decidim-spam_detection 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d79ed046a5c1b646ded9acd3616982dec8c6e97c22841d639eecac8880769246
-  data.tar.gz: 99c3a5a0a9b771d8e8f411871fdb35d6f95fef88eeba23dc8229c61e9a1912bc
+  metadata.gz: dc40888f7da14f290222e3e99fcd985c8020affbebc5f7d213754e8415025db9
+  data.tar.gz: 62521b3df543d4b344aaa937e2cb53d572ac5fc96559dabbefdbaa55b5f26664
 SHA512:
-  metadata.gz: b8cc4a5992ea9ed32bc9bf696ba37185789d8a6fd376025af80658d5237dac10f565d6af65db6394a390fa454eb0f04b0449b5e77f6e4e01659142c45549bdaa
-  data.tar.gz: 1a3bf69b129c4e3fc8119b4aff3502dd176b7ab341a519964b4baf0bc2076714c314a894060d95959748208094f6b06816b08de4a2971870ae36432699d65605
+  metadata.gz: 1934658b6b73cfa41fece1ac68f3d4b85360e53ab179bcb3e62c48b99228ccd1b9b368d92e1ab057270eb8d321ee86303d8a2df1026e11885f73397cd48c7ae6
+  data.tar.gz: 36083c1b45fd4ad0c49ad5fbfc466f0631ecc9c5907611a7629868d5ae72b533c912d8e236e1484b7882cfb011ed674f1d82384a905a65de46f551bfd4e4c12b

data/README.md

@@ -44,6 +44,9 @@ if you are using sidekiq scheduler you can use the following configuration:
 ### Further configuration
 list of env var, default value and their usage:
 ```
+ACTIVATE_SPAM_DETECTION_SERVICE:
+    default: false
+    usage: Activate the spam detection service if api url is set to default one
 SPAM_DETECTION_API_AUTH_TOKEN
     default_value: dummy
     usage: Token auth for authentication used by external service, ask us for more details

data/app/commands/decidim/admin/unblock_user.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class UnblockUser < Rectify::Command
+    class UnblockUser < Decidim::Command
       # Public: Initializes the command.
       #
       # blocked_user - the user that is unblocked
@@ -48,7 +48,7 @@ module Decidim
       def add_spam_detection_metadata!
         return if @blocked_user.extended_data.dig("spam_detection", "blocked_at").blank?
 
-        @blocked_user.update!(extended_data: @blocked_user.extended_data.dup.deep_merge("spam_detection" => { "unblocked_at": Time.current }))
+        @blocked_user.update!(extended_data: @blocked_user.extended_data.dup.deep_merge("spam_detection" => { unblocked_at: Time.current }))
       end
     end
   end

data/app/commands/decidim/admin/unreport_user.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class UnreportUser < Rectify::Command
+    class UnreportUser < Decidim::Command
       # Public: Initializes the command.
       #
       # reportable - A Decidim::User - The user reported
@@ -46,7 +46,7 @@ module Decidim
       def add_spam_detection_metadata!
         return if @reportable.extended_data.dig("spam_detection", "reported_at").blank?
 
-        @reportable.update!(extended_data: @reportable.extended_data.dup.deep_merge("spam_detection" => { "unreported_at": Time.current }))
+        @reportable.update!(extended_data: @reportable.extended_data.dup.deep_merge("spam_detection" => { unreported_at: Time.current }))
       end
     end
   end

data/app/services/decidim/spam_detection/mark_users_service.rb

@@ -31,6 +31,8 @@ module Decidim
       end
 
       def self.call
+        return unless Decidim::SpamDetection.service_activated?
+
         new.ask_and_mark
       end
 

data/lib/decidim/spam_detection/abstract_spam_user_command.rb

@@ -54,7 +54,6 @@ module Decidim
           password: password,
           password_confirmation: password,
           tos_agreement: true,
-          email_on_notification: false,
           email_on_moderations: false
         }
         moderation_admin = Decidim::User.new(params.merge(additional_params))

data/lib/decidim/spam_detection/api_proxy.rb

@@ -6,8 +6,8 @@ require "net/http"
 module Decidim
   module SpamDetection
     class ApiProxy
-      URL = URI(ENV.fetch("SPAM_DETECTION_API_URL", "http://localhost:8080/api"))
-      AUTH_TOKEN = ENV.fetch("SPAM_DETECTION_API_AUTH_TOKEN", "dummy")
+      URL = URI(Decidim::SpamDetection.spam_detection_api_url)
+      AUTH_TOKEN = Decidim::SpamDetection.spam_detection_api_auth_token
 
       def initialize(data_array, batch_size)
         @data_array = data_array

data/lib/decidim/spam_detection/spam_user_command_adapter.rb

@@ -7,7 +7,7 @@ module Decidim
       SPAM_LEVEL = { very_sure: 0.99, probable: 0.7 }.freeze
 
       def self.perform_block_user?
-        ENV.fetch("PERFORM_BLOCK_USER", false)
+        Decidim::SpamDetection.spam_detection_api_perform_block_user
       end
 
       def initialize(probability_hash)

data/lib/decidim/spam_detection/version.rb

@@ -5,11 +5,11 @@ module Decidim
   # This holds the decidim-spam_detection version.
   module SpamDetection
     def self.version
-      "3.0.0"
+      "4.0.0"
     end
 
     def self.decidim_version
-      "0.26.0"
+      "0.27.0"
     end
   end
 end

data/lib/decidim/spam_detection.rb

@@ -8,6 +8,9 @@ module Decidim
   # This namespace holds the logic of the `SpamDetection` component. This component
   # allows users to create spam_detection in a participatory space.
   module SpamDetection
+    DEFAULT_URL = "http://localhost:8080/api"
+    include ActiveSupport::Configurable
+
     autoload :Command, "decidim/spam_detection/command"
     autoload :CommandErrors, "decidim/spam_detection/command_errors"
     autoload :ApiProxy, "decidim/spam_detection/api_proxy"
@@ -15,5 +18,33 @@ module Decidim
     autoload :ReportSpamUserCommand, "decidim/spam_detection/report_spam_user_command"
     autoload :BlockSpamUserCommand, "decidim/spam_detection/block_spam_user_command"
     autoload :SpamUserCommandAdapter, "decidim/spam_detection/spam_user_command_adapter"
+
+    config_accessor :spam_detection_api_url do
+      ENV.fetch("SPAM_DETECTION_API_URL", DEFAULT_URL)
+    end
+
+    config_accessor :spam_detection_api_auth_token do
+      ENV.fetch("SPAM_DETECTION_API_AUTH_TOKEN", "dummy")
+    end
+
+    config_accessor :spam_detection_api_perform_block_user do
+      ENV.fetch("PERFORM_BLOCK_USER", "0") == "1"
+    end
+
+    config_accessor :spam_detection_api_force_activate_service do
+      ENV.fetch("ACTIVATE_SPAM_DETECTION_SERVICE", "0") == "1"
+    end
+
+    config_accessor :spam_detection_api_activate_service do
+      lambda do
+        return true unless Rails.env.production?
+
+        spam_detection_api_force_activate_service || spam_detection_api_url != DEFAULT_URL
+      end
+    end
+
+    def self.service_activated?
+      spam_detection_api_activate_service.call
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-spam_detection
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Armand Fardeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,18 +16,19 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
-description: "  SpamDetection is a detection bot made by OpenSourcePolitics. \n  It
-  works with a spam detection service (https://github.com/OpenSourcePolitics/spam_detection)
-  \n  which marks the user with a spam probability score, \n  between 0.7 and 0.99
-  it is probable, and above 0.99 it is very sure.\n"
+        version: 0.27.0
+description: |2
+    SpamDetection is a detection bot made by OpenSourcePolitics.
+     It works with a spam detection service (https://github.com/OpenSourcePolitics/spam_detection)
+     which marks the user with a spam probability score,
+     between 0.7 and 0.99 it is probable, and above 0.99 it is very sure.
 email:
 - fardeauarmand@gmail.com
 executables: []
@@ -75,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="