From d5c828213fd5e4e3b58c43d1a6f3b3d503c01e50 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 13 Mar 2018 08:35:15 +0800
Subject: [PATCH] FIX: Circular references warning in `TopicTrackingState`.

---
 app/models/topic_tracking_state.rb       | 9 ++++++---
 app/models/user_archived_message.rb      | 2 +-
 spec/models/topic_tracking_state_spec.rb | 3 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 5256a99d4a9..eaf264d9190 100644
--- a/app/models/topic_tracking_state.rb
+++ b/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
-      user_ids = [user_id]
+    elsif archive_user_id
+      user_ids = [archive_user_id]
 
       [
         "/private-messages/archive",
diff --git a/app/models/user_archived_message.rb b/app/models/user_archived_message.rb
index c5932b4a7b2..1edd3863c48 100644
--- a/app/models/user_archived_message.rb
+++ b/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
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index abf7dcbdd43..720657a77b7 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/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,
-            user_archive: true
+            archive_user_id: private_message_post.user_id,
           )
         end