-
-
- {name}
-
+
+
+ {name}
+ {messagePreview}
+
+
{badge}
- {tooltip}
+ {this.renderGeneralMenu()}
}
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 25ad192ea4..130135f641 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -427,7 +427,9 @@ export default class SendMessageComposer extends React.Component {
_onPaste = (event) => {
const {clipboardData} = event;
- if (clipboardData.files.length) {
+ // Prioritize text on the clipboard over files as Office on macOS puts a bitmap
+ // in the clipboard as well as the content being copied.
+ if (clipboardData.files.length && !clipboardData.types.some(t => t === "text/plain")) {
// This actually not so much for 'files' as such (at time of writing
// neither chrome nor firefox let you paste a plain file copied
// from Finder) but more images copied from a different website
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index ebdb6b2714..1ef8faa5c9 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -62,7 +62,7 @@ export default class AppearanceUserSettingsTab extends React.Component
{
this.setState({fontSize: size.toString()});
- SettingsStore.setValue("fontSize", null, SettingLevel.DEVICE, size);
+ SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, size - FontWatcher.SIZE_DIFF);
};
private onValidateFontSize = async ({value}: Pick): Promise => {
const parsedSize = parseFloat(value);
- const min = FontWatcher.MIN_SIZE;
- const max = FontWatcher.MAX_SIZE;
+ const min = FontWatcher.MIN_SIZE + FontWatcher.SIZE_DIFF;
+ const max = FontWatcher.MAX_SIZE + FontWatcher.SIZE_DIFF;
if (isNaN(parsedSize)) {
return {valid: false, feedback: _t("Size must be a number")};
@@ -151,7 +151,13 @@ export default class AppearanceUserSettingsTab extends React.Component ""}
+ displayFunc={_ => ""}
disabled={this.state.useCustomFontSize}
/>
Aa
@@ -291,9 +297,10 @@ export default class AppearanceUserSettingsTab extends React.Component this.setState({useCustomFontSize: checked})}
+ useCheckbox={true}
/>
this.setState({fontSize: value.target.value})}
disabled={!this.state.useCustomFontSize}
+ className="mx_SettingsTab_customFontSizeField"
/>
;
}
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index 71493d6e44..5f7ca1293c 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -36,9 +36,15 @@ export enum Action {
/**
* Open the user settings. No additional payload information required.
+ * Optionally can include an OpenToTabPayload.
*/
ViewUserSettings = "view_user_settings",
+ /**
+ * Opens the room directory. No additional payload information required.
+ */
+ ViewRoomDirectory = "view_room_directory",
+
/**
* Sets the current tooltip. Should be use with ViewTooltipPayload.
*/
@@ -58,4 +64,9 @@ export enum Action {
* Focuses the user's cursor to the composer. No additional payload information required.
*/
FocusComposer = "focus_composer",
+
+ /**
+ * Opens the user menu (previously known as the top left menu). No additional payload information required.
+ */
+ ToggleUserMenu = "toggle_user_menu",
}
diff --git a/src/dispatcher/payloads/OpenToTabPayload.ts b/src/dispatcher/payloads/OpenToTabPayload.ts
new file mode 100644
index 0000000000..2877ee053e
--- /dev/null
+++ b/src/dispatcher/payloads/OpenToTabPayload.ts
@@ -0,0 +1,27 @@
+/*
+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 { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface OpenToTabPayload extends ActionPayload {
+ action: Action.ViewUserSettings | string, // TODO: Add room settings action
+
+ /**
+ * The tab ID to open in the settings view to start, if possible.
+ */
+ initialTabId?: string;
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 46a91b0cb1..b2cfbb7f66 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -246,6 +246,7 @@
"%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s enabled flair for %(groups)s in this room.",
"%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
"%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
+ "sent an image.": "sent an image.",
"%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
"%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
"%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
@@ -419,6 +420,7 @@
"Restart": "Restart",
"Upgrade your Riot": "Upgrade your Riot",
"A new version of Riot is available!": "A new version of Riot is available!",
+ "You: %(message)s": "You: %(message)s",
"There was an error joining the room": "There was an error joining the room",
"Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
"Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
@@ -1070,6 +1072,7 @@
"Replying": "Replying",
"Room %(name)s": "Room %(name)s",
"Recent rooms": "Recent rooms",
+ "No recently visited rooms": "No recently visited rooms",
"No rooms to show": "No rooms to show",
"Unnamed room": "Unnamed room",
"World readable": "World readable",
@@ -1091,6 +1094,7 @@
"Low priority": "Low priority",
"Historical": "Historical",
"System Alerts": "System Alerts",
+ "People": "People",
"This room": "This room",
"Joining room …": "Joining room …",
"Loading …": "Loading …",
@@ -1134,10 +1138,15 @@
"Securely back up your keys to avoid losing them.
Learn more.": "Securely back up your keys to avoid losing them.
Learn more.",
"Not now": "Not now",
"Don't ask me again": "Don't ask me again",
- "Jump to first unread room.": "Jump to first unread room.",
- "Jump to first invite.": "Jump to first invite.",
+ "Sort by": "Sort by",
+ "Unread rooms": "Unread rooms",
+ "Always show first": "Always show first",
+ "Show": "Show",
+ "Message preview": "Message preview",
+ "List options": "List options",
"Add room": "Add room",
- "Show %(n)s more": "Show %(n)s more",
+ "Show %(count)s more|other": "Show %(count)s more",
+ "Show %(count)s more|one": "Show %(count)s more",
"Options": "Options",
"%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
"%(count)s unread messages including mentions.|one": "1 unread mention.",
@@ -1145,6 +1154,11 @@
"%(count)s unread messages.|one": "1 unread message.",
"Unread mentions.": "Unread mentions.",
"Unread messages.": "Unread messages.",
+ "Favourite": "Favourite",
+ "Low Priority": "Low Priority",
+ "Direct Chat": "Direct Chat",
+ "Leave Room": "Leave Room",
+ "Room options": "Room options",
"Add a topic": "Add a topic",
"Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.",
"This room has already been upgraded.": "This room has already been upgraded.",
@@ -1821,9 +1835,6 @@
"Mentions only": "Mentions only",
"Leave": "Leave",
"Forget": "Forget",
- "Favourite": "Favourite",
- "Low Priority": "Low Priority",
- "Direct Chat": "Direct Chat",
"Clear status": "Clear status",
"Update status": "Update status",
"Set status": "Set status",
@@ -1962,6 +1973,7 @@
"Explore": "Explore",
"Filter": "Filter",
"Filter rooms…": "Filter rooms…",
+ "Explore rooms": "Explore rooms",
"Failed to reject invitation": "Failed to reject invitation",
"This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
"Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
@@ -2007,7 +2019,6 @@
"Find a room…": "Find a room…",
"Find a room… (e.g. %(exampleRoom)s)": "Find a room… (e.g. %(exampleRoom)s)",
"If you can't find the room you're looking for, ask for an invite or
Create a new room.": "If you can't find the room you're looking for, ask for an invite or
Create a new room.",
- "Explore rooms": "Explore rooms",
"You can't send any messages until you review and agree to
our terms and conditions.": "You can't send any messages until you review and agree to
our terms and conditions.",
"Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please
contact your service administrator to continue using the service.": "Your message wasn't sent because this homeserver has hit its Monthly Active User Limit. Please
contact your service administrator to continue using the service.",
"Your message wasn't sent because this homeserver has exceeded a resource limit. Please
contact your service administrator to continue using the service.": "Your message wasn't sent because this homeserver has exceeded a resource limit. Please
contact your service administrator to continue using the service.",
@@ -2019,6 +2030,8 @@
"Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
"Active call": "Active call",
"There's no one else here! Would you like to
invite others or
stop warning about the empty room?": "There's no one else here! Would you like to
invite others or
stop warning about the empty room?",
+ "Jump to first unread room.": "Jump to first unread room.",
+ "Jump to first invite.": "Jump to first invite.",
"You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
"You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
"Search failed": "Search failed",
@@ -2043,6 +2056,14 @@
"Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
"Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
"Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
+ "Switch to light mode": "Switch to light mode",
+ "Switch to dark mode": "Switch to dark mode",
+ "Switch theme": "Switch theme",
+ "Security & privacy": "Security & privacy",
+ "All settings": "All settings",
+ "Archived rooms": "Archived rooms",
+ "Feedback": "Feedback",
+ "Account settings": "Account settings",
"Could not load user profile": "Could not load user profile",
"Verify this login": "Verify this login",
"Session verified": "Session verified",
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index fac7c92b65..d4e8ab0117 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -290,6 +290,33 @@ export default class EventIndex extends EventEmitter {
return validEventType && validMsgType && hasContentValue;
}
+ eventToJson(ev) {
+ const jsonEvent = ev.toJSON();
+ const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+
+ if (ev.isEncrypted()) {
+ // Let us store some additional data so we can re-verify the event.
+ // The js-sdk checks if an event is encrypted using the algorithm,
+ // the sender key and ed25519 signing key are used to find the
+ // correct device that sent the event which allows us to check the
+ // verification state of the event, either directly or using cross
+ // signing.
+ e.curve25519Key = ev.getSenderKey();
+ e.ed25519Key = ev.getClaimedEd25519Key();
+ e.algorithm = ev.getWireContent().algorithm;
+ e.forwardingCurve25519KeyChain = ev.getForwardingCurve25519KeyChain();
+ } else {
+ // Make sure that unencrypted events don't contain any of that data,
+ // despite what the server might give to us.
+ delete e.curve25519Key;
+ delete e.ed25519Key;
+ delete e.algorithm;
+ delete e.forwardingCurve25519KeyChain;
+ }
+
+ return e;
+ }
+
/**
* Queue up live events to be added to the event index.
*
@@ -300,8 +327,7 @@ export default class EventIndex extends EventEmitter {
if (!this.isValidEvent(ev)) return;
- const jsonEvent = ev.toJSON();
- const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+ const e = this.eventToJson(ev);
const profile = {
displayname: ev.sender.rawDisplayName,
@@ -477,8 +503,7 @@ export default class EventIndex extends EventEmitter {
// Let us convert the events back into a format that EventIndex can
// consume.
const events = filteredEvents.map((ev) => {
- const jsonEvent = ev.toJSON();
- const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+ const e = this.eventToJson(ev);
let profile = {};
if (e.sender in profiles) profile = profiles[e.sender];
diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index 9f9d7898cb..64a1ea0c33 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -145,6 +145,10 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
if (enabledLabs.length) {
body.append('enabled_labs', enabledLabs.join(', '));
}
+ // if low bandwidth mode is enabled, say so over rageshake, it causes many issues
+ if (SettingsStore.getValue("lowBandwidth")) {
+ body.append("lowBandwidth", "enabled");
+ }
// add storage persistence/quota information
if (navigator.storage && navigator.storage.persisted) {
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index ea10a027cf..fad932fa4b 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -170,10 +170,10 @@ export const SETTINGS = {
displayName: _td("Show info about bridges in room settings"),
default: false,
},
- "fontSize": {
+ "baseFontSize": {
displayName: _td("Font size"),
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
- default: 15,
+ default: 10,
controller: new FontSizeController(),
},
"useCustomFontSize": {
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index 4b18a27c6c..dcdde46631 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -181,6 +181,8 @@ export default class SettingsStore {
* @param {String} roomId The room ID to monitor for changes in. Use null for all rooms.
*/
static monitorSetting(settingName, roomId) {
+ roomId = roomId || null; // the thing wants null specifically to work, so appease it.
+
if (!this._monitors[settingName]) this._monitors[settingName] = {};
const registerWatcher = () => {
diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts
index dce9e77e9e..5527284cd0 100644
--- a/src/settings/watchers/FontWatcher.ts
+++ b/src/settings/watchers/FontWatcher.ts
@@ -20,8 +20,10 @@ import IWatcher from "./Watcher";
import { toPx } from '../../utils/units';
export class FontWatcher implements IWatcher {
- public static readonly MIN_SIZE = 13;
- public static readonly MAX_SIZE = 20;
+ public static readonly MIN_SIZE = 8;
+ public static readonly MAX_SIZE = 15;
+ // Externally we tell the user the font is size 15. Internally we use 10.
+ public static readonly SIZE_DIFF = 5;
private dispatcherRef: string;
@@ -30,7 +32,7 @@ export class FontWatcher implements IWatcher {
}
public start() {
- this.setRootFontSize(SettingsStore.getValue("fontSize"));
+ this.setRootFontSize(SettingsStore.getValue("baseFontSize"));
this.dispatcherRef = dis.register(this.onAction);
}
@@ -48,7 +50,7 @@ export class FontWatcher implements IWatcher {
const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE);
if (fontSize !== size) {
- SettingsStore.setValue("fontSize", null, SettingLevel.Device, fontSize);
+ SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, fontSize);
}
(
document.querySelector(":root")).style.fontSize = toPx(fontSize);
};
diff --git a/src/stores/AsyncStore.ts b/src/stores/AsyncStore.ts
index 3519050078..1977e808dc 100644
--- a/src/stores/AsyncStore.ts
+++ b/src/stores/AsyncStore.ts
@@ -42,18 +42,20 @@ export const UPDATE_EVENT = "update";
* help prevent lock conflicts.
*/
export abstract class AsyncStore extends EventEmitter {
- private storeState: T = {};
+ private storeState: T;
private lock = new AwaitLock();
private readonly dispatcherRef: string;
/**
* Creates a new AsyncStore using the given dispatcher.
* @param {Dispatcher} dispatcher The dispatcher to rely upon.
+ * @param {T} initialState The initial state for the store.
*/
- protected constructor(private dispatcher: Dispatcher) {
+ protected constructor(private dispatcher: Dispatcher, initialState: T = {}) {
super();
this.dispatcherRef = dispatcher.register(this.onDispatch.bind(this));
+ this.storeState = initialState;
}
/**
diff --git a/src/stores/AsyncStoreWithClient.ts b/src/stores/AsyncStoreWithClient.ts
new file mode 100644
index 0000000000..ce7fd45eec
--- /dev/null
+++ b/src/stores/AsyncStoreWithClient.ts
@@ -0,0 +1,53 @@
+/*
+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 { AsyncStore } from "./AsyncStore";
+import { ActionPayload } from "../dispatcher/payloads";
+
+
+export abstract class AsyncStoreWithClient extends AsyncStore {
+ protected matrixClient: MatrixClient;
+
+ protected abstract async onAction(payload: ActionPayload);
+
+ protected async onReady() {
+ // Default implementation is to do nothing.
+ }
+
+ protected async onNotReady() {
+ // Default implementation is to do nothing.
+ }
+
+ protected async onDispatch(payload: ActionPayload) {
+ await this.onAction(payload);
+
+ if (payload.action === 'MatrixActions.sync') {
+ // Filter out anything that isn't the first PREPARED sync.
+ if (!(payload.prevState === 'PREPARED' && payload.state !== 'PREPARED')) {
+ return;
+ }
+
+ this.matrixClient = payload.matrixClient;
+ await this.onReady();
+ } else if (payload.action === 'on_client_not_viable' || payload.action === 'on_logged_out') {
+ if (this.matrixClient) {
+ await this.onNotReady();
+ this.matrixClient = null;
+ }
+ }
+ }
+}
diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
new file mode 100644
index 0000000000..332fa7fe2e
--- /dev/null
+++ b/src/stores/BreadcrumbsStore.ts
@@ -0,0 +1,166 @@
+/*
+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 SettingsStore, { SettingLevel } from "../settings/SettingsStore";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { ActionPayload } from "../dispatcher/payloads";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { arrayHasDiff } from "../utils/arrays";
+import { RoomListStoreTempProxy } from "./room-list/RoomListStoreTempProxy";
+
+const MAX_ROOMS = 20; // arbitrary
+const AUTOJOIN_WAIT_THRESHOLD_MS = 90000; // 90s, the time we wait for an autojoined room to show up
+
+interface IState {
+ enabled?: boolean;
+ rooms?: Room[];
+}
+
+export class BreadcrumbsStore extends AsyncStoreWithClient {
+ private static internalInstance = new BreadcrumbsStore();
+
+ private waitingRooms: { roomId: string, addedTs: number }[] = [];
+
+ private constructor() {
+ super(defaultDispatcher);
+
+ SettingsStore.monitorSetting("breadcrumb_rooms", null);
+ SettingsStore.monitorSetting("breadcrumbs", null);
+ }
+
+ public static get instance(): BreadcrumbsStore {
+ return BreadcrumbsStore.internalInstance;
+ }
+
+ public get rooms(): Room[] {
+ return this.state.rooms || [];
+ }
+
+ public get visible(): boolean {
+ return this.state.enabled;
+ }
+
+ protected async onAction(payload: ActionPayload) {
+ if (!this.matrixClient) return;
+
+ // TODO: Remove when new room list is made the default
+ if (!RoomListStoreTempProxy.isUsingNewStore()) return;
+
+ if (payload.action === 'setting_updated') {
+ if (payload.settingName === 'breadcrumb_rooms') {
+ await this.updateRooms();
+ } else if (payload.settingName === 'breadcrumbs') {
+ await this.updateState({enabled: SettingsStore.getValue("breadcrumbs", null)});
+ }
+ } else if (payload.action === 'view_room') {
+ if (payload.auto_join && !this.matrixClient.getRoom(payload.room_id)) {
+ // Queue the room instead of pushing it immediately. We're probably just
+ // waiting for a room join to complete.
+ this.waitingRooms.push({roomId: payload.room_id, addedTs: Date.now()});
+ } else {
+ // The tests might not result in a valid room object.
+ const room = this.matrixClient.getRoom(payload.room_id);
+ if (room) await this.appendRoom(room);
+ }
+ }
+ }
+
+ protected async onReady() {
+ // TODO: Remove when new room list is made the default
+ if (!RoomListStoreTempProxy.isUsingNewStore()) return;
+
+ await this.updateRooms();
+ await this.updateState({enabled: SettingsStore.getValue("breadcrumbs", null)});
+
+ this.matrixClient.on("Room.myMembership", this.onMyMembership);
+ this.matrixClient.on("Room", this.onRoom);
+ }
+
+ protected async onNotReady() {
+ // TODO: Remove when new room list is made the default
+ if (!RoomListStoreTempProxy.isUsingNewStore()) return;
+
+ this.matrixClient.removeListener("Room.myMembership", this.onMyMembership);
+ this.matrixClient.removeListener("Room", this.onRoom);
+ }
+
+ private onMyMembership = async (room: Room) => {
+ // We turn on breadcrumbs by default once the user has at least 1 room to show.
+ if (!this.state.enabled) {
+ await SettingsStore.setValue("breadcrumbs", null, SettingLevel.ACCOUNT, true);
+ }
+ };
+
+ private onRoom = async (room: Room) => {
+ const waitingRoom = this.waitingRooms.find(r => r.roomId === room.roomId);
+ if (!waitingRoom) return;
+ this.waitingRooms.splice(this.waitingRooms.indexOf(waitingRoom), 1);
+
+ if ((Date.now() - waitingRoom.addedTs) > AUTOJOIN_WAIT_THRESHOLD_MS) return; // Too long ago.
+ await this.appendRoom(room);
+ };
+
+ private async updateRooms() {
+ let roomIds = SettingsStore.getValue("breadcrumb_rooms");
+ if (!roomIds || roomIds.length === 0) roomIds = [];
+
+ const rooms = roomIds.map(r => this.matrixClient.getRoom(r)).filter(r => !!r);
+ const currentRooms = this.state.rooms || [];
+ if (!arrayHasDiff(rooms, currentRooms)) return; // no change (probably echo)
+ await this.updateState({rooms});
+ }
+
+ private async appendRoom(room: Room) {
+ const rooms = (this.state.rooms || []).slice(); // cheap clone
+
+ // If the room is upgraded, use that room instead. We'll also splice out
+ // any children of the room.
+ const history = this.matrixClient.getRoomUpgradeHistory(room.roomId);
+ if (history.length > 1) {
+ room = history[history.length - 1]; // Last room is most recent in history
+
+ // Take out any room that isn't the most recent room
+ for (let i = 0; i < history.length - 1; i++) {
+ const idx = rooms.findIndex(r => r.roomId === history[i].roomId);
+ if (idx !== -1) rooms.splice(idx, 1);
+ }
+ }
+
+ // Remove the existing room, if it is present
+ const existingIdx = rooms.findIndex(r => r.roomId === room.roomId);
+ if (existingIdx !== -1) {
+ rooms.splice(existingIdx, 1);
+ }
+
+ // Splice the room to the start of the list
+ rooms.splice(0, 0, room);
+
+ if (rooms.length > MAX_ROOMS) {
+ // This looks weird, but it's saying to start at the MAX_ROOMS point in the
+ // list and delete everything after it.
+ rooms.splice(MAX_ROOMS, rooms.length - MAX_ROOMS);
+ }
+
+ // Update the breadcrumbs
+ await this.updateState({rooms});
+ const roomIds = rooms.map(r => r.roomId);
+ if (roomIds.length > 0) {
+ await SettingsStore.setValue("breadcrumb_rooms", null, SettingLevel.ACCOUNT, roomIds);
+ }
+ }
+
+}
diff --git a/src/stores/MessagePreviewStore.ts b/src/stores/MessagePreviewStore.ts
new file mode 100644
index 0000000000..64d65a72f3
--- /dev/null
+++ b/src/stores/MessagePreviewStore.ts
@@ -0,0 +1,135 @@
+/*
+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 { Room } from "matrix-js-sdk/src/models/room";
+import { ActionPayload } from "../dispatcher/payloads";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { RoomListStoreTempProxy } from "./room-list/RoomListStoreTempProxy";
+import { textForEvent } from "../TextForEvent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { _t } from "../languageHandler";
+
+const PREVIEWABLE_EVENTS = [
+ // This is the same list from RiotX
+ {type: "m.room.message", isState: false},
+ {type: "m.room.name", isState: true},
+ {type: "m.room.topic", isState: true},
+ {type: "m.room.member", isState: true},
+ {type: "m.room.history_visibility", isState: true},
+ {type: "m.call.invite", isState: false},
+ {type: "m.call.hangup", isState: false},
+ {type: "m.call.answer", isState: false},
+ {type: "m.room.encrypted", isState: false},
+ {type: "m.room.encryption", isState: true},
+ {type: "m.room.third_party_invite", isState: true},
+ {type: "m.sticker", isState: false},
+ {type: "m.room.create", isState: true},
+];
+
+// The maximum number of events we're willing to look back on to get a preview.
+const MAX_EVENTS_BACKWARDS = 50;
+
+interface IState {
+ [roomId: string]: string | null; // null indicates the preview is empty
+}
+
+export class MessagePreviewStore extends AsyncStoreWithClient {
+ private static internalInstance = new MessagePreviewStore();
+
+ private constructor() {
+ super(defaultDispatcher, {});
+ }
+
+ public static get instance(): MessagePreviewStore {
+ return MessagePreviewStore.internalInstance;
+ }
+
+ /**
+ * Gets the pre-translated preview for a given room
+ * @param room The room to get the preview for.
+ * @returns The preview, or null if none present.
+ */
+ public getPreviewForRoom(room: Room): string {
+ if (!room) return null; // invalid room, just return nothing
+
+ // It's faster to do a lookup this way than it is to use Object.keys().includes()
+ // We only want to generate a preview if there's one actually missing and not explicitly
+ // set as 'none'.
+ const val = this.state[room.roomId];
+ if (val !== null && typeof(val) !== "string") {
+ this.generatePreview(room);
+ }
+
+ return this.state[room.roomId];
+ }
+
+ private generatePreview(room: Room) {
+ const timeline = room.getLiveTimeline();
+ if (!timeline) return; // usually only happens in tests
+ const events = timeline.getEvents();
+
+ for (let i = events.length - 1; i >= 0; i--) {
+ if (i === events.length - MAX_EVENTS_BACKWARDS) return; // limit reached
+
+ const event = events[i];
+ const preview = this.generatePreviewForEvent(event);
+ if (preview.isPreviewable) {
+ // noinspection JSIgnoredPromiseFromCall - the AsyncStore handles concurrent calls
+ this.updateState({[room.roomId]: preview.preview});
+ return; // break - we found some text
+ }
+ }
+
+ // if we didn't find anything, subscribe ourselves to an update
+ // noinspection JSIgnoredPromiseFromCall - the AsyncStore handles concurrent calls
+ this.updateState({[room.roomId]: null});
+ }
+
+ protected async onAction(payload: ActionPayload) {
+ if (!this.matrixClient) return;
+
+ // TODO: Remove when new room list is made the default
+ if (!RoomListStoreTempProxy.isUsingNewStore()) return;
+
+ if (payload.action === 'MatrixActions.Room.timeline' || payload.action === 'MatrixActions.Event.decrypted') {
+ const event = payload.event; // TODO: Type out the dispatcher
+ if (!Object.keys(this.state).includes(event.getRoomId())) return; // not important
+
+ const preview = this.generatePreviewForEvent(event);
+ if (preview.isPreviewable) {
+ await this.updateState({[event.getRoomId()]: preview.preview});
+ return; // break - we found some text
+ }
+ }
+ }
+
+ private generatePreviewForEvent(event: MatrixEvent): { isPreviewable: boolean, preview: string } {
+ if (PREVIEWABLE_EVENTS.some(p => p.type === event.getType() && p.isState === event.isState())) {
+ const isSelf = event.getSender() === this.matrixClient.getUserId();
+ let text = textForEvent(event, /*skipUserPrefix=*/isSelf);
+ if (!text || text.trim().length === 0) text = null; // force null if useless to us
+ if (text && isSelf) {
+ // XXX: i18n doesn't really work here if the language doesn't support prefixing.
+ // We'd ideally somehow route the `You:` bit to the textForEvent call, however
+ // threading that through is non-trivial.
+ text = _t("You: %(message)s", {message: text});
+ }
+ return {isPreviewable: true, preview: text};
+ }
+ return {isPreviewable: false, preview: null};
+ }
+}
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index b41d56be3e..af9d6801a3 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -16,14 +16,16 @@ limitations under the License.
import { TagID } from "./models";
-const TILE_HEIGHT_PX = 34;
+const TILE_HEIGHT_PX = 44;
interface ISerializedListLayout {
numTiles: number;
+ showPreviews: boolean;
}
export class ListLayout {
private _n = 0;
+ private _previews = false;
constructor(public readonly tagId: TagID) {
const serialized = localStorage.getItem(this.key);
@@ -31,9 +33,19 @@ export class ListLayout {
// We don't use the setters as they cause writes.
const parsed = JSON.parse(serialized);
this._n = parsed.numTiles;
+ this._previews = parsed.showPreviews;
}
}
+ public get showPreviews(): boolean {
+ return this._previews;
+ }
+
+ public set showPreviews(v: boolean) {
+ this._previews = v;
+ this.save();
+ }
+
public get tileHeight(): number {
return TILE_HEIGHT_PX;
}
@@ -48,11 +60,28 @@ export class ListLayout {
public set visibleTiles(v: number) {
this._n = v;
- localStorage.setItem(this.key, JSON.stringify(this.serialize()));
+ this.save();
}
public get minVisibleTiles(): number {
- return 3;
+ // the .65 comes from the CSS where the show more button is
+ // mathematically 65% of a tile when floating.
+ return 4.65;
+ }
+
+ public calculateTilesToPixelsMin(maxTiles: number, n: number, possiblePadding: number): number {
+ // Only apply the padding if we're about to use maxTiles as we need to
+ // plan for the padding. If we're using n, the padding is already accounted
+ // for by the resizing stuff.
+ let padding = 0;
+ if (maxTiles < n) {
+ padding = possiblePadding;
+ }
+ return this.tilesToPixels(Math.min(maxTiles, n)) + padding;
+ }
+
+ public tilesToPixelsWithPadding(n: number, padding: number): number {
+ return this.tilesToPixels(n) + padding;
}
public tilesToPixels(n: number): number {
@@ -63,9 +92,14 @@ export class ListLayout {
return px / this.tileHeight;
}
+ private save() {
+ localStorage.setItem(this.key, JSON.stringify(this.serialize()));
+ }
+
private serialize(): ISerializedListLayout {
return {
numTiles: this.visibleTiles,
+ showPreviews: this.showPreviews,
};
}
}
diff --git a/src/stores/room-list/RoomListStoreTempProxy.ts b/src/stores/room-list/RoomListStoreTempProxy.ts
index 0268cf0a46..0a173d53a9 100644
--- a/src/stores/room-list/RoomListStoreTempProxy.ts
+++ b/src/stores/room-list/RoomListStoreTempProxy.ts
@@ -31,11 +31,14 @@ export class RoomListStoreTempProxy {
return SettingsStore.isFeatureEnabled("feature_new_room_list");
}
- public static addListener(handler: () => void) {
+ public static addListener(handler: () => void): RoomListStoreTempToken {
if (RoomListStoreTempProxy.isUsingNewStore()) {
- return RoomListStore.instance.on(UPDATE_EVENT, handler);
+ const offFn = () => RoomListStore.instance.off(UPDATE_EVENT, handler);
+ RoomListStore.instance.on(UPDATE_EVENT, handler);
+ return new RoomListStoreTempToken(offFn);
} else {
- return OldRoomListStore.addListener(handler);
+ const token = OldRoomListStore.addListener(handler);
+ return new RoomListStoreTempToken(() => token.remove());
}
}
@@ -47,3 +50,12 @@ export class RoomListStoreTempProxy {
}
}
}
+
+export class RoomListStoreTempToken {
+ constructor(private offFn: () => void) {
+ }
+
+ public remove(): void {
+ this.offFn();
+ }
+}
diff --git a/src/stores/room-list/TagWatcher.ts b/src/stores/room-list/TagWatcher.ts
index 1fb5223e00..22302b695d 100644
--- a/src/stores/room-list/TagWatcher.ts
+++ b/src/stores/room-list/TagWatcher.ts
@@ -74,6 +74,11 @@ export class TagWatcher {
this.store.removeFilter(filter);
}
+ // Destroy any and all old filter conditions to prevent resource leaks
+ for (const filter of this.filters.values()) {
+ filter.destroy();
+ }
+
this.filters = newFilters;
}
};
diff --git a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts b/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
index c3ac8c150f..a8512c0bd6 100644
--- a/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
+++ b/src/stores/room-list/algorithms/list-ordering/Algorithm.ts
@@ -20,9 +20,11 @@ import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
import { EffectiveMembership, splitRoomsByMembership } from "../../membership";
import { ITagMap, ITagSortingMap } from "../models";
import DMRoomMap from "../../../../utils/DMRoomMap";
-import { FILTER_CHANGED, IFilterCondition } from "../../filters/IFilterCondition";
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "../../filters/IFilterCondition";
import { EventEmitter } from "events";
import { UPDATE_EVENT } from "../../../AsyncStore";
+import { ArrayUtil } from "../../../../utils/arrays";
+import { getEnumValues } from "../../../../utils/enums";
// TODO: Add locking support to avoid concurrent writes?
@@ -184,22 +186,33 @@ export abstract class Algorithm extends EventEmitter {
}
console.warn("Recalculating filtered room list");
- const allowedByFilters = new Set();
const filters = Array.from(this.allowedByFilter.keys());
+ const orderedFilters = new ArrayUtil(filters)
+ .groupBy(f => f.relativePriority)
+ .orderBy(getEnumValues(FilterPriority))
+ .value;
const newMap: ITagMap = {};
for (const tagId of Object.keys(this.cachedRooms)) {
// Cheaply clone the rooms so we can more easily do operations on the list.
// We optimize our lookups by trying to reduce sample size as much as possible
// to the rooms we know will be deduped by the Set.
const rooms = this.cachedRooms[tagId];
- const remainingRooms = rooms.map(r => r).filter(r => !allowedByFilters.has(r));
- const allowedRoomsInThisTag = [];
- for (const filter of filters) {
+ let remainingRooms = rooms.map(r => r);
+ let allowedRoomsInThisTag = [];
+ let lastFilterPriority = orderedFilters[0].relativePriority;
+ for (const filter of orderedFilters) {
+ if (filter.relativePriority !== lastFilterPriority) {
+ // Every time the filter changes priority, we want more specific filtering.
+ // To accomplish that, reset the variables to make it look like the process
+ // has started over, but using the filtered rooms as the seed.
+ remainingRooms = allowedRoomsInThisTag;
+ allowedRoomsInThisTag = [];
+ lastFilterPriority = filter.relativePriority;
+ }
const filteredRooms = remainingRooms.filter(r => filter.isVisible(r));
for (const room of filteredRooms) {
const idx = remainingRooms.indexOf(room);
if (idx >= 0) remainingRooms.splice(idx, 1);
- allowedByFilters.add(room);
allowedRoomsInThisTag.push(room);
}
}
@@ -207,7 +220,8 @@ export abstract class Algorithm extends EventEmitter {
console.log(`[DEBUG] ${newMap[tagId].length}/${rooms.length} rooms filtered into ${tagId}`);
}
- this.allowedRoomsByFilters = allowedByFilters;
+ const allowedRooms = Object.values(newMap).reduce((rv, v) => { rv.push(...v); return rv; }, []);
+ this.allowedRoomsByFilters = new Set(allowedRooms);
this.filteredRooms = newMap;
this.emit(LIST_UPDATED_EVENT);
}
diff --git a/src/stores/room-list/filters/CommunityFilterCondition.ts b/src/stores/room-list/filters/CommunityFilterCondition.ts
index 13d0084ae1..b7ff8e686d 100644
--- a/src/stores/room-list/filters/CommunityFilterCondition.ts
+++ b/src/stores/room-list/filters/CommunityFilterCondition.ts
@@ -15,18 +15,18 @@ limitations under the License.
*/
import { Room } from "matrix-js-sdk/src/models/room";
-import { FILTER_CHANGED, IFilterCondition } from "./IFilterCondition";
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondition";
import { Group } from "matrix-js-sdk/src/models/group";
import { EventEmitter } from "events";
import GroupStore from "../../GroupStore";
import { arrayHasDiff } from "../../../utils/arrays";
-import { IDisposable } from "../../../utils/IDisposable";
+import { IDestroyable } from "../../../utils/IDestroyable";
/**
* A filter condition for the room list which reveals rooms which
* are a member of a given community.
*/
-export class CommunityFilterCondition extends EventEmitter implements IFilterCondition, IDisposable {
+export class CommunityFilterCondition extends EventEmitter implements IFilterCondition, IDestroyable {
private roomIds: string[] = [];
constructor(private community: Group) {
@@ -37,6 +37,11 @@ export class CommunityFilterCondition extends EventEmitter implements IFilterCon
this.onStoreUpdate(); // trigger a false update to seed the store
}
+ public get relativePriority(): FilterPriority {
+ // Lowest priority so we can coarsely find rooms.
+ return FilterPriority.Lowest;
+ }
+
public isVisible(room: Room): boolean {
return this.roomIds.includes(room.roomId);
}
@@ -52,7 +57,7 @@ export class CommunityFilterCondition extends EventEmitter implements IFilterCon
}
};
- public dispose(): void {
+ public destroy(): void {
GroupStore.off("update", this.onStoreUpdate);
}
}
diff --git a/src/stores/room-list/filters/IFilterCondition.ts b/src/stores/room-list/filters/IFilterCondition.ts
index f7f0f61194..3b054eaece 100644
--- a/src/stores/room-list/filters/IFilterCondition.ts
+++ b/src/stores/room-list/filters/IFilterCondition.ts
@@ -19,6 +19,12 @@ import { EventEmitter } from "events";
export const FILTER_CHANGED = "filter_changed";
+export enum FilterPriority {
+ Lowest,
+ // in the middle would be Low, Normal, and High if we had a need
+ Highest,
+}
+
/**
* A filter condition for the room list, determining if a room
* should be shown or not.
@@ -32,6 +38,12 @@ export const FILTER_CHANGED = "filter_changed";
* as a change in the user's input), this emits FILTER_CHANGED.
*/
export interface IFilterCondition extends EventEmitter {
+ /**
+ * The relative priority that this filter should be applied with.
+ * Lower priorities get applied first.
+ */
+ relativePriority: FilterPriority;
+
/**
* Determines if a given room should be visible under this
* condition.
diff --git a/src/stores/room-list/filters/NameFilterCondition.ts b/src/stores/room-list/filters/NameFilterCondition.ts
index 6a76569df3..f238cdeb09 100644
--- a/src/stores/room-list/filters/NameFilterCondition.ts
+++ b/src/stores/room-list/filters/NameFilterCondition.ts
@@ -15,7 +15,7 @@ limitations under the License.
*/
import { Room } from "matrix-js-sdk/src/models/room";
-import { FILTER_CHANGED, IFilterCondition } from "./IFilterCondition";
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondition";
import { EventEmitter } from "events";
/**
@@ -29,6 +29,11 @@ export class NameFilterCondition extends EventEmitter implements IFilterConditio
super();
}
+ public get relativePriority(): FilterPriority {
+ // We want this one to be at the highest priority so it can search within other filters.
+ return FilterPriority.Highest;
+ }
+
public get search(): string {
return this._search;
}
diff --git a/src/theme.js b/src/theme.js
index ccb753d601..6ed0657bbc 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -62,7 +62,7 @@ function setCustomThemeVars(customTheme) {
}
}
-function getCustomTheme(themeName) {
+export function getCustomTheme(themeName) {
// set css variables
const customThemes = SettingsStore.getValue("custom_themes");
if (!customThemes) {
diff --git a/src/utils/FormattingUtils.js b/src/utils/FormattingUtils.ts
similarity index 80%
rename from src/utils/FormattingUtils.js
rename to src/utils/FormattingUtils.ts
index b932214530..21b50da4ca 100644
--- a/src/utils/FormattingUtils.js
+++ b/src/utils/FormattingUtils.ts
@@ -1,6 +1,6 @@
/*
Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 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.
@@ -21,8 +21,8 @@ import { _t } from '../languageHandler';
* formats numbers to fit into ~3 characters, suitable for badge counts
* e.g: 999, 9.9K, 99K, 0.9M, 9.9M, 99M, 0.9B, 9.9B
*/
-export function formatCount(count) {
- if (count < 1000) return count;
+export function formatCount(count: number): string {
+ if (count < 1000) return count.toString();
if (count < 10000) return (count / 1000).toFixed(1) + "K";
if (count < 100000) return (count / 1000).toFixed(0) + "K";
if (count < 10000000) return (count / 1000000).toFixed(1) + "M";
@@ -34,7 +34,7 @@ export function formatCount(count) {
* Format a count showing the whole number but making it a bit more readable.
* e.g: 1000 => 1,000
*/
-export function formatCountLong(count) {
+export function formatCountLong(count: number): string {
const formatter = new Intl.NumberFormat();
return formatter.format(count)
}
@@ -43,7 +43,7 @@ export function formatCountLong(count) {
* format a size in bytes into a human readable form
* e.g: 1024 -> 1.00 KB
*/
-export function formatBytes(bytes, decimals = 2) {
+export function formatBytes(bytes: number, decimals = 2): string {
if (bytes === 0) return '0 Bytes';
const k = 1024;
@@ -62,7 +62,7 @@ export function formatBytes(bytes, decimals = 2) {
*
* @return {string}
*/
-export function formatCryptoKey(key) {
+export function formatCryptoKey(key: string): string {
return key.match(/.{1,4}/g).join(" ");
}
/**
@@ -72,7 +72,7 @@ export function formatCryptoKey(key) {
*
* @return {number}
*/
-export function hashCode(str) {
+export function hashCode(str: string): number {
let hash = 0;
let i;
let chr;
@@ -87,7 +87,7 @@ export function hashCode(str) {
return Math.abs(hash);
}
-export function getUserNameColorClass(userId) {
+export function getUserNameColorClass(userId: string): string {
const colorNumber = (hashCode(userId) % 8) + 1;
return `mx_Username_color${colorNumber}`;
}
@@ -103,7 +103,7 @@ export function getUserNameColorClass(userId) {
* @returns {string} a string constructed by joining `items` with a comma
* between each item, but with the last item appended as " and [lastItem]".
*/
-export function formatCommaSeparatedList(items, itemLimit) {
+export function formatCommaSeparatedList(items: string[], itemLimit?: number): string {
const remaining = itemLimit === undefined ? 0 : Math.max(
items.length - itemLimit, 0,
);
@@ -119,3 +119,14 @@ export function formatCommaSeparatedList(items, itemLimit) {
return _t("%(items)s and %(lastItem)s", { items: items.join(', '), lastItem: lastItem });
}
}
+
+/**
+ * Formats a number into a 'minimal' badge count (9, 98, 99+).
+ * @param count The number to convert
+ * @returns The badge count, stringified.
+ */
+export function formatMinimalBadgeCount(count: number): string {
+ // we specifically go from "98" to "99+"
+ if (count < 99) return count.toString();
+ return "99+";
+}
diff --git a/src/utils/IDisposable.ts b/src/utils/IDestroyable.ts
similarity index 91%
rename from src/utils/IDisposable.ts
rename to src/utils/IDestroyable.ts
index bf03e3bc85..f58fffb299 100644
--- a/src/utils/IDisposable.ts
+++ b/src/utils/IDestroyable.ts
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-export interface IDisposable {
- dispose(): void;
+export interface IDestroyable {
+ destroy(): void;
}
diff --git a/src/utils/arrays.ts b/src/utils/arrays.ts
index 3a84990b56..fea376afcd 100644
--- a/src/utils/arrays.ts
+++ b/src/utils/arrays.ts
@@ -45,3 +45,63 @@ export function arrayDiff(a: T[], b: T[]): { added: T[], removed: T[] } {
removed: a.filter(i => !b.includes(i)),
};
}
+
+/**
+ * Helper functions to perform LINQ-like queries on arrays.
+ */
+export class ArrayUtil {
+ /**
+ * Create a new array helper.
+ * @param a The array to help. Can be modified in-place.
+ */
+ constructor(private a: T[]) {
+ }
+
+ /**
+ * The value of this array, after all appropriate alterations.
+ */
+ public get value(): T[] {
+ return this.a;
+ }
+
+ /**
+ * Groups an array by keys.
+ * @param fn The key-finding function.
+ * @returns This.
+ */
+ public groupBy(fn: (a: T) => K): GroupedArray {
+ const obj = this.a.reduce((rv: Map, val: T) => {
+ const k = fn(val);
+ if (!rv.has(k)) rv.set(k, []);
+ rv.get(k).push(val);
+ return rv;
+ }, new Map());
+ return new GroupedArray(obj);
+ }
+}
+
+/**
+ * Helper functions to perform LINQ-like queries on groups (maps).
+ */
+export class GroupedArray {
+ /**
+ * Creates a new group helper.
+ * @param val The group to help. Can be modified in-place.
+ */
+ constructor(private val: Map) {
+ }
+
+ /**
+ * Orders the grouping into an array using the provided key order.
+ * @param keyOrder The key order.
+ * @returns An array helper of the result.
+ */
+ public orderBy(keyOrder: K[]): ArrayUtil {
+ const a: T[] = [];
+ for (const k of keyOrder) {
+ if (!this.val.has(k)) continue;
+ a.push(...this.val.get(k));
+ }
+ return new ArrayUtil(a);
+ }
+}
diff --git a/src/utils/enums.ts b/src/utils/enums.ts
new file mode 100644
index 0000000000..79656d7675
--- /dev/null
+++ b/src/utils/enums.ts
@@ -0,0 +1,27 @@
+/*
+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.
+*/
+
+/**
+ * Get the values for an enum.
+ * @param e The enum.
+ * @returns The enum values.
+ */
+export function getEnumValues(e: any): T[] {
+ const keys = Object.keys(e);
+ return keys
+ .filter(k => ['string', 'number'].includes(typeof(e[k])))
+ .map(k => e[k]);
+}
diff --git a/tsconfig.json b/tsconfig.json
index 8a01ca335e..db040d1f31 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,7 +15,8 @@
"types": [
"node",
"react",
- "flux"
+ "flux",
+ "react-transition-group"
]
},
"include": [
diff --git a/yarn.lock b/yarn.lock
index 333c5ccf20..32f8d3093e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -968,7 +968,7 @@
core-js-pure "^3.0.0"
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
version "7.10.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
@@ -1352,6 +1352,13 @@
dependencies:
"@types/react" "*"
+"@types/react-transition-group@^4.4.0":
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d"
+ integrity sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==
+ dependencies:
+ "@types/react" "*"
+
"@types/react@*", "@types/react@^16.9":
version "16.9.35"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
@@ -2835,7 +2842,7 @@ cssstyle@^1.0.0:
dependencies:
cssom "0.3.x"
-csstype@^2.2.0:
+csstype@^2.2.0, csstype@^2.6.7:
version "2.6.10"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==
@@ -3054,6 +3061,14 @@ doctrine@^3.0.0:
dependencies:
esutils "^2.0.2"
+dom-helpers@^5.0.1:
+ version "5.1.4"
+ resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz#4609680ab5c79a45f2531441f1949b79d6587f4b"
+ integrity sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==
+ dependencies:
+ "@babel/runtime" "^7.8.7"
+ csstype "^2.6.7"
+
dom-serializer@0, dom-serializer@^0.2.1:
version "0.2.2"
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -7136,6 +7151,16 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
react-is "^16.8.6"
scheduler "^0.19.1"
+react-transition-group@^4.4.1:
+ version "4.4.1"
+ resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
+ integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+ dom-helpers "^5.0.1"
+ loose-envify "^1.4.0"
+ prop-types "^15.6.2"
+
react@^16.9.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"