decidim-cdtb 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241f6ab9b3dcf2a9c90d13e458459776a5cedf5d0beff5ffbe9114b0c0f687ba
-  data.tar.gz: 2d9a4ef96c973b47296869acf12083a4f5862fdab7e7135e6ad36e6674115edc
+  metadata.gz: 7d7f9bf148f8840d5c1a477beeaff15fc28202a1ed2ec1362f7d4ce877a7b7ba
+  data.tar.gz: f24fc484d095684afffeacb808370927bbf4d7653da349cf8c036ecbad1c2f62
 SHA512:
-  metadata.gz: 37c3ba1e514d44cecf61948a84f89b16c01dd67f7993b972fda6f6b006997b0afaabf3dcacf312ff85a9ef142d6f1576dd822824c1d5e492bbc200a4bff3cc20
-  data.tar.gz: 1517ff9df9d457abab99ed385d3fb0c7d1e4a6bdf080a8c29ba5fe3a766d8024ae294f37bc8fe4c90142155914bba4bfd20cdf51108a590b33ba168d977cd27e
+  metadata.gz: afdcf2aaf7ec1b44c41035d6953c9fc2c1b5d025f4e4f0632e2dc8f54d61a16da866b3060a6d77c2ad0d6e86aa432815e202123a705a48492fcd93bc487698a1
+  data.tar.gz: 00141eb4d4e782c16ef0f6f17e1a7be55e029f6ec1d29e6c957a4cedd5c4f7dead2f5ba96491b447955f41f5fdf9e69aa83ce6f4d6119735b9d5adc91b6c8afa

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.1.8] - 2024-04-24 (Sapastre i bonastre)
+
+- Fix spam users detector with deleted_at param and hide comments in remover users.
+
+## [0.1.7] - 2024-04-22 (Emocions de colors)
+
+- Fix remove users task and add the reporter user mailer to arguments
+
 ## [0.1.6] - 2024-04-11 (Malifetes ben fetes)
 
 - Add remover users task

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    decidim-cdtb (0.1.6)
+    decidim-cdtb (0.1.8)
       decidim (>= 0.26.2)
       rails (>= 6)
       ruby-progressbar

data/README.md

@@ -105,7 +105,7 @@ bin/rake cdtb:users:fix_nicknames
 
 #### Remove users
 
-You can delete users through a CSV with the user ID. The purpose is to be able to eliminate potentially spammy users.
+You can delete users through a CSV with the user ID and a reporter user mailer. The purpose is to be able to eliminate potentially spammy users.
 
 This task reports and hide the user's comments, blocks the user, and finally deletes the user.
 
@@ -114,7 +114,7 @@ The CSV will have a header and one column with the user ID.
 To execute the task run:
 
 ```
-bundle exec rake cdtb:users:remove[spam_users.csv]
+bundle exec rake cdtb:users:remove[spam_users.csv, reporter_user@example.org]
 ```
 
 ### Upgrades:

data/lib/decidim/cdtb/spam/user_spam_detector.rb

@@ -21,10 +21,12 @@ module Decidim
         end
 
         def prepare_execution(_ctx)
+          base_query = Decidim::User.where(deleted_at: nil)
+
           @users = if @organization.present?
-                     Decidim::User.where(organization: @organization)
+                     base_query.where(organization: @organization)
                    else
-                     Decidim::User.all
+                     base_query
                    end
 
           @num_users = @users.count

data/lib/decidim/cdtb/users/remover.rb

@@ -5,9 +5,11 @@ module Decidim
     module Users
       # Remove Decidim::User's
       #
+      # rubocop:disable Metrics/ClassLength
       class Remover < ::Decidim::Cdtb::Task
-        def initialize(csv_path)
+        def initialize(csv_path, reporter_user_email)
           @csv_path = csv_path
+          @reporter_user_email = reporter_user_email
           progress_bar = { title: "Decidim::User" }
           super("USER REMOVER", progress_bar: progress_bar)
         end
@@ -25,10 +27,10 @@ module Decidim
             user = Decidim::User.find_by(id: row[0])
             next unless user.present?
 
-            reporter_user = Decidim::User.find_by(email: "support@coditramuntana.com",
+            reporter_user = Decidim::User.find_by(email: @reporter_user_email,
                                                   organization: user.organization)
             comments = Decidim::Comments::Comment.where(decidim_author_id: user.id)
-            manage_comments(comments, reporter_user) unless comments.empty?
+            manage_comments(comments, user, reporter_user) unless comments.empty?
             destroy_user(user) if block_user(user, reporter_user)
             progress_bar.increment
           end
@@ -40,10 +42,10 @@ module Decidim
 
         private
 
-        def manage_comments(comments, reporter_user)
+        def manage_comments(comments, user, reporter_user)
           comments.find_each do |comment|
-            report_comment(comment, reporter_user)
-            hide_comment(comment, reporter_user)
+            report_comment(comment, user, reporter_user)
+            hide_comment(comment, user, reporter_user) unless comment.hidden?
           end
         end
 
@@ -91,15 +93,16 @@ module Decidim
           end
         end
 
-        def report_comment(comment, reporter_user)
+        def report_comment(comment, user, reporter_user)
           params = {
             reason: "spam",
             details: "Spam message"
           }
 
-          form = Decidim::ReportForm.from_params(params)
+          form = Decidim::ReportForm.from_params(params).with_context(context_for_report(user, comment, reporter_user))
+          reportable = GlobalID::Locator.locate_signed(comment.to_sgid.to_s)
 
-          CreateReport.call(form, comment, reporter_user) do
+          Decidim::CreateReport.call(form, reportable, reporter_user) do
             on(:ok) do
               puts "OK: Comment #{comment.id} of User #{user.id} reported"
             end
@@ -110,7 +113,7 @@ module Decidim
           end
         end
 
-        def hide_comment(comment, reporter_user)
+        def hide_comment(comment, user, reporter_user)
           Admin::HideResource.call(comment, reporter_user) do
             on(:ok) do
               puts "OK: Comment #{comment.id} of User #{user.id} hided"
@@ -121,7 +124,17 @@ module Decidim
             end
           end
         end
+
+        def context_for_report(user, comment, reporter_user)
+          {
+            current_organization: user.organization,
+            current_component: comment.component,
+            current_user: reporter_user,
+            current_participatory_space: comment.participatory_space
+          }
+        end
       end
+      # rubocop:enable Metrics/ClassLength
     end
   end
 end

data/lib/decidim/cdtb/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Cdtb
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
     DECIDIM_MIN_VERSION = ">= 0.26.2"
   end
 end

data/lib/tasks/users.rake

@@ -15,8 +15,8 @@ namespace :cdtb do
     desc <<~EODESC
       Remove Decidim::User's by IDs in a CSV.
     EODESC
-    task :remove, %i[csv_file] => [:environment] do |_taks, args|
-      service = ::Decidim::Cdtb::Users::Remover.new(args.csv_file)
+    task :remove, %i[csv_path reporter_user_email] => [:environment] do |_taks, args|
+      service = ::Decidim::Cdtb::Users::Remover.new(args.csv_path, args.reporter_user_email)
       service.execute!
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cdtb
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Oliver Valls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-16 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim