diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-25 14:31:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 14:31:49 +0200 |
| commit | 359f8de2e8297670fe9faf0839c8c9dd25b58de1 (patch) | |
| tree | 1edfdc513b197699b5e7cae76d8c4871d5019788 /app/lib | |
| parent | a2df067f9852f0db3140dd2c35539f4e74bdb6dc (diff) | |
| parent | 2f6ff141984e7df12f7bcc64b2c8754542151a70 (diff) | |
Merge pull request #1570 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index cc2d391fb..390414df2 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -223,8 +223,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 + rescue Seahorse::Client::NetworkingError => e + Rails.logger.warn "Error storing emoji: #{e}" end def process_attachments @@ -247,8 +247,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 + rescue Seahorse::Client::NetworkingError => e + Rails.logger.warn "Error storing media attachment: #{e}" end end |