From aef9cb99922179a254d27c2f4bd81b817964545f Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 19 Mar 2022 09:48:50 +0000 Subject: [PATCH] Moved "ignore" check to a better location --- src/Navigation/Notifications/Factory/Notification.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Navigation/Notifications/Factory/Notification.php b/src/Navigation/Notifications/Factory/Notification.php index d75b13fe4f..ac3a2560e8 100644 --- a/src/Navigation/Notifications/Factory/Notification.php +++ b/src/Navigation/Notifications/Factory/Notification.php @@ -107,11 +107,6 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow { $message = []; - if (Post\ThreadUser::getIgnored($Notification->parentUriId, $Notification->uid)) { - $this->logger->info('Thread is ignored', ['parent-uri-id' => $Notification->parentUriId, 'type' => $Notification->type]); - return $message; - } - $causer = $author = Contact::getById($Notification->actorId, ['id', 'name', 'url', 'contact-type', 'pending']); if (empty($causer)) { $this->logger->info('Causer not found', ['contact' => $Notification->actorId]); @@ -133,6 +128,11 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow return $message; } + if (Post\ThreadUser::getIgnored($Notification->parentUriId, $Notification->uid)) { + $this->logger->info('Thread is ignored', ['parent-uri-id' => $Notification->parentUriId, 'type' => $Notification->type]); + return $message; + } + if (in_array($Notification->type, [Post\UserNotification::TYPE_THREAD_COMMENT, Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_EXPLICIT_TAGGED])) { $item = Post::selectFirst([], ['uri-id' => $Notification->parentUriId, 'uid' => [0, $Notification->uid]], ['order' => ['uid' => true]]); if (empty($item)) { -- 2.39.5