diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-17 13:55:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-17 13:55:37 +0100 |
| commit | 381137c94e6cf341117adddc673cfac82760c710 (patch) | |
| tree | 5cfc5f89aaa1d20f5801da6bf56e4cd14bb59433 /app/services | |
| parent | ab7d99e035f5b880ef77440e7c2e76f8e8728992 (diff) | |
| parent | c22f3a87a3598210ffa28517e42c2fc619dbcef5 (diff) | |
Merge pull request #1951 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/verify_link_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb index 0a39d7f26..7496fe2d5 100644 --- a/app/services/verify_link_service.rb +++ b/app/services/verify_link_service.rb @@ -28,7 +28,7 @@ class VerifyLinkService < BaseService links = Nokogiri::HTML(@body).xpath('//a[contains(concat(" ", normalize-space(@rel), " "), " me ")]|//link[contains(concat(" ", normalize-space(@rel), " "), " me ")]') - if links.any? { |link| link['href'].downcase == @link_back.downcase } + if links.any? { |link| link['href']&.downcase == @link_back.downcase } true elsif links.empty? false @@ -38,6 +38,8 @@ class VerifyLinkService < BaseService end def link_redirects_back?(test_url) + return false if test_url.blank? + redirect_to_url = Request.new(:head, test_url, follow: false).perform do |res| res.headers['Location'] end |