diff --git a/Gemfile b/Gemfile index b12773d79c..84e14123f5 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-m gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: "release/0.27-stable" gem "decidim-simple_proposal", git: "https://github.com/OpenSourcePolitics/decidim-module-simple_proposal", branch: DECIDIM_BRANCH -gem "decidim-spam_detection" +gem "decidim-spam_detection", git: "https://github.com/OpenSourcePolitics/decidim-spam_detection.git", tag: "4.1.1" gem "decidim-survey_multiple_answers", git: "https://github.com/OpenSourcePolitics/decidim-module-survey_multiple_answers" gem "decidim-term_customizer", git: "https://github.com/OpenSourcePolitics/decidim-module-term_customizer.git", branch: "fix/email_with_precompile" diff --git a/Gemfile.lock b/Gemfile.lock index 3820ac2126..8477846bb4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,6 +106,14 @@ GIT decidim-phone_authorization_handler (1.0.0) decidim-core (~> 0.27) +GIT + remote: https://github.com/OpenSourcePolitics/decidim-spam_detection.git + revision: fb2ee4624b728ce6f73603bfb84eda1d9b4e04d4 + tag: 4.1.1 + specs: + decidim-spam_detection (4.1.1) + decidim-core (~> 0.27.0) + GIT remote: https://github.com/OpenSourcePolitics/omniauth-france_connect revision: 14a53ad31928c8a83742360cfbdb90938d0a057e @@ -532,8 +540,6 @@ GEM decidim-comments (= 0.27.4) decidim-core (= 0.27.4) decidim-proposals (= 0.27.4) - decidim-spam_detection (4.0.0) - decidim-core (~> 0.27.0) decidim-surveys (0.27.4) decidim-core (= 0.27.4) decidim-forms (= 0.27.4) @@ -1177,7 +1183,7 @@ DEPENDENCIES decidim-initiatives (~> 0.27.0) decidim-phone_authorization_handler! decidim-simple_proposal! - decidim-spam_detection + decidim-spam_detection! decidim-survey_multiple_answers! decidim-templates (~> 0.27.0) decidim-term_customizer! diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 6447ded831..393809c0f4 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -32,6 +32,11 @@ cron: '0 <%= Random.rand(0..59) %> <%= Random.rand(6..8) %> * * *' # Run randomly between 06:00 and 08:59 class: Decidim::SpamDetection::MarkUsersJob queue: scheduled + SpamBotBlockUsers: + cron: '0 <%= Random.rand(0..59) %> <%= Random.rand(6..8) %> * * *' # Run randomly between 06:00 and 08:59 + class: Decidim::SpamDetection::BlockUsersJob + queue: default + enabled: false Backup: cron: '0 <%= Random.rand(0..59) %> <%= Random.rand(2..3) %> * * *' # Run randomly between 02:00 and 03:59 class: BackupJob