From a7eaf5dbe40d6b0471a28b22ebe1828af742a526 Mon Sep 17 00:00:00 2001 From: raishvaria Date: Wed, 2 Dec 2020 10:29:46 +0530 Subject: [PATCH 1/4] fix updater issue & add optimize clear cmd --- app/Space/Updater.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Space/Updater.php b/app/Space/Updater.php index 25ef7924..b76026a5 100644 --- a/app/Space/Updater.php +++ b/app/Space/Updater.php @@ -30,8 +30,8 @@ class Updater $data = json_decode($data); - if ($data->success && $data->version && $data->version->extensions) { - $extensions = $data->version->extensions; + if ($data->success && $data->version && property_exists($data->version, 'extensions')) { + $extensions = $data->version->extensions ?? []; $extensionData = []; foreach (json_decode($extensions) as $extension) { $extensionData[$extension] = phpversion($extension) ? true : false; @@ -118,7 +118,6 @@ class Updater public static function copyFiles($temp_extract_dir) { - if (!File::copyDirectory($temp_extract_dir . '/Crater', base_path())) { return false; } @@ -138,6 +137,8 @@ class Updater public static function finishUpdate($installed, $version) { + Artisan::call('optimize:clear'); + event(new UpdateFinished($installed, $version)); return [ @@ -146,5 +147,4 @@ class Updater 'data' => [] ]; } - } From c2c0e2809c06b847ec7adef3769912ab1bf53f5a Mon Sep 17 00:00:00 2001 From: raishvaria Date: Wed, 2 Dec 2020 12:23:30 +0530 Subject: [PATCH 2/4] remove listener & add version320 migration --- app/Listeners/Updates/v3/Version320.php | 32 ------------------- app/Space/Updater.php | 10 +++--- ...12_02_064933_update_crater_version_320.php | 31 ++++++++++++++++++ 3 files changed, 36 insertions(+), 37 deletions(-) delete mode 100644 app/Listeners/Updates/v3/Version320.php create mode 100644 database/migrations/2020_12_02_064933_update_crater_version_320.php diff --git a/app/Listeners/Updates/v3/Version320.php b/app/Listeners/Updates/v3/Version320.php deleted file mode 100644 index 7cf02960..00000000 --- a/app/Listeners/Updates/v3/Version320.php +++ /dev/null @@ -1,32 +0,0 @@ -isListenerFired($event)) { - return; - } - - Artisan::call('migrate', ['--force' => true]); - - // Update Crater app version - Setting::setSetting('version', static::VERSION); - } -} diff --git a/app/Space/Updater.php b/app/Space/Updater.php index b76026a5..54b3193b 100644 --- a/app/Space/Updater.php +++ b/app/Space/Updater.php @@ -17,9 +17,9 @@ class Updater $data = null; if(env('APP_ENV') === 'development') { - $url = 'https://craterapp.com/downloads/check/latest/'. $installed_version . '?type=update&is_dev=1'; + $url = 'downloads/check/latest/'. $installed_version . '?type=update&is_dev=1'; } else { - $url = 'https://craterapp.com/downloads/check/latest/'. $installed_version . '?type=update'; + $url = 'downloads/check/latest/'. $installed_version . '?type=update'; } $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]); @@ -31,7 +31,7 @@ class Updater $data = json_decode($data); if ($data->success && $data->version && property_exists($data->version, 'extensions')) { - $extensions = $data->version->extensions ?? []; + $extensions = $data->version->extensions; $extensionData = []; foreach (json_decode($extensions) as $extension) { $extensionData[$extension] = phpversion($extension) ? true : false; @@ -49,9 +49,9 @@ class Updater $path = null; if (env('APP_ENV') === 'development') { - $url = 'https://craterapp.com/downloads/file/' . $new_version . '?type=update&is_dev=1'; + $url = 'downloads/file/' . $new_version . '?type=update&is_dev=1'; } else { - $url = 'https://craterapp.com/downloads/file/' . $new_version . '?type=update'; + $url = 'downloads/file/' . $new_version . '?type=update'; } $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]); diff --git a/database/migrations/2020_12_02_064933_update_crater_version_320.php b/database/migrations/2020_12_02_064933_update_crater_version_320.php new file mode 100644 index 00000000..24a7d5b5 --- /dev/null +++ b/database/migrations/2020_12_02_064933_update_crater_version_320.php @@ -0,0 +1,31 @@ + Date: Wed, 2 Dec 2020 12:31:16 +0530 Subject: [PATCH 3/4] remove optimized cmd --- app/Space/Updater.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Space/Updater.php b/app/Space/Updater.php index 54b3193b..aad9192f 100644 --- a/app/Space/Updater.php +++ b/app/Space/Updater.php @@ -137,8 +137,6 @@ class Updater public static function finishUpdate($installed, $version) { - Artisan::call('optimize:clear'); - event(new UpdateFinished($installed, $version)); return [ From 21e01bc1dbd694c82ae01682433be8026bec1e95 Mon Sep 17 00:00:00 2001 From: raishvaria Date: Wed, 2 Dec 2020 12:32:13 +0530 Subject: [PATCH 4/4] remove use from EventServiceProvider --- app/Providers/EventServiceProvider.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 88fc803d..c8ddc6ac 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -14,7 +14,6 @@ use Crater\Listeners\Updates\v2\Version210; use Crater\Listeners\Updates\v3\Version300; use Crater\Listeners\Updates\v3\Version310; use Crater\Listeners\Updates\v3\Version311; -use Crater\Listeners\Updates\v3\Version320; class EventServiceProvider extends ServiceProvider { @@ -33,7 +32,6 @@ class EventServiceProvider extends ServiceProvider Version300::class, Version310::class, Version311::class, - Version320::class ], Registered::class => [ SendEmailVerificationNotification::class,