FIX: Use split hide profile and presence options (#128)

Author: jancernik

.discourse-compatibility

@@ -1,3 +1,4 @@
+< 3.4.0.beta3-dev: a84123531a6865f6e76cd210e769e0ac4d729963
 < 3.4.0.beta1-dev: 1294355185bb29e61d381d63b9b4036cc7af9fc9
 < 3.3.0.beta1-dev: da1be75dae1c5218bdc3f7672d804915272c9ee9
 3.1.999: 83d3d61797ba989e5ddea8786235b9ade9ad57af

app/models/user_follower.rb

@@ -45,7 +45,7 @@ def self.filter_opted_out_users(relation)
       SQL
     end
     relation.joins("LEFT OUTER JOIN user_options uo ON uo.user_id = users.id").where(
-      "uo.user_id IS NULL OR NOT uo.hide_profile_and_presence",
+      "uo.user_id IS NULL OR NOT uo.hide_profile",
     )
   end
 

lib/follow/notification_handler.rb

@@ -13,7 +13,7 @@ def handle
     return if [Post.types[:regular], Post.types[:whisper]].exclude?(post.post_type)
     return if !SiteSetting.follow_notifications_enabled
     return if !post.user.allow_people_to_follow_me
-    return if post.user.user_option&.hide_profile_and_presence
+    return if post.user.user_option&.hide_profile
 
     topic = post.topic
     return if !topic || topic.private_message?

lib/follow/updater.rb

@@ -52,7 +52,7 @@ def follow(notification_level)
             )
     end
 
-    if @target.user_option&.hide_profile_and_presence
+    if @target.user_option&.hide_profile
       raise Discourse::InvalidAccess.new(
               nil,
               nil,

lib/follow/user_extension.rb

@@ -5,8 +5,7 @@ def self.prepended(base)
     base.has_many :follower_relations, class_name: "UserFollower", dependent: :delete_all
     base.has_many :followers,
                   ->(user) do
-                    if !user.allow_people_to_follow_me ||
-                         user.user_option&.hide_profile_and_presence
+                    if !user.allow_people_to_follow_me || user.user_option&.hide_profile
                       where("1=0")
                     end
                   end,

spec/integration/follow_notifications_spec.rb

@@ -397,7 +397,7 @@ def follow_notification_assertions(notification, followed, post, topic)
   context "when the followed user has hidden profile but has existing followers" do
     it "the followers no longer receive notification for posts made by the followed user" do
       expect(followed.followers.count).to be > 0
-      followed.user_option.update!(hide_profile_and_presence: true)
+      followed.user_option.update!(hide_profile: true)
       create_topic(user: followed).tap { |t| create_post(topic: t, user: followed) }
       followed.followers.each { |follower| expect(follower.notifications.count).to eq(0) }
     end

spec/lib/updater_spec.rb

@@ -169,7 +169,7 @@ def new_updater(follower, target)
   end
 
   it "does not allow following a user who has hidden their profile" do
-    user2.user_option.update!(hide_profile_and_presence: true)
+    user2.user_option.update!(hide_profile: true)
     expect do new_updater(user1, user2).watch_follow end.to raise_error do |error|
       expect(error).to be_a(Discourse::InvalidAccess)
       expect(error.custom_message).to eq("follow.user_does_not_allow_follow")

spec/models/user_follower_spec.rb

@@ -139,7 +139,7 @@
     it "does not include posts from followed users who have hidden their profile" do
       post1 = Fabricate(:post, user: followed)
       post2 = Fabricate(:post, user: followed2)
-      followed.user_option.update!(hide_profile_and_presence: true)
+      followed.user_option.update!(hide_profile: true)
       posts = UserFollower.posts_for(follower, current_user: follower)
       expect(posts.pluck(:id)).to contain_exactly(post2.id)
     end

spec/models/user_spec.rb

@@ -34,7 +34,7 @@
     end
 
     it "returns empty relation if the user has hidden their profile" do
-      followed1.user_option.update!(hide_profile_and_presence: true)
+      followed1.user_option.update!(hide_profile: true)
       expect(followed1.followers.pluck(:id)).to be_empty
       expect(followed2.followers.pluck(:id)).to contain_exactly(follower1.id, follower2.id)
     end
@@ -70,7 +70,7 @@
     end
 
     it "excludes users who have hidden their profile" do
-      followed1.user_option.update!(hide_profile_and_presence: true)
+      followed1.user_option.update!(hide_profile: true)
 
       expect(follower1.following.pluck(:id)).to contain_exactly(followed2.id)
       expect(follower2.following.pluck(:id)).to contain_exactly(followed2.id)