diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-10 13:27:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 13:27:40 +0100 |
| commit | ee7e49d1b1323618e16026bc8db8ab7f9459cc2d (patch) | |
| tree | 86d51ac7c13d2b08fae534a44524c2ef8b131315 /app/lib | |
| parent | b2a25d446a9f4368ad9d1240b9da30bc33942da5 (diff) | |
| parent | c4d2c729245fab1dda31d0de73be9bc03217b06a (diff) | |
Merge pull request #1910 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/hashtag_normalizer.rb | 2 | ||||
| -rw-r--r-- | app/lib/request.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/lib/hashtag_normalizer.rb b/app/lib/hashtag_normalizer.rb index c1f99e163..49fa6101d 100644 --- a/app/lib/hashtag_normalizer.rb +++ b/app/lib/hashtag_normalizer.rb @@ -8,7 +8,7 @@ class HashtagNormalizer private def remove_invalid_characters(str) - str.gsub(/[^[:alnum:]#{Tag::HASHTAG_SEPARATORS}]/, '') + str.gsub(Tag::HASHTAG_INVALID_CHARS_RE, '') end def ascii_folding(str) diff --git a/app/lib/request.rb b/app/lib/request.rb index 1ea86862d..dd198f399 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -199,7 +199,8 @@ class Request rescue IPAddr::InvalidAddressError Resolv::DNS.open do |dns| dns.timeouts = 5 - addresses = dns.getaddresses(host).take(2) + addresses = dns.getaddresses(host) + addresses = addresses.filter { |addr| addr.is_a?(Resolv::IPv6) }.take(2) + addresses.filter { |addr| !addr.is_a?(Resolv::IPv6) }.take(2) end end |