Merge branch 'master' into amp.chat

Change-Id: I6141964157bcb7218e2e6368a3ca8d20eb4855e9
2020-05-05 13:44:06 +02:00
parent 880223e5de c41b8ab846
commit ab649fbf70
10 changed files with 304 additions and 98 deletions
@@ -43,7 +43,7 @@ const validateDisplayName = fieldval =>
    : undefined;

 function approximateAliasLength(alias, homeserver) {
-  /* TODO maybe handle punycode in homeserver URL */
+  /* TODO maybe handle punycode in homeserver name */

  var te;

@@ -69,7 +69,7 @@ const validateAlias = fieldval => {
  if (fieldval === undefined) {
    return undefined;
  }
-  const homeserver = localStorage.getItem("home_server_url");
+  const homeserver = localStorage.getItem("home_server");

  if (approximateAliasLength(fieldval, homeserver) > 255) {
    return "synapseadmin.rooms.alias_too_long";