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

Introduce a RiotPermalinkConstructor and fix the setting name

Browse source 
Originally we were planning on using the current location as the permalink prefix, but that doesn't work if the user is a desktop user.
This commit is contained in:
Travis Ralston 2019-09-30 13:04:20 -06:00
parent f879185aef
commit f183e96d66
2 changed files with 64 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,8 +17,9 @@ limitations under the License.
import MatrixClientPeg from "../../MatrixClientPeg";
import isIp from "is-ip";
import utils from 'matrix-js-sdk/lib/utils';
import SpecPermalinkConstructor from "./SpecPermalinkConstructor";
import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
import PermalinkConstructor from "./PermalinkConstructor";
import RiotPermalinkConstructor from "./RiotPermalinkConstructor";
const SdkConfig = require("../../SdkConfig");
@ -283,8 +284,8 @@ export function isPermalinkHost(host: string): boolean {
}
function getPermalinkConstructor(): PermalinkConstructor {
if (SdkConfig.get()['useRiotToCreatePermalinks']) {
// TODO: Return a RiotPermalinkConstructor
if (SdkConfig.get()['permalinkPrefix'] && SdkConfig.get()['permalinkPrefix'] !== matrixtoBaseUrl) {
return new RiotPermalinkConstructor(SdkConfig.get()['permalinkPrefix']);
}
return new SpecPermalinkConstructor();