diff --git a/app/Http/Controllers/Api/AdminApiController.php b/app/Http/Controllers/Api/AdminApiController.php index ed3773bbc..862538179 100644 --- a/app/Http/Controllers/Api/AdminApiController.php +++ b/app/Http/Controllers/Api/AdminApiController.php @@ -23,6 +23,7 @@ use App\Services\AdminStatsService; use App\Services\ConfigCacheService; use App\Services\InstanceService; use App\Services\ModLogService; +use App\Services\SnowflakeService; use App\Services\StatusService; use App\Services\NetworkTimelineService; use App\Services\NotificationService; @@ -141,13 +142,13 @@ class AdminApiController extends Controller StatusService::del($status->id); - Notification::whereAction('autospam.warning') - ->whereProfileId($appeal->user->profile_id) - ->get() - ->each(function($n) use($appeal) { - NotificationService::del($appeal->user->profile_id, $n->id); - $n->forceDelete(); - }); + Notification::whereAction('autospam.warning') + ->whereProfileId($appeal->user->profile_id) + ->get() + ->each(function($n) use($appeal) { + NotificationService::del($appeal->user->profile_id, $n->id); + $n->forceDelete(); + }); Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id); Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id); @@ -174,13 +175,13 @@ class AdminApiController extends Controller StatusService::del($status->id, true); } - Notification::whereAction('autospam.warning') - ->whereProfileId($report->user->profile_id) - ->get() - ->each(function($n) use($report) { - NotificationService::del($report->user->profile_id, $n->id); - $n->forceDelete(); - }); + Notification::whereAction('autospam.warning') + ->whereProfileId($report->user->profile_id) + ->get() + ->each(function($n) use($report) { + NotificationService::del($report->user->profile_id, $n->id); + $n->forceDelete(); + }); }); Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id); Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id); @@ -599,4 +600,62 @@ class AdminApiController extends Controller return new AdminInstance($instance); } + + public function getAllStats(Request $request) + { + abort_if(!$request->user(), 404); + abort_unless($request->user()->is_admin === 1, 404); + + if($request->has('refresh')) { + Cache::forget('admin-api:instance-all-stats_v1'); + } + + return Cache::remember('admin-api:instance-all-stats-v1', 1209600, function() { + $days = range(0, 6); + $res = [ + 'cached_at' => now()->format('c'), + ]; + $minStatusId = SnowflakeService::byDate(now()->subDays(8)); + + foreach($days as $day) { + $label = now()->subDays($day)->format('D'); + $labelShort = substr($label, 0, 1); + $res['users']['days'][] = [ + 'date' => now()->subDays($day)->format('M j Y'), + 'label_full' => $label, + 'label' => $labelShort, + 'count' => User::whereDate('created_at', now()->subDays($day))->count() + ]; + + $res['posts']['days'][] = [ + 'date' => now()->subDays($day)->format('M j Y'), + 'label_full' => $label, + 'label' => $labelShort, + 'count' => Status::where('id', '>', $minStatusId)->whereNull('uri')->whereDate('created_at', now()->subDays($day))->count() + ]; + + $res['instances']['days'][] = [ + 'date' => now()->subDays($day)->format('M j Y'), + 'label_full' => $label, + 'label' => $labelShort, + 'count' => Instance::whereDate('created_at', now()->subDays($day))->count() + ]; + } + + $res['users']['total'] = DB::table('users')->count(); + $res['users']['min'] = collect($res['users']['days'])->min('count'); + $res['users']['max'] = $res['users']['total']; + $res['users']['change'] = $res['users']['total'] - $res['users']['min']; + $res['posts']['total'] = DB::table('statuses')->whereNull('uri')->count(); + $res['posts']['min'] = collect($res['posts']['days'])->min('count'); + $res['posts']['max'] = collect($res['posts']['days'])->max('count'); + $res['posts']['change'] = $res['posts']['total'] - $res['posts']['min']; + $res['instances']['total'] = DB::table('instances')->count(); + $res['instances']['min'] = collect($res['instances']['days'])->min('count'); + $res['instances']['max'] = collect($res['instances']['days'])->max('count'); + $res['instances']['change'] = $res['instances']['total'] - $res['instances']['min']; + + return $res; + }); + } } diff --git a/routes/api.php b/routes/api.php index 253057d16..384202f2e 100644 --- a/routes/api.php +++ b/routes/api.php @@ -20,299 +20,300 @@ Route::get('api/nodeinfo/2.0.json', 'FederationController@nodeinfo'); Route::group(['prefix' => 'api'], function() use($middleware) { - Route::group(['prefix' => 'v1'], function() use($middleware) { - Route::post('apps', 'Api\ApiV1Controller@apps'); - Route::get('apps/verify_credentials', 'Api\ApiV1Controller@getApp')->middleware($middleware); - Route::get('instance', 'Api\ApiV1Controller@instance'); - Route::get('bookmarks', 'Api\ApiV1Controller@bookmarks')->middleware($middleware); + Route::group(['prefix' => 'v1'], function() use($middleware) { + Route::post('apps', 'Api\ApiV1Controller@apps'); + Route::get('apps/verify_credentials', 'Api\ApiV1Controller@getApp')->middleware($middleware); + Route::get('instance', 'Api\ApiV1Controller@instance'); + Route::get('bookmarks', 'Api\ApiV1Controller@bookmarks')->middleware($middleware); - Route::get('accounts/verify_credentials', 'Api\ApiV1Controller@verifyCredentials')->middleware($middleware); - Route::match(['post', 'patch'], 'accounts/update_credentials', 'Api\ApiV1Controller@accountUpdateCredentials')->middleware($middleware); - Route::get('accounts/relationships', 'Api\ApiV1Controller@accountRelationshipsById')->middleware($middleware); - Route::get('accounts/search', 'Api\ApiV1Controller@accountSearch')->middleware($middleware); - Route::get('accounts/{id}/statuses', 'Api\ApiV1Controller@accountStatusesById')->middleware($middleware); - Route::get('accounts/{id}/following', 'Api\ApiV1Controller@accountFollowingById')->middleware($middleware); - Route::get('accounts/{id}/followers', 'Api\ApiV1Controller@accountFollowersById')->middleware($middleware); - Route::post('accounts/{id}/follow', 'Api\ApiV1Controller@accountFollowById')->middleware($middleware); - Route::post('accounts/{id}/unfollow', 'Api\ApiV1Controller@accountUnfollowById')->middleware($middleware); - Route::post('accounts/{id}/block', 'Api\ApiV1Controller@accountBlockById')->middleware($middleware); - Route::post('accounts/{id}/unblock', 'Api\ApiV1Controller@accountUnblockById')->middleware($middleware); - Route::post('accounts/{id}/pin', 'Api\ApiV1Controller@accountEndorsements')->middleware($middleware); - Route::post('accounts/{id}/unpin', 'Api\ApiV1Controller@accountEndorsements')->middleware($middleware); - Route::post('accounts/{id}/mute', 'Api\ApiV1Controller@accountMuteById')->middleware($middleware); - Route::post('accounts/{id}/unmute', 'Api\ApiV1Controller@accountUnmuteById')->middleware($middleware); - Route::get('accounts/{id}/lists', 'Api\ApiV1Controller@accountListsById')->middleware($middleware); - Route::get('lists/{id}/accounts', 'Api\ApiV1Controller@accountListsById')->middleware($middleware); - Route::get('accounts/{id}', 'Api\ApiV1Controller@accountById')->middleware($middleware); + Route::get('accounts/verify_credentials', 'Api\ApiV1Controller@verifyCredentials')->middleware($middleware); + Route::match(['post', 'patch'], 'accounts/update_credentials', 'Api\ApiV1Controller@accountUpdateCredentials')->middleware($middleware); + Route::get('accounts/relationships', 'Api\ApiV1Controller@accountRelationshipsById')->middleware($middleware); + Route::get('accounts/search', 'Api\ApiV1Controller@accountSearch')->middleware($middleware); + Route::get('accounts/{id}/statuses', 'Api\ApiV1Controller@accountStatusesById')->middleware($middleware); + Route::get('accounts/{id}/following', 'Api\ApiV1Controller@accountFollowingById')->middleware($middleware); + Route::get('accounts/{id}/followers', 'Api\ApiV1Controller@accountFollowersById')->middleware($middleware); + Route::post('accounts/{id}/follow', 'Api\ApiV1Controller@accountFollowById')->middleware($middleware); + Route::post('accounts/{id}/unfollow', 'Api\ApiV1Controller@accountUnfollowById')->middleware($middleware); + Route::post('accounts/{id}/block', 'Api\ApiV1Controller@accountBlockById')->middleware($middleware); + Route::post('accounts/{id}/unblock', 'Api\ApiV1Controller@accountUnblockById')->middleware($middleware); + Route::post('accounts/{id}/pin', 'Api\ApiV1Controller@accountEndorsements')->middleware($middleware); + Route::post('accounts/{id}/unpin', 'Api\ApiV1Controller@accountEndorsements')->middleware($middleware); + Route::post('accounts/{id}/mute', 'Api\ApiV1Controller@accountMuteById')->middleware($middleware); + Route::post('accounts/{id}/unmute', 'Api\ApiV1Controller@accountUnmuteById')->middleware($middleware); + Route::get('accounts/{id}/lists', 'Api\ApiV1Controller@accountListsById')->middleware($middleware); + Route::get('lists/{id}/accounts', 'Api\ApiV1Controller@accountListsById')->middleware($middleware); + Route::get('accounts/{id}', 'Api\ApiV1Controller@accountById')->middleware($middleware); - Route::post('avatar/update', 'ApiController@avatarUpdate')->middleware($middleware); - Route::get('blocks', 'Api\ApiV1Controller@accountBlocks')->middleware($middleware); - Route::get('conversations', 'Api\ApiV1Controller@conversations')->middleware($middleware); - Route::get('custom_emojis', 'Api\ApiV1Controller@customEmojis'); - Route::get('domain_blocks', 'Api\ApiV1Controller@accountDomainBlocks')->middleware($middleware); - Route::post('domain_blocks', 'Api\ApiV1Controller@accountDomainBlocks')->middleware($middleware); - Route::delete('domain_blocks', 'Api\ApiV1Controller@accountDomainBlocks')->middleware($middleware); - Route::get('endorsements', 'Api\ApiV1Controller@accountEndorsements')->middleware($middleware); - Route::get('favourites', 'Api\ApiV1Controller@accountFavourites')->middleware($middleware); - Route::get('filters', 'Api\ApiV1Controller@accountFilters')->middleware($middleware); - Route::get('follow_requests', 'Api\ApiV1Controller@accountFollowRequests')->middleware($middleware); - Route::post('follow_requests/{id}/authorize', 'Api\ApiV1Controller@accountFollowRequestAccept')->middleware($middleware); - Route::post('follow_requests/{id}/reject', 'Api\ApiV1Controller@accountFollowRequestReject')->middleware($middleware); - Route::get('lists', 'Api\ApiV1Controller@accountLists')->middleware($middleware); - Route::post('media', 'Api\ApiV1Controller@mediaUpload')->middleware($middleware); - Route::get('media/{id}', 'Api\ApiV1Controller@mediaGet')->middleware($middleware); - Route::put('media/{id}', 'Api\ApiV1Controller@mediaUpdate')->middleware($middleware); - Route::get('mutes', 'Api\ApiV1Controller@accountMutes')->middleware($middleware); - Route::get('notifications', 'Api\ApiV1Controller@accountNotifications')->middleware($middleware); - Route::get('suggestions', 'Api\ApiV1Controller@accountSuggestions')->middleware($middleware); + Route::post('avatar/update', 'ApiController@avatarUpdate')->middleware($middleware); + Route::get('blocks', 'Api\ApiV1Controller@accountBlocks')->middleware($middleware); + Route::get('conversations', 'Api\ApiV1Controller@conversations')->middleware($middleware); + Route::get('custom_emojis', 'Api\ApiV1Controller@customEmojis'); + Route::get('domain_blocks', 'Api\ApiV1Controller@accountDomainBlocks')->middleware($middleware); + Route::post('domain_blocks', 'Api\ApiV1Controller@accountDomainBlocks')->middleware($middleware); + Route::delete('domain_blocks', 'Api\ApiV1Controller@accountDomainBlocks')->middleware($middleware); + Route::get('endorsements', 'Api\ApiV1Controller@accountEndorsements')->middleware($middleware); + Route::get('favourites', 'Api\ApiV1Controller@accountFavourites')->middleware($middleware); + Route::get('filters', 'Api\ApiV1Controller@accountFilters')->middleware($middleware); + Route::get('follow_requests', 'Api\ApiV1Controller@accountFollowRequests')->middleware($middleware); + Route::post('follow_requests/{id}/authorize', 'Api\ApiV1Controller@accountFollowRequestAccept')->middleware($middleware); + Route::post('follow_requests/{id}/reject', 'Api\ApiV1Controller@accountFollowRequestReject')->middleware($middleware); + Route::get('lists', 'Api\ApiV1Controller@accountLists')->middleware($middleware); + Route::post('media', 'Api\ApiV1Controller@mediaUpload')->middleware($middleware); + Route::get('media/{id}', 'Api\ApiV1Controller@mediaGet')->middleware($middleware); + Route::put('media/{id}', 'Api\ApiV1Controller@mediaUpdate')->middleware($middleware); + Route::get('mutes', 'Api\ApiV1Controller@accountMutes')->middleware($middleware); + Route::get('notifications', 'Api\ApiV1Controller@accountNotifications')->middleware($middleware); + Route::get('suggestions', 'Api\ApiV1Controller@accountSuggestions')->middleware($middleware); - Route::post('statuses/{id}/favourite', 'Api\ApiV1Controller@statusFavouriteById')->middleware($middleware); - Route::post('statuses/{id}/unfavourite', 'Api\ApiV1Controller@statusUnfavouriteById')->middleware($middleware); - Route::get('statuses/{id}/context', 'Api\ApiV1Controller@statusContext')->middleware($middleware); - Route::get('statuses/{id}/card', 'Api\ApiV1Controller@statusCard')->middleware($middleware); - Route::get('statuses/{id}/reblogged_by', 'Api\ApiV1Controller@statusRebloggedBy')->middleware($middleware); - Route::get('statuses/{id}/favourited_by', 'Api\ApiV1Controller@statusFavouritedBy')->middleware($middleware); - Route::post('statuses/{id}/reblog', 'Api\ApiV1Controller@statusShare')->middleware($middleware); - Route::post('statuses/{id}/unreblog', 'Api\ApiV1Controller@statusUnshare')->middleware($middleware); - Route::post('statuses/{id}/bookmark', 'Api\ApiV1Controller@bookmarkStatus')->middleware($middleware); - Route::post('statuses/{id}/unbookmark', 'Api\ApiV1Controller@unbookmarkStatus')->middleware($middleware); - Route::delete('statuses/{id}', 'Api\ApiV1Controller@statusDelete')->middleware($middleware); - Route::get('statuses/{id}', 'Api\ApiV1Controller@statusById')->middleware($middleware); - Route::post('statuses', 'Api\ApiV1Controller@statusCreate')->middleware($middleware); + Route::post('statuses/{id}/favourite', 'Api\ApiV1Controller@statusFavouriteById')->middleware($middleware); + Route::post('statuses/{id}/unfavourite', 'Api\ApiV1Controller@statusUnfavouriteById')->middleware($middleware); + Route::get('statuses/{id}/context', 'Api\ApiV1Controller@statusContext')->middleware($middleware); + Route::get('statuses/{id}/card', 'Api\ApiV1Controller@statusCard')->middleware($middleware); + Route::get('statuses/{id}/reblogged_by', 'Api\ApiV1Controller@statusRebloggedBy')->middleware($middleware); + Route::get('statuses/{id}/favourited_by', 'Api\ApiV1Controller@statusFavouritedBy')->middleware($middleware); + Route::post('statuses/{id}/reblog', 'Api\ApiV1Controller@statusShare')->middleware($middleware); + Route::post('statuses/{id}/unreblog', 'Api\ApiV1Controller@statusUnshare')->middleware($middleware); + Route::post('statuses/{id}/bookmark', 'Api\ApiV1Controller@bookmarkStatus')->middleware($middleware); + Route::post('statuses/{id}/unbookmark', 'Api\ApiV1Controller@unbookmarkStatus')->middleware($middleware); + Route::delete('statuses/{id}', 'Api\ApiV1Controller@statusDelete')->middleware($middleware); + Route::get('statuses/{id}', 'Api\ApiV1Controller@statusById')->middleware($middleware); + Route::post('statuses', 'Api\ApiV1Controller@statusCreate')->middleware($middleware); - Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware); - Route::get('timelines/public', 'Api\ApiV1Controller@timelinePublic')->middleware($middleware); - Route::get('timelines/tag/{hashtag}', 'Api\ApiV1Controller@timelineHashtag')->middleware($middleware); - Route::get('discover/posts', 'Api\ApiV1Controller@discoverPosts')->middleware($middleware); + Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware); + Route::get('timelines/public', 'Api\ApiV1Controller@timelinePublic')->middleware($middleware); + Route::get('timelines/tag/{hashtag}', 'Api\ApiV1Controller@timelineHashtag')->middleware($middleware); + Route::get('discover/posts', 'Api\ApiV1Controller@discoverPosts')->middleware($middleware); - Route::get('preferences', 'Api\ApiV1Controller@getPreferences')->middleware($middleware); - Route::get('trends', 'Api\ApiV1Controller@getTrends')->middleware($middleware); - Route::get('announcements', 'Api\ApiV1Controller@getAnnouncements')->middleware($middleware); - Route::get('markers', 'Api\ApiV1Controller@getMarkers')->middleware($middleware); - Route::post('markers', 'Api\ApiV1Controller@setMarkers')->middleware($middleware); + Route::get('preferences', 'Api\ApiV1Controller@getPreferences')->middleware($middleware); + Route::get('trends', 'Api\ApiV1Controller@getTrends')->middleware($middleware); + Route::get('announcements', 'Api\ApiV1Controller@getAnnouncements')->middleware($middleware); + Route::get('markers', 'Api\ApiV1Controller@getMarkers')->middleware($middleware); + Route::post('markers', 'Api\ApiV1Controller@setMarkers')->middleware($middleware); - Route::get('followed_tags', 'Api\ApiV1Controller@getFollowedTags')->middleware($middleware); - Route::post('tags/{id}/follow', 'Api\ApiV1Controller@followHashtag')->middleware($middleware); - Route::post('tags/{id}/unfollow', 'Api\ApiV1Controller@unfollowHashtag')->middleware($middleware); - Route::get('tags/{id}', 'Api\ApiV1Controller@getHashtag')->middleware($middleware); + Route::get('followed_tags', 'Api\ApiV1Controller@getFollowedTags')->middleware($middleware); + Route::post('tags/{id}/follow', 'Api\ApiV1Controller@followHashtag')->middleware($middleware); + Route::post('tags/{id}/unfollow', 'Api\ApiV1Controller@unfollowHashtag')->middleware($middleware); + Route::get('tags/{id}', 'Api\ApiV1Controller@getHashtag')->middleware($middleware); - Route::get('statuses/{id}/history', 'StatusEditController@history')->middleware($middleware); - Route::put('statuses/{id}', 'StatusEditController@store')->middleware($middleware); - }); + Route::get('statuses/{id}/history', 'StatusEditController@history')->middleware($middleware); + Route::put('statuses/{id}', 'StatusEditController@store')->middleware($middleware); + }); - Route::group(['prefix' => 'v2'], function() use($middleware) { - Route::get('search', 'Api\ApiV2Controller@search')->middleware($middleware); - Route::post('media', 'Api\ApiV2Controller@mediaUploadV2')->middleware($middleware); - Route::get('streaming/config', 'Api\ApiV2Controller@getWebsocketConfig'); - Route::get('instance', 'Api\ApiV2Controller@instance'); - }); + Route::group(['prefix' => 'v2'], function() use($middleware) { + Route::get('search', 'Api\ApiV2Controller@search')->middleware($middleware); + Route::post('media', 'Api\ApiV2Controller@mediaUploadV2')->middleware($middleware); + Route::get('streaming/config', 'Api\ApiV2Controller@getWebsocketConfig'); + Route::get('instance', 'Api\ApiV2Controller@instance'); + }); - Route::group(['prefix' => 'v1.1'], function() use($middleware) { - $reportMiddleware = $middleware; - $reportMiddleware[] = DeprecatedEndpoint::class; - Route::post('report', 'Api\ApiV1Dot1Controller@report')->middleware($reportMiddleware); + Route::group(['prefix' => 'v1.1'], function() use($middleware) { + $reportMiddleware = $middleware; + $reportMiddleware[] = DeprecatedEndpoint::class; + Route::post('report', 'Api\ApiV1Dot1Controller@report')->middleware($reportMiddleware); - Route::group(['prefix' => 'accounts'], function () use($middleware) { - $middleware[] = DeprecatedEndpoint::class; - Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware); - Route::delete('avatar', 'Api\ApiV1Dot1Controller@deleteAvatar')->middleware($middleware); - Route::get('{id}/posts', 'Api\ApiV1Dot1Controller@accountPosts')->middleware($middleware); - Route::post('change-password', 'Api\ApiV1Dot1Controller@accountChangePassword')->middleware($middleware); - Route::get('login-activity', 'Api\ApiV1Dot1Controller@accountLoginActivity')->middleware($middleware); - Route::get('two-factor', 'Api\ApiV1Dot1Controller@accountTwoFactor')->middleware($middleware); - Route::get('emails-from-pixelfed', 'Api\ApiV1Dot1Controller@accountEmailsFromPixelfed')->middleware($middleware); - Route::get('apps-and-applications', 'Api\ApiV1Dot1Controller@accountApps')->middleware($middleware); - }); + Route::group(['prefix' => 'accounts'], function () use($middleware) { + $middleware[] = DeprecatedEndpoint::class; + Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware); + Route::delete('avatar', 'Api\ApiV1Dot1Controller@deleteAvatar')->middleware($middleware); + Route::get('{id}/posts', 'Api\ApiV1Dot1Controller@accountPosts')->middleware($middleware); + Route::post('change-password', 'Api\ApiV1Dot1Controller@accountChangePassword')->middleware($middleware); + Route::get('login-activity', 'Api\ApiV1Dot1Controller@accountLoginActivity')->middleware($middleware); + Route::get('two-factor', 'Api\ApiV1Dot1Controller@accountTwoFactor')->middleware($middleware); + Route::get('emails-from-pixelfed', 'Api\ApiV1Dot1Controller@accountEmailsFromPixelfed')->middleware($middleware); + Route::get('apps-and-applications', 'Api\ApiV1Dot1Controller@accountApps')->middleware($middleware); + }); - Route::group(['prefix' => 'collections'], function () use($middleware) { - $middleware[] = DeprecatedEndpoint::class; - Route::get('accounts/{id}', 'CollectionController@getUserCollections')->middleware($middleware); - Route::get('items/{id}', 'CollectionController@getItems')->middleware($middleware); - Route::get('view/{id}', 'CollectionController@getCollection')->middleware($middleware); - Route::post('add', 'CollectionController@storeId')->middleware($middleware); - Route::post('update/{id}', 'CollectionController@store')->middleware($middleware); - Route::delete('delete/{id}', 'CollectionController@delete')->middleware($middleware); - Route::post('remove', 'CollectionController@deleteId')->middleware($middleware); - }); + Route::group(['prefix' => 'collections'], function () use($middleware) { + $middleware[] = DeprecatedEndpoint::class; + Route::get('accounts/{id}', 'CollectionController@getUserCollections')->middleware($middleware); + Route::get('items/{id}', 'CollectionController@getItems')->middleware($middleware); + Route::get('view/{id}', 'CollectionController@getCollection')->middleware($middleware); + Route::post('add', 'CollectionController@storeId')->middleware($middleware); + Route::post('update/{id}', 'CollectionController@store')->middleware($middleware); + Route::delete('delete/{id}', 'CollectionController@delete')->middleware($middleware); + Route::post('remove', 'CollectionController@deleteId')->middleware($middleware); + }); - Route::group(['prefix' => 'direct'], function () use($middleware) { - $middleware[] = DeprecatedEndpoint::class; - Route::get('thread', 'DirectMessageController@thread')->middleware($middleware); - Route::post('thread/send', 'DirectMessageController@create')->middleware($middleware); - Route::delete('thread/message', 'DirectMessageController@delete')->middleware($middleware); - Route::post('thread/mute', 'DirectMessageController@mute')->middleware($middleware); - Route::post('thread/unmute', 'DirectMessageController@unmute')->middleware($middleware); - Route::post('thread/media', 'DirectMessageController@mediaUpload')->middleware($middleware); - Route::post('thread/read', 'DirectMessageController@read')->middleware($middleware); - Route::post('lookup', 'DirectMessageController@composeLookup')->middleware($middleware); - }); + Route::group(['prefix' => 'direct'], function () use($middleware) { + $middleware[] = DeprecatedEndpoint::class; + Route::get('thread', 'DirectMessageController@thread')->middleware($middleware); + Route::post('thread/send', 'DirectMessageController@create')->middleware($middleware); + Route::delete('thread/message', 'DirectMessageController@delete')->middleware($middleware); + Route::post('thread/mute', 'DirectMessageController@mute')->middleware($middleware); + Route::post('thread/unmute', 'DirectMessageController@unmute')->middleware($middleware); + Route::post('thread/media', 'DirectMessageController@mediaUpload')->middleware($middleware); + Route::post('thread/read', 'DirectMessageController@read')->middleware($middleware); + Route::post('lookup', 'DirectMessageController@composeLookup')->middleware($middleware); + }); - Route::group(['prefix' => 'archive'], function () use($middleware) { - $middleware[] = DeprecatedEndpoint::class; - Route::post('add/{id}', 'Api\ApiV1Dot1Controller@archive')->middleware($middleware); - Route::post('remove/{id}', 'Api\ApiV1Dot1Controller@unarchive')->middleware($middleware); - Route::get('list', 'Api\ApiV1Dot1Controller@archivedPosts')->middleware($middleware); - }); + Route::group(['prefix' => 'archive'], function () use($middleware) { + $middleware[] = DeprecatedEndpoint::class; + Route::post('add/{id}', 'Api\ApiV1Dot1Controller@archive')->middleware($middleware); + Route::post('remove/{id}', 'Api\ApiV1Dot1Controller@unarchive')->middleware($middleware); + Route::get('list', 'Api\ApiV1Dot1Controller@archivedPosts')->middleware($middleware); + }); - Route::group(['prefix' => 'places'], function () use($middleware) { - $middleware[] = DeprecatedEndpoint::class; - Route::get('posts/{id}/{slug}', 'Api\ApiV1Dot1Controller@placesById')->middleware($middleware); - }); + Route::group(['prefix' => 'places'], function () use($middleware) { + $middleware[] = DeprecatedEndpoint::class; + Route::get('posts/{id}/{slug}', 'Api\ApiV1Dot1Controller@placesById')->middleware($middleware); + }); - Route::group(['prefix' => 'stories'], function () use($middleware) { - $middleware[] = DeprecatedEndpoint::class; - Route::get('carousel', 'Stories\StoryApiV1Controller@carousel')->middleware($middleware); - Route::post('add', 'Stories\StoryApiV1Controller@add')->middleware($middleware); - Route::post('publish', 'Stories\StoryApiV1Controller@publish')->middleware($middleware); - Route::post('seen', 'Stories\StoryApiV1Controller@viewed')->middleware($middleware); - Route::post('self-expire/{id}', 'Stories\StoryApiV1Controller@delete')->middleware($middleware); - Route::post('comment', 'Stories\StoryApiV1Controller@comment')->middleware($middleware); - }); + Route::group(['prefix' => 'stories'], function () use($middleware) { + $middleware[] = DeprecatedEndpoint::class; + Route::get('carousel', 'Stories\StoryApiV1Controller@carousel')->middleware($middleware); + Route::post('add', 'Stories\StoryApiV1Controller@add')->middleware($middleware); + Route::post('publish', 'Stories\StoryApiV1Controller@publish')->middleware($middleware); + Route::post('seen', 'Stories\StoryApiV1Controller@viewed')->middleware($middleware); + Route::post('self-expire/{id}', 'Stories\StoryApiV1Controller@delete')->middleware($middleware); + Route::post('comment', 'Stories\StoryApiV1Controller@comment')->middleware($middleware); + }); - Route::group(['prefix' => 'compose'], function () use($middleware) { - $middleware[] = DeprecatedEndpoint::class; - Route::get('search/location', 'ComposeController@searchLocation')->middleware($middleware); - Route::get('settings', 'ComposeController@composeSettings')->middleware($middleware); - }); + Route::group(['prefix' => 'compose'], function () use($middleware) { + $middleware[] = DeprecatedEndpoint::class; + Route::get('search/location', 'ComposeController@searchLocation')->middleware($middleware); + Route::get('settings', 'ComposeController@composeSettings')->middleware($middleware); + }); - Route::group(['prefix' => 'discover'], function () use($middleware) { - $middleware[] = DeprecatedEndpoint::class; - Route::get('accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular')->middleware($middleware); - Route::get('posts/trending', 'DiscoverController@trendingApi')->middleware($middleware); - Route::get('posts/hashtags', 'DiscoverController@trendingHashtags')->middleware($middleware); - }); + Route::group(['prefix' => 'discover'], function () use($middleware) { + $middleware[] = DeprecatedEndpoint::class; + Route::get('accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular')->middleware($middleware); + Route::get('posts/trending', 'DiscoverController@trendingApi')->middleware($middleware); + Route::get('posts/hashtags', 'DiscoverController@trendingHashtags')->middleware($middleware); + }); - Route::group(['prefix' => 'directory'], function () use($middleware) { - $middleware[] = DeprecatedEndpoint::class; - Route::get('listing', 'PixelfedDirectoryController@get'); - }); + Route::group(['prefix' => 'directory'], function () use($middleware) { + $middleware[] = DeprecatedEndpoint::class; + Route::get('listing', 'PixelfedDirectoryController@get'); + }); - Route::group(['prefix' => 'auth'], function () use($middleware) { - Route::get('iarpfc', 'Api\ApiV1Dot1Controller@inAppRegistrationPreFlightCheck'); - Route::post('iar', 'Api\ApiV1Dot1Controller@inAppRegistration'); - Route::post('iarc', 'Api\ApiV1Dot1Controller@inAppRegistrationConfirm'); - Route::get('iarer', 'Api\ApiV1Dot1Controller@inAppRegistrationEmailRedirect'); + Route::group(['prefix' => 'auth'], function () use($middleware) { + Route::get('iarpfc', 'Api\ApiV1Dot1Controller@inAppRegistrationPreFlightCheck'); + Route::post('iar', 'Api\ApiV1Dot1Controller@inAppRegistration'); + Route::post('iarc', 'Api\ApiV1Dot1Controller@inAppRegistrationConfirm'); + Route::get('iarer', 'Api\ApiV1Dot1Controller@inAppRegistrationEmailRedirect'); - Route::post('invite/admin/verify', 'AdminInviteController@apiVerifyCheck')->middleware('throttle:20,120'); - Route::post('invite/admin/uc', 'AdminInviteController@apiUsernameCheck')->middleware('throttle:20,120'); - Route::post('invite/admin/ec', 'AdminInviteController@apiEmailCheck')->middleware('throttle:10,1440'); - }); - }); + Route::post('invite/admin/verify', 'AdminInviteController@apiVerifyCheck')->middleware('throttle:20,120'); + Route::post('invite/admin/uc', 'AdminInviteController@apiUsernameCheck')->middleware('throttle:20,120'); + Route::post('invite/admin/ec', 'AdminInviteController@apiEmailCheck')->middleware('throttle:10,1440'); + }); + }); - Route::group(['prefix' => 'live'], function() use($middleware) { - Route::post('create_stream', 'LiveStreamController@createStream')->middleware($middleware); - Route::post('stream/edit', 'LiveStreamController@editStream')->middleware($middleware); - Route::get('active/list', 'LiveStreamController@getActiveStreams')->middleware($middleware); - Route::get('accounts/stream', 'LiveStreamController@getUserStream')->middleware($middleware); - Route::get('accounts/stream/guest', 'LiveStreamController@getUserStreamAsGuest'); - Route::delete('accounts/stream', 'LiveStreamController@deleteStream')->middleware($middleware); - Route::get('chat/latest', 'LiveStreamController@getLatestChat')->middleware($middleware); - Route::post('chat/message', 'LiveStreamController@addChatComment')->middleware($middleware); - Route::post('chat/delete', 'LiveStreamController@deleteChatComment')->middleware($middleware); - Route::post('chat/ban-user', 'LiveStreamController@banChatUser')->middleware($middleware); - Route::post('chat/pin', 'LiveStreamController@pinChatComment')->middleware($middleware); - Route::post('chat/unpin', 'LiveStreamController@unpinChatComment')->middleware($middleware); - Route::get('config', 'LiveStreamController@getConfig'); - Route::post('broadcast/publish', 'LiveStreamController@clientBroadcastPublish'); - Route::post('broadcast/finish', 'LiveStreamController@clientBroadcastFinish'); - }); + Route::group(['prefix' => 'live'], function() use($middleware) { + // Route::post('create_stream', 'LiveStreamController@createStream')->middleware($middleware); + // Route::post('stream/edit', 'LiveStreamController@editStream')->middleware($middleware); + // Route::get('active/list', 'LiveStreamController@getActiveStreams')->middleware($middleware); + // Route::get('accounts/stream', 'LiveStreamController@getUserStream')->middleware($middleware); + // Route::get('accounts/stream/guest', 'LiveStreamController@getUserStreamAsGuest'); + // Route::delete('accounts/stream', 'LiveStreamController@deleteStream')->middleware($middleware); + // Route::get('chat/latest', 'LiveStreamController@getLatestChat')->middleware($middleware); + // Route::post('chat/message', 'LiveStreamController@addChatComment')->middleware($middleware); + // Route::post('chat/delete', 'LiveStreamController@deleteChatComment')->middleware($middleware); + // Route::post('chat/ban-user', 'LiveStreamController@banChatUser')->middleware($middleware); + // Route::post('chat/pin', 'LiveStreamController@pinChatComment')->middleware($middleware); + // Route::post('chat/unpin', 'LiveStreamController@unpinChatComment')->middleware($middleware); + // Route::get('config', 'LiveStreamController@getConfig'); + // Route::post('broadcast/publish', 'LiveStreamController@clientBroadcastPublish')->middleware($middleware); + // Route::post('broadcast/finish', 'LiveStreamController@clientBroadcastFinish')->middleware($middleware); + }); - Route::group(['prefix' => 'admin'], function() use($middleware) { - Route::post('moderate/post/{id}', 'Api\ApiV1Dot1Controller@moderatePost')->middleware($middleware); - Route::get('supported', 'Api\AdminApiController@supported')->middleware($middleware); - Route::get('stats', 'Api\AdminApiController@getStats')->middleware($middleware); + Route::group(['prefix' => 'admin'], function() use($middleware) { + Route::post('moderate/post/{id}', 'Api\ApiV1Dot1Controller@moderatePost')->middleware($middleware); + Route::get('supported', 'Api\AdminApiController@supported')->middleware($middleware); + Route::get('stats', 'Api\AdminApiController@getStats')->middleware($middleware); - Route::get('autospam/list', 'Api\AdminApiController@autospam')->middleware($middleware); - Route::post('autospam/handle', 'Api\AdminApiController@autospamHandle')->middleware($middleware); - Route::get('mod-reports/list', 'Api\AdminApiController@modReports')->middleware($middleware); - Route::post('mod-reports/handle', 'Api\AdminApiController@modReportHandle')->middleware($middleware); - Route::get('config', 'Api\AdminApiController@getConfiguration')->middleware($middleware); - Route::post('config/update', 'Api\AdminApiController@updateConfiguration')->middleware($middleware); - Route::get('users/list', 'Api\AdminApiController@getUsers')->middleware($middleware); - Route::get('users/get', 'Api\AdminApiController@getUser')->middleware($middleware); - Route::post('users/action', 'Api\AdminApiController@userAdminAction')->middleware($middleware); - Route::get('instances/list', 'Api\AdminApiController@instances')->middleware($middleware); - Route::get('instances/get', 'Api\AdminApiController@getInstance')->middleware($middleware); - Route::post('instances/moderate', 'Api\AdminApiController@moderateInstance')->middleware($middleware); - Route::post('instances/refresh-stats', 'Api\AdminApiController@refreshInstanceStats')->middleware($middleware); - }); + Route::get('autospam/list', 'Api\AdminApiController@autospam')->middleware($middleware); + Route::post('autospam/handle', 'Api\AdminApiController@autospamHandle')->middleware($middleware); + Route::get('mod-reports/list', 'Api\AdminApiController@modReports')->middleware($middleware); + Route::post('mod-reports/handle', 'Api\AdminApiController@modReportHandle')->middleware($middleware); + Route::get('config', 'Api\AdminApiController@getConfiguration')->middleware($middleware); + Route::post('config/update', 'Api\AdminApiController@updateConfiguration')->middleware($middleware); + Route::get('users/list', 'Api\AdminApiController@getUsers')->middleware($middleware); + Route::get('users/get', 'Api\AdminApiController@getUser')->middleware($middleware); + Route::post('users/action', 'Api\AdminApiController@userAdminAction')->middleware($middleware); + Route::get('instances/list', 'Api\AdminApiController@instances')->middleware($middleware); + Route::get('instances/get', 'Api\AdminApiController@getInstance')->middleware($middleware); + Route::post('instances/moderate', 'Api\AdminApiController@moderateInstance')->middleware($middleware); + Route::post('instances/refresh-stats', 'Api\AdminApiController@refreshInstanceStats')->middleware($middleware); + Route::get('instance/stats', 'Api\AdminApiController@getAllStats')->middleware($middleware); + }); - Route::group(['prefix' => 'landing/v1'], function() use($middleware) { - Route::get('directory', 'LandingController@getDirectoryApi'); - }); + Route::group(['prefix' => 'landing/v1'], function() use($middleware) { + Route::get('directory', 'LandingController@getDirectoryApi'); + }); - Route::group(['prefix' => 'pixelfed'], function() use($middleware) { - Route::group(['prefix' => 'v1'], function() use($middleware) { - Route::post('report', 'Api\ApiV1Dot1Controller@report')->middleware($middleware); + Route::group(['prefix' => 'pixelfed'], function() use($middleware) { + Route::group(['prefix' => 'v1'], function() use($middleware) { + Route::post('report', 'Api\ApiV1Dot1Controller@report')->middleware($middleware); - Route::group(['prefix' => 'accounts'], function () use($middleware) { - Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware); - Route::delete('avatar', 'Api\ApiV1Dot1Controller@deleteAvatar')->middleware($middleware); - Route::get('{id}/posts', 'Api\ApiV1Dot1Controller@accountPosts')->middleware($middleware); - Route::post('change-password', 'Api\ApiV1Dot1Controller@accountChangePassword')->middleware($middleware); - Route::get('login-activity', 'Api\ApiV1Dot1Controller@accountLoginActivity')->middleware($middleware); - Route::get('two-factor', 'Api\ApiV1Dot1Controller@accountTwoFactor')->middleware($middleware); - Route::get('emails-from-pixelfed', 'Api\ApiV1Dot1Controller@accountEmailsFromPixelfed')->middleware($middleware); - Route::get('apps-and-applications', 'Api\ApiV1Dot1Controller@accountApps')->middleware($middleware); - }); + Route::group(['prefix' => 'accounts'], function () use($middleware) { + Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware); + Route::delete('avatar', 'Api\ApiV1Dot1Controller@deleteAvatar')->middleware($middleware); + Route::get('{id}/posts', 'Api\ApiV1Dot1Controller@accountPosts')->middleware($middleware); + Route::post('change-password', 'Api\ApiV1Dot1Controller@accountChangePassword')->middleware($middleware); + Route::get('login-activity', 'Api\ApiV1Dot1Controller@accountLoginActivity')->middleware($middleware); + Route::get('two-factor', 'Api\ApiV1Dot1Controller@accountTwoFactor')->middleware($middleware); + Route::get('emails-from-pixelfed', 'Api\ApiV1Dot1Controller@accountEmailsFromPixelfed')->middleware($middleware); + Route::get('apps-and-applications', 'Api\ApiV1Dot1Controller@accountApps')->middleware($middleware); + }); - Route::group(['prefix' => 'archive'], function () use($middleware) { - Route::post('add/{id}', 'Api\ApiV1Dot1Controller@archive')->middleware($middleware); - Route::post('remove/{id}', 'Api\ApiV1Dot1Controller@unarchive')->middleware($middleware); - Route::get('list', 'Api\ApiV1Dot1Controller@archivedPosts')->middleware($middleware); - }); + Route::group(['prefix' => 'archive'], function () use($middleware) { + Route::post('add/{id}', 'Api\ApiV1Dot1Controller@archive')->middleware($middleware); + Route::post('remove/{id}', 'Api\ApiV1Dot1Controller@unarchive')->middleware($middleware); + Route::get('list', 'Api\ApiV1Dot1Controller@archivedPosts')->middleware($middleware); + }); - Route::group(['prefix' => 'collections'], function () use($middleware) { - Route::get('accounts/{id}', 'CollectionController@getUserCollections')->middleware($middleware); - Route::get('items/{id}', 'CollectionController@getItems')->middleware($middleware); - Route::get('view/{id}', 'CollectionController@getCollection')->middleware($middleware); - Route::post('add', 'CollectionController@storeId')->middleware($middleware); - Route::post('update/{id}', 'CollectionController@store')->middleware($middleware); - Route::delete('delete/{id}', 'CollectionController@delete')->middleware($middleware); - Route::post('remove', 'CollectionController@deleteId')->middleware($middleware); - }); + Route::group(['prefix' => 'collections'], function () use($middleware) { + Route::get('accounts/{id}', 'CollectionController@getUserCollections')->middleware($middleware); + Route::get('items/{id}', 'CollectionController@getItems')->middleware($middleware); + Route::get('view/{id}', 'CollectionController@getCollection')->middleware($middleware); + Route::post('add', 'CollectionController@storeId')->middleware($middleware); + Route::post('update/{id}', 'CollectionController@store')->middleware($middleware); + Route::delete('delete/{id}', 'CollectionController@delete')->middleware($middleware); + Route::post('remove', 'CollectionController@deleteId')->middleware($middleware); + }); - Route::group(['prefix' => 'compose'], function () use($middleware) { - Route::get('search/location', 'ComposeController@searchLocation')->middleware($middleware); - Route::get('settings', 'ComposeController@composeSettings')->middleware($middleware); - }); + Route::group(['prefix' => 'compose'], function () use($middleware) { + Route::get('search/location', 'ComposeController@searchLocation')->middleware($middleware); + Route::get('settings', 'ComposeController@composeSettings')->middleware($middleware); + }); - Route::group(['prefix' => 'direct'], function () use($middleware) { - Route::get('thread', 'DirectMessageController@thread')->middleware($middleware); - Route::post('thread/send', 'DirectMessageController@create')->middleware($middleware); - Route::delete('thread/message', 'DirectMessageController@delete')->middleware($middleware); - Route::post('thread/mute', 'DirectMessageController@mute')->middleware($middleware); - Route::post('thread/unmute', 'DirectMessageController@unmute')->middleware($middleware); - Route::post('thread/media', 'DirectMessageController@mediaUpload')->middleware($middleware); - Route::post('thread/read', 'DirectMessageController@read')->middleware($middleware); - Route::post('lookup', 'DirectMessageController@composeLookup')->middleware($middleware); - }); + Route::group(['prefix' => 'direct'], function () use($middleware) { + Route::get('thread', 'DirectMessageController@thread')->middleware($middleware); + Route::post('thread/send', 'DirectMessageController@create')->middleware($middleware); + Route::delete('thread/message', 'DirectMessageController@delete')->middleware($middleware); + Route::post('thread/mute', 'DirectMessageController@mute')->middleware($middleware); + Route::post('thread/unmute', 'DirectMessageController@unmute')->middleware($middleware); + Route::post('thread/media', 'DirectMessageController@mediaUpload')->middleware($middleware); + Route::post('thread/read', 'DirectMessageController@read')->middleware($middleware); + Route::post('lookup', 'DirectMessageController@composeLookup')->middleware($middleware); + }); - Route::group(['prefix' => 'discover'], function () use($middleware) { - Route::get('accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular')->middleware($middleware); - Route::get('posts/trending', 'DiscoverController@trendingApi')->middleware($middleware); - Route::get('posts/hashtags', 'DiscoverController@trendingHashtags')->middleware($middleware); - }); + Route::group(['prefix' => 'discover'], function () use($middleware) { + Route::get('accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular')->middleware($middleware); + Route::get('posts/trending', 'DiscoverController@trendingApi')->middleware($middleware); + Route::get('posts/hashtags', 'DiscoverController@trendingHashtags')->middleware($middleware); + }); - Route::group(['prefix' => 'directory'], function () use($middleware) { - Route::get('listing', 'PixelfedDirectoryController@get'); - }); + Route::group(['prefix' => 'directory'], function () use($middleware) { + Route::get('listing', 'PixelfedDirectoryController@get'); + }); - Route::group(['prefix' => 'places'], function () use($middleware) { - Route::get('posts/{id}/{slug}', 'Api\ApiV1Dot1Controller@placesById')->middleware($middleware); - }); + Route::group(['prefix' => 'places'], function () use($middleware) { + Route::get('posts/{id}/{slug}', 'Api\ApiV1Dot1Controller@placesById')->middleware($middleware); + }); - Route::get('app/settings', 'UserAppSettingsController@get')->middleware($middleware); - Route::post('app/settings', 'UserAppSettingsController@store')->middleware($middleware); + Route::get('app/settings', 'UserAppSettingsController@get')->middleware($middleware); + Route::post('app/settings', 'UserAppSettingsController@store')->middleware($middleware); - Route::group(['prefix' => 'stories'], function () use($middleware) { - Route::get('carousel', 'Stories\StoryApiV1Controller@carousel')->middleware($middleware); - Route::post('add', 'Stories\StoryApiV1Controller@add')->middleware($middleware); - Route::post('publish', 'Stories\StoryApiV1Controller@publish')->middleware($middleware); - Route::post('seen', 'Stories\StoryApiV1Controller@viewed')->middleware($middleware); - Route::post('self-expire/{id}', 'Stories\StoryApiV1Controller@delete')->middleware($middleware); - Route::post('comment', 'Stories\StoryApiV1Controller@comment')->middleware($middleware); - }); - }); - }); + Route::group(['prefix' => 'stories'], function () use($middleware) { + Route::get('carousel', 'Stories\StoryApiV1Controller@carousel')->middleware($middleware); + Route::post('add', 'Stories\StoryApiV1Controller@add')->middleware($middleware); + Route::post('publish', 'Stories\StoryApiV1Controller@publish')->middleware($middleware); + Route::post('seen', 'Stories\StoryApiV1Controller@viewed')->middleware($middleware); + Route::post('self-expire/{id}', 'Stories\StoryApiV1Controller@delete')->middleware($middleware); + Route::post('comment', 'Stories\StoryApiV1Controller@comment')->middleware($middleware); + }); + }); + }); });