-
+ { this.props.showReplyPreview && (
+
+ ) }
{ controls }
diff --git a/src/components/views/spaces/SpacePublicShare.tsx b/src/components/views/spaces/SpacePublicShare.tsx
index 39e5115e55..cb282d8d1f 100644
--- a/src/components/views/spaces/SpacePublicShare.tsx
+++ b/src/components/views/spaces/SpacePublicShare.tsx
@@ -54,8 +54,8 @@ const SpacePublicShare = ({ space, onFinished }: IProps) => {
{ 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 3b67db374c..c265ed4bb9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -426,9 +426,6 @@
"Prepends ( ͡° ͜ʖ ͡°) to a plain-text message": "Prepends ( ͡° ͜ʖ ͡°) to a plain-text message",
"Sends a message as plain text, without interpreting it as markdown": "Sends a message as plain text, without interpreting it as markdown",
"Sends a message as html, without interpreting it as markdown": "Sends a message as html, without interpreting it as markdown",
- "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
- "/ddg is not a command": "/ddg is not a command",
- "To use it, just wait for autocomplete results to load and tab through them.": "To use it, just wait for autocomplete results to load and tab through them.",
"Upgrades a room to a new version": "Upgrades a room to a new version",
"You do not have the required permissions to use this command.": "You do not have the required permissions to use this command.",
"Changes your display nickname": "Changes your display nickname",
@@ -811,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",
@@ -1808,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",
@@ -1927,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",
@@ -2413,8 +2413,8 @@
"Clear cache and resync": "Clear cache and resync",
"%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "%(brand)s now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!",
"Updating %(brand)s": "Updating %(brand)s",
- "Leave all rooms and spaces": "Leave all rooms and spaces",
"Don't leave any": "Don't leave any",
+ "Leave all rooms and spaces": "Leave all rooms and spaces",
"Leave specific rooms and spaces": "Leave specific rooms and spaces",
"Search %(spaceName)s": "Search %(spaceName)s",
"You won't be able to rejoin unless you are re-invited.": "You won't be able to rejoin unless you are re-invited.",
@@ -3004,8 +3004,6 @@
"Commands": "Commands",
"Command Autocomplete": "Command Autocomplete",
"Community Autocomplete": "Community Autocomplete",
- "Results from DuckDuckGo": "Results from DuckDuckGo",
- "DuckDuckGo Results": "DuckDuckGo Results",
"Emoji": "Emoji",
"Emoji Autocomplete": "Emoji Autocomplete",
"Notify the whole room": "Notify the whole room",
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/settings/handlers/DeviceSettingsHandler.ts b/src/settings/handlers/DeviceSettingsHandler.ts
index e4ad4cb51e..e57862a824 100644
--- a/src/settings/handlers/DeviceSettingsHandler.ts
+++ b/src/settings/handlers/DeviceSettingsHandler.ts
@@ -71,7 +71,13 @@ export default class DeviceSettingsHandler extends SettingsHandler {
// Special case for old useIRCLayout setting
if (settingName === "layout") {
const settings = this.getSettings() || {};
- if (settings["useIRCLayout"]) return Layout.IRC;
+ if (settings["useIRCLayout"]) {
+ // Set the new layout setting and delete the old one so that we
+ // can delete this block of code after some time
+ settings["layout"] = Layout.IRC;
+ delete settings["useIRCLayout"];
+ localStorage.setItem("mx_local_settings", JSON.stringify(settings));
+ }
return settings[settingName];
}
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/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts
index 30bea42346..91a4cf6642 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/StopGapWidgetDriver.ts
@@ -185,7 +185,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
limitPerRoom: number,
roomIds: (string | Symbols.AnyRoom)[] = null,
): Promise {
- limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, 25) : 25; // arbitrary choice
+ limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER; // relatively arbitrary
const rooms = this.pickRooms(roomIds);
const allResults: IEvent[] = [];
@@ -212,7 +212,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
limitPerRoom: number,
roomIds: (string | Symbols.AnyRoom)[] = null,
): Promise {
- limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, 100) : 100; // arbitrary choice
+ limitPerRoom = limitPerRoom > 0 ? Math.min(limitPerRoom, Number.MAX_SAFE_INTEGER) : Number.MAX_SAFE_INTEGER; // relatively arbitrary
const rooms = this.pickRooms(roomIds);
const allResults: IEvent[] = [];
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 0c9514ae30..4e58909563 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5792,8 +5792,8 @@ mathml-tag-names@^2.1.3:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
- version "12.3.1"
- resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/92d822d494cc1179affbf1f14fc8635ed5595b3c"
+ version "12.4.0"
+ resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2783d162b77d6629c574f35e88bea9ae29765c34"
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"