From f026f7ad3a9ad2b32477938af7355f25e06de9aa Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Mon, 10 Jul 2023 12:39:50 +0200 Subject: [PATCH 1/4] remove unexisting command --- app/Console/Kernel.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index e854af5..d1e6bf8 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -18,7 +18,6 @@ use Spatie\Backup\Commands\BackupCommand; use Spatie\Backup\Commands\CleanupCommand; use Spatie\Backup\Commands\MonitorCommand; -use Spatie\ScheduleMonitor\Commands\CleanLogCommand; class Kernel extends ConsoleKernel { @@ -46,9 +45,6 @@ protected function schedule(Schedule $schedule): void // laravel/scout $schedule->command(ReImportCommand::class)->everyThreeHours()->onOneServer(); - // spatie/laravel-schedule-monitor - $schedule->command(CleanLogCommand::class)->dailyAt('00:00')->onOneServer(); - // spatie/laravel-backup $schedule->command(BackupCommand::class)->twiceDaily(1, 13); $schedule->command(CleanupCommand::class)->dailyAt('09:00'); From 5ccb6d896703cf82bd2f1b9ebebf6bb6cd3818cf Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Mon, 10 Jul 2023 13:33:42 +0200 Subject: [PATCH 2/4] add organization as well --- k6.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/k6.js b/k6.js index 1cee259..ec817ad 100644 --- a/k6.js +++ b/k6.js @@ -48,8 +48,15 @@ export default function () { 'https://opendor.me/faqs', 'https://opendor.me/faqs', 'https://opendor.me/sponsors', + 'https://opendor.me/sponsors', + 'https://opendor.me/@Gummibeer', + 'https://opendor.me/@Gummibeer', 'https://opendor.me/@Gummibeer', 'https://opendor.me/@Gummibeer', + 'https://opendor.me/@Astrotomic', + 'https://opendor.me/@Astrotomic', + 'https://opendor.me/@Astrotomic', + 'https://opendor.me/@Astrotomic', ].random(); let res = http.get(url); From c86b3232651e30ca818216c20b01c99c4dabad35 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 11 Jul 2023 11:51:56 +0200 Subject: [PATCH 3/4] fix dropbox access tokens --- app/Providers/AppServiceProvider.php | 39 +++++++++++++++++++++++++++- config/filesystems.php | 4 ++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 48cd987..b73a5c3 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -128,7 +128,17 @@ public function boot(): void }); Storage::extend('dropbox', static function (Container $app, array $config): FilesystemContract { - $client = new DropboxClient($config['access_token']); + $accessToken = Http::baseUrl('https://api.dropboxapi.com') + ->timeout(5) + ->retry(3, 50) + ->withBasicAuth($config['app_key'], $config['app_secret']) + ->post('/oauth2/token?'.Arr::query([ + 'grant_type' => 'refresh_token', + 'refresh_token' => $config['refresh_token'], + ])) + ->json('access_token'); + + $client = new DropboxClient($accessToken); $adapter = new DropboxAdapter($client); $config = array_merge($config, ['case_sensitive' => false]); @@ -139,6 +149,33 @@ public function boot(): void ); }); + + Storage::extend('dropbox', function ($app, $config): FilesystemContract { + $accessToken = Http::baseUrl('https://api.dropboxapi.com') + ->timeout(5) + ->retry(3, 50) + ->withBasicAuth($config['app_key'], $config['app_secret']) + ->post('/oauth2/token?'.Arr::query([ + 'grant_type' => 'refresh_token', + 'refresh_token' => $config['refresh_token'], + ])) + ->json('access_token'); + + $adapter = new DropboxAdapter( + new DropboxClient($accessToken) + ); + + $config = [ + 'case_sensitive' => false, + ]; + + return new FilesystemAdapter( + new Filesystem($adapter, $config), + $adapter, + $config + ); + }); + URL::macro('horizon', function (string $uri): string { /** @var \Illuminate\Routing\UrlGenerator $this */ if (config('horizon.domain') !== null) { diff --git a/config/filesystems.php b/config/filesystems.php index 6028697..ab748f0 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -58,7 +58,9 @@ 'backups' => [ 'driver' => 'dropbox', - 'access_token' => env('BACKUP_DROPBOX_ACCESS_TOKEN'), + 'app_key' => env('BACKUP_DROPBOX_APP_KEY'), + 'app_secret' => env('BACKUP_DROPBOX_APP_SECRET'), + 'refresh_token' => env('BACKUP_DROPBOX_REFRESH_TOKEN'), 'throw' => true, ], From 77582c2bf5815ae779074d06b0e38a07fd8a13f3 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Tue, 11 Jul 2023 11:53:15 +0200 Subject: [PATCH 4/4] fix php cs --- app/Providers/AppServiceProvider.php | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index b73a5c3..2c553d6 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -149,33 +149,6 @@ public function boot(): void ); }); - - Storage::extend('dropbox', function ($app, $config): FilesystemContract { - $accessToken = Http::baseUrl('https://api.dropboxapi.com') - ->timeout(5) - ->retry(3, 50) - ->withBasicAuth($config['app_key'], $config['app_secret']) - ->post('/oauth2/token?'.Arr::query([ - 'grant_type' => 'refresh_token', - 'refresh_token' => $config['refresh_token'], - ])) - ->json('access_token'); - - $adapter = new DropboxAdapter( - new DropboxClient($accessToken) - ); - - $config = [ - 'case_sensitive' => false, - ]; - - return new FilesystemAdapter( - new Filesystem($adapter, $config), - $adapter, - $config - ); - }); - URL::macro('horizon', function (string $uri): string { /** @var \Illuminate\Routing\UrlGenerator $this */ if (config('horizon.domain') !== null) {