Skip to content

A platform for community discussion. Free, open, simple.

FIX: Apply the hidden post cooldown to wiki authors

Régis Hanol274ae7858cd2
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 68b0b22001d..55e84a3a4a8 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -180,6 +180,7 @@ module PostGuardian
end
if post.wiki && @user.in_any_groups?(SiteSetting.edit_wiki_post_allowed_groups_map)
+ return false if post.hidden? && is_my_own?(post) && !can_edit_hidden_post?(post)
return can_create_post?(post.topic)
end
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 37055cf02ba..1b13d996cea 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -321,7 +321,7 @@ module TopicGuardian
if topic&.first_post&.wiki &&
@user.in_any_groups?(SiteSetting.edit_wiki_post_allowed_groups_map)
- return can_create_post?(topic)
+ return can_edit_post?(topic.first_post)
end
false
diff --git a/spec/lib/guardian/post_guardian_spec.rb b/spec/lib/guardian/post_guardian_spec.rb
index 6303a41e160..011596e328d 100644
--- a/spec/lib/guardian/post_guardian_spec.rb
+++ b/spec/lib/guardian/post_guardian_spec.rb
@@ -591,6 +591,24 @@ RSpec.describe PostGuardian do
expect(guardian.can_edit?(post)).to be_truthy
end
+
+ it "returns false for the author of a wiki post hidden during the cooldown" do
+ post.update!(user: user, wiki: true, hidden: true, hidden_at: Time.zone.now)
+
+ expect(user.guardian.can_edit_post?(post)).to eq(false)
+ end
+
+ it "returns true for the author of a wiki post unhidden during the cooldown" do
+ post.update!(user: user, wiki: true, hidden: false, hidden_at: Time.zone.now)
+
+ expect(user.guardian.can_edit_post?(post)).to eq(true)
+ end
+
+ it "returns true for other wiki editors of a wiki post hidden during the cooldown" do
+ post.update!(wiki: true, hidden: true, hidden_at: Time.zone.now)
+
+ expect(user.guardian.can_edit_post?(post)).to eq(true)
+ end
end
describe "#can_edit_hidden_post?" do
diff --git a/spec/lib/guardian/topic_guardian_spec.rb b/spec/lib/guardian/topic_guardian_spec.rb
index e2db1fd4c6e..094b644ad27 100644
--- a/spec/lib/guardian/topic_guardian_spec.rb
+++ b/spec/lib/guardian/topic_guardian_spec.rb
@@ -246,6 +246,14 @@ RSpec.describe TopicGuardian do
end
end
+ describe "#can_edit_tags?" do
+ it "returns false for the author of a wiki topic whose first post is hidden during the cooldown" do
+ post = Fabricate(:post, user:, wiki: true, hidden: true, hidden_at: Time.zone.now)
+
+ expect(user.guardian.can_edit_tags?(post.topic)).to eq(false)
+ end
+ end
+
describe "#can_delete_topic?" do
it "returns false for an unauthenticated user" do
expect(Guardian.new.can_delete_topic?(topic)).to be_falsey