From e9acff975e4375805d871597135b338d86f7ee49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 08:09:48 +0000 Subject: [PATCH 1/3] Bump dns-packet from 1.3.1 to 1.3.4 Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4. - [Release notes](https://github.com/mafintosh/dns-packet/releases) - [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md) - [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9bfa793b21..cc9be25f1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3951,9 +3951,9 @@ dns-equal@^1.0.0: integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a" - integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg== + version "1.3.4" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== dependencies: ip "^1.1.0" safe-buffer "^5.0.1" 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 2/3] 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'); } From d400bfeaeb55fe2f87c36f9c65b7e2835d2dfc3a Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Fri, 25 Jun 2021 01:11:53 -0500 Subject: [PATCH 3/3] Add libera.chat to default room directory Signed-off-by: Aaron Raimist --- element.io/app/config.json | 3 ++- element.io/develop/config.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/element.io/app/config.json b/element.io/app/config.json index 0259261701..5922fcf504 100644 --- a/element.io/app/config.json +++ b/element.io/app/config.json @@ -21,7 +21,8 @@ "roomDirectory": { "servers": [ "matrix.org", - "gitter.im" + "gitter.im", + "libera.chat" ] }, "enable_presence_by_hs_url": { diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 1e1e3ed023..58da5283db 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -21,7 +21,8 @@ "roomDirectory": { "servers": [ "matrix.org", - "gitter.im" + "gitter.im", + "libera.chat" ] }, "enable_presence_by_hs_url": {