]> cat aescling's git repositories - mastodon.git/commitdiff
Don't create attachments if remote file cannot be fetched
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 18 Nov 2016 22:16:34 +0000 (23:16 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 18 Nov 2016 22:16:34 +0000 (23:16 +0100)
app/models/media_attachment.rb
app/services/process_feed_service.rb

index d3e3d73beb83628dec6c5127ae9fa2777702f03d..bfbf00d762c51ff864ea22bf32bc6d06387be1bf 100644 (file)
@@ -22,8 +22,6 @@ class MediaAttachment < ApplicationRecord
 
   def file_remote_url=(url)
     self.file = URI.parse(url)
-  rescue OpenURI::HTTPError => e
-    Rails.logger.debug "Error fetching remote attachment: #{e}"
   end
 
   def image?
index 561feb0325bab74b107283990afaaf0441157264..08c66c9048f1b2d729321db61e4b7573c7575b68 100644 (file)
@@ -173,7 +173,7 @@ class ProcessFeedService < BaseService
         begin
           media.file_remote_url = link['href']
           media.save
-        rescue Paperclip::Errors::NotIdentifiedByImageMagickError
+        rescue OpenURI::HTTPError, Paperclip::Errors::NotIdentifiedByImageMagickError
           next
         end
       end