Merge pull request #17704 from vector-im/t3chguy/ts/5.1

This commit is contained in:
Michael Telatynski 2021-06-24 15:24:01 +01:00 committed by GitHub
commit a470c7dd1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -17,16 +17,15 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import VectorBasePlatform from './VectorBasePlatform';
import { UpdateCheckStatus } from "matrix-react-sdk/src/BasePlatform"; import { UpdateCheckStatus } from "matrix-react-sdk/src/BasePlatform";
import BaseEventIndexManager, { import BaseEventIndexManager, {
CrawlerCheckpoint, ICrawlerCheckpoint,
EventAndProfile, IEventAndProfile,
IndexStats, IIndexStats,
MatrixEvent, IMatrixEvent,
MatrixProfile, IMatrixProfile,
SearchArgs, ISearchArgs,
SearchResult, ISearchResult,
} from 'matrix-react-sdk/src/indexing/BaseEventIndexManager'; } from 'matrix-react-sdk/src/indexing/BaseEventIndexManager';
import dis from 'matrix-react-sdk/src/dispatcher/dispatcher'; import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
import { _t, _td } from 'matrix-react-sdk/src/languageHandler'; import { _t, _td } from 'matrix-react-sdk/src/languageHandler';
@ -56,6 +55,8 @@ import ToastStore from "matrix-react-sdk/src/stores/ToastStore";
import GenericExpiringToast from "matrix-react-sdk/src/components/views/toasts/GenericExpiringToast"; import GenericExpiringToast from "matrix-react-sdk/src/components/views/toasts/GenericExpiringToast";
import SettingsStore from 'matrix-react-sdk/src/settings/SettingsStore'; import SettingsStore from 'matrix-react-sdk/src/settings/SettingsStore';
import VectorBasePlatform from './VectorBasePlatform';
const electron = window.electron; const electron = window.electron;
const isMac = navigator.platform.toUpperCase().includes('MAC'); const isMac = navigator.platform.toUpperCase().includes('MAC');
@ -151,7 +152,7 @@ class SeshatIndexManager extends BaseEventIndexManager {
return this._ipcCall('initEventIndex', userId, deviceId); return this._ipcCall('initEventIndex', userId, deviceId);
} }
async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<void> { async addEventToIndex(ev: IMatrixEvent, profile: IMatrixProfile): Promise<void> {
return this._ipcCall('addEventToIndex', ev, profile); return this._ipcCall('addEventToIndex', ev, profile);
} }
@ -171,31 +172,31 @@ class SeshatIndexManager extends BaseEventIndexManager {
return this._ipcCall('commitLiveEvents'); return this._ipcCall('commitLiveEvents');
} }
async searchEventIndex(searchConfig: SearchArgs): Promise<SearchResult> { async searchEventIndex(searchConfig: ISearchArgs): Promise<ISearchResult> {
return this._ipcCall('searchEventIndex', searchConfig); return this._ipcCall('searchEventIndex', searchConfig);
} }
async addHistoricEvents( async addHistoricEvents(
events: [EventAndProfile], events: IEventAndProfile[],
checkpoint: CrawlerCheckpoint | null, checkpoint: ICrawlerCheckpoint | null,
oldCheckpoint: CrawlerCheckpoint | null, oldCheckpoint: ICrawlerCheckpoint | null,
): Promise<boolean> { ): Promise<boolean> {
return this._ipcCall('addHistoricEvents', events, checkpoint, oldCheckpoint); return this._ipcCall('addHistoricEvents', events, checkpoint, oldCheckpoint);
} }
async addCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise<void> { async addCrawlerCheckpoint(checkpoint: ICrawlerCheckpoint): Promise<void> {
return this._ipcCall('addCrawlerCheckpoint', checkpoint); return this._ipcCall('addCrawlerCheckpoint', checkpoint);
} }
async removeCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise<void> { async removeCrawlerCheckpoint(checkpoint: ICrawlerCheckpoint): Promise<void> {
return this._ipcCall('removeCrawlerCheckpoint', checkpoint); return this._ipcCall('removeCrawlerCheckpoint', checkpoint);
} }
async loadFileEvents(args): Promise<[EventAndProfile]> { async loadFileEvents(args): Promise<IEventAndProfile[]> {
return this._ipcCall('loadFileEvents', args); return this._ipcCall('loadFileEvents', args);
} }
async loadCheckpoints(): Promise<[CrawlerCheckpoint]> { async loadCheckpoints(): Promise<ICrawlerCheckpoint[]> {
return this._ipcCall('loadCheckpoints'); return this._ipcCall('loadCheckpoints');
} }
@ -203,7 +204,7 @@ class SeshatIndexManager extends BaseEventIndexManager {
return this._ipcCall('closeEventIndex'); return this._ipcCall('closeEventIndex');
} }
async getStats(): Promise<IndexStats> { async getStats(): Promise<IIndexStats> {
return this._ipcCall('getStats'); return this._ipcCall('getStats');
} }