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

Merge pull request #3334 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2022-03-25 02:50:51 -06:00 committed by GitHub
commit 63be6cc1f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -109,6 +109,7 @@
- Updated ApiV1Controller, increase limits from 80 to 100. ([15eccd44](https://github.com/pixelfed/pixelfed/commit/15eccd44)) - Updated ApiV1Controller, increase limits from 80 to 100. ([15eccd44](https://github.com/pixelfed/pixelfed/commit/15eccd44))
- Updated ApiV1Controller, fix accountStatusesById endpoint. ([db7b1af3](https://github.com/pixelfed/pixelfed/commit/db7b1af3)) - Updated ApiV1Controller, fix accountStatusesById endpoint. ([db7b1af3](https://github.com/pixelfed/pixelfed/commit/db7b1af3))
- Updated ApiV1Controller, update statusCreate entity. ([a84ab6ea](https://github.com/pixelfed/pixelfed/commit/a84ab6ea)) - Updated ApiV1Controller, update statusCreate entity. ([a84ab6ea](https://github.com/pixelfed/pixelfed/commit/a84ab6ea))
- Updated ApiV1Controller, remove pinned attribute to match MastoAPI Status entity. ([6057de30](https://github.com/pixelfed/pixelfed/commit/6057de30))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2) ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

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

@ -2245,7 +2245,6 @@ class ApiV1Controller extends Controller
$res['favourited'] = false; $res['favourited'] = false;
$res['language'] = 'en'; $res['language'] = 'en';
$res['bookmarked'] = false; $res['bookmarked'] = false;
$res['pinned'] = false;
$res['card'] = null; $res['card'] = null;
return $this->json($res); return $this->json($res);
} }

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

@ -31,7 +31,6 @@ class StatusTransformer extends Fractal\TransformerAbstract
'favourited' => $status->liked(), 'favourited' => $status->liked(),
'muted' => false, 'muted' => false,
'bookmarked' => false, 'bookmarked' => false,
'pinned' => false,
'content' => $status->rendered ?? $status->caption ?? '', 'content' => $status->rendered ?? $status->caption ?? '',
'reblog' => null, 'reblog' => null,
'application' => [ 'application' => [

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

@ -50,7 +50,6 @@ class StatusStatelessTransformer extends Fractal\TransformerAbstract
'website' => null 'website' => null
], ],
'language' => null, 'language' => null,
'pinned' => null,
'mentions' => StatusMentionService::get($status->id), 'mentions' => StatusMentionService::get($status->id),
'tags' => [], 'tags' => [],
'pf_type' => $status->type ?? $status->setType(), 'pf_type' => $status->type ?? $status->setType(),