Browse Source

fix(chat) stop using nicknames

We stopped providing a way to set them, so don't render them either.

Also cleanup some leftover config options.
master
Saúl Ibarra Corretgé 4 years ago
parent
commit
29fa4c935e

+ 0
- 1
config.js View File

678
      forceJVB121Ratio
678
      forceJVB121Ratio
679
      hiddenDomain
679
      hiddenDomain
680
      ignoreStartMuted
680
      ignoreStartMuted
681
-     nick
682
      startBitrate
681
      startBitrate
683
      */
682
      */
684
 
683
 

+ 0
- 1
doc/example-config-files/config.js.example View File

4
         muc: 'conference.jitsi.example.com', // FIXME: use XEP-0030
4
         muc: 'conference.jitsi.example.com', // FIXME: use XEP-0030
5
         bridge: 'jitsi-videobridge.jitsi.example.com' // FIXME: use XEP-0030
5
         bridge: 'jitsi-videobridge.jitsi.example.com' // FIXME: use XEP-0030
6
     },
6
     },
7
-    useNicks: false,
8
     bosh: '//jitsi.example.com/http-bind' // FIXME: use xep-0156 for that
7
     bosh: '//jitsi.example.com/http-bind' // FIXME: use xep-0156 for that
9
 };
8
 };

+ 0
- 1
doc/example-config-files/multidomain/config.js.multidomain.example View File

9
         muc: 'conference.'+subdomain+'jitsi.example.com', // FIXME: use XEP-0030
9
         muc: 'conference.'+subdomain+'jitsi.example.com', // FIXME: use XEP-0030
10
         focus: 'focus.jitsi.example.com',
10
         focus: 'focus.jitsi.example.com',
11
     },
11
     },
12
-    useNicks: false,
13
     bosh: '//jitsi.example.com/http-bind', // FIXME: use xep-0156 for that
12
     bosh: '//jitsi.example.com/http-bind', // FIXME: use xep-0156 for that
14
     websocket: 'wss://jitsi.example.com/xmpp-websocket'
13
     websocket: 'wss://jitsi.example.com/xmpp-websocket'
15
 };
14
 };

+ 0
- 5
modules/UI/UI.js View File

343
     });
343
     });
344
 };
344
 };
345
 
345
 
346
-UI.askForNickname = function() {
347
-    // eslint-disable-next-line no-alert
348
-    return window.prompt('Your nickname (optional)');
349
-};
350
-
351
 /**
346
 /**
352
  * Sets muted audio state for participant
347
  * Sets muted audio state for participant
353
  */
348
  */

+ 0
- 1
react/features/base/config/configWhitelist.js View File

128
     'localRecording',
128
     'localRecording',
129
     'maxFullResolutionParticipants',
129
     'maxFullResolutionParticipants',
130
     'minParticipants',
130
     'minParticipants',
131
-    'nick',
132
     'openBridgeChannel',
131
     'openBridgeChannel',
133
     'opusMaxAverageBitrate',
132
     'opusMaxAverageBitrate',
134
     'p2p',
133
     'p2p',

+ 5
- 8
react/features/chat/middleware.js View File

161
 
161
 
162
     conference.on(
162
     conference.on(
163
         JitsiConferenceEvents.MESSAGE_RECEIVED,
163
         JitsiConferenceEvents.MESSAGE_RECEIVED,
164
-        (id, message, timestamp, nick) => {
164
+        (id, message, timestamp) => {
165
             _handleReceivedMessage(store, {
165
             _handleReceivedMessage(store, {
166
                 id,
166
                 id,
167
                 message,
167
                 message,
168
-                nick,
169
                 privateMessage: false,
168
                 privateMessage: false,
170
                 timestamp
169
                 timestamp
171
             });
170
             });
179
                 id,
178
                 id,
180
                 message,
179
                 message,
181
                 privateMessage: true,
180
                 privateMessage: true,
182
-                timestamp,
183
-                nick: undefined
181
+                timestamp
184
             });
182
             });
185
         }
183
         }
186
     );
184
     );
215
  * @param {Object} message - The message object.
213
  * @param {Object} message - The message object.
216
  * @returns {void}
214
  * @returns {void}
217
  */
215
  */
218
-function _handleReceivedMessage({ dispatch, getState }, { id, message, nick, privateMessage, timestamp }) {
216
+function _handleReceivedMessage({ dispatch, getState }, { id, message, privateMessage, timestamp }) {
219
     // Logic for all platforms:
217
     // Logic for all platforms:
220
     const state = getState();
218
     const state = getState();
221
     const { isOpen: isChatOpen } = state['features/chat'];
219
     const { isOpen: isChatOpen } = state['features/chat'];
228
     // backfilled for a participant that has left the conference.
226
     // backfilled for a participant that has left the conference.
229
     const participant = getParticipantById(state, id) || {};
227
     const participant = getParticipantById(state, id) || {};
230
     const localParticipant = getLocalParticipant(getState);
228
     const localParticipant = getLocalParticipant(getState);
231
-    const displayName = participant.name || nick || getParticipantDisplayName(state, id);
229
+    const displayName = getParticipantDisplayName(state, id);
232
     const hasRead = participant.local || isChatOpen;
230
     const hasRead = participant.local || isChatOpen;
233
-    const timestampToDate = timestamp
234
-        ? new Date(timestamp) : new Date();
231
+    const timestampToDate = timestamp ? new Date(timestamp) : new Date();
235
     const millisecondsTimestamp = timestampToDate.getTime();
232
     const millisecondsTimestamp = timestampToDate.getTime();
236
 
233
 
237
     dispatch(addMessage({
234
     dispatch(addMessage({

Loading…
Cancel
Save