From 2aa17513e18d8d05deb854658bf2f9b1475c701e Mon Sep 17 00:00:00 2001 From: mchev Date: Sat, 5 Apr 2025 10:16:23 +0200 Subject: [PATCH] Check version number on version.md file (#280) --- app/Console/Commands/UpdateCommand.php | 3 +-- app/Http/Controllers/AppVersionController.php | 3 ++- .../Controllers/V1/Admin/Update/CheckVersionController.php | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/UpdateCommand.php b/app/Console/Commands/UpdateCommand.php index 916ef627..6a23e0fc 100644 --- a/app/Console/Commands/UpdateCommand.php +++ b/app/Console/Commands/UpdateCommand.php @@ -2,7 +2,6 @@ namespace App\Console\Commands; -use App\Models\Setting; use App\Space\Updater; use Illuminate\Console\Command; @@ -98,7 +97,7 @@ class UpdateCommand extends Command public function getInstalledVersion() { - return Setting::getSetting('version'); + return preg_replace('~[\r\n]+~', '', File::get(base_path('version.md'))); } public function getLatestVersionResponse() diff --git a/app/Http/Controllers/AppVersionController.php b/app/Http/Controllers/AppVersionController.php index 84cc9ad7..9e6b5bad 100644 --- a/app/Http/Controllers/AppVersionController.php +++ b/app/Http/Controllers/AppVersionController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Models\Setting; use Illuminate\Http\Request; +use Illuminate\Support\Facades\File; class AppVersionController extends Controller { @@ -14,7 +15,7 @@ class AppVersionController extends Controller */ public function __invoke(Request $request) { - $version = Setting::getSetting('version'); + $version = preg_replace('~[\r\n]+~', '', File::get(base_path('version.md'))); $channel = Setting::getSetting('updater_channel'); if (is_null($channel)) { diff --git a/app/Http/Controllers/V1/Admin/Update/CheckVersionController.php b/app/Http/Controllers/V1/Admin/Update/CheckVersionController.php index a3bbc2ac..7a53fe84 100644 --- a/app/Http/Controllers/V1/Admin/Update/CheckVersionController.php +++ b/app/Http/Controllers/V1/Admin/Update/CheckVersionController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\V1\Admin\Update; use App\Http\Controllers\Controller; -use App\Models\Setting; use App\Space\Updater; use Illuminate\Http\Request; +use Illuminate\Support\Facades\File; class CheckVersionController extends Controller { @@ -26,7 +26,8 @@ class CheckVersionController extends Controller set_time_limit(600); // 10 minutes $channel = $request->get('channel', 'stable'); - $response = Updater::checkForUpdate(Setting::getSetting('version'), $channel); + $version = preg_replace('~[\r\n]+~', '', File::get(base_path('version.md'))); + $response = Updater::checkForUpdate($version, $channel); return response()->json($response); }