Skip to content

Commit 59a8f9d

Browse files
committed
Don't check the current user but the affected user of the notification
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
1 parent c96bb21 commit 59a8f9d

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

apps/settings/lib/Activity/GroupProvider.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,29 +88,29 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
8888
switch ($event->getSubject()) {
8989
case self::ADDED_TO_GROUP:
9090
if (isset($parsedParameters['actor'])) {
91-
if ($this->activityManager->getCurrentUserId() === $params['user']) {
91+
if ($event->getAffectedUser() === $params['user']) {
9292
$subject = $l->t('{actor} added you to group {group}');
93-
} elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
93+
} elseif (isset($params['actor']) && $event->getAffectedUser() === $params['actor']) {
9494
$subject = $l->t('You added {user} to group {group}');
9595
} else {
9696
$subject = $l->t('{actor} added {user} to group {group}');
9797
}
98-
} elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
98+
} elseif ($event->getAffectedUser() === $params['user']) {
9999
$subject = $l->t('An administrator added you to group {group}');
100100
} else {
101101
$subject = $l->t('An administrator added {user} to group {group}');
102102
}
103103
break;
104104
case self::REMOVED_FROM_GROUP:
105105
if (isset($parsedParameters['actor'])) {
106-
if ($this->activityManager->getCurrentUserId() === $params['user']) {
106+
if ($event->getAffectedUser() === $params['user']) {
107107
$subject = $l->t('{actor} removed you from group {group}');
108-
} elseif (isset($params['actor']) && $this->activityManager->getCurrentUserId() === $params['actor']) {
108+
} elseif (isset($params['actor']) && $event->getAffectedUser() === $params['actor']) {
109109
$subject = $l->t('You removed {user} from group {group}');
110110
} else {
111111
$subject = $l->t('{actor} removed {user} from group {group}');
112112
}
113-
} elseif ($this->activityManager->getCurrentUserId() === $params['user']) {
113+
} elseif ($event->getAffectedUser() === $params['user']) {
114114
$subject = $l->t('An administrator removed you from group {group}');
115115
} else {
116116
$subject = $l->t('An administrator removed {user} from group {group}');

0 commit comments

Comments
 (0)