mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-22 07:42:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5381 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2024-12-06 03:25:51 -07:00 committed by GitHub
commit f004b8dcd1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Services/StatusService.php
View file

@ -10,7 +10,7 @@ use League\Fractal\Serializer\ArraySerializer;
class StatusService class StatusService
{ {
const CACHE_KEY = 'pf:services:status:v1:'; const CACHE_KEY = 'pf:services:status:v1.1:';
public static function key($id, $publicOnly = true) public static function key($id, $publicOnly = true)
{ {

2
app/Transformer/ActivityPub/StatusTransformer.php
View file

@ -11,7 +11,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
{ {
public function transform(Status $status) 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 [ return [
'@context' => [ '@context' => [

2
app/Transformer/ActivityPub/Verb/CreateNote.php
View file

@ -52,7 +52,7 @@ class CreateNote extends Fractal\TransformerAbstract
$emojis = CustomEmoji::scan($status->caption, true) ?? []; $emojis = CustomEmoji::scan($status->caption, true) ?? [];
$emoji = array_merge($emojis, $mentions); $emoji = array_merge($emojis, $mentions);
$tags = array_merge($emoji, $hashtags); $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 [ return [
'@context' => [ '@context' => [

2
app/Transformer/ActivityPub/Verb/Note.php
View file

@ -53,7 +53,7 @@ class Note extends Fractal\TransformerAbstract
$emojis = CustomEmoji::scan($status->caption, true) ?? []; $emojis = CustomEmoji::scan($status->caption, true) ?? [];
$emoji = array_merge($emojis, $mentions); $emoji = array_merge($emojis, $mentions);
$tags = array_merge($emoji, $hashtags); $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 [ return [
'@context' => [ '@context' => [

2
app/Transformer/ActivityPub/Verb/UpdateNote.php
View file

@ -53,7 +53,7 @@ class UpdateNote extends Fractal\TransformerAbstract
$emoji = array_merge($emojis, $mentions); $emoji = array_merge($emojis, $mentions);
$tags = array_merge($emoji, $hashtags); $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(); $latestEdit = $status->edits()->latest()->first();
return [ return [

2
app/Transformer/Api/Mastodon/v1/StatusTransformer.php
View file

@ -13,7 +13,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
{ {
public function transform(Status $status) 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 [ return [
'id' => (string) $status->id, 'id' => (string) $status->id,

2
app/Transformer/Api/StatusStatelessTransformer.php
View file

@ -23,7 +23,7 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract
{ {
$taggedPeople = MediaTagService::get($status->id); $taggedPeople = MediaTagService::get($status->id);
$poll = $status->type === 'poll' ? PollService::get($status->id) : null; $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 [ return [
'_v' => 1, '_v' => 1,

2
app/Transformer/Api/StatusTransformer.php
View file

@ -25,7 +25,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
$pid = request()->user()->profile_id; $pid = request()->user()->profile_id;
$taggedPeople = MediaTagService::get($status->id); $taggedPeople = MediaTagService::get($status->id);
$poll = $status->type === 'poll' ? PollService::get($status->id, $pid) : null; $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 [ return [
'_v' => 1, '_v' => 1,