-
- { _t('The information being sent to us to help make Riot better includes:') }
-
+
{_t('The information being sent to us to help make %(brand)s better includes:', {
+ brand: SdkConfig.get().brand,
+ })}
{ rows.map((row) =>
- | { _t(customVariables[row[0]].expl) } |
+ {_t(
+ customVariables[row[0]].expl,
+ customVariables[row[0]].getTextVariables ?
+ customVariables[row[0]].getTextVariables() :
+ null,
+ )} |
{ row[1] !== undefined && { row[1] } | }
) }
{ otherVariables.map((item, index) =>
diff --git a/src/AsyncWrapper.js b/src/AsyncWrapper.js
index b7b81688e1..05054cf63a 100644
--- a/src/AsyncWrapper.js
+++ b/src/AsyncWrapper.js
@@ -38,7 +38,7 @@ export default createReactClass({
};
},
- componentWillMount: function() {
+ componentDidMount: function() {
this._unmounted = false;
// XXX: temporary logging to try to diagnose
// https://github.com/vector-im/riot-web/issues/3148
diff --git a/src/Avatar.js b/src/Avatar.js
index 217b196348..d76ea6f2c4 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -19,6 +19,7 @@ import {MatrixClientPeg} from './MatrixClientPeg';
import DMRoomMap from './utils/DMRoomMap';
import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
+// Not to be used for BaseAvatar urls as that has similar default avatar fallback already
export function avatarUrlForMember(member, width, height, resizeMethod) {
let url;
if (member && member.getAvatarUrl) {
@@ -53,13 +54,56 @@ export function avatarUrlForUser(user, width, height, resizeMethod) {
return url;
}
+function isValidHexColor(color) {
+ return typeof color === "string" &&
+ (color.length === 7 || color.lengh === 9) &&
+ color.charAt(0) === "#" &&
+ !color.substr(1).split("").some(c => isNaN(parseInt(c, 16)));
+}
+
+function urlForColor(color) {
+ const size = 40;
+ const canvas = document.createElement("canvas");
+ canvas.width = size;
+ canvas.height = size;
+ const ctx = canvas.getContext("2d");
+ // bail out when using jsdom in unit tests
+ if (!ctx) {
+ return "";
+ }
+ ctx.fillStyle = color;
+ ctx.fillRect(0, 0, size, size);
+ return canvas.toDataURL();
+}
+
+// XXX: Ideally we'd clear this cache when the theme changes
+// but since this function is at global scope, it's a bit
+// hard to install a listener here, even if there were a clear event to listen to
+const colorToDataURLCache = new Map();
+
export function defaultAvatarUrlForString(s) {
- const images = ['03b381', '368bd6', 'ac3ba8'];
+ const defaultColors = ['#0DBD8B', '#368bd6', '#ac3ba8'];
let total = 0;
for (let i = 0; i < s.length; ++i) {
total += s.charCodeAt(i);
}
- return require('../res/img/' + images[total % images.length] + '.png');
+ const colorIndex = total % defaultColors.length;
+ // overwritten color value in custom themes
+ const cssVariable = `--avatar-background-colors_${colorIndex}`;
+ const cssValue = document.body.style.getPropertyValue(cssVariable);
+ const color = cssValue || defaultColors[colorIndex];
+ let dataUrl = colorToDataURLCache.get(color);
+ if (!dataUrl) {
+ // validate color as this can come from account_data
+ // with custom theming
+ if (isValidHexColor(color)) {
+ dataUrl = urlForColor(color);
+ colorToDataURLCache.set(color, dataUrl);
+ } else {
+ dataUrl = "";
+ }
+ }
+ return dataUrl;
}
/**
diff --git a/src/BasePlatform.js b/src/BasePlatform.js
deleted file mode 100644
index 5d809eb28f..0000000000
--- a/src/BasePlatform.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// @flow
-
-/*
-Copyright 2016 Aviral Dasgupta
-Copyright 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import {MatrixClient} from "matrix-js-sdk";
-import dis from './dispatcher';
-import BaseEventIndexManager from './indexing/BaseEventIndexManager';
-
-/**
- * Base class for classes that provide platform-specific functionality
- * eg. Setting an application badge or displaying notifications
- *
- * Instances of this class are provided by the application.
- */
-export default class BasePlatform {
- constructor() {
- this.notificationCount = 0;
- this.errorDidOccur = false;
-
- dis.register(this._onAction.bind(this));
- }
-
- _onAction(payload: Object) {
- switch (payload.action) {
- case 'on_client_not_viable':
- case 'on_logged_out':
- this.setNotificationCount(0);
- break;
- }
- }
-
- // Used primarily for Analytics
- getHumanReadableName(): string {
- return 'Base Platform';
- }
-
- setNotificationCount(count: number) {
- this.notificationCount = count;
- }
-
- setErrorStatus(errorDidOccur: boolean) {
- this.errorDidOccur = errorDidOccur;
- }
-
- /**
- * Returns true if the platform supports displaying
- * notifications, otherwise false.
- * @returns {boolean} whether the platform supports displaying notifications
- */
- supportsNotifications(): boolean {
- return false;
- }
-
- /**
- * Returns true if the application currently has permission
- * to display notifications. Otherwise false.
- * @returns {boolean} whether the application has permission to display notifications
- */
- maySendNotifications(): boolean {
- return false;
- }
-
- /**
- * Requests permission to send notifications. Returns
- * a promise that is resolved when the user has responded
- * to the request. The promise has a single string argument
- * that is 'granted' if the user allowed the request or
- * 'denied' otherwise.
- */
- requestNotificationPermission(): Promise {
- }
-
- displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
- }
-
- loudNotification(ev: Event, room: Object) {
- }
-
- /**
- * Returns a promise that resolves to a string representing
- * the current version of the application.
- */
- getAppVersion(): Promise {
- throw new Error("getAppVersion not implemented!");
- }
-
- /*
- * If it's not expected that capturing the screen will work
- * with getUserMedia, return a string explaining why not.
- * Otherwise, return null.
- */
- screenCaptureErrorString(): string {
- return "Not implemented";
- }
-
- /**
- * Restarts the application, without neccessarily reloading
- * any application code
- */
- reload() {
- throw new Error("reload not implemented!");
- }
-
- supportsAutoLaunch(): boolean {
- return false;
- }
-
- // XXX: Surely this should be a setting like any other?
- async getAutoLaunchEnabled(): boolean {
- return false;
- }
-
- async setAutoLaunchEnabled(enabled: boolean): void {
- throw new Error("Unimplemented");
- }
-
- supportsAutoHideMenuBar(): boolean {
- return false;
- }
-
- async getAutoHideMenuBarEnabled(): boolean {
- return false;
- }
-
- async setAutoHideMenuBarEnabled(enabled: boolean): void {
- throw new Error("Unimplemented");
- }
-
- supportsMinimizeToTray(): boolean {
- return false;
- }
-
- async getMinimizeToTrayEnabled(): boolean {
- return false;
- }
-
- async setMinimizeToTrayEnabled(enabled: boolean): void {
- throw new Error("Unimplemented");
- }
-
- /**
- * Get our platform specific EventIndexManager.
- *
- * @return {BaseEventIndexManager} The EventIndex manager for our platform,
- * can be null if the platform doesn't support event indexing.
- */
- getEventIndexingManager(): BaseEventIndexManager | null {
- return null;
- }
-
- setLanguage(preferredLangs: string[]) {}
-
- getSSOCallbackUrl(hsUrl: string, isUrl: string): URL {
- const url = new URL(window.location.href);
- // XXX: at this point, the fragment will always be #/login, which is no
- // use to anyone. Ideally, we would get the intended fragment from
- // MatrixChat.screenAfterLogin so that you could follow #/room links etc
- // through an SSO login.
- url.hash = "";
- url.searchParams.set("homeserver", hsUrl);
- url.searchParams.set("identityServer", isUrl);
- return url;
- }
-
- /**
- * Begin Single Sign On flows.
- * @param {MatrixClient} mxClient the matrix client using which we should start the flow
- * @param {"sso"|"cas"} loginType the type of SSO it is, CAS/SSO.
- */
- startSingleSignOn(mxClient: MatrixClient, loginType: "sso"|"cas") {
- const callbackUrl = this.getSSOCallbackUrl(mxClient.getHomeserverUrl(), mxClient.getIdentityServerUrl());
- window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
- }
-}
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
new file mode 100644
index 0000000000..acf72a986c
--- /dev/null
+++ b/src/BasePlatform.ts
@@ -0,0 +1,284 @@
+/*
+Copyright 2016 Aviral Dasgupta
+Copyright 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import dis from './dispatcher/dispatcher';
+import BaseEventIndexManager from './indexing/BaseEventIndexManager';
+import {ActionPayload} from "./dispatcher/payloads";
+import {CheckUpdatesPayload} from "./dispatcher/payloads/CheckUpdatesPayload";
+import {Action} from "./dispatcher/actions";
+import {hideToast as hideUpdateToast} from "./toasts/UpdateToast";
+
+export const SSO_HOMESERVER_URL_KEY = "mx_sso_hs_url";
+export const SSO_ID_SERVER_URL_KEY = "mx_sso_is_url";
+
+export enum UpdateCheckStatus {
+ Checking = "CHECKING",
+ Error = "ERROR",
+ NotAvailable = "NOTAVAILABLE",
+ Downloading = "DOWNLOADING",
+ Ready = "READY",
+}
+
+const UPDATE_DEFER_KEY = "mx_defer_update";
+
+/**
+ * Base class for classes that provide platform-specific functionality
+ * eg. Setting an application badge or displaying notifications
+ *
+ * Instances of this class are provided by the application.
+ */
+export default abstract class BasePlatform {
+ protected notificationCount = 0;
+ protected errorDidOccur = false;
+
+ constructor() {
+ dis.register(this.onAction);
+ this.startUpdateCheck = this.startUpdateCheck.bind(this);
+ }
+
+ abstract async getConfig(): Promise<{}>;
+
+ abstract getDefaultDeviceDisplayName(): string;
+
+ protected onAction = (payload: ActionPayload) => {
+ switch (payload.action) {
+ case 'on_client_not_viable':
+ case 'on_logged_out':
+ this.setNotificationCount(0);
+ break;
+ }
+ };
+
+ // Used primarily for Analytics
+ abstract getHumanReadableName(): string;
+
+ setNotificationCount(count: number) {
+ this.notificationCount = count;
+ }
+
+ setErrorStatus(errorDidOccur: boolean) {
+ this.errorDidOccur = errorDidOccur;
+ }
+
+ /**
+ * Whether we can call checkForUpdate on this platform build
+ */
+ async canSelfUpdate(): Promise {
+ return false;
+ }
+
+ startUpdateCheck() {
+ hideUpdateToast();
+ localStorage.removeItem(UPDATE_DEFER_KEY);
+ dis.dispatch({
+ action: Action.CheckUpdates,
+ status: UpdateCheckStatus.Checking,
+ });
+ }
+
+ /**
+ * Update the currently running app to the latest available version
+ * and replace this instance of the app with the new version.
+ */
+ installUpdate() {
+ }
+
+ /**
+ * Check if the version update has been deferred and that deferment is still in effect
+ * @param newVersion the version string to check
+ */
+ protected shouldShowUpdate(newVersion: string): boolean {
+ try {
+ const [version, deferUntil] = JSON.parse(localStorage.getItem(UPDATE_DEFER_KEY));
+ return newVersion !== version || Date.now() > deferUntil;
+ } catch (e) {
+ return true;
+ }
+ }
+
+ /**
+ * Ignore the pending update and don't prompt about this version
+ * until the next morning (8am).
+ */
+ deferUpdate(newVersion: string) {
+ const date = new Date(Date.now() + 24 * 60 * 60 * 1000);
+ date.setHours(8, 0, 0, 0); // set to next 8am
+ localStorage.setItem(UPDATE_DEFER_KEY, JSON.stringify([newVersion, date.getTime()]));
+ hideUpdateToast();
+ }
+
+ /**
+ * Returns true if the platform supports displaying
+ * notifications, otherwise false.
+ * @returns {boolean} whether the platform supports displaying notifications
+ */
+ supportsNotifications(): boolean {
+ return false;
+ }
+
+ /**
+ * Returns true if the application currently has permission
+ * to display notifications. Otherwise false.
+ * @returns {boolean} whether the application has permission to display notifications
+ */
+ maySendNotifications(): boolean {
+ return false;
+ }
+
+ /**
+ * Requests permission to send notifications. Returns
+ * a promise that is resolved when the user has responded
+ * to the request. The promise has a single string argument
+ * that is 'granted' if the user allowed the request or
+ * 'denied' otherwise.
+ */
+ abstract requestNotificationPermission(): Promise;
+
+ abstract displayNotification(title: string, msg: string, avatarUrl: string, room: Object);
+
+ loudNotification(ev: Event, room: Object) {
+ }
+
+ /**
+ * Returns a promise that resolves to a string representing the current version of the application.
+ */
+ abstract getAppVersion(): Promise;
+
+ /*
+ * If it's not expected that capturing the screen will work
+ * with getUserMedia, return a string explaining why not.
+ * Otherwise, return null.
+ */
+ screenCaptureErrorString(): string {
+ return "Not implemented";
+ }
+
+ /**
+ * Restarts the application, without neccessarily reloading
+ * any application code
+ */
+ abstract reload();
+
+ supportsAutoLaunch(): boolean {
+ return false;
+ }
+
+ // XXX: Surely this should be a setting like any other?
+ async getAutoLaunchEnabled(): Promise {
+ return false;
+ }
+
+ async setAutoLaunchEnabled(enabled: boolean): Promise {
+ throw new Error("Unimplemented");
+ }
+
+ supportsAutoHideMenuBar(): boolean {
+ return false;
+ }
+
+ async getAutoHideMenuBarEnabled(): Promise {
+ return false;
+ }
+
+ async setAutoHideMenuBarEnabled(enabled: boolean): Promise {
+ throw new Error("Unimplemented");
+ }
+
+ supportsMinimizeToTray(): boolean {
+ return false;
+ }
+
+ async getMinimizeToTrayEnabled(): Promise {
+ return false;
+ }
+
+ async setMinimizeToTrayEnabled(enabled: boolean): Promise {
+ throw new Error("Unimplemented");
+ }
+
+ /**
+ * Get our platform specific EventIndexManager.
+ *
+ * @return {BaseEventIndexManager} The EventIndex manager for our platform,
+ * can be null if the platform doesn't support event indexing.
+ */
+ getEventIndexingManager(): BaseEventIndexManager | null {
+ return null;
+ }
+
+ setLanguage(preferredLangs: string[]) {}
+
+ protected getSSOCallbackUrl(fragmentAfterLogin: string): URL {
+ const url = new URL(window.location.href);
+ url.hash = fragmentAfterLogin || "";
+ return url;
+ }
+
+ /**
+ * Begin Single Sign On flows.
+ * @param {MatrixClient} mxClient the matrix client using which we should start the flow
+ * @param {"sso"|"cas"} loginType the type of SSO it is, CAS/SSO.
+ * @param {string} fragmentAfterLogin the hash to pass to the app during sso callback.
+ */
+ startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) {
+ // persist hs url and is url for when the user is returned to the app with the login token
+ localStorage.setItem(SSO_HOMESERVER_URL_KEY, mxClient.getHomeserverUrl());
+ if (mxClient.getIdentityServerUrl()) {
+ localStorage.setItem(SSO_ID_SERVER_URL_KEY, mxClient.getIdentityServerUrl());
+ }
+ const callbackUrl = this.getSSOCallbackUrl(fragmentAfterLogin);
+ window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
+ }
+
+ onKeyDown(ev: KeyboardEvent): boolean {
+ return false; // no shortcuts implemented
+ }
+
+ /**
+ * Get a previously stored pickle key. The pickle key is used for
+ * encrypting libolm objects.
+ * @param {string} userId the user ID for the user that the pickle key is for.
+ * @param {string} userId the device ID that the pickle key is for.
+ * @returns {string|null} the previously stored pickle key, or null if no
+ * pickle key has been stored.
+ */
+ async getPickleKey(userId: string, deviceId: string): Promise {
+ return null;
+ }
+
+ /**
+ * Create and store a pickle key for encrypting libolm objects.
+ * @param {string} userId the user ID for the user that the pickle key is for.
+ * @param {string} userId the device ID that the pickle key is for.
+ * @returns {string|null} the pickle key, or null if the platform does not
+ * support storing pickle keys.
+ */
+ async createPickleKey(userId: string, deviceId: string): Promise {
+ return null;
+ }
+
+ /**
+ * Delete a previously stored pickle key from storage.
+ * @param {string} userId the user ID for the user that the pickle key is for.
+ * @param {string} userId the device ID that the pickle key is for.
+ */
+ async destroyPickleKey(userId: string, deviceId: string): Promise {
+ }
+}
diff --git a/src/CallHandler.js b/src/CallHandler.js
index 362db939a3..4414bce457 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -59,13 +59,13 @@ import Modal from './Modal';
import * as sdk from './index';
import { _t } from './languageHandler';
import Matrix from 'matrix-js-sdk';
-import dis from './dispatcher';
-import SdkConfig from './SdkConfig';
-import { showUnknownDeviceDialogForCalls } from './cryptodevices';
+import dis from './dispatcher/dispatcher';
import WidgetUtils from './utils/WidgetUtils';
import WidgetEchoStore from './stores/WidgetEchoStore';
import SettingsStore, { SettingLevel } from './settings/SettingsStore';
import {generateHumanReadableId} from "./utils/NamingUtils";
+import {Jitsi} from "./widgets/Jitsi";
+import {WidgetType} from "./widgets/WidgetType";
global.mxCalls = {
//room_id: MatrixCall
@@ -118,62 +118,22 @@ function pause(audioId) {
}
}
-function _reAttemptCall(call) {
- if (call.direction === 'outbound') {
- dis.dispatch({
- action: 'place_call',
- room_id: call.roomId,
- type: call.type,
- });
- } else {
- call.answer();
- }
-}
-
function _setCallListeners(call) {
call.on("error", function(err) {
console.error("Call error:", err);
- if (err.code === 'unknown_devices') {
- const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-
- Modal.createTrackedDialog('Call Failed', '', QuestionDialog, {
- title: _t('Call Failed'),
- description: _t(
- "There are unknown sessions in this room: "+
- "if you proceed without verifying them, it will be "+
- "possible for someone to eavesdrop on your call.",
- ),
- button: _t('Review Sessions'),
- onFinished: function(confirmed) {
- if (confirmed) {
- const room = MatrixClientPeg.get().getRoom(call.roomId);
- showUnknownDeviceDialogForCalls(
- MatrixClientPeg.get(),
- room,
- () => {
- _reAttemptCall(call);
- },
- call.direction === 'outbound' ? _t("Call Anyway") : _t("Answer Anyway"),
- call.direction === 'outbound' ? _t("Call") : _t("Answer"),
- );
- }
- },
- });
- } else {
- if (
- MatrixClientPeg.get().getTurnServers().length === 0 &&
- SettingsStore.getValue("fallbackICEServerAllowed") === null
- ) {
- _showICEFallbackPrompt();
- return;
- }
-
- const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
- Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
- title: _t('Call Failed'),
- description: err.message,
- });
+ if (
+ MatrixClientPeg.get().getTurnServers().length === 0 &&
+ SettingsStore.getValue("fallbackICEServerAllowed") === null
+ ) {
+ _showICEFallbackPrompt();
+ return;
}
+
+ const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+ Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
+ title: _t('Call Failed'),
+ description: err.message,
+ });
});
call.on("hangup", function() {
_setCallState(undefined, call.roomId, "ended");
@@ -401,9 +361,9 @@ async function _startCallApp(roomId, type) {
});
const room = MatrixClientPeg.get().getRoom(roomId);
- const currentRoomWidgets = WidgetUtils.getRoomWidgets(room);
+ const currentJitsiWidgets = WidgetUtils.getRoomWidgetsOfType(room, WidgetType.JITSI);
- if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, 'jitsi')) {
+ if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentJitsiWidgets, WidgetType.JITSI)) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call already in progress', '', ErrorDialog, {
@@ -413,9 +373,6 @@ async function _startCallApp(roomId, type) {
return;
}
- const currentJitsiWidgets = currentRoomWidgets.filter((ev) => {
- return ev.getContent().type === 'jitsi';
- });
if (currentJitsiWidgets.length > 0) {
console.warn(
"Refusing to start conference call widget in " + roomId +
@@ -430,8 +387,8 @@ async function _startCallApp(roomId, type) {
return;
}
- const confId = `JitsiConference_${generateHumanReadableId()}`;
- const jitsiDomain = SdkConfig.get()['jitsi']['preferredDomain'];
+ const confId = `JitsiConference${generateHumanReadableId()}`;
+ const jitsiDomain = Jitsi.getInstance().preferredDomain;
let widgetUrl = WidgetUtils.getLocalJitsiWrapperUrl();
@@ -454,7 +411,7 @@ async function _startCallApp(roomId, type) {
Date.now()
);
- WidgetUtils.setRoomWidget(roomId, widgetId, 'jitsi', widgetUrl, 'Jitsi', widgetData).then(() => {
+ WidgetUtils.setRoomWidget(roomId, widgetId, WidgetType.JITSI, widgetUrl, 'Jitsi', widgetData).then(() => {
console.log('Jitsi widget added');
}).catch((e) => {
if (e.errcode === 'M_FORBIDDEN') {
diff --git a/src/ContentMessages.js b/src/ContentMessages.tsx
similarity index 73%
rename from src/ContentMessages.js
rename to src/ContentMessages.tsx
index 34379c029b..6f55a75d0c 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.tsx
@@ -1,6 +1,7 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,20 +16,22 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
+import React from "react";
import extend from './extend';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
import {MatrixClientPeg} from './MatrixClientPeg';
+import {MatrixClient} from "matrix-js-sdk/src/client";
import * as sdk from './index';
import { _t } from './languageHandler';
import Modal from './Modal';
import RoomViewStore from './stores/RoomViewStore';
import encrypt from "browser-encrypt-attachment";
import extractPngChunks from "png-chunks-extract";
+import Spinner from "./components/views/elements/Spinner";
// Polyfill for Canvas.toBlob API using Canvas.toDataURL
import "blueimp-canvas-to-blob";
+import { Action } from "./dispatcher/actions";
const MAX_WIDTH = 800;
const MAX_HEIGHT = 600;
@@ -39,6 +42,50 @@ const PHYS_HIDPI = [0x00, 0x00, 0x16, 0x25, 0x00, 0x00, 0x16, 0x25, 0x01];
export class UploadCanceledError extends Error {}
+type ThumbnailableElement = HTMLImageElement | HTMLVideoElement;
+
+interface IUpload {
+ fileName: string;
+ roomId: string;
+ total: number;
+ loaded: number;
+ promise: Promise;
+ canceled?: boolean;
+}
+
+interface IMediaConfig {
+ "m.upload.size"?: number;
+}
+
+interface IContent {
+ body: string;
+ msgtype: string;
+ info: {
+ size: number;
+ mimetype?: string;
+ };
+ file?: string;
+ url?: string;
+}
+
+interface IThumbnail {
+ info: {
+ thumbnail_info: {
+ w: number;
+ h: number;
+ mimetype: string;
+ size: number;
+ };
+ w: number;
+ h: number;
+ };
+ thumbnail: Blob;
+}
+
+interface IAbortablePromise extends Promise {
+ abort(): void;
+}
+
/**
* Create a thumbnail for a image DOM element.
* The image will be smaller than MAX_WIDTH and MAX_HEIGHT.
@@ -51,13 +98,13 @@ export class UploadCanceledError extends Error {}
* about the original image and the thumbnail.
*
* @param {HTMLElement} element The element to thumbnail.
- * @param {integer} inputWidth The width of the image in the input element.
- * @param {integer} inputHeight the width of the image in the input element.
+ * @param {number} inputWidth The width of the image in the input element.
+ * @param {number} inputHeight the width of the image in the input element.
* @param {String} mimeType The mimeType to save the blob as.
* @return {Promise} A promise that resolves with an object with an info key
* and a thumbnail key.
*/
-function createThumbnail(element, inputWidth, inputHeight, mimeType) {
+function createThumbnail(element: ThumbnailableElement, inputWidth: number, inputHeight: number, mimeType: string): Promise {
return new Promise((resolve) => {
let targetWidth = inputWidth;
let targetHeight = inputHeight;
@@ -98,7 +145,7 @@ function createThumbnail(element, inputWidth, inputHeight, mimeType) {
* @param {File} imageFile The file to load in an image element.
* @return {Promise} A promise that resolves with the html image element.
*/
-async function loadImageElement(imageFile) {
+async function loadImageElement(imageFile: File) {
// Load the file into an html element
const img = document.createElement("img");
const objectUrl = URL.createObjectURL(imageFile);
@@ -128,8 +175,7 @@ async function loadImageElement(imageFile) {
for (const chunk of chunks) {
if (chunk.name === 'pHYs') {
if (chunk.data.byteLength !== PHYS_HIDPI.length) return;
- const hidpi = chunk.data.every((val, i) => val === PHYS_HIDPI[i]);
- return hidpi;
+ return chunk.data.every((val, i) => val === PHYS_HIDPI[i]);
}
}
return false;
@@ -152,7 +198,7 @@ async function loadImageElement(imageFile) {
*/
function infoForImageFile(matrixClient, roomId, imageFile) {
let thumbnailType = "image/png";
- if (imageFile.type == "image/jpeg") {
+ if (imageFile.type === "image/jpeg") {
thumbnailType = "image/jpeg";
}
@@ -175,15 +221,15 @@ function infoForImageFile(matrixClient, roomId, imageFile) {
* @param {File} videoFile The file to load in an video element.
* @return {Promise} A promise that resolves with the video image element.
*/
-function loadVideoElement(videoFile) {
+function loadVideoElement(videoFile): Promise {
return new Promise((resolve, reject) => {
// Load the file into an html element
const video = document.createElement("video");
const reader = new FileReader();
- reader.onload = function(e) {
- video.src = e.target.result;
+ reader.onload = function(ev) {
+ video.src = ev.target.result as string;
// Once ready, returns its size
// Wait until we have enough data to thumbnail the first frame.
@@ -231,11 +277,11 @@ function infoForVideoFile(matrixClient, roomId, videoFile) {
* @return {Promise} A promise that resolves with an ArrayBuffer when the file
* is read.
*/
-function readFileAsArrayBuffer(file) {
+function readFileAsArrayBuffer(file: File | Blob): Promise {
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onload = function(e) {
- resolve(e.target.result);
+ resolve(e.target.result as ArrayBuffer);
};
reader.onerror = function(e) {
reject(e);
@@ -257,11 +303,11 @@ function readFileAsArrayBuffer(file) {
* If the file is unencrypted then the object will have a "url" key.
* If the file is encrypted then the object will have a "file" key.
*/
-function uploadFile(matrixClient, roomId, file, progressHandler) {
+function uploadFile(matrixClient: MatrixClient, roomId: string, file: File | Blob, progressHandler?: any) {
+ let canceled = false;
if (matrixClient.isRoomEncrypted(roomId)) {
// If the room is encrypted then encrypt the file before uploading it.
// First read the file into memory.
- let canceled = false;
let uploadPromise;
let encryptInfo;
const prom = readFileAsArrayBuffer(file).then(function(data) {
@@ -278,9 +324,9 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
progressHandler: progressHandler,
includeFilename: false,
});
-
return uploadPromise;
}).then(function(url) {
+ if (canceled) throw new UploadCanceledError();
// If the attachment is encrypted then bundle the URL along
// with the information needed to decrypt the attachment and
// add it under a file key.
@@ -290,7 +336,7 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
}
return {"file": encryptInfo};
});
- prom.abort = () => {
+ (prom as IAbortablePromise).abort = () => {
canceled = true;
if (uploadPromise) MatrixClientPeg.get().cancelUpload(uploadPromise);
};
@@ -300,55 +346,23 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
progressHandler: progressHandler,
});
const promise1 = basePromise.then(function(url) {
+ if (canceled) throw new UploadCanceledError();
// If the attachment isn't encrypted then include the URL directly.
return {"url": url};
});
- // XXX: copy over the abort method to the new promise
- promise1.abort = basePromise.abort;
+ promise1.abort = () => {
+ canceled = true;
+ MatrixClientPeg.get().cancelUpload(basePromise);
+ };
return promise1;
}
}
export default class ContentMessages {
- constructor() {
- this.inprogress = [];
- this.nextId = 0;
- this._mediaConfig = null;
- }
+ private inprogress: IUpload[] = [];
+ private mediaConfig: IMediaConfig = null;
- static sharedInstance() {
- if (global.mx_ContentMessages === undefined) {
- global.mx_ContentMessages = new ContentMessages();
- }
- return global.mx_ContentMessages;
- }
-
- _isFileSizeAcceptable(file) {
- if (this._mediaConfig !== null &&
- this._mediaConfig["m.upload.size"] !== undefined &&
- file.size > this._mediaConfig["m.upload.size"]) {
- return false;
- }
- return true;
- }
-
- _ensureMediaConfigFetched() {
- if (this._mediaConfig !== null) return;
-
- console.log("[Media Config] Fetching");
- return MatrixClientPeg.get().getMediaConfig().then((config) => {
- console.log("[Media Config] Fetched config:", config);
- return config;
- }).catch(() => {
- // Media repo can't or won't report limits, so provide an empty object (no limits).
- console.log("[Media Config] Could not fetch config, so not limiting uploads.");
- return {};
- }).then((config) => {
- this._mediaConfig = config;
- });
- }
-
- sendStickerContentToRoom(url, roomId, info, text, matrixClient) {
+ sendStickerContentToRoom(url: string, roomId: string, info: string, text: string, matrixClient: MatrixClient) {
return MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
throw e;
@@ -356,14 +370,14 @@ export default class ContentMessages {
}
getUploadLimit() {
- if (this._mediaConfig !== null && this._mediaConfig["m.upload.size"] !== undefined) {
- return this._mediaConfig["m.upload.size"];
+ if (this.mediaConfig !== null && this.mediaConfig["m.upload.size"] !== undefined) {
+ return this.mediaConfig["m.upload.size"];
} else {
return null;
}
}
- async sendContentListToRoom(files, roomId, matrixClient) {
+ async sendContentListToRoom(files: File[], roomId: string, matrixClient: MatrixClient) {
if (matrixClient.isGuest()) {
dis.dispatch({action: 'require_registration'});
return;
@@ -372,32 +386,32 @@ export default class ContentMessages {
const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
if (isQuoting) {
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
- const shouldUpload = await new Promise((resolve) => {
- Modal.createTrackedDialog('Upload Reply Warning', '', QuestionDialog, {
- title: _t('Replying With Files'),
- description: (
- {_t(
- 'At this time it is not possible to reply with a file. ' +
- 'Would you like to upload this file without replying?',
- )}
- ),
- hasCancelButton: true,
- button: _t("Continue"),
- onFinished: (shouldUpload) => {
- resolve(shouldUpload);
- },
- });
+ const {finished} = Modal.createTrackedDialog<[boolean]>('Upload Reply Warning', '', QuestionDialog, {
+ title: _t('Replying With Files'),
+ description: (
+ {_t(
+ 'At this time it is not possible to reply with a file. ' +
+ 'Would you like to upload this file without replying?',
+ )}
+ ),
+ hasCancelButton: true,
+ button: _t("Continue"),
});
+ const [shouldUpload] = await finished;
if (!shouldUpload) return;
}
- await this._ensureMediaConfigFetched();
+ if (!this.mediaConfig) { // hot-path optimization to not flash a spinner if we don't need to
+ const modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
+ await this.ensureMediaConfigFetched();
+ modal.close();
+ }
const tooBigFiles = [];
const okFiles = [];
for (let i = 0; i < files.length; ++i) {
- if (this._isFileSizeAcceptable(files[i])) {
+ if (this.isFileSizeAcceptable(files[i])) {
okFiles.push(files[i]);
} else {
tooBigFiles.push(files[i]);
@@ -406,17 +420,12 @@ export default class ContentMessages {
if (tooBigFiles.length > 0) {
const UploadFailureDialog = sdk.getComponent("dialogs.UploadFailureDialog");
- const uploadFailureDialogPromise = new Promise((resolve) => {
- Modal.createTrackedDialog('Upload Failure', '', UploadFailureDialog, {
- badFiles: tooBigFiles,
- totalFiles: files.length,
- contentMessages: this,
- onFinished: (shouldContinue) => {
- resolve(shouldContinue);
- },
- });
+ const {finished} = Modal.createTrackedDialog<[boolean]>('Upload Failure', '', UploadFailureDialog, {
+ badFiles: tooBigFiles,
+ totalFiles: files.length,
+ contentMessages: this,
});
- const shouldContinue = await uploadFailureDialogPromise;
+ const [shouldContinue] = await finished;
if (!shouldContinue) return;
}
@@ -428,31 +437,47 @@ export default class ContentMessages {
for (let i = 0; i < okFiles.length; ++i) {
const file = okFiles[i];
if (!uploadAll) {
- const shouldContinue = await new Promise((resolve) => {
- Modal.createTrackedDialog('Upload Files confirmation', '', UploadConfirmDialog, {
- file,
- currentIndex: i,
- totalFiles: okFiles.length,
- onFinished: (shouldContinue, shouldUploadAll) => {
- if (shouldUploadAll) {
- uploadAll = true;
- }
- resolve(shouldContinue);
- },
- });
+ const {finished} = Modal.createTrackedDialog<[boolean, boolean]>('Upload Files confirmation', '', UploadConfirmDialog, {
+ file,
+ currentIndex: i,
+ totalFiles: okFiles.length,
});
+ const [shouldContinue, shouldUploadAll] = await finished;
if (!shouldContinue) break;
+ if (shouldUploadAll) {
+ uploadAll = true;
+ }
}
- promBefore = this._sendContentToRoom(file, roomId, matrixClient, promBefore);
+ promBefore = this.sendContentToRoom(file, roomId, matrixClient, promBefore);
}
}
- _sendContentToRoom(file, roomId, matrixClient, promBefore) {
- const content = {
+ getCurrentUploads() {
+ return this.inprogress.filter(u => !u.canceled);
+ }
+
+ cancelUpload(promise: Promise) {
+ let upload: IUpload;
+ for (let i = 0; i < this.inprogress.length; ++i) {
+ if (this.inprogress[i].promise === promise) {
+ upload = this.inprogress[i];
+ break;
+ }
+ }
+ if (upload) {
+ upload.canceled = true;
+ MatrixClientPeg.get().cancelUpload(upload.promise);
+ dis.dispatch({action: 'upload_canceled', upload});
+ }
+ }
+
+ private sendContentToRoom(file: File, roomId: string, matrixClient: MatrixClient, promBefore: Promise) {
+ const content: IContent = {
body: file.name || 'Attachment',
info: {
size: file.size,
},
+ msgtype: "", // set later
};
// if we have a mime type for the file, add it to the message metadata
@@ -461,25 +486,25 @@ export default class ContentMessages {
}
const prom = new Promise((resolve) => {
- if (file.type.indexOf('image/') == 0) {
+ if (file.type.indexOf('image/') === 0) {
content.msgtype = 'm.image';
- infoForImageFile(matrixClient, roomId, file).then((imageInfo)=>{
+ infoForImageFile(matrixClient, roomId, file).then((imageInfo) => {
extend(content.info, imageInfo);
resolve();
- }, (error)=>{
- console.error(error);
+ }, (e) => {
+ console.error(e);
content.msgtype = 'm.file';
resolve();
});
- } else if (file.type.indexOf('audio/') == 0) {
+ } else if (file.type.indexOf('audio/') === 0) {
content.msgtype = 'm.audio';
resolve();
- } else if (file.type.indexOf('video/') == 0) {
+ } else if (file.type.indexOf('video/') === 0) {
content.msgtype = 'm.video';
- infoForVideoFile(matrixClient, roomId, file).then((videoInfo)=>{
+ infoForVideoFile(matrixClient, roomId, file).then((videoInfo) => {
extend(content.info, videoInfo);
resolve();
- }, (error)=>{
+ }, (e) => {
content.msgtype = 'm.file';
resolve();
});
@@ -489,19 +514,23 @@ export default class ContentMessages {
}
});
- const upload = {
+ // create temporary abort handler for before the actual upload gets passed off to js-sdk
+ (prom as IAbortablePromise).abort = () => {
+ upload.canceled = true;
+ };
+
+ const upload: IUpload = {
fileName: file.name || 'Attachment',
roomId: roomId,
- total: 0,
+ total: file.size,
loaded: 0,
+ promise: prom,
};
this.inprogress.push(upload);
dis.dispatch({action: 'upload_started'});
// Focus the composer view
- dis.dispatch({action: 'focus_composer'});
-
- let error;
+ dis.fire(Action.FocusComposer);
function onProgress(ev) {
upload.total = ev.total;
@@ -509,7 +538,9 @@ export default class ContentMessages {
dis.dispatch({action: 'upload_progress', upload: upload});
}
+ let error;
return prom.then(function() {
+ if (upload.canceled) throw new UploadCanceledError();
// XXX: upload.promise must be the promise that
// is returned by uploadFile as it has an abort()
// method hacked onto it.
@@ -520,16 +551,17 @@ export default class ContentMessages {
content.file = result.file;
content.url = result.url;
});
- }).then((url) => {
+ }).then(() => {
// Await previous message being sent into the room
return promBefore;
}).then(function() {
+ if (upload.canceled) throw new UploadCanceledError();
return matrixClient.sendMessage(roomId, content);
}, function(err) {
error = err;
if (!upload.canceled) {
let desc = _t("The file '%(fileName)s' failed to upload.", {fileName: upload.fileName});
- if (err.http_status == 413) {
+ if (err.http_status === 413) {
desc = _t(
"The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
{fileName: upload.fileName},
@@ -542,11 +574,9 @@ export default class ContentMessages {
});
}
}).finally(() => {
- const inprogressKeys = Object.keys(this.inprogress);
for (let i = 0; i < this.inprogress.length; ++i) {
- const k = inprogressKeys[i];
- if (this.inprogress[k].promise === upload.promise) {
- this.inprogress.splice(k, 1);
+ if (this.inprogress[i].promise === upload.promise) {
+ this.inprogress.splice(i, 1);
break;
}
}
@@ -555,7 +585,7 @@ export default class ContentMessages {
// clear the media size limit so we fetch it again next time
// we try to upload
if (error && error.http_status === 413) {
- this._mediaConfig = null;
+ this.mediaConfig = null;
}
dis.dispatch({action: 'upload_failed', upload, error});
} else {
@@ -565,24 +595,35 @@ export default class ContentMessages {
});
}
- getCurrentUploads() {
- return this.inprogress.filter(u => !u.canceled);
+ private isFileSizeAcceptable(file: File) {
+ if (this.mediaConfig !== null &&
+ this.mediaConfig["m.upload.size"] !== undefined &&
+ file.size > this.mediaConfig["m.upload.size"]) {
+ return false;
+ }
+ return true;
}
- cancelUpload(promise) {
- const inprogressKeys = Object.keys(this.inprogress);
- let upload;
- for (let i = 0; i < this.inprogress.length; ++i) {
- const k = inprogressKeys[i];
- if (this.inprogress[k].promise === promise) {
- upload = this.inprogress[k];
- break;
- }
- }
- if (upload) {
- upload.canceled = true;
- MatrixClientPeg.get().cancelUpload(upload.promise);
- dis.dispatch({action: 'upload_canceled', upload});
+ private ensureMediaConfigFetched() {
+ if (this.mediaConfig !== null) return;
+
+ console.log("[Media Config] Fetching");
+ return MatrixClientPeg.get().getMediaConfig().then((config) => {
+ console.log("[Media Config] Fetched config:", config);
+ return config;
+ }).catch(() => {
+ // Media repo can't or won't report limits, so provide an empty object (no limits).
+ console.log("[Media Config] Could not fetch config, so not limiting uploads.");
+ return {};
+ }).then((config) => {
+ this.mediaConfig = config;
+ });
+ }
+
+ static sharedInstance() {
+ if (window.mxContentMessages === undefined) {
+ window.mxContentMessages = new ContentMessages();
}
+ return window.mxContentMessages;
}
}
diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index da7c0673d2..a584a69d35 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -20,7 +20,6 @@ import {MatrixClientPeg} from './MatrixClientPeg';
import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
import { _t } from './languageHandler';
-import SettingsStore from './settings/SettingsStore';
import {encodeBase64} from "matrix-js-sdk/src/crypto/olmlib";
// This stores the secret storage private keys in memory for the JS SDK. This is
@@ -32,10 +31,7 @@ let secretStorageKeys = {};
let secretStorageBeingAccessed = false;
function isCachingAllowed() {
- return (
- secretStorageBeingAccessed ||
- SettingsStore.getValue("keepSecretStoragePassphraseForSession")
- );
+ return secretStorageBeingAccessed;
}
export class AccessCancelledError extends Error {
@@ -44,25 +40,16 @@ export class AccessCancelledError extends Error {
}
}
-async function confirmToDismiss(name) {
- let description;
- if (name === "m.cross_signing.user_signing") {
- description = _t("If you cancel now, you won't complete verifying the other user.");
- } else if (name === "m.cross_signing.self_signing") {
- description = _t("If you cancel now, you won't complete verifying your other session.");
- } else {
- description = _t("If you cancel now, you won't complete your secret storage operation.");
- }
-
+async function confirmToDismiss() {
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
const [sure] = await Modal.createDialog(QuestionDialog, {
title: _t("Cancel entering passphrase?"),
- description,
- danger: true,
- cancelButton: _t("Enter passphrase"),
- button: _t("Cancel"),
+ description: _t("Are you sure you want to cancel entering passphrase?"),
+ danger: false,
+ button: _t("Go Back"),
+ cancelButton: _t("Cancel"),
}).finished;
- return sure;
+ return !sure;
}
async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
@@ -96,11 +83,8 @@ async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
{
keyInfo: info,
checkPrivateKey: async (input) => {
- if (!info.pubkey) {
- return true;
- }
const key = await inputToKey(input);
- return MatrixClientPeg.get().checkSecretStoragePrivateKey(key, info.pubkey);
+ return await MatrixClientPeg.get().checkSecretStorageKey(key, info);
},
},
/* className= */ null,
@@ -109,7 +93,7 @@ async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
/* options= */ {
onBeforeClose: async (reason) => {
if (reason === "backgroundClick") {
- return confirmToDismiss(ssssItemName);
+ return confirmToDismiss();
}
return true;
},
@@ -188,7 +172,7 @@ export async function promptForBackupPassphrase() {
const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
const { finished } = Modal.createTrackedDialog('Restore Backup', '', RestoreKeyBackupDialog, {
- showSummary: false, keyCallback: k => key = k,
+ showSummary: false, keyCallback: k => key = k,
}, null, /* priority = */ false, /* static = */ true);
const success = await finished;
diff --git a/src/DeviceListener.js b/src/DeviceListener.js
deleted file mode 100644
index f8555c7602..0000000000
--- a/src/DeviceListener.js
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { MatrixClientPeg } from './MatrixClientPeg';
-import SettingsStore from './settings/SettingsStore';
-import * as sdk from './index';
-import { _t } from './languageHandler';
-import ToastStore from './stores/ToastStore';
-
-function toastKey(deviceId) {
- return 'unverified_session_' + deviceId;
-}
-
-const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
-const THIS_DEVICE_TOAST_KEY = 'setupencryption';
-
-export default class DeviceListener {
- static sharedInstance() {
- if (!global.mx_DeviceListener) global.mx_DeviceListener = new DeviceListener();
- return global.mx_DeviceListener;
- }
-
- constructor() {
- // set of device IDs we're currently showing toasts for
- this._activeNagToasts = new Set();
- // device IDs for which the user has dismissed the verify toast ('Later')
- this._dismissed = new Set();
- // has the user dismissed any of the various nag toasts to setup encryption on this device?
- this._dismissedThisDeviceToast = false;
-
- // cache of the key backup info
- this._keyBackupInfo = null;
- this._keyBackupFetchedAt = null;
- }
-
- start() {
- MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
- MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
- MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
- MatrixClientPeg.get().on('accountData', this._onAccountData);
- this._recheck();
- }
-
- stop() {
- if (MatrixClientPeg.get()) {
- MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
- MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
- MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
- MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
- }
- this._dismissed.clear();
- }
-
- dismissVerification(deviceId) {
- this._dismissed.add(deviceId);
- this._recheck();
- }
-
- dismissEncryptionSetup() {
- this._dismissedThisDeviceToast = true;
- this._recheck();
- }
-
- _onDevicesUpdated = (users) => {
- if (!users.includes(MatrixClientPeg.get().getUserId())) return;
- this._recheck();
- }
-
- _onDeviceVerificationChanged = (userId) => {
- if (userId !== MatrixClientPeg.get().getUserId()) return;
- this._recheck();
- }
-
- _onUserTrustStatusChanged = (userId, trustLevel) => {
- if (userId !== MatrixClientPeg.get().getUserId()) return;
- this._recheck();
- }
-
- _onAccountData = (ev) => {
- // User may have migrated SSSS to symmetric, in which case we can dismiss that toast
- if (ev.getType().startsWith('m.secret_storage.key.')) {
- this._recheck();
- }
- }
-
- // The server doesn't tell us when key backup is set up, so we poll
- // & cache the result
- async _getKeyBackupInfo() {
- const now = (new Date()).getTime();
- if (!this._keyBackupInfo || this._keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) {
- this._keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
- this._keyBackupFetchedAt = now;
- }
- return this._keyBackupInfo;
- }
-
- async _recheck() {
- const cli = MatrixClientPeg.get();
-
- if (
- !SettingsStore.isFeatureEnabled("feature_cross_signing") ||
- !await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
- ) return;
-
- if (!cli.isCryptoEnabled()) return;
-
- const crossSigningReady = await cli.isCrossSigningReady();
-
- if (this._dismissedThisDeviceToast) {
- ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
- } else {
- if (!crossSigningReady) {
- // cross signing isn't enabled - nag to enable it
- // There are 3 different toasts for:
- if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
- // Cross-signing on account but this device doesn't trust the master key (verify this session)
- ToastStore.sharedInstance().addOrReplaceToast({
- key: THIS_DEVICE_TOAST_KEY,
- title: _t("Verify this session"),
- icon: "verification_warning",
- props: {kind: 'verify_this_session'},
- component: sdk.getComponent("toasts.SetupEncryptionToast"),
- });
- } else {
- const backupInfo = await this._getKeyBackupInfo();
- if (backupInfo) {
- // No cross-signing on account but key backup available (upgrade encryption)
- ToastStore.sharedInstance().addOrReplaceToast({
- key: THIS_DEVICE_TOAST_KEY,
- title: _t("Encryption upgrade available"),
- icon: "verification_warning",
- props: {kind: 'upgrade_encryption'},
- component: sdk.getComponent("toasts.SetupEncryptionToast"),
- });
- } else {
- // No cross-signing or key backup on account (set up encryption)
- ToastStore.sharedInstance().addOrReplaceToast({
- key: THIS_DEVICE_TOAST_KEY,
- title: _t("Set up encryption"),
- icon: "verification_warning",
- props: {kind: 'set_up_encryption'},
- component: sdk.getComponent("toasts.SetupEncryptionToast"),
- });
- }
- }
- return;
- } else if (await cli.secretStorageKeyNeedsUpgrade()) {
- ToastStore.sharedInstance().addOrReplaceToast({
- key: THIS_DEVICE_TOAST_KEY,
- title: _t("Encryption upgrade available"),
- icon: "verification_warning",
- props: {kind: 'upgrade_ssss'},
- component: sdk.getComponent("toasts.SetupEncryptionToast"),
- });
- }
- }
-
- // as long as cross-signing isn't ready,
- // you can't see or dismiss any device toasts
- if (crossSigningReady) {
- const newActiveToasts = new Set();
-
- const devices = await cli.getStoredDevicesForUser(cli.getUserId());
- for (const device of devices) {
- if (device.deviceId == cli.deviceId) continue;
-
- const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
- if (deviceTrust.isCrossSigningVerified() || this._dismissed.has(device.deviceId)) {
- ToastStore.sharedInstance().dismissToast(toastKey(device.deviceId));
- } else {
- this._activeNagToasts.add(device.deviceId);
- ToastStore.sharedInstance().addOrReplaceToast({
- key: toastKey(device.deviceId),
- title: _t("Unverified login. Was this you?"),
- icon: "verification_warning",
- props: { device },
- component: sdk.getComponent("toasts.UnverifiedSessionToast"),
- });
- newActiveToasts.add(device.deviceId);
- }
- }
-
- // clear any other outstanding toasts (eg. logged out devices)
- for (const deviceId of this._activeNagToasts) {
- if (!newActiveToasts.has(deviceId)) ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
- }
- this._activeNagToasts = newActiveToasts;
- }
- }
-}
diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
new file mode 100644
index 0000000000..a37521118f
--- /dev/null
+++ b/src/DeviceListener.ts
@@ -0,0 +1,266 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {MatrixClientPeg} from './MatrixClientPeg';
+import {
+ hideToast as hideBulkUnverifiedSessionsToast,
+ showToast as showBulkUnverifiedSessionsToast,
+} from "./toasts/BulkUnverifiedSessionsToast";
+import {
+ hideToast as hideSetupEncryptionToast,
+ Kind as SetupKind,
+ showToast as showSetupEncryptionToast,
+} from "./toasts/SetupEncryptionToast";
+import {
+ hideToast as hideUnverifiedSessionsToast,
+ showToast as showUnverifiedSessionsToast,
+} from "./toasts/UnverifiedSessionToast";
+import {privateShouldBeEncrypted} from "./createRoom";
+
+const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
+
+export default class DeviceListener {
+ // device IDs for which the user has dismissed the verify toast ('Later')
+ private dismissed = new Set();
+ // has the user dismissed any of the various nag toasts to setup encryption on this device?
+ private dismissedThisDeviceToast = false;
+ // cache of the key backup info
+ private keyBackupInfo: object = null;
+ private keyBackupFetchedAt: number = null;
+ // We keep a list of our own device IDs so we can batch ones that were already
+ // there the last time the app launched into a single toast, but display new
+ // ones in their own toasts.
+ private ourDeviceIdsAtStart: Set = null;
+ // The set of device IDs we're currently displaying toasts for
+ private displayingToastsForDeviceIds = new Set();
+
+ static sharedInstance() {
+ if (!window.mxDeviceListener) window.mxDeviceListener = new DeviceListener();
+ return window.mxDeviceListener;
+ }
+
+ start() {
+ MatrixClientPeg.get().on('crypto.willUpdateDevices', this._onWillUpdateDevices);
+ MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
+ MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
+ MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
+ MatrixClientPeg.get().on('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
+ MatrixClientPeg.get().on('accountData', this._onAccountData);
+ MatrixClientPeg.get().on('sync', this._onSync);
+ this._recheck();
+ }
+
+ stop() {
+ if (MatrixClientPeg.get()) {
+ MatrixClientPeg.get().removeListener('crypto.willUpdateDevices', this._onWillUpdateDevices);
+ MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
+ MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
+ MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
+ MatrixClientPeg.get().removeListener('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
+ MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
+ MatrixClientPeg.get().removeListener('sync', this._onSync);
+ }
+ this.dismissed.clear();
+ this.dismissedThisDeviceToast = false;
+ this.keyBackupInfo = null;
+ this.keyBackupFetchedAt = null;
+ this.ourDeviceIdsAtStart = null;
+ this.displayingToastsForDeviceIds = new Set();
+ }
+
+ /**
+ * Dismiss notifications about our own unverified devices
+ *
+ * @param {String[]} deviceIds List of device IDs to dismiss notifications for
+ */
+ async dismissUnverifiedSessions(deviceIds: Iterable) {
+ for (const d of deviceIds) {
+ this.dismissed.add(d);
+ }
+
+ this._recheck();
+ }
+
+ dismissEncryptionSetup() {
+ this.dismissedThisDeviceToast = true;
+ this._recheck();
+ }
+
+ _ensureDeviceIdsAtStartPopulated() {
+ if (this.ourDeviceIdsAtStart === null) {
+ const cli = MatrixClientPeg.get();
+ this.ourDeviceIdsAtStart = new Set(
+ cli.getStoredDevicesForUser(cli.getUserId()).map(d => d.deviceId),
+ );
+ }
+ }
+
+ _onWillUpdateDevices = async (users: string[], initialFetch?: boolean) => {
+ // If we didn't know about *any* devices before (ie. it's fresh login),
+ // then they are all pre-existing devices, so ignore this and set the
+ // devicesAtStart list to the devices that we see after the fetch.
+ if (initialFetch) return;
+
+ const myUserId = MatrixClientPeg.get().getUserId();
+ if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
+
+ // No need to do a recheck here: we just need to get a snapshot of our devices
+ // before we download any new ones.
+ };
+
+ _onDevicesUpdated = (users: string[]) => {
+ if (!users.includes(MatrixClientPeg.get().getUserId())) return;
+ this._recheck();
+ };
+
+ _onDeviceVerificationChanged = (userId: string) => {
+ if (userId !== MatrixClientPeg.get().getUserId()) return;
+ this._recheck();
+ };
+
+ _onUserTrustStatusChanged = (userId: string) => {
+ if (userId !== MatrixClientPeg.get().getUserId()) return;
+ this._recheck();
+ };
+
+ _onCrossSingingKeysChanged = () => {
+ this._recheck();
+ };
+
+ _onAccountData = (ev) => {
+ // User may have:
+ // * migrated SSSS to symmetric
+ // * uploaded keys to secret storage
+ // * completed secret storage creation
+ // which result in account data changes affecting checks below.
+ if (
+ ev.getType().startsWith('m.secret_storage.') ||
+ ev.getType().startsWith('m.cross_signing.')
+ ) {
+ this._recheck();
+ }
+ };
+
+ _onSync = (state, prevState) => {
+ if (state === 'PREPARED' && prevState === null) this._recheck();
+ };
+
+ // The server doesn't tell us when key backup is set up, so we poll
+ // & cache the result
+ async _getKeyBackupInfo() {
+ const now = (new Date()).getTime();
+ if (!this.keyBackupInfo || this.keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) {
+ this.keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+ this.keyBackupFetchedAt = now;
+ }
+ return this.keyBackupInfo;
+ }
+
+ private shouldShowSetupEncryptionToast() {
+ // In a default configuration, show the toasts. If the well-known config causes e2ee default to be false
+ // then do not show the toasts until user is in at least one encrypted room.
+ if (privateShouldBeEncrypted()) return true;
+ const cli = MatrixClientPeg.get();
+ return cli && cli.getRooms().some(r => cli.isRoomEncrypted(r.roomId));
+ }
+
+ async _recheck() {
+ const cli = MatrixClientPeg.get();
+
+ if (!await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) return;
+
+ if (!cli.isCryptoEnabled()) return;
+ // don't recheck until the initial sync is complete: lots of account data events will fire
+ // while the initial sync is processing and we don't need to recheck on each one of them
+ // (we add a listener on sync to do once check after the initial sync is done)
+ if (!cli.isInitialSyncComplete()) return;
+
+ const crossSigningReady = await cli.isCrossSigningReady();
+
+ if (this.dismissedThisDeviceToast || crossSigningReady) {
+ hideSetupEncryptionToast();
+ } else if (this.shouldShowSetupEncryptionToast()) {
+ // make sure our keys are finished downloading
+ await cli.downloadKeys([cli.getUserId()]);
+ // cross signing isn't enabled - nag to enable it
+ // There are 3 different toasts for:
+ if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
+ // Cross-signing on account but this device doesn't trust the master key (verify this session)
+ showSetupEncryptionToast(SetupKind.VERIFY_THIS_SESSION);
+ } else {
+ const backupInfo = await this._getKeyBackupInfo();
+ if (backupInfo) {
+ // No cross-signing on account but key backup available (upgrade encryption)
+ showSetupEncryptionToast(SetupKind.UPGRADE_ENCRYPTION);
+ } else {
+ // No cross-signing or key backup on account (set up encryption)
+ showSetupEncryptionToast(SetupKind.SET_UP_ENCRYPTION);
+ }
+ }
+ }
+
+ // This needs to be done after awaiting on downloadKeys() above, so
+ // we make sure we get the devices after the fetch is done.
+ this._ensureDeviceIdsAtStartPopulated();
+
+ // Unverified devices that were there last time the app ran
+ // (technically could just be a boolean: we don't actually
+ // need to remember the device IDs, but for the sake of
+ // symmetry...).
+ const oldUnverifiedDeviceIds = new Set();
+ // Unverified devices that have appeared since then
+ const newUnverifiedDeviceIds = new Set();
+
+ // as long as cross-signing isn't ready,
+ // you can't see or dismiss any device toasts
+ if (crossSigningReady) {
+ const devices = cli.getStoredDevicesForUser(cli.getUserId());
+ for (const device of devices) {
+ if (device.deviceId === cli.deviceId) continue;
+
+ const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
+ if (!deviceTrust.isCrossSigningVerified() && !this.dismissed.has(device.deviceId)) {
+ if (this.ourDeviceIdsAtStart.has(device.deviceId)) {
+ oldUnverifiedDeviceIds.add(device.deviceId);
+ } else {
+ newUnverifiedDeviceIds.add(device.deviceId);
+ }
+ }
+ }
+ }
+
+ // Display or hide the batch toast for old unverified sessions
+ if (oldUnverifiedDeviceIds.size > 0) {
+ showBulkUnverifiedSessionsToast(oldUnverifiedDeviceIds);
+ } else {
+ hideBulkUnverifiedSessionsToast();
+ }
+
+ // Show toasts for new unverified devices if they aren't already there
+ for (const deviceId of newUnverifiedDeviceIds) {
+ showUnverifiedSessionsToast(deviceId);
+ }
+
+ // ...and hide any we don't need any more
+ for (const deviceId of this.displayingToastsForDeviceIds) {
+ if (!newUnverifiedDeviceIds.has(deviceId)) {
+ hideUnverifiedSessionsToast(deviceId);
+ }
+ }
+
+ this.displayingToastsForDeviceIds = newUnverifiedDeviceIds;
+ }
+}
diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index ea76c85643..1b4aa19ebf 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -17,15 +17,15 @@ limitations under the License.
*/
import URL from 'url';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
import WidgetMessagingEndpoint from './WidgetMessagingEndpoint';
import ActiveWidgetStore from './stores/ActiveWidgetStore';
import {MatrixClientPeg} from "./MatrixClientPeg";
import RoomViewStore from "./stores/RoomViewStore";
import {IntegrationManagers} from "./integrations/IntegrationManagers";
import SettingsStore from "./settings/SettingsStore";
-import {Capability, KnownWidgetActions} from "./widgets/WidgetApi";
-import SdkConfig from "./SdkConfig";
+import {Capability} from "./widgets/WidgetApi";
+import {objectClone} from "./utils/objects";
const WIDGET_API_VERSION = '0.0.2'; // Current API version
const SUPPORTED_WIDGET_API_VERSIONS = [
@@ -101,7 +101,7 @@ export default class FromWidgetPostMessageApi {
console.warn('Add FromWidgetPostMessageApi - Endpoint already registered');
return;
} else {
- console.warn(`Adding fromWidget messaging endpoint for ${widgetId}`, endpoint);
+ console.log(`Adding fromWidget messaging endpoint for ${widgetId}`, endpoint);
this.widgetMessagingEndpoints.push(endpoint);
}
}
@@ -166,7 +166,7 @@ export default class FromWidgetPostMessageApi {
const action = event.data.action;
const widgetId = event.data.widgetId;
if (action === 'content_loaded') {
- console.warn('Widget reported content loaded for', widgetId);
+ console.log('Widget reported content loaded for', widgetId);
dis.dispatch({
action: 'widget_content_loaded',
widgetId: widgetId,
@@ -220,13 +220,6 @@ export default class FromWidgetPostMessageApi {
}
} else if (action === 'get_openid') {
// Handled by caller
- } else if (action === KnownWidgetActions.GetRiotWebConfig) {
- if (ActiveWidgetStore.widgetHasCapability(widgetId, Capability.GetRiotWebConfig)) {
- this.sendResponse(event, {
- api: INBOUND_API_NAME,
- config: SdkConfig.get(),
- });
- }
} else {
console.warn('Widget postMessage event unhandled');
this.sendError(event, {message: 'The postMessage was unhandled'});
@@ -255,7 +248,7 @@ export default class FromWidgetPostMessageApi {
* @param {Object} res Response data
*/
sendResponse(event, res) {
- const data = JSON.parse(JSON.stringify(event.data));
+ const data = objectClone(event.data);
data.response = res;
event.source.postMessage(data, event.origin);
}
@@ -268,7 +261,7 @@ export default class FromWidgetPostMessageApi {
*/
sendError(event, msg, nestedError) {
console.error('Action:' + event.data.action + ' failed with message: ' + msg);
- const data = JSON.parse(JSON.stringify(event.data));
+ const data = objectClone(event.data);
data.response = {
error: {
message: msg,
diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 9131a89e5d..e7ae3217bb 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -22,6 +22,7 @@ import { _t } from './languageHandler';
import {MatrixClientPeg} from './MatrixClientPeg';
import GroupStore from './stores/GroupStore';
import {allSettled} from "./utils/promise";
+import StyledCheckbox from './components/views/elements/StyledCheckbox';
export function showGroupInviteDialog(groupId) {
return new Promise((resolve, reject) => {
@@ -61,19 +62,19 @@ export function showGroupAddRoomDialog(groupId) {
{ _t("Which rooms would you like to add to this community?") }
;
- const checkboxContainer = ;
+ const checkboxContainer =
+ { _t("Show these rooms to non-members on the community page and room list?") }
+ ;
const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
Modal.createTrackedDialog('Add Rooms to Group', '', AddressPickerDialog, {
title: _t("Add rooms to the community"),
description: description,
extraNode: checkboxContainer,
- placeholder: _t("Room name or alias"),
+ placeholder: _t("Room name or address"),
button: _t("Add to community"),
pickerType: 'room',
validAddressTypes: ['mx-room-id'],
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.tsx
similarity index 81%
rename from src/HtmlUtils.js
rename to src/HtmlUtils.tsx
index a58ea25c8a..77a9579f2c 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.tsx
@@ -17,10 +17,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
-import ReplyThread from "./components/views/elements/ReplyThread";
-
import React from 'react';
import sanitizeHtml from 'sanitize-html';
import * as linkify from 'linkifyjs';
@@ -28,12 +24,13 @@ import linkifyMatrix from './linkify-matrix';
import _linkifyElement from 'linkifyjs/element';
import _linkifyString from 'linkifyjs/string';
import classNames from 'classnames';
-import {MatrixClientPeg} from './MatrixClientPeg';
+import EMOJIBASE_REGEX from 'emojibase-regex';
import url from 'url';
-import EMOJIBASE_REGEX from 'emojibase-regex';
+import {MatrixClientPeg} from './MatrixClientPeg';
import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
import {SHORTCODE_TO_EMOJI, getEmojiFromUnicode} from "./emoji";
+import ReplyThread from "./components/views/elements/ReplyThread";
linkifyMatrix(linkify);
@@ -64,7 +61,7 @@ const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet'];
* need emojification.
* unicodeToImage uses this function.
*/
-function mightContainEmoji(str) {
+function mightContainEmoji(str: string) {
return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str);
}
@@ -74,7 +71,7 @@ function mightContainEmoji(str) {
* @param {String} char The emoji character
* @return {String} The shortcode (such as :thumbup:)
*/
-export function unicodeToShortcode(char) {
+export function unicodeToShortcode(char: string) {
const data = getEmojiFromUnicode(char);
return (data && data.shortcodes ? `:${data.shortcodes[0]}:` : '');
}
@@ -85,7 +82,7 @@ export function unicodeToShortcode(char) {
* @param {String} shortcode The shortcode (such as :thumbup:)
* @return {String} The emoji character; null if none exists
*/
-export function shortcodeToUnicode(shortcode) {
+export function shortcodeToUnicode(shortcode: string) {
shortcode = shortcode.slice(1, shortcode.length - 1);
const data = SHORTCODE_TO_EMOJI.get(shortcode);
return data ? data.unicode : null;
@@ -100,7 +97,7 @@ export function processHtmlForSending(html: string): string {
}
let contentHTML = "";
- for (let i=0; i < contentDiv.children.length; i++) {
+ for (let i = 0; i < contentDiv.children.length; i++) {
const element = contentDiv.children[i];
if (element.tagName.toLowerCase() === 'p') {
contentHTML += element.innerHTML;
@@ -122,12 +119,19 @@ export function processHtmlForSending(html: string): string {
* Given an untrusted HTML string, return a React node with an sanitized version
* of that HTML.
*/
-export function sanitizedHtmlNode(insaneHtml) {
+export function sanitizedHtmlNode(insaneHtml: string) {
const saneHtml = sanitizeHtml(insaneHtml, sanitizeHtmlParams);
return ;
}
+export function sanitizedHtmlNodeInnerText(insaneHtml: string) {
+ const saneHtml = sanitizeHtml(insaneHtml, sanitizeHtmlParams);
+ const contentDiv = document.createElement("div");
+ contentDiv.innerHTML = saneHtml;
+ return contentDiv.innerText;
+}
+
/**
* Tests if a URL from an untrusted source may be safely put into the DOM
* The biggest threat here is javascript: URIs.
@@ -136,7 +140,7 @@ export function sanitizedHtmlNode(insaneHtml) {
* other places we need to sanitise URLs.
* @return true if permitted, otherwise false
*/
-export function isUrlPermitted(inputUrl) {
+export function isUrlPermitted(inputUrl: string) {
try {
const parsed = url.parse(inputUrl);
if (!parsed.protocol) return false;
@@ -147,9 +151,9 @@ export function isUrlPermitted(inputUrl) {
}
}
-const transformTags = { // custom to matrix
+const transformTags: sanitizeHtml.IOptions["transformTags"] = { // custom to matrix
// add blank targets to all hyperlinks except vector URLs
- 'a': function(tagName, attribs) {
+ 'a': function(tagName: string, attribs: sanitizeHtml.Attributes) {
if (attribs.href) {
attribs.target = '_blank'; // by default
@@ -162,7 +166,7 @@ const transformTags = { // custom to matrix
attribs.rel = 'noreferrer noopener'; // https://mathiasbynens.github.io/rel-noopener/
return { tagName, attribs };
},
- 'img': function(tagName, attribs) {
+ 'img': function(tagName: string, attribs: sanitizeHtml.Attributes) {
// Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
// because transformTags is used _before_ we filter by allowedSchemesByTag and
// we don't want to allow images with `https?` `src`s.
@@ -176,17 +180,17 @@ const transformTags = { // custom to matrix
);
return { tagName, attribs };
},
- 'code': function(tagName, attribs) {
+ 'code': function(tagName: string, attribs: sanitizeHtml.Attributes) {
if (typeof attribs.class !== 'undefined') {
// Filter out all classes other than ones starting with language- for syntax highlighting.
const classes = attribs.class.split(/\s/).filter(function(cl) {
- return cl.startsWith('language-');
+ return cl.startsWith('language-') && !cl.startsWith('language-_');
});
attribs.class = classes.join(' ');
}
return { tagName, attribs };
},
- '*': function(tagName, attribs) {
+ '*': function(tagName: string, attribs: sanitizeHtml.Attributes) {
// Delete any style previously assigned, style is an allowedTag for font and span
// because attributes are stripped after transforming
delete attribs.style;
@@ -220,7 +224,7 @@ const transformTags = { // custom to matrix
},
};
-const sanitizeHtmlParams = {
+const sanitizeHtmlParams: sanitizeHtml.IOptions = {
allowedTags: [
'font', // custom to matrix for IRC-style font coloring
'del', // for markdown
@@ -247,16 +251,16 @@ const sanitizeHtmlParams = {
};
// this is the same as the above except with less rewriting
-const composerSanitizeHtmlParams = Object.assign({}, sanitizeHtmlParams);
-composerSanitizeHtmlParams.transformTags = {
- 'code': transformTags['code'],
- '*': transformTags['*'],
+const composerSanitizeHtmlParams: sanitizeHtml.IOptions = {
+ ...sanitizeHtmlParams,
+ transformTags: {
+ 'code': transformTags['code'],
+ '*': transformTags['*'],
+ },
};
-class BaseHighlighter {
- constructor(highlightClass, highlightLink) {
- this.highlightClass = highlightClass;
- this.highlightLink = highlightLink;
+abstract class BaseHighlighter {
+ constructor(public highlightClass: string, public highlightLink: string) {
}
/**
@@ -270,47 +274,49 @@ class BaseHighlighter {
* returns a list of results (strings for HtmlHighligher, react nodes for
* TextHighlighter).
*/
- applyHighlights(safeSnippet, safeHighlights) {
+ public applyHighlights(safeSnippet: string, safeHighlights: string[]): T[] {
let lastOffset = 0;
let offset;
- let nodes = [];
+ let nodes: T[] = [];
const safeHighlight = safeHighlights[0];
while ((offset = safeSnippet.toLowerCase().indexOf(safeHighlight.toLowerCase(), lastOffset)) >= 0) {
// handle preamble
if (offset > lastOffset) {
- var subSnippet = safeSnippet.substring(lastOffset, offset);
- nodes = nodes.concat(this._applySubHighlights(subSnippet, safeHighlights));
+ const subSnippet = safeSnippet.substring(lastOffset, offset);
+ nodes = nodes.concat(this.applySubHighlights(subSnippet, safeHighlights));
}
// do highlight. use the original string rather than safeHighlight
// to preserve the original casing.
const endOffset = offset + safeHighlight.length;
- nodes.push(this._processSnippet(safeSnippet.substring(offset, endOffset), true));
+ nodes.push(this.processSnippet(safeSnippet.substring(offset, endOffset), true));
lastOffset = endOffset;
}
// handle postamble
if (lastOffset !== safeSnippet.length) {
- subSnippet = safeSnippet.substring(lastOffset, undefined);
- nodes = nodes.concat(this._applySubHighlights(subSnippet, safeHighlights));
+ const subSnippet = safeSnippet.substring(lastOffset, undefined);
+ nodes = nodes.concat(this.applySubHighlights(subSnippet, safeHighlights));
}
return nodes;
}
- _applySubHighlights(safeSnippet, safeHighlights) {
+ private applySubHighlights(safeSnippet: string, safeHighlights: string[]): T[] {
if (safeHighlights[1]) {
// recurse into this range to check for the next set of highlight matches
return this.applyHighlights(safeSnippet, safeHighlights.slice(1));
} else {
// no more highlights to be found, just return the unhighlighted string
- return [this._processSnippet(safeSnippet, false)];
+ return [this.processSnippet(safeSnippet, false)];
}
}
+
+ protected abstract processSnippet(snippet: string, highlight: boolean): T;
}
-class HtmlHighlighter extends BaseHighlighter {
+class HtmlHighlighter extends BaseHighlighter {
/* highlight the given snippet if required
*
* snippet: content of the span; must have been sanitised
@@ -318,28 +324,23 @@ class HtmlHighlighter extends BaseHighlighter {
*
* returns an HTML string
*/
- _processSnippet(snippet, highlight) {
+ protected processSnippet(snippet: string, highlight: boolean): string {
if (!highlight) {
// nothing required here
return snippet;
}
- let span = ""
- + snippet + "";
+ let span = `${snippet}`;
if (this.highlightLink) {
- span = ""
- +span+"";
+ span = `${span}`;
}
return span;
}
}
-class TextHighlighter extends BaseHighlighter {
- constructor(highlightClass, highlightLink) {
- super(highlightClass, highlightLink);
- this._key = 0;
- }
+class TextHighlighter extends BaseHighlighter {
+ private key = 0;
/* create a node to hold the given content
*
@@ -348,13 +349,12 @@ class TextHighlighter extends BaseHighlighter {
*
* returns a React node
*/
- _processSnippet(snippet, highlight) {
- const key = this._key++;
+ protected processSnippet(snippet: string, highlight: boolean): React.ReactNode {
+ const key = this.key++;
- let node =
-
- { snippet }
- ;
+ let node =
+ { snippet }
+ ;
if (highlight && this.highlightLink) {
node = { node };
@@ -364,6 +364,20 @@ class TextHighlighter extends BaseHighlighter {
}
}
+interface IContent {
+ format?: string;
+ formatted_body?: string;
+ body: string;
+}
+
+interface IOpts {
+ highlightLink?: string;
+ disableBigEmoji?: boolean;
+ stripReplyFallback?: boolean;
+ returnString?: boolean;
+ forComposerQuote?: boolean;
+ ref?: React.Ref;
+}
/* turn a matrix event body into html
*
@@ -378,7 +392,7 @@ class TextHighlighter extends BaseHighlighter {
* opts.forComposerQuote: optional param to lessen the url rewriting done by sanitization, for quoting into composer
* opts.ref: React ref to attach to any React components returned (not compatible with opts.returnString)
*/
-export function bodyToHtml(content, highlights, opts={}) {
+export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts = {}) {
const isHtmlMessage = content.format === "org.matrix.custom.html" && content.formatted_body;
let bodyHasEmoji = false;
@@ -387,9 +401,9 @@ export function bodyToHtml(content, highlights, opts={}) {
sanitizeParams = composerSanitizeHtmlParams;
}
- let strippedBody;
- let safeBody;
- let isDisplayedWithHtml;
+ let strippedBody: string;
+ let safeBody: string;
+ let isDisplayedWithHtml: boolean;
// XXX: We sanitize the HTML whilst also highlighting its text nodes, to avoid accidentally trying
// to highlight HTML tags themselves. However, this does mean that we don't highlight textnodes which
// are interrupted by HTML tags (not that we did before) - e.g. foobar won't get highlighted
@@ -446,7 +460,8 @@ export function bodyToHtml(content, highlights, opts={}) {
// their username. Permalinks (links in pills) can be any URL
// now, so we just check for an HTTP-looking thing.
(
- content.formatted_body == undefined ||
+ strippedBody === safeBody || // replies have the html fallbacks, account for that here
+ content.formatted_body === undefined ||
(!content.formatted_body.includes("http:") &&
!content.formatted_body.includes("https:"))
);
@@ -470,7 +485,7 @@ export function bodyToHtml(content, highlights, opts={}) {
* @param {object} [options] Options for linkifyString. Default: linkifyMatrix.options
* @returns {string} Linkified string
*/
-export function linkifyString(str, options = linkifyMatrix.options) {
+export function linkifyString(str: string, options = linkifyMatrix.options) {
return _linkifyString(str, options);
}
@@ -481,7 +496,7 @@ export function linkifyString(str, options = linkifyMatrix.options) {
* @param {object} [options] Options for linkifyElement. Default: linkifyMatrix.options
* @returns {object}
*/
-export function linkifyElement(element, options = linkifyMatrix.options) {
+export function linkifyElement(element: HTMLElement, options = linkifyMatrix.options) {
return _linkifyElement(element, options);
}
@@ -492,7 +507,7 @@ export function linkifyElement(element, options = linkifyMatrix.options) {
* @param {object} [options] Options for linkifyString. Default: linkifyMatrix.options
* @returns {string}
*/
-export function linkifyAndSanitizeHtml(dirtyHtml, options = linkifyMatrix.options) {
+export function linkifyAndSanitizeHtml(dirtyHtml: string, options = linkifyMatrix.options) {
return sanitizeHtml(linkifyString(dirtyHtml, options), sanitizeHtmlParams);
}
@@ -503,7 +518,7 @@ export function linkifyAndSanitizeHtml(dirtyHtml, options = linkifyMatrix.option
* @param {Node} node
* @returns {bool}
*/
-export function checkBlockNode(node) {
+export function checkBlockNode(node: Node) {
switch (node.nodeName) {
case "H1":
case "H2":
diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js
deleted file mode 100644
index 30f3b7d50e..0000000000
--- a/src/KeyRequestHandler.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import * as sdk from './index';
-import Modal from './Modal';
-import SettingsStore from './settings/SettingsStore';
-
-// TODO: We can remove this once cross-signing is the only way.
-// https://github.com/vector-im/riot-web/issues/11908
-export default class KeyRequestHandler {
- constructor(matrixClient) {
- this._matrixClient = matrixClient;
-
- // the user/device for which we currently have a dialog open
- this._currentUser = null;
- this._currentDevice = null;
-
- // userId -> deviceId -> [keyRequest]
- this._pendingKeyRequests = Object.create(null);
- }
-
- handleKeyRequest(keyRequest) {
- // Ignore own device key requests if cross-signing lab enabled
- if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
- return;
- }
-
- const userId = keyRequest.userId;
- const deviceId = keyRequest.deviceId;
- const requestId = keyRequest.requestId;
-
- if (!this._pendingKeyRequests[userId]) {
- this._pendingKeyRequests[userId] = Object.create(null);
- }
- if (!this._pendingKeyRequests[userId][deviceId]) {
- this._pendingKeyRequests[userId][deviceId] = [];
- }
-
- // check if we already have this request
- const requests = this._pendingKeyRequests[userId][deviceId];
- if (requests.find((r) => r.requestId === requestId)) {
- console.log("Already have this key request, ignoring");
- return;
- }
-
- requests.push(keyRequest);
-
- if (this._currentUser) {
- // ignore for now
- console.log("Key request, but we already have a dialog open");
- return;
- }
-
- this._processNextRequest();
- }
-
- handleKeyRequestCancellation(cancellation) {
- // Ignore own device key requests if cross-signing lab enabled
- if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
- return;
- }
-
- // see if we can find the request in the queue
- const userId = cancellation.userId;
- const deviceId = cancellation.deviceId;
- const requestId = cancellation.requestId;
-
- if (userId === this._currentUser && deviceId === this._currentDevice) {
- console.log(
- "room key request cancellation for the user we currently have a"
- + " dialog open for",
- );
- // TODO: update the dialog. For now, we just ignore the
- // cancellation.
- return;
- }
-
- if (!this._pendingKeyRequests[userId]) {
- return;
- }
- const requests = this._pendingKeyRequests[userId][deviceId];
- if (!requests) {
- return;
- }
- const idx = requests.findIndex((r) => r.requestId === requestId);
- if (idx < 0) {
- return;
- }
- console.log("Forgetting room key request");
- requests.splice(idx, 1);
- if (requests.length === 0) {
- delete this._pendingKeyRequests[userId][deviceId];
- if (Object.keys(this._pendingKeyRequests[userId]).length === 0) {
- delete this._pendingKeyRequests[userId];
- }
- }
- }
-
- _processNextRequest() {
- const userId = Object.keys(this._pendingKeyRequests)[0];
- if (!userId) {
- return;
- }
- const deviceId = Object.keys(this._pendingKeyRequests[userId])[0];
- if (!deviceId) {
- return;
- }
- console.log(`Starting KeyShareDialog for ${userId}:${deviceId}`);
-
- const finished = (r) => {
- this._currentUser = null;
- this._currentDevice = null;
-
- if (!this._pendingKeyRequests[userId] || !this._pendingKeyRequests[userId][deviceId]) {
- // request was removed in the time the dialog was displayed
- this._processNextRequest();
- return;
- }
-
- if (r) {
- for (const req of this._pendingKeyRequests[userId][deviceId]) {
- req.share();
- }
- }
- delete this._pendingKeyRequests[userId][deviceId];
- if (Object.keys(this._pendingKeyRequests[userId]).length === 0) {
- delete this._pendingKeyRequests[userId];
- }
-
- this._processNextRequest();
- };
-
- const KeyShareDialog = sdk.getComponent("dialogs.KeyShareDialog");
- Modal.appendTrackedDialog('Key Share', 'Process Next Request', KeyShareDialog, {
- matrixClient: this._matrixClient,
- userId: userId,
- deviceId: deviceId,
- onFinished: finished,
- });
- this._currentUser = userId;
- this._currentDevice = deviceId;
- }
-}
-
diff --git a/src/Keyboard.ts b/src/Keyboard.ts
index 23e2bbf0d6..7040898872 100644
--- a/src/Keyboard.ts
+++ b/src/Keyboard.ts
@@ -43,6 +43,8 @@ export const Key = {
BACKTICK: "`",
SPACE: " ",
SLASH: "/",
+ SQUARE_BRACKET_LEFT: "[",
+ SQUARE_BRACKET_RIGHT: "]",
A: "a",
B: "b",
C: "c",
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index b9fbf4f1bc..a05392c3e9 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -26,7 +26,7 @@ import Analytics from './Analytics';
import Notifier from './Notifier';
import UserActivity from './UserActivity';
import Presence from './Presence';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
import DMRoomMap from './utils/DMRoomMap';
import Modal from './Modal';
import * as sdk from './index';
@@ -40,6 +40,12 @@ import ToastStore from "./stores/ToastStore";
import {IntegrationManagers} from "./integrations/IntegrationManagers";
import {Mjolnir} from "./mjolnir/Mjolnir";
import DeviceListener from "./DeviceListener";
+import RebrandListener from "./RebrandListener";
+import {Jitsi} from "./widgets/Jitsi";
+import {SSO_HOMESERVER_URL_KEY, SSO_ID_SERVER_URL_KEY} from "./BasePlatform";
+
+const HOMESERVER_URL_KEY = "mx_hs_url";
+const ID_SERVER_URL_KEY = "mx_is_url";
/**
* Called at startup, to attempt to build a logged-in Matrix session. It tries
@@ -162,14 +168,16 @@ export function attemptTokenLogin(queryParams, defaultDeviceDisplayName) {
return Promise.resolve(false);
}
- if (!queryParams.homeserver) {
+ const homeserver = localStorage.getItem(SSO_HOMESERVER_URL_KEY);
+ const identityServer = localStorage.getItem(SSO_ID_SERVER_URL_KEY);
+ if (!homeserver) {
console.warn("Cannot log in with token: can't determine HS URL to use");
return Promise.resolve(false);
}
return sendLoginRequest(
- queryParams.homeserver,
- queryParams.identityServer,
+ homeserver,
+ identityServer,
"m.login.token", {
token: queryParams.loginToken,
initial_device_display_name: defaultDeviceDisplayName,
@@ -255,8 +263,8 @@ function _registerAsGuest(hsUrl, isUrl, defaultDeviceDisplayName) {
* @returns {Object} Information about the session - see implementation for variables.
*/
export function getLocalStorageSessionVars() {
- const hsUrl = localStorage.getItem("mx_hs_url");
- const isUrl = localStorage.getItem("mx_is_url");
+ const hsUrl = localStorage.getItem(HOMESERVER_URL_KEY);
+ const isUrl = localStorage.getItem(ID_SERVER_URL_KEY);
const accessToken = localStorage.getItem("mx_access_token");
const userId = localStorage.getItem("mx_user_id");
const deviceId = localStorage.getItem("mx_device_id");
@@ -297,6 +305,8 @@ async function _restoreFromLocalStorage(opts) {
return false;
}
+ const pickleKey = await PlatformPeg.get().getPickleKey(userId, deviceId);
+
console.log(`Restoring session for ${userId}`);
await _doSetLoggedIn({
userId: userId,
@@ -305,6 +315,7 @@ async function _restoreFromLocalStorage(opts) {
homeserverUrl: hsUrl,
identityServerUrl: isUrl,
guest: isGuest,
+ pickleKey: pickleKey,
}, false);
return true;
} else {
@@ -347,9 +358,13 @@ async function _handleLoadSessionFailure(e) {
*
* @returns {Promise} promise which resolves to the new MatrixClient once it has been started
*/
-export function setLoggedIn(credentials) {
+export async function setLoggedIn(credentials) {
stopMatrixClient();
- return _doSetLoggedIn(credentials, true);
+ const pickleKey = credentials.userId && credentials.deviceId
+ ? await PlatformPeg.get().createPickleKey(credentials.userId, credentials.deviceId)
+ : null;
+
+ return _doSetLoggedIn(Object.assign({}, credentials, {pickleKey}), true);
}
/**
@@ -478,9 +493,9 @@ function _showStorageEvictedDialog() {
class AbortLoginAndRebuildStorage extends Error { }
function _persistCredentialsToLocalStorage(credentials) {
- localStorage.setItem("mx_hs_url", credentials.homeserverUrl);
+ localStorage.setItem(HOMESERVER_URL_KEY, credentials.homeserverUrl);
if (credentials.identityServerUrl) {
- localStorage.setItem("mx_is_url", credentials.identityServerUrl);
+ localStorage.setItem(ID_SERVER_URL_KEY, credentials.identityServerUrl);
}
localStorage.setItem("mx_user_id", credentials.userId);
localStorage.setItem("mx_access_token", credentials.accessToken);
@@ -515,7 +530,9 @@ export function logout() {
}
_isLoggingOut = true;
- MatrixClientPeg.get().logout().then(onLoggedOut,
+ const client = MatrixClientPeg.get();
+ PlatformPeg.get().destroyPickleKey(client.getUserId(), client.getDeviceId());
+ client.logout().then(onLoggedOut,
(err) => {
// Just throwing an error here is going to be very unhelpful
// if you're trying to log out because your server's down and
@@ -574,13 +591,12 @@ async function startMatrixClient(startSyncing=true) {
// to work).
dis.dispatch({action: 'will_start_client'}, true);
+ // reset things first just in case
+ TypingStore.sharedInstance().reset();
+ ToastStore.sharedInstance().reset();
+
Notifier.start();
UserActivity.sharedInstance().start();
- TypingStore.sharedInstance().reset(); // just in case
- ToastStore.sharedInstance().reset();
- if (!SettingsStore.getValue("lowBandwidth")) {
- Presence.start();
- }
DMRoomMap.makeShared().start();
IntegrationManagers.sharedInstance().startWatching();
ActiveWidgetStore.start();
@@ -603,6 +619,16 @@ async function startMatrixClient(startSyncing=true) {
// This needs to be started after crypto is set up
DeviceListener.sharedInstance().start();
+ // Similarly, don't start sending presence updates until we've started
+ // the client
+ if (!SettingsStore.getValue("lowBandwidth")) {
+ Presence.start();
+ }
+
+ // Now that we have a MatrixClientPeg, update the Jitsi info
+ await Jitsi.getInstance().start();
+
+ RebrandListener.sharedInstance().start();
// dispatch that we finished starting up to wire up any other bits
// of the matrix client that cannot be set prior to starting up.
@@ -637,6 +663,10 @@ async function _clearStorage() {
window.localStorage.clear();
}
+ if (window.sessionStorage) {
+ window.sessionStorage.clear();
+ }
+
// create a temporary client to clear out the persistent stores.
const cli = createMatrixClient({
// we'll never make any requests, so can pass a bogus HS URL
@@ -661,6 +691,7 @@ export function stopMatrixClient(unsetClient=true) {
IntegrationManagers.sharedInstance().stopWatching();
Mjolnir.sharedInstance().stop();
DeviceListener.sharedInstance().stop();
+ RebrandListener.sharedInstance().stop();
if (DMRoomMap.shared()) DMRoomMap.shared().stop();
EventIndexPeg.stop();
const cli = MatrixClientPeg.get();
diff --git a/src/Login.js b/src/Login.js
index 1590e5ac28..04805b4af9 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -95,6 +95,8 @@ export default class Login {
identifier = {
type: 'm.id.phone',
country: phoneCountry,
+ phone: phoneNumber,
+ // XXX: Synapse historically wanted `number` and not `phone`
number: phoneNumber,
};
} else if (isEmail) {
diff --git a/src/Markdown.js b/src/Markdown.js
index fb1f8bf0ea..d312b7c5bd 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -175,14 +175,6 @@ export default class Markdown {
const renderer = new commonmark.HtmlRenderer({safe: false});
const real_paragraph = renderer.paragraph;
- // The default `out` function only sends the input through an XML
- // escaping function, which causes messages to be entity encoded,
- // which we don't want in this case.
- renderer.out = function(s) {
- // The `lit` function adds a string literal to the output buffer.
- this.lit(s);
- };
-
renderer.paragraph = function(node, entering) {
// as with toHTML, only append lines to paragraphs if there are
// multiple paragraphs
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.ts
similarity index 73%
rename from src/MatrixClientPeg.js
rename to src/MatrixClientPeg.ts
index 21f05b9759..5f334a639c 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.ts
@@ -17,8 +17,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import {MatrixClient, MemoryStore} from 'matrix-js-sdk';
-
+import {MatrixClient} from 'matrix-js-sdk/src/client';
+import {MemoryStore} from 'matrix-js-sdk/src/store/memory';
import * as utils from 'matrix-js-sdk/src/utils';
import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline';
import {EventTimelineSet} from 'matrix-js-sdk/src/models/event-timeline-set';
@@ -34,37 +34,26 @@ import IdentityAuthClient from './IdentityAuthClient';
import { crossSigningCallbacks } from './CrossSigningManager';
import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
-interface MatrixClientCreds {
- homeserverUrl: string,
- identityServerUrl: string,
- userId: string,
- deviceId: string,
- accessToken: string,
- guest: boolean,
+export interface IMatrixClientCreds {
+ homeserverUrl: string;
+ identityServerUrl: string;
+ userId: string;
+ deviceId: string;
+ accessToken: string;
+ guest: boolean;
+ pickleKey?: string;
}
-/**
- * Wrapper object for handling the js-sdk Matrix Client object in the react-sdk
- * Handles the creation/initialisation of client objects.
- * This module provides a singleton instance of this class so the 'current'
- * Matrix Client object is available easily.
- */
-class _MatrixClientPeg {
- constructor() {
- this.matrixClient = null;
- this._justRegisteredUserId = null;
+// TODO: Move this to the js-sdk
+export interface IOpts {
+ initialSyncLimit?: number;
+ pendingEventOrdering?: "detached" | "chronological";
+ lazyLoadMembers?: boolean;
+ clientWellKnownPollPeriod?: number;
+}
- // These are the default options used when when the
- // client is started in 'start'. These can be altered
- // at any time up to after the 'will_start_client'
- // event is finished processing.
- this.opts = {
- initialSyncLimit: 20,
- };
- // the credentials used to init the current client object.
- // used if we tear it down & recreate it with a different store
- this._currentClientCreds = null;
- }
+export interface IMatrixClientPeg {
+ opts: IOpts;
/**
* Sets the script href passed to the IndexedDB web worker
@@ -73,19 +62,23 @@ class _MatrixClientPeg {
*
* @param {string} script href to the script to be passed to the web worker
*/
- setIndexedDbWorkerScript(script) {
- createMatrixClient.indexedDbWorkerScript = script;
- }
+ setIndexedDbWorkerScript(script: string): void;
- get(): MatrixClient {
- return this.matrixClient;
- }
+ /**
+ * Return the server name of the user's homeserver
+ * Throws an error if unable to deduce the homeserver name
+ * (eg. if the user is not logged in)
+ *
+ * @returns {string} The homeserver name, if present.
+ */
+ getHomeserverName(): string;
- unset() {
- this.matrixClient = null;
+ get(): MatrixClient;
+ unset(): void;
+ assign(): Promise;
+ start(): Promise;
- MatrixActionCreators.stop();
- }
+ getCredentials(): IMatrixClientCreds;
/**
* If we've registered a user ID we set this to the ID of the
@@ -95,9 +88,7 @@ class _MatrixClientPeg {
*
* @param {string} uid The user ID of the user we've just registered
*/
- setJustRegisteredUserId(uid) {
- this._justRegisteredUserId = uid;
- }
+ setJustRegisteredUserId(uid: string): void;
/**
* Returns true if the current user has just been registered by this
@@ -105,23 +96,73 @@ class _MatrixClientPeg {
*
* @returns {bool} True if user has just been registered
*/
- currentUserIsJustRegistered() {
+ currentUserIsJustRegistered(): boolean;
+
+ /**
+ * Replace this MatrixClientPeg's client with a client instance that has
+ * homeserver / identity server URLs and active credentials
+ *
+ * @param {IMatrixClientCreds} creds The new credentials to use.
+ */
+ replaceUsingCreds(creds: IMatrixClientCreds): void;
+}
+
+/**
+ * Wrapper object for handling the js-sdk Matrix Client object in the react-sdk
+ * Handles the creation/initialisation of client objects.
+ * This module provides a singleton instance of this class so the 'current'
+ * Matrix Client object is available easily.
+ */
+class _MatrixClientPeg implements IMatrixClientPeg {
+ // These are the default options used when when the
+ // client is started in 'start'. These can be altered
+ // at any time up to after the 'will_start_client'
+ // event is finished processing.
+ public opts: IOpts = {
+ initialSyncLimit: 20,
+ };
+
+ private matrixClient: MatrixClient = null;
+ private justRegisteredUserId: string;
+
+ // the credentials used to init the current client object.
+ // used if we tear it down & recreate it with a different store
+ private currentClientCreds: IMatrixClientCreds;
+
+ constructor() {
+ }
+
+ public setIndexedDbWorkerScript(script: string): void {
+ createMatrixClient.indexedDbWorkerScript = script;
+ }
+
+ public get(): MatrixClient {
+ return this.matrixClient;
+ }
+
+ public unset(): void {
+ this.matrixClient = null;
+
+ MatrixActionCreators.stop();
+ }
+
+ public setJustRegisteredUserId(uid: string): void {
+ this.justRegisteredUserId = uid;
+ }
+
+ public currentUserIsJustRegistered(): boolean {
return (
this.matrixClient &&
- this.matrixClient.credentials.userId === this._justRegisteredUserId
+ this.matrixClient.credentials.userId === this.justRegisteredUserId
);
}
- /*
- * Replace this MatrixClientPeg's client with a client instance that has
- * homeserver / identity server URLs and active credentials
- */
- replaceUsingCreds(creds: MatrixClientCreds) {
- this._currentClientCreds = creds;
- this._createClient(creds);
+ public replaceUsingCreds(creds: IMatrixClientCreds): void {
+ this.currentClientCreds = creds;
+ this.createClient(creds);
}
- async assign() {
+ public async assign(): Promise {
for (const dbType of ['indexeddb', 'memory']) {
try {
const promise = this.matrixClient.store.startup();
@@ -132,7 +173,7 @@ class _MatrixClientPeg {
if (dbType === 'indexeddb') {
console.error('Error starting matrixclient store - falling back to memory store', err);
this.matrixClient.store = new MemoryStore({
- localStorage: global.localStorage,
+ localStorage: localStorage,
});
} else {
console.error('Failed to start memory store!', err);
@@ -158,9 +199,7 @@ class _MatrixClientPeg {
// The js-sdk found a crypto DB too new for it to use
const CryptoStoreTooNewDialog =
sdk.getComponent("views.dialogs.CryptoStoreTooNewDialog");
- Modal.createDialog(CryptoStoreTooNewDialog, {
- host: window.location.host,
- });
+ Modal.createDialog(CryptoStoreTooNewDialog);
}
// this can happen for a number of reasons, the most likely being
// that the olm library was missing. It's not fatal.
@@ -171,6 +210,7 @@ class _MatrixClientPeg {
// the react sdk doesn't work without this, so don't allow
opts.pendingEventOrdering = "detached";
opts.lazyLoadMembers = true;
+ opts.clientWellKnownPollPeriod = 2 * 60 * 60; // 2 hours
// Connect the matrix client to the dispatcher and setting handlers
MatrixActionCreators.start(this.matrixClient);
@@ -179,7 +219,7 @@ class _MatrixClientPeg {
return opts;
}
- async start() {
+ public async start(): Promise {
const opts = await this.assign();
console.log(`MatrixClientPeg: really starting MatrixClient`);
@@ -187,7 +227,7 @@ class _MatrixClientPeg {
console.log(`MatrixClientPeg: MatrixClient started`);
}
- getCredentials(): MatrixClientCreds {
+ public getCredentials(): IMatrixClientCreds {
return {
homeserverUrl: this.matrixClient.baseUrl,
identityServerUrl: this.matrixClient.idBaseUrl,
@@ -198,12 +238,7 @@ class _MatrixClientPeg {
};
}
- /*
- * Return the server name of the user's homeserver
- * Throws an error if unable to deduce the homeserver name
- * (eg. if the user is not logged in)
- */
- getHomeserverName() {
+ public getHomeserverName(): string {
const matches = /^@.+:(.+)$/.exec(this.matrixClient.credentials.userId);
if (matches === null || matches.length < 1) {
throw new Error("Failed to derive homeserver name from user ID!");
@@ -211,13 +246,15 @@ class _MatrixClientPeg {
return matches[1];
}
- _createClient(creds: MatrixClientCreds) {
+ private createClient(creds: IMatrixClientCreds): void {
+ // TODO: Make these opts typesafe with the js-sdk
const opts = {
baseUrl: creds.homeserverUrl,
idBaseUrl: creds.identityServerUrl,
accessToken: creds.accessToken,
userId: creds.userId,
deviceId: creds.deviceId,
+ pickleKey: creds.pickleKey,
timelineSupport: true,
forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'),
@@ -228,9 +265,9 @@ class _MatrixClientPeg {
],
unstableClientRelationAggregation: true,
identityServer: new IdentityAuthClient(),
+ cryptoCallbacks: {},
};
- opts.cryptoCallbacks = {};
// These are always installed regardless of the labs flag so that
// cross-signing features can toggle on without reloading and also be
// accessed immediately after login.
@@ -253,8 +290,8 @@ class _MatrixClientPeg {
}
}
-if (!global.mxMatrixClientPeg) {
- global.mxMatrixClientPeg = new _MatrixClientPeg();
+if (!window.mxMatrixClientPeg) {
+ window.mxMatrixClientPeg = new _MatrixClientPeg();
}
-export const MatrixClientPeg = global.mxMatrixClientPeg;
+export const MatrixClientPeg = window.mxMatrixClientPeg;
diff --git a/src/Modal.js b/src/Modal.js
deleted file mode 100644
index de441740f1..0000000000
--- a/src/Modal.js
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import Analytics from './Analytics';
-import dis from './dispatcher';
-import {defer} from './utils/promise';
-import AsyncWrapper from './AsyncWrapper';
-
-const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
-const STATIC_DIALOG_CONTAINER_ID = "mx_Dialog_StaticContainer";
-
-class ModalManager {
- constructor() {
- this._counter = 0;
-
- // The modal to prioritise over all others. If this is set, only show
- // this modal. Remove all other modals from the stack when this modal
- // is closed.
- this._priorityModal = null;
- // The modal to keep open underneath other modals if possible. Useful
- // for cases like Settings where the modal should remain open while the
- // user is prompted for more information/errors.
- this._staticModal = null;
- // A list of the modals we have stacked up, with the most recent at [0]
- // Neither the static nor priority modal will be in this list.
- this._modals = [
- /* {
- elem: React component for this dialog
- onFinished: caller-supplied onFinished callback
- className: CSS class for the dialog wrapper div
- } */
- ];
-
- this.onBackgroundClick = this.onBackgroundClick.bind(this);
- }
-
- hasDialogs() {
- return this._priorityModal || this._staticModal || this._modals.length > 0;
- }
-
- getOrCreateContainer() {
- let container = document.getElementById(DIALOG_CONTAINER_ID);
-
- if (!container) {
- container = document.createElement("div");
- container.id = DIALOG_CONTAINER_ID;
- document.body.appendChild(container);
- }
-
- return container;
- }
-
- getOrCreateStaticContainer() {
- let container = document.getElementById(STATIC_DIALOG_CONTAINER_ID);
-
- if (!container) {
- container = document.createElement("div");
- container.id = STATIC_DIALOG_CONTAINER_ID;
- document.body.appendChild(container);
- }
-
- return container;
- }
-
- createTrackedDialog(analyticsAction, analyticsInfo, ...rest) {
- Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
- return this.createDialog(...rest);
- }
-
- appendTrackedDialog(analyticsAction, analyticsInfo, ...rest) {
- Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
- return this.appendDialog(...rest);
- }
-
- createDialog(Element, ...rest) {
- return this.createDialogAsync(Promise.resolve(Element), ...rest);
- }
-
- appendDialog(Element, ...rest) {
- return this.appendDialogAsync(Promise.resolve(Element), ...rest);
- }
-
- createTrackedDialogAsync(analyticsAction, analyticsInfo, ...rest) {
- Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
- return this.createDialogAsync(...rest);
- }
-
- appendTrackedDialogAsync(analyticsAction, analyticsInfo, ...rest) {
- Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
- return this.appendDialogAsync(...rest);
- }
-
- _buildModal(prom, props, className, options) {
- const modal = {};
-
- // never call this from onFinished() otherwise it will loop
- const [closeDialog, onFinishedProm] = this._getCloseFn(modal, props);
-
- // don't attempt to reuse the same AsyncWrapper for different dialogs,
- // otherwise we'll get confused.
- const modalCount = this._counter++;
-
- // FIXME: If a dialog uses getDefaultProps it clobbers the onFinished
- // property set here so you can't close the dialog from a button click!
- modal.elem = (
-
- );
- modal.onFinished = props ? props.onFinished : null;
- modal.className = className;
- modal.onBeforeClose = options.onBeforeClose;
- modal.beforeClosePromise = null;
- modal.close = closeDialog;
- modal.closeReason = null;
-
- return {modal, closeDialog, onFinishedProm};
- }
-
- _getCloseFn(modal, props) {
- const deferred = defer();
- return [async (...args) => {
- if (modal.beforeClosePromise) {
- await modal.beforeClosePromise;
- } else if (modal.onBeforeClose) {
- modal.beforeClosePromise = modal.onBeforeClose(modal.closeReason);
- const shouldClose = await modal.beforeClosePromise;
- modal.beforeClosePromise = null;
- if (!shouldClose) {
- return;
- }
- }
- deferred.resolve(args);
- if (props && props.onFinished) props.onFinished.apply(null, args);
- const i = this._modals.indexOf(modal);
- if (i >= 0) {
- this._modals.splice(i, 1);
- }
-
- if (this._priorityModal === modal) {
- this._priorityModal = null;
-
- // XXX: This is destructive
- this._modals = [];
- }
-
- if (this._staticModal === modal) {
- this._staticModal = null;
-
- // XXX: This is destructive
- this._modals = [];
- }
-
- this._reRender();
- }, deferred.promise];
- }
-
- /**
- * @callback onBeforeClose
- * @param {string?} reason either "backgroundClick" or null
- * @return {Promise} whether the dialog should close
- */
-
- /**
- * Open a modal view.
- *
- * This can be used to display a react component which is loaded as an asynchronous
- * webpack component. To do this, set 'loader' as:
- *
- * (cb) => {
- * require([''], cb);
- * }
- *
- * @param {Promise} prom a promise which resolves with a React component
- * which will be displayed as the modal view.
- *
- * @param {Object} props properties to pass to the displayed
- * component. (We will also pass an 'onFinished' property.)
- *
- * @param {String} className CSS class to apply to the modal wrapper
- *
- * @param {boolean} isPriorityModal if true, this modal will be displayed regardless
- * of other modals that are currently in the stack.
- * Also, when closed, all modals will be removed
- * from the stack.
- * @param {boolean} isStaticModal if true, this modal will be displayed under other
- * modals in the stack. When closed, all modals will
- * also be removed from the stack. This is not compatible
- * with being a priority modal. Only one modal can be
- * static at a time.
- * @param {Object} options? extra options for the dialog
- * @param {onBeforeClose} options.onBeforeClose a callback to decide whether to close the dialog
- * @returns {object} Object with 'close' parameter being a function that will close the dialog
- */
- createDialogAsync(prom, props, className, isPriorityModal, isStaticModal, options = {}) {
- const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className, options);
- if (isPriorityModal) {
- // XXX: This is destructive
- this._priorityModal = modal;
- } else if (isStaticModal) {
- // This is intentionally destructive
- this._staticModal = modal;
- } else {
- this._modals.unshift(modal);
- }
-
- this._reRender();
- return {
- close: closeDialog,
- finished: onFinishedProm,
- };
- }
-
- appendDialogAsync(prom, props, className) {
- const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className, {});
-
- this._modals.push(modal);
- this._reRender();
- return {
- close: closeDialog,
- finished: onFinishedProm,
- };
- }
-
- onBackgroundClick() {
- const modal = this._getCurrentModal();
- if (!modal) {
- return;
- }
- // we want to pass a reason to the onBeforeClose
- // callback, but close is currently defined to
- // pass all number of arguments to the onFinished callback
- // so, pass the reason to close through a member variable
- modal.closeReason = "backgroundClick";
- modal.close();
- modal.closeReason = null;
- }
-
- _getCurrentModal() {
- return this._priorityModal ? this._priorityModal : (this._modals[0] || this._staticModal);
- }
-
- _reRender() {
- if (this._modals.length === 0 && !this._priorityModal && !this._staticModal) {
- // If there is no modal to render, make all of Riot available
- // to screen reader users again
- dis.dispatch({
- action: 'aria_unhide_main_app',
- });
- ReactDOM.unmountComponentAtNode(this.getOrCreateContainer());
- ReactDOM.unmountComponentAtNode(this.getOrCreateStaticContainer());
- return;
- }
-
- // Hide the content outside the modal to screen reader users
- // so they won't be able to navigate into it and act on it using
- // screen reader specific features
- dis.dispatch({
- action: 'aria_hide_main_app',
- });
-
- if (this._staticModal) {
- const classes = "mx_Dialog_wrapper mx_Dialog_staticWrapper "
- + (this._staticModal.className ? this._staticModal.className : '');
-
- const staticDialog = (
-
-
- { this._staticModal.elem }
-
-
-
+
+ { this.staticModal.elem }
+
+
+
{_t(
@@ -384,18 +423,21 @@ export const CommandMap = {
)}
,
button: _t("Continue"),
},
- ));
+ );
+
+ prom = finished.then(([useDefault]) => {
+ if (useDefault) {
+ useDefaultIdentityServer();
+ return;
+ }
+ throw new Error(_t("Use an identity server to invite by email. Manage in Settings."));
+ });
} else {
return reject(_t("Use an identity server to invite by email. Manage in Settings."));
}
}
const inviter = new MultiInviter(roomId);
- return success(finished.then(([useDefault] = []) => {
- if (useDefault) {
- useDefaultIdentityServer();
- } else if (useDefault === false) {
- throw new Error(_t("Use an identity server to invite by email. Manage in Settings."));
- }
+ return success(prom.then(() => {
return inviter.invite([address]);
}).then(() => {
if (inviter.getCompletionState(address) !== "invited") {
@@ -408,12 +450,12 @@ export const CommandMap = {
},
category: CommandCategories.actions,
}),
-
- join: new Command({
- name: 'join',
- args: '',
- description: _td('Joins room with given alias'),
- runFn: function(roomId, args) {
+ new Command({
+ command: 'join',
+ aliases: ['j', 'goto'],
+ args: '',
+ description: _td('Joins room with given address'),
+ runFn: function(_, args) {
if (args) {
// Note: we support 2 versions of this command. The first is
// the public-facing one for most users and the other is a
@@ -456,8 +498,7 @@ export const CommandMap = {
});
return success();
} else if (params[0][0] === '!') {
- const roomId = params[0];
- const viaServers = params.splice(0);
+ const [roomId, ...viaServers] = params;
dis.dispatch({
action: 'view_room',
@@ -521,10 +562,9 @@ export const CommandMap = {
},
category: CommandCategories.actions,
}),
-
- part: new Command({
- name: 'part',
- args: '[]',
+ new Command({
+ command: 'part',
+ args: '[]',
description: _td('Leave room'),
runFn: function(roomId, args) {
const cli = MatrixClientPeg.get();
@@ -556,7 +596,7 @@ export const CommandMap = {
}
if (targetRoomId) break;
}
- if (!targetRoomId) return reject(_t('Unrecognised room alias:') + ' ' + roomAlias);
+ if (!targetRoomId) return reject(_t('Unrecognised room address:') + ' ' + roomAlias);
}
}
@@ -569,9 +609,8 @@ export const CommandMap = {
},
category: CommandCategories.actions,
}),
-
- kick: new Command({
- name: 'kick',
+ new Command({
+ command: 'kick',
args: ' [reason]',
description: _td('Kicks user with given id'),
runFn: function(roomId, args) {
@@ -585,10 +624,8 @@ export const CommandMap = {
},
category: CommandCategories.admin,
}),
-
- // Ban a user from the room with an optional reason
- ban: new Command({
- name: 'ban',
+ new Command({
+ command: 'ban',
args: ' [reason]',
description: _td('Bans user with given id'),
runFn: function(roomId, args) {
@@ -602,10 +639,8 @@ export const CommandMap = {
},
category: CommandCategories.admin,
}),
-
- // Unban a user from ythe room
- unban: new Command({
- name: 'unban',
+ new Command({
+ command: 'unban',
args: '',
description: _td('Unbans user with given ID'),
runFn: function(roomId, args) {
@@ -620,16 +655,15 @@ export const CommandMap = {
},
category: CommandCategories.admin,
}),
-
- ignore: new Command({
- name: 'ignore',
+ new Command({
+ command: 'ignore',
args: '',
description: _td('Ignores a user, hiding their messages from you'),
runFn: function(roomId, args) {
if (args) {
const cli = MatrixClientPeg.get();
- const matches = args.match(/^(\S+)$/);
+ const matches = args.match(/^(@[^:]+:\S+)$/);
if (matches) {
const userId = matches[1];
const ignoredUsers = cli.getIgnoredUsers();
@@ -651,16 +685,15 @@ export const CommandMap = {
},
category: CommandCategories.actions,
}),
-
- unignore: new Command({
- name: 'unignore',
+ new Command({
+ command: 'unignore',
args: '',
description: _td('Stops ignoring a user, showing their messages going forward'),
runFn: function(roomId, args) {
if (args) {
const cli = MatrixClientPeg.get();
- const matches = args.match(/^(\S+)$/);
+ const matches = args.match(/(^@[^:]+:\S+$)/);
if (matches) {
const userId = matches[1];
const ignoredUsers = cli.getIgnoredUsers();
@@ -683,10 +716,8 @@ export const CommandMap = {
},
category: CommandCategories.actions,
}),
-
- // Define the power level of a user
- op: new Command({
- name: 'op',
+ new Command({
+ command: 'op',
args: ' []',
description: _td('Define the power level of a user'),
runFn: function(roomId, args) {
@@ -696,13 +727,16 @@ export const CommandMap = {
if (matches) {
const userId = matches[1];
if (matches.length === 4 && undefined !== matches[3]) {
- powerLevel = parseInt(matches[3]);
+ powerLevel = parseInt(matches[3], 10);
}
if (!isNaN(powerLevel)) {
const cli = MatrixClientPeg.get();
const room = cli.getRoom(roomId);
- if (!room) return reject('Bad room ID: ' + roomId);
-
+ if (!room) return reject(_t("Command failed"));
+ const member = room.getMember(args);
+ if (!member || getEffectiveMembership(member.membership) === EffectiveMembership.Leave) {
+ return reject(_t("Could not find user in room"));
+ }
const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent));
}
@@ -712,10 +746,8 @@ export const CommandMap = {
},
category: CommandCategories.admin,
}),
-
- // Reset the power level of a user
- deop: new Command({
- name: 'deop',
+ new Command({
+ command: 'deop',
args: '',
description: _td('Deops user with given id'),
runFn: function(roomId, args) {
@@ -724,9 +756,10 @@ export const CommandMap = {
if (matches) {
const cli = MatrixClientPeg.get();
const room = cli.getRoom(roomId);
- if (!room) return reject('Bad room ID: ' + roomId);
+ if (!room) return reject(_t("Command failed"));
const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
+ if (!powerLevelEvent.getContent().users[args]) return reject(_t("Could not find user in room"));
return success(cli.setPowerLevel(roomId, args, undefined, powerLevelEvent));
}
}
@@ -734,9 +767,8 @@ export const CommandMap = {
},
category: CommandCategories.admin,
}),
-
- devtools: new Command({
- name: 'devtools',
+ new Command({
+ command: 'devtools',
description: _td('Opens the Developer Tools dialog'),
runFn: function(roomId) {
const DevtoolsDialog = sdk.getComponent('dialogs.DevtoolsDialog');
@@ -745,31 +777,60 @@ export const CommandMap = {
},
category: CommandCategories.advanced,
}),
-
- addwidget: new Command({
- name: 'addwidget',
- args: '',
+ new Command({
+ command: 'addwidget',
+ args: '',
description: _td('Adds a custom widget by URL to the room'),
- runFn: function(roomId, args) {
- if (!args || (!args.startsWith("https://") && !args.startsWith("http://"))) {
+ runFn: function(roomId, widgetUrl) {
+ if (!widgetUrl) {
+ return reject(_t("Please supply a widget URL or embed code"));
+ }
+
+ // Try and parse out a widget URL from iframes
+ if (widgetUrl.toLowerCase().startsWith("