diff options
| -rw-r--r-- | app/services/process_mentions_service.rb | 44 | ||||
| -rw-r--r-- | app/workers/local_notification_worker.rb | 12 |
2 files changed, 37 insertions, 19 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index dc8df4a9a..2ed6698cf 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -10,55 +10,61 @@ class ProcessMentionsService < BaseService def call(status) return unless status.local? + @status = status + mentions = [] + status.text = status.text.gsub(Account::MENTION_RE) do |match| - username, domain = $1.split('@') + username, domain = Regexp.last_match(1).split('@') mentioned_account = Account.find_remote(username, domain) - if mention_undeliverable?(status, mentioned_account) + if mention_undeliverable?(mentioned_account) begin - mentioned_account = resolve_account_service.call($1) + mentioned_account = resolve_account_service.call(Regexp.last_match(1)) rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError mentioned_account = nil end end - next match if mention_undeliverable?(status, mentioned_account) + next match if mention_undeliverable?(mentioned_account) + + mentions << mentioned_account.mentions.where(status: status).first_or_create(status: status) - 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 + mentions.each { |mention| create_notification(mention) } end private - def mention_undeliverable?(status, mentioned_account) - mentioned_account.nil? || (!mentioned_account.local? && mentioned_account.ostatus? && status.stream_entry.hidden?) + def mention_undeliverable?(mentioned_account) + mentioned_account.nil? || (!mentioned_account.local? && mentioned_account.ostatus? && @status.stream_entry.hidden?) end - def create_notification(status, mention) + def create_notification(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) + LocalNotificationWorker.perform_async(mention.id) + elsif mentioned_account.ostatus? && !@status.stream_entry.hidden? + NotificationWorker.perform_async(ostatus_xml, @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) + ActivityPub::DeliveryWorker.perform_async(activitypub_json, mention.status.account_id, mentioned_account.inbox_url) end end - def build_json(status) - Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new( - status, + def ostatus_xml + @ostatus_xml ||= stream_entry_to_xml(@status.stream_entry) + end + + def activitypub_json + @activitypub_json ||= Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new( + @status, serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter - ).as_json).sign!(status.account)) + ).as_json).sign!(@status.account)) end def resolve_account_service diff --git a/app/workers/local_notification_worker.rb b/app/workers/local_notification_worker.rb new file mode 100644 index 000000000..748270563 --- /dev/null +++ b/app/workers/local_notification_worker.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class LocalNotificationWorker + include Sidekiq::Worker + + def perform(mention_id) + mention = Mention.find(mention_id) + NotifyService.new.call(mention.account, mention) + rescue ActiveRecord::RecordNotFound + true + end +end |