decidim-spam_detection 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38cc3310b2ed4c7e48cadea2c1bf9f0ff86d8f28bad7b3e04398d5922598442d
-  data.tar.gz: be191b16b6827c2e6963b72578fe899d1feace76156b87cb246928dc869619d3
+  metadata.gz: 9b9e77c55c37762f44ecfcfcd84d383ddef69ecd39a46e50586715c2b943850d
+  data.tar.gz: 5c4e554147e711a82b7f2d1271c50166972d79bb9701a1d56aca424b0a646662
 SHA512:
-  metadata.gz: ef0c0fcc58dfdb427725cc53ad5a3fa2829b0482180e4b311427a483345b97f09ec90d55ffdcfaf778903ed00913bf17976ae56e2a9fb13deb17605cf45c0425
-  data.tar.gz: 9d6b782f0b236cd000b1bf361b5d83524c037da23fa22aa779321f5c09fafbc849d45d713c965b2e9a6eb2a37d465565e91b33bfcff0a1e73436065ee76265b6
+  metadata.gz: 6702d4551ed229114b12cbd672f7714e9a4cf291bb8121919ffca7414470fe90ac18b66bc5d19c963017a159cd107ceb3d58d9b21359a5260486b868dd6d0ae4
+  data.tar.gz: '0719aa19be805f1732b391e1c3b172ce31be3504a41b6fc0ab8130793350b843bbe827acd6efa4e7e3c39b9f129275ad1eb4bc674f12c39c5386067825a6f0a9'

data/README.md

@@ -1,7 +1,8 @@
 # Decidim::SpamDetection
 [![codecov](https://codecov.io/gh/OpenSourcePolitics/decidim-spam_detection/branch/master/graph/badge.svg?token=eJu34XLlVu)](https://codecov.io/gh/OpenSourcePolitics/decidim-spam_detection)
-![Tests](https://github.com/opensourcepolitics/decidim-spam_detection/actions/workflows/tests.yml/badge.svg)
-![Tests](https://github.com/opensourcepolitics/decidim-spam_detection/actions/workflows/lint.yml/badge.svg)
+![Tests](https://github.com/opensourcepolitics/decidim-spam_detection/actions/workflows/ci_cd.yml/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/decidim-spam_detection.svg)](https://badge.fury.io/rb/decidim-spam_detection)
+
 
 ## Usage
 

data/app/mailers/decidim/spam_detection/spam_detection_mailer.rb

@@ -3,6 +3,8 @@
 module Decidim
   module SpamDetection
     class SpamDetectionMailer < Decidim::ApplicationMailer
+      helper_method :blocked_users_url, :reported_users_url
+
       def notify_detection(user, results)
         with_user(user) do
           @reported_count = results[:reported_user]
@@ -14,6 +16,24 @@ module Decidim
           mail(to: @user.email, subject: subject)
         end
       end
+
+      private
+
+      def blocked_users_url
+        decidim_admin.moderated_users_url(blocked: true, host: root_url)
+      end
+
+      def reported_users_url
+        decidim_admin.moderated_users_url(blocked: false, host: root_url)
+      end
+
+      def decidim_admin
+        Decidim::Admin::Engine.routes.url_helpers
+      end
+
+      def root_url
+        decidim.root_url(host: @user.organization.host)[0..-2]
+      end
     end
   end
 end

data/app/views/decidim/spam_detection/spam_detection_mailer/notify_detection.html.erb

@@ -5,10 +5,12 @@
   <p>
     <%= t(".reported_count", count: @reported_count) %>
   </p>
+  <p><%= link_to(t(".reported_link"), reported_users_url ) %></p>
 <% end %>
 
 <% if @blocked_count.present? %>
   <p>
     <%= t(".blocked_count", count: @blocked_count) %>
   </p>
+  <p><%= link_to(t(".blocked_link"), blocked_users_url ) %></p>
 <% end %>

data/config/i18n-tasks.yml

@@ -5,6 +5,8 @@ locales: [en, fr, es, ca]
 
 ignore_unused:
   - "decidim.components.spam_detection.name"
+  - blocked_user.*
+  - reported_user.*
 
 ignore_missing:
   - decidim.participatory_processes.scopes.global

data/config/locales/ca.yml

@@ -1,16 +1,26 @@
 ---
 ca:
+  blocked_user:
+    reason: La nostra tasca de detecció automàtica dspam li ha bloquejat. Si això
+      és un error. Poseu-vos en contacte amb els administradors de la plataforma que
+      poden restaurar el vostre compte.
   decidim:
     components:
       spam_detection:
-        name: SpamDetection
+        name: DeteccioSpam
     spam_detection:
       spam_detection_mailer:
         notify_detection:
-          blocked_count: blocked_count %{count}
-          hello: Hello %{name}
-          intro: Aquí teniu l'informe de la tasca de detecció de correu brossa
-          reported_count: reported_count %{count}
+          blocked_count: Comptes de spam bloquejats %{count}
+          blocked_link: Consulteu la llista de tots els comptes bloquejats
+          hello: Hola %{name}
+          intro: Aquí teniu l’informe de la tasca de detecció de spam
+          reported_count: Comptes blocs de %{count}
+          reported_link: Consulteu la llista de tots els comptes reportats al lloc
     spam_detection_mailer:
       notify_detection:
-        subject: Resum de detecció de correu brossa
+        subject: Informe de la tasca automàtica detecció de spam
+  reported_user:
+    details: L’usuari s’ha marcat com spam a causa d’una alta probabilitat de spam
+      per la tasca de detecció automàtica de spam de Decidim amb una probabilitat
+      de %{probability}%

data/config/locales/en.yml

@@ -1,5 +1,9 @@
 ---
 en:
+  blocked_user:
+    reason: Our automatic spam account detection task has blocked you. If this is
+      an error. Contact the platform administrators who will be able to restore your
+      account.
   decidim:
     components:
       spam_detection:
@@ -7,10 +11,15 @@ en:
     spam_detection:
       spam_detection_mailer:
         notify_detection:
-          blocked_count: 'Blocked users count: %{count}'
+          blocked_count: 'Spam accounts blocked: %{count}'
+          blocked_link: See the list of all blocked accounts
           hello: Hello %{name}
-          intro: Here is the report of the spam detection task
-          reported_count: 'Reported users count: %{count}'
+          intro: Here is the report of the automated spam detection task.
+          reported_count: 'Spam accounts reported: %{count}'
+          reported_link: See the list of all reported accounts
     spam_detection_mailer:
       notify_detection:
-        subject: Spam detection digest
+        subject: Automated spam detection task digest
+  reported_user:
+    details: The user was reported because of a high spam probability by the automated
+      spam detection task with a probability of %{probability}%

data/config/locales/es.yml

@@ -1,16 +1,25 @@
 ---
 es:
+  blocked_user:
+    reason: Nuestra tarea de detección automática de spam le ha bloqueado. Si esto
+      es un error. Póngase en contacto con los administradores de la plataforma que
+      pueden restaurar su cuenta.
   decidim:
     components:
       spam_detection:
-        name: SpamDetection
+        name: DeteccionSpam
     spam_detection:
       spam_detection_mailer:
         notify_detection:
-          blocked_count: blocked_count %{count}
-          hello: Hello %{name}
-          intro: Here is the report of the spam detection task
-          reported_count: reported_count %{count}
+          blocked_count: 'Cuentas de spam bloqueadas : %{count}'
+          blocked_link: Ver la lista de todas las cuentas bloqueadas
+          hello: Hola %{name}
+          intro: Aquí está el informe de la tarea de detección automática de spam.
+          reported_count: Cuentas de spam señaladas %{count}
+          reported_link: Ver la lista de cuentas señaladas
     spam_detection_mailer:
       notify_detection:
-        subject: Subject
+        subject: Informe de la tarea automática detección de spam
+  reported_user:
+    details: El usuario fue señalado debido a una alta probabilidad de spam por la
+      tarea de detección automática de spam con una probabilidad de %{probability}%

data/config/locales/fr.yml

@@ -1,16 +1,25 @@
 ---
 fr:
+  blocked_user:
+    reason: Notre tâche de détection automatique des comptes spam vous a bloqué. S'il
+      s'agit d'une erreur. Prenez contact avec les administrateurs de la plateforme
+      qui pourront rétablir votre compte.
   decidim:
     components:
       spam_detection:
-        name: SpamDetection
+        name: DetectionSpam
     spam_detection:
       spam_detection_mailer:
         notify_detection:
-          blocked_count: blocked_count %{count}
-          hello: Hello %{name}
-          intro: Here is the report of the spam detection task
-          reported_count: reported_count %{count}
+          blocked_count: 'Comptes spam bloqués : %{count}'
+          blocked_link: Voir la liste de tous les comptes bloqués du site
+          hello: Bonjour %{name}
+          intro: Voici le rapport de la tâche de détection automatisée des spams.
+          reported_count: 'Comptes spam signalés : %{count}'
+          reported_link: Voir la liste de tous les comptes signalés
     spam_detection_mailer:
       notify_detection:
-        subject: Subject
+        subject: Rapport de la tâche de détection automatique de spam
+  reported_user:
+    details: L’utilisateur a été signalé en raison d’une forte probabilité de spam
+      par la tâche de détection automatique de spam avec une probabilité de %{probability}%

data/lib/decidim/spam_detection/block_spam_user_command.rb

@@ -55,14 +55,19 @@ module Decidim
           @user.blocked = true
           @user.blocked_at = Time.current
           @user.blocking = @current_blocking
-          @user.extended_data["user_name"] = @user.name
+          update_extended_data
           @user.name = "Blocked user"
           @user.save!
         end
       end
 
       def reason
-        "The user was blocked because of a high spam probability by Decidim spam detection bot with a probability of #{@probability}%"
+        I18n.t("blocked_user.reason", probability: @probability)
+      end
+
+      def update_extended_data
+        @user.extended_data = {} if @user.extended_data.nil?
+        @user.extended_data["user_name"] = @user.name
       end
     end
   end

data/lib/decidim/spam_detection/report_spam_user_command.rb

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def details
-        "The user was marked as spam by Decidim spam detection bot with a probability of #{@probability}%"
+        I18n.t("reported_user.details", probability: @probability)
       end
 
       def find_or_create_moderation!

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
-      "1.1.0"
+      "2.0.0"
     end
 
     def self.decidim_version
-      "0.25"
+      "0.26"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-spam_detection
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Armand Fardeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.26'
 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