From c2c0e2809c06b847ec7adef3769912ab1bf53f5a Mon Sep 17 00:00:00 2001
From: raishvaria <raishvaria1996@gmail.com>
Date: Wed, 2 Dec 2020 12:23:30 +0530
Subject: [PATCH] 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 @@
-<?php
-
-namespace Crater\Listeners\Updates\v3;
-
-use Crater\Listeners\Updates\Listener;
-use Crater\Events\UpdateFinished;
-use Crater\Setting;
-use Crater\Currency;
-use Artisan;
-
-class Version320 extends Listener
-{
-    const VERSION = '3.2.0';
-
-    /**
-     * Handle the event.
-     *
-     * @param UpdateFinished $event
-     * @return void
-     */
-    public function handle(UpdateFinished $event)
-    {
-        if ($this->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 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Crater\Setting;
+
+class UpdateCraterVersion320 extends Migration
+{
+    const VERSION = '3.2.0';
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Setting::setSetting('version', static::VERSION);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}