diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb index 846751cd59..7d53bc255a 100644 --- a/app/services/verify_link_service.rb +++ b/app/services/verify_link_service.rb @@ -27,6 +27,22 @@ class VerifyLinkService < BaseService def link_back_present? return false if @body.empty? - Nokogiri::HTML(@body).xpath('//a[contains(concat(" ", normalize-space(@rel), " "), " me ")]|//link[contains(concat(" ", normalize-space(@rel), " "), " me ")]').any? { |link| link['href'] == @link_back } + 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'] == @link_back } + true + elsif links.empty? + false + else + link_redirects_back?(links.first['href']) + end + end + + def link_redirects_back?(test_url) + redirect_to_url = Request.new(:head, test_url, follow: false).perform do |res| + res.headers['Location'] + end + + redirect_to_url == @link_back end end diff --git a/config/locales/es.yml b/config/locales/es.yml index 7ae08dbce2..4501dc28d5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -47,7 +47,7 @@ es: one: Seguidor other: Seguidores following: Siguiendo - joined: Se unió el %{fecha} + joined: Se unió el %{date} media: Media moved_html: "%{name} se ha trasladado a %{new_profile_link}:" network_hidden: Esta información no está disponible diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb index acd4e851e5..9b04d61364 100644 --- a/spec/services/verify_link_service_spec.rb +++ b/spec/services/verify_link_service_spec.rb @@ -7,6 +7,7 @@ RSpec.describe VerifyLinkService, type: :service do let(:field) { Account::Field.new(account, 'name' => 'Website', 'value' => 'http://example.com') } before do + stub_request(:head, 'https://redirect.me/abc').to_return(status: 301, headers: { 'Location' => ActivityPub::TagManager.instance.url_for(account) }) stub_request(:get, 'http://example.com').to_return(status: 200, body: html) subject.call(field) end @@ -56,6 +57,21 @@ RSpec.describe VerifyLinkService, type: :service do end end + context 'when a link goes through a redirect back' do + let(:html) do + <<-HTML + + + + + HTML + end + + it 'marks the field as verified' do + expect(field.verified?).to be true + end + end + context 'when a link does not contain a link back' do let(:html) { '' }