Merge branch 'develop' into gsouquet/dependency-mock
This commit is contained in:
commit
50a9287107
4 changed files with 37 additions and 34 deletions
|
@ -21,7 +21,8 @@
|
||||||
"roomDirectory": {
|
"roomDirectory": {
|
||||||
"servers": [
|
"servers": [
|
||||||
"matrix.org",
|
"matrix.org",
|
||||||
"gitter.im"
|
"gitter.im",
|
||||||
|
"libera.chat"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"enable_presence_by_hs_url": {
|
"enable_presence_by_hs_url": {
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
"roomDirectory": {
|
"roomDirectory": {
|
||||||
"servers": [
|
"servers": [
|
||||||
"matrix.org",
|
"matrix.org",
|
||||||
"gitter.im"
|
"gitter.im",
|
||||||
|
"libera.chat"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"enable_presence_by_hs_url": {
|
"enable_presence_by_hs_url": {
|
||||||
|
|
|
@ -17,23 +17,22 @@ 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';
|
||||||
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
|
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
|
||||||
import * as rageshake from 'matrix-react-sdk/src/rageshake/rageshake';
|
import * as rageshake from 'matrix-react-sdk/src/rageshake/rageshake';
|
||||||
import {MatrixClient} from "matrix-js-sdk/src/client";
|
import { MatrixClient } from "matrix-js-sdk/src/client";
|
||||||
import {Room} from "matrix-js-sdk/src/models/room";
|
import { Room } from "matrix-js-sdk/src/models/room";
|
||||||
import Modal from "matrix-react-sdk/src/Modal";
|
import Modal from "matrix-react-sdk/src/Modal";
|
||||||
import InfoDialog from "matrix-react-sdk/src/components/views/dialogs/InfoDialog";
|
import InfoDialog from "matrix-react-sdk/src/components/views/dialogs/InfoDialog";
|
||||||
import Spinner from "matrix-react-sdk/src/components/views/elements/Spinner";
|
import Spinner from "matrix-react-sdk/src/components/views/elements/Spinner";
|
||||||
|
@ -44,18 +43,20 @@ import {
|
||||||
Modifiers,
|
Modifiers,
|
||||||
registerShortcut,
|
registerShortcut,
|
||||||
} from "matrix-react-sdk/src/accessibility/KeyboardShortcuts";
|
} from "matrix-react-sdk/src/accessibility/KeyboardShortcuts";
|
||||||
import {isOnlyCtrlOrCmdKeyEvent, Key} from "matrix-react-sdk/src/Keyboard";
|
import { isOnlyCtrlOrCmdKeyEvent, Key } from "matrix-react-sdk/src/Keyboard";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import {randomString} from "matrix-js-sdk/src/randomstring";
|
import { randomString } from "matrix-js-sdk/src/randomstring";
|
||||||
import {Action} from "matrix-react-sdk/src/dispatcher/actions";
|
import { Action } from "matrix-react-sdk/src/dispatcher/actions";
|
||||||
import {ActionPayload} from "matrix-react-sdk/src/dispatcher/payloads";
|
import { ActionPayload } from "matrix-react-sdk/src/dispatcher/payloads";
|
||||||
import {SwitchSpacePayload} from "matrix-react-sdk/src/dispatcher/payloads/SwitchSpacePayload";
|
import { SwitchSpacePayload} from "matrix-react-sdk/src/dispatcher/payloads/SwitchSpacePayload";
|
||||||
import {showToast as showUpdateToast} from "matrix-react-sdk/src/toasts/UpdateToast";
|
import { showToast as showUpdateToast } from "matrix-react-sdk/src/toasts/UpdateToast";
|
||||||
import {CheckUpdatesPayload} from "matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload";
|
import { CheckUpdatesPayload } from "matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload";
|
||||||
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 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');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3958,9 +3958,9 @@ dns-equal@^1.0.0:
|
||||||
integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
|
integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
|
||||||
|
|
||||||
dns-packet@^1.3.1:
|
dns-packet@^1.3.1:
|
||||||
version "1.3.1"
|
version "1.3.4"
|
||||||
resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
|
resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
|
||||||
integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
|
integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
|
||||||
dependencies:
|
dependencies:
|
||||||
ip "^1.1.0"
|
ip "^1.1.0"
|
||||||
safe-buffer "^5.0.1"
|
safe-buffer "^5.0.1"
|
||||||
|
|
Loading…
Reference in a new issue