diff --git a/src/Content/Item.php b/src/Content/Item.php index 943bda4591..aec01ae292 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -607,7 +607,7 @@ class Item } else { $owner_avatar = $item['owner-id']; $owner_updated = $item['owner-updated']; - $owner_thumb = $item['owner-avatar']; + $owner_thumb = $item['owner-avatar'] ?? ''; } if (empty($owner_thumb) || Photo::isPhotoURI($owner_thumb)) { diff --git a/src/Object/Post.php b/src/Object/Post.php index 363ad5e7a9..b5ad33f56e 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -555,6 +555,7 @@ class Post 'title' => $item['title'], 'summary' => $item['content-warning'], 'localtime' => DateTimeFormat::local($item['created'], 'r'), + 'utc' => DateTimeFormat::utc($item['created']), 'ago' => $item['app'] ? DI::l10n()->t('%s from %s', $ago, $item['app']) : $ago, 'app' => $item['app'], 'created' => $ago, diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index f09b5a2e07..b96486ef3a 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -906,15 +906,15 @@ class Processor if ($id) { $shared_item = Post::selectFirst(['uri-id'], ['id' => $id]); $item['quote-uri-id'] = $shared_item['uri-id']; - DI::logger()->debug('Quote is found', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $item['quote-uri-id']]); + DI::logger()->debug('Quote is found', ['uri' => $item['uri'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $item['quote-uri-id']]); } elseif ($uri_id = ItemURI::getIdByURI($activity['quote-url'], false)) { - DI::logger()->info('Quote was not fetched but the uri-id existed', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $uri_id]); + DI::logger()->info('Quote was not fetched but the uri-id existed', ['uri' => $item['uri'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $uri_id]); $item['quote-uri-id'] = $uri_id; } elseif (Queue::exists($activity['quote-url'], 'as:Create')) { $item['quote-uri-id'] = ItemURI::getIdByURI($activity['quote-url']); - DI::logger()->info('Quote is queued but not processed yet', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $item['quote-uri-id']]); + DI::logger()->info('Quote is queued but not processed yet', ['uri' => $item['uri'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url'], 'quote-uri-id' => $item['quote-uri-id']]); } else { - DI::logger()->notice('Quote was not fetched', ['guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]); + DI::logger()->notice('Quote was not fetched', ['uri' => $item['uri'], 'uri-id' => $item['uri-id'], 'quote' => $activity['quote-url']]); } } diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index a4446e5978..890ae4f529 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -798,10 +798,12 @@ class Transmitter } if (!empty($item['quote-uri-id']) && in_array($item['private'], [Item::PUBLIC, Item::UNLISTED])) { - $quoted = Post::selectFirst(['author-link'], ['uri-id' => $item['quote-uri-id']]); - $profile = APContact::getByURL($quoted['author-link'], false); - if (!empty($profile)) { - $data['cc'][] = $profile['url']; + $quoted = Post::selectFirst(['author-link'], ['uri-id' => $item['quote-uri-id']]); + if (!empty($quoted['author-link'])) { + $profile = APContact::getByURL($quoted['author-link'], false); + if (!empty($profile)) { + $data['cc'][] = $profile['url']; + } } }