Merge remote-tracking branch 'upstream/2023.09-rc' into user-defined-channels

[friendica.git] / src / Model / Post / UserNotification.php

diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php
index 012a49dbf5c506d6b4fb68f4c67ae83bb3d13c1a..41c8b503122c172fc05577bcd8326f63efbf458f 100644 (file)
--- a/src/Model/Post/UserNotification.php
+++ b/src/Model/Post/UserNotification.php
@@ -133,14 +133,14 @@ class UserNotification
        public static function setNotification(int $uri_id, int $uid)
        {
                $fields = ['id', 'uri-id', 'parent-uri-id', 'uid', 'body', 'parent', 'gravity', 'vid', 'gravity',
-                       'contact-id', 'author-id', 'owner-id', 'causer-id',
+                       'contact-id', 'author-id', 'author-gsid', 'owner-id', 'owner-gsid', 'causer-id', 'causer-gsid',
                        'private', 'thr-parent', 'thr-parent-id', 'parent-uri-id', 'parent-uri', 'verb'];
                $item   = Post::selectFirst($fields, ['uri-id' => $uri_id, 'uid' => $uid, 'origin' => false]);
                if (!DBA::isResult($item)) {
                        return;
                }
 
-               $parent = Post::selectFirstPost(['author-id', 'owner-id', 'causer-id'], ['uri-id' => $item['parent-uri-id']]);
+               $parent = Post::selectFirstPost(['author-id', 'author-gsid', 'owner-id', 'owner-gsid', 'causer-id', 'causer-gsid',], ['uri-id' => $item['parent-uri-id']]);
                if (!DBA::isResult($parent)) {
                        return;
                }
@@ -195,6 +195,13 @@ class UserNotification
                        }
                }
 
+               foreach (array_unique([$parent['author-gsid'], $parent['owner-gsid'], $parent['causer-gsid'], $item['author-gsid'], $item['owner-gsid'], $item['causer-gsid']]) as $gsid) {
+                       if ($gsid && DI::userGServer()->isIgnoredByUser($uid, $gsid)) {
+                               Logger::debug('Server is ignored by user', ['uid' => $uid, 'gsid' => $gsid, 'uri-id' => $item['uri-id']]);
+                               return;
+                       }
+               }
+
                $user = User::getById($uid, ['account-type', 'account_removed', 'account_expired']);
                if (in_array($user['account-type'], [User::ACCOUNT_TYPE_COMMUNITY, User::ACCOUNT_TYPE_RELAY])) {
                        return;
@@ -595,7 +602,7 @@ class UserNotification
         */
        private static function checkQuoted(array $item, array $contacts): bool
        {
-               if (empty($item['quote-uri-id'])) {
+               if (empty($item['quote-uri-id']) || ($item['quote-uri-id'] == $item['uri-id'])) {
                        return false;
                }
                $condition = ['uri-id' => $item['quote-uri-id'], 'uid' => $item['uid'], 'author-id' => $contacts, 'deleted' => false, 'gravity' => [item::GRAVITY_PARENT, Item::GRAVITY_COMMENT]];