decidim-cdtb 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4545daf0386a7705e4c372eb8a0c49812d2e9b7bb35e9cb704b4d3c4d0a8958a
-  data.tar.gz: c8c831e68a8766c2bf3cd4a1486ce7bfc1c199aa150a285b21e1abc23e856eab
+  metadata.gz: 3cdd6e2f7b6f54ea5053222a30ff8cb106b14975261395d8fdf6cbae0e7d06f1
+  data.tar.gz: 3e141391b889c44fb29d640e036417cbfea23308e9392efe9e9bbf67a132d7ff
 SHA512:
-  metadata.gz: 33c54f1f56b68b0b15ae5aed1338c81e236808d14bb7c2e8055eb3dbc7add79aa85e28c8a14e06c63b855713a4265dfaaba2cbb09f8f4c89911ed43285ab2d88
-  data.tar.gz: b0001f706bf9083b3049bc223644bd44d41373e56cff44870c092c867bc6054034eaef8a9f96813d3da3cdfe7df83749877c6c3235831e4c6d5499779444df87
+  metadata.gz: 9b3e4166b142c0d23b7140802d669cf3833a3195625ca48d6931d000db5cc12ea7431914a2cac518efc51c70c890aad81ceda101e7c47bf63e34fdbe59778819
+  data.tar.gz: 1144580a008ee6e0c1ca00d14a5e30e1be7528a7d4165b1cd893c2462204a94f9248ed0801183878ae1b18f3282cf28bbbc8eec34d207515d3d097289573ab77

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [0.5.2] - 2025-05-23 (patch - Sense por ni flotador)
+
+- Update validate_migrations generator template.
+- Add last_sign_in_at to spam users detector.
+
+## [0.5.1] - 2025-04-14 (minor - Diferents però igual)
+
+- Add remove ActionLogs of users on remove users task.
+- Fix error on add content blocks task.
+
 ## [0.5.0] - 2025-04-28 (minor - Unes roques molt gracioses)
 
 - Add task to export the list of admins.

data/Gemfile.lock

@@ -141,7 +141,7 @@ GIT
 PATH
   remote: .
   specs:
-    decidim-cdtb (0.5.0)
+    decidim-cdtb (0.5.2)
       decidim (>= 0.28.0)
       rails (>= 6)
       ruby-progressbar

data/lib/decidim/cdtb/participatory_spaces/add_content_blocks.rb

@@ -73,6 +73,7 @@ module Decidim
 
           current_content_blocks.each do |content_block|
             # hero is usually the first content block
+            next if content_block.nil?
             next if content_block == extra_data_content_block || content_block.manifest_name == "hero"
 
             content_block.update(weight: content_block.weight + 10)

data/lib/decidim/cdtb/spam/{user_spam_detector.rb → spam_users_detector.rb}

@@ -7,7 +7,7 @@ module Decidim
     module Spam
       # Detect spam behavior in users
       #
-      class UserSpamDetector < ::Decidim::Cdtb::Task
+      class SpamUsersDetector < ::Decidim::Cdtb::Task
         # rubocop:disable Style/RedundantRegexpEscape
         URL_REGEX = %r{(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|
         www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|
@@ -44,7 +44,7 @@ module Decidim
           filepath= Rails.env.test? ? "tmp/#{filename}" : filename
           CSV.open(filepath, "w") do |csv|
             csv_headers = ["ID", "Is suspicious?", "Name", "Email", "Nickname", "Personal URL", "About",
-                           "Organization ID", "Organization Name"]
+                           "Organization ID", "Organization Name", "Last Sign In At"]
             csv << csv_headers
 
             @users.find_each do |user|
@@ -56,7 +56,7 @@ module Decidim
               end
 
               csv << [user.id, suspicious, user.name, user.email, user.nickname, user.personal_url, user.about,
-                      user.organization.id, user.organization.name]
+                      user.organization.id, user.organization.name, user.last_sign_in_at&.strftime(Decidim::Cdtb::STRFTIME_FORMAT)]
 
               progress_bar.increment
             end

data/lib/decidim/cdtb/tasks.rb

@@ -8,7 +8,7 @@ require "decidim/cdtb/users/remover"
 require "decidim/cdtb/multitenants/org_by_host_like"
 require "decidim/cdtb/participatory_spaces/add_content_blocks"
 require "decidim/cdtb/participatory_spaces/move_images_to_content_block"
-require "decidim/cdtb/spam/user_spam_detector"
+require "decidim/cdtb/spam/spam_users_detector"
 require "decidim/cdtb/storage/local_sharding"
 require "decidim/cdtb/storage/set_local_on_blobs"
 require "decidim/cdtb/upgrades/validate_migrations_task"

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

@@ -36,7 +36,10 @@ module Decidim
                                                   organization: user.organization)
             comments = Decidim::Comments::Comment.where(decidim_author_id: user.id)
             manage_comments(comments, user, reporter_user) unless comments.empty?
-            destroy_user(user) if block_user(user, reporter_user)
+            if block_user(user, reporter_user)
+              remove_action_logs_by(user)
+              destroy_user(user)
+            end
             progress_bar.increment
           end
         ensure
@@ -53,28 +56,18 @@ module Decidim
         def disable_email_moderations(users_emails)
           log_task_step("Disabling email on moderations...")
 
-          users = Decidim::User.where(email: users_emails)
-
-          users.find_each do |user|
-            user.email_on_moderations = false
-            user.save(validate: false)
-          end
+          Decidim::User.where(email: users_emails).update_all(email_on_moderations: false)
         end
 
         def enable_email_moderations(users_emails)
           log_task_step("Enabling email on moderations...")
 
-          users = Decidim::User.where(email: users_emails)
-
-          users.find_each do |user|
-            user.email_on_moderations = true
-            user.save(validate: false)
-          end
+          Decidim::User.where(email: users_emails).update_all(email_on_moderations: true)
         end
 
         def manage_comments(comments, user, reporter_user)
           comments.find_each do |comment|
-            report_comment(comment, user, reporter_user)
+            report_comment(comment, user, reporter_user) unless comment.reported?
             hide_comment(comment, user, reporter_user) unless comment.hidden?
           end
         end
@@ -163,6 +156,12 @@ module Decidim
             current_participatory_space: comment.participatory_space
           }
         end
+
+        def remove_action_logs_by(user)
+          puts "Removing ActionLog from user #{user.id}..."
+
+          ActiveRecord::Base.connection.execute("DELETE FROM decidim_action_logs WHERE decidim_user_id = #{user.id}")
+        end
       end
       # rubocop:enable Metrics/ClassLength
     end

data/lib/decidim/cdtb/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Cdtb
-    VERSION = "0.5.0"
+    VERSION = "0.5.2"
     DECIDIM_MIN_VERSION = ">= 0.28.0"
   end
 end

data/lib/generators/cdtb/templates/validate_migrations.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:11
+        image: postgres:16
         ports: ["5432:5432"]
         options: >-
           --health-cmd pg_isready
@@ -36,7 +36,7 @@ jobs:
       SECRET_KEY_BASE: "secret_key_base"
 
     steps:
-      - uses: actions/checkout@v2.0.0
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - uses: ruby/setup-ruby@master
@@ -44,7 +44,7 @@ jobs:
           ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true
       - name: Recover Ruby dependency cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ./vendor/bundle
           key: ${{ runner.OS }}-app-rubydeps-${{ hashFiles('Gemfile.lock') }}
@@ -56,7 +56,7 @@ jobs:
         run: bundle config set --local path 'vendor/bundle'
 
       - name: Install Ruby deps
-        uses: nick-invision/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 3

data/lib/tasks/spam.rake

@@ -2,11 +2,11 @@
 
 namespace :cdtb do
   namespace :spam do
-    desc "Show a list with users suspected of spam"
+    desc "Show a list with users suspicious of being spammers"
     task :users, %i[org_id] => :environment do |_task, args|
       organization = args.org_id.present? ? Decidim::Organization.find(args.org_id) : nil
 
-      detector = Decidim::Cdtb::Spam::UserSpamDetector.new(organization)
+      detector = Decidim::Cdtb::Spam::SpamUsersDetector.new(organization)
       detector.execute!
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cdtb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 2025-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim
@@ -96,7 +96,7 @@ files:
 - lib/decidim/cdtb/participatory_spaces/add_content_blocks.rb
 - lib/decidim/cdtb/participatory_spaces/manages_content_blocks.rb
 - lib/decidim/cdtb/participatory_spaces/move_images_to_content_block.rb
-- lib/decidim/cdtb/spam/user_spam_detector.rb
+- lib/decidim/cdtb/spam/spam_users_detector.rb
 - lib/decidim/cdtb/storage/local_sharding.rb
 - lib/decidim/cdtb/storage/set_local_on_blobs.rb
 - lib/decidim/cdtb/task.rb