From 9017635c79eeb69201ea298ff3ca11e3a937ce92 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 7 Nov 2018 16:53:29 -0700 Subject: [PATCH 1/3] Support room IDs and event permalinks in the join command Mostly useful for power users who want to jump to places more easily. Examples: * `/join !somewhere:example.org` * `/join !somewhere:example.org altserver.com` - to join through `altserver.com` * `/goto https://matrix.to/#/!somewhere:example.org/$something:example.org?via=altserver.com` Fixes https://github.com/vector-im/riot-web/issues/3248 Fixes https://github.com/vector-im/riot-web/issues/7543 --- src/SlashCommands.js | 83 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 79 insertions(+), 4 deletions(-) diff --git a/src/SlashCommands.js b/src/SlashCommands.js index 3a8e77293b..712a7d0131 100644 --- a/src/SlashCommands.js +++ b/src/SlashCommands.js @@ -24,6 +24,8 @@ import sdk from './index'; import {_t, _td} from './languageHandler'; import Modal from './Modal'; import SettingsStore, {SettingLevel} from './settings/SettingsStore'; +import {MATRIXTO_URL_PATTERN} from "./linkify-matrix"; +import * as querystring from "querystring"; class Command { @@ -152,12 +154,26 @@ export const CommandMap = { args: '', description: _td('Joins room with given alias'), runFn: function(roomId, args) { + console.log(args); if (args) { - const matches = args.match(/^(\S+)$/); - if (matches) { - let roomAlias = matches[1]; - if (roomAlias[0] !== '#') return reject(this.getUsage()); + // Note: we support 2 versions of this command. The first is + // the public-facing one for most users and the other is a + // power-user edition where someone may join via permalink or + // room ID with optional servers. Practically, this results + // in the following variations: + // /join #example:example.org + // /join !example:example.org + // /join !example:example.org altserver.com elsewhere.ca + // /join https://matrix.to/#/!example:example.org?via=altserver.com + // The command also supports event permalinks transparently: + // /join https://matrix.to/#/!example:example.org/$something:example.org + // /join https://matrix.to/#/!example:example.org/$something:example.org?via=altserver.com + const params = args.split(' '); + if (params.length < 1) return reject(this.getUsage()); + const matrixToMatches = params[0].match(MATRIXTO_URL_PATTERN); + if (params[0][0] === '#') { + let roomAlias = params[0]; if (!roomAlias.includes(':')) { roomAlias += ':' + MatrixClientPeg.get().getDomain(); } @@ -167,7 +183,65 @@ export const CommandMap = { room_alias: roomAlias, auto_join: true, }); + return success(); + } else if(params[0][0] === '!') { + let roomId = params[0]; + let viaServers = params.splice(0); + dis.dispatch({ + action: 'view_room', + room_id: roomId, + opts: { + // These are passed down to the js-sdk's /join call + server_name: viaServers, + }, + auto_join: true, + }); + return success(); + } else if(matrixToMatches) { + let entity = matrixToMatches[1]; + let eventId = null; + let viaServers = []; + + if (entity[0] !== '!' && entity[0] !== '#') return reject(this.getUsage()); + + if (entity.indexOf('?') !== -1) { + const parts = entity.split('?'); + entity = parts[0]; + + const parsed = querystring.parse(parts[1]); + viaServers = parsed["via"]; + if (typeof viaServers === 'string') viaServers = [viaServers]; + } + + // We quietly support event ID permalinks too + if (entity.indexOf('/$') !== -1) { + const parts = entity.split("/$"); + entity = parts[0]; + eventId = `$${parts[1]}`; + } + + const dispatch = { + action: 'view_room', + auto_join: true, + }; + + if (entity[0] === '!') dispatch["room_id"] = entity; + else dispatch["room_alias"] = entity; + + if (eventId) { + dispatch["event_id"] = eventId; + dispatch["highlighted"] = true; + } + + if (viaServers) { + dispatch["opts"] = { + // These are passed down to the js-sdk's /join call + server_name: viaServers, + } + } + + dis.dispatch(dispatch); return success(); } } @@ -492,6 +566,7 @@ export const CommandMap = { const aliases = { j: "join", newballsplease: "discardsession", + goto: "join", // because it handles event permalinks magically }; From 88bfe6fc399ed6ea7cf9aeba198fa19ad2a8faae Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 7 Nov 2018 16:59:24 -0700 Subject: [PATCH 2/3] debugging--; --- src/SlashCommands.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SlashCommands.js b/src/SlashCommands.js index 712a7d0131..b1884ae532 100644 --- a/src/SlashCommands.js +++ b/src/SlashCommands.js @@ -154,7 +154,6 @@ export const CommandMap = { args: '', description: _td('Joins room with given alias'), runFn: function(roomId, args) { - console.log(args); if (args) { // Note: we support 2 versions of this command. The first is // the public-facing one for most users and the other is a From 5d804e1e574ff2dcce3881405d1323271f667d8e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 7 Nov 2018 17:01:47 -0700 Subject: [PATCH 3/3] Appease the linter --- src/SlashCommands.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SlashCommands.js b/src/SlashCommands.js index b1884ae532..8a34ba7ab1 100644 --- a/src/SlashCommands.js +++ b/src/SlashCommands.js @@ -183,9 +183,9 @@ export const CommandMap = { auto_join: true, }); return success(); - } else if(params[0][0] === '!') { - let roomId = params[0]; - let viaServers = params.splice(0); + } else if (params[0][0] === '!') { + const roomId = params[0]; + const viaServers = params.splice(0); dis.dispatch({ action: 'view_room', @@ -197,7 +197,7 @@ export const CommandMap = { auto_join: true, }); return success(); - } else if(matrixToMatches) { + } else if (matrixToMatches) { let entity = matrixToMatches[1]; let eventId = null; let viaServers = []; @@ -237,7 +237,7 @@ export const CommandMap = { dispatch["opts"] = { // These are passed down to the js-sdk's /join call server_name: viaServers, - } + }; } dis.dispatch(dispatch);