diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-13 12:26:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-13 12:26:34 +0100 |
| commit | afd0d424da4928b9e20a3c7a943f970252ed3a29 (patch) | |
| tree | 98641aa5df145b1a025ff29940c2d8814f6b7b2f /app/services | |
| parent | 932a22219ae99a285bdd0b69f02627f029327db3 (diff) | |
| parent | b52dc5f69d27ce2fcc84b3929840f2d8704ae48a (diff) | |
Merge pull request #2080 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/batched_remove_status_service.rb | 2 | ||||
| -rw-r--r-- | app/services/verify_link_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb index 2b649ee22..e2c370057 100644 --- a/app/services/batched_remove_status_service.rb +++ b/app/services/batched_remove_status_service.rb @@ -20,7 +20,7 @@ class BatchedRemoveStatusService < BaseService ActiveRecord::Associations::Preloader.new.preload(statuses_with_account_conversations, [mentions: :account]) statuses_with_account_conversations.each do |status| - status.send(:unlink_from_conversations) + status.unlink_from_conversations! unpush_from_direct_timelines(status) end diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb index 7496fe2d5..d049b52d1 100644 --- a/app/services/verify_link_service.rb +++ b/app/services/verify_link_service.rb @@ -26,7 +26,7 @@ class VerifyLinkService < BaseService def link_back_present? return false if @body.blank? - links = Nokogiri::HTML(@body).xpath('//a[contains(concat(" ", normalize-space(@rel), " "), " me ")]|//link[contains(concat(" ", normalize-space(@rel), " "), " me ")]') + links = Nokogiri::HTML5(@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 } true |