diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
| commit | e4f8679eaeea062e1f9ca9f58703b51ff8162c35 (patch) | |
| tree | 13940a853f1278a3c4ef89dd3a0bbedfeaaf7140 /app/lib/activitypub/activity/create.rb | |
| parent | 1978f7265e1e83bda25413da26f53c53110af764 (diff) | |
| parent | 8485c436d5d083c28df8c942fe521bfb46edfc9f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.
Diffstat (limited to 'app/lib/activitypub/activity/create.rb')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index d56d47a2d..b9d43d74d 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -228,6 +228,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri) emoji.image_remote_url = image_url emoji.save + rescue Seahorse::Client::NetworkingError + nil end def process_attachments @@ -250,6 +252,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity media_attachment.save rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError RedownloadMediaWorker.perform_in(rand(30..600).seconds, media_attachment.id) + rescue Seahorse::Client::NetworkingError + nil end end |