From f461c900cf2d1ccc9172541698892e3d667351fb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 19 Jun 2021 15:37:06 +0100 Subject: [PATCH] Improve typing of Event Index Manager / Seshat --- src/vector/platform/ElectronPlatform.tsx | 59 ++++++++++++------------ 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index 7ec8147edd..a06516a4d8 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -17,37 +17,38 @@ See the License for the specific language governing permissions and 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, { - CrawlerCheckpoint, - EventAndProfile, - IndexStats, - MatrixEvent, - MatrixProfile, - SearchArgs, - SearchResult, + ICrawlerCheckpoint, + IEventAndProfile, + IIndexStats, + IMatrixEvent, + IMatrixProfile, + ISearchArgs, + ISearchResult, } from 'matrix-react-sdk/src/indexing/BaseEventIndexManager'; 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'; import SdkConfig from 'matrix-react-sdk/src/SdkConfig'; import * as rageshake from 'matrix-react-sdk/src/rageshake/rageshake'; -import {MatrixClient} from "matrix-js-sdk/src/client"; -import {Room} from "matrix-js-sdk/src/models/room"; +import { MatrixClient } from "matrix-js-sdk/src/client"; +import { Room } from "matrix-js-sdk/src/models/room"; import Modal from "matrix-react-sdk/src/Modal"; import InfoDialog from "matrix-react-sdk/src/components/views/dialogs/InfoDialog"; import Spinner from "matrix-react-sdk/src/components/views/elements/Spinner"; -import {Categories, Modifiers, registerShortcut} from "matrix-react-sdk/src/accessibility/KeyboardShortcuts"; -import {Key} from "matrix-react-sdk/src/Keyboard"; +import { Categories, Modifiers, registerShortcut } from "matrix-react-sdk/src/accessibility/KeyboardShortcuts"; +import { Key } from "matrix-react-sdk/src/Keyboard"; import React from "react"; -import {randomString} from "matrix-js-sdk/src/randomstring"; -import {Action} from "matrix-react-sdk/src/dispatcher/actions"; -import {ActionPayload} from "matrix-react-sdk/src/dispatcher/payloads"; -import {showToast as showUpdateToast} from "matrix-react-sdk/src/toasts/UpdateToast"; -import {CheckUpdatesPayload} from "matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload"; +import { randomString } from "matrix-js-sdk/src/randomstring"; +import { Action } from "matrix-react-sdk/src/dispatcher/actions"; +import { ActionPayload } from "matrix-react-sdk/src/dispatcher/payloads"; +import { showToast as showUpdateToast } from "matrix-react-sdk/src/toasts/UpdateToast"; +import { CheckUpdatesPayload } from "matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload"; import ToastStore from "matrix-react-sdk/src/stores/ToastStore"; import GenericExpiringToast from "matrix-react-sdk/src/components/views/toasts/GenericExpiringToast"; +import VectorBasePlatform from './VectorBasePlatform'; + const electron = window.electron; const isMac = navigator.platform.toUpperCase().includes('MAC'); @@ -143,7 +144,7 @@ class SeshatIndexManager extends BaseEventIndexManager { return this._ipcCall('initEventIndex', userId, deviceId); } - async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise { + async addEventToIndex(ev: IMatrixEvent, profile: IMatrixProfile): Promise { return this._ipcCall('addEventToIndex', ev, profile); } @@ -163,31 +164,31 @@ class SeshatIndexManager extends BaseEventIndexManager { return this._ipcCall('commitLiveEvents'); } - async searchEventIndex(searchConfig: SearchArgs): Promise { + async searchEventIndex(searchConfig: ISearchArgs): Promise { return this._ipcCall('searchEventIndex', searchConfig); } async addHistoricEvents( - events: [EventAndProfile], - checkpoint: CrawlerCheckpoint | null, - oldCheckpoint: CrawlerCheckpoint | null, + events: IEventAndProfile[], + checkpoint: ICrawlerCheckpoint | null, + oldCheckpoint: ICrawlerCheckpoint | null, ): Promise { return this._ipcCall('addHistoricEvents', events, checkpoint, oldCheckpoint); } - async addCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise { + async addCrawlerCheckpoint(checkpoint: ICrawlerCheckpoint): Promise { return this._ipcCall('addCrawlerCheckpoint', checkpoint); } - async removeCrawlerCheckpoint(checkpoint: CrawlerCheckpoint): Promise { + async removeCrawlerCheckpoint(checkpoint: ICrawlerCheckpoint): Promise { return this._ipcCall('removeCrawlerCheckpoint', checkpoint); } - async loadFileEvents(args): Promise<[EventAndProfile]> { + async loadFileEvents(args): Promise { return this._ipcCall('loadFileEvents', args); } - async loadCheckpoints(): Promise<[CrawlerCheckpoint]> { + async loadCheckpoints(): Promise { return this._ipcCall('loadCheckpoints'); } @@ -195,7 +196,7 @@ class SeshatIndexManager extends BaseEventIndexManager { return this._ipcCall('closeEventIndex'); } - async getStats(): Promise { + async getStats(): Promise { return this._ipcCall('getStats'); }