From 202527008f49309c207d775e40a7da81bdb58d39 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 12 Aug 2018 12:35:15 -0500
Subject: [PATCH] user.rb: drop unused add_favorite!, delete_favorite! methods.

These methods were incorrect anyway, didn't upvote/downvote the post.
---
 app/models/user.rb         | 16 +---------------
 test/unit/favorite_test.rb | 12 ++++++------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 6eb6937d5..85aef23bd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -108,6 +108,7 @@ class User < ApplicationRecord
   has_many :forum_posts, -> {order("forum_posts.created_at, forum_posts.id")}, :foreign_key => "creator_id"
   has_many :user_name_change_requests, -> {visible.order("user_name_change_requests.created_at desc")}
   has_many :favorite_groups, -> {order(name: :asc)}, foreign_key: :creator_id
+  has_many :favorites, ->(rec) {where("user_id % 100 = #{rec.id % 100} and user_id = #{rec.id}").order("id desc")}
   belongs_to :inviter, class_name: "User", optional: true
   after_update :create_mod_action
   accepts_nested_attributes_for :dmail_filter
@@ -297,20 +298,6 @@ class User < ApplicationRecord
     end
   end
 
-  module FavoriteMethods
-    def favorites
-      Favorite.where("user_id % 100 = #{id % 100} and user_id = #{id}").order("id desc")
-    end
-
-    def add_favorite!(post)
-      Favorite.add(post: post, user: self)
-    end
-
-    def remove_favorite!(post)
-      Favorite.remove(post: post, user: self)
-    end
-  end
-
   module LevelMethods
     extend ActiveSupport::Concern
 
@@ -917,7 +904,6 @@ class User < ApplicationRecord
   include NameMethods
   include PasswordMethods
   include AuthenticationMethods
-  include FavoriteMethods
   include LevelMethods
   include EmailMethods
   include BlacklistMethods
diff --git a/test/unit/favorite_test.rb b/test/unit/favorite_test.rb
index 0d52f0db4..6bbdb4d10 100644
--- a/test/unit/favorite_test.rb
+++ b/test/unit/favorite_test.rb
@@ -18,7 +18,7 @@ class FavoriteTest < ActiveSupport::TestCase
       user1 = FactoryBot.create(:user)
       p1 = FactoryBot.create(:post)
 
-      user1.add_favorite!(p1)
+      p1.add_favorite!(user1)
       assert_equal(1, Favorite.count)
 
       Favorite.where(:user_id => user1.id, :post_id => p1.id).delete_all
@@ -31,9 +31,9 @@ class FavoriteTest < ActiveSupport::TestCase
       p1 = FactoryBot.create(:post)
       p2 = FactoryBot.create(:post)
 
-      user1.add_favorite!(p1)
-      user1.add_favorite!(p2)
-      user2.add_favorite!(p1)
+      p1.add_favorite!(user1)
+      p2.add_favorite!(user1)
+      p1.add_favorite!(user2)
 
       favorites = user1.favorites.order("id desc")
       assert_equal(2, favorites.count)
@@ -49,8 +49,8 @@ class FavoriteTest < ActiveSupport::TestCase
       user1 = FactoryBot.create(:user)
       p1 = FactoryBot.create(:post)
       p2 = FactoryBot.create(:post)
-      user1.add_favorite!(p1)
-      user1.add_favorite!(p1)
+      p1.add_favorite!(user1)
+      p1.add_favorite!(user1)
 
       assert_equal(1, user1.favorites.count)
     end