Merge pull request #2203 from pixelfed/staging

Staging

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);
     }
 
 }

app/Util/Lexer/RestrictedNames.php

@@ -238,10 +238,13 @@ class RestrictedNames
 		'robot',
 		'robots',
 		's',
+		'sc',
 		'search',
 		'sell',
 		'send',
 		'settings',
+		'short',
+		'shortcode',
 		'status',
 		'statuses',
 		'site',

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'
+			]
 		]
 	],
 

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'),
+		]
 	]
-];
+];

resources/views/layouts/app.blade.php

@@ -47,13 +47,6 @@
             </div>
         
         </noscript>
-        <div class="modal pr-0" tabindex="-1" role="dialog" id="composeModal">
-          <div class="modal-dialog" role="document">
-            <div class="modal-content">
-              <compose-modal></compose-modal>
-            </div>
-          </div>
-        </div>
     </main>
     @include('layouts.partial.footer')
     <script type="text/javascript" src="{{ mix('js/manifest.js') }}"></script>