Merge pull request #11794 from nanaya/background-image-proxy

Remove proxying option of blade background image
ppy · Jan 20, 2025 · f6be1f0 · f6be1f0
2 parents 832081c + 4a0a233
commit f6be1f0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/app/helpers.php b/app/helpers.php
@@ -55,15 +55,11 @@ function atom_id(string $namespace, $id = null): string
     return 'tag:'.request()->getHttpHost().',2019:'.$namespace.($id === null ? '' : "/{$id}");
 }
 
-function background_image($url, $proxy = true)
+function background_image($url): string
 {
-    if (!present($url)) {
-        return '';
-    }
-
-    $url = $proxy ? proxy_media($url) : $url;
-
-    return sprintf(' style="background-image:url(\'%s\');" ', e($url));
+    return present($url)
+        ? sprintf(' style="background-image:url(\'%s\');" ', e($url))
+        : '';
 }
 
 function beatmap_timestamp_format($ms)

diff --git a/resources/views/follows/modding.blade.php b/resources/views/follows/modding.blade.php
@@ -60,7 +60,7 @@
                                 <td class="beatmapset-watches__col beatmapset-watches__col--cover">
                                     <a href="{{ route('beatmapsets.discussion', $watch->beatmapset) }}">
                                         <div
-                                            {!! background_image($watch->beatmapset->coverURL('list'), false) !!}
+                                            {!! background_image($watch->beatmapset->coverURL('list')) !!}
                                             class="beatmapset-watches__cover"
                                         ></div>
                                     </a>

diff --git a/resources/views/forum/topics/_post_info.blade.php b/resources/views/forum/topics/_post_info.blade.php
@@ -76,7 +76,7 @@ class="forum-post-info__row forum-post-info__row--title"
             <a
                 class="flag-team"
                 href="{{ route('teams.show', $team) }}"
-                {!! background_image($team->logo()->url(), false) !!}
+                {!! background_image($team->logo()->url()) !!}
             >
             </a>
         </div>

diff --git a/resources/views/layout/_header_user.blade.php b/resources/views/layout/_header_user.blade.php
@@ -21,6 +21,6 @@ class="{{ $class }} avatar--guest"
         class="{{ $class }} {{ Auth::user()->isRestricted() ? 'avatar--restricted' : '' }}"
         data-click-menu-target="nav2-user-popup"
         href="{{ route('users.show', Auth::user()) }}"
-        {!! background_image(Auth::user()->user_avatar, false) !!}
+        {!! background_image(Auth::user()->user_avatar) !!}
     ></a>
 @endif
diff --git a/resources/views/layout/_page_header_v4.blade.php b/resources/views/layout/_page_header_v4.blade.php
@@ -24,7 +24,7 @@
 ">
     <div class="header-v4__container header-v4__container--main">
         <div class="header-v4__bg-container">
-            <div class="header-v4__bg {{ $backgroundExtraClass }}" {!! background_image($backgroundImage ?? null, false) !!}></div>
+            <div class="header-v4__bg {{ $backgroundExtraClass }}" {!! background_image($backgroundImage ?? null) !!}></div>
         </div>
 
         <div class="hidden-xs js-sync-height--target" data-sync-height-id="notification-banners">

diff --git a/resources/views/layout/_popup_user.blade.php b/resources/views/layout/_popup_user.blade.php
@@ -14,7 +14,7 @@ class="simple-menu simple-menu--nav2 js-click-menu js-nav2--centered-popup"
     <a
         href="{{ $currentUserUrl  }}"
         class="simple-menu__header simple-menu__header--link js-current-user-cover"
-        {!! background_image($currentUser->cover()->url(), false) !!}
+        {!! background_image($currentUser->cover()->url()) !!}
     >
         <img class="simple-menu__header-icon" src="/images/icons/profile.svg" alt="">
         <div class="u-relative">{{ $currentUser->username }}</div>

diff --git a/resources/views/objects/_flag_team.blade.php b/resources/views/objects/_flag_team.blade.php
@@ -5,5 +5,5 @@
 <span
     class="{{ class_with_modifiers('flag-team', $modifiers ?? null) }}"
     title="{{ $team->name }}"
-    {!! background_image($team->logo()->url(), false) !!}
+    {!! background_image($team->logo()->url()) !!}
 ></span>