decidim-comments 0.30.1 → 0.31.0.rc1

data/lib/decidim/api/commentable_mutation_type.rb

@@ -8,12 +8,11 @@ module Decidim
       field :add_comment, Decidim::Comments::CommentType, description: "Add a new comment to a commentable", null: true do
         argument :alignment, GraphQL::Types::Int, "The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'", default_value: 0, required: false
         argument :body, GraphQL::Types::String, "The comments's body", required: true
-        argument :user_group_id, GraphQL::Types::ID, "The comment's user group id. Replaces the author.", required: false
       end
       field :id, GraphQL::Types::ID, "The Commentable's unique ID", null: false
 
-      def add_comment(body:, alignment: nil, user_group_id: nil)
-        params = { "comment" => { "body" => body, "alignment" => alignment, "user_group_id" => user_group_id, "commentable" => object } }
+      def add_comment(body:, alignment: nil)
+        params = { "comment" => { "body" => body, "alignment" => alignment, "commentable" => object } }
         form = Decidim::Comments::CommentForm.from_params(params).with_context(
           current_organization: context[:current_organization],
           current_user: context[:current_user],

data/lib/decidim/comments/comment_serializer.rb

@@ -19,10 +19,6 @@ module Decidim
           },
           alignment: resource.alignment,
           depth: resource.depth,
-          user_group: {
-            id: resource.user_group.try(:id),
-            name: resource.user_group.try(:name) || empty_translatable
-          },
           commentable_id: resource.decidim_commentable_id,
           commentable_type: resource.decidim_commentable_type,
           root_commentable_url:

data/lib/decidim/comments/comment_vote_serializer.rb

@@ -20,10 +20,6 @@ module Decidim
             },
             alignment: resource.comment.alignment,
             depth: resource.comment.depth,
-            user_group: {
-              id: resource.comment.user_group.try(:id),
-              name: resource.comment.user_group.try(:name)
-            },
             commentable_id: resource.comment.decidim_commentable_id,
             commentable_type: resource.comment.decidim_commentable_type,
             root_commentable_url:

data/lib/decidim/comments/commentable.rb

@@ -17,6 +17,10 @@ module Decidim
           true
         end
 
+        def has_comments?
+          comment_threads.not_hidden.size.positive?
+        end
+
         # Public: Whether the object can have new comments or not.
         def accepts_new_comments?
           true

data/lib/decidim/comments/engine.rb

@@ -35,9 +35,12 @@ module Decidim
       end
 
       initializer "decidim_comments.stats" do
-        Decidim.stats.register :comments_count, priority: StatsRegistry::MEDIUM_PRIORITY do |organization|
+        Decidim.stats.register :comments_count,
+                               priority: StatsRegistry::HIGH_PRIORITY,
+                               icon_name: "chat-1-line",
+                               tooltip_key: "comments_count" do |organization|
           Decidim.component_manifests.sum do |component|
-            component.stats.filter(tag: :comments).with_context(organization.published_components).map { |_name, value| value }.sum
+            component.stats.filter(tag: :comments).with_context(organization.published_components).map { |_name, value| value }.compact_blank.sum
           end
         end
       end
@@ -56,23 +59,6 @@ module Decidim
         Decidim.icons.register(name: "edit-line", icon: "edit-line", description: "Edit comment button", **common_parameters)
       end
 
-      initializer "decidim_comments.register_metrics" do
-        Decidim.metrics_registry.register(:comments) do |metric_registry|
-          metric_registry.manager_class = "Decidim::Comments::Metrics::CommentsMetricManage"
-
-          metric_registry.settings do |settings|
-            settings.attribute :highlighted, type: :boolean, default: false
-            settings.attribute :scopes, type: :array, default: %w(home participatory_process)
-            settings.attribute :weight, type: :integer, default: 6
-            settings.attribute :stat_block, type: :string, default: "small"
-          end
-        end
-
-        Decidim.metrics_operation.register(:participants, :comments) do |metric_operation|
-          metric_operation.manager_class = "Decidim::Comments::Metrics::CommentParticipantsMetricMeasure"
-        end
-      end
-
       initializer "decidim_comments.register_resources" do
         Decidim.register_resource(:comment) do |resource|
           resource.model_class_name = "Decidim::Comments::Comment"
@@ -86,7 +72,7 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Comments::Engine.root}/app/views") # for partials
       end
 
-      initializer "decidim_comments.webpacker.assets_path" do
+      initializer "decidim_comments.shakapacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
 

data/lib/decidim/comments/test/factories.rb

@@ -19,7 +19,7 @@ FactoryBot.define do
                      else
                        evaluator.body
                      end
-      comment.body = Decidim::ContentProcessor.parse_with_processor(:hashtag, comment.body, current_organization: comment.root_commentable.organization).rewrite
+      comment.body = Decidim::ContentProcessor.parse(comment.body, current_organization: comment.root_commentable.organization).rewrite
     end
 
     trait :deleted do

data/lib/decidim/comments/test/shared_examples/comment_event.rb

@@ -17,11 +17,6 @@ shared_context "when it is a comment event" do
 
   let(:extra) { { comment_id: comment.id } }
   let(:resource_title) { decidim_sanitize_translated(resource.title) }
-  let(:user_group) do
-    user_group = create(:user_group, :verified, organization:, users: [comment_author])
-    comment.update!(user_group:)
-    user_group
-  end
 end
 
 shared_examples_for "a comment event" do
@@ -29,11 +24,7 @@ shared_examples_for "a comment event" do
 
   describe "author" do
     it "returns the comment author" do
-      if defined? user_group_author
-        expect(subject.author).to eq(user_group_author)
-      else
-        expect(subject.author).to eq(comment_author)
-      end
+      expect(subject.author).to eq(comment_author)
     end
   end
 

data/lib/decidim/comments/test/shared_examples/create_comment_context.rb

@@ -11,13 +11,11 @@ RSpec.shared_context "when creating a comment" do
   let(:commentable) { dummy_resource }
   let(:body) { Faker::Lorem.paragraph }
   let(:alignment) { 1 }
-  let(:user_group_id) { nil }
   let(:form_params) do
     {
       "comment" => {
         "body" => body,
         "alignment" => alignment,
-        "user_group_id" => user_group_id,
         "commentable" => commentable
       }
     }

data/lib/decidim/comments/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-comments version.
   module Comments
     def self.version
-      "0.30.1"
+      "0.31.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.31.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-17 00:00:00.000000000 Z
+date: 2025-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0.rc1
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -126,14 +126,12 @@ files:
 - app/controllers/decidim/comments/comments_controller.rb
 - app/controllers/decidim/comments/votes_controller.rb
 - app/events/decidim/comments/comment_by_followed_user_event.rb
-- app/events/decidim/comments/comment_by_followed_user_group_event.rb
 - app/events/decidim/comments/comment_created_event.rb
 - app/events/decidim/comments/comment_downvoted_event.rb
 - app/events/decidim/comments/comment_event.rb
 - app/events/decidim/comments/comment_upvoted_event.rb
 - app/events/decidim/comments/comment_voted_event.rb
 - app/events/decidim/comments/reply_created_event.rb
-- app/events/decidim/comments/user_group_mentioned_event.rb
 - app/events/decidim/comments/user_mentioned_event.rb
 - app/forms/decidim/comments/comment_form.rb
 - app/helpers/decidim/comments/comment_cells_helper.rb
@@ -151,8 +149,6 @@ files:
 - app/packs/src/decidim/comments/comments_mobile_modal.js
 - app/packs/stylesheets/comments.scss
 - app/permissions/decidim/comments/permissions.rb
-- app/queries/decidim/comments/metrics/comment_participants_metric_measure.rb
-- app/queries/decidim/comments/metrics/comments_metric_manage.rb
 - app/queries/decidim/comments/sorted_comments.rb
 - app/resolvers/decidim/comments/vote_comment_resolver.rb
 - app/scrubbers/decidim/comments/user_input_scrubber.rb

data/app/events/decidim/comments/comment_by_followed_user_group_event.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    class CommentByFollowedUserGroupEvent < Decidim::Events::SimpleEvent
-      include Decidim::Comments::CommentEvent
-    end
-  end
-end

data/app/events/decidim/comments/user_group_mentioned_event.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    class UserGroupMentionedEvent < Decidim::Events::SimpleEvent
-      include Decidim::Comments::CommentEvent
-      include Decidim::Events::UserGroupEvent
-    end
-  end
-end

data/app/queries/decidim/comments/metrics/comment_participants_metric_measure.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    module Metrics
-      # Searches for Participants in the following actions
-      #  - Leave a comment (Comments)
-      class CommentParticipantsMetricMeasure < Decidim::MetricMeasure
-        def valid?
-          super && @resource.is_a?(Decidim::Participable)
-        end
-
-        def calculate
-          cumulative_users = []
-          quantity_users = []
-
-          retrieve_comments_for_organization.each do |comment|
-            related_object = comment.root_commentable
-            next unless related_object
-            next unless check_participatory_space(@resource, related_object)
-
-            cumulative_users << comment.decidim_author_id
-            quantity_users << comment.decidim_author_id if comment.created_at >= start_time
-          end
-          {
-            cumulative_users: cumulative_users.uniq,
-            quantity_users: quantity_users.uniq
-          }
-        end
-
-        private
-
-        def check_participatory_space(participatory_space, related_object)
-          return related_object.participatory_space == participatory_space if related_object.respond_to?(:participatory_space)
-          return related_object == participatory_space if related_object.is_a?(Decidim::Participable)
-
-          false
-        end
-
-        def retrieve_comments_for_organization
-          user_ids = Decidim::User.where(organization: @resource.organization).pluck(:id)
-          Decidim::Comments::Comment.includes(:root_commentable).not_hidden.not_deleted
-                                    .where(decidim_comments_comments: { created_at: ..end_time })
-                                    .where(decidim_comments_comments: { decidim_author_id: user_ids })
-                                    .where(decidim_comments_comments: { decidim_author_type: "Decidim::UserBaseEntity" })
-        end
-      end
-    end
-  end
-end

data/app/queries/decidim/comments/metrics/comments_metric_manage.rb

@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    module Metrics
-      class CommentsMetricManage < Decidim::MetricManage
-        def metric_name
-          "comments"
-        end
-
-        def save
-          query.each do |key, results|
-            cumulative_value = results[:cumulative]
-            next if cumulative_value.zero?
-
-            quantity_value = results[:quantity] || 0
-            space_type, space_id, taxonomy_id, related_object_type, related_object_id = key
-            record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
-                                                           participatory_space_type: space_type, participatory_space_id: space_id,
-                                                           organization: @organization, decidim_taxonomy_id: taxonomy_id,
-                                                           related_object_type:, related_object_id:)
-            record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            record.save!
-          end
-        end
-
-        private
-
-        # Creates a Hashed structure with comments grouped by
-        #
-        #  - ParticipatorySpace (type & ID)
-        #  - Taxonomy (ID)
-        #  - RelatedObject (type & ID)
-        #
-        def query
-          return @query if @query
-
-          @query = retrieve_comments.each_with_object({}) do |comment, grouped_comments|
-            related_object = comment.root_commentable
-            next grouped_comments unless related_object
-
-            group_keys = generate_group_keys(related_object)
-
-            next grouped_comments unless group_keys
-
-            group_keys.map do |group_key|
-              grouped_comments[group_key] ||= { cumulative: 0, quantity: 0 }
-              grouped_comments[group_key][:cumulative] += 1
-              grouped_comments[group_key][:quantity] += 1 if comment.created_at >= start_time
-            end
-          end
-
-          @query
-        end
-
-        # Retrieve Comments generated within an Organization
-        #
-        # Uses 'author' and 'user_group' relationship
-        #
-        def retrieve_comments
-          user_ids = Decidim::User.select(:id).where(organization: @organization).collect(&:id)
-          user_group_ids = Decidim::UserGroup.select(:id).where(organization: @organization).collect(&:id)
-          Decidim::Comments::Comment.includes(:root_commentable).not_hidden.not_deleted
-                                    .where(decidim_comments_comments: { created_at: ..end_time })
-                                    .where("decidim_comments_comments.decidim_author_id IN (?) OR
-                                           decidim_comments_comments.decidim_user_group_id IN (?)", user_ids, user_group_ids)
-        end
-
-        # Generates a group key from the related object of a Comment
-        def generate_group_keys(related_object)
-          participatory_space = retrieve_participatory_space(related_object)
-          return unless participatory_space
-
-          return unless related_object.respond_to?(:taxonomies)
-
-          taxonomy_ids = related_object.taxonomies.pluck(:id)
-          taxonomy_ids.each_with_object([]) do |taxonomy_id, group_keys|
-            group_key = []
-            group_key += [participatory_space.class.name, participatory_space.id]
-            group_key += [taxonomy_id]
-            group_key += [related_object.class.name, related_object.id]
-            group_keys << group_key
-          end
-        end
-
-        # Gets current ParticipatorySpace of a given 'related_object'
-        def retrieve_participatory_space(related_object)
-          if related_object.respond_to?(:participatory_space)
-            related_object.participatory_space
-          elsif related_object.is_a?(Decidim::Participable)
-            related_object
-          end
-        end
-      end
-    end
-  end
-end