diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-01 16:58:13 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-01 16:58:13 +0100 |
commit | 57304ac375e905fb0efa1b98a6100828bdbef2e1 (patch) | |
tree | 820e85a777938b618cc18fe3d45c0fcc9aaf7179 /app/models | |
parent | bab4904492dff61f20f44e6e0daf040173990214 (diff) |
Catch 404 errors when downloading remote media, add screenshot to landing page
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/account.rb | 2 | ||||
-rw-r--r-- | app/models/media_attachment.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 8542852bc..0a6ba182b 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -112,6 +112,8 @@ class Account < ApplicationRecord def avatar_remote_url=(url) self.avatar = URI.parse(url) unless self[:avatar_remote_url] == url self[:avatar_remote_url] = url + rescue OpenURI::HTTPError + # end def object_type diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 55eabc226..a740792f2 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -20,6 +20,8 @@ class MediaAttachment < ApplicationRecord def file_remote_url=(url) self.file = URI.parse(url) + rescue OpenURI::HTTPError + # end def image? |