From 175cd4f8efb62abf8ba7b758b21b724798deaaa5 Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Tue, 25 Aug 2020 01:09:46 +0900
Subject: [PATCH] Fix an error when file_file_size is nil in tootctl media
remove (#14657)
---
lib/mastodon/media_cli.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 7b82c3d220..54da5b2cd7 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
--
GitLab