Commit 84cfee24 authored by ThibG's avatar ThibG Committed by Eugen Rochko

Do not process undeliverable mentions (#5598)

* Resolve remote accounts when mentioned even if they are already known

This commit reduces the risk of not having up-to-date public key or protocol
information for a remote account, which is required to deliver toots
(especially direct messages).

* Do not add mentions in private messages for remote users we cannot deliver to

Mastodon does not deliver private and direct toots to OStatus users, as there
is no guarantee the remote software understands the toot's privacy. However,
users currently do not get any feedback on it (Mastodon won't attempt delivery,
but the toot will be displayed exactly the same way to the user).

This change introduces *some* feedback by not processing mentions that are
not going to be delivered. A long-term solution is still needed to have
delivery receipts or at least some better indication of what is going on, but
at least an user can see *something* is up.
parent 7bea1530
......@@ -17,7 +17,7 @@ class ProcessMentionsService < BaseService
mentioned_account = nil
end
next if mentioned_account.nil?
next if mentioned_account.nil? || (mentioned_account.ostatus? && status.stream_entry.hidden?)
mentioned_account.mentions.where(status: status).first_or_create(status: status)
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment