diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2021-02-12 01:42:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 01:42:44 +0300 |
| commit | a93662c521110176ee642b05047d71ebeb6e79e6 (patch) | |
| tree | 98dab73049b2859b4721452d11da81bae06b1a73 | |
| parent | f987b73ffbb174eae8061d00a3173c5308f3ae0e (diff) | |
| parent | 591f8b2b3d9e207e92077b16b1d585fbeef3c021 (diff) | |
Merge pull request #5118 from nextcloud/bugfix/5109/guests-show-actor-id-instead-of-label
Show "Guest" instead of session hash for guests
| -rw-r--r-- | lib/Controller/CallController.php | 2 | ||||
| -rw-r--r-- | src/components/CallView/shared/Video.vue | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php index 19ec07389..3650494e7 100644 --- a/lib/Controller/CallController.php +++ b/lib/Controller/CallController.php @@ -113,7 +113,7 @@ class CallController extends AEnvironmentAwareController { } } } else { - $displayName = $guestNames[$participant->getAttendee()->getActorId()] ?? $displayName; + $displayName = $guestNames[$participant->getAttendee()->getActorId()] ?? ''; } $result[] = [ diff --git a/src/components/CallView/shared/Video.vue b/src/components/CallView/shared/Video.vue index acaec6009..3da309e81 100644 --- a/src/components/CallView/shared/Video.vue +++ b/src/components/CallView/shared/Video.vue @@ -100,6 +100,7 @@ import AccountCircle from 'vue-material-design-icons/AccountCircle' import VideoBottomBar from './VideoBottomBar' import Screen from './Screen' import { EventBus } from '../../../services/EventBus' +import { ATTENDEE } from '../../../constants' export default { @@ -240,7 +241,7 @@ export default { // Check data from participant list if (this.participant?.actorType) { - if (this.participant?.actorType === 'users' && this.participant?.actorId) { + if (this.participant?.actorType === ATTENDEE.ACTOR_TYPE.USERS && this.participant?.actorId) { return this.participant.actorId } @@ -249,7 +250,7 @@ export default { } // Fallback to CallController::getPeers() endpoint - if (this.peerData.actorType === 'users') { + if (this.peerData.actorType === ATTENDEE.ACTOR_TYPE.USERS) { return this.peerData.actorId } @@ -279,6 +280,9 @@ export default { if (!participantName) { participantName = this.peerData.displayName + if (!participantName && this.peerData.actorType === ATTENDEE.ACTOR_TYPE.GUESTS) { + participantName = t('spreed', 'Guest') + } } return participantName |