decidim-cdtb 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4adf8e2c9aeb9bfef5d29c8b9beb889da8566d7cd5d49debeded01c0aac28030
-  data.tar.gz: ed5adda640ba3bfec70f1b13147f5fd05a2ba51cc818f6b8344bb5791354e820
+  metadata.gz: 4c986754e258f5c89f059019e2eff8a989cb15972c8958a0aef8519246a1c974
+  data.tar.gz: a930aa3920de4ffaa6549d86831dcc9f328b8e4be9eab69a3d0e99a4367ba7ad
 SHA512:
-  metadata.gz: 55c8a981705afb0014de3d2e8c90ba6de21aba8e9e7d9746cddfa75311a7b22fe5cfdcd31689e2b7a146a789643f795fb52d6c6acdc42dfbf0415d74602dfacd
-  data.tar.gz: 8a10c840a930ce5ba7a349890491725ca1ed19a9035f030aab79955d2651b45b9c7d1e1303b2edced69a712a96548060249ec59ad6ee5e82894c8d80d1f1c0e3
+  metadata.gz: 9ae0c57f0806d1d074969b6a4e6f5780d4cac4a6843d0696cc65c1235025e604eb5e6a1c866260a99fd15099b019aee936932888c0cdf0de345622b5a32d684d
+  data.tar.gz: 187bcef080e8308048ee7250a8b7b226dc21ff644e875ac254a33164df150338a491d000e79b73058f04aea8bf03d639a1ce76707df340679a0af05610215122

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-## [Unreleased]
+## [0.6.2] - 2026-09-10 (minor)
+
+- Prevent `cdtb:users:remove` from enqueueing the admin block notification email when blocking users while preserving auditability and moderation records.
 
 ## [0.6.1] - 2026-08-27 (patch)
 

data/Gemfile.lock

@@ -141,7 +141,7 @@ GIT
 PATH
   remote: .
   specs:
-    decidim-cdtb (0.6.1)
+    decidim-cdtb (0.6.2)
       decidim (>= 0.29.0)
       rails (>= 6)
       ruby-progressbar

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

@@ -85,28 +85,57 @@ module Decidim
         end
 
         def block_user(user, reporter_user)
-          params = {
-            user_id: user.id,
-            justification: "Confirmed spam suspicious"
-          }
+          justification = "Confirmed spam suspicious"
 
-          form = Decidim::Admin::BlockUserForm.from_params(params).with_context(
-            {
-              current_organization: user.organization,
-              current_user: reporter_user
-            }
-          )
+          return skip_blocked_user(user) if user.blocked?
 
-          Decidim::Admin::BlockUser.call(form) do
-            on(:ok) do
-              puts "OK: User #{user.id} blocked"
-              return true
-            end
+          user_block = create_user_block(user, reporter_user, justification)
+          apply_block_to_user(user, user_block, reporter_user, justification)
 
-            on(:invalid) do
-              puts "ERROR: User #{user.id} not blocked"
-              return false
-            end
+          puts "OK: User #{user.id} blocked"
+          true
+        rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
+          puts "ERROR: User #{user.id} not blocked (#{e.message})"
+          false
+        end
+
+        def skip_blocked_user(user)
+          puts "SKIP: User #{user.id} already blocked"
+          false
+        end
+
+        def create_user_block(user, reporter_user, justification)
+          Decidim::UserModeration.find_or_create_by!(user:)
+
+          Decidim::UserBlock.create!(
+            justification:,
+            user:,
+            blocking_user: reporter_user
+          )
+        end
+
+        def apply_block_to_user(user, user_block, reporter_user, justification)
+          Decidim.traceability.perform_action!(
+            "block",
+            user,
+            reporter_user,
+            extra: {
+              reportable_type: user.class.name,
+              current_justification: justification
+            },
+            resource: {
+              title: user.name
+            }
+          ) do
+            user.assign_attributes(
+              blocked: true,
+              blocked_at: Time.current,
+              block_id: user_block.id,
+              extended_data: user.extended_data.to_h.merge("user_name" => user.name),
+              name: "Blocked user",
+              notifications_sending_frequency: "none"
+            )
+            user.save!
           end
         end
 
@@ -116,9 +145,11 @@ module Decidim
           }
 
           form = Decidim::DeleteAccountForm.from_params(params).with_context(current_user: user)
+          removed_users = 0
 
           Decidim::DestroyAccount.call(form) do
             on(:ok) do
+              removed_users += 1
               puts "OK: User #{user.id} removed"
             end
 
@@ -126,6 +157,8 @@ module Decidim
               puts "ERROR: User #{user.id} not removed"
             end
           end
+
+          @num_applied += removed_users
         end
 
         def report_comment(comment, user, reporter_user)

data/lib/decidim/cdtb/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Cdtb
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
     DECIDIM_MIN_VERSION = ">= 0.29.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cdtb
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-28 00:00:00.000000000 Z
+date: 2026-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim