From 0c1a0fa55b8979f3bca13e05358a90929286c433 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 7 Jan 2022 19:47:21 -0700 Subject: [PATCH 1/3] Update PublicApiController --- app/Http/Controllers/PublicApiController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index f31aca727..5c25977ab 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -327,7 +327,7 @@ class PublicApiController extends Controller return $status; }) ->filter(function($s) use($filtered) { - return $s && in_array($s['account']['id'], $filtered) == false; + return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false; }) ->values(); $res = $timeline->toArray(); @@ -397,7 +397,7 @@ class PublicApiController extends Controller return $status; }) ->filter(function($s) use($filtered) { - return in_array($s['account']['id'], $filtered) == false; + return isset($s['account']) && in_array($s['account']['id'], $filtered) == false; }) ->values() ->toArray(); From eeaf0f931170985717afa10b6df37b252ee86f90 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 7 Jan 2022 19:59:29 -0700 Subject: [PATCH 2/3] Update StatusService --- app/Services/StatusService.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Services/StatusService.php b/app/Services/StatusService.php index 7d72ccbe0..f98b986ab 100644 --- a/app/Services/StatusService.php +++ b/app/Services/StatusService.php @@ -68,6 +68,7 @@ class StatusService $status['shortcode'], $status['taggedPeople'], $status['thread'], + $status['pinned'], $status['account']['header_bg'], $status['account']['is_admin'], $status['account']['last_fetched_at'], @@ -87,6 +88,8 @@ class StatusService $status['account']['last_status_at'] = null; $status['media_attachments'] = array_values(MediaService::getMastodon($status['id'])); + $status['muted'] = false; + $status['reblogged'] = false; return $status; } From 32bbcc12c365ab6e31eb6ae88859deddfc7caa94 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 7 Jan 2022 22:09:15 -0700 Subject: [PATCH 3/3] Update web routes --- routes/api.php | 2 -- routes/web.php | 12 +++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/routes/api.php b/routes/api.php index 35e106bb1..fde9963de 100644 --- a/routes/api.php +++ b/routes/api.php @@ -85,8 +85,6 @@ Route::group(['prefix' => 'api'], function() use($middleware) { Route::group(['prefix' => 'v2'], function() use($middleware) { Route::get('search', 'Api\ApiV1Controller@searchV2')->middleware($middleware); - Route::get('statuses/{id}/replies', 'Api\ApiV1Controller@statusReplies')->middleware($middleware); - Route::get('statuses/{id}/state', 'Api\ApiV1Controller@statusState')->middleware($middleware); }); }); diff --git a/routes/web.php b/routes/web.php index 3e91ae99c..687da5fd9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -151,6 +151,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('loops', 'DiscoverController@loopsApi'); Route::post('loops/watch', 'DiscoverController@loopWatch'); Route::get('discover/tag', 'DiscoverController@getHashtags'); + Route::get('statuses/{id}/replies', 'Api\ApiV1Controller@statusReplies'); + Route::get('statuses/{id}/state', 'Api\ApiV1Controller@statusState'); }); Route::group(['prefix' => 'pixelfed'], function() { @@ -190,24 +192,24 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments'); Route::get('likes/profile/{username}/status/{id}', 'PublicApiController@statusLikes'); Route::get('shares/profile/{username}/status/{id}', 'PublicApiController@statusShares'); - Route::get('status/{id}/replies', 'InternalApiController@statusReplies'); Route::post('moderator/action', 'InternalApiController@modAction'); Route::get('discover/categories', 'InternalApiController@discoverCategories'); Route::get('loops', 'DiscoverController@loopsApi'); Route::post('loops/watch', 'DiscoverController@loopWatch'); Route::get('discover/tag', 'DiscoverController@getHashtags'); - Route::post('status/compose', 'InternalApiController@composePost'); Route::get('discover/posts/trending', 'DiscoverController@trendingApi'); Route::get('discover/posts/hashtags', 'DiscoverController@trendingHashtags'); Route::get('discover/posts/places', 'DiscoverController@trendingPlaces'); Route::get('seasonal/yir', 'SeasonalController@getData'); Route::post('seasonal/yir', 'SeasonalController@store'); - Route::post('status/{id}/archive', 'ApiController@archive'); - Route::post('status/{id}/unarchive', 'ApiController@unarchive'); - Route::get('statuses/archives', 'ApiController@archivedPosts'); Route::get('mutes', 'AccountController@accountMutesV2'); Route::get('blocks', 'AccountController@accountBlocksV2'); Route::get('filters', 'AccountController@accountFiltersV2'); + Route::post('status/compose', 'InternalApiController@composePost'); + Route::get('status/{id}/replies', 'InternalApiController@statusReplies'); + Route::post('status/{id}/archive', 'ApiController@archive'); + Route::post('status/{id}/unarchive', 'ApiController@unarchive'); + Route::get('statuses/archives', 'ApiController@archivedPosts'); }); Route::get('discover/accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular');