Fix link to post in notification

This commit is contained in:
Michael 2022-03-20 19:59:35 +00:00
parent 09e55c15e4
commit 4dace46159

View file

@ -141,7 +141,7 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
} }
$link_item = Post::selectFirstPost(['guid'], ['uri-id' => $Notification->targetUriId]); $link_item = Post::selectFirstPost(['guid'], ['uri-id' => $Notification->targetUriId]);
} else { } else {
$item = Post::selectFirst([], ['uri-id' => $Notification->targetUriId, 'uid' => [0, $Notification->uid]], ['order' => ['uid' => true]]); $link_item = $item = Post::selectFirst([], ['uri-id' => $Notification->targetUriId, 'uid' => [0, $Notification->uid]], ['order' => ['uid' => true]]);
if (empty($item)) { if (empty($item)) {
$this->logger->info('Post not found', ['uri-id' => $Notification->targetUriId]); $this->logger->info('Post not found', ['uri-id' => $Notification->targetUriId]);
return $message; return $message;
@ -154,8 +154,11 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
return $message; return $message;
} }
} }
if (($Notification->verb != Activity::POST) || !in_array($Notification->type, [Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT, Post\UserNotification::TYPE_IMPLICIT_TAGGED])) {
$link_item = $item; $link_item = $item;
} }
}
if (in_array($Notification->type, [Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_SHARED])) { if (in_array($Notification->type, [Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_SHARED])) {
$author = Contact::getById($item['author-id'], ['id', 'name', 'url', 'contact-type']); $author = Contact::getById($item['author-id'], ['id', 'name', 'url', 'contact-type']);