diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php index 51815c9c..e668abfd 100644 --- a/app/Http/Controllers/PublicApiController.php +++ b/app/Http/Controllers/PublicApiController.php @@ -558,6 +558,7 @@ class PublicApiController extends Controller 'likes_count', 'reblogs_count', 'scope', + 'visibility', 'local', 'cw_summary', 'created_at', @@ -568,12 +569,13 @@ class PublicApiController extends Controller ->whereIn('visibility', $visibility) ->latest() ->limit($limit) + ->orderByDesc('created_at') ->get(); $resource = new Fractal\Resource\Collection($timeline, new StatusTransformer()); $res = $this->fractal->createData($resource)->toArray(); - return response()->json($res); + return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES); } } diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php index 0b08ee1e..ae3f97bf 100644 --- a/app/Util/Lexer/RestrictedNames.php +++ b/app/Util/Lexer/RestrictedNames.php @@ -238,10 +238,13 @@ class RestrictedNames 'robot', 'robots', 's', + 'sc', 'search', 'sell', 'send', 'settings', + 'short', + 'shortcode', 'status', 'statuses', 'site', diff --git a/config/federation.php b/config/federation.php index 09af08bf..6a34f38e 100644 --- a/config/federation.php +++ b/config/federation.php @@ -21,7 +21,11 @@ return [ 'delivery' => [ 'timeout' => env('ACTIVITYPUB_DELIVERY_TIMEOUT', 2.0), - 'concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10) + 'concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10), + 'logger' => [ + 'enabled' => env('AP_LOGGER_ENABLED', false), + 'driver' => 'log' + ] ] ], diff --git a/config/instance.php b/config/instance.php index 70fd6c26..e8047f3e 100644 --- a/config/instance.php +++ b/config/instance.php @@ -10,6 +10,9 @@ return [ ], 'discover' => [ + 'loops' => [ + 'enabled' => env('EXP_LOOPS', false), + ], 'tags' => [ 'is_public' => env('INSTANCE_PUBLIC_HASHTAGS', false) ], @@ -49,5 +52,12 @@ return [ 'restricted' => [ 'enabled' => env('RESTRICTED_INSTANCE', false), 'level' => 1 + ], + + 'oauth' => [ + 'pat' => [ + 'enabled' => env('OAUTH_PAT_ENABLED', false), + 'id' => env('OAUTH_PAT_ID'), + ] ] -]; +]; \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 659481ad..53c0891a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -47,13 +47,6 @@ - @include('layouts.partial.footer')