Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2021-02-10 19:28:21 +0300
committerJoas Schilling <coding@schilljs.com>2021-02-11 21:54:43 +0300
commit86d18ae835716fddeacd401fcaa858c6a682ebab (patch)
tree155bfc8aa99c2e2b90b2bd18b457599bf7103603
parentf987b73ffbb174eae8061d00a3173c5308f3ae0e (diff)
Show "Guest" instead of session hash for guests
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--lib/Controller/CallController.php2
-rw-r--r--src/components/CallView/shared/Video.vue3
2 files changed, 4 insertions, 1 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..d7d1fe9f8 100644
--- a/src/components/CallView/shared/Video.vue
+++ b/src/components/CallView/shared/Video.vue
@@ -279,6 +279,9 @@ export default {
if (!participantName) {
participantName = this.peerData.displayName
+ if (!participantName && this.peerData.actorType === 'guests') {
+ participantName = t('spreed', 'Guest')
+ }
}
return participantName