Merge branch 'main' into glitch-soc/merge-upstream

2023-01-24 20:32:31 +01:00
parent 368d6fe54f a5a00d7f7a
commit 3074338d79
108 changed files with 1004 additions and 571 deletions
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@ -10,7 +10,7 @@ class VerifyLinkService < BaseService
    return unless link_back_present?

    field.mark_verified!
-  rescue OpenSSL::SSL::SSLError, HTTP::Error, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e
+  rescue OpenSSL::SSL::SSLError, HTTP::Error, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, IPAddr::AddressFamilyError => e
    Rails.logger.debug "Error fetching link #{@url}: #{e}"
    nil
  end