Amend code to use NewThreadFollower model instead

Author: trichoplax

app/controllers/comments_controller.rb

@@ -59,11 +59,11 @@ def create_thread
         @comment.post.user.create_notification(notification, helpers.comment_link(@comment))
       end
 
-      ThreadFollower.where(post: @post).each do |tf|
-        unless tf.user == current_user || tf.user == @comment.post.user
-          tf.user.create_notification(notification, helpers.comment_link(@comment))
+      NewThreadFollower.where(post: @post).each do |ntf|
+        unless ntf.user == current_user || ntf.user == @comment.post.user
+          ntf.user.create_notification(notification, helpers.comment_link(@comment))
         end
-        ThreadFollower.create(user: tf.user, comment_thread: @comment_thread)
+        ThreadFollower.create(user: ntf.user, comment_thread: @comment_thread)
       end
 
       apply_pings(pings)
@@ -330,8 +330,8 @@ def post
   end
 
   def post_follow
-    if ThreadFollower.where(post: @post, user: current_user).none?
-      ThreadFollower.create(post: @post, user: current_user)
+    if NewThreadFollower.where(post: @post, user: current_user).none?
+      NewThreadFollower.create(post: @post, user: current_user)
     end
 
     respond_to do |format|
@@ -341,7 +341,7 @@ def post_follow
   end
 
   def post_unfollow
-    ThreadFollower.where(post: @post, user: current_user).destroy_all
+    NewThreadFollower.where(post: @post, user: current_user).destroy_all
 
     respond_to do |format|
       format.html { redirect_to post_path(@post) }

app/models/concerns/user_merge.rb

@@ -71,6 +71,7 @@ def update_thread_references(target_user)
       CommentThread.where(archived_by_id: id).update_all(archived_by_id: target_user.id)
       CommentThread.where(deleted_by_id: id).update_all(deleted_by_id: target_user.id)
       ThreadFollower.where(user_id: id).update_all(user_id: target_user.id)
+      NewThreadFollower.where(user_id: id).update_all(user_id: target_user.id)
     end
 
     def update_post_action_references(target_user)

app/models/post.rb

@@ -243,7 +243,7 @@ def deleted_by_owner?
   # @param user [User] user to check
   # @return [Boolean] check result
   def followed_by?(user)
-    ThreadFollower.where(post: self, user: user).any?
+    NewThreadFollower.where(post: self, user: user).any?
   end
 
   # Is the post an imported post?

test/controllers/comments/post_follow_test.rb

@@ -11,13 +11,13 @@ class CommentsControllerTest < ActionController::TestCase
     question = posts(:question_one)
 
     # Assert user follows post
-    assert_equal 1, ThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
+    assert_equal 1, NewThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
 
     try_post_unfollow(question)
     assert_response(:found)
 
     # Assert user does not follow post
-    assert_equal 0, ThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
+    assert_equal 0, NewThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
   end
 
   test 'non-follower can follow post' do
@@ -26,13 +26,13 @@ class CommentsControllerTest < ActionController::TestCase
     question = posts(:question_one)
 
     # Assert user does not follow post
-    assert_equal 0, ThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
+    assert_equal 0, NewThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
 
     try_post_follow(question)
     assert_response(:found)
 
     # Assert user follows post
-    assert_equal 1, ThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
+    assert_equal 1, NewThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
   end
 
   test 'follower cannot duplicate the following of a post' do
@@ -41,12 +41,12 @@ class CommentsControllerTest < ActionController::TestCase
     question = posts(:question_one)
 
     # Assert user follows post
-    assert_equal 1, ThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
+    assert_equal 1, NewThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
 
     try_post_follow(question)
     assert_response(:found)
 
     # Assert user still only follows post once
-    assert_equal 1, ThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
+    assert_equal 1, NewThreadFollower.where(['post_id = ? AND user_id = ?', question, user]).count
   end
 end

test/test_helper.rb

@@ -20,6 +20,7 @@
     WarningTemplate,
     ModWarning,
     ThreadFollower,
+    NewThreadFollower,
     Comment,
     CommentThread,
     Reaction,