From 20baf7a7c983d77d8a5aa310e7a452d03e845f1b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 27 Aug 2019 19:14:56 -0600 Subject: [PATCH 01/76] Update InboxWorker --- app/Jobs/InboxPipeline/InboxWorker.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Jobs/InboxPipeline/InboxWorker.php b/app/Jobs/InboxPipeline/InboxWorker.php index 4726d9aff..20962113c 100644 --- a/app/Jobs/InboxPipeline/InboxWorker.php +++ b/app/Jobs/InboxPipeline/InboxWorker.php @@ -18,6 +18,9 @@ class InboxWorker implements ShouldQueue protected $profile; protected $payload; + public $timeout = 5; + public $tries = 1; + /** * Create a new job instance. * From 58a9ca664c781e3413f0b689594cc3722a194541 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 28 Aug 2019 19:52:05 -0600 Subject: [PATCH 02/76] Update SearchController --- app/Http/Controllers/SearchController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index ada796b10..064afd86f 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -54,7 +54,8 @@ class SearchController extends Controller 'id' => (string) $item->id, 'following' => $item->followedBy(Auth::user()->profile), 'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id), - 'thumb' => $item->avatarUrl() + 'thumb' => $item->avatarUrl(), + 'local' => (bool) !$item->domain ] ]]; } else if ($type == 'Note') { @@ -92,7 +93,7 @@ class SearchController extends Controller } return $tokens; }); - $users = Profile::select('username', 'name', 'id') + $users = Profile::select('domain', 'username', 'name', 'id') ->whereNull('status') ->whereNull('domain') ->where('id', '!=', Auth::user()->profile->id) @@ -113,9 +114,11 @@ class SearchController extends Controller 'avatar' => $item->avatarUrl(), 'id' => $item->id, 'entity' => [ - 'id' => $item->id, + 'id' => (string) $item->id, 'following' => $item->followedBy(Auth::user()->profile), - 'thumb' => $item->avatarUrl() + 'follow_request' => $item->hasFollowRequestById(Auth::user()->profile_id), + 'thumb' => $item->avatarUrl(), + 'local' => (bool) !$item->domain ] ]; }); @@ -162,4 +165,5 @@ class SearchController extends Controller return view('search.results'); } + } From 02e5abf3b33c4551ee8a45674c566da5ea2f004c Mon Sep 17 00:00:00 2001 From: trwnh Date: Thu, 29 Aug 2019 05:19:18 -0500 Subject: [PATCH 03/76] read IMAGE_DRIVER from env --- config/image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/image.php b/config/image.php index 67983819d..eb77c9089 100644 --- a/config/image.php +++ b/config/image.php @@ -15,6 +15,6 @@ return [ | */ - 'driver' => 'gd', + 'driver' => env('IMAGE_DRIVER', 'gd'), ]; From a3ae352fd2be50e37956242bd9b48228654b7624 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 29 Aug 2019 18:07:34 -0600 Subject: [PATCH 04/76] Update InternalApiController for ComposeUI v4 --- app/Http/Controllers/InternalApiController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php index abe07ad22..674e70597 100644 --- a/app/Http/Controllers/InternalApiController.php +++ b/app/Http/Controllers/InternalApiController.php @@ -240,7 +240,8 @@ class InternalApiController extends Controller 'media.*.license' => 'nullable|string|max:80', 'cw' => 'nullable|boolean', 'visibility' => 'required|string|in:public,private,unlisted|min:2|max:10', - 'place' => 'nullable' + 'place' => 'nullable', + 'comments_disabled' => 'nullable|boolean' ]); if(config('costar.enabled') == true) { @@ -287,9 +288,15 @@ class InternalApiController extends Controller if($request->filled('place')) { $status->place_id = $request->input('place')['id']; } + + if($request->filled('comments_disabled')) { + $status->comments_disabled = $request->input('comments_disabled'); + } + $status->caption = strip_tags($request->caption); $status->scope = 'draft'; $status->profile_id = $profile->id; + $status->save(); foreach($attachments as $media) { From 7e11e4aa449be6054e22b2563837ea338f2c1eda Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 29 Aug 2019 18:30:26 -0600 Subject: [PATCH 05/76] Update Place model, add url methods --- app/Place.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/Place.php b/app/Place.php index a63c507c5..5ea6351cc 100644 --- a/app/Place.php +++ b/app/Place.php @@ -28,4 +28,16 @@ class Place extends Model { return $this->hasMany(Status::class, 'id', 'place_id'); } + + public function countryUrl() + { + $country = strtolower($this->country); + $country = urlencode($country); + return url('/discover/location/country/' . $country); + } + + public function cityUrl() + { + return $this->url(); + } } From 98bf80e8114dea42908b81ff01f281be2fc3cc26 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 29 Aug 2019 19:15:58 -0600 Subject: [PATCH 06/76] Update nav bar --- resources/views/layouts/partial/nav.blade.php | 93 +++++++------------ 1 file changed, 34 insertions(+), 59 deletions(-) diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index fb626fb0f..b57991048 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -1,59 +1,48 @@ -