diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-30 18:34:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 18:34:51 +0200 |
| commit | f715e8b51612820a18fa307e4465eb0c1a088f86 (patch) | |
| tree | 8137b48a716e05424ca544210d86e91818085ba7 /lib | |
| parent | 30632adf9eda6d83a9b4269f23f11ced5e09cd93 (diff) | |
| parent | a68ec50e4e38898e88a7dcc33bd0032adc946dda (diff) | |
Merge pull request #1411 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/media_cli.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index 7b82c3d22..54da5b2cd 100644 --- a/lib/mastodon/media_cli.rb +++ b/lib/mastodon/media_cli.rb @@ -31,7 +31,7 @@ module Mastodon processed, aggregate = parallelize_with_progress(MediaAttachment.cached.where.not(remote_url: '').where('created_at < ?', time_ago)) do |media_attachment| next if media_attachment.file.blank? - size = media_attachment.file_file_size + (media_attachment.thumbnail_file_size || 0) + size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0) unless options[:dry_run] media_attachment.file.destroy |