matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-12-01 09:58:03 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into dbkr/call_hold

Browse Source
This commit is contained in:
David Baker
2020-10-30 16:49:42 +00:00
parent 90cdc2f341 517e3b5ea4
commit 7796621e8d
52 changed files with 1995 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/SlashCommands.tsx
View File

@@ -518,6 +518,7 @@ export const Commands = [
action: 'view_room',
room_alias: roomAlias,
auto_join: true,
_type: "slash_command", // instrumentation
});
return success();
} else if (params[0][0] === '!') {
@@ -532,6 +533,7 @@ export const Commands = [
},
via_servers: viaServers, // for the rejoin button
auto_join: true,
_type: "slash_command", // instrumentation
});
return success();
} else if (isPermalink) {
@@ -556,6 +558,7 @@ export const Commands = [
const dispatch = {
action: 'view_room',
auto_join: true,
_type: "slash_command", // instrumentation
};
if (entity[0] === '!') dispatch["room_id"] = entity;