diff options
| -rw-r--r-- | app/services/process_feed_service.rb | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 9402baf18..56105838e 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -69,9 +69,16 @@ class ProcessFeedService < BaseService end end + status.thread = find_status(thread(@xml).first) if thread?(@xml) + status.save! end + if thread?(@xml) && status.thread.nil? + Rails.logger.debug "Trying to attach #{status.id} (#{id(@xml)}) to #{thread(@xml).first}" + ThreadResolveWorker.perform_async(status.id, thread(@xml).second) + end + notify_about_mentions!(status) unless status.reblog? notify_about_reblog!(status) if status.reblog? && status.reblog.account.local? @@ -154,11 +161,6 @@ class ProcessFeedService < BaseService conversation: find_or_create_conversation(entry) ) - if thread?(entry) - Rails.logger.debug "Trying to attach #{status.id} (#{id(entry)}) to #{thread(entry).first}" - status.thread = find_or_resolve_status(status, *thread(entry)) - end - mentions_from_xml(status, entry) hashtags_from_xml(status, entry) media_from_xml(status, entry) @@ -166,14 +168,6 @@ class ProcessFeedService < BaseService [status, true] end - def find_or_resolve_status(parent, uri, url) - status = find_status(uri) - - ThreadResolveWorker.perform_async(parent.id, url) if status.nil? - - status - end - def find_or_create_conversation(xml) uri = xml.at_xpath('./ostatus:conversation', ostatus: TagManager::OS_XMLNS)&.attribute('ref')&.content return if uri.nil? |