decidim-spam_detection 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d79ed046a5c1b646ded9acd3616982dec8c6e97c22841d639eecac8880769246
-  data.tar.gz: 99c3a5a0a9b771d8e8f411871fdb35d6f95fef88eeba23dc8229c61e9a1912bc
+  metadata.gz: f24ecac49f9c8814f2dd96c598a036884b67f170ff780f45fc08edfd889f4731
+  data.tar.gz: d4fcfab70fafa852c915207a7762a380afe5b55d4e330a22e3c1a96c8df49cce
 SHA512:
-  metadata.gz: b8cc4a5992ea9ed32bc9bf696ba37185789d8a6fd376025af80658d5237dac10f565d6af65db6394a390fa454eb0f04b0449b5e77f6e4e01659142c45549bdaa
-  data.tar.gz: 1a3bf69b129c4e3fc8119b4aff3502dd176b7ab341a519964b4baf0bc2076714c314a894060d95959748208094f6b06816b08de4a2971870ae36432699d65605
+  metadata.gz: 231ce11ea08422ce24f822b68c33a5ec73641e8077d3615097443b9e3a14ed0e29c3ccc89dfae7c3de89927881b6e1230f9903a6eba17be2783ccbc249c61957
+  data.tar.gz: b1aa9020d61d8683e4d66bb05c6f6042bcaa6f37ac917af76d3e00dc3f1ae4eec437b23a64ff3da9d24736613757d6c70f47b220eb35d594a9e49fa10bfc3248

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/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/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,7 +5,7 @@ module Decidim
   # This holds the decidim-spam_detection version.
   module SpamDetection
     def self.version
-      "3.0.0"
+      "3.1.0"
     end
 
     def self.decidim_version

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: 3.1.0
 platform: ruby
 authors:
 - Armand Fardeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core