Skip to content

Commit 88f33be

Browse files
committed
refactor: only get instanceSettings once from db
1 parent 21612cc commit 88f33be

File tree

23 files changed

+54
-51
lines changed

23 files changed

+54
-51
lines changed

app/Exceptions/Handler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function register(): void
6565
if ($e instanceof RuntimeException) {
6666
return;
6767
}
68-
$this->settings = InstanceSettings::get();
68+
$this->settings = view()->shared('instanceSettings');
6969
if ($this->settings->do_not_track) {
7070
return;
7171
}

app/Http/Controllers/Api/OtherController.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace App\Http\Controllers\Api;
44

55
use App\Http\Controllers\Controller;
6-
use App\Models\InstanceSettings;
76
use Illuminate\Http\Request;
87
use Illuminate\Support\Facades\Http;
98
use OpenApi\Attributes as OA;
@@ -85,7 +84,7 @@ public function enable_api(Request $request)
8584
if ($teamId !== '0') {
8685
return response()->json(['message' => 'You are not allowed to enable the API.'], 403);
8786
}
88-
$settings = InstanceSettings::get();
87+
$settings = view()->shared('instanceSettings');
8988
$settings->update(['is_api_enabled' => true]);
9089

9190
return response()->json(['message' => 'API enabled.'], 200);
@@ -136,7 +135,7 @@ public function disable_api(Request $request)
136135
if ($teamId !== '0') {
137136
return response()->json(['message' => 'You are not allowed to disable the API.'], 403);
138137
}
139-
$settings = InstanceSettings::get();
138+
$settings = view()->shared('instanceSettings');
140139
$settings->update(['is_api_enabled' => false]);
141140

142141
return response()->json(['message' => 'API disabled.'], 200);

app/Http/Controllers/Api/ServersController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public function domains_by_server(Request $request)
301301
$projects = Project::where('team_id', $teamId)->get();
302302
$domains = collect();
303303
$applications = $projects->pluck('applications')->flatten();
304-
$settings = InstanceSettings::get();
304+
$settings = view()->shared('instanceSettings');
305305
if ($applications->count() > 0) {
306306
foreach ($applications as $application) {
307307
$ip = $application->destination->server->ip;

app/Http/Middleware/ApiAllowed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function handle(Request $request, Closure $next): Response
1515
if (isCloud()) {
1616
return $next($request);
1717
}
18-
$settings = InstanceSettings::get();
18+
$settings = view()->shared('instanceSettings');
1919
if ($settings->is_api_enabled === false) {
2020
return response()->json(['success' => true, 'message' => 'API is disabled.'], 403);
2121
}

app/Jobs/PullCoolifyImageJob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function handle(): void
3636
$latest_version = get_latest_version_of_coolify();
3737
instant_remote_process(["docker pull -q ghcr.io/coollabsio/coolify:{$latest_version}"], $server, false);
3838

39-
$settings = InstanceSettings::get();
39+
$settings = view()->shared('instanceSettings');
4040
$current_version = config('version');
4141
if (! $settings->is_auto_update_enabled) {
4242
return;

app/Livewire/Help.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function submit()
4848
]
4949
);
5050
$mail->subject("[HELP]: {$this->subject}");
51-
$settings = InstanceSettings::get();
51+
$settings = view()->shared('instanceSettings');
5252
$type = set_transanctional_email_settings($settings);
5353
if (! $type) {
5454
$url = 'https://app.coolify.io/api/feedback';

app/Livewire/Notifications/Email.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public function submitResend()
173173

174174
public function copyFromInstanceSettings()
175175
{
176-
$settings = InstanceSettings::get();
176+
$settings = view()->shared('instanceSettings');
177177
if ($settings->smtp_enabled) {
178178
$team = currentTeam();
179179
$team->update([

app/Livewire/Project/Shared/Webhooks.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class Webhooks extends Component
2929

3030
public function mount()
3131
{
32+
// ray()->clearAll();
33+
// ray()->showQueries();
3234
$this->deploywebhook = generateDeployWebhook($this->resource);
3335

3436
$this->githubManualWebhookSecret = data_get($this->resource, 'manual_webhook_secret_github');

app/Livewire/Settings/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Index extends Component
1818
public function mount()
1919
{
2020
if (isInstanceAdmin()) {
21-
$settings = InstanceSettings::get();
21+
$settings = view()->shared('instanceSettings');
2222
$database = StandalonePostgresql::whereName('coolify-db')->first();
2323
$s3s = S3Storage::whereTeamId(0)->get() ?? [];
2424
if ($database) {

app/Livewire/Settings/License.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function mount()
2929
abort(404);
3030
}
3131
$this->instance_id = config('app.id');
32-
$this->settings = InstanceSettings::get();
32+
$this->settings = view()->shared('instanceSettings');
3333
}
3434

3535
public function render()

0 commit comments

Comments
 (0)