decidim-cdtb 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ea237b7898bc194b0f63514d1f699d5cd1cf649ac7dd7433de19d9319541474
-  data.tar.gz: be9a6f3251d35022b933524b3227edac2186a1c338a4025f6d73eb5495633e61
+  metadata.gz: 7d7f9bf148f8840d5c1a477beeaff15fc28202a1ed2ec1362f7d4ce877a7b7ba
+  data.tar.gz: f24fc484d095684afffeacb808370927bbf4d7653da349cf8c036ecbad1c2f62
 SHA512:
-  metadata.gz: 3999c77a44817f3c0b3bc6b97663a47f3dade93f896958cdce06298bd9695d734cdd82859315607ecc3fcd990efd6e567e2e63d6e0141f5c3d256bc44d6b91ef
-  data.tar.gz: 513123ffe284a654f47666d8a0e355b29cb3dd011a30bab73cdef0348776f45cd44dab8c8c9f23f5e962fb5f00a5dc9acb9d68a70ced7b39335cfc225ce56839
+  metadata.gz: afdcf2aaf7ec1b44c41035d6953c9fc2c1b5d025f4e4f0632e2dc8f54d61a16da866b3060a6d77c2ad0d6e86aa432815e202123a705a48492fcd93bc487698a1
+  data.tar.gz: 00141eb4d4e782c16ef0f6f17e1a7be55e029f6ec1d29e6c957a4cedd5c4f7dead2f5ba96491b447955f41f5fdf9e69aa83ce6f4d6119735b9d5adc91b6c8afa

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [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

data/Gemfile.lock

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

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,6 +5,7 @@ module Decidim
     module Users
       # Remove Decidim::User's
       #
+      # rubocop:disable Metrics/ClassLength
       class Remover < ::Decidim::Cdtb::Task
         def initialize(csv_path, reporter_user_email)
           @csv_path = csv_path
@@ -44,6 +45,7 @@ module Decidim
         def manage_comments(comments, user, reporter_user)
           comments.find_each do |comment|
             report_comment(comment, user, reporter_user)
+            hide_comment(comment, user, reporter_user) unless comment.hidden?
           end
         end
 
@@ -111,6 +113,18 @@ module Decidim
           end
         end
 
+        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"
+            end
+
+            on(:invalid) do
+              puts "ERROR: Comment #{comment.id} of User #{user.id} not hided"
+            end
+          end
+        end
+
         def context_for_report(user, comment, reporter_user)
           {
             current_organization: user.organization,
@@ -120,6 +134,7 @@ module Decidim
           }
         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.7"
+    VERSION = "0.1.8"
     DECIDIM_MIN_VERSION = ">= 0.26.2"
   end
 end

metadata

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