decidim-comments 0.28.3 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e76f64fa0fee31f599c29269357e27a2d605700c2009634d8f0b5093895ebb7b
-  data.tar.gz: 5e06d45c5ca4245bfb0dbac58ab2a5e1f74757d821ea8b36c56f26f31ffb61ad
+  metadata.gz: 3d55828915033b2a2a4a6443c316df98042bbbdc627f70c2d4bcf4ef9c983131
+  data.tar.gz: 247c5198c406f27a1ca6de26bcb8c2b8621b6789a4fd6aa92c2b4df4705d885f
 SHA512:
-  metadata.gz: a57f0ae964d0487dd387682b8c4e5d01cb3bc7cc77c856b2cda7aaba0070e1f51ef07c5406e4da84f65ff552ada7769b91a5ff9873efd49d30711283fa88158a
-  data.tar.gz: 77b7c066fcfac602d5bcbc5a7280c3895ae3f3fbd13a725aef2333884c33a4f7860a49c5dd4b95df61b59de0ba9a7c23753b00182181a92eff9fc155383aa4e6
+  metadata.gz: 4ff6042bb9daf77d523c9d6ef46a4bf20d34cb726c2e9cd5d959877ead8491c498d987b46e9a64b1e865a25c62b9c1fe0f1f6d6be69f35f7b7b22537fdaba84d
+  data.tar.gz: 1da79ef396ae8c7e7bd4ccb96f8fc0e7f75af9b861f618efe09e41f608d11e9d36829fb299d705dfcd1479eaa05b519d6206145f0df0e774d7fa09f2a636a137

data/app/cells/decidim/comments/comment/actions.erb

@@ -1,9 +1,10 @@
 <div class="comment__actions">
   <% if depth.zero? && has_replies_in_children? %>
-    <button class="button button__sm button__text-secondary comment__hide" data-controls="comment-<%= model.id %>-replies" data-open="true" id="comment-<%= model.id %>-replies-trigger">
-      <span class="show-comment-replies font-normal"><%= t("decidim.components.comment.show_replies", count: replies.size) %></span>
+    <button class="button button__sm button__text-secondary" data-comment-hide data-controls="comment-<%= model.id %>-replies" data-open="true" id="comment-<%= model.id %>-replies-trigger">
+      <%= icon "arrow-down-s-line" %>
+      <span data-show-comment-reply class="font-normal"><%= t("decidim.components.comment.show_replies", count: replies.size) %></span>
       <%= icon "arrow-up-s-line" %>
-      <span class="hide-comment-replies font-normal"><%= t("decidim.components.comment.hide_replies", count: replies.size) %></span>
+      <span data-hide-comment-reply class="font-normal"><%= t("decidim.components.comment.hide_replies", count: replies.size) %></span>
     </button>
   <% end %>
   <% if can_reply? %>

data/app/cells/decidim/comments/comment/deletion_data.erb

@@ -1,6 +1,6 @@
 <%= render partial: "decidim/comments/comments/delete", formats: [:html], locals: { comment: model } %>
 
-<div class="comment__footer" data-component="accordion" id="accordion-<%= model.id %>">
+<div data-comment-footer data-component="accordion" id="accordion-<%= model.id %>">
   <div id="comment-<%= model.id %>-replies" class="<%= "comment-reply" if has_replies_in_children? %>">
     <% if has_replies_in_children? %>
       <%= render :replies %>

data/app/cells/decidim/comments/comment/show.erb

@@ -63,13 +63,13 @@
       </div>
     </div>
 
-    <div class="comment__footer" data-component="accordion" id="accordion-<%= model.id %>">
+    <div data-comment-footer data-component="accordion" id="accordion-<%= model.id %>">
       <div class="comment__footer-grid">
         <%= render :actions %>
         <%= votes %>
       </div>
       <% if can_reply? %>
-        <div id="panel-<%= reply_id %>" class="add-comment comment__additionalreply">
+        <div id="panel-<%= reply_id %>" class="add-comment" data-additional-reply>
           <%== cell("decidim/comments/comment_form", model, root_depth:, order:) %>
         </div>
       <% end %>

data/app/cells/decidim/comments/comment_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   module Comments
     # A cell to display a single comment.
     class CommentCell < Decidim::ViewModel
-      include ActionView::Helpers::DateHelper
-      include Decidim::IconHelper
       include Decidim::ResourceHelper
       include Cell::ViewModel::Partial
 

data/app/cells/decidim/comments/comment_form/opinion.erb

@@ -1,15 +1,15 @@
 <div>
   <span class="comment__opinion-label"><%= t("decidim.components.add_comment_form.opinion.label") %></span>
-  <div class="opinion-toggle comment__opinion-container">
-    <button type="button" aria-pressed="false" class="opinion-toggle--ok" data-selected-label="<%= t("decidim.components.add_comment_form.opinion.positive_selected") %>">
+  <div data-opinion-toggle class="comment__opinion-container">
+    <button type="button" aria-pressed="false" data-toggle-ok="true" data-selected-label="<%= t("decidim.components.add_comment_form.opinion.positive_selected") %>">
       <span><%= t("decidim.components.comment.alignment.in_favor") %></span>
       <%= icon "thumb-up-line" %>
     </button>
-    <button type="button" aria-pressed="true" class="opinion-toggle--meh is-active" data-selected-label="<%= t("decidim.components.add_comment_form.opinion.neutral_selected") %>">
+    <button type="button" aria-pressed="true" class="is-active" data-toggle-meh="true" data-selected-label="<%= t("decidim.components.add_comment_form.opinion.neutral_selected") %>">
       <span><%= t("decidim.components.add_comment_form.opinion.neutral") %></span>
       <%= icon "loader-3-line" %>
     </button>
-    <button type="button" aria-pressed="false" class="opinion-toggle--ko" data-selected-label="<%= t("decidim.components.add_comment_form.opinion.negative_selected") %>">
+    <button type="button" aria-pressed="false" data-toggle-ko="true" data-selected-label="<%= t("decidim.components.add_comment_form.opinion.negative_selected") %>">
       <span><%= t("decidim.components.comment.alignment.against") %></span>
       <%= icon "thumb-down-line" %>
     </button>

data/app/cells/decidim/comments/comment_form_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   module Comments
     # A cell to display a form for adding a new comment.
     class CommentFormCell < Decidim::ViewModel
-      delegate :current_user, :user_signed_in?, to: :controller
-
       def comment_as_for(form)
         return if verified_user_groups.blank?
 

data/app/cells/decidim/comments/comment_metadata_cell.rb

@@ -14,7 +14,7 @@ module Decidim
 
       def commentable_item
         {
-          text: decidim_html_escape(translated_attribute(root_commentable.title)),
+          text: decidim_escape_translated(root_commentable.title),
           icon: resource_type_icon_key(root_commentable.class)
         }
       end

data/app/cells/decidim/comments/comments_cell.rb

@@ -4,10 +4,7 @@ module Decidim
   module Comments
     # A cell to display a comments section for a commentable object.
     class CommentsCell < Decidim::ViewModel
-      include Decidim::IconHelper
-
       delegate :user_signed_in?, to: :controller
-
       def add_comment
         return if single_comment?
         return if comments_blocked?

data/app/cells/decidim/comments/edit_comment_modal_form_cell.rb

@@ -4,7 +4,6 @@ module Decidim
   module Comments
     # A cell to display a form for editing a comment.
     class EditCommentModalFormCell < Decidim::ViewModel
-      delegate :current_user, :user_signed_in?, to: :controller
       alias comment model
 
       private

data/app/commands/decidim/comments/create_comment.rb

@@ -4,12 +4,12 @@ module Decidim
   module Comments
     # A command with all the business logic to create a new comment
     class CreateComment < Decidim::Command
+      delegate :current_user, to: :form
       # Public: Initializes the command.
       #
       # form - A form object with the params.
-      def initialize(form, author)
+      def initialize(form)
         @form = form
-        @author = author
       end
 
       # Executes the command. Broadcasts these events:
@@ -30,13 +30,13 @@ module Decidim
 
       private
 
-      attr_reader :form, :comment, :author
+      attr_reader :form, :comment
 
       def event_arguments
         {
           resource: comment,
           extra: {
-            event_author: form.current_user,
+            event_author: current_user,
             locale:
           }
         }
@@ -46,7 +46,7 @@ module Decidim
         parsed = Decidim::ContentProcessor.parse(form.body, current_organization: form.current_organization)
 
         params = {
-          author:,
+          author: current_user,
           commentable: form.commentable,
           root_commentable: root_commentable(form.commentable),
           body: { I18n.locale => parsed.rewrite },
@@ -57,7 +57,7 @@ module Decidim
 
         @comment = Decidim.traceability.create!(
           Comment,
-          author,
+          current_user,
           params,
           visibility: "public-only"
         )

data/app/commands/decidim/comments/update_comment.rb

@@ -4,14 +4,13 @@ module Decidim
   module Comments
     # A command with all the business logic to update an existing comment
     class UpdateComment < Decidim::Command
+      delegate :current_user, to: :form
       # Public: Initializes the command.
       #
       # comment - Decidim::Comments::Comment
-      # current_user - Decidim::User
       # form - A form object with the params.
-      def initialize(comment, current_user, form)
+      def initialize(comment, form)
         @comment = comment
-        @current_user = current_user
         @form = form
       end
 
@@ -33,7 +32,7 @@ module Decidim
 
       private
 
-      attr_reader :form, :comment, :current_user
+      attr_reader :form, :comment
 
       def event_arguments
         {

data/app/controllers/decidim/comments/comments_controller.rb

@@ -53,10 +53,11 @@ module Decidim
         form = Decidim::Comments::CommentForm.from_params(
           params.merge(commentable: comment.commentable)
         ).with_context(
+          current_user:,
           current_organization:
         )
 
-        Decidim::Comments::UpdateComment.call(comment, current_user, form) do
+        Decidim::Comments::UpdateComment.call(comment, form) do
           on(:ok) do
             respond_to do |format|
               format.js { render :update }
@@ -78,9 +79,10 @@ module Decidim
           params.merge(commentable:)
         ).with_context(
           current_organization:,
-          current_component:
+          current_component:,
+          current_user:
         )
-        Decidim::Comments::CreateComment.call(form, current_user) do
+        Decidim::Comments::CreateComment.call(form) do
           on(:ok) do |comment|
             handle_success(comment)
             respond_to do |format|

data/app/helpers/decidim/comments/comment_cells_helper.rb

@@ -22,7 +22,7 @@ module Decidim
       delegate :root_commentable, to: :comment
 
       def root_commentable_title
-        decidim_html_escape(translated_attribute(root_commentable.title))
+        decidim_escape_translated(root_commentable.title)
       end
 
       def url_params

data/app/models/decidim/comments/seed.rb

@@ -9,7 +9,7 @@ module Decidim
       class << self
         # Adds a random amount of comments for a given resource.
         #
-        # @param resource [Object] - the Decidim resource to add the coments to.
+        # @param resource [Object] - the Decidim resource to add the comments to.
         #                            examples: Decidim::Proposals::CollaborativeDraft, Decidim::Proposals::Proposal,
         #
         # @return nil
@@ -18,14 +18,28 @@ module Decidim
 
           Decidim::Comments::Comment.reset_column_information
 
+          @organization = resource.organization
+
           rand(0..6).times do
-            comment = create_comment(resource)
-            create_comment(comment, resource) if [true, false].sample
+            comment1 = create_comment(resource)
+            NewCommentNotificationCreator.new(comment1, [], []).create
+
+            if [true, false].sample
+              comment2 = create_comment(comment1, resource)
+              NewCommentNotificationCreator.new(comment2, [], []).create
+            end
+
+            next if [true, false].sample
+
+            create_votes(comment1) if comment1
+            create_votes(comment2) if comment2
           end
         end
 
         private
 
+        attr_reader :organization
+
         # Creates a comment for a given resource.
         #
         # @private
@@ -35,8 +49,8 @@ module Decidim
         #
         # @return [Decidim::Comments::Comment]
         def create_comment(resource, root_commentable = nil)
-          author = Decidim::User.where(organization: resource.organization).all.sample
-          user_group = [true, false].sample ? Decidim::UserGroups::ManageableUserGroups.for(author).verified.sample : nil
+          author = random_user
+          user_group = random_user_group(author)
 
           params = {
             commentable: resource,
@@ -53,6 +67,42 @@ module Decidim
             visibility: "public-only"
           )
         end
+
+        # Creates a random amount of votes for a given comment.
+        # The votes can be from a user or a user group.
+        #
+        # @private
+        #
+        # @param [Decidim::Comments::Comment]
+        #
+        # @return nil
+        def create_votes(comment)
+          rand(0..12).times do
+            user = random_user
+            user_group = random_user_group(user)
+            author = [user, user_group].compact.sample
+            next if CommentVote.where(comment:, author:).any?
+
+            CommentVote.create!(comment:, author:, weight: [1, -1].sample)
+          end
+
+          nil
+        rescue ActiveRecord::AssociationTypeMismatch
+          nil # in case there is a mismatch, we ignore the error as it is not important for the seeding
+        end
+
+        def random_user
+          user = Decidim::User.where(organization:).not_deleted.not_blocked.confirmed.sample
+
+          user.valid? ? user : random_user
+        end
+
+        def random_user_group(user)
+          user_group = Decidim::UserGroups::ManageableUserGroups.for(user).verified.sample
+          return nil unless user_group&.valid?
+
+          [true, false].sample ? user_group : nil
+        end
       end
     end
   end

data/app/packs/entrypoints/decidim_comments.js

@@ -1,5 +1,5 @@
 // CSS
 import "stylesheets/comments.scss"
 
-// Javacript
+// JavaScript
 import "src/decidim/comments/comments"

data/app/packs/src/decidim/comments/comments.component.js

@@ -2,7 +2,7 @@
 /* eslint max-lines: ["error", {"max": 350, "skipBlankLines": true}] */
 
 /**
- * A plain Javascript component that handles the comments.
+ * A plain JavaScript component that handles the comments.
  *
  * @class
  * @augments Component
@@ -56,7 +56,7 @@ export default class CommentsComponent {
       this.mounted = false;
       this._stopPolling();
 
-      $(".add-comment .opinion-toggle button", this.$element).off("click.decidim-comments");
+      $(".add-comment [data-opinion-toggle] button", this.$element).off("click.decidim-comments");
       $(".add-comment textarea", this.$element).off("input.decidim-comments");
       $(".add-comment form", this.$element).off("submit.decidim-comments");
       $(".add-comment textarea", this.$element).each((_i, el) => el.removeEventListener("emoji.added", this._onTextInput));
@@ -117,7 +117,7 @@ export default class CommentsComponent {
     $(".add-comment", $parent).each((_i, el) => {
       const $add = $(el);
       const $form = $("form", $add);
-      const $opinionButtons = $(".opinion-toggle button", $add);
+      const $opinionButtons = $("[data-opinion-toggle] button", $add);
       const $text = $("textarea", $form);
 
       $opinionButtons.on("click.decidim-comments", this._onToggleOpinion);
@@ -280,18 +280,18 @@ export default class CommentsComponent {
 
     const $add = $btn.closest(".add-comment");
     const $form = $("form", $add);
-    const $opinionButtons = $(".opinion-toggle button", $add);
-    const $selectedState = $(".opinion-toggle .selected-state", $add);
+    const $opinionButtons = $("[data-opinion-toggle] button", $add);
+    const $selectedState = $("[data-opinion-toggle] .selected-state", $add);
     const $alignment = $(".alignment-input", $form);
 
     $opinionButtons.removeClass("is-active").attr("aria-pressed", "false");
     $btn.addClass("is-active").attr("aria-pressed", "true");
 
-    if ($btn.is(".opinion-toggle--ok")) {
+    if ($btn.data("toggleOk")) {
       $alignment.val(1);
-    } else if ($btn.is(".opinion-toggle--meh")) {
+    } else if ($btn.data("toggleMeh")) {
       $alignment.val(0);
-    } else if ($btn.is(".opinion-toggle--ko")) {
+    } else if ($btn.data("toggleKo")) {
       $alignment.val(-1);
     }
 

data/app/packs/src/decidim/comments/comments.component.test.js

@@ -45,7 +45,7 @@ describe("CommentsComponent", () => {
   const spyOnAddComment = (methodToSpy) => {
     addComment.each((i) => {
       addComment[i].$ = $(addComment[i]);
-      addComment[i].opinionToggles = $(".opinion-toggle button", addComment[i].$);
+      addComment[i].opinionToggles = $("[data-opinion-toggle] button", addComment[i].$);
       addComment[i].commentForm = $("form", addComment[i].$);
       addComment[i].commentTextarea = $("textarea", addComment[i].commentForm);
 
@@ -66,7 +66,7 @@ describe("CommentsComponent", () => {
         return orderLinks;
       } else if (jqSelector === ".add-comment" && parent.is(subject.$element)) {
         return addComment;
-      } else if (jqSelector === ".add-comment .opinion-toggle button" && parent.is(subject.$element)) {
+      } else if (jqSelector === ".add-comment [data-opinion-toggle] button" && parent.is(subject.$element)) {
         return allToggles;
       } else if (jqSelector === ".add-comment textarea" && parent.is(subject.$element)) {
         return allTextareas;
@@ -75,7 +75,7 @@ describe("CommentsComponent", () => {
       }
       const addCommentsArray = addComment.toArray();
       for (let i = 0; i < addCommentsArray.length; i += 1) {
-        if (jqSelector === ".opinion-toggle button" && parent.is(addCommentsArray[i].$)) {
+        if (jqSelector === "[data-opinion-toggle] button" && parent.is(addCommentsArray[i].$)) {
           return addCommentsArray[i].opinionToggles;
         } else if (jqSelector === "form" && parent.is(addCommentsArray[i].$)) {
           return addCommentsArray[i].commentForm;
@@ -102,7 +102,7 @@ describe("CommentsComponent", () => {
     </div>
 
       <div class="form__wrapper gap-2">
-        <label class="show-for-sr" for="add-comment-${modelName}-${modelId}">
+        <label for="add-comment-${modelName}-${modelId}">
           Comment
         </label>
         <span class="emoji__container">
@@ -233,7 +233,7 @@ describe("CommentsComponent", () => {
         <div class="comment__content">
           <div><p>${content}</p></div>
         </div>
-        <div class="comment__footer" data-component="accordion" role="presentation">
+        <div data-comment-footer data-component="accordion" role="presentation">
           <div class="comment__footer-grid">
             <div class="comment__actions">
               <button class="button button__sm button__text-secondary" data-controls="panel-comment${commentId}-reply" role="button" tabindex="0" aria-controls="panel-comment${commentId}-reply" aria-expanded="false" aria-disabled="false">
@@ -323,21 +323,21 @@ describe("CommentsComponent", () => {
               ${secondThread}
             </div>
             <div class="add-comment">
-              <div class="opinion-toggle button-group comment__opinion-container">
-                <span class="show-for-sr py-1.5">Your opinion about this topic</span>
-                <button aria-pressed="false" class="button button__sm button__text-secondary opinion-toggle--ok" data-selected-label="Your opinion about this topic is positive">
+              <div data-opinion-toggle class="button-group comment__opinion-container">
+                <span class="py-1.5">Your opinion about this topic</span>
+                <button aria-pressed="false" class="button button__sm button__text-secondary" data-toggle-ok="true" data-selected-label="Your opinion about this topic is positive">
                   <svg width="1em" height="1em" role="img" aria-hidden="true"><use href="/decidim-packs/media/images/remixicon.symbol-5540ed538fb6bd400d2a.svg#ri-thumb-up-line" tabindex="-1"></use></svg>
                   <svg width="1em" height="1em" role="img" aria-hidden="true"><use href="/decidim-packs/media/images/remixicon.symbol-5540ed538fb6bd400d2a.svg#ri-thumb-up-fill" tabindex="-1"></use></svg>
-                  <span class="show-for-sr">Positive</span>
+                  <span>Positive</span>
                 </button>
-                <button aria-pressed="true" class="button button__sm button__text-secondary opinion-toggle--meh is-active" data-selected-label="Your opinion about this topic is neutral">
-                  <span class="show-for-sr">Neutral
+                <button aria-pressed="true" class="button button__sm button__text-secondary is-active" data-toggle-meh="true" data-selected-label="Your opinion about this topic is neutral">
+                  <span>Neutral
                   </span>
                 </button>
-                <button aria-pressed="false" class="button button__sm button__text-secondary opinion-toggle--ko" data-selected-label="Your opinion about this topic is negative">
+                <button aria-pressed="false" class="button button__sm button__text-secondary"  data-toggle-ko="true" data-selected-label="Your opinion about this topic is negative">
                   <svg width="1em" height="1em" role="img" aria-hidden="true"><use href="/decidim-packs/media/images/remixicon.symbol-5540ed538fb6bd400d2a.svg#ri-thumb-down-line" tabindex="-1"></use></svg>
                   <svg width="1em" height="1em" role="img" aria-hidden="true"><use href="/decidim-packs/media/images/remixicon.symbol-5540ed538fb6bd400d2a.svg#ri-thumb-down-fill" tabindex="-1"></use></svg>
-                  <span class="show-for-sr">Negative</span>
+                  <span>Negative</span>
                 </button>
                 <div role="alert" aria-live="assertive" aria-atomic="true" class="selected-state sr-only"></div>
               </div>
@@ -371,7 +371,7 @@ describe("CommentsComponent", () => {
     addComment = $(".add-comment", subject.$element);
     orderLinks = $(".comment-order-by a.comment-order-by__item", subject.$element);
 
-    allToggles = $(".add-comment .opinion-toggle .button", subject.$element);
+    allToggles = $(".add-comment [data-opinion-toggle] .button", subject.$element);
     allTextareas = $(".add-comment textarea", subject.$element);
     allForms = $(".add-comment form", subject.$element);
   });

data/app/views/decidim/comments/comments/create.js.erb

@@ -8,8 +8,8 @@
   if (inReplyTo) {
     component.addReply(inReplyTo, commentHtml, true);
 
-    var hideButton = $("#comment_" + <%= root_comment.id %>).find(".comment__hide").first();
-    hideButton.find(".show-comment-replies").first().html('<%= t("decidim.components.comment.show_replies", count: Decidim::Comments::SortedComments.for(root_comment.reload).size) %>');
+    var hideButton = $("#comment_" + <%= root_comment.id %>).find("[data-comment-hide]").first();
+    hideButton.find("[data-show-comment-reply]").first().html('<%= t("decidim.components.comment.show_replies", count: Decidim::Comments::SortedComments.for(root_comment.reload).size) %>');
 
   } else {
     component.addThread(commentHtml, true);

data/app/views/decidim/comments/comments/delete.js.erb

@@ -5,11 +5,14 @@ $(() => {
   const $comment = $(`#comment_${commentId}`);
   const $commentReply = $(`#comment${commentId}-reply`);
   const $content = $("> .comment__content", $comment);
-  const sectionsToDelete = ["header", "footer-grid", "reply", "additionalreply"];
+  const sectionsToDelete = ["footer-grid", "reply"];
 
   sectionsToDelete.forEach((section) => {
-    $(`> .comment__${section}`, $comment).remove();
+    $(`#comment_${commentId} > [data-comment-footer] > .comment__${section}`).remove();
   });
+  $(`#comment_${commentId} > .comment__header`).remove();
+  $(`#comment_${commentId} > [data-additional-reply]`).remove();
+
   $commentReply.remove();
   $content.replaceWith(deleteDataHtml);
   Rails.fire(document, "comments:loaded", {

data/app/views/decidim/comments/votes/create.js.erb

@@ -3,7 +3,7 @@
   var upVotes = <%= comment.up_votes.count.to_json %>;
   var downVotes = <%= comment.down_votes.count.to_json %>;
   var $comment = $("#comment_" + commentId);
-  var $votes = $("> .comment__footer > .comment__footer-grid .comment__votes", $comment);
+  var $votes = $("> [data-comment-footer] > .comment__footer-grid .comment__votes", $comment);
   var $upVote = $(".js-comment__votes--up", $votes);
   var $downVote = $(".js-comment__votes--down", $votes);
 

data/config/locales/bg.yml

@@ -39,7 +39,6 @@ bg:
           error: Възникна проблем с гласуването за коментара.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Влезте в профила си</a> или <a href="%{sign_up_url}">се регистрирайте</a>, за да добавите Вашия коментар.
         form:
           body:
             label: Коментар

data/config/locales/ca.yml

@@ -39,7 +39,7 @@ ca:
           error: S'ha produït un error en votar el comentari.
     components:
       add_comment_form:
-        account_message: Per afegir un comentari, <a href="%{sign_in_url}">inicia la teva sessió</a> o <a href="%{sign_up_url}">registra't</a>.
+        account_message: <a href="%{sign_in_url}">Inicia sessió</a> o <a href="%{sign_up_url}">crea un compte</a>per afegir el teu comentari.
         form:
           body:
             label: Comentari

data/config/locales/cs.yml

@@ -43,7 +43,6 @@ cs:
           error: Při hlasování o komentáři došlo k chybě.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Přihlaste se pomocí svého účtu</a> nebo se <a href="%{sign_up_url}">zaregistrujte</a> a přidejte svůj komentář.
         form:
           body:
             label: Komentář
@@ -78,11 +77,6 @@ cs:
         deleted_user: Vymazaný účastník
         edit: Upravit
         edited: Upraveno
-        hide_replies:
-          one: Skrýt odpověď
-          few: Skrýt {count} odpovědi
-          many: Skrýt {count} odpovědí
-          other: Skrýt {count} odpovědí
         moderated_at: Komentář moderován dne %{date}
         reply: Odpověď
         report:

data/config/locales/de.yml

@@ -39,7 +39,6 @@ de:
           error: Beim Abstimmen des Kommentars sind Fehler aufgetreten.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Melden Sie sich mit Ihrem Konto an</a> oder <a href="%{sign_up_url}">registrieren Sie sich</a>, um Ihren Kommentar hinzuzufügen.
         form:
           body:
             label: Kommentar

data/config/locales/en.yml

@@ -39,7 +39,7 @@ en:
           error: There was a problem voting the comment.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Log in with your account</a> or <a href="%{sign_up_url}">sign up</a> to add your comment.
+        account_message: <a href="%{sign_in_url}">Log in</a> or <a href="%{sign_up_url}">create an account</a> to add your comment.
         form:
           body:
             label: Comment

data/config/locales/es-MX.yml

@@ -39,7 +39,7 @@ es-MX:
           error: Ha habido errores al votar el comentario.
     components:
       add_comment_form:
-        account_message: Para añadir un comentario, <a href="%{sign_in_url}">inicia tu sesión </a> o <a href="%{sign_up_url}">regístrate</a>.
+        account_message: <a href="%{sign_in_url}">Inicia sesión</a> o <a href="%{sign_up_url}">crea una cuenta</a> para añadir tu comentario.
         form:
           body:
             label: Comentario

data/config/locales/es-PY.yml

@@ -39,7 +39,7 @@ es-PY:
           error: Ha habido errores al votar el comentario.
     components:
       add_comment_form:
-        account_message: Para añadir un comentario, <a href="%{sign_in_url}">inicia tu sesión </a> o <a href="%{sign_up_url}">regístrate</a>.
+        account_message: <a href="%{sign_in_url}">Inicia sesión</a> o <a href="%{sign_up_url}">crea una cuenta</a> para añadir tu comentario.
         form:
           body:
             label: Comentario

data/config/locales/es.yml

@@ -39,7 +39,7 @@ es:
           error: Se ha producido un error al votar el comentario.
     components:
       add_comment_form:
-        account_message: Para añadir un comentario, <a href="%{sign_in_url}">inicia tu sesión </a> o <a href="%{sign_up_url}">regístrate</a>.
+        account_message: <a href="%{sign_in_url}">Inicia sesión</a> o <a href="%{sign_up_url}">crea una cuenta</a> para añadir tu comentario.
         form:
           body:
             label: Comentario

data/config/locales/eu.yml

@@ -39,7 +39,7 @@ eu:
           error: Arazo bat egon da iruzkina bozkatzean.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Sartu zure kontuarekin</a> edo <a href="%{sign_up_url}">erregistratu</a> zure iruzkina gehitzeko.
+        account_message: Sortu kontu bat <a href="%{sign_in_url}">Log in</a> edo <a href="%{sign_up_url}"> </a> zure iruzkina gehitzeko.
         form:
           body:
             label: Iruzkina

data/config/locales/fi-plain.yml

@@ -39,7 +39,7 @@ fi-pl:
           error: Äänestettäessä kommenttia tapahtui virhe.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Kirjaudu tilillesi</a> tai <a href="%{sign_up_url}">rekisteröidy</a> kommentoidaksesi.
+        account_message: <a href="%{sign_in_url}">Kirjaudu sisään</a> tai <a href="%{sign_up_url}">luo tili</a> kommentoidaksesi.
         form:
           body:
             label: Kommentti

data/config/locales/fi.yml

@@ -26,7 +26,7 @@ fi:
             start_time: Kommentointi sallittu alkaen
       comments:
         create:
-          error: Kommentin luonti epäonnistui.
+          error: Kommentin luotaessa tapahtui virhe.
         delete:
           error: Kommenttia ei voitu poistaa.
         update:
@@ -39,7 +39,7 @@ fi:
           error: Kommentin äänestys epäonnistui.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Kirjaudu tilillesi</a> tai <a href="%{sign_up_url}">rekisteröidy</a> kommentoidaksesi.
+        account_message: <a href="%{sign_in_url}">Kirjaudu sisään</a> tai <a href="%{sign_up_url}">luo tili</a> kommentoidaksesi.
         form:
           body:
             label: Kommentti
@@ -127,7 +127,7 @@ fi:
     events:
       comments:
         comment_by_followed_user:
-          email_intro: "%{author_name} on jättänyt kommentin kohteessa %{resource_title}. Voit lukea sen sivulta:"
+          email_intro: "%{author_name} on jättänyt kommentin kohteessa %{resource_title}. Voit lukea sen täältä:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat %{author_name}. Voit perua seuraamisen kyseisen käyttäjän profiilisivulta.
           email_subject: '%{author_name} on jättänyt uuden kommentin kohteessa %{resource_title}'
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on jättänyt uuden kommentin kohteessa <a href="%{resource_path}">%{resource_title}</a>.
@@ -137,7 +137,7 @@ fi:
           email_subject: '%{author_name} on jättänyt uuden kommentin kohteessa %{resource_title}'
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on jättänyt uuden kommentin kohteessa <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
-          email_intro: "%{resource_title} on kommentoitu. Voit lukea kommentin sivulta:"
+          email_intro: "%{resource_title} on kommentoitu. Voit lukea kommentin tällä sivulla:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat "%{resource_title}" tai sen kirjoittajaa. Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
           email_subject: '%{author_name} on jättänyt uuden kommentin kohteessa %{resource_title}'
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a>on jättänyt uuden kommentin kohteessa <a href="%{resource_path}">%{resource_title}</a>
@@ -152,7 +152,7 @@ fi:
           email_subject: Kommenttisi kohteessa "%{resource_title}" sai äänen.
           notification_title: <a href="%{resource_path}">Kommenttisi</a> kohteessa "%{resource_title}" sai äänen. Sillä on yhteensä %{upvotes} ääntä ja %{downvotes} miinusääntä.
         reply_created:
-          email_intro: "%{author_name} on vastannut kommentiisi kohdassa %{resource_title}. Voit lukea sen sivulta:"
+          email_intro: "%{author_name} on vastannut kommentiisi kohdassa %{resource_title}. Voit lukea sen tällä sivulla:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska kommenttiisi vastattiin.
           email_subject: "%{author_name} on vastannut kommentiisi %{resource_title}"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on vastannut kommentiisi kohdassa <a href="%{resource_path}">%{resource_title}</a>

data/config/locales/fr-CA.yml

@@ -39,7 +39,7 @@ fr-CA:
           error: Une erreur s'est produite lors du vote sur le commentaire.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Connectez-vous avec votre compte</a> ou <a href="%{sign_up_url}"> inscrivez-vous </a> pour ajouter votre commentaire.
+        account_message: <a href="%{sign_in_url}">Connectez-vous</a> ou <a href="%{sign_up_url}">créez un compte</a> pour ajouter votre commentaire.
         form:
           body:
             label: Commentaire

data/config/locales/fr.yml

@@ -39,7 +39,7 @@ fr:
           error: Une erreur s'est produite lors du vote sur le commentaire.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Connectez-vous avec votre compte</a> ou <a href="%{sign_up_url}"> inscrivez-vous </a> pour ajouter votre commentaire.
+        account_message: <a href="%{sign_in_url}">Connectez-vous</a> ou <a href="%{sign_up_url}">créez un compte</a> pour ajouter votre commentaire.
         form:
           body:
             label: Commentaire

data/config/locales/ja.yml

@@ -37,7 +37,7 @@ ja:
           error: コメントに投票中に問題がありました。
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">ログイン</a> または <a href="%{sign_up_url}">サインアップ</a> してコメントできます。
+        account_message: コメントを追加するには<a href="%{sign_in_url}">ログインする</a> か <a href="%{sign_up_url}">アカウントを作成</a>してください
         form:
           body:
             label: コメント

data/config/locales/pl.yml

@@ -43,7 +43,7 @@ pl:
           error: Podczas dodawania komentarza wystąpił błąd.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Zaloguj się na swoje konto</a> lub <a href="%{sign_up_url}">zarejestruj się</a>, aby dodać swój komentarz.
+        account_message: <a href="%{sign_in_url}">Zaloguj się</a> lub <a href="%{sign_up_url}">utwórz konto</a>, aby dodać swój komentarz.
         form:
           body:
             label: Komentarz

data/config/locales/ro-RO.yml

@@ -41,7 +41,6 @@ ro:
           error: A apărut o problemă la votarea comentariului.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Conectați-vă cu contul dumneavoastră</a> sau <a href="%{sign_up_url}">înregistrați-vă</a> pentru a adăuga un comentariu.
         form:
           body:
             label: Comentariu
@@ -67,17 +66,12 @@ ro:
           against: Împotrivă
           in_favor: Pentru
         cancel_reply: Anulează răspunsul
-        comment_label: Comentariu %{comment_id}
         confirm_destroy: Sigur dorești să ştergi acest comentariu?
         delete: Șterge
         deleted_at: Comentariu șters la %{date}
         deleted_user: Participant șters
         edit: Actualizare
         edited: Actualizat
-        hide_replies:
-          one: Ascundeți răspunsul
-          few: Ascundeți %{count} răspunsuri
-          other: Ascundeți %{count} răspunsuri
         moderated_at: Comentariu moderat pe %{date}
         reply: Răspunde
         report:

data/config/locales/sv.yml

@@ -4,7 +4,7 @@ sv:
     models:
       decidim/comments/comment_by_followed_user_event: Kommentar
       decidim/comments/comment_created_event: Kommentar
-      decidim/comments/comment_upvoted_event: Positiva kommentarer
+      decidim/comments/comment_upvoted_event: Kommentar uppröstad
       decidim/comments/reply_created_event: Svar till en kommentar
       decidim/comments/user_group_mentioned_event: Nämn
       decidim/comments/user_mentioned_event: Nämn
@@ -35,7 +35,6 @@ sv:
           error: Det gick inte att rösta om kommentaren.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Logga in med ditt konto</a> eller <a href="%{sign_up_url}">registrera dig</a> för att lämna en kommentar.
         form:
           body:
             label: Kommentera
@@ -44,13 +43,13 @@ sv:
           user_group_id:
             label: Kommentera som
         opinion:
-          label: Din åsikt om ämnet
+          label: Din åsikt om detta ämne
           negative: Negativ
-          negative_selected: Din åsikt om ämnet är negativ
+          negative_selected: Din åsikt om detta ämne är negativ
           neutral: Neutral
-          neutral_selected: Din åsikt om ämnet är neutral
+          neutral_selected: Din åsikt om detta ämne är neutral
           positive: Positiv
-          positive_selected: Din åsikt om ämnet är positiv
+          positive_selected: Din åsikt om detta ämne är positiv
         remaining_characters: "%{count} tecken kvar"
         remaining_characters_1: "%{count} tecken kvar"
         title: Lägg till din kommentar
@@ -73,8 +72,7 @@ sv:
           description: Är detta innehåll olämpligt?
           details: Ytterligare kommentarer
           reasons:
-            does_not_belong: Innehåller olaglig information, hot om självmord, personuppgifter eller något annat som inte hör hemma på %{organization_name}.
-            offensive: Innehåller rasism, sexism, personangrepp, mordhot, uppmaning att begå självmord eller hets mot folkgrupp.
+            offensive: Innehåller rasism, sexism, skällsord, personliga attacker, dödshot, uppmaningar att begå självmord eller någon form av hatpropaganda.
             spam: Innehåller clickbait, reklam, bedrägerier eller skriptrobotar.
           title: Rapportera olämpligt innehåll
         show_replies:
@@ -119,7 +117,7 @@ sv:
           email_subject: Det finns en ny kommentar av %{author_name} i %{resource_title}
           notification_title: Det finns en ny kommentar av <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>.
         comment_by_followed_user_group:
-          email_intro: 'Gruppen %{author_name} har lämnat en kommentar i %{resource_title}. Du kan läsa den här:'
+          email_intro: 'Gruppen %{author_name} har lämnat en kommentar i %{resource_title}. Du kan läsa den på denna sida:'
           email_outro: Du har fått det här meddelandet eftersom du följer %{author_name}. Du kan sluta följa den här gruppen från dess profilsida.
           email_subject: Det finns en ny kommentar av %{author_name} i %{resource_title}
           notification_title: Det finns en ny kommentar av <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>.

data/config/locales/tr-TR.yml

@@ -25,7 +25,6 @@ tr:
           error: Yorum oylanırken bir sorun oluştu.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Hesabınızla giriş yapın</a> veya yorumunuzu eklemek için <a href="%{sign_up_url}">kaydolun</a>.
         form:
           body:
             label: Yorum

data/db/seeds.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Since comments cannot exist without a real model we are not including
 # specific seeds for this engine.
 # Other engines are free to include comments on their seeds like this:

data/decidim-comments.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-comments"
   s.summary = "Decidim comments module"

data/lib/decidim/api/commentable_mutation_type.rb

@@ -17,9 +17,10 @@ module Decidim
         params = { "comment" => { "body" => body, "alignment" => alignment, "user_group_id" => user_group_id, "commentable" => object } }
         form = Decidim::Comments::CommentForm.from_params(params).with_context(
           current_organization: context[:current_organization],
+          current_user: context[:current_user],
           current_component: object.component
         )
-        Decidim::Comments::CreateComment.call(form, context[:current_user]) do
+        Decidim::Comments::CreateComment.call(form) do
           on(:ok) do |comment|
             return comment
           end

data/lib/decidim/comments/commentable.rb

@@ -28,7 +28,7 @@ module Decidim
           false
         end
 
-        # Public: Whether the object's comments can have have votes or not. It enables the
+        # Public: Whether the object's comments can have votes or not. It enables the
         # upvote and downvote buttons for comments.
         def comments_have_votes?
           false
@@ -58,7 +58,7 @@ module Decidim
         end
 
         # Public: Updates the comments counter cache. We have to do it these
-        # way in order to properly calculate the coutner with hidden
+        # way in order to properly calculate the counter with hidden
         # comments.
         #
         # rubocop:disable Rails/SkipsModelValidations

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

@@ -6,6 +6,7 @@ RSpec.shared_context "when creating a comment" do
   let(:component) { create(:component, participatory_space: participatory_process) }
   let(:user) { create(:user, organization:) }
   let(:author) { create(:user, organization:) }
+  let(:current_user) { author }
   let(:dummy_resource) { create :dummy_resource, component: }
   let(:commentable) { dummy_resource }
   let(:body) { Faker::Lorem.paragraph }
@@ -25,8 +26,8 @@ RSpec.shared_context "when creating a comment" do
     Decidim::Comments::CommentForm.from_params(
       form_params
     ).with_context(
-      current_organization: organization
+      current_organization: organization, current_user:
     )
   end
-  let(:command) { described_class.new(form, author) }
+  let(:command) { described_class.new(form) }
 end

data/lib/decidim/comments/version.rb

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

data/lib/tasks/upgrade/decidim_comments.rake

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+namespace :decidim_comments do
+  namespace :upgrade do
+    desc "Adds participatory_process_id to comments if they are associated with a participatory process"
+    task participatory_process_in_comments: :environment do
+      puts "Updating comments..."
+      ok = errors = 0
+
+      log = ActiveSupport::Logger.new(Rails.root.join("log/update_participatory_process_in_comments.log"))
+      Decidim::Comments::Comment.where(participatory_space: nil).find_each do |c|
+        c.participatory_space = if c.root_commentable.is_a?(Decidim::Participable)
+                                  c.root_commentable
+                                else
+                                  c.commentable.try(:participatory_space)
+                                end
+        c.save(validate: false)
+        ok += 1
+      rescue StandardError => e
+        errors += 1
+        log.info "Error updating comment ##{c.id}: #{e.message}"
+      end
+
+      puts "#{ok} comments updated."
+      puts "#{errors} errors found. Check the file 'log/update_participatory_process_in_comments.log' for more information." if errors.positive?
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.28.3
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-07-16 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.28.3
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.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.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -296,7 +296,7 @@ files:
 - lib/decidim/comments/test/shared_examples/has_comments_availability_attributes.rb
 - lib/decidim/comments/test/shared_examples/translatable_comment.rb
 - lib/decidim/comments/version.rb
-- lib/tasks/decidim_comments.rake
+- lib/tasks/upgrade/decidim_comments.rake
 homepage: https://decidim.org
 licenses:
 - AGPL-3.0
@@ -314,14 +314,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim comments module

data/lib/tasks/decidim_comments.rake

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-namespace :decidim_comments do
-  desc "Adds participatory_process_id to comments if they are associated with a participatory process"
-  task update_participatory_process_in_comments: :environment do
-    puts "Updating comments..."
-    ok = errors = 0
-
-    log = ActiveSupport::Logger.new(Rails.root.join("log/update_participatory_process_in_comments.log"))
-    Decidim::Comments::Comment.where(participatory_space: nil).find_each do |c|
-      c.participatory_space = if c.root_commentable.is_a?(Decidim::Participable)
-                                c.root_commentable
-                              else
-                                c.commentable.try(:participatory_space)
-                              end
-      c.save(validate: false)
-      ok += 1
-    rescue StandardError => e
-      errors += 1
-      log.info "Error updating comment ##{c.id}: #{e.message}"
-    end
-
-    puts "#{ok} comments updated."
-    puts "#{errors} errors found. Check the file 'log/update_participatory_process_in_comments.log' for more information." if errors.positive?
-  end
-end