decidim-cdtb 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30a633cfd37b8c99f0aa405a37d8140ee9d5d6ae06a393cfe29513fd91d425bd
-  data.tar.gz: da2c0fb5f6fdb4e8086e6d24910825bf7a331884446e27c5932e50fb777759b6
+  metadata.gz: 4c986754e258f5c89f059019e2eff8a989cb15972c8958a0aef8519246a1c974
+  data.tar.gz: a930aa3920de4ffaa6549d86831dcc9f328b8e4be9eab69a3d0e99a4367ba7ad
 SHA512:
-  metadata.gz: 16ad1987a516def98adb792653df860c6d6a881b9ae38e3c5578725cc3e9674ddacc96fb1bf1c179e9f2673141f6864f5fd5000759cb6c19890f26f95d7b5b8c
-  data.tar.gz: 84d66913b5ab49b424d47a29ff46b3897d2acd2b7784c5ed42262578dd55042444f847de0af5931b977bd5574e1c7d47f102b0437077acca50f4a799d7cd0d43
+  metadata.gz: 9ae0c57f0806d1d074969b6a4e6f5780d4cac4a6843d0696cc65c1235025e604eb5e6a1c866260a99fd15099b019aee936932888c0cdf0de345622b5a32d684d
+  data.tar.gz: 187bcef080e8308048ee7250a8b7b226dc21ff644e875ac254a33164df150338a491d000e79b73058f04aea8bf03d639a1ce76707df340679a0af05610215122

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## [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)
+
+- Fix `ArgumentError` in Users::Remover task: `Decidim::CreateReport.call` only takes `(form, reportable)`, drop the extra `reporter_user` argument.
+- Skip orphaned comments (with no `participatory_space`, e.g. their commentable has been removed) when reporting/hiding them in Users::Remover task, instead of aborting the whole task.
+- Add `cdtb:comments:remove_orphaned` task to remove orphaned comments (and their votes, search index entries and moderations).
 
 ## [0.6.0] - 2026-08-25 (minor)
 

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/CodiTramuntana/decidim.git
-  revision: 6c2e53561a9700ad76d0da64f023e6c0690f41ad
+  revision: 67e68f735337b9c7fb98de058362e3b457d24c7a
   branch: release/0.29-stable
   specs:
     decidim (0.29.7)
@@ -141,7 +141,7 @@ GIT
 PATH
   remote: .
   specs:
-    decidim-cdtb (0.6.0)
+    decidim-cdtb (0.6.2)
       decidim (>= 0.29.0)
       rails (>= 6)
       ruby-progressbar
@@ -660,7 +660,7 @@ GEM
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.2.0)
+    responders (3.2.1)
       actionpack (>= 7.0)
       railties (>= 7.0)
     rexml (3.4.4)

data/README.md

@@ -164,6 +164,22 @@ To execute the task run:
 bundle exec rake cdtb:users:remove[spam_users.csv,reporter_user@example.org]
 ```
 
+### Comments
+
+Tasks related with comments.
+
+#### Remove orphaned comments
+
+Removes `Decidim::Comments::Comment`'s whose participatory space can no longer be resolved: this happens when their root commentable (e.g. a proposal or a meeting) and/or its participatory space has been removed without cascading its comments. Trying to report or hide these comments raises `ActiveRecord::RecordInvalid` (a `Decidim::Moderation` requires a `participatory_space`), which is the same condition `cdtb:users:remove` skips.
+
+The task also removes the comment's votes, search index entries and any moderation/report referencing it.
+
+To execute the task run:
+
+```
+bin/rake cdtb:comments:remove_orphaned
+```
+
 ### Participatory Spaces
 
 #### Add content blocks 

data/lib/decidim/cdtb/comments/orphaned_remover.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Cdtb
+    module Comments
+      # Removes Decidim::Comments::Comment's that are orphaned: their
+      # participatory space can no longer be resolved, be it because their
+      # root commentable (e.g. a proposal or a meeting) was removed without
+      # cascading its comments, or because the participatory space itself
+      # was removed.
+      #
+      # This is the same condition Decidim::Cdtb::Users::Remover skips when
+      # reporting/hiding comments, since Decidim::CreateReport requires a
+      # participatory_space to create the Moderation.
+      #
+      # Rows are deleted with `delete_all` (no callbacks, no validations) on
+      # purpose: Decidim::Searchable#remove_from_index blows up for these
+      # comments, since it ends up calling `comment.organization.id` and
+      # `organization` is nil for an orphaned comment.
+      class OrphanedRemover < ::Decidim::Cdtb::Task
+        def initialize
+          @root_commentable_orphaned = {}
+          progress_bar = { title: "Decidim::Comments::Comment" }
+          super("REMOVE ORPHANED COMMENTS", progress_bar:)
+        end
+
+        def prepare_execution(_ctx)
+          @num_comments = query.count
+          log_task_info("Checking #{@num_comments} comments...")
+        end
+
+        def total_items
+          @num_comments
+        end
+
+        def do_execution(context)
+          progress_bar = context[:progress_bar]
+
+          query.find_each do |comment|
+            remove_comment(comment) if orphaned?(comment)
+            progress_bar.increment
+          end
+        end
+
+        def end_execution(_ctx)
+          log_task_step("#{@num_applied} orphaned comments removed")
+        end
+
+        private
+
+        # Comments that share the same root_commentable share the same fate,
+        # so the check is cached by that key to avoid resolving it once per
+        # comment in a heavily-commented orphaned thread. `find_each` always
+        # batches by primary key, so no explicit ordering helps that cache hit.
+        def query
+          Decidim::Comments::Comment.all
+        end
+
+        def orphaned?(comment)
+          key = [comment.decidim_root_commentable_type, comment.decidim_root_commentable_id]
+          @root_commentable_orphaned.fetch(key) { @root_commentable_orphaned[key] = comment.participatory_space.blank? }
+        end
+
+        def remove_comment(comment)
+          remove_moderations(comment)
+          Decidim::Comments::CommentVote.where(decidim_comment_id: comment.id).delete_all
+          Decidim::SearchableResource.where(resource_type: "Decidim::Comments::Comment", resource_id: comment.id).delete_all
+          Decidim::Comments::Comment.where(id: comment.id).delete_all
+
+          @num_applied += 1
+          puts "OK: Comment #{comment.id} removed (orphaned)"
+        end
+
+        def remove_moderations(comment)
+          moderation_ids = Decidim::Moderation.where(
+            decidim_reportable_type: "Decidim::Comments::Comment",
+            decidim_reportable_id: comment.id
+          ).pluck(:id)
+          return if moderation_ids.empty?
+
+          Decidim::Report.where(decidim_moderation_id: moderation_ids).delete_all
+          Decidim::Moderation.where(id: moderation_ids).delete_all
+        end
+      end
+    end
+  end
+end

data/lib/decidim/cdtb/tasks.rb

@@ -2,6 +2,7 @@
 
 require "decidim/cdtb/tasks_utils"
 require "decidim/cdtb/task"
+require "decidim/cdtb/comments/orphaned_remover"
 require "decidim/cdtb/fixes/nickname_fixer"
 require "decidim/cdtb/fixes/you_tube_embeds_fixer"
 require "decidim/cdtb/users/remover"

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

@@ -67,34 +67,75 @@ module Decidim
 
         def manage_comments(comments, user, reporter_user)
           comments.find_each do |comment|
+            next unless orphaned_comment_skip_check(comment)
+
             report_comment(comment, user, reporter_user) unless comment.reported?
             hide_comment(comment, user, reporter_user) unless comment.hidden?
           end
         end
 
+        # Comments whose commentable (or its participatory space) has been removed
+        # have no `participatory_space`, which makes `Decidim::CreateReport` blow up
+        # (Moderation requires a participatory_space) and would abort the whole batch.
+        def orphaned_comment_skip_check(comment)
+          return true if comment.participatory_space.present?
+
+          puts "SKIP: Comment #{comment.id} of User #{comment.decidim_author_id} has no participatory space (orphaned)"
+          false
+        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
 
@@ -104,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
 
@@ -114,18 +157,19 @@ module Decidim
               puts "ERROR: User #{user.id} not removed"
             end
           end
+
+          @num_applied += removed_users
         end
 
         def report_comment(comment, user, reporter_user)
-          params = {
-            reason: "spam",
-            details: "Spam message"
-          }
-
-          form = Decidim::ReportForm.from_params(params).with_context(context_for_report(user, comment, reporter_user))
+          form = report_form_for(comment, user, reporter_user)
           reportable = GlobalID::Locator.locate_signed(comment.to_sgid.to_s)
 
-          Decidim::CreateReport.call(form, reportable, reporter_user) do
+          create_report(form, reportable, comment, user)
+        end
+
+        def create_report(form, reportable, comment, user)
+          Decidim::CreateReport.call(form, reportable) do
             on(:ok) do
               puts "OK: Comment #{comment.id} of User #{user.id} reported"
             end
@@ -134,6 +178,17 @@ module Decidim
               puts "ERROR: Comment #{comment.id} of User #{user.id} not reported"
             end
           end
+        rescue ActiveRecord::RecordInvalid => e
+          puts "ERROR: Comment #{comment.id} of User #{user.id} not reported (#{e.message})"
+        end
+
+        def report_form_for(comment, user, reporter_user)
+          params = {
+            reason: "spam",
+            details: "Spam message"
+          }
+
+          Decidim::ReportForm.from_params(params).with_context(context_for_report(user, comment, reporter_user))
         end
 
         def hide_comment(comment, user, reporter_user)

data/lib/decidim/cdtb/version.rb

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

data/lib/tasks/comments.rake

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "decidim/cdtb/tasks"
+
+namespace :cdtb do
+  namespace :comments do
+    desc <<~EODESC
+      Remove orphaned Decidim::Comments::Comment's: comments whose participatory
+      space can no longer be resolved (their root commentable and/or their
+      participatory space has been removed).
+    EODESC
+    task remove_orphaned: [:environment] do
+      task = Decidim::Cdtb::Comments::OrphanedRemover.new
+      task.execute!
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cdtb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-26 00:00:00.000000000 Z
+date: 2026-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim
@@ -91,6 +91,7 @@ files:
 - decidim-cdtb.gemspec
 - lib/cdtb/ip_parser.rb
 - lib/decidim/cdtb.rb
+- lib/decidim/cdtb/comments/orphaned_remover.rb
 - lib/decidim/cdtb/engine.rb
 - lib/decidim/cdtb/fixes/nickname_fixer.rb
 - lib/decidim/cdtb/fixes/you_tube_embeds_fixer.rb
@@ -117,6 +118,7 @@ files:
 - lib/generators/cdtb/github_actions/templates/zeitwerk.yml
 - lib/tasks/anonymize.rake
 - lib/tasks/census.rake
+- lib/tasks/comments.rake
 - lib/tasks/fix_youtube_embeds.rake
 - lib/tasks/logs.rake
 - lib/tasks/multitenants.rake