enable user privacy mode for displaying favorites

This commit is contained in:
r888888888
2016-02-22 12:18:19 -08:00
parent b165fec66a
commit caf4a28b02
8 changed files with 43 additions and 5 deletions

View File

@@ -33,9 +33,21 @@ class FavoriteGroup < ActiveRecord::Base
params = {} if params.blank?
if params[:creator_id].present?
q = q.where("creator_id = ?", params[:creator_id].to_i)
user = User.find(params[:creator_id])
if user.hide_favorites?
raise User::PrivilegeError.new
end
q = q.where("creator_id = ?", user.id)
elsif params[:creator_name].present?
q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].tr(" ", "_").mb_chars.downcase)
user = User.find_by_name(params[:creator_name])
if user.hide_favorites?
raise User::PrivilegeError.new
end
q = q.where("creator_id = ?", user.id)
else
q = q.where("creator_id = ?", CurrentUser.user.id)
end

View File

@@ -855,7 +855,9 @@ class Post < ActiveRecord::Base
end
def favorited_users
favorited_user_ids.map {|id| User.find(id)}
favorited_user_ids.map {|id| User.find(id)}.select do |x|
!x.hide_favorites?
end
end
def favorite_groups(active_id=nil)

View File

@@ -811,6 +811,10 @@ class User < ActiveRecord::Base
end
end
def hide_favorites?
enable_privacy_mode? && CurrentUser.user.id != id
end
def initialize_default_boolean_attributes
self.enable_post_navigation = true
self.new_post_navigation_layout = true