Merge pull request #17931 from vector-im/t3chguy/ts/c1

Improve and consolidate typing
This commit is contained in:
Michael Telatynski 2021-07-14 17:19:10 +01:00 committed by GitHub
commit 22a25f0e95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -22,10 +22,7 @@ import BaseEventIndexManager, {
ICrawlerCheckpoint, ICrawlerCheckpoint,
IEventAndProfile, IEventAndProfile,
IIndexStats, IIndexStats,
IMatrixEvent,
IMatrixProfile,
ISearchArgs, ISearchArgs,
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';
@ -54,6 +51,7 @@ import { CheckUpdatesPayload } from "matrix-react-sdk/src/dispatcher/payloads/Ch
import ToastStore from "matrix-react-sdk/src/stores/ToastStore"; 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 { IMatrixProfile, IEventWithRoomId as IMatrixEvent, IResultRoomEvents } from "matrix-js-sdk/src/@types/search";
import VectorBasePlatform from './VectorBasePlatform'; import VectorBasePlatform from './VectorBasePlatform';
@ -172,7 +170,7 @@ class SeshatIndexManager extends BaseEventIndexManager {
return this._ipcCall('commitLiveEvents'); return this._ipcCall('commitLiveEvents');
} }
async searchEventIndex(searchConfig: ISearchArgs): Promise<ISearchResult> { async searchEventIndex(searchConfig: ISearchArgs): Promise<IResultRoomEvents> {
return this._ipcCall('searchEventIndex', searchConfig); return this._ipcCall('searchEventIndex', searchConfig);
} }