Bladeren bron

fix(sip-invite) add minor fixes to sip invite flow

master
Tudor-Ovidiu Avram 4 jaren geleden
bovenliggende
commit
f0f9c02452

+ 2
- 2
react/features/invite/actions.any.js Bestand weergeven

81
             dispatch(setCalleeInfoVisible(true, invitees[0]));
81
             dispatch(setCalleeInfoVisible(true, invitees[0]));
82
         }
82
         }
83
 
83
 
84
-        const { conference } = state['features/base/conference'];
84
+        const { conference, password } = state['features/base/conference'];
85
 
85
 
86
         if (typeof conference === 'undefined') {
86
         if (typeof conference === 'undefined') {
87
             // Invite will fail before CONFERENCE_JOIN. The request will be
87
             // Invite will fail before CONFERENCE_JOIN. The request will be
177
             sipInviteUrl,
177
             sipInviteUrl,
178
             jwt,
178
             jwt,
179
             conference.options.name,
179
             conference.options.name,
180
-            conference.password,
180
+            password,
181
             displayName
181
             displayName
182
         );
182
         );
183
 
183
 

+ 4
- 4
react/features/invite/components/add-people-dialog/AbstractAddPeopleDialog.js Bestand weergeven

160
                     if (invitedCount >= 3) {
160
                     if (invitedCount >= 3) {
161
                         notificationProps = {
161
                         notificationProps = {
162
                             titleArguments: {
162
                             titleArguments: {
163
-                                name: invitees[0].name,
163
+                                name: invitees[0].name || invitees[0].address,
164
                                 count: invitedCount - 1
164
                                 count: invitedCount - 1
165
                             },
165
                             },
166
                             titleKey: 'notify.invitedThreePlusMembers'
166
                             titleKey: 'notify.invitedThreePlusMembers'
168
                     } else if (invitedCount === 2) {
168
                     } else if (invitedCount === 2) {
169
                         notificationProps = {
169
                         notificationProps = {
170
                             titleArguments: {
170
                             titleArguments: {
171
-                                first: invitees[0].name,
172
-                                second: invitees[1].name
171
+                                first: invitees[0].name || invitees[0].address,
172
+                                second: invitees[1].name || invitees[1].address
173
                             },
173
                             },
174
                             titleKey: 'notify.invitedTwoMembers'
174
                             titleKey: 'notify.invitedTwoMembers'
175
                         };
175
                         };
176
                     } else if (invitedCount) {
176
                     } else if (invitedCount) {
177
                         notificationProps = {
177
                         notificationProps = {
178
                             titleArguments: {
178
                             titleArguments: {
179
-                                name: invitees[0].name
179
+                                name: invitees[0].name || invitees[0].address
180
                             },
180
                             },
181
                             titleKey: 'notify.invitedOneMember'
181
                             titleKey: 'notify.invitedOneMember'
182
                         };
182
                         };

+ 1
- 1
react/features/invite/components/add-people-dialog/web/InviteContactsForm.js Bestand weergeven

356
                 filterValues: [
356
                 filterValues: [
357
                     sip.address
357
                     sip.address
358
                 ],
358
                 ],
359
-                content: t('addPeople.sip', { address: sip.address }),
359
+                content: sip.address,
360
                 description: '',
360
                 description: '',
361
                 item: sip,
361
                 item: sip,
362
                 value: sip.address
362
                 value: sip.address

+ 2
- 1
react/features/lobby/components/native/KnockingParticipantList.js Bestand weergeven

6
 import { Avatar } from '../../../base/avatar';
6
 import { Avatar } from '../../../base/avatar';
7
 import { translate } from '../../../base/i18n';
7
 import { translate } from '../../../base/i18n';
8
 import { connect } from '../../../base/redux';
8
 import { connect } from '../../../base/redux';
9
+import { HIDDEN_EMAILS } from '../../constants';
9
 import AbstractKnockingParticipantList, {
10
 import AbstractKnockingParticipantList, {
10
     mapStateToProps as abstractMapStateToProps,
11
     mapStateToProps as abstractMapStateToProps,
11
     type Props
12
     type Props
44
                             <Text style = { styles.knockingParticipantListText }>
45
                             <Text style = { styles.knockingParticipantListText }>
45
                                 { p.name }
46
                                 { p.name }
46
                             </Text>
47
                             </Text>
47
-                            { p.email && (
48
+                            { p.email && !HIDDEN_EMAILS.includes(p.email) && (
48
                                 <Text style = { styles.knockingParticipantListText }>
49
                                 <Text style = { styles.knockingParticipantListText }>
49
                                     { p.email }
50
                                     { p.email }
50
                                 </Text>
51
                                 </Text>

+ 2
- 1
react/features/lobby/components/web/KnockingParticipantList.js Bestand weergeven

6
 import { translate } from '../../../base/i18n';
6
 import { translate } from '../../../base/i18n';
7
 import { connect } from '../../../base/redux';
7
 import { connect } from '../../../base/redux';
8
 import { isToolboxVisible } from '../../../toolbox/functions.web';
8
 import { isToolboxVisible } from '../../../toolbox/functions.web';
9
+import { HIDDEN_EMAILS } from '../../constants';
9
 import AbstractKnockingParticipantList, {
10
 import AbstractKnockingParticipantList, {
10
     mapStateToProps as abstractMapStateToProps,
11
     mapStateToProps as abstractMapStateToProps,
11
     type Props as AbstractProps
12
     type Props as AbstractProps
56
                                 <span data-testid = 'knockingParticipant.name'>
57
                                 <span data-testid = 'knockingParticipant.name'>
57
                                     { p.name }
58
                                     { p.name }
58
                                 </span>
59
                                 </span>
59
-                                { p.email && (
60
+                                { p.email && !HIDDEN_EMAILS.includes(p.email) && (
60
                                     <span data-testid = 'knockingParticipant.email'>
61
                                     <span data-testid = 'knockingParticipant.email'>
61
                                         { p.email }
62
                                         { p.email }
62
                                     </span>
63
                                     </span>

+ 4
- 0
react/features/lobby/constants.js Bestand weergeven

1
+/**
2
+ * Hide these emails when trying to join a lobby
3
+ */
4
+export const HIDDEN_EMAILS = [ 'inbound-sip-jibri@jitsi.net', 'outbound-sip-jibri@jitsi.net' ];

Laden…
Annuleren
Opslaan