Merge pull request #3878 from pixelfed/staging

Staging

CHANGELOG.md

@@ -33,7 +33,9 @@
 - Update MediaStorageService, fix size check bug ([319f0ba5](https://github.com/pixelfed/pixelfed/commit/319f0ba5))
 - Update AvatarSync, fix sync skipping recently fetched avatars by setting last_fetched_at to null before refetching ([a83fc798](https://github.com/pixelfed/pixelfed/commit/a83fc798))
 - Refactor AvatarStorage to support migrating avatars to cloud storage, fix remote avatar refetching and merge AvatarSync commands and add deprecation notice to avatar:sync command ([223aea47](https://github.com/pixelfed/pixelfed/commit/223aea47))
-- ([](https://github.com/pixelfed/pixelfed/commit/))
+- Update AvatarStorage, improve overview calculations ([733b9fd0](https://github.com/pixelfed/pixelfed/commit/733b9fd0))
+- Update filesystem config, fix DO Spaces root default ([720b6eb3](https://github.com/pixelfed/pixelfed/commit/720b6eb3))
+-  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)
 

app/Console/Commands/AvatarStorage.php

@@ -51,8 +51,8 @@ class AvatarStorage extends Command
             ],
             [
                 'Remote',
-                Avatar::whereNotNull('is_remote')->count(),
-                PrettyNumber::size(Avatar::whereNotNull('is_remote')->sum('size'))
+                Avatar::whereIsRemote(true)->count(),
+                PrettyNumber::size(Avatar::whereIsRemote(true)->sum('size'))
             ],
             [
                 'Cached (CDN)',
@@ -61,8 +61,8 @@ class AvatarStorage extends Command
             ],
             [
                 'Uncached',
-                Avatar::whereNull('is_remote')->whereNull('cdn_url')->count(),
-                PrettyNumber::size(Avatar::whereNull('is_remote')->whereNull('cdn_url')->sum('size'))
+                Avatar::whereNull('cdn_url')->count(),
+                PrettyNumber::size(Avatar::whereNull('cdn_url')->sum('size'))
             ],
             [
                 '------------',

config/filesystems.php

@@ -80,7 +80,7 @@ return [
             'options' => [
                 'CacheControl' => 'max-age=31536000'
             ],
-            'root' => env('DO_SPACES_ROOT','/'),
+            'root' => env('DO_SPACES_ROOT',''),
             'throw' => true,
         ],