logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: e4f56fa94217061b25f3a8f45d17c8657ca9c56d
parent: 882de42bab197e4d6b7b8acf327e72a240eda76d
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 18 Nov 2016 23:16:34 +0100

Don't create attachments if remote file cannot be fetched

Diffstat:

Mapp/models/media_attachment.rb2--
Mapp/services/process_feed_service.rb2+-
2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb @@ -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? diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb @@ -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