From c14d0616eaf134efcdd413297496da953fa394f7 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 21 Feb 2020 13:36:52 +0100 Subject: [PATCH 1/3] always return null if there is no canonical alias --- src/models/room.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/room.js b/src/models/room.js index 92d636129bd..79a670dcf6a 100644 --- a/src/models/room.js +++ b/src/models/room.js @@ -861,7 +861,7 @@ Room.prototype.getAliases = function() { Room.prototype.getCanonicalAlias = function() { const canonicalAlias = this.currentState.getStateEvents("m.room.canonical_alias", ""); if (canonicalAlias) { - return canonicalAlias.getContent().alias; + return canonicalAlias.getContent().alias || null; } return null; }; From c95cdf5a11a9ff2777882c4ee31b46565daad159 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 21 Feb 2020 13:37:14 +0100 Subject: [PATCH 2/3] add room method for alt_aliases --- src/models/room.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/models/room.js b/src/models/room.js index 79a670dcf6a..cabfd77a3e8 100644 --- a/src/models/room.js +++ b/src/models/room.js @@ -866,6 +866,18 @@ Room.prototype.getCanonicalAlias = function() { return null; }; +/** + * Get this room's alternative aliases + * @return {[string]} The room's alternative aliases, or an empty array + */ +Room.prototype.getAltAliases = function() { + const canonicalAlias = this.currentState.getStateEvents("m.room.canonical_alias", ""); + if (canonicalAlias) { + return canonicalAlias.getContent().alt_aliases || []; + } + return []; +}; + /** * Add events to a timeline * From 14e1920ff5a5e1199e82aaa9013b572fbefe465d Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 21 Feb 2020 13:43:08 +0100 Subject: [PATCH 3/3] fix docs parser error --- src/models/room.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/room.js b/src/models/room.js index cabfd77a3e8..2b8fadf26d0 100644 --- a/src/models/room.js +++ b/src/models/room.js @@ -868,7 +868,7 @@ Room.prototype.getCanonicalAlias = function() { /** * Get this room's alternative aliases - * @return {[string]} The room's alternative aliases, or an empty array + * @return {array} The room's alternative aliases, or an empty array */ Room.prototype.getAltAliases = function() { const canonicalAlias = this.currentState.getStateEvents("m.room.canonical_alias", "");