diff --git a/app/Services/StatusService.php b/app/Services/StatusService.php index 64a434d32..de2f4d112 100644 --- a/app/Services/StatusService.php +++ b/app/Services/StatusService.php @@ -10,7 +10,7 @@ use League\Fractal\Serializer\ArraySerializer; class StatusService { - const CACHE_KEY = 'pf:services:status:v1:'; + const CACHE_KEY = 'pf:services:status:v1.1:'; public static function key($id, $publicOnly = true) { diff --git a/app/Transformer/ActivityPub/StatusTransformer.php b/app/Transformer/ActivityPub/StatusTransformer.php index ec7a71d6e..c7f61b88b 100644 --- a/app/Transformer/ActivityPub/StatusTransformer.php +++ b/app/Transformer/ActivityPub/StatusTransformer.php @@ -11,7 +11,7 @@ class StatusTransformer extends Fractal\TransformerAbstract { public function transform(Status $status) { - $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null; + $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : ""; return [ '@context' => [ diff --git a/app/Transformer/ActivityPub/Verb/CreateNote.php b/app/Transformer/ActivityPub/Verb/CreateNote.php index 1061dadb7..cf2f0fb51 100644 --- a/app/Transformer/ActivityPub/Verb/CreateNote.php +++ b/app/Transformer/ActivityPub/Verb/CreateNote.php @@ -52,7 +52,7 @@ class CreateNote extends Fractal\TransformerAbstract $emojis = CustomEmoji::scan($status->caption, true) ?? []; $emoji = array_merge($emojis, $mentions); $tags = array_merge($emoji, $hashtags); - $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null; + $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : ""; return [ '@context' => [ diff --git a/app/Transformer/ActivityPub/Verb/Note.php b/app/Transformer/ActivityPub/Verb/Note.php index 0c8e20c03..bc34761cd 100644 --- a/app/Transformer/ActivityPub/Verb/Note.php +++ b/app/Transformer/ActivityPub/Verb/Note.php @@ -53,7 +53,7 @@ class Note extends Fractal\TransformerAbstract $emojis = CustomEmoji::scan($status->caption, true) ?? []; $emoji = array_merge($emojis, $mentions); $tags = array_merge($emoji, $hashtags); - $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null; + $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : ""; return [ '@context' => [ diff --git a/app/Transformer/ActivityPub/Verb/UpdateNote.php b/app/Transformer/ActivityPub/Verb/UpdateNote.php index 07f0c7e11..4199f7230 100644 --- a/app/Transformer/ActivityPub/Verb/UpdateNote.php +++ b/app/Transformer/ActivityPub/Verb/UpdateNote.php @@ -53,7 +53,7 @@ class UpdateNote extends Fractal\TransformerAbstract $emoji = array_merge($emojis, $mentions); $tags = array_merge($emoji, $hashtags); - $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null; + $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : ""; $latestEdit = $status->edits()->latest()->first(); return [ diff --git a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php index 202b82d54..16ff4cc30 100644 --- a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php +++ b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php @@ -13,7 +13,7 @@ class StatusTransformer extends Fractal\TransformerAbstract { public function transform(Status $status) { - $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null; + $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : ""; return [ 'id' => (string) $status->id, diff --git a/app/Transformer/Api/StatusStatelessTransformer.php b/app/Transformer/Api/StatusStatelessTransformer.php index db454fc9b..9f52ab50a 100644 --- a/app/Transformer/Api/StatusStatelessTransformer.php +++ b/app/Transformer/Api/StatusStatelessTransformer.php @@ -23,7 +23,7 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract { $taggedPeople = MediaTagService::get($status->id); $poll = $status->type === 'poll' ? PollService::get($status->id) : null; - $rendered = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null; + $rendered = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : ""; return [ '_v' => 1, diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php index a4abfad68..4dc08b618 100644 --- a/app/Transformer/Api/StatusTransformer.php +++ b/app/Transformer/Api/StatusTransformer.php @@ -25,7 +25,7 @@ class StatusTransformer extends Fractal\TransformerAbstract $pid = request()->user()->profile_id; $taggedPeople = MediaTagService::get($status->id); $poll = $status->type === 'poll' ? PollService::get($status->id, $pid) : null; - $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : null; + $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : ""; return [ '_v' => 1,