imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move permalink host check into permalink constructors

Browse source 
Without the requirement for a room to work
This commit is contained in:
Travis Ralston 2019-09-30 12:53:45 -06:00
parent 926e1146f9
commit f879185aef
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/utils/permalinks/RoomPermalinkCreator.js
View file

@ -17,10 +17,7 @@ limitations under the License.
import MatrixClientPeg from "../../MatrixClientPeg";
import isIp from "is-ip";
import utils from 'matrix-js-sdk/lib/utils';
import SpecPermalinkConstructor, {
baseUrl as matrixtoBaseUrl,
host as matrixtoHost
} from "./SpecPermalinkConstructor";
import SpecPermalinkConstructor from "./SpecPermalinkConstructor";
import PermalinkConstructor from "./PermalinkConstructor";
const SdkConfig = require("../../SdkConfig");
@ -127,10 +124,6 @@ export class RoomPermalinkCreator {
return this._started;
}
isPermalinkHost(host: string): boolean {
return host === matrixtoHost;
}
forEvent(eventId) {
return getPermalinkConstructor().forEvent(this._roomId, eventId, this._serverCandidates);
}
@ -285,6 +278,10 @@ export function makeGroupPermalink(groupId) {
return getPermalinkConstructor().forGroup(groupId);
}
export function isPermalinkHost(host: string): boolean {
return getPermalinkConstructor().isPermalinkHost(host);
}
function getPermalinkConstructor(): PermalinkConstructor {
if (SdkConfig.get()['useRiotToCreatePermalinks']) {
// TODO: Return a RiotPermalinkConstructor