Kaynağa Gözat

fix(avatar) remove participant's "avatarID"

Through several avatar work iterations it's no longer used.
j8
Saúl Ibarra Corretgé 4 yıl önce
ebeveyn
işleme
c5f6df5210

+ 0
- 12
conference.js Dosyayı Görüntüle

@@ -24,7 +24,6 @@ import {
24 24
     reloadWithStoredParams
25 25
 } from './react/features/app/actions';
26 26
 import {
27
-    AVATAR_ID_COMMAND,
28 27
     AVATAR_URL_COMMAND,
29 28
     EMAIL_COMMAND,
30 29
     authStatusChanged,
@@ -169,7 +168,6 @@ window.JitsiMeetScreenObtainer = {
169 168
  * Known custom conference commands.
170 169
  */
171 170
 const commands = {
172
-    AVATAR_ID: AVATAR_ID_COMMAND,
173 171
     AVATAR_URL: AVATAR_URL_COMMAND,
174 172
     CUSTOM_ROLE: 'custom-role',
175 173
     EMAIL: EMAIL_COMMAND,
@@ -2136,16 +2134,6 @@ export default {
2136 2134
                     }));
2137 2135
             });
2138 2136
 
2139
-        room.addCommandListener(this.commands.defaults.AVATAR_ID,
2140
-            (data, from) => {
2141
-                APP.store.dispatch(
2142
-                    participantUpdated({
2143
-                        conference: room,
2144
-                        id: from,
2145
-                        avatarID: data.value
2146
-                    }));
2147
-            });
2148
-
2149 2137
         APP.UI.addListener(UIEvents.NICKNAME_CHANGED,
2150 2138
             this.changeLocalDisplayName.bind(this));
2151 2139
 

+ 0
- 8
react/features/base/conference/actions.js Dosyayı Görüntüle

@@ -52,7 +52,6 @@ import {
52 52
     SET_START_MUTED_POLICY
53 53
 } from './actionTypes';
54 54
 import {
55
-    AVATAR_ID_COMMAND,
56 55
     AVATAR_URL_COMMAND,
57 56
     EMAIL_COMMAND,
58 57
     JITSI_CONFERENCE_URL_KEY
@@ -198,13 +197,6 @@ function _addConferenceListeners(conference, dispatch) {
198 197
             botType
199 198
         })));
200 199
 
201
-    conference.addCommandListener(
202
-        AVATAR_ID_COMMAND,
203
-        (data, id) => dispatch(participantUpdated({
204
-            conference,
205
-            id,
206
-            avatarID: data.value
207
-        })));
208 200
     conference.addCommandListener(
209 201
         AVATAR_URL_COMMAND,
210 202
         (data, id) => dispatch(participantUpdated({

+ 0
- 7
react/features/base/conference/constants.js Dosyayı Görüntüle

@@ -1,10 +1,3 @@
1
-/**
2
- * The command type for updating a participant's avatar ID.
3
- *
4
- * @type {string}
5
- */
6
-export const AVATAR_ID_COMMAND = 'avatar-id';
7
-
8 1
 /**
9 2
  * The command type for updating a participant's avatar URL.
10 3
  *

+ 0
- 5
react/features/base/conference/functions.js Dosyayı Görüntüle

@@ -14,7 +14,6 @@ import { toState } from '../redux';
14 14
 import { safeDecodeURIComponent } from '../util';
15 15
 
16 16
 import {
17
-    AVATAR_ID_COMMAND,
18 17
     AVATAR_URL_COMMAND,
19 18
     EMAIL_COMMAND,
20 19
     JITSI_CONFERENCE_URL_KEY
@@ -316,16 +315,12 @@ export function sendLocalParticipant(
316 315
             setDisplayName: Function,
317 316
             setLocalParticipantProperty: Function }) {
318 317
     const {
319
-        avatarID,
320 318
         avatarURL,
321 319
         email,
322 320
         features,
323 321
         name
324 322
     } = getLocalParticipant(stateful);
325 323
 
326
-    avatarID && conference.sendCommand(AVATAR_ID_COMMAND, {
327
-        value: avatarID
328
-    });
329 324
     avatarURL && conference.sendCommand(AVATAR_URL_COMMAND, {
330 325
         value: avatarURL
331 326
     });

+ 0
- 1
react/features/base/participants/middleware.js Dosyayı Görüntüle

@@ -283,7 +283,6 @@ function _localParticipantJoined({ getState, dispatch }, next, action) {
283 283
     const settings = getState()['features/base/settings'];
284 284
 
285 285
     dispatch(localParticipantJoined({
286
-        avatarID: settings.avatarID,
287 286
         avatarURL: settings.avatarURL,
288 287
         email: settings.email,
289 288
         name: settings.displayName

+ 0
- 2
react/features/base/participants/reducer.js Dosyayı Görüntüle

@@ -181,7 +181,6 @@ function _participant(state: Object = {}, action) {
181 181
  */
182 182
 function _participantJoined({ participant }) {
183 183
     const {
184
-        avatarID,
185 184
         avatarURL,
186 185
         botType,
187 186
         connectionStatus,
@@ -211,7 +210,6 @@ function _participantJoined({ participant }) {
211 210
     }
212 211
 
213 212
     return {
214
-        avatarID,
215 213
         avatarURL,
216 214
         botType,
217 215
         conference,

+ 0
- 1
react/features/base/settings/actionTypes.js Dosyayı Görüntüle

@@ -5,7 +5,6 @@
5 5
  *     type: SETTINGS_UPDATED,
6 6
  *     settings: {
7 7
  *         audioOutputDeviceId: string,
8
- *         avatarID: string,
9 8
  *         avatarURL: string,
10 9
  *         cameraDeviceId: string,
11 10
  *         displayName: string,

+ 0
- 1
react/features/base/settings/actions.js Dosyayı Görüntüle

@@ -8,7 +8,6 @@ import { SETTINGS_UPDATED } from './actionTypes';
8 8
  *     type: SETTINGS_UPDATED,
9 9
  *     settings: {
10 10
  *         audioOutputDeviceId: string,
11
- *         avatarID: string,
12 11
  *         avatarURL: string,
13 12
  *         cameraDeviceId: string,
14 13
  *         displayName: string,

+ 1
- 11
react/features/base/settings/reducer.js Dosyayı Görüntüle

@@ -1,7 +1,6 @@
1 1
 // @flow
2 2
 
3 3
 import { jitsiLocalStorage } from '@jitsi/js-utils';
4
-import { randomHexString } from '@jitsi/js-utils/random';
5 4
 import _ from 'lodash';
6 5
 
7 6
 import { APP_WILL_MOUNT } from '../app/actionTypes';
@@ -19,7 +18,6 @@ import logger from './logger';
19 18
  */
20 19
 const DEFAULT_STATE = {
21 20
     audioOutputDeviceId: undefined,
22
-    avatarID: undefined,
23 21
     avatarURL: undefined,
24 22
     cameraDeviceId: undefined,
25 23
     disableCallIntegration: undefined,
@@ -126,24 +124,16 @@ function _initSettings(featureState) {
126 124
     // jibri, and remove the old settings.js values.
127 125
     const savedDisplayName = jitsiLocalStorage.getItem('displayname');
128 126
     const savedEmail = jitsiLocalStorage.getItem('email');
129
-    let avatarID = _.escape(jitsiLocalStorage.getItem('avatarId'));
130 127
 
131 128
     // The helper _.escape will convert null to an empty strings. The empty
132 129
     // string will be saved in settings. On app re-load, because an empty string
133 130
     // is a defined value, it will override any value found in local storage.
134 131
     // The workaround is sidestepping _.escape when the value is not set in
135 132
     // local storage.
136
-    const displayName
137
-        = savedDisplayName === null ? undefined : _.escape(savedDisplayName);
133
+    const displayName = savedDisplayName === null ? undefined : _.escape(savedDisplayName);
138 134
     const email = savedEmail === null ? undefined : _.escape(savedEmail);
139 135
 
140
-    if (!avatarID) {
141
-        // if there is no avatar id, we generate a unique one and use it forever
142
-        avatarID = randomHexString(32);
143
-    }
144
-
145 136
     settings = assignIfDefined({
146
-        avatarID,
147 137
         displayName,
148 138
         email
149 139
     }, settings);

Loading…
İptal
Kaydet