FIX: Circular references warning in TopicTrackingState.

app/models/topic_tracking_state.rb

@@ -246,7 +246,10 @@ SQL
     sql
   end
 
-  def self.publish_private_message(topic, user_id: user_id, user_archive: false, post: nil, group_archive: false)
+  def self.publish_private_message(topic, archive_user_id: archive_user_id,
+                                          post: nil,
+                                          group_archive: false)
+
     return unless topic.private_message?
     channels = {}
 
@@ -254,8 +257,8 @@ SQL
 
     if post && allowed_user_ids.include?(post.user_id)
       channels["/private-messages/sent"] = [post.user_id]
-    elsif user_archive
+    elsif archive_user_id
-      user_ids = [user_id]
+      user_ids = [archive_user_id]
 
       [
         "/private-messages/archive",

app/models/user_archived_message.rb

@@ -38,7 +38,7 @@ class UserArchivedMessage < ActiveRecord::Base
 
     def self.publish_topic_tracking_state(topic, user_id)
       TopicTrackingState.publish_private_message(
-        topic, user_id: user_id, user_archive: true
+        topic, archive_user_id: user_id
       )
     end
 end

spec/models/topic_tracking_state_spec.rb

@@ -189,8 +189,7 @@ describe TopicTrackingState do
         messages = MessageBus.track_publish do
           TopicTrackingState.publish_private_message(
             private_message_topic,
-            user_id: private_message_post.user_id,
+            archive_user_id: private_message_post.user_id,
-            user_archive: true
           )
         end