UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-26 08:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5355 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2024-11-19 03:02:22 -07:00 committed by GitHub
commit c04e19bc4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 734 additions and 762 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -3,6 +3,8 @@
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.12.3...dev)
- Update AP helpers, reject statuses with invalid dates ([960f3849](https://github.com/pixelfed/pixelfed/commit/960f3849))
- Update DirectMessage API, fix broken threading ([044d410c](https://github.com/pixelfed/pixelfed/commit/044d410c))
- Update Status caption render logic ([fb8dbb95](https://github.com/pixelfed/pixelfed/commit/fb8dbb95))
- Update ApiV1Controller, fix bookmark bug. Closes #5216 ([9f7cc52c](https://github.com/pixelfed/pixelfed/commit/9f7cc52c))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.12.4 (2024-11-08)](https://github.com/pixelfed/pixelfed/compare/v0.12.4...dev)

6
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -1878,7 +1878,7 @@ class ApiV1Controller extends Controller
$media->original_sha256 = $hash;
$media->size = $photo->getSize();
$media->mime = $mime;
$media->caption = $request->input('description') ?? "";
$media->caption = $request->input('description') ?? '';
$media->filter_class = $filterClass;
$media->filter_name = $filterName;
if ($license) {
@ -2106,7 +2106,7 @@ class ApiV1Controller extends Controller
$media->original_sha256 = $hash;
$media->size = $photo->getSize();
$media->mime = $mime;
$media->caption = $request->input('description') ?? "";
$media->caption = $request->input('description') ?? '';
$media->filter_class = $filterClass;
$media->filter_name = $filterName;
if ($license) {
@ -3951,6 +3951,7 @@ class ApiV1Controller extends Controller
abort_unless($request->user()->tokenCan('write'), 403);
$status = Status::findOrFail($id);
$user = $request->user();
$pid = $request->user()->profile_id;
$account = AccountService::get($status->profile_id);
abort_if(isset($account['moved'], $account['moved']['id']), 422, 'Cannot bookmark a post from an account that has migrated');
@ -3994,6 +3995,7 @@ class ApiV1Controller extends Controller
$status = Status::findOrFail($id);
$pid = $request->user()->profile_id;
$user = $request->user();
abort_if($user->has_roles && ! UserRoleService::can('can-bookmark', $user->id), 403, 'Invalid permissions for this action');
abort_if($status->in_reply_to_id || $status->reblog_of_id, 404);

17
app/Http/Controllers/PublicApiController.php
View file

@ -31,8 +31,8 @@ class PublicApiController extends Controller
public function __construct()
{
$this->fractal = new Fractal\Manager();
$this->fractal->setSerializer(new ArraySerializer());
$this->fractal = new Fractal\Manager;
$this->fractal->setSerializer(new ArraySerializer);
}
protected function getUserData($user)
@ -74,7 +74,7 @@ class PublicApiController extends Controller
abort_if(! in_array($cached['visibility'], ['public', 'unlisted']), 403);
$res = ['status' => $cached];
} else {
$item = new Fractal\Resource\Item($status, new StatusStatelessTransformer());
$item = new Fractal\Resource\Item($status, new StatusStatelessTransformer);
$res = [
'status' => $this->fractal->createData($item)->toArray(),
];
@ -141,7 +141,7 @@ class PublicApiController extends Controller
$replies = $status->comments()
->whereNull('reblog_of_id')
->whereIn('scope', $scope)
->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
->where('id', '>=', $request->min_id)
->orderBy('id', 'desc')
->paginate($limit);
@ -150,7 +150,7 @@ class PublicApiController extends Controller
$replies = $status->comments()
->whereNull('reblog_of_id')
->whereIn('scope', $scope)
->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
->where('id', '<=', $request->max_id)
->orderBy('id', 'desc')
->paginate($limit);
@ -159,12 +159,12 @@ class PublicApiController extends Controller
$replies = Status::whereInReplyToId($status->id)
->whereNull('reblog_of_id')
->whereIn('scope', $scope)
->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
->orderBy('id', 'desc')
->paginate($limit);
}
$resource = new Fractal\Resource\Collection($replies, new StatusStatelessTransformer(), 'data');
$resource = new Fractal\Resource\Collection($replies, new StatusStatelessTransformer, 'data');
$resource->setPaginator(new IlluminatePaginatorAdapter($replies));
$res = $this->fractal->createData($resource)->toArray();
@ -271,7 +271,6 @@ class PublicApiController extends Controller
'id',
'uri',
'caption',
'rendered',
'profile_id',
'type',
'in_reply_to_id',
@ -405,7 +404,6 @@ class PublicApiController extends Controller
'id',
'uri',
'caption',
'rendered',
'profile_id',
'type',
'in_reply_to_id',
@ -456,7 +454,6 @@ class PublicApiController extends Controller
'id',
'uri',
'caption',
'rendered',
'profile_id',
'type',
'in_reply_to_id',

18
app/Http/Resources/StatusStateless.php
View file

@ -2,18 +2,17 @@
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
use Cache;
use App\Models\CustomEmoji;
use App\Services\AccountService;
use App\Services\HashidService;
use App\Services\LikeService;
use App\Services\MediaService;
use App\Services\MediaTagService;
use App\Services\StatusHashtagService;
use App\Services\StatusLabelService;
use App\Services\StatusMentionService;
use App\Services\PollService;
use App\Models\CustomEmoji;
use App\Services\StatusHashtagService;
use App\Services\StatusMentionService;
use App\Util\Lexer\Autolink;
use Illuminate\Http\Resources\Json\JsonResource;
class StatusStateless extends JsonResource
{
@ -28,6 +27,7 @@ class StatusStateless extends JsonResource
$status = $this;
$taggedPeople = MediaTagService::get($status->id);
$poll = $status->type === 'poll' ? PollService::get($status->id) : null;
$autoLink = $status->caption ? Autolink::create()->autolink($status->caption) : null;
return [
'_v' => 1,
@ -39,7 +39,7 @@ class StatusStateless extends JsonResource
'in_reply_to_id' => $status->in_reply_to_id ? (string) $status->in_reply_to_id : null,
'in_reply_to_account_id' => $status->in_reply_to_profile_id ? (string) $status->in_reply_to_profile_id : null,
'reblog' => null,
'content' => $status->rendered ?? $status->caption,
'content' => $autoLink,
'content_text' => $status->caption,
'created_at' => str_replace('+00:00', 'Z', $status->created_at->format(DATE_RFC3339_EXTENDED)),
'emojis' => CustomEmoji::scan($status->caption),
@ -53,7 +53,7 @@ class StatusStateless extends JsonResource
'visibility' => $status->scope ?? $status->visibility,
'application' => [
'name' => 'web',
'website' => null
'website' => null,
],
'language' => null,
'mentions' => StatusMentionService::get($status->id),
@ -70,7 +70,7 @@ class StatusStateless extends JsonResource
'media_attachments' => MediaService::get($status->id),
'account' => AccountService::get($status->profile_id, true),
'tags' => StatusHashtagService::statusTags($status->id),
'poll' => $poll
'poll' => $poll,
];
}
}

40
app/Status.php
View file

@ -308,46 +308,6 @@ class Status extends Model
return $this->comments()->orderBy('created_at', 'desc')->take(3);
}
public function toActivityPubObject()
{
if($this->local == false) {
return;
}
$profile = $this->profile;
$to = $this->scopeToAudience('to');
$cc = $this->scopeToAudience('cc');
return [
'@context' => 'https://www.w3.org/ns/activitystreams',
'id' => $this->permalink(),
'type' => 'Create',
'actor' => $profile->permalink(),
'published' => str_replace('+00:00', 'Z', $this->created_at->format(DATE_RFC3339_EXTENDED)),
'to' => $to,
'cc' => $cc,
'object' => [
'id' => $this->url(),
'type' => 'Note',
'summary' => null,
'inReplyTo' => null,
'published' => str_replace('+00:00', 'Z', $this->created_at->format(DATE_RFC3339_EXTENDED)),
'url' => $this->url(),
'attributedTo' => $this->profile->url(),
'to' => $to,
'cc' => $cc,
'sensitive' => (bool) $this->is_nsfw,
'content' => $this->rendered,
'attachment' => $this->media->map(function($media) {
return [
'type' => 'Document',
'mediaType' => $media->mime,
'url' => $media->url(),
'name' => null
];
})->toArray()
]
];
}
public function scopeToAudience($audience)
{
if(!in_array($audience, ['to', 'cc']) || $this->local == false) {

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

@ -2,14 +2,17 @@
namespace App\Transformer\ActivityPub;
use App\Status;
use League\Fractal;
use App\Services\MediaService;
use App\Status;
use App\Util\Lexer\Autolink;
use League\Fractal;
class StatusTransformer extends Fractal\TransformerAbstract
{
public function transform(Status $status)
{
$content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
return [
'@context' => [
'https://www.w3.org/ns/activitystreams',
@ -28,7 +31,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
// XXX: CW Title
'summary' => null,
'content' => $status->rendered ?? $status->caption,
'content' => $content,
'inReplyTo' => null,
// TODO: fix date format
@ -53,7 +56,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
'name' => $status->place->name,
'longitude' => $status->place->long,
'latitude' => $status->place->lat,
'country' => $status->place->country
'country' => $status->place->country,
] : null,
];
}

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

@ -2,10 +2,11 @@
namespace App\Transformer\ActivityPub\Verb;
use App\Status;
use League\Fractal;
use App\Models\CustomEmoji;
use App\Status;
use App\Util\Lexer\Autolink;
use Illuminate\Support\Str;
use League\Fractal;
class CreateNote extends Fractal\TransformerAbstract
{
@ -15,25 +16,26 @@ class CreateNote extends Fractal\TransformerAbstract
$webfinger = $mention->emailUrl();
$name = Str::startsWith($webfinger, '@') ?
$webfinger :
'@' . $webfinger;
'@'.$webfinger;
return [
'type' => 'Mention',
'href' => $mention->permalink(),
'name' => $name
'name' => $name,
];
})->toArray();
if($status->in_reply_to_id != null) {
if ($status->in_reply_to_id != null) {
$parent = $status->parent()->profile;
if($parent) {
if ($parent) {
$webfinger = $parent->emailUrl();
$name = Str::startsWith($webfinger, '@') ?
$webfinger :
'@' . $webfinger;
'@'.$webfinger;
$reply = [
'type' => 'Mention',
'href' => $parent->permalink(),
'name' => $name
'name' => $name,
];
$mentions = array_merge($reply, $mentions);
}
@ -50,6 +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 ? Autolink::create()->autolink($status->caption) : null;
return [
'@context' => [
@ -62,28 +65,28 @@ class CreateNote extends Fractal\TransformerAbstract
'pixelfed' => 'http://pixelfed.org/ns#',
'commentsEnabled' => [
'@id' => 'pixelfed:commentsEnabled',
'@type' => 'schema:Boolean'
'@type' => 'schema:Boolean',
],
'capabilities' => [
'@id' => 'pixelfed:capabilities',
'@container' => '@set'
'@container' => '@set',
],
'announce' => [
'@id' => 'pixelfed:canAnnounce',
'@type' => '@id'
'@type' => '@id',
],
'like' => [
'@id' => 'pixelfed:canLike',
'@type' => '@id'
'@type' => '@id',
],
'reply' => [
'@id' => 'pixelfed:canReply',
'@type' => '@id'
'@type' => '@id',
],
'toot' => 'http://joinmastodon.org/ns#',
'Emoji' => 'toot:Emoji',
'blurhash' => 'toot:blurhash',
]
],
],
'id' => $status->permalink(),
'type' => 'Create',
@ -95,7 +98,7 @@ class CreateNote extends Fractal\TransformerAbstract
'id' => $status->url(),
'type' => 'Note',
'summary' => $status->is_nsfw ? $status->cw_summary : null,
'content' => $status->rendered ?? $status->caption,
'content' => $content,
'inReplyTo' => $status->in_reply_to_id ? $status->parent()->url() : null,
'published' => $status->created_at->toAtomString(),
'url' => $status->url(),
@ -110,32 +113,33 @@ class CreateNote extends Fractal\TransformerAbstract
'url' => $media->url(),
'name' => $media->caption,
];
if($media->blurhash) {
if ($media->blurhash) {
$res['blurhash'] = $media->blurhash;
}
if($media->width) {
if ($media->width) {
$res['width'] = $media->width;
}
if($media->height) {
if ($media->height) {
$res['height'] = $media->height;
}
return $res;
})->toArray(),
'tag' => $tags,
'commentsEnabled' => (bool) !$status->comments_disabled,
'commentsEnabled' => (bool) ! $status->comments_disabled,
'capabilities' => [
'announce' => 'https://www.w3.org/ns/activitystreams#Public',
'like' => 'https://www.w3.org/ns/activitystreams#Public',
'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public',
],
'location' => $status->place_id ? [
'type' => 'Place',
'name' => $status->place->name,
'longitude' => $status->place->long,
'latitude' => $status->place->lat,
'country' => $status->place->country
'country' => $status->place->country,
] : null,
]
],
];
}
}

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

@ -2,10 +2,11 @@
namespace App\Transformer\ActivityPub\Verb;
use App\Status;
use League\Fractal;
use App\Models\CustomEmoji;
use App\Status;
use App\Util\Lexer\Autolink;
use Illuminate\Support\Str;
use League\Fractal;
class Note extends Fractal\TransformerAbstract
{
@ -16,25 +17,26 @@ class Note extends Fractal\TransformerAbstract
$webfinger = $mention->emailUrl();
$name = Str::startsWith($webfinger, '@') ?
$webfinger :
'@' . $webfinger;
'@'.$webfinger;
return [
'type' => 'Mention',
'href' => $mention->permalink(),
'name' => $name
'name' => $name,
];
})->toArray();
if($status->in_reply_to_id != null) {
if ($status->in_reply_to_id != null) {
$parent = $status->parent()->profile;
if($parent) {
if ($parent) {
$webfinger = $parent->emailUrl();
$name = Str::startsWith($webfinger, '@') ?
$webfinger :
'@' . $webfinger;
'@'.$webfinger;
$reply = [
'type' => 'Mention',
'href' => $parent->permalink(),
'name' => $name
'name' => $name,
];
array_push($mentions, $reply);
}
@ -51,6 +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 ? Autolink::create()->autolink($status->caption) : null;
return [
'@context' => [
@ -63,33 +66,33 @@ class Note extends Fractal\TransformerAbstract
'pixelfed' => 'http://pixelfed.org/ns#',
'commentsEnabled' => [
'@id' => 'pixelfed:commentsEnabled',
'@type' => 'schema:Boolean'
'@type' => 'schema:Boolean',
],
'capabilities' => [
'@id' => 'pixelfed:capabilities',
'@container' => '@set'
'@container' => '@set',
],
'announce' => [
'@id' => 'pixelfed:canAnnounce',
'@type' => '@id'
'@type' => '@id',
],
'like' => [
'@id' => 'pixelfed:canLike',
'@type' => '@id'
'@type' => '@id',
],
'reply' => [
'@id' => 'pixelfed:canReply',
'@type' => '@id'
'@type' => '@id',
],
'toot' => 'http://joinmastodon.org/ns#',
'Emoji' => 'toot:Emoji',
'blurhash' => 'toot:blurhash',
]
],
],
'id' => $status->url(),
'type' => 'Note',
'summary' => $status->is_nsfw ? $status->cw_summary : null,
'content' => $status->rendered ?? $status->caption,
'content' => $content,
'inReplyTo' => $status->in_reply_to_id ? $status->parent()->url() : null,
'published' => $status->created_at->toAtomString(),
'url' => $status->url(),
@ -104,30 +107,31 @@ class Note extends Fractal\TransformerAbstract
'url' => $media->url(),
'name' => $media->caption,
];
if($media->blurhash) {
if ($media->blurhash) {
$res['blurhash'] = $media->blurhash;
}
if($media->width) {
if ($media->width) {
$res['width'] = $media->width;
}
if($media->height) {
if ($media->height) {
$res['height'] = $media->height;
}
return $res;
})->toArray(),
'tag' => $tags,
'commentsEnabled' => (bool) !$status->comments_disabled,
'commentsEnabled' => (bool) ! $status->comments_disabled,
'capabilities' => [
'announce' => 'https://www.w3.org/ns/activitystreams#Public',
'like' => 'https://www.w3.org/ns/activitystreams#Public',
'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public',
],
'location' => $status->place_id ? [
'type' => 'Place',
'name' => $status->place->name,
'longitude' => $status->place->long,
'latitude' => $status->place->lat,
'country' => $status->place->country
'country' => $status->place->country,
] : null,
];
}

39
app/Transformer/ActivityPub/Verb/Question.php
View file

@ -3,8 +3,9 @@
namespace App\Transformer\ActivityPub\Verb;
use App\Status;
use League\Fractal;
use App\Util\Lexer\Autolink;
use Illuminate\Support\Str;
use League\Fractal;
class Question extends Fractal\TransformerAbstract
{
@ -14,11 +15,12 @@ class Question extends Fractal\TransformerAbstract
$webfinger = $mention->emailUrl();
$name = Str::startsWith($webfinger, '@') ?
$webfinger :
'@' . $webfinger;
'@'.$webfinger;
return [
'type' => 'Mention',
'href' => $mention->permalink(),
'name' => $name
'name' => $name,
];
})->toArray();
@ -30,6 +32,7 @@ class Question extends Fractal\TransformerAbstract
];
})->toArray();
$tags = array_merge($mentions, $hashtags);
$content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
return [
'@context' => [
@ -42,32 +45,32 @@ class Question extends Fractal\TransformerAbstract
'pixelfed' => 'http://pixelfed.org/ns#',
'commentsEnabled' => [
'@id' => 'pixelfed:commentsEnabled',
'@type' => 'schema:Boolean'
'@type' => 'schema:Boolean',
],
'capabilities' => [
'@id' => 'pixelfed:capabilities',
'@container' => '@set'
'@container' => '@set',
],
'announce' => [
'@id' => 'pixelfed:canAnnounce',
'@type' => '@id'
'@type' => '@id',
],
'like' => [
'@id' => 'pixelfed:canLike',
'@type' => '@id'
'@type' => '@id',
],
'reply' => [
'@id' => 'pixelfed:canReply',
'@type' => '@id'
'@type' => '@id',
],
'toot' => 'http://joinmastodon.org/ns#',
'Emoji' => 'toot:Emoji'
]
'Emoji' => 'toot:Emoji',
],
],
'id' => $status->url(),
'type' => 'Question',
'summary' => null,
'content' => $status->rendered ?? $status->caption,
'content' => $content,
'inReplyTo' => $status->in_reply_to_id ? $status->parent()->url() : null,
'published' => $status->created_at->toAtomString(),
'url' => $status->url(),
@ -77,30 +80,30 @@ class Question extends Fractal\TransformerAbstract
'sensitive' => (bool) $status->is_nsfw,
'attachment' => [],
'tag' => $tags,
'commentsEnabled' => (bool) !$status->comments_disabled,
'commentsEnabled' => (bool) ! $status->comments_disabled,
'capabilities' => [
'announce' => 'https://www.w3.org/ns/activitystreams#Public',
'like' => 'https://www.w3.org/ns/activitystreams#Public',
'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public',
],
'location' => $status->place_id ? [
'type' => 'Place',
'name' => $status->place->name,
'longitude' => $status->place->long,
'latitude' => $status->place->lat,
'country' => $status->place->country
'country' => $status->place->country,
] : null,
'endTime' => $status->poll->expires_at->toAtomString(),
'oneOf' => collect($status->poll->poll_options)->map(function($option, $index) use($status) {
'oneOf' => collect($status->poll->poll_options)->map(function ($option, $index) use ($status) {
return [
'type' => 'Note',
'name' => $option,
'replies' => [
'type' => 'Collection',
'totalItems' => $status->poll->cached_tallies[$index]
]
'totalItems' => $status->poll->cached_tallies[$index],
],
];
})
}),
];
}
}

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

@ -2,10 +2,11 @@
namespace App\Transformer\ActivityPub\Verb;
use App\Status;
use League\Fractal;
use App\Models\CustomEmoji;
use App\Status;
use App\Util\Lexer\Autolink;
use Illuminate\Support\Str;
use League\Fractal;
class UpdateNote extends Fractal\TransformerAbstract
{
@ -15,25 +16,26 @@ class UpdateNote extends Fractal\TransformerAbstract
$webfinger = $mention->emailUrl();
$name = Str::startsWith($webfinger, '@') ?
$webfinger :
'@' . $webfinger;
'@'.$webfinger;
return [
'type' => 'Mention',
'href' => $mention->permalink(),
'name' => $name
'name' => $name,
];
})->toArray();
if($status->in_reply_to_id != null) {
if ($status->in_reply_to_id != null) {
$parent = $status->parent()->profile;
if($parent) {
if ($parent) {
$webfinger = $parent->emailUrl();
$name = Str::startsWith($webfinger, '@') ?
$webfinger :
'@' . $webfinger;
'@'.$webfinger;
$reply = [
'type' => 'Mention',
'href' => $parent->permalink(),
'name' => $name
'name' => $name,
];
$mentions = array_merge($reply, $mentions);
}
@ -51,6 +53,7 @@ class UpdateNote extends Fractal\TransformerAbstract
$emoji = array_merge($emojis, $mentions);
$tags = array_merge($emoji, $hashtags);
$content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
$latestEdit = $status->edits()->latest()->first();
return [
@ -64,29 +67,29 @@ class UpdateNote extends Fractal\TransformerAbstract
'pixelfed' => 'http://pixelfed.org/ns#',
'commentsEnabled' => [
'@id' => 'pixelfed:commentsEnabled',
'@type' => 'schema:Boolean'
'@type' => 'schema:Boolean',
],
'capabilities' => [
'@id' => 'pixelfed:capabilities',
'@container' => '@set'
'@container' => '@set',
],
'announce' => [
'@id' => 'pixelfed:canAnnounce',
'@type' => '@id'
'@type' => '@id',
],
'like' => [
'@id' => 'pixelfed:canLike',
'@type' => '@id'
'@type' => '@id',
],
'reply' => [
'@id' => 'pixelfed:canReply',
'@type' => '@id'
'@type' => '@id',
],
'toot' => 'http://joinmastodon.org/ns#',
'Emoji' => 'toot:Emoji'
]
'Emoji' => 'toot:Emoji',
],
'id' => $status->permalink('#updates/' . $latestEdit->id),
],
'id' => $status->permalink('#updates/'.$latestEdit->id),
'type' => 'Update',
'actor' => $status->profile->permalink(),
'published' => $latestEdit->created_at->toAtomString(),
@ -96,7 +99,7 @@ class UpdateNote extends Fractal\TransformerAbstract
'id' => $status->url(),
'type' => 'Note',
'summary' => $status->is_nsfw ? $status->cw_summary : null,
'content' => $status->rendered ?? $status->caption,
'content' => $content,
'inReplyTo' => $status->in_reply_to_id ? $status->parent()->url() : null,
'published' => $status->created_at->toAtomString(),
'url' => $status->url(),
@ -113,21 +116,21 @@ class UpdateNote extends Fractal\TransformerAbstract
];
})->toArray(),
'tag' => $tags,
'commentsEnabled' => (bool) !$status->comments_disabled,
'commentsEnabled' => (bool) ! $status->comments_disabled,
'updated' => $latestEdit->created_at->toAtomString(),
'capabilities' => [
'announce' => 'https://www.w3.org/ns/activitystreams#Public',
'like' => 'https://www.w3.org/ns/activitystreams#Public',
'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public',
],
'location' => $status->place_id ? [
'type' => 'Place',
'name' => $status->place->name,
'longitude' => $status->place->long,
'latitude' => $status->place->lat,
'country' => $status->place->country
'country' => $status->place->country,
] : null,
]
],
];
}
}

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

@ -2,17 +2,19 @@
namespace App\Transformer\Api\Mastodon\v1;
use App\Status;
use League\Fractal;
use Cache;
use App\Services\MediaService;
use App\Services\ProfileService;
use App\Services\StatusHashtagService;
use App\Status;
use App\Util\Lexer\Autolink;
use League\Fractal;
class StatusTransformer extends Fractal\TransformerAbstract
{
public function transform(Status $status)
{
$content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
return [
'id' => (string) $status->id,
'created_at' => $status->created_at->toJSON(),
@ -31,11 +33,11 @@ class StatusTransformer extends Fractal\TransformerAbstract
'favourited' => $status->liked(),
'muted' => false,
'bookmarked' => false,
'content' => $status->rendered ?? $status->caption ?? '',
'content' => $content,
'reblog' => null,
'application' => [
'name' => 'web',
'website' => null
'website' => null,
],
'mentions' => [],
'emojis' => [],

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

@ -2,21 +2,20 @@
namespace App\Transformer\Api;
use App\Status;
use League\Fractal;
use Cache;
use App\Models\CustomEmoji;
use App\Services\AccountService;
use App\Services\HashidService;
use App\Services\LikeService;
use App\Services\MediaService;
use App\Services\MediaTagService;
use App\Services\StatusService;
use App\Services\PollService;
use App\Services\StatusHashtagService;
use App\Services\StatusLabelService;
use App\Services\StatusMentionService;
use App\Services\PollService;
use App\Models\CustomEmoji;
use App\Services\StatusService;
use App\Status;
use App\Util\Lexer\Autolink;
use League\Fractal;
class StatusStatelessTransformer extends Fractal\TransformerAbstract
{
@ -24,9 +23,7 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract
{
$taggedPeople = MediaTagService::get($status->id);
$poll = $status->type === 'poll' ? PollService::get($status->id) : null;
$rendered = config('exp.autolink') ?
( $status->caption ? Autolink::create()->autolink($status->caption) : '' ) :
( $status->rendered ?? $status->caption );
$rendered = $status->caption ? Autolink::create()->autolink($status->caption) : null;
return [
'_v' => 1,
@ -52,7 +49,7 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract
'visibility' => $status->scope ?? $status->visibility,
'application' => [
'name' => 'web',
'website' => null
'website' => null,
],
'language' => null,
'mentions' => StatusMentionService::get($status->id),

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

@ -2,24 +2,21 @@
namespace App\Transformer\Api;
use App\Like;
use App\Status;
use League\Fractal;
use Cache;
use App\Models\CustomEmoji;
use App\Services\BookmarkService;
use App\Services\HashidService;
use App\Services\LikeService;
use App\Services\MediaService;
use App\Services\MediaTagService;
use App\Services\StatusService;
use App\Services\PollService;
use App\Services\ProfileService;
use App\Services\StatusHashtagService;
use App\Services\StatusLabelService;
use App\Services\StatusMentionService;
use App\Services\ProfileService;
use Illuminate\Support\Str;
use App\Services\PollService;
use App\Models\CustomEmoji;
use App\Services\BookmarkService;
use App\Services\StatusService;
use App\Status;
use App\Util\Lexer\Autolink;
use League\Fractal;
class StatusTransformer extends Fractal\TransformerAbstract
{
@ -28,9 +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;
$rendered = config('exp.autolink') ?
( $status->caption ? Autolink::create()->autolink($status->caption) : '' ) :
( $status->rendered ?? $status->caption );
$content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
return [
'_v' => 1,
@ -41,7 +36,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
'in_reply_to_id' => (string) $status->in_reply_to_id,
'in_reply_to_account_id' => (string) $status->in_reply_to_profile_id,
'reblog' => $status->reblog_of_id ? StatusService::get($status->reblog_of_id) : null,
'content' => $rendered,
'content' => $content,
'content_text' => $status->caption,
'created_at' => str_replace('+00:00', 'Z', $status->created_at->format(DATE_RFC3339_EXTENDED)),
'emojis' => CustomEmoji::scan($status->caption),
@ -55,7 +50,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
'visibility' => $status->scope ?? $status->visibility,
'application' => [
'name' => 'web',
'website' => null
'website' => null,
],
'language' => null,
'mentions' => StatusMentionService::get($status->id),

4
app/Util/ActivityPub/Inbox.php
View file

@ -417,8 +417,8 @@ class Inbox
return;
}
$msg = $activity['content'];
$msgText = strip_tags($activity['content']);
$msg = Purify::clean($activity['content']);
$msgText = strip_tags($msg);
if (Str::startsWith($msgText, '@'.$profile->username)) {
$len = strlen('@'.$profile->username);