From c4ebe9dca9610811595430460611330b61fb5a56 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 23 May 2020 23:04:28 -0600
Subject: [PATCH 1/5] Update PublicApiController

---
 app/Http/Controllers/PublicApiController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php
index 51815c9cc..e668abfdb 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);
     }
 
 }

From f12bfb143510fe1519f6d4f7ed5f2c6b4744b07d Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 23 May 2020 23:06:14 -0600
Subject: [PATCH 2/5] Update RestrictedNames

---
 app/Util/Lexer/RestrictedNames.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php
index 0b08ee1e0..ae3f97bf4 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',

From 76dd453ea0bbd4615a6ca2aebfb57a9aa20eb760 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 23 May 2020 23:08:09 -0600
Subject: [PATCH 3/5] Update instance config

---
 config/instance.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/config/instance.php b/config/instance.php
index 70fd6c261..e8047f3ec 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

From 06c83ba08a5f9d4cf1075b3d3ff0caa2eeb74f66 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 23 May 2020 23:08:27 -0600
Subject: [PATCH 4/5] Update federation config

---
 config/federation.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/federation.php b/config/federation.php
index 09af08bf7..6a34f38e2 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'
+			]
 		]
 	],
 

From fe7d58af85e26de129548c642e6c31757826806f Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 23 May 2020 23:51:47 -0600
Subject: [PATCH 5/5] Update app layout

---
 resources/views/layouts/app.blade.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 659481ad3..53c0891a6 100644
--- a/resources/views/layouts/app.blade.php
+++ b/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>