mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use already-known remote user data if resolving temporarily fails in mentions (#5702)

for-upstream/optional-notification-muting^2
ThibG 2017-11-15 01:06:49 +01:00 committed by Eugen Rochko
parent 546257bc7f
commit 1c25853842
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/process_mentions_service.rb
View File

@ -17,6 +17,11 @@ class ProcessMentionsService < BaseService
mentioned_account = nil mentioned_account = nil
end end
if mentioned_account.nil?
username, domain = match.first.split('@')
mentioned_account = Account.find_remote(username, domain)
end
next match if mentioned_account.nil? || (!mentioned_account.local? && mentioned_account.ostatus? && status.stream_entry.hidden?) next match if mentioned_account.nil? || (!mentioned_account.local? && mentioned_account.ostatus? && status.stream_entry.hidden?)
mentioned_account.mentions.where(status: status).first_or_create(status: status) mentioned_account.mentions.where(status: status).first_or_create(status: status)