From 380282955704166e605059ddcf368e8a2202f431 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Wed, 1 Sep 2021 10:11:19 -0700
Subject: [PATCH] Differentiate between rooms and room aliases
---
src/InvalidUrlView.js | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/InvalidUrlView.js b/src/InvalidUrlView.js
index a13bcd2..ecc66da 100644
--- a/src/InvalidUrlView.js
+++ b/src/InvalidUrlView.js
@@ -15,7 +15,7 @@ limitations under the License.
*/
import {TemplateView} from "./utils/TemplateView.js";
-import {LinkKind} from "./Link.js";
+import {LinkKind, IdentifierKind} from "./Link.js";
export class InvalidUrlView extends TemplateView {
render(t, vm) {
@@ -29,12 +29,16 @@ export class InvalidUrlView extends TemplateView {
]);
}
- _describeLinkKind(kind) {
- switch (kind) {
- case LinkKind.Room: return "The room ";
+ _describeRoom(identifierKind) {
+ return identifierKind === IdentifierKind.RoomAlias ? "room alias" : "room";
+ }
+
+ _describeLinkKind(linkKind, identifierKind) {
+ switch (linkKind) {
+ case LinkKind.Room: return `The ${this._describeRoom(identifierKind)} `;
case LinkKind.User: return "The user ";
case LinkKind.Group: return "The group ";
- case LinkKind.Event: return "An event in room ";
+ case LinkKind.Event: return `An event in ${this._describeRoom(identifierKind)} `;
}
}
@@ -42,7 +46,10 @@ export class InvalidUrlView extends TemplateView {
return t.p([
'Did you mean any of the following?',
t.ul(validFixes.map(fix =>
- t.li([this._describeLinkKind(fix.link.kind), t.a({ href: fix.url }, fix.link.identifier)])
+ t.li([
+ this._describeLinkKind(fix.link.kind, fix.link.identifierKind),
+ t.a({ href: fix.url }, fix.link.identifier)
+ ])
))
]);
}
--
GitLab