summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2023-08-07 12:48:57 +0200
committerJoas Schilling <coding@schilljs.com>2023-08-08 10:46:57 +0200
commit49e69db76dca56bbd93ae841a17d581a25703e23 (patch)
tree082016818681060449d604344490d4a43d340b84
parent4ae7a454ac572c0583e7e28019ac168ce39012d4 (diff)
fix(chat): Fix actor detection when type and id are provided
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--lib/Chat/SystemMessage/Listener.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Chat/SystemMessage/Listener.php b/lib/Chat/SystemMessage/Listener.php
index 6cb24278d..4fb0eba8e 100644
--- a/lib/Chat/SystemMessage/Listener.php
+++ b/lib/Chat/SystemMessage/Listener.php
@@ -448,12 +448,12 @@ class Listener implements IEventListener {
} elseif (\OC::$CLI || $this->session->exists('talk-overwrite-actor-cli')) {
$actorType = Attendee::ACTOR_GUESTS;
$actorId = 'cli';
- } elseif ($this->session->exists('talk-overwrite-actor-id')) {
- $actorType = Attendee::ACTOR_USERS;
- $actorId = $this->session->get('talk-overwrite-actor-id');
} elseif ($this->session->exists('talk-overwrite-actor-type')) {
$actorType = $this->session->get('talk-overwrite-actor-type');
$actorId = $this->session->get('talk-overwrite-actor-id');
+ } elseif ($this->session->exists('talk-overwrite-actor-id')) {
+ $actorType = Attendee::ACTOR_USERS;
+ $actorId = $this->session->get('talk-overwrite-actor-id');
} else {
$actorType = Attendee::ACTOR_GUESTS;
$sessionId = $this->talkSession->getSessionForRoom($room->getToken());