Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV: Update rubocop-discourse to latest version #60

Merged
merged 1 commit into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,47 +1,74 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.3.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
ast (2.4.2)
json (2.7.1)
base64 (0.2.0)
bigdecimal (3.1.8)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
drb (2.2.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
json (2.7.2)
language_server-protocol (3.17.0.3)
minitest (5.23.0)
mutex_m (0.2.0)
parallel (1.24.0)
parser (3.3.0.4)
parser (3.3.1.0)
ast (~> 2.4.1)
racc
prettier_print (1.2.1)
racc (1.7.3)
rainbow (3.1.1)
regexp_parser (2.9.0)
regexp_parser (2.9.2)
rexml (3.2.8)
strscan (>= 3.0.9)
rubocop (1.60.0)
rubocop (1.63.5)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
rubocop-discourse (3.6.0)
rubocop-discourse (3.7.1)
activesupport (>= 6.1)
rubocop (>= 1.59.0)
rubocop-capybara (>= 2.0.0)
rubocop-factory_bot (>= 2.0.0)
rubocop-rspec (>= 2.25.0)
rubocop-factory_bot (2.25.1)
rubocop (~> 1.41)
rubocop-rspec (2.26.1)
rubocop-rspec (2.29.2)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
rubocop-rspec_rails (~> 2.28)
rubocop-rspec_rails (2.28.3)
rubocop (~> 1.40)
ruby-progressbar (1.13.0)
strscan (3.1.0)
syntax_tree (6.2.0)
prettier_print (>= 1.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)

PLATFORMS
Expand Down
23 changes: 23 additions & 0 deletions lib/discourse_restricted_replies/guardian_extension.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# frozen_string_literal: true

module DiscourseRestrictedReplies
module GuardianExtension
extend ActiveSupport::Concern

def can_create_post_on_topic?(topic)
return super if !SiteSetting.restricted_replies_enabled
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are enabled checks required in class extensions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When adding methods to existing classes, we should check for the enabled setting, yes. It’s not done automatically when extending “manually” a class, so we should probably keep the existing checks when they exist. (Maybe at some point we could do something to automatically add the checks)

return super if !(category = topic&.category)
return super if !category.custom_fields["restrict_replies"]
default_value = super
if default_value
in_allowed_group =
GroupUser.where(
group_id: topic.category.custom_fields["restrict_replies_bypass_groups"],
user_id: user.id,
).exists?
return true if is_staff? || in_allowed_group || is_my_own?(topic)
end
false
end
end
end
25 changes: 3 additions & 22 deletions plugin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,10 @@
register_asset "stylesheets/restrict-replies.scss"

after_initialize do
require_relative "lib/discourse_restricted_replies/guardian_extension"

register_category_custom_field_type "restrict_replies", :boolean
register_category_custom_field_type "restrict_replies_bypass_groups", [:integer]

reloadable_patch do
topic_overrides =
Module.new do
def can_create_post_on_topic?(topic)
return super if !SiteSetting.restricted_replies_enabled
return super if !(category = topic&.category)
return super if !category.custom_fields["restrict_replies"]
default_value = super
if default_value
in_allowed_group =
GroupUser.where(
group_id: topic.category.custom_fields["restrict_replies_bypass_groups"],
user_id: user.id,
).exists?
return true if is_staff? || in_allowed_group || is_my_own?(topic)
end
false
end
end

Guardian.class_exec { prepend topic_overrides }
end
reloadable_patch { Guardian.prepend(DiscourseRestrictedReplies::GuardianExtension) }
end