diff --git a/Gemfile.lock b/Gemfile.lock index 85c4315..ca09fb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.1.3.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -19,29 +19,28 @@ GEM tzinfo (~> 2.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.8) concurrent-ruby (1.2.3) connection_pool (2.4.1) - drb (2.2.0) - ruby2_keywords - i18n (1.14.1) + drb (2.2.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) - minitest (5.22.2) + minitest (5.23.1) mutex_m (0.2.0) parallel (1.24.0) - parser (3.3.0.5) + parser (3.3.1.0) ast (~> 2.4.1) racc prettier_print (1.2.1) - prism (0.24.0) - 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.61.0) + rubocop (1.64.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -49,28 +48,35 @@ 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.31.0) - parser (>= 3.3.0.4) - prism (>= 0.24.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-discourse (3.7.1) + 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) - ruby2_keywords (0.0.5) strscan (3.1.0) syntax_tree (6.2.0) prettier_print (>= 1.2.0) @@ -87,4 +93,4 @@ DEPENDENCIES translations-manager! BUNDLED WITH - 2.5.4 + 2.5.10 diff --git a/app/models/channel.rb b/app/models/channel.rb index 7082360..a27d5d8 100644 --- a/app/models/channel.rb +++ b/app/models/channel.rb @@ -39,7 +39,7 @@ class DiscourseChatIntegration::Channel < DiscourseChatIntegration::PluginModel def data_valid? # If provider is invalid, don't try and check data - return unless ::DiscourseChatIntegration::Provider.provider_names.include? provider + return if ::DiscourseChatIntegration::Provider.provider_names.exclude? provider params = ::DiscourseChatIntegration::Provider.get_by_name(provider)::CHANNEL_PARAMETERS diff --git a/lib/discourse_chat_integration/provider.rb b/lib/discourse_chat_integration/provider.rb index eba0f98..1010f71 100644 --- a/lib/discourse_chat_integration/provider.rb +++ b/lib/discourse_chat_integration/provider.rb @@ -58,7 +58,7 @@ module DiscourseChatIntegration def self.requires_provider(provider_name) before_action do - raise ProviderDisabled.new unless Provider.enabled_provider_names.include?(provider_name) + raise ProviderDisabled.new if Provider.enabled_provider_names.exclude?(provider_name) end end diff --git a/package.json b/package.json index 057cc88..b032ece 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,9 @@ { - "name": "discourse-chat-integration", "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" } }