diff --git a/CHANGELOG.md b/CHANGELOG.md index 845194256..70944b504 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Release Notes ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.6...dev) + +### Updates +- Update admin dashboard, fix search and dropdown menu ([dac0d083](https://github.com/pixelfed/pixelfed/commit/dac0d083)) +- Update sudo mode view, fix trusted device checkbox ([8ef900bf](https://github.com/pixelfed/pixelfed/commit/8ef900bf)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6) diff --git a/app/Services/AvatarService.php b/app/Services/AvatarService.php new file mode 100644 index 000000000..1c5e9e0c1 --- /dev/null +++ b/app/Services/AvatarService.php @@ -0,0 +1,23 @@ +avatarUrl(); + } +} diff --git a/app/User.php b/app/User.php index 980548d6d..3f826c143 100644 --- a/app/User.php +++ b/app/User.php @@ -7,6 +7,7 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; use App\Util\RateLimit\User as UserRateLimit; +use App\Services\AvatarService; class User extends Authenticatable { @@ -97,4 +98,13 @@ class User extends Authenticatable return $this->hasMany(AccountInterstitial::class); } + public function avatarUrl() + { + if(!$this->profile_id || $this->status) { + return config('app.url') . '/storage/avatars/default.jpg'; + } + + return AvatarService::get($this->profile_id); + } + } diff --git a/public/js/spa.js b/public/js/spa.js index d9f342348..e5284288a 100644 Binary files a/public/js/spa.js and b/public/js/spa.js differ diff --git a/public/js/spa.js.LICENSE.txt b/public/js/spa.js.LICENSE.txt index ba8e2aeda..dec739529 100644 --- a/public/js/spa.js.LICENSE.txt +++ b/public/js/spa.js.LICENSE.txt @@ -1 +1,3 @@ /*! @source http://purl.eligrey.com/github/canvas-toBlob.js/blob/master/canvas-toBlob.js */ + +/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index c1d72cb20..adfaf1c36 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/views/admin/partial/nav.blade.php b/resources/views/admin/partial/nav.blade.php index fe011be1a..cbbf17822 100644 --- a/resources/views/admin/partial/nav.blade.php +++ b/resources/views/admin/partial/nav.blade.php @@ -1,7 +1,8 @@