]> cat aescling's git repositories - mastodon.git/commitdiff
Fix an error when file_file_size is nil in tootctl media remove (#14657)
authorTakeshi Umeda <noel.yoshiba@gmail.com>
Mon, 24 Aug 2020 16:09:46 +0000 (01:09 +0900)
committerGitHub <noreply@github.com>
Mon, 24 Aug 2020 16:09:46 +0000 (18:09 +0200)
lib/mastodon/media_cli.rb

index 7b82c3d220111df25f75e3356a121a4f3469008d..54da5b2cd7d2cea7d5b0ba87b298465aa5661af5 100644 (file)
@@ -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