From 6317cb60e03762596ecae034518b4da4c60a8f64 Mon Sep 17 00:00:00 2001
From: Fire Demon <firedemon@creature.cafe>
Date: Thu, 20 Aug 2020 06:26:19 -0500
Subject: [Federation, Feature] Add support for pull federation, account
 synchronization, and server-to-server migration

---
 app/workers/thread_resolve_worker.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/workers/thread_resolve_worker.rb')

diff --git a/app/workers/thread_resolve_worker.rb b/app/workers/thread_resolve_worker.rb
index 7599eb784..74cb09ab5 100644
--- a/app/workers/thread_resolve_worker.rb
+++ b/app/workers/thread_resolve_worker.rb
@@ -15,5 +15,7 @@ class ThreadResolveWorker
 
     child_status.thread = parent_status
     child_status.save!
+  rescue ActiveRecord::RecordInvalid
+    nil
   end
 end
-- 
cgit