mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 21:26:52 +00:00
Don't create attachments if remote file cannot be fetched
This commit is contained in:
parent
882de42bab
commit
e4f56fa942
|
@ -22,8 +22,6 @@ class MediaAttachment < ApplicationRecord
|
||||||
|
|
||||||
def file_remote_url=(url)
|
def file_remote_url=(url)
|
||||||
self.file = URI.parse(url)
|
self.file = URI.parse(url)
|
||||||
rescue OpenURI::HTTPError => e
|
|
||||||
Rails.logger.debug "Error fetching remote attachment: #{e}"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def image?
|
def image?
|
||||||
|
|
|
@ -173,7 +173,7 @@ class ProcessFeedService < BaseService
|
||||||
begin
|
begin
|
||||||
media.file_remote_url = link['href']
|
media.file_remote_url = link['href']
|
||||||
media.save
|
media.save
|
||||||
rescue Paperclip::Errors::NotIdentifiedByImageMagickError
|
rescue OpenURI::HTTPError, Paperclip::Errors::NotIdentifiedByImageMagickError
|
||||||
next
|
next
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue