From d531b64d66fa3b3ae9de09b0feb7f8126af57ab2 Mon Sep 17 00:00:00 2001 From: Thorsten Claus Date: Sun, 7 Nov 2021 10:54:11 +0100 Subject: [PATCH] fixes #8319 --- lib/configuration_methods.rb | 4 ++-- spec/lib/configuration_methods_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/configuration_methods.rb b/lib/configuration_methods.rb index 22a5e1a16..bdd6642df 100644 --- a/lib/configuration_methods.rb +++ b/lib/configuration_methods.rb @@ -52,9 +52,9 @@ module Configuration def local_posts_stream?(user) return true if settings.enable_local_posts_stream == "admins" && - Role.is_admin?(user) + user.admin? return true if settings.enable_local_posts_stream == "moderators" && - (Role.moderator?(user) || Role.is_admin?(user)) + user.moderator? settings.enable_local_posts_stream == "everyone" end diff --git a/spec/lib/configuration_methods_spec.rb b/spec/lib/configuration_methods_spec.rb index 2453d406f..037559399 100644 --- a/spec/lib/configuration_methods_spec.rb +++ b/spec/lib/configuration_methods_spec.rb @@ -129,11 +129,11 @@ describe Configuration::Methods do end describe "#has_local_posts_stream" do - let!(:moderator) { create(:person) } - let!(:admin) { create(:person) } + let!(:moderator) { create(:user) } + let!(:admin) { create(:user) } before do - moderator.roles.create(name: "moderator") - admin.roles.create(name: "admin") + Role.add_moderator(moderator.person) + Role.add_admin(admin.person) end it "return false if show_local_posts_link is 'disabled'" do