Moved permission assigning / simplified block check

diff --git a/mod/item.php b/mod/item.php
index aa673969f6f344d749440a3f38b2b0cfb8670b33..c1740c274f8d4b7e9f819cb7502ba70fbd013967 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -180,11 +180,13 @@ function item_insert(int $uid, array $request, bool $preview, string $return_pat
                        Logger::info('Public item stored for user', ['uri-id' => $toplevel_item['uri-id'], 'uid' => $post['uid'], 'stored' => $stored]);
                }
 
+               $post['parent']      = $toplevel_item['id'];
                $post['gravity']     = Item::GRAVITY_COMMENT;
                $post['thr-parent']  = $parent_item['uri'];
                $post['wall']        = $toplevel_item['wall'];
        } else {
                $parent_item         = [];
+               $post['parent']      = 0;
                $post['gravity']     = Item::GRAVITY_PARENT;
                $post['thr-parent']  = $post['uri'];
        }
@@ -237,14 +239,6 @@ function item_process(array $post, array $request, bool $preview, string $return
 
        $post = DI::contentItem()->addCategories($post, $request['category'] ?? '');
 
-       if (!$preview) {
-               if (Photo::setPermissionFromBody($post['body'], $post['uid'], $post['contact-id'], $post['allow_cid'], $post['allow_gid'], $post['deny_cid'], $post['deny_gid'])) {
-                       $post['object-type'] = Activity\ObjectType::IMAGE;
-               }
-
-               $post = DI::contentItem()->moveAttachmentsFromBodyToAttach($post);
-       }
-
        // Add the attachment to the body.
        if (!empty($request['has_attachment'])) {
                $post['body'] .= DI::contentItem()->storeAttachmentFromRequest($request);

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 0b8c03b8e9db89358921ebe11aa94e06317a05f4..4eafd28475a6b7964a9b22e29cff9ec350757753 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -820,12 +820,6 @@ class Item
        private static function prepareOriginPost(array $item): array
        {
                $item = DI::contentItem()->initializePost($item);
-
-               if (Photo::setPermissionFromBody($item['body'], $item['uid'], $item['contact-id'], $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid'])) {
-                       $item['object-type'] = Activity\ObjectType::IMAGE;
-               }
-
-               $item = DI::contentItem()->moveAttachmentsFromBodyToAttach($item);
                $item = DI::contentItem()->finalizePost($item);
 
                return $item;
@@ -1052,6 +1046,14 @@ class Item
                        }
                }
 
+               if ($notify) {
+                       if (Photo::setPermissionFromBody($item['body'], $item['uid'], $item['contact-id'], $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid'])) {
+                               $item['object-type'] = Activity\ObjectType::IMAGE;
+                       }
+
+                       $item = DI::contentItem()->moveAttachmentsFromBodyToAttach($item);
+               }
+
                $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
                $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
 

diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php
index 2a42b36340a875952e6c69c231495aa13fdd0b67..dd0bbbe1ecf0249379cfe585cbe089311e7e0978 100644 (file)
--- a/src/Model/Post/UserNotification.php
+++ b/src/Model/Post/UserNotification.php
@@ -140,6 +140,11 @@ class UserNotification
                        return;
                }
 
+               $parent = Post::selectFirstPost(['author-id', 'owner-id', 'causer-id'], ['uri-id' => $item['parent-uri-id']]);
+               if (!DBA::isResult($parent)) {
+                       return;
+               }
+
                // "Activity::FOLLOW" is an automated activity, so we ignore it here
                if ($item['verb'] == Activity::FOLLOW) {
                        return;
@@ -162,33 +167,32 @@ class UserNotification
                DBA::close($users);
 
                foreach (array_unique($uids) as $uid) {
-                       self::setNotificationForUser($item, $uid);
+                       self::setNotificationForUser($item, $parent, $uid);
                }
        }
 
        /**
         * Checks an item for notifications for the given user and sets the "notification-type" field
         *
-        * @param array $item Item array
-        * @param int   $uid  User ID
+        * @param array $item   Item array
+        * @param array $parent Parent item array
+        * @param int   $uid    User ID
         * @throws HTTPException\InternalServerErrorException
         */
-       private static function setNotificationForUser(array $item, int $uid)
+       private static function setNotificationForUser(array $item, array $parent, int $uid)
        {
-               if (Contact\User::isBlocked($item['author-id'], $uid) || Contact\User::isIgnored($item['author-id'], $uid) || Contact\User::isCollapsed($item['author-id'], $uid)) {
-                       return;
-               }
-
-               if (Contact\User::isBlocked($item['owner-id'], $uid) || Contact\User::isIgnored($item['owner-id'], $uid) || Contact\User::isCollapsed($item['owner-id'], $uid)) {
-                       return;
-               }
-
-               if (!empty($item['causer-id']) && (Contact\User::isBlocked($item['causer-id'], $uid) || Contact\User::isIgnored($item['causer-id'], $uid) || Contact\User::isCollapsed($item['causer-id'], $uid))) {
+               if (Post\ThreadUser::getIgnored($item['parent-uri-id'], $uid)) {
                        return;
                }
 
-               if (Post\ThreadUser::getIgnored($item['parent-uri-id'], $uid)) {
-                       return;
+               foreach (array_unique([$parent['author-id'], $parent['owner-id'], $parent['causer-id'], $item['author-id'], $item['owner-id'], $item['causer-id']]) as $author_id) {
+                       if (empty($author_id)) {
+                               continue;
+                       }
+                       if (Contact\User::isBlocked($author_id, $uid) || Contact\User::isIgnored($author_id, $uid) || Contact\User::isCollapsed($author_id, $uid)) {
+                               Logger::debug('Author is blocked/ignored/collapsed by user', ['uid' => $uid, 'author' => $author_id, 'uri-id' => $item['uri-id']]);
+                               return;
+                       }
                }
 
                $user = User::getById($uid, ['account-type', 'account_removed', 'account_expired']);