mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-11-28 06:48:28 +09:00
Code

Improve PostStatusService performance (#7317)

Browse Source 
Offload creation of local notifications to a worker. Remove two
redundant SQL queries from ProcessMentionsService, remove n+1
XML/JSON serialization via memoization
This commit is contained in:
Eugen Rochko 2018-05-02 22:10:57 +02:00 committed by GitHub
parent cb5b5cb5f7
commit 658cbc9425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/services/process_mentions_service.rb
View File

@ -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

12
app/workers/local_notification_worker.rb Normal file
View File

@ -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