]> cat aescling's git repositories - mastodon.git/commitdiff
Fix "tootctl media remove-orphans" crashing when encountering invalid media (#13170)
authorEugen Rochko <eugen@zeonfederated.com>
Thu, 5 Mar 2020 14:56:01 +0000 (15:56 +0100)
committerGitHub <noreply@github.com>
Thu, 5 Mar 2020 14:56:01 +0000 (15:56 +0100)
Fixes #13168

app/models/media_attachment.rb

index 42364641f39fc371c43a65ddc9c6362c71423549..1e36625ca9a2eaa0f1ac43aa7d75cba93bc8b480 100644 (file)
@@ -170,6 +170,7 @@ class MediaAttachment < ApplicationRecord
 
   def variant?(other_file_name)
     return true if file_file_name == other_file_name
+    return false if file_file_name.nil?
 
     formats = file.styles.values.map(&:format).compact