Browse Source

Merge pull request #3334 from pixelfed/staging

Staging
daniel 3 years ago
parent
commit
63be6cc1f0

+ 1 - 0
CHANGELOG.md

@@ -109,6 +109,7 @@
 - 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, 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/))
 
 ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

+ 0 - 1
app/Http/Controllers/Api/ApiV1Controller.php

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

+ 0 - 1
app/Transformer/Api/Mastodon/v1/StatusTransformer.php

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

+ 0 - 1
app/Transformer/Api/StatusStatelessTransformer.php

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