From: Takeshi Umeda Date: Mon, 24 Aug 2020 16:09:46 +0000 (+0900) Subject: Fix an error when file_file_size is nil in tootctl media remove (#14657) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=175cd4f8efb62abf8ba7b758b21b724798deaaa5;p=mastodon.git Fix an error when file_file_size is nil in tootctl media remove (#14657) --- 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