Parcourir la source

Update app.name config, use config_cache

Daniel Supernault il y a 1 an
Parent
commit
911446c03e

+ 1 - 1
app/Http/Controllers/Api/ApiV1Controller.php

@@ -1632,7 +1632,7 @@ class ApiV1Controller extends Controller
 
             return [
                 'uri' => config('pixelfed.domain.app'),
-                'title' => config('app.name'),
+                'title' => config_cache('app.name'),
                 'short_description' => config_cache('app.short_description'),
                 'description' => config_cache('app.description'),
                 'email' => config('instance.email'),

+ 2 - 2
resources/views/account/moderation/post/autospam.blade.php

@@ -69,7 +69,7 @@
 		<div class="col-12 col-md-6 offset-md-3 my-3">
 			<div class="border rounded p-3 border-primary">
 				<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
-				<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
+				<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
 			</div>
 		</div>
 
@@ -100,4 +100,4 @@
 	ctx.putImageData(imageData, 0, 0);
 </script>
 @endif
-@endpush
+@endpush

+ 2 - 2
resources/views/account/moderation/post/cw.blade.php

@@ -70,7 +70,7 @@
 		<div class="col-12 col-md-6 offset-md-3 my-3">
 			<div class="border rounded p-3 border-primary">
 				<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
-				<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
+				<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
 			</div>
 		</div>
 
@@ -127,4 +127,4 @@
 	ctx.putImageData(imageData, 0, 0);
 </script>
 @endif
-@endpush
+@endpush

+ 2 - 2
resources/views/account/moderation/post/removed.blade.php

@@ -62,7 +62,7 @@
 		<div class="col-12 col-md-6 offset-md-3 my-3">
 			<div class="border rounded p-3 border-primary">
 				<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
-				<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
+				<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
 			</div>
 		</div>
 		<div class="col-12 col-md-6 offset-md-3 mt-4 mb-5">
@@ -96,4 +96,4 @@
 	ctx.putImageData(imageData, 0, 0);
 </script>
 @endif
-@endpush
+@endpush

+ 2 - 2
resources/views/account/moderation/post/unlist.blade.php

@@ -69,7 +69,7 @@
 		<div class="col-12 col-md-6 offset-md-3 my-3">
 			<div class="border rounded p-3 border-primary">
 				<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
-				<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
+				<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
 			</div>
 		</div>
 
@@ -125,4 +125,4 @@
 	ctx.putImageData(imageData, 0, 0);
 </script>
 @endif
-@endpush
+@endpush

+ 2 - 2
resources/views/home.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.app',['title' => 'Welcome to ' . config('app.name')])
+@extends('layouts.app',['title' => 'Welcome to ' . config_cache('app.name')])
 
 @section('content')
 <div class="container mt-4">
@@ -14,7 +14,7 @@
                         </div>
                     @endif
 
-                    <p class="lead mb-0">Welcome to {{config('app.name')}}!</p>
+                    <p class="lead mb-0">Welcome to {{config_cache('app.name')}}!</p>
                 </div>
             </div>
 

+ 3 - 3
resources/views/layouts/app-guest.blade.php

@@ -5,11 +5,11 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<meta name="mobile-web-app-capable" content="yes">
 
-	<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
+	<title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
 	<link rel="manifest" href="{{url('/manifest.json')}}">
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta property="og:type" content="article">
 	<meta property="og:url" content="{{url(request()->url())}}">
 	@stack('meta')

+ 2 - 2
resources/views/layouts/app.blade.php

@@ -70,11 +70,11 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<meta name="mobile-web-app-capable" content="yes">
 
-	<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
+	<title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
 	<link rel="manifest" href="/manifest.json">
 
 	<meta property="og:site_name" content="Pixelfed">
-	<meta property="og:title" content="{{ $ogTitle ?? $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $ogTitle ?? $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta property="og:type" content="{{ $ogType ?? 'article' }}">
 	<meta property="og:url" content="{{url(request()->url())}}">
 	@stack('meta')

+ 2 - 2
resources/views/layouts/blank.blade.php

@@ -11,8 +11,8 @@
 
 	<title>{{ $title ?? config_cache('app.name') }}</title>
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta property="og:type" content="article">
 	<meta property="og:url" content="{{request()->url()}}">
 	@stack('meta')

+ 3 - 3
resources/views/layouts/bundle.blade.php

@@ -9,11 +9,11 @@
 
     <meta name="mobile-web-app-capable" content="yes">
 
-    <title>{{ $title ?? config('app.name', 'Laravel') }}</title>
+    <title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
     <link rel="manifest" href="/manifest.json">
 
-    <meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-    <meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+    <meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+    <meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
     <meta property="og:type" content="article">
     <meta property="og:url" content="{{request()->url()}}">
     @stack('meta')

+ 1 - 1
resources/views/layouts/partial/noauthnav.blade.php

@@ -2,7 +2,7 @@
     <div class="container">
         <a class="navbar-brand d-flex align-items-center" href="{{ url('/') }}">
             <img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" alt="Pixelfed logo">
-            <span class="font-weight-bold mb-0" style="font-size:20px;">{{ config('app.name', 'Laravel') }}</span>
+            <span class="font-weight-bold mb-0" style="font-size:20px;">{{ config_cache('app.name', 'Pixelfed') }}</span>
         </a>
     </div>
 </nav>

+ 2 - 2
resources/views/portfolio/layout.blade.php

@@ -11,8 +11,8 @@
 
 	<title>{!! $title ?? config_cache('app.name') !!}</title>
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta property="og:type" content="article">
 	<meta property="og:url" content="{{request()->url()}}">
 	@stack('meta')

+ 2 - 2
resources/views/profile/embed-removed.blade.php

@@ -9,8 +9,8 @@
 
 	<title>Pixelfed | 404 Embed Not Found</title>
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta name="medium" content="image">
 	<meta name="theme-color" content="#10c5f8">
 	<meta name="apple-mobile-web-app-capable" content="yes">

+ 2 - 2
resources/views/profile/embed.blade.php

@@ -9,8 +9,8 @@
 
     <title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
 
-    <meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-    <meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+    <meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+    <meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
     <meta property="og:type" content="article">
     <meta property="og:url" content="{{$profile['url']}}">
     <meta name="medium" content="image">

+ 1 - 1
resources/views/profile/private.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.app-guest',['title' => $user->username . " on " . config('app.name')])
+@extends('layouts.app-guest',['title' => $user->username . " on " . config_cache('app.name')])
 
 @section('content')
 @if (session('error'))

+ 1 - 1
resources/views/site/index.blade.php

@@ -8,7 +8,7 @@
 
 	<meta name="mobile-web-app-capable" content="yes">
 
-	<title>{{ config('app.name', 'Pixelfed') }}</title>
+	<title>{{ config_cache('app.name', 'Pixelfed') }}</title>
 
 	<link rel="canonical" href="{{ request()->url() }}" />
 

+ 2 - 2
resources/views/status/embed-removed.blade.php

@@ -9,8 +9,8 @@
 
 	<title>Pixelfed | 404 Embed Not Found</title>
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta name="medium" content="image">
 	<meta name="theme-color" content="#10c5f8">
 	<meta name="apple-mobile-web-app-capable" content="yes">

+ 2 - 2
resources/views/vendor/mail/html/message.blade.php

@@ -2,7 +2,7 @@
 {{-- Header --}}
 @slot('header')
 @component('mail::header', ['url' => config('app.url')])
-{{ config('app.name') }}
+{{ config_cache('app.name') }}
 @endcomponent
 @endslot
 
@@ -21,7 +21,7 @@
 {{-- Footer --}}
 @slot('footer')
 @component('mail::footer')
-© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
+© {{ date('Y') }} {{ config_cache('app.name') }}. @lang('All rights reserved.')
 @endcomponent
 @endslot
 @endcomponent

+ 2 - 2
resources/views/vendor/mail/text/message.blade.php

@@ -2,7 +2,7 @@
     {{-- Header --}}
     @slot('header')
         @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
+            {{ config_cache('app.name') }}
         @endcomponent
     @endslot
 
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
+            © {{ date('Y') }} {{ config_cache('app.name') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent

+ 1 - 1
resources/views/vendor/passport/authorize.blade.php

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ config('app.name') }} - Authorization</title>
+    <title>{{ config_cache('app.name') }} - Authorization</title>
     <link href="{{ mix('/css/app.css') }}" rel="stylesheet">
     <style>
         .passport-authorize .container {