chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3878 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2022-12-02 02:04:36 -07:00 committed by GitHub
parent 38c84e1c3e 1a695f8073
commit cb7b6ac19c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -33,6 +33,8 @@
- Update MediaStorageService, fix size check bug ([319f0ba5](https://github.com/pixelfed/pixelfed/commit/319f0ba5)) - 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)) - 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)) - 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))
- 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/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

8
app/Console/Commands/AvatarStorage.php
View File

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

2
config/filesystems.php
View File

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