5d5c0f4f43
* Work around Twidere and Tootdon bug Tootdon and Twidere construct @user@domain handles from mentions in toots based solely on the mention text and account URI's domain without performing any webfinger call or retrieving account info from the Mastodon server. As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually resolve to the correct account (since the recommended configuration is to have WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing mentions, but won't do so when displaying them (as it does not go through the whole account resolution at that time). This change rewrites mentions to the resolved account, so that displaying the mentions will work. * Use lookbehind instead of non-capturing group in MENTION_RE Indeed, substitutions with the previous regexp would erroneously eat any preceding whitespace, which would lead to concatenated mentions in the previous commit. Note that users will “lose” up to one character space per mention for their toots, as that regexp is also used to remove the domain-part of mentioned users for character counting purposes, and it also erroneously removed the preceding character if it was a space.
59 lines
1.8 KiB
Ruby
59 lines
1.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class ProcessMentionsService < BaseService
|
|
include StreamEntryRenderer
|
|
|
|
# Scan status for mentions and fetch remote mentioned users, create
|
|
# local mention pointers, send Salmon notifications to mentioned
|
|
# remote users
|
|
# @param [Status] status
|
|
def call(status)
|
|
return unless status.local?
|
|
|
|
status.text = status.text.gsub(Account::MENTION_RE) do |match|
|
|
begin
|
|
mentioned_account = resolve_remote_account_service.call($1)
|
|
rescue Goldfinger::Error, HTTP::Error
|
|
mentioned_account = nil
|
|
end
|
|
|
|
next match if mentioned_account.nil? || (mentioned_account.ostatus? && status.stream_entry.hidden?)
|
|
|
|
mentioned_account.mentions.where(status: status).first_or_create(status: status)
|
|
"@#{mentioned_account.acct}"
|
|
end
|
|
|
|
status.save!
|
|
|
|
status.mentions.includes(:account).each do |mention|
|
|
create_notification(status, mention)
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def create_notification(status, mention)
|
|
mentioned_account = mention.account
|
|
|
|
if mentioned_account.local?
|
|
NotifyService.new.call(mentioned_account, mention)
|
|
elsif mentioned_account.ostatus? && !status.stream_entry.hidden?
|
|
NotificationWorker.perform_async(stream_entry_to_xml(status.stream_entry), status.account_id, mentioned_account.id)
|
|
elsif mentioned_account.activitypub?
|
|
ActivityPub::DeliveryWorker.perform_async(build_json(mention.status), mention.status.account_id, mentioned_account.inbox_url)
|
|
end
|
|
end
|
|
|
|
def build_json(status)
|
|
Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
|
|
status,
|
|
serializer: ActivityPub::ActivitySerializer,
|
|
adapter: ActivityPub::Adapter
|
|
).as_json).sign!(status.account))
|
|
end
|
|
|
|
def resolve_remote_account_service
|
|
ResolveRemoteAccountService.new
|
|
end
|
|
end
|