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

Fix React crash when using a non-default homeserver on soft logout

Browse source 
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
This commit is contained in:
Travis Ralston 2019-07-05 14:35:21 -06:00
parent 017fc84862
commit 1f1a5b2aac
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/MatrixClientPeg.js
View file

@ -193,7 +193,7 @@ class MatrixClientPeg {
* Throws an error if unable to deduce the homeserver name
* (eg. if the user is not logged in)
*/
getHomeServerName() {
getHomeserverName() {
const matches = /^@.+:(.+)$/.exec(this.matrixClient.credentials.userId);
if (matches === null || matches.length < 1) {
throw new Error("Failed to derive homeserver name from user ID!");
@ -201,6 +201,13 @@ class MatrixClientPeg {
return matches[1];
}
/**
* @deprecated Use getHomeserverName() instead (correct spelling)
*/
getHomeServerName() {
return this.getHomeserverName();
}
_createClient(creds: MatrixClientCreds) {
const aggregateRelations = SettingsStore.isFeatureEnabled("feature_reactions");
const enableEdits = SettingsStore.isFeatureEnabled("feature_message_editing");