diff options
| author | Starfall <us@starfall.systems> | 2020-08-31 12:28:25 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-08-31 12:28:25 -0500 |
| commit | c5bb91194f0df90ea9c59ea6af1bd985b295fb30 (patch) | |
| tree | 47b303b2c64ff1920fb19d01093a08dc9fd20ac8 /lib | |
| parent | 27ee0fc8c4c13c53f81ca3db781b9d0783b877e5 (diff) | |
| parent | f715e8b51612820a18fa307e4465eb0c1a088f86 (diff) | |
Merge branch 'glitch' into main
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 |