From f207c5411c1b6437ee7685b9ced3cbf294d4a0b4 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 14 Mar 2024 14:58:27 +0100 Subject: =?UTF-8?q?fix(federation):=20Add=20"=E2=80=A6=20invited=20you"=20?= =?UTF-8?q?short=20cut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Joas Schilling --- lib/Chat/Parser/SystemMessage.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php index 645e0e147..84185708f 100644 --- a/lib/Chat/Parser/SystemMessage.php +++ b/lib/Chat/Parser/SystemMessage.php @@ -368,6 +368,11 @@ class SystemMessage implements IEventListener { if ($parsedParameters['federated_user']['id'] === $parsedParameters['actor']['id']) { $parsedMessage = $this->l->t('You accepted the invitation'); } + } elseif ($this->isCurrentParticipantChangedUser($currentActorType, $currentActorId, $parsedParameters['federated_user'])) { + $parsedMessage = $this->l->t('{actor} invited you'); + if ($cliIsActor) { + $parsedMessage = $this->l->t('An administrator invited you'); + } } elseif ($cliIsActor) { $parsedMessage = $this->l->t('An administrator invited {federated_user}'); } elseif ($parsedParameters['federated_user']['id'] === $parsedParameters['actor']['id']) { @@ -378,6 +383,11 @@ class SystemMessage implements IEventListener { $parsedMessage = $this->l->t('{actor} removed {federated_user}'); if ($currentUserIsActor) { $parsedMessage = $this->l->t('You removed {federated_user}'); + } elseif ($this->isCurrentParticipantChangedUser($currentActorType, $currentActorId, $parsedParameters['federated_user'])) { + $parsedMessage = $this->l->t('{actor} removed you'); + if ($cliIsActor) { + $parsedMessage = $this->l->t('An administrator removed you'); + } } elseif ($cliIsActor) { $parsedMessage = $this->l->t('An administrator removed {federated_user}'); } elseif ($parsedParameters['federated_user']['id'] === $parsedParameters['actor']['id']) { -- cgit v1.2.3