diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php index f8882d12a..481757162 100644 --- a/app/Actions/Fortify/CreateNewUser.php +++ b/app/Actions/Fortify/CreateNewUser.php @@ -2,7 +2,6 @@ namespace App\Actions\Fortify; -use App\Models\InstanceSettings; use App\Models\User; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; @@ -20,7 +19,7 @@ class CreateNewUser implements CreatesNewUsers */ public function create(array $input): User { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); if (! $settings->is_registration_enabled) { abort(403); } @@ -48,7 +47,7 @@ class CreateNewUser implements CreatesNewUsers $team = $user->teams()->first(); // Disable registration after first user is created - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $settings->is_registration_enabled = false; $settings->save(); } else { diff --git a/app/Actions/License/CheckResaleLicense.php b/app/Actions/License/CheckResaleLicense.php index dcb4058c0..55af1a8c0 100644 --- a/app/Actions/License/CheckResaleLicense.php +++ b/app/Actions/License/CheckResaleLicense.php @@ -2,7 +2,6 @@ namespace App\Actions\License; -use App\Models\InstanceSettings; use Illuminate\Support\Facades\Http; use Lorisleiva\Actions\Concerns\AsAction; @@ -13,7 +12,7 @@ class CheckResaleLicense public function handle() { try { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); if (isDev()) { $settings->update([ 'is_resale_license_active' => true, diff --git a/app/Actions/Server/CleanupDocker.php b/app/Actions/Server/CleanupDocker.php index 19bb03383..dc6ac12bf 100644 --- a/app/Actions/Server/CleanupDocker.php +++ b/app/Actions/Server/CleanupDocker.php @@ -2,7 +2,6 @@ namespace App\Actions\Server; -use App\Models\InstanceSettings; use App\Models\Server; use Lorisleiva\Actions\Concerns\AsAction; @@ -12,7 +11,7 @@ class CleanupDocker public function handle(Server $server) { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $helperImageVersion = data_get($settings, 'helper_version'); $helperImage = config('coolify.helper_image'); $helperImageWithVersion = "$helperImage:$helperImageVersion"; diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php index 901f2cf77..30664df26 100644 --- a/app/Actions/Server/UpdateCoolify.php +++ b/app/Actions/Server/UpdateCoolify.php @@ -3,7 +3,6 @@ namespace App\Actions\Server; use App\Jobs\PullHelperImageJob; -use App\Models\InstanceSettings; use App\Models\Server; use Lorisleiva\Actions\Concerns\AsAction; @@ -20,7 +19,7 @@ class UpdateCoolify public function handle($manual_update = false) { try { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $this->server = Server::find(0); if (! $this->server) { return; diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php index 2f5d36140..ad7bff86d 100644 --- a/app/Console/Commands/Init.php +++ b/app/Console/Commands/Init.php @@ -7,7 +7,6 @@ use App\Enums\ActivityTypes; use App\Enums\ApplicationDeploymentStatus; use App\Models\ApplicationDeploymentQueue; use App\Models\Environment; -use App\Models\InstanceSettings; use App\Models\ScheduledDatabaseBackup; use App\Models\Server; use App\Models\StandalonePostgresql; @@ -69,7 +68,7 @@ class Init extends Command } catch (\Throwable $e) { echo "Could not setup dynamic configuration: {$e->getMessage()}\n"; } - $settings = InstanceSettings::get(); + $settings = instanceSettings(); if (! is_null(env('AUTOUPDATE', null))) { if (env('AUTOUPDATE') == true) { $settings->update(['is_auto_update_enabled' => true]); @@ -196,7 +195,7 @@ class Init extends Command { $id = config('app.id'); $version = config('version'); - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $do_not_track = data_get($settings, 'do_not_track'); if ($do_not_track == true) { echo "Skipping alive as do_not_track is enabled\n"; diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 03d479400..c4d85a014 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -13,7 +13,6 @@ use App\Jobs\PullTemplatesFromCDN; use App\Jobs\ScheduledTaskJob; use App\Jobs\ServerCheckJob; use App\Jobs\UpdateCoolifyJob; -use App\Models\InstanceSettings; use App\Models\ScheduledDatabaseBackup; use App\Models\ScheduledTask; use App\Models\Server; @@ -28,7 +27,7 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule): void { $this->all_servers = Server::all(); - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $schedule->job(new CleanupStaleMultiplexedConnections)->hourly(); @@ -66,7 +65,7 @@ class Kernel extends ConsoleKernel private function pull_images($schedule) { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $servers = $this->all_servers->where('settings.is_usable', true)->where('settings.is_reachable', true)->where('ip', '!=', '1.2.3.4'); foreach ($servers as $server) { if ($server->isSentinelEnabled()) { @@ -88,7 +87,7 @@ class Kernel extends ConsoleKernel private function schedule_updates($schedule) { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $updateCheckFrequency = $settings->update_check_frequency; $schedule->job(new CheckForUpdatesJob) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 6b69350fe..63fbfc862 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -65,7 +65,7 @@ class Handler extends ExceptionHandler if ($e instanceof RuntimeException) { return; } - $this->settings = \App\Models\InstanceSettings::get(); + $this->settings = instanceSettings(); if ($this->settings->do_not_track) { return; } diff --git a/app/Http/Controllers/Api/OtherController.php b/app/Http/Controllers/Api/OtherController.php index c085b88a5..2414b7a42 100644 --- a/app/Http/Controllers/Api/OtherController.php +++ b/app/Http/Controllers/Api/OtherController.php @@ -86,7 +86,7 @@ class OtherController extends Controller if ($teamId !== '0') { return response()->json(['message' => 'You are not allowed to enable the API.'], 403); } - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); $settings->update(['is_api_enabled' => true]); return response()->json(['message' => 'API enabled.'], 200); @@ -138,7 +138,7 @@ class OtherController extends Controller if ($teamId !== '0') { return response()->json(['message' => 'You are not allowed to disable the API.'], 403); } - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); $settings->update(['is_api_enabled' => false]); return response()->json(['message' => 'API disabled.'], 200); diff --git a/app/Http/Controllers/Api/ServersController.php b/app/Http/Controllers/Api/ServersController.php index 5f0d6bb12..a49515579 100644 --- a/app/Http/Controllers/Api/ServersController.php +++ b/app/Http/Controllers/Api/ServersController.php @@ -308,7 +308,7 @@ class ServersController extends Controller $projects = Project::where('team_id', $teamId)->get(); $domains = collect(); $applications = $projects->pluck('applications')->flatten(); - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if ($applications->count() > 0) { foreach ($applications as $application) { $ip = $application->destination->server->ip; diff --git a/app/Http/Controllers/OauthController.php b/app/Http/Controllers/OauthController.php index 9569e8cfa..630d01045 100644 --- a/app/Http/Controllers/OauthController.php +++ b/app/Http/Controllers/OauthController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; -use App\Models\InstanceSettings; use App\Models\User; use Illuminate\Support\Facades\Auth; use Symfony\Component\HttpKernel\Exception\HttpException; @@ -22,7 +21,7 @@ class OauthController extends Controller $oauthUser = get_socialite_provider($provider)->user(); $user = User::whereEmail($oauthUser->email)->first(); if (! $user) { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); if (! $settings->is_registration_enabled) { abort(403, 'Registration is disabled'); } diff --git a/app/Http/Middleware/ApiAllowed.php b/app/Http/Middleware/ApiAllowed.php index 648720ba4..471e6d602 100644 --- a/app/Http/Middleware/ApiAllowed.php +++ b/app/Http/Middleware/ApiAllowed.php @@ -14,7 +14,7 @@ class ApiAllowed if (isCloud()) { return $next($request); } - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if ($settings->is_api_enabled === false) { return response()->json(['success' => true, 'message' => 'API is disabled.'], 403); } diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 4b1ac1b11..9ae383a9f 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -12,7 +12,6 @@ use App\Models\ApplicationPreview; use App\Models\EnvironmentVariable; use App\Models\GithubApp; use App\Models\GitlabApp; -use App\Models\InstanceSettings; use App\Models\Server; use App\Models\StandaloneDocker; use App\Models\SwarmDocker; @@ -1334,7 +1333,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue private function prepare_builder_image() { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $helperImage = config('coolify.helper_image'); $helperImage = "{$helperImage}:{$settings->helper_version}"; // Get user home directory diff --git a/app/Jobs/CheckForUpdatesJob.php b/app/Jobs/CheckForUpdatesJob.php index 747a9a98a..f2348118a 100644 --- a/app/Jobs/CheckForUpdatesJob.php +++ b/app/Jobs/CheckForUpdatesJob.php @@ -2,7 +2,6 @@ namespace App\Jobs; -use App\Models\InstanceSettings; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeEncrypted; use Illuminate\Contracts\Queue\ShouldQueue; @@ -22,7 +21,7 @@ class CheckForUpdatesJob implements ShouldBeEncrypted, ShouldQueue if (isDev() || isCloud()) { return; } - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json'); if ($response->successful()) { $versions = $response->json(); diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php index 947dc4317..b6836ec33 100644 --- a/app/Jobs/DatabaseBackupJob.php +++ b/app/Jobs/DatabaseBackupJob.php @@ -4,7 +4,6 @@ namespace App\Jobs; use App\Actions\Database\StopDatabase; use App\Events\BackupCreated; -use App\Models\InstanceSettings; use App\Models\S3Storage; use App\Models\ScheduledDatabaseBackup; use App\Models\ScheduledDatabaseBackupExecution; @@ -562,7 +561,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue private function getFullImageName(): string { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $helperImage = config('coolify.helper_image'); $latestVersion = $settings->helper_version; diff --git a/app/Jobs/PullHelperImageJob.php b/app/Jobs/PullHelperImageJob.php index ef1659680..4b208fc31 100644 --- a/app/Jobs/PullHelperImageJob.php +++ b/app/Jobs/PullHelperImageJob.php @@ -2,7 +2,6 @@ namespace App\Jobs; -use App\Models\InstanceSettings; use App\Models\Server; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeEncrypted; @@ -26,7 +25,7 @@ class PullHelperImageJob implements ShouldBeEncrypted, ShouldQueue $response = Http::retry(3, 1000)->get('https://cdn.coollabs.io/coolify/versions.json'); if ($response->successful()) { $versions = $response->json(); - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $latest_version = data_get($versions, 'coolify.helper.version'); $current_version = $settings->helper_version; if (version_compare($latest_version, $current_version, '>')) { diff --git a/app/Jobs/UpdateCoolifyJob.php b/app/Jobs/UpdateCoolifyJob.php index 4c65a711f..2cc705e4a 100644 --- a/app/Jobs/UpdateCoolifyJob.php +++ b/app/Jobs/UpdateCoolifyJob.php @@ -3,7 +3,6 @@ namespace App\Jobs; use App\Actions\Server\UpdateCoolify; -use App\Models\InstanceSettings; use App\Models\Server; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeEncrypted; @@ -23,7 +22,7 @@ class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue { try { CheckForUpdatesJob::dispatchSync(); - $settings = InstanceSettings::get(); + $settings = instanceSettings(); if (! $settings->new_version_available) { Log::info('No new version available. Skipping update.'); diff --git a/app/Livewire/Help.php b/app/Livewire/Help.php index d6dc0d521..68691c1cd 100644 --- a/app/Livewire/Help.php +++ b/app/Livewire/Help.php @@ -47,7 +47,7 @@ class Help extends Component ] ); $mail->subject("[HELP]: {$this->subject}"); - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); $type = set_transanctional_email_settings($settings); if (! $type) { $url = 'https://app.coolify.io/api/feedback'; diff --git a/app/Livewire/Notifications/Email.php b/app/Livewire/Notifications/Email.php index 2960ed226..53673292e 100644 --- a/app/Livewire/Notifications/Email.php +++ b/app/Livewire/Notifications/Email.php @@ -172,7 +172,7 @@ class Email extends Component public function copyFromInstanceSettings() { - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if ($settings->smtp_enabled) { $team = currentTeam(); $team->update([ diff --git a/app/Livewire/Settings/Index.php b/app/Livewire/Settings/Index.php index 4eab505e9..754f0929b 100644 --- a/app/Livewire/Settings/Index.php +++ b/app/Livewire/Settings/Index.php @@ -162,7 +162,7 @@ class Index extends Component { CheckForUpdatesJob::dispatchSync(); $this->dispatch('updateAvailable'); - $settings = InstanceSettings::get(); + $settings = instanceSettings(); if ($settings->new_version_available) { $this->dispatch('success', 'New version available!'); } else { diff --git a/app/Livewire/Settings/License.php b/app/Livewire/Settings/License.php index f9402fd7b..ca0c9c1ae 100644 --- a/app/Livewire/Settings/License.php +++ b/app/Livewire/Settings/License.php @@ -29,7 +29,7 @@ class License extends Component abort(404); } $this->instance_id = config('app.id'); - $this->settings = \App\Models\InstanceSettings::get(); + $this->settings = instanceSettings(); } public function render() diff --git a/app/Livewire/SettingsBackup.php b/app/Livewire/SettingsBackup.php index 99b8f8d49..9240aa96d 100644 --- a/app/Livewire/SettingsBackup.php +++ b/app/Livewire/SettingsBackup.php @@ -42,7 +42,7 @@ class SettingsBackup extends Component public function mount() { if (isInstanceAdmin()) { - $settings = InstanceSettings::get(); + $settings = instanceSettings(); $this->database = StandalonePostgresql::whereName('coolify-db')->first(); $s3s = S3Storage::whereTeamId(0)->get() ?? []; if ($this->database) { diff --git a/app/Livewire/SettingsEmail.php b/app/Livewire/SettingsEmail.php index 3eb8ea646..4515df9a7 100644 --- a/app/Livewire/SettingsEmail.php +++ b/app/Livewire/SettingsEmail.php @@ -43,7 +43,7 @@ class SettingsEmail extends Component public function mount() { if (isInstanceAdmin()) { - $this->settings = InstanceSettings::get(); + $this->settings = instanceSettings(); $this->emails = auth()->user()->email; } else { return redirect()->route('dashboard'); diff --git a/app/Livewire/Source/Github/Change.php b/app/Livewire/Source/Github/Change.php index 75d7fd04a..193b650ff 100644 --- a/app/Livewire/Source/Github/Change.php +++ b/app/Livewire/Source/Github/Change.php @@ -99,7 +99,7 @@ class Change extends Component return redirect()->route('source.all'); } $this->applications = $this->github_app->applications; - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret'); $this->name = str($this->github_app->name)->kebab(); diff --git a/app/Livewire/Subscription/Index.php b/app/Livewire/Subscription/Index.php index c278bf58e..df450cf7e 100644 --- a/app/Livewire/Subscription/Index.php +++ b/app/Livewire/Subscription/Index.php @@ -23,7 +23,7 @@ class Index extends Component if (data_get(currentTeam(), 'subscription') && isSubscriptionActive()) { return redirect()->route('subscription.show'); } - $this->settings = \App\Models\InstanceSettings::get(); + $this->settings = instanceSettings(); $this->alreadySubscribed = currentTeam()->subscription()->exists(); } diff --git a/app/Models/Application.php b/app/Models/Application.php index 17489040f..dfa875a5a 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -304,7 +304,7 @@ class Application extends BaseModel 'application_uuid' => data_get($this, 'uuid'), 'task_uuid' => $task_uuid, ]); - $settings = InstanceSettings::get(); + $settings = instanceSettings(); if (data_get($settings, 'fqdn')) { $url = Url::fromString($route); $url = $url->withPort(null); diff --git a/app/Models/Server.php b/app/Models/Server.php index a1b4c0828..caed8d8f0 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -268,7 +268,7 @@ respond 404 public function setupDynamicProxyConfiguration() { - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); $dynamic_config_path = $this->proxyPath().'/dynamic'; if ($this->proxyType() === ProxyTypes::TRAEFIK->value) { $file = "$dynamic_config_path/coolify.yaml"; diff --git a/app/Models/Service.php b/app/Models/Service.php index 8e557d6cb..2294e8b68 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -966,7 +966,7 @@ class Service extends BaseModel 'service_uuid' => data_get($this, 'uuid'), 'task_uuid' => $task_uuid, ]); - $settings = InstanceSettings::get(); + $settings = instanceSettings(); if (data_get($settings, 'fqdn')) { $url = Url::fromString($route); $url = $url->withPort(null); diff --git a/app/Notifications/Channels/TransactionalEmailChannel.php b/app/Notifications/Channels/TransactionalEmailChannel.php index 549fc6cd3..cc7d76ebf 100644 --- a/app/Notifications/Channels/TransactionalEmailChannel.php +++ b/app/Notifications/Channels/TransactionalEmailChannel.php @@ -13,7 +13,7 @@ class TransactionalEmailChannel { public function send(User $notifiable, Notification $notification): void { - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if (! data_get($settings, 'smtp_enabled') && ! data_get($settings, 'resend_enabled')) { Log::info('SMTP/Resend not enabled'); diff --git a/app/Notifications/TransactionalEmails/ResetPassword.php b/app/Notifications/TransactionalEmails/ResetPassword.php index 8b1c02d39..3938a8da7 100644 --- a/app/Notifications/TransactionalEmails/ResetPassword.php +++ b/app/Notifications/TransactionalEmails/ResetPassword.php @@ -18,7 +18,7 @@ class ResetPassword extends Notification public function __construct($token) { - $this->settings = \App\Models\InstanceSettings::get(); + $this->settings = instanceSettings(); $this->token = $token; } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index cd90918ad..8b4c2eef2 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,10 +2,8 @@ namespace App\Providers; -use App\Models\InstanceSettings; use App\Models\PersonalAccessToken; use Illuminate\Support\Facades\Http; -use Illuminate\Support\Facades\View; use Illuminate\Support\ServiceProvider; use Laravel\Sanctum\Sanctum; @@ -30,9 +28,5 @@ class AppServiceProvider extends ServiceProvider ])->baseUrl($api_url); } }); - // if (! env('CI')) { - // View::share('instanceSettings', InstanceSettings::get()); - // } - } } diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php index 53a2e9281..b916b6234 100644 --- a/app/Providers/FortifyServiceProvider.php +++ b/app/Providers/FortifyServiceProvider.php @@ -46,7 +46,7 @@ class FortifyServiceProvider extends ServiceProvider Fortify::registerView(function () { $isFirstUser = User::count() === 0; - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if (! $settings->is_registration_enabled) { return redirect()->route('login'); } @@ -60,7 +60,7 @@ class FortifyServiceProvider extends ServiceProvider }); Fortify::loginView(function () { - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); $enabled_oauth_providers = OauthSetting::where('enabled', true)->get(); $users = User::count(); if ($users == 0) { diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index 3ed2c2d13..ffd53a99a 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -247,7 +247,7 @@ function is_transactional_emails_active(): bool function set_transanctional_email_settings(?InstanceSettings $settings = null): ?string { if (! $settings) { - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); } config()->set('mail.from.address', data_get($settings, 'smtp_from_address')); config()->set('mail.from.name', data_get($settings, 'smtp_from_name')); @@ -281,7 +281,7 @@ function base_ip(): string if (isDev()) { return 'localhost'; } - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if ($settings->public_ipv4) { return "$settings->public_ipv4"; } @@ -309,7 +309,7 @@ function getFqdnWithoutPort(string $fqdn) */ function base_url(bool $withPort = true): string { - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if ($settings->fqdn) { return $settings->fqdn; } @@ -389,7 +389,7 @@ function send_internal_notification(string $message): void } function send_user_an_email(MailMessage $mail, string $email, ?string $cc = null): void { - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); $type = set_transanctional_email_settings($settings); if (! $type) { throw new Exception('No email settings found.'); @@ -975,7 +975,7 @@ function validate_dns_entry(string $fqdn, Server $server) if (str($host)->contains('sslip.io')) { return true; } - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); $is_dns_validation_enabled = data_get($settings, 'is_dns_validation_enabled'); if (! $is_dns_validation_enabled) { return true; @@ -1095,7 +1095,7 @@ function checkIfDomainIsAlreadyUsed(Collection|array $domains, ?string $teamId = if ($domainFound) { return true; } - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if (data_get($settings, 'fqdn')) { $domain = data_get($settings, 'fqdn'); if (str($domain)->endsWith('/')) { @@ -1167,7 +1167,7 @@ function check_domain_usage(ServiceApplication|Application|null $resource = null } } if ($resource) { - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if (data_get($settings, 'fqdn')) { $domain = data_get($settings, 'fqdn'); if (str($domain)->endsWith('/')) { diff --git a/database/migrations/2023_07_27_182013_smtp_discord_schemaless_to_normal.php b/database/migrations/2023_07_27_182013_smtp_discord_schemaless_to_normal.php index 8bb8d7824..3e3a90b6d 100644 --- a/database/migrations/2023_07_27_182013_smtp_discord_schemaless_to_normal.php +++ b/database/migrations/2023_07_27_182013_smtp_discord_schemaless_to_normal.php @@ -163,7 +163,7 @@ return new class extends Migration $table->schemalessAttributes('smtp'); }); - $instance_setting = InstanceSettings::get(); + $instance_setting = instanceSettings(); $instance_setting->smtp = [ 'enabled' => $instance_setting->smtp_enabled, 'from_address' => $instance_setting->smtp_from_address, diff --git a/database/seeders/InstanceSettingsSeeder.php b/database/seeders/InstanceSettingsSeeder.php index c3182a2dd..35fc8506b 100644 --- a/database/seeders/InstanceSettingsSeeder.php +++ b/database/seeders/InstanceSettingsSeeder.php @@ -27,14 +27,14 @@ class InstanceSettingsSeeder extends Seeder $ipv4 = Process::run('curl -4s https://ifconfig.io')->output(); $ipv4 = trim($ipv4); $ipv4 = filter_var($ipv4, FILTER_VALIDATE_IP); - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if (is_null($settings->public_ipv4) && $ipv4) { $settings->update(['public_ipv4' => $ipv4]); } $ipv6 = Process::run('curl -6s https://ifconfig.io')->output(); $ipv6 = trim($ipv6); $ipv6 = filter_var($ipv6, FILTER_VALIDATE_IP); - $settings = \App\Models\InstanceSettings::get(); + $settings = instanceSettings(); if (is_null($settings->public_ipv6) && $ipv6) { $settings->update(['public_ipv6' => $ipv6]); } diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 0076c941a..78ae02f3a 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -8,7 +8,7 @@ @use('App\Models\InstanceSettings') @php - $instanceSettings = \App\Models\InstanceSettings::get(); + $instanceSettings = instanceSettings(); $name = null; if ($instanceSettings) {