Fixed incorrect showing of favorites

- Moved all favorite checking logic to same file
This commit is contained in:
BrokenEagle
2017-12-18 11:59:27 -08:00
parent 2000719227
commit 26c168bdcd
2 changed files with 18 additions and 6 deletions

View File

@@ -400,12 +400,6 @@ class PostQueryBuilder
if q[:ordfav].present?
user_id = q[:ordfav].to_i
user = User.find(user_id)
if user.hide_favorites?
raise User::PrivilegeError.new
end
relation = relation.joins("INNER JOIN favorites ON favorites.post_id = posts.id")
relation = relation.where("favorites.user_id % 100 = ? and favorites.user_id = ?", user_id % 100, user_id).order("favorites.id DESC")
end

View File

@@ -617,13 +617,31 @@ class Tag < ApplicationRecord
q[:favgroups] << favgroup_id
when "-fav"
favuser = User.find_by_name(g2)
if favuser.hide_favorites?
raise User::PrivilegeError.new
end
q[:tags][:exclude] << "fav:#{User.name_to_id(g2)}"
when "fav"
favuser = User.find_by_name(g2)
if favuser.hide_favorites?
raise User::PrivilegeError.new
end
q[:tags][:related] << "fav:#{User.name_to_id(g2)}"
when "ordfav"
user_id = User.name_to_id(g2)
favuser = User.find(user_id)
if favuser.hide_favorites?
raise User::PrivilegeError.new
end
q[:tags][:related] << "fav:#{user_id}"
q[:ordfav] = user_id