potsda.mn/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Thread resolving no longer needs to be separate from ProcessFeedService,

Browse source 
since that is only ever called in the background
This commit is contained in:
Eugen Rochko 2016-12-11 22:23:11 +01:00
parent 6c60757e99
commit f90133d2ad
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/services/process_feed_service.rb
View file

@ -121,7 +121,8 @@ class ProcessFeedService < BaseService
def find_or_resolve_status(parent, uri, url)
status = find_status(uri)
ThreadResolveWorker.perform_async(parent.id, url) if status.nil?
ResolveThread.new.call(parent, url) if status.nil?
status
end
@ -242,4 +243,15 @@ class ProcessFeedService < BaseService
"#{username}@#{domain}"
end
end
class ResolveThread
def call(child_status, parent_url)
parent_status = FetchRemoteStatusService.new.call(parent_url)
return if parent_status.nil?
child_status.thread = parent_status
child_status.save!
end
end
end

15
app/workers/thread_resolve_worker.rb
View file

@ -1,15 +0,0 @@
# frozen_string_literal: true
class ThreadResolveWorker
include Sidekiq::Worker
def perform(child_status_id, parent_url)
child_status = Status.find(child_status_id)
parent_status = FetchRemoteStatusService.new.call(parent_url)
return if parent_status.nil?
child_status.thread = parent_status
child_status.save!
end
end