Преглед изворни кода

feat(DisplayName): Limit local and remote display name to 50 chars

master
hristoterezov пре 8 година
родитељ
комит
a6a7e81a0f
1 измењених фајлова са 16 додато и 7 уклоњено
  1. 16
    7
      conference.js

+ 16
- 7
conference.js Прегледај датотеку

@@ -54,6 +54,12 @@ const commands = {
54 54
     CUSTOM_ROLE: "custom-role"
55 55
 };
56 56
 
57
+/**
58
+ * Max length of the display names. If we receive longer display name the
59
+ * additional chars are going to be cut.
60
+ */
61
+const MAX_DISPLAYNAME_LENGTH = 50;
62
+
57 63
 /**
58 64
  * Open Connection. When authentication failed it shows auth dialog.
59 65
  * @param roomName the room name to use
@@ -281,15 +287,16 @@ function changeLocalEmail(email = '') {
281 287
  * @param nickname {string} the new display name
282 288
  */
283 289
 function changeLocalDisplayName(nickname = '') {
284
-    nickname = nickname.trim();
290
+    const formattedNickname
291
+        = nickname.trim().substr(0, MAX_DISPLAYNAME_LENGTH);
285 292
 
286
-    if (nickname === APP.settings.getDisplayName()) {
293
+    if (formattedNickname === APP.settings.getDisplayName()) {
287 294
         return;
288 295
     }
289 296
 
290
-    APP.settings.setDisplayName(nickname);
291
-    room.setDisplayName(nickname);
292
-    APP.UI.changeDisplayName(APP.conference.getMyUserId(), nickname);
297
+    APP.settings.setDisplayName(formattedNickname);
298
+    room.setDisplayName(formattedNickname);
299
+    APP.UI.changeDisplayName(APP.conference.getMyUserId(), formattedNickname);
293 300
 }
294 301
 
295 302
 class ConferenceConnector {
@@ -1268,8 +1275,10 @@ export default {
1268 1275
         });
1269 1276
 
1270 1277
         room.on(ConferenceEvents.DISPLAY_NAME_CHANGED, (id, displayName) => {
1271
-            APP.API.notifyDisplayNameChanged(id, displayName);
1272
-            APP.UI.changeDisplayName(id, displayName);
1278
+            const formattedDisplayName
1279
+                = displayName.substr(0, MAX_DISPLAYNAME_LENGTH);
1280
+            APP.API.notifyDisplayNameChanged(id, formattedDisplayName);
1281
+            APP.UI.changeDisplayName(id, formattedDisplayName);
1273 1282
         });
1274 1283
 
1275 1284
         room.on(ConferenceEvents.PARTICIPANT_PROPERTY_CHANGED,

Loading…
Откажи
Сачувај