nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Pleroma mentions being fetched as preview cards (#9158)

This commit is contained in:
ThibG 2018-10-30 15:02:24 +01:00 committed by Eugen Rochko
parent c1eec9869e
commit a03d506626
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/fetch_link_card_service.rb
View File

@ -17,8 +17,7 @@ class FetchLinkCardService < BaseService
return if @url.nil? || @status.preview_cards.any? return if @url.nil? || @status.preview_cards.any?
@mentions = status.mentions @url = @url.to_s
@url = @url.to_s
RedisLock.acquire(lock_options) do |lock| RedisLock.acquire(lock_options) do |lock|
if lock.acquired? if lock.acquired?
@ -84,9 +83,8 @@ class FetchLinkCardService < BaseService
end end
def mention_link?(a) def mention_link?(a)
return false if @mentions.nil? @status.mentions.any? do |mention|
@mentions.any? do |mention| a['href'] == TagManager.instance.url_for(mention.account)
a['href'] == TagManager.instance.url_for(mention.target)
end end
end end