Merge branch 'next' into feat/disable-default-redirect

This commit is contained in:
Kael authored and GitHub committed 2024-11-18 21:02:20 +11:00
commit bc89b84539
307 files changed
+18023 -5041

No files matched your search

+6 -8
View File
@@ -4,7 +4,6 @@ namespace App\Livewire\Server;
use App\Actions\Proxy\CheckConfiguration;
use App\Actions\Proxy\SaveConfiguration;
use App\Actions\Proxy\StartProxy;
use App\Models\Server;
use Livewire\Component;
@@ -46,14 +45,13 @@ class Proxy extends Component
public function selectProxy($proxy_type)
{
$this->server->proxy->set('status', 'exited');
$this->server->proxy->set('type', $proxy_type);
$this->server->save();
$this->selectedProxy = $this->server->proxy->type;
if ($this->server->proxySet()) {
StartProxy::run($this->server, false);
try {
$this->server->changeProxy($proxy_type, async: false);
$this->selectedProxy = $this->server->proxy->type;
$this->dispatch('proxyStatusUpdated');
} catch (\Throwable $e) {
return handleError($e, $this);
}
$this->dispatch('proxyStatusUpdated');
}
public function instantSave()