-
+ { this.props.showReplyPreview && (
+
+ ) }
{ controls }
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index b8a4315e2d..89b493595f 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -28,6 +28,8 @@ import { UPDATE_EVENT } from "../../../stores/AsyncStore";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import InviteReason from "../elements/InviteReason";
+const MemberEventHtmlReasonField = "io.element.html_reason";
+
const MessageCase = Object.freeze({
NotLoggedIn: "NotLoggedIn",
Joining: "Joining",
@@ -492,9 +494,13 @@ export default class RoomPreviewBar extends React.Component {
}
const myUserId = MatrixClientPeg.get().getUserId();
- const reason = this.props.room.currentState.getMember(myUserId).events.member.event.content.reason;
- if (reason) {
- reasonElement =
;
+ const memberEventContent = this.props.room.currentState.getMember(myUserId).events.member.getContent();
+
+ if (memberEventContent.reason) {
+ reasonElement =
;
}
primaryActionHandler = this.props.onJoinClick;
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index 205320fb68..aca397b6b2 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -57,15 +57,16 @@ import { ActionPayload } from "../../../dispatcher/payloads";
function addReplyToMessageContent(
content: IContent,
- repliedToEvent: MatrixEvent,
+ replyToEvent: MatrixEvent,
+ replyInThread: boolean,
permalinkCreator: RoomPermalinkCreator,
): void {
- const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
+ const replyContent = ReplyThread.makeReplyMixIn(replyToEvent, replyInThread);
Object.assign(content, replyContent);
// Part of Replies fallback support - prepend the text we're sending
// with the text we're replying to
- const nestedReply = ReplyThread.getNestedReplyText(repliedToEvent, permalinkCreator);
+ const nestedReply = ReplyThread.getNestedReplyText(replyToEvent, permalinkCreator);
if (nestedReply) {
if (content.formatted_body) {
content.formatted_body = nestedReply.html + content.formatted_body;
@@ -77,8 +78,9 @@ function addReplyToMessageContent(
// exported for tests
export function createMessageContent(
model: EditorModel,
- permalinkCreator: RoomPermalinkCreator,
replyToEvent: MatrixEvent,
+ replyInThread: boolean,
+ permalinkCreator: RoomPermalinkCreator,
): IContent {
const isEmote = containsEmote(model);
if (isEmote) {
@@ -101,7 +103,7 @@ export function createMessageContent(
}
if (replyToEvent) {
- addReplyToMessageContent(content, replyToEvent, permalinkCreator);
+ addReplyToMessageContent(content, replyToEvent, replyInThread, permalinkCreator);
}
return content;
@@ -129,6 +131,7 @@ interface IProps {
room: Room;
placeholder?: string;
permalinkCreator: RoomPermalinkCreator;
+ replyInThread?: boolean;
replyToEvent?: MatrixEvent;
disabled?: boolean;
onChange?(model: EditorModel): void;
@@ -357,7 +360,12 @@ export default class SendMessageComposer extends React.Component
{
if (cmd.category === CommandCategories.messages) {
content = await this.runSlashCommand(cmd, args);
if (replyToEvent) {
- addReplyToMessageContent(content, replyToEvent, this.props.permalinkCreator);
+ addReplyToMessageContent(
+ content,
+ replyToEvent,
+ this.props.replyInThread,
+ this.props.permalinkCreator,
+ );
}
} else {
this.runSlashCommand(cmd, args);
@@ -400,7 +408,12 @@ export default class SendMessageComposer extends React.Component {
const startTime = CountlyAnalytics.getTimestamp();
const { roomId } = this.props.room;
if (!content) {
- content = createMessageContent(this.model, this.props.permalinkCreator, replyToEvent);
+ content = createMessageContent(
+ this.model,
+ replyToEvent,
+ this.props.replyInThread,
+ this.props.permalinkCreator,
+ );
}
// don't bother sending an empty message
if (!content.body.trim()) return;
diff --git a/src/components/views/settings/LayoutSwitcher.tsx b/src/components/views/settings/LayoutSwitcher.tsx
index dd7accf9a8..ad8abd0033 100644
--- a/src/components/views/settings/LayoutSwitcher.tsx
+++ b/src/components/views/settings/LayoutSwitcher.tsx
@@ -26,7 +26,7 @@ import { Layout } from "../../../settings/Layout";
import { SettingLevel } from "../../../settings/SettingLevel";
interface IProps {
- userId: string;
+ userId?: string;
displayName: string;
avatarUrl: string;
messagePreviewText: string;
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index cbf0b7916c..bc54a8155c 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -67,7 +67,7 @@ interface IState extends IThemeState {
showAdvanced: boolean;
layout: Layout;
// User profile data for the message preview
- userId: string;
+ userId?: string;
displayName: string;
avatarUrl: string;
}
@@ -92,8 +92,8 @@ export default class AppearanceUserSettingsTab extends React.Component {
{ space.canInvite(MatrixClientPeg.get()?.getUserId()) ? {
- showRoomInviteDialog(space.roomId);
if (onFinished) onFinished();
+ showRoomInviteDialog(space.roomId);
}}
>
{ _t("Invite people") }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ede8694545..c265ed4bb9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -601,6 +601,8 @@
"See when anyone posts a sticker to your active room": "See when anyone posts a sticker to your active room",
"with an empty state key": "with an empty state key",
"with state key %(stateKey)s": "with state key %(stateKey)s",
+ "The above, but in any room you are joined or invited to as well": "The above, but in any room you are joined or invited to as well",
+ "The above, but in as well": "The above, but in as well",
"Send %(eventType)s events as you in this room": "Send %(eventType)s events as you in this room",
"See %(eventType)s events posted to this room": "See %(eventType)s events posted to this room",
"Send %(eventType)s events as you in your active room": "Send %(eventType)s events as you in your active room",
@@ -806,6 +808,7 @@
"Render LaTeX maths in messages": "Render LaTeX maths in messages",
"Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
"Message Pinning": "Message Pinning",
+ "Threaded messaging": "Threaded messaging",
"Custom user status messages": "Custom user status messages",
"Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
"Render simple counters in room header": "Render simple counters in room header",
@@ -1803,6 +1806,7 @@
"%(count)s people|other": "%(count)s people",
"%(count)s people|one": "%(count)s person",
"Show files": "Show files",
+ "Show threads": "Show threads",
"Share room": "Share room",
"Room settings": "Room settings",
"Trusted": "Trusted",
@@ -1922,6 +1926,7 @@
"React": "React",
"Edit": "Edit",
"Reply": "Reply",
+ "Thread": "Thread",
"Message Actions": "Message Actions",
"Download %(text)s": "Download %(text)s",
"Error decrypting attachment": "Error decrypting attachment",
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 28c5b1353f..a0261e9994 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -211,6 +211,15 @@ export const SETTINGS: {[setting: string]: ISetting} = {
supportedLevels: LEVELS_FEATURE,
default: false,
},
+ "feature_thread": {
+ isFeature: true,
+ // Requires a reload as we change an option flag on the `js-sdk`
+ // And the entire sync history needs to be parsed again
+ controller: new ReloadOnChangeController(),
+ displayName: _td("Threaded messaging"),
+ supportedLevels: LEVELS_FEATURE,
+ default: false,
+ },
"feature_custom_status": {
isFeature: true,
displayName: _td("Custom user status messages"),
diff --git a/src/stores/RightPanelStorePhases.ts b/src/stores/RightPanelStorePhases.ts
index d62f6c6110..96a585b676 100644
--- a/src/stores/RightPanelStorePhases.ts
+++ b/src/stores/RightPanelStorePhases.ts
@@ -37,6 +37,10 @@ export enum RightPanelPhases {
SpaceMemberList = "SpaceMemberList",
SpaceMemberInfo = "SpaceMemberInfo",
Space3pidMemberInfo = "Space3pidMemberInfo",
+
+ // Thread stuff
+ ThreadView = "ThreadView",
+ ThreadPanel = "ThreadPanel",
}
// These are the phases that are safe to persist (the ones that don't require additional
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index c08c66714b..8a7d51b60a 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -145,9 +145,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
return this._allRoomsInHome;
}
- public async setActiveRoomInSpace(space: Room | null): Promise {
+ public setActiveRoomInSpace(space: Room | null): void {
if (space && !space.isSpaceRoom()) return;
- if (space !== this.activeSpace) await this.setActiveSpace(space);
+ if (space !== this.activeSpace) this.setActiveSpace(space);
if (space) {
const roomId = this.getNotificationState(space.roomId).getFirstRoomWithNotifications();
@@ -190,7 +190,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
* @param contextSwitch whether to switch the user's context,
* should not be done when the space switch is done implicitly due to another event like switching room.
*/
- public async setActiveSpace(space: Room | null, contextSwitch = true) {
+ public setActiveSpace(space: Room | null, contextSwitch = true) {
if (space === this.activeSpace || (space && !space.isSpaceRoom())) return;
this._activeSpace = space;
@@ -293,11 +293,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
}
if (space) {
- const suggestedRooms = await this.fetchSuggestedRooms(space);
- if (this._activeSpace === space) {
- this._suggestedRooms = suggestedRooms;
- this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
- }
+ this.loadSuggestedRooms(space);
+ }
+ }
+
+ private async loadSuggestedRooms(space) {
+ const suggestedRooms = await this.fetchSuggestedRooms(space);
+ if (this._activeSpace === space) {
+ this._suggestedRooms = suggestedRooms;
+ this.emit(SUGGESTED_ROOMS, this._suggestedRooms);
}
}
@@ -666,6 +670,14 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
this.onSpaceUpdate();
this.emit(room.roomId);
}
+
+ if (room === this.activeSpace && // current space
+ this.matrixClient.getRoom(ev.getStateKey())?.getMyMembership() !== "join" && // target not joined
+ ev.getPrevContent().suggested !== ev.getContent().suggested // suggested flag changed
+ ) {
+ this.loadSuggestedRooms(room);
+ }
+
break;
case EventType.SpaceParent:
@@ -678,12 +690,14 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
}
this.emit(room.roomId);
break;
+ }
+ };
- case EventType.RoomMember:
- if (room.isSpaceRoom()) {
- this.onSpaceMembersChange(ev);
- }
- break;
+ // listening for m.room.member events in onRoomState above doesn't work as the Member object isn't updated by then
+ private onRoomStateMembers = (ev: MatrixEvent) => {
+ const room = this.matrixClient.getRoom(ev.getRoomId());
+ if (room?.isSpaceRoom()) {
+ this.onSpaceMembersChange(ev);
}
};
@@ -743,6 +757,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
this.matrixClient.removeListener("Room.myMembership", this.onRoom);
this.matrixClient.removeListener("Room.accountData", this.onRoomAccountData);
this.matrixClient.removeListener("RoomState.events", this.onRoomState);
+ this.matrixClient.removeListener("RoomState.members", this.onRoomStateMembers);
this.matrixClient.removeListener("accountData", this.onAccountData);
}
await this.reset();
@@ -754,6 +769,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient {
this.matrixClient.on("Room.myMembership", this.onRoom);
this.matrixClient.on("Room.accountData", this.onRoomAccountData);
this.matrixClient.on("RoomState.events", this.onRoomState);
+ this.matrixClient.on("RoomState.members", this.onRoomStateMembers);
this.matrixClient.on("accountData", this.onAccountData);
this.matrixClient.getCapabilities().then(capabilities => {
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index daa1e0e787..d3c886d4b8 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -1,5 +1,5 @@
/*
- * Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
+ * Copyright 2020 - 2021 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.
@@ -55,6 +55,7 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { ELEMENT_CLIENT_ID } from "../../identifiers";
import { getUserLanguage } from "../../languageHandler";
import { WidgetVariableCustomisations } from "../../customisations/WidgetVariables";
+import { arrayFastClone } from "../../utils/arrays";
// TODO: Destroy all of this code
@@ -146,6 +147,7 @@ export class StopGapWidget extends EventEmitter {
private scalarToken: string;
private roomId?: string;
private kind: WidgetKind;
+ private readUpToMap: {[roomId: string]: string} = {}; // room ID to event ID
constructor(private appTileProps: IAppTileProps) {
super();
@@ -294,6 +296,14 @@ export class StopGapWidget extends EventEmitter {
this.messaging.transport.reply(ev.detail, {});
});
+ // Populate the map of "read up to" events for this widget with the current event in every room.
+ // This is a bit inefficient, but should be okay. We do this for all rooms in case the widget
+ // requests timeline capabilities in other rooms down the road. It's just easier to manage here.
+ for (const room of MatrixClientPeg.get().getRooms()) {
+ // Timelines are most recent last
+ this.readUpToMap[room.roomId] = arrayFastClone(room.getLiveTimeline().getEvents()).reverse()[0].getId();
+ }
+
// Attach listeners for feeding events - the underlying widget classes handle permissions for us
MatrixClientPeg.get().on('event', this.onEvent);
MatrixClientPeg.get().on('Event.decrypted', this.onEventDecrypted);
@@ -408,21 +418,56 @@ export class StopGapWidget extends EventEmitter {
private onEvent = (ev: MatrixEvent) => {
MatrixClientPeg.get().decryptEventIfNeeded(ev);
if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
- if (ev.getRoomId() !== this.eventListenerRoomId) return;
this.feedEvent(ev);
};
private onEventDecrypted = (ev: MatrixEvent) => {
if (ev.isDecryptionFailure()) return;
- if (ev.getRoomId() !== this.eventListenerRoomId) return;
this.feedEvent(ev);
};
private feedEvent(ev: MatrixEvent) {
if (!this.messaging) return;
+ // Check to see if this event would be before or after our "read up to" marker. If it's
+ // before, or we can't decide, then we assume the widget will have already seen the event.
+ // If the event is after, or we don't have a marker for the room, then we'll send it through.
+ //
+ // This approach of "read up to" prevents widgets receiving decryption spam from startup or
+ // receiving out-of-order events from backfill and such.
+ const upToEventId = this.readUpToMap[ev.getRoomId()];
+ if (upToEventId) {
+ // Small optimization for exact match (prevent search)
+ if (upToEventId === ev.getId()) {
+ return;
+ }
+
+ let isBeforeMark = true;
+
+ // Timelines are most recent last, so reverse the order and limit ourselves to 100 events
+ // to avoid overusing the CPU.
+ const timeline = MatrixClientPeg.get().getRoom(ev.getRoomId()).getLiveTimeline();
+ const events = arrayFastClone(timeline.getEvents()).reverse().slice(0, 100);
+
+ for (const timelineEvent of events) {
+ if (timelineEvent.getId() === upToEventId) {
+ break;
+ } else if (timelineEvent.getId() === ev.getId()) {
+ isBeforeMark = false;
+ break;
+ }
+ }
+
+ if (isBeforeMark) {
+ // Ignore the event: it is before our interest.
+ return;
+ }
+ }
+
+ this.readUpToMap[ev.getRoomId()] = ev.getId();
+
const raw = ev.getEffectiveEvent();
- this.messaging.feedEvent(raw).catch(e => {
+ this.messaging.feedEvent(raw, this.eventListenerRoomId).catch(e => {
console.error("Error sending event to widget: ", e);
});
}
diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts
index d473ecf3b1..91a4cf6642 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/StopGapWidgetDriver.ts
@@ -1,5 +1,5 @@
/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 2020 - 2021 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.
@@ -23,6 +23,7 @@ import {
MatrixCapabilities,
OpenIDRequestState,
SimpleObservable,
+ Symbols,
Widget,
WidgetDriver,
WidgetEventCapability,
@@ -42,7 +43,8 @@ import { CHAT_EFFECTS } from "../../effects";
import { containsEmoji } from "../../effects/utils";
import dis from "../../dispatcher/dispatcher";
import { tryTransformPermalinkToLocalHref } from "../../utils/permalinks/Permalinks";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { IEvent, MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk";
// TODO: Purge this from the universe
@@ -133,9 +135,14 @@ export class StopGapWidgetDriver extends WidgetDriver {
return allAllowed;
}
- public async sendEvent(eventType: string, content: any, stateKey: string = null): Promise {
+ public async sendEvent(
+ eventType: string,
+ content: any,
+ stateKey: string = null,
+ targetRoomId: string = null,
+ ): Promise {
const client = MatrixClientPeg.get();
- const roomId = ActiveRoomObserver.activeRoomId;
+ const roomId = targetRoomId || ActiveRoomObserver.activeRoomId;
if (!client || !roomId) throw new Error("Not in a room or not attached to a client");
@@ -162,48 +169,68 @@ export class StopGapWidgetDriver extends WidgetDriver {
return { roomId, eventId: r.event_id };
}
- public async readRoomEvents(eventType: string, msgtype: string | undefined, limit: number): Promise {
- limit = limit > 0 ? Math.min(limit, 25) : 25; // arbitrary choice
-
+ private pickRooms(roomIds: (string | Symbols.AnyRoom)[] = null): Room[] {
const client = MatrixClientPeg.get();
- const roomId = ActiveRoomObserver.activeRoomId;
- const room = client.getRoom(roomId);
- if (!client || !roomId || !room) throw new Error("Not in a room or not attached to a client");
+ if (!client) throw new Error("Not attached to a client");
- const results: MatrixEvent[] = [];
- const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
- for (let i = events.length - 1; i > 0; i--) {
- if (results.length >= limit) break;
-
- const ev = events[i];
- if (ev.getType() !== eventType || ev.isState()) continue;
- if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()['msgtype']) continue;
- results.push(ev);
- }
-
- return results.map(e => e.getEffectiveEvent());
+ const targetRooms = roomIds
+ ? (roomIds.includes(Symbols.AnyRoom) ? client.getVisibleRooms() : roomIds.map(r => client.getRoom(r)))
+ : [client.getRoom(ActiveRoomObserver.activeRoomId)];
+ return targetRooms.filter(r => !!r);
}
- public async readStateEvents(eventType: string, stateKey: string | undefined, limit: number): Promise {
- limit = limit > 0 ? Math.min(limit, 100) : 100; // arbitrary choice
+ public async readRoomEvents(
+ eventType: string,
+ msgtype: string | undefined,
+ limitPerRoom: number,
+ roomIds: (string | Symbols.AnyRoom)[] = null,
+ ): Promise {
+ limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER; // relatively arbitrary
- const client = MatrixClientPeg.get();
- const roomId = ActiveRoomObserver.activeRoomId;
- const room = client.getRoom(roomId);
- if (!client || !roomId || !room) throw new Error("Not in a room or not attached to a client");
+ const rooms = this.pickRooms(roomIds);
+ const allResults: IEvent[] = [];
+ for (const room of rooms) {
+ const results: MatrixEvent[] = [];
+ const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
+ for (let i = events.length - 1; i > 0; i--) {
+ if (results.length >= limitPerRoom) break;
- const results: MatrixEvent[] = [];
- const state: Map = room.currentState.events.get(eventType);
- if (state) {
- if (stateKey === "" || !!stateKey) {
- const forKey = state.get(stateKey);
- if (forKey) results.push(forKey);
- } else {
- results.push(...Array.from(state.values()));
+ const ev = events[i];
+ if (ev.getType() !== eventType || ev.isState()) continue;
+ if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()['msgtype']) continue;
+ results.push(ev);
}
- }
- return results.slice(0, limit).map(e => e.event);
+ results.forEach(e => allResults.push(e.getEffectiveEvent()));
+ }
+ return allResults;
+ }
+
+ public async readStateEvents(
+ eventType: string,
+ stateKey: string | undefined,
+ limitPerRoom: number,
+ roomIds: (string | Symbols.AnyRoom)[] = null,
+ ): Promise {
+ limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER; // relatively arbitrary
+
+ const rooms = this.pickRooms(roomIds);
+ const allResults: IEvent[] = [];
+ for (const room of rooms) {
+ const results: MatrixEvent[] = [];
+ const state: Map = room.currentState.events.get(eventType);
+ if (state) {
+ if (stateKey === "" || !!stateKey) {
+ const forKey = state.get(stateKey);
+ if (forKey) results.push(forKey);
+ } else {
+ results.push(...Array.from(state.values()));
+ }
+ }
+
+ results.slice(0, limitPerRoom).forEach(e => allResults.push(e.getEffectiveEvent()));
+ }
+ return allResults;
}
public async askOpenID(observer: SimpleObservable) {
diff --git a/src/widgets/CapabilityText.tsx b/src/widgets/CapabilityText.tsx
index 63e34eea7a..8c13a4b2fc 100644
--- a/src/widgets/CapabilityText.tsx
+++ b/src/widgets/CapabilityText.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020 - 2021 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.
@@ -14,11 +14,22 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import { Capability, EventDirection, MatrixCapabilities, WidgetEventCapability, WidgetKind } from "matrix-widget-api";
+import {
+ Capability,
+ EventDirection,
+ getTimelineRoomIDFromCapability,
+ isTimelineCapability,
+ isTimelineCapabilityFor,
+ MatrixCapabilities, Symbols,
+ WidgetEventCapability,
+ WidgetKind,
+} from "matrix-widget-api";
import { _t, _td, TranslatedString } from "../languageHandler";
import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
import { ElementWidgetCapabilities } from "../stores/widgets/ElementWidgetCapabilities";
import React from "react";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import TextWithTooltip from "../components/views/elements/TextWithTooltip";
type GENERIC_WIDGET_KIND = "generic"; // eslint-disable-line @typescript-eslint/naming-convention
const GENERIC_WIDGET_KIND: GENERIC_WIDGET_KIND = "generic";
@@ -138,8 +149,31 @@ export class CapabilityText {
if (textForKind[GENERIC_WIDGET_KIND]) return { primary: _t(textForKind[GENERIC_WIDGET_KIND]) };
// ... we'll fall through to the generic capability processing at the end of this
- // function if we fail to locate a simple string and the capability isn't for an
- // event.
+ // function if we fail to generate a string for the capability.
+ }
+
+ // Try to handle timeline capabilities. The text here implies that the caller has sorted
+ // the timeline caps to the end for UI purposes.
+ if (isTimelineCapability(capability)) {
+ if (isTimelineCapabilityFor(capability, Symbols.AnyRoom)) {
+ return { primary: _t("The above, but in any room you are joined or invited to as well") };
+ } else {
+ const roomId = getTimelineRoomIDFromCapability(capability);
+ const room = MatrixClientPeg.get().getRoom(roomId);
+ return {
+ primary: _t("The above, but in as well", {}, {
+ Room: () => {
+ if (room) {
+ return
+ { room.name }
+ ;
+ } else {
+ return { roomId };
+ }
+ },
+ }),
+ };
+ }
}
// We didn't have a super simple line of text, so try processing the capability as the
diff --git a/test/components/views/rooms/SendMessageComposer-test.js b/test/components/views/rooms/SendMessageComposer-test.js
index 0c4bde76a8..db5b55df90 100644
--- a/test/components/views/rooms/SendMessageComposer-test.js
+++ b/test/components/views/rooms/SendMessageComposer-test.js
@@ -46,7 +46,7 @@ describe('', () => {
const model = new EditorModel([], createPartCreator(), createRenderer());
model.update("hello world", "insertText", { offset: 11, atNodeEnd: true });
- const content = createMessageContent(model, permalinkCreator);
+ const content = createMessageContent(model, null, false, permalinkCreator);
expect(content).toEqual({
body: "hello world",
@@ -58,7 +58,7 @@ describe('', () => {
const model = new EditorModel([], createPartCreator(), createRenderer());
model.update("hello *world*", "insertText", { offset: 13, atNodeEnd: true });
- const content = createMessageContent(model, permalinkCreator);
+ const content = createMessageContent(model, null, false, permalinkCreator);
expect(content).toEqual({
body: "hello *world*",
@@ -72,7 +72,7 @@ describe('', () => {
const model = new EditorModel([], createPartCreator(), createRenderer());
model.update("/me blinks __quickly__", "insertText", { offset: 22, atNodeEnd: true });
- const content = createMessageContent(model, permalinkCreator);
+ const content = createMessageContent(model, null, false, permalinkCreator);
expect(content).toEqual({
body: "blinks __quickly__",
@@ -86,7 +86,7 @@ describe('', () => {
const model = new EditorModel([], createPartCreator(), createRenderer());
model.update("//dev/null is my favourite place", "insertText", { offset: 32, atNodeEnd: true });
- const content = createMessageContent(model, permalinkCreator);
+ const content = createMessageContent(model, null, false, permalinkCreator);
expect(content).toEqual({
body: "/dev/null is my favourite place",
diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts
index 2e823aa72b..7cfd97b234 100644
--- a/test/stores/SpaceStore-test.ts
+++ b/test/stores/SpaceStore-test.ts
@@ -562,7 +562,7 @@ describe("SpaceStore", () => {
]);
mkSpace(space3).getMyMembership.mockReturnValue("invite");
await run();
- await store.setActiveSpace(null);
+ store.setActiveSpace(null);
expect(store.activeSpace).toBe(null);
});
afterEach(() => {
@@ -570,31 +570,31 @@ describe("SpaceStore", () => {
});
it("switch to home space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
fn.mockClear();
- await store.setActiveSpace(null);
+ store.setActiveSpace(null);
expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, null);
expect(store.activeSpace).toBe(null);
});
it("switch to invited space", async () => {
const space = client.getRoom(space3);
- await store.setActiveSpace(space);
+ store.setActiveSpace(space);
expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
expect(store.activeSpace).toBe(space);
});
it("switch to top level space", async () => {
const space = client.getRoom(space1);
- await store.setActiveSpace(space);
+ store.setActiveSpace(space);
expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
expect(store.activeSpace).toBe(space);
});
it("switch to subspace", async () => {
const space = client.getRoom(space2);
- await store.setActiveSpace(space);
+ store.setActiveSpace(space);
expect(fn).toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
expect(store.activeSpace).toBe(space);
});
@@ -602,7 +602,7 @@ describe("SpaceStore", () => {
it("switch to unknown space is a nop", async () => {
expect(store.activeSpace).toBe(null);
const space = client.getRoom(room1); // not a space
- await store.setActiveSpace(space);
+ store.setActiveSpace(space);
expect(fn).not.toHaveBeenCalledWith(UPDATE_SELECTED_SPACE, space);
expect(store.activeSpace).toBe(null);
});
@@ -635,59 +635,59 @@ describe("SpaceStore", () => {
};
it("last viewed room in target space is the current viewed and in both spaces", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
expect(getCurrentRoom()).toBe(room2);
});
it("last viewed room in target space is in the current space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
expect(getCurrentRoom()).toBe(space2);
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
expect(getCurrentRoom()).toBe(room2);
});
it("last viewed room in target space is not in the current space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
expect(getCurrentRoom()).toBe(room1);
});
it("last viewed room is target space is not known", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
localStorage.setItem(`mx_space_context_${space2}`, orphan2);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
expect(getCurrentRoom()).toBe(space2);
});
it("last viewed room is target space is no longer in that space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
localStorage.setItem(`mx_space_context_${space2}`, room1);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
expect(getCurrentRoom()).toBe(space2); // Space home instead of room1
});
it("no last viewed room in target space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space2));
+ store.setActiveSpace(client.getRoom(space2));
expect(getCurrentRoom()).toBe(space2);
});
it("no last viewed room in home space", async () => {
- await store.setActiveSpace(client.getRoom(space1));
+ store.setActiveSpace(client.getRoom(space1));
viewRoom(room1);
- await store.setActiveSpace(null);
+ store.setActiveSpace(null);
expect(getCurrentRoom()).toBeNull(); // Home
});
});
@@ -715,28 +715,28 @@ describe("SpaceStore", () => {
it("no switch required, room is in current space", async () => {
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space1), false);
+ store.setActiveSpace(client.getRoom(space1), false);
viewRoom(room2);
expect(store.activeSpace).toBe(client.getRoom(space1));
});
it("switch to canonical parent space for room", async () => {
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space2), false);
+ store.setActiveSpace(client.getRoom(space2), false);
viewRoom(room2);
expect(store.activeSpace).toBe(client.getRoom(space2));
});
it("switch to first containing space for room", async () => {
viewRoom(room2);
- await store.setActiveSpace(client.getRoom(space2), false);
+ store.setActiveSpace(client.getRoom(space2), false);
viewRoom(room3);
expect(store.activeSpace).toBe(client.getRoom(space1));
});
it("switch to home for orphaned room", async () => {
viewRoom(room1);
- await store.setActiveSpace(client.getRoom(space1), false);
+ store.setActiveSpace(client.getRoom(space1), false);
viewRoom(orphan1);
expect(store.activeSpace).toBeNull();
});
@@ -744,7 +744,7 @@ describe("SpaceStore", () => {
it("when switching rooms in the all rooms home space don't switch to related space", async () => {
await setShowAllRooms(true);
viewRoom(room2);
- await store.setActiveSpace(null, false);
+ store.setActiveSpace(null, false);
viewRoom(room1);
expect(store.activeSpace).toBeNull();
});
diff --git a/test/stores/room-list/SpaceWatcher-test.ts b/test/stores/room-list/SpaceWatcher-test.ts
index 85f79c75b6..474c279fdd 100644
--- a/test/stores/room-list/SpaceWatcher-test.ts
+++ b/test/stores/room-list/SpaceWatcher-test.ts
@@ -57,7 +57,7 @@ describe("SpaceWatcher", () => {
beforeEach(async () => {
filter = null;
store.removeAllListeners();
- await store.setActiveSpace(null);
+ store.setActiveSpace(null);
client.getVisibleRooms.mockReturnValue(rooms = []);
space1 = mkSpace(space1Id);
@@ -95,7 +95,7 @@ describe("SpaceWatcher", () => {
await setShowAllRooms(true);
new SpaceWatcher(mockRoomListStore);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
@@ -114,7 +114,7 @@ describe("SpaceWatcher", () => {
await setShowAllRooms(false);
new SpaceWatcher(mockRoomListStore);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
@@ -124,22 +124,22 @@ describe("SpaceWatcher", () => {
await setShowAllRooms(true);
new SpaceWatcher(mockRoomListStore);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
- await SpaceStore.instance.setActiveSpace(null);
+ SpaceStore.instance.setActiveSpace(null);
expect(filter).toBeNull();
});
it("updates filter correctly for space -> home transition", async () => {
await setShowAllRooms(false);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
new SpaceWatcher(mockRoomListStore);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
- await SpaceStore.instance.setActiveSpace(null);
+ SpaceStore.instance.setActiveSpace(null);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(null);
@@ -147,12 +147,12 @@ describe("SpaceWatcher", () => {
it("updates filter correctly for space -> space transition", async () => {
await setShowAllRooms(false);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
new SpaceWatcher(mockRoomListStore);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space1);
- await SpaceStore.instance.setActiveSpace(space2);
+ SpaceStore.instance.setActiveSpace(space2);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
expect(filter["space"]).toBe(space2);
@@ -160,7 +160,7 @@ describe("SpaceWatcher", () => {
it("doesn't change filter when changing showAllRooms mode to true", async () => {
await setShowAllRooms(false);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
new SpaceWatcher(mockRoomListStore);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
@@ -173,7 +173,7 @@ describe("SpaceWatcher", () => {
it("doesn't change filter when changing showAllRooms mode to false", async () => {
await setShowAllRooms(true);
- await SpaceStore.instance.setActiveSpace(space1);
+ SpaceStore.instance.setActiveSpace(space1);
new SpaceWatcher(mockRoomListStore);
expect(filter).toBeInstanceOf(SpaceFilterCondition);
diff --git a/yarn.lock b/yarn.lock
index 6dd1d269c3..f70f0e75c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5791,10 +5791,9 @@ mathml-tag-names@^2.1.3:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
-matrix-js-sdk@12.4.0:
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "12.4.0"
- resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.0.tgz#ff60306f9a9e39fd1ae6c7e501001f80eb779dd7"
- integrity sha512-KamHmvNle4mkdErmNgVsGIL3n8/zgPe60DLVaEA2t4aSNwQLEmRS+oVpIgsO3ZrUivBvn4oc9sBqxP0OIl6kUg==
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2783d162b77d6629c574f35e88bea9ae29765c34"
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@@ -5828,10 +5827,10 @@ matrix-react-test-utils@^0.2.3:
"@babel/traverse" "^7.13.17"
walk "^2.3.14"
-matrix-widget-api@^0.1.0-beta.15:
- version "0.1.0-beta.15"
- resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.15.tgz#b02511f93fe1a3634868b6e246d736107f182745"
- integrity sha512-sWmtb8ZarSbHVbk5ni7IHBR9jOh7m1+5R4soky0fEO9VKl+MN7skT0+qNux3J9WuUAu2D80dZW9xPUT9cxfxbg==
+matrix-widget-api@^0.1.0-beta.16:
+ version "0.1.0-beta.16"
+ resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.16.tgz#32655f05cab48239b97fe4111a1d0858f2aad61a"
+ integrity sha512-9zqaNLaM14YDHfFb7WGSUOivGOjYw+w5Su84ZfOl6A4IUy1xT9QPp0nsSA8wNfz0LpxOIPn3nuoF8Tn/40F5tg==
dependencies:
"@types/events" "^3.0.0"
events "^3.2.0"