diff --git a/Gemfile.lock b/Gemfile.lock index 2b8cf11..27fcd63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,40 @@ 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.1) + 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) + racc (1.8.0) + rack (3.0.11) 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.64.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -22,26 +42,40 @@ GEM 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.8.0) + activesupport (>= 6.1) rubocop (>= 1.59.0) + rubocop-capybara (>= 2.0.0) + rubocop-factory_bot (>= 2.0.0) + rubocop-rails (>= 2.25.0) rubocop-rspec (>= 2.25.0) rubocop-factory_bot (2.25.1) rubocop (~> 1.41) - rubocop-rspec (2.26.1) + rubocop-rails (2.25.0) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + 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 @@ -52,4 +86,4 @@ DEPENDENCIES syntax_tree BUNDLED WITH - 2.5.4 + 2.5.10 diff --git a/package.json b/package.json index cb923be..b032ece 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,9 @@ { - "name": "discourse-watch-category-mcneel", "private": true, "devDependencies": { - "@discourse/lint-configs": "^1.3.5", - "ember-template-lint": "^5.13.0", - "eslint": "^8.56.0", - "prettier": "^2.8.8" + "@discourse/lint-configs": "1.3.9", + "ember-template-lint": "6.0.0", + "eslint": "8.57.0", + "prettier": "2.8.8" } } diff --git a/plugin.rb b/plugin.rb index 6353842..7b530ca 100644 --- a/plugin.rb +++ b/plugin.rb @@ -13,7 +13,7 @@ def self.watch_category! unless mcneel_private_category.nil? || mcneel_group.nil? mcneel_group.users.each do |user| watched_categories = CategoryUser.lookup(user, :watching).pluck(:category_id) - unless watched_categories.include?(mcneel_private_category.id) + if watched_categories.exclude?(mcneel_private_category.id) CategoryUser.set_notification_level_for_category( user, CategoryUser.notification_levels[:watching], @@ -29,7 +29,7 @@ def self.watch_category! reseller_group.users.each do |user| watched_categories = CategoryUser.lookup(user, :watching).pluck(:category_id) - unless watched_categories.include?(reseller_category.id) + if watched_categories.exclude?(reseller_category.id) CategoryUser.set_notification_level_for_category( user, CategoryUser.notification_levels[:watching],