decidim-comments 0.26.0 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9903736806a3d7efe85f3d373935800106918e251e43cf8ec24cc7e9ec8f8797
-  data.tar.gz: 3a2649ef1b67bdc602b203de100b7ef51b8ff9751cd399244170690082880e2f
+  metadata.gz: 15e0e5dd8fbb2fc7171061fa36077e83f956f3ada42b41dfa32cd8e8f60cdd0a
+  data.tar.gz: 6cb4e67d56972f657983cc174806b8766d0916fb55b7ca783ee2e8a684859283
 SHA512:
-  metadata.gz: 50a349c6acd1b0e54e2d94e7fa98304e90ac052485058e78e9b1e67b647a9cacecb679f2843bfaf31db1e9bf6186bf07b2fc359bf7058eae035791196012c924
-  data.tar.gz: 3d2f9498c1ebecafd97f386fc2fdbfc2d8033959880148be737e2187a0cb53640d2345234e21c9568c5685de6bbcc11b4f19f66fb71599ef1932ffd33fc001da
+  metadata.gz: a3a7482658e91430342214a3d668979c0450b1203c28725ab083c46773b6c39474f148a4489238c90187cda2407a81edbc1c7a1b9bd26944081ce36261f86e7e
+  data.tar.gz: ee42d7e4922a5cbc826a1a98f73b1d1056d4ce6879a398da32ad6962d9987323f7b37b2e1fc57111251baf2185301cbdc0e370621107778afd2fb47263dc285b

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

@@ -34,7 +34,7 @@ module Decidim
       end
 
       def perform_caching?
-        super && has_replies_in_children? == false
+        super && has_replies_in_children? == false && current_user.blank?
       end
 
       private
@@ -134,7 +134,7 @@ module Decidim
       end
 
       def commentable_path(params = {})
-        if root_commentable.is_a?(Decidim::Budgets::Project)
+        if defined?(Decidim::Budgets) && root_commentable.is_a?(Decidim::Budgets::Project)
           resource_locator([root_commentable.budget, root_commentable]).path(params)
         else
           resource_locator(root_commentable).path(params)
@@ -186,11 +186,11 @@ module Decidim
       end
 
       def has_replies?
-        model.comment_threads.includes(:moderation).collect { |c| !c.deleted? && !c.hidden? }.any?
+        model.comment_threads.not_hidden.not_deleted.exists?
       end
 
       def has_replies_in_children?
-        has_replies? || model.comment_threads.includes(:moderation).collect { |t| t.comment_threads.includes(:moderation).collect { |c| !c.deleted? && !c.hidden? }.any? }.any?
+        model.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.exists?
       end
 
       # action_authorization_button expects current_component to be available

data/app/cells/decidim/comments/comments/add_comment.erb

@@ -1,5 +1,5 @@
 <div class="add-comment">
-  <h5 class="section-heading"><%= t("decidim.components.add_comment_form.title") %></h5>
+  <h4 class="section-heading"><%= t("decidim.components.add_comment_form.title") %></h4>
 
   <% if user_signed_in? %>
     <% if alignment_enabled? %>

data/app/cells/decidim/comments/comments/comments_loading.erb

@@ -0,0 +1,3 @@
+<div class="callout primary loading-comments">
+  <p><%= t("decidim.components.comments.loading") %></p>
+</div>

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

@@ -2,7 +2,7 @@
   <div class="columns large-9 comments-container" id="comments">
     <div class="comments">
       <div class="row collapse order-by">
-        <h4 class="order-by__text section-heading">
+        <h3 class="order-by__text section-heading">
           <% if single_comment? %>
             <%= t("decidim.components.comments.comment_details_title") %>
           <% else %>
@@ -10,12 +10,13 @@
               <%= t("decidim.components.comments.title", count: comments_count) %>
             </span>
           <% end %>
-        </h4>
+        </h3>
         <%= render :order_control %>
       </div>
       <%= single_comment_warning %>
       <%= blocked_comments_warning %>
       <div class="comment-threads">
+        <%= comments_loading %>
         <% comments.each do |comment| %>
           <%= cell("decidim/comments/comment_thread", comment, order: order) %>
         <% end %>

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

@@ -22,6 +22,12 @@ module Decidim
         render :single_comment_warning
       end
 
+      def comments_loading
+        return if single_comment?
+
+        render :comments_loading
+      end
+
       def blocked_comments_warning
         return unless comments_blocked?
         return unless user_comments_blocked?
@@ -43,11 +49,7 @@ module Decidim
       end
 
       def comments
-        if single_comment?
-          [single_comment]
-        else
-          SortedComments.for(model, order_by: order)
-        end
+        single_comment? ? [single_comment] : []
       end
 
       def comments_count
@@ -97,17 +99,10 @@ module Decidim
           commentableGid: model.to_signed_global_id.to_s,
           commentsUrl: decidim_comments.comments_path,
           rootDepth: root_depth,
-          lastCommentId: last_comment_id,
           order: order
         }
       end
 
-      def last_comment_id
-        Decidim::Comments::Comment.where(
-          root_commentable: model
-        ).order(:id).pluck(:id).last
-      end
-
       def single_comment?
         single_comment.present?
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A command with all the business logic to create a new comment
-    class CreateComment < Rectify::Command
+    class CreateComment < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A command with all the business logic to delete a comment
-    class DeleteComment < Rectify::Command
+    class DeleteComment < Decidim::Command
       # Public: Initializes the command.
       #
       # comment - The comment to delete.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A command with all the business logic to update an existing comment
-    class UpdateComment < Rectify::Command
+    class UpdateComment < Decidim::Command
       # Public: Initializes the command.
       #
       # comment - Decidim::Comments::Comment

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

@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A command with all the business logic to upvote a comment
-    class VoteComment < Rectify::Command
+    class VoteComment < Decidim::Command
       # Public: Initializes the command.
       #
       # comment - A comment

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

@@ -6,7 +6,9 @@ module Decidim
     #
     class CommentsController < Decidim::Comments::ApplicationController
       include Decidim::ResourceHelper
+      include Decidim::SkipTimeoutable
 
+      prepend_before_action :skip_timeout, only: :index
       before_action :authenticate_user!, only: [:create]
       before_action :set_commentable, except: [:destroy, :update]
       before_action :ensure_commentable!, except: [:destroy, :update]
@@ -21,6 +23,12 @@ module Decidim
           order_by: order,
           after: params.fetch(:after, 0).to_i
         )
+        @comments = @comments.reject do |comment|
+          next if comment.depth < 1
+          next if !comment.deleted? && !comment.hidden?
+
+          comment.commentable.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.blank?
+        end
         @comments_count = commentable.comments_count
 
         respond_to do |format|
@@ -134,14 +142,12 @@ module Decidim
 
       def handle_success(comment)
         @comment = comment
-        @comments_count = begin
-          case commentable
-          when Decidim::Comments::Comment
-            commentable.root_commentable.comments_count
-          else
-            commentable.comments_count
-          end
-        end
+        @comments_count = case commentable
+                          when Decidim::Comments::Comment
+                            commentable.root_commentable.comments_count
+                          else
+                            commentable.comments_count
+                          end
       end
 
       def commentable_gid
@@ -170,7 +176,7 @@ module Decidim
       end
 
       def commentable_path
-        return commentable.polymorphic_resource_path({}) if commentable&.respond_to?(:polymorphic_resource_path)
+        return commentable.polymorphic_resource_path({}) if commentable.respond_to?(:polymorphic_resource_path)
 
         resource_locator(commentable).path
       end

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

@@ -14,7 +14,7 @@ module Decidim
       end
 
       def resource_link_path
-        return root_commentable.polymorphic_resource_path(url_params) if root_commentable&.respond_to?(:polymorphic_resource_path)
+        return root_commentable.polymorphic_resource_path(url_params) if root_commentable.respond_to?(:polymorphic_resource_path)
 
         resource_locator(root_commentable).path(url_params)
       end

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

@@ -10,12 +10,13 @@ module Decidim
       include Decidim::Authorable
       include Decidim::Comments::Commentable
       include Decidim::FriendlyDates
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Searchable
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
+      include Decidim::ActsAsTree
 
       # Limit the max depth of a comment tree. If C is a comment and R is a reply:
       # C          (depth 0)
@@ -27,6 +28,8 @@ module Decidim
 
       translatable_fields :body
 
+      parent_item_foreign_key :decidim_commentable_id
+
       belongs_to :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", polymorphic: true
       belongs_to :root_commentable, foreign_key: "decidim_root_commentable_id", foreign_type: "decidim_root_commentable_type", polymorphic: true, touch: true
       belongs_to :participatory_space, foreign_key: "decidim_participatory_space_id", foreign_type: "decidim_participatory_space_type", polymorphic: true, optional: true
@@ -130,7 +133,7 @@ module Decidim
       def reported_content_url
         url_params = { anchor: "comment_#{id}" }
 
-        if root_commentable&.respond_to?(:polymorphic_resource_url)
+        if root_commentable.respond_to?(:polymorphic_resource_url)
           root_commentable.polymorphic_resource_url(url_params)
         else
           ResourceLocatorPresenter.new(root_commentable).url(url_params)
@@ -155,7 +158,7 @@ module Decidim
       # Expects all +resources+ to be of the same "commentable_type".
       # If the result is not `Decidim::Comments::Commentable` returns `nil`.
       def self.user_commentators_ids_in(resources)
-        if resources.first&.kind_of?(Decidim::Comments::Commentable)
+        if resources.first.is_a?(Decidim::Comments::Commentable)
           commentable_type = resources.first.class.name
           Decidim::Comments::Comment.select("DISTINCT decidim_author_id").not_hidden.not_deleted
                                     .where(decidim_commentable_id: resources.pluck(:id))
@@ -167,7 +170,7 @@ module Decidim
       end
 
       def can_participate?(user)
-        return true unless root_commentable&.respond_to?(:can_participate?)
+        return true unless root_commentable.respond_to?(:can_participate?)
 
         root_commentable.can_participate?(user)
       end

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

@@ -5,7 +5,7 @@ module Decidim
     # A comment can include user votes. A user should be able to upVote, votes with
     # weight 1 and downVote, votes with weight -1.
     class CommentVote < ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :comment, foreign_key: "decidim_comment_id", class_name: "Comment"
       belongs_to :author, foreign_key: "decidim_author_id", foreign_type: "decidim_author_type", polymorphic: true

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

@@ -1,4 +1,6 @@
 /* eslint id-length: ["error", { "exceptions": ["$"] }] */
+/* eslint max-lines: ["error", {"max": 350, "skipBlankLines": true}] */
+
 
 /**
  * A plain Javascript component that handles the comments.
@@ -10,6 +12,8 @@
 // This is necessary for testing purposes
 const $ = window.$;
 
+import Rails from "@rails/ujs";
+
 import { createCharacterCounter } from "src/decidim/input_character_counter"
 import ExternalLink from "src/decidim/external_link"
 import updateExternalDomainLinks from "src/decidim/external_domain_warning"
@@ -23,6 +27,8 @@ export default class CommentsComponent {
     this.order = config.order;
     this.lastCommentId = config.lastCommentId;
     this.pollingInterval = config.pollingInterval || 15000;
+    this.singleComment = config.singleComment;
+    this.toggleTranslations = config.toggleTranslations;
     this.id = this.$element.attr("id") || this._getUID();
     this.mounted = false;
   }
@@ -36,6 +42,9 @@ export default class CommentsComponent {
     if (this.$element.length > 0 && !this.mounted) {
       this.mounted = true;
       this._initializeComments(this.$element);
+      if (!this.singleComment) {
+        this._fetchComments();
+      }
 
       $(".order-by__dropdown .is-submenu-item a", this.$element).on("click.decidim-comments", () => this._onInitOrder());
     }
@@ -133,8 +142,6 @@ export default class CommentsComponent {
         $text.get(0).addEventListener("emoji.added", this._onTextInput);
       }
     });
-
-    this._pollComments();
   }
 
   /**
@@ -200,20 +207,32 @@ export default class CommentsComponent {
     this._stopPolling();
 
     this.pollTimeout = setTimeout(() => {
-      $.ajax({
-        url: this.commentsUrl,
-        method: "GET",
-        contentType: "application/javascript",
-        data: {
-          "commentable_gid": this.commentableGid,
-          "root_depth": this.rootDepth,
-          order: this.order,
-          after: this.lastCommentId
-        }
-      }).done(() => this._pollComments());
+      this._fetchComments();
     }, this.pollingInterval);
   }
 
+  /**
+   * Sends an ajax request based on current
+   * params to get comments for the component
+   * @private
+   * @returns {Void} - Returns nothing
+   */
+  _fetchComments() {
+    Rails.ajax({
+      url: this.commentsUrl,
+      type: "GET",
+      data: new URLSearchParams({
+        "commentable_gid": this.commentableGid,
+        "root_depth": this.rootDepth,
+        "order": this.order,
+        "after": this.lastCommentId,
+        ...(this.toggleTranslations && { "toggle_translations": this.toggleTranslations }),
+        ...(this.lastCommentId && { "after": this.lastCommentId })
+      }),
+      success: this._pollComments()
+    })
+  }
+
   /**
    * Stops polling for new comments.
    * @private

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

@@ -13,6 +13,10 @@ window.$.ajax = jest.fn().mockImplementation((...args) => $.ajax(...args));
 import Quill from "quill"
 window.Quill = Quill
 
+// Rails.ajax is used by the fetching/polling of the comments
+import Rails from "@rails/ujs";
+jest.mock("@rails/ujs");
+
 // Fake timers for testing polling
 jest.useFakeTimers();
 
@@ -383,16 +387,16 @@ describe("CommentsComponent", () => {
 
     jest.advanceTimersByTime(1000);
 
-    expect(window.$.ajax).toHaveBeenCalledWith({
+    expect(Rails.ajax).toHaveBeenCalledWith({
       url: "/comments",
-      method: "GET",
-      contentType: "application/javascript",
-      data: {
+      type: "GET",
+      data: new URLSearchParams({
         "commentable_gid": "commentable-gid",
         "root_depth": 0,
         order: "older",
         after: 456
-      }
+      }),
+      success: window.undefined
     });
   });
 

data/app/permissions/decidim/comments/permissions.rb

@@ -51,13 +51,11 @@ module Decidim
       end
 
       def commentable
-        @commentable ||= begin
-          if comment
-            comment.root_commentable
-          else
-            context.fetch(:commentable, nil)
-          end
-        end
+        @commentable ||= if comment
+                           comment.root_commentable
+                         else
+                           context.fetch(:commentable, nil)
+                         end
       end
 
       def comment

data/app/queries/decidim/comments/sorted_comments.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Comments
     # A class used to find comments for a commentable resource
-    class SortedComments < Rectify::Query
+    class SortedComments < Decidim::Query
       attr_reader :commentable
 
       # Syntactic sugar to initialize the class and return the queried objects.
@@ -34,8 +34,6 @@ module Decidim
                 .includes(:author, :user_group, :up_votes, :down_votes)
 
         case @options[:order_by]
-        when "older"
-          order_by_older(scope)
         when "recent"
           order_by_recent(scope)
         when "best_rated"

data/app/services/decidim/comments/new_comment_notification_creator.rb

@@ -117,7 +117,7 @@ module Decidim
           }
         }.deep_merge(users)
 
-        Decidim::EventsManager.publish(data)
+        Decidim::EventsManager.publish(**data)
       end
     end
   end

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

@@ -4,6 +4,7 @@
   var $comments = $("#" + rootCommentableId);
   var component = $comments.data("comments");
 
+  $(".loading-comments").addClass("hide");
 <% @comments.each do |comment| %>
   var commentId = <%= comment.id.to_json %>;
   var commentHtml = '<%== j(render comment).strip %>';

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

@@ -6,6 +6,7 @@
   component.unmountComponent();
 
   var commentsHtml = '<%== j(render partial: "comments").strip %>';
+  $(".loading-comments").addClass("hide");
   $comments.replaceWith(commentsHtml);
 
   $comments = $("#" + rootCommentableId);

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     models:
@@ -24,6 +25,7 @@ ar:
         other: الأصوات
   decidim:
     comments:
+      comments_title: التعليقات
       last_activity:
         new_comment_at_html: "<span>تعليق جديد على %{link}</span>"
       votes:
@@ -49,7 +51,9 @@ ar:
         alignment:
           against: ضد
           in_favor: لصالح
+        delete: حذف
         deleted_user: مشارك محذوف
+        edit: تعديل
         hide_replies: إخفاء الردود
         reply: الرد
         report:
@@ -78,6 +82,8 @@ ar:
         comment_details_title: تفاصيل التعليق
         loading: جارٍ تحميل التعليقات ...
         single_comment_warning_title: إنك ترى تعليقا واحدا
+      edit_comment_modal_form:
+        close: أغلق
     events:
       comments:
         comment_by_followed_user:

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     models:

data/config/locales/ca.yml

@@ -1,8 +1,10 @@
+---
 ca:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Comentari
       decidim/comments/comment_created_event: Comentari
+      decidim/comments/comment_upvoted_event: Comentari valorat positivament
       decidim/comments/reply_created_event: Resposta al comentari
       decidim/comments/user_group_mentioned_event: Mencionar
       decidim/comments/user_mentioned_event: Mencionar

data/config/locales/cs.yml

@@ -1,8 +1,10 @@
+---
 cs:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Komentář
       decidim/comments/comment_created_event: Komentář
+      decidim/comments/comment_upvoted_event: Komentář podpořen výše
       decidim/comments/reply_created_event: Odpověď na komentář
       decidim/comments/user_group_mentioned_event: Zmínka
       decidim/comments/user_mentioned_event: Zmínka
@@ -74,6 +76,7 @@ cs:
         edit: Upravit
         edited: Upraveno
         hide_replies: Skrýt odpovědi
+        moderated_at: Komentář moderován dne %{date}
         reply: Odpověď
         report:
           action: Zpráva

data/config/locales/da.yml

@@ -1 +1,2 @@
+---
 da:

data/config/locales/de.yml

@@ -1,8 +1,10 @@
+---
 de:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Kommentar
       decidim/comments/comment_created_event: Kommentar
+      decidim/comments/comment_upvoted_event: Kommentar positiv bewertet
       decidim/comments/reply_created_event: Kommentarantwort
       decidim/comments/user_group_mentioned_event: Erwähnen
       decidim/comments/user_mentioned_event: Erwähnen

data/config/locales/el.yml

@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     models:

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
     models:
       decidim/comments/comment_by_followed_user_event: Comment
       decidim/comments/comment_created_event: Comment
+      decidim/comments/comment_upvoted_event: Comment upvoted
       decidim/comments/reply_created_event: Comment reply
       decidim/comments/user_group_mentioned_event: Mention
       decidim/comments/user_mentioned_event: Mention

data/config/locales/eo.yml

@@ -1 +1,2 @@
+---
 eo:

data/config/locales/es-MX.yml

@@ -1,8 +1,10 @@
+---
 es-MX:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Comentario
       decidim/comments/comment_created_event: Comentario
+      decidim/comments/comment_upvoted_event: Comentario valorado positivamente
       decidim/comments/reply_created_event: Respuesta al comentario
       decidim/comments/user_group_mentioned_event: Mencionar
       decidim/comments/user_mentioned_event: Mencionar

data/config/locales/es-PY.yml

@@ -1,8 +1,10 @@
+---
 es-PY:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Comentario
       decidim/comments/comment_created_event: Comentario
+      decidim/comments/comment_upvoted_event: Comentario valorado positivamente
       decidim/comments/reply_created_event: Respuesta al comentario
       decidim/comments/user_group_mentioned_event: Mencionar
       decidim/comments/user_mentioned_event: Mencionar

data/config/locales/es.yml

@@ -1,8 +1,10 @@
+---
 es:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Comentario
       decidim/comments/comment_created_event: Comentario
+      decidim/comments/comment_upvoted_event: Comentario valorado positivamente
       decidim/comments/reply_created_event: Respuesta al comentario
       decidim/comments/user_group_mentioned_event: Mencionar
       decidim/comments/user_mentioned_event: Mencionar

data/config/locales/et.yml

@@ -1 +1,2 @@
+---
 et:

data/config/locales/eu.yml

@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     models:

data/config/locales/fi-plain.yml

@@ -1,8 +1,10 @@
+---
 fi-pl:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Kommentti
       decidim/comments/comment_created_event: Kommentti
+      decidim/comments/comment_upvoted_event: Kommenttia äänestettiin
       decidim/comments/reply_created_event: Vastaus kommentiin
       decidim/comments/user_group_mentioned_event: Maininta
       decidim/comments/user_mentioned_event: Maininta
@@ -70,6 +72,7 @@ fi-pl:
         edit: Muokkaa
         edited: Muokattu
         hide_replies: Piilota vastaukset
+        moderated_at: Kommentti moderoitu %{date}
         reply: Vastaa
         report:
           action: Tee ilmoitus

data/config/locales/fi.yml

@@ -1,8 +1,10 @@
+---
 fi:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Kommentti
       decidim/comments/comment_created_event: Kommentti
+      decidim/comments/comment_upvoted_event: Kommenttia äänestettiin
       decidim/comments/reply_created_event: Vastaus kommentiin
       decidim/comments/user_group_mentioned_event: Maininta
       decidim/comments/user_mentioned_event: Maininta
@@ -70,6 +72,7 @@ fi:
         edit: Muokkaa
         edited: Muokattu
         hide_replies: Piilota vastaukset
+        moderated_at: Kommentti moderoitu %{date}
         reply: Vastaa
         report:
           action: Tee ilmoitus

data/config/locales/fr-CA.yml

@@ -1,8 +1,10 @@
+---
 fr-CA:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Commentaire
       decidim/comments/comment_created_event: Commentaire
+      decidim/comments/comment_upvoted_event: Vote favorable
       decidim/comments/reply_created_event: Réponse à un commentaire
       decidim/comments/user_group_mentioned_event: Mention
       decidim/comments/user_mentioned_event: Mention

data/config/locales/fr.yml

@@ -1,8 +1,10 @@
+---
 fr:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Commentaire
       decidim/comments/comment_created_event: Commentaire
+      decidim/comments/comment_upvoted_event: Vote favorable
       decidim/comments/reply_created_event: Réponse à un commentaire
       decidim/comments/user_group_mentioned_event: Mention
       decidim/comments/user_mentioned_event: Mention
@@ -121,32 +123,32 @@ fr:
       comments:
         comment_by_followed_user:
           email_intro: "%{author_name} a laissé un commentaire dans %{resource_title}. Vous pouvez le lire sur la page suivante :"
-          email_outro: Vous avez reçu cette notification, car vous suivez %{author_name}. Vous pouvez vous désabonner de cet utilisateur depuis sa page de profil.
+          email_outro: Vous avez reçu cette notification, car vous suivez %{author_name}. Vous pouvez vous désabonner de cet utilisateur depuis sa page de profil, ou bien vous rendre dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: Un nouveau commentaire vient d'être déposé par %{author_name} dans %{resource_title}
           notification_title: Un nouveau commentaire a été publié par <a href="%{author_path}">%{author_name} %{author_nickname}</a> dans <a href="%{resource_path}">%{resource_title}</a>.
         comment_by_followed_user_group:
           email_intro: '%{author_name} a laissé un commentaire dans %{resource_title}. Vous pouvez le lire sur la page suivante :'
-          email_outro: Vous avez reçu cette notification, car vous suivez %{author_name}. Vous pouvez vous désabonner de cet utilisateur depuis sa page de profil.
+          email_outro: Vous avez reçu cette notification, car vous suivez %{author_name}. Vous pouvez vous désabonner de ce groupe utilisateur depuis sa page de profil, ou bien vous rendre dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: Un nouveau commentaire vient d'être déposé par %{author_name} dans %{resource_title}
           notification_title: Un nouveau commentaire a été publié par <a href="%{author_path}">%{author_name} %{author_nickname}</a> dans <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} a été commenté. Vous pouvez lire le commentaire sur cette page :"
-          email_outro: Vous venez de recevoir cette notification parce que vous suivez "%{resource_title}" ou son auteur. Vous pouvez vous désabonner à partir du lien précédant.
+          email_outro: Vous venez de recevoir cette notification parce que vous suivez "%{resource_title}" ou son auteur. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: Un nouveau commentaire vient d'être publié par %{author_name} dans %{resource_title}
           notification_title: Un nouveau commentaire de <a href="%{author_path}">%{author_name} %{author_nickname}</a> vient d'être publié dans <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: Votre commentaire sur "%{resource_title}" a reçu un vote défavorable. Il a maintenant un total de %{upvotes} votes positifs et %{downvotes} votes négatifs.
-          email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de ce commentaire.
+          email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de ce commentaire. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: Votre commentaire sur "%{resource_title}" a reçu un vote défavorable.
           notification_title: Votre <a href="%{resource_path}">commentaire</a> sur "%{resource_title}" a reçu un vote défavorable. Il a maintenant un total de %{upvotes} votes positifs et de %{downvotes} votes négatifs.
         comment_upvoted:
           email_intro: Votre commentaire dans "%{resource_title}" a reçu un vote favorable. Il a maintenant un total de %{upvotes} votes positifs et %{downvotes} votes négatifs.
-          email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de ce commentaire.
+          email_outro: Vous avez reçu cette notification parce que vous êtes l'auteur de ce commentaire. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: Votre commentaire sur "%{resource_title}" a reçu un vote favorable.
           notification_title: Votre <a href="%{resource_path}">commentaire</a> sur "%{resource_title}" a reçu un vote favorable. Il a maintenant un total de %{upvotes} votes positifs et de %{downvotes} votes négatifs.
         reply_created:
           email_intro: "%{author_name} a répondu à votre commentaire dans %{resource_title}. Vous pouvez le lire depuis la page suivante :"
-          email_outro: Vous venez de recevoir une notification à votre commentaire.
+          email_outro: Vous avez reçu cette notification parce que votre commentaire a reçu une réponse. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: "%{author_name} a répondu à votre commentaire dans %{resource_title}"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> a réagi à votre commentaire sur <a href="%{resource_path}">%{resource_title}</a>
         user_group_mentioned:
@@ -156,7 +158,7 @@ fr:
           notification_title: Vous avez été mentionné dans <a href="%{resource_path}">%{resource_title}</a> par <a href="%{author_path}">%{author_name} %{author_nickname}</a> en tant que membre de <a href="%{group_path}">%{group_name} %{group_nickname}</a>
         user_mentioned:
           email_intro: Vous avez été mentionné
-          email_outro: Vous avez reçu cette notification parce que vous avez été mentionné dans %{resource_title}.
+          email_outro: Vous avez reçu cette notification parce que vous avez été mentionné dans %{resource_title}. Si vous souhaitez vous désabonner des notifications, connectez-vous à la plateforme, puis rendez-vous dans l'onglet “Mon compte” > “Paramètres des notifications”.
           email_subject: Vous avez été mentionné dans %{resource_title}
           notification_title: Vous avez été mentionné dans <a href="%{resource_path}">%{resource_title}</a> par <a href="%{author_path}">%{author_name} %{author_nickname}</a>
     metrics:

data/config/locales/ga-IE.yml

@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     models:

data/config/locales/gl.yml

@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     models:
@@ -70,6 +71,7 @@ gl:
         edit: Editar
         edited: Editado
         hide_replies: Ocultar respostas
+        moderated_at: Comentario moderado o %{date}
         reply: Responder
         report:
           action: Informe

data/config/locales/hr.yml

@@ -1 +1,2 @@
+---
 hr:

data/config/locales/hu.yml

@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     models:

data/config/locales/id-ID.yml

@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     models:

data/config/locales/is-IS.yml

@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   decidim:
     components:
       add_comment_form:

data/config/locales/it.yml

@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     models:

data/config/locales/ja.yml

@@ -1,8 +1,10 @@
+---
 ja:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: コメント
       decidim/comments/comment_created_event: コメント
+      decidim/comments/comment_upvoted_event: 賛成票のあったコメント
       decidim/comments/reply_created_event: コメント返信
       decidim/comments/user_group_mentioned_event: メンション
       decidim/comments/user_mentioned_event: メンション

data/config/locales/ko.yml

@@ -1 +1,2 @@
+---
 ko:

data/config/locales/lb.yml

@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     models:

data/config/locales/lt.yml

@@ -1 +1,2 @@
+---
 lt:

data/config/locales/lv.yml

@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     models:

data/config/locales/mt.yml

@@ -1 +1,2 @@
+---
 mt:

data/config/locales/nl.yml

@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     models:

data/config/locales/no.yml

@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     models:

data/config/locales/om-ET.yml

@@ -1 +1,2 @@
+---
 om:

data/config/locales/pl.yml

@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     models:
@@ -43,7 +44,7 @@ pl:
             label: Komentarz
             placeholder: Co o tym myślisz?
           form_error: 'Tekst jest wymagany. Maksymalna liczba znaków to: %{length}.'
-          submit: Wyślij
+          submit: Skomentuj
           user_group_id:
             label: Komentuj jako
         opinion:
@@ -111,7 +112,7 @@ pl:
           body:
             label: Komentarz
             placeholder: Co o tym myślisz?
-          submit: Wyślij
+          submit: Skomentuj
         title: Edytuj swój komentarz
       up_vote_button:
         text: Zgadzam się z tym komentarzem

data/config/locales/pt-BR.yml

@@ -1,4 +1,5 @@
-pt-BR:
+---
+pt:
   activemodel:
     models:
       decidim/comments/comment_by_followed_user_event: Comente

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     models:

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     models:

data/config/locales/ru.yml

@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     models:

data/config/locales/si-LK.yml

@@ -1,3 +1,4 @@
+---
 si:
   activemodel:
     models:

data/config/locales/sk.yml

@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     models:

data/config/locales/sl.yml

@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     models:

data/config/locales/so-SO.yml

@@ -1 +1,2 @@
+---
 so:

data/config/locales/sr-CS.yml

@@ -1,3 +1,4 @@
+---
 sr:
   decidim:
     components:

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     models:

data/config/locales/sw-KE.yml

@@ -1 +1,2 @@
+---
 sw:

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     models:

data/config/locales/uk.yml

@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     models:

data/config/locales/val-ES.yml

@@ -1 +1,2 @@
+---
 val:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     models:

data/config/locales/zh-TW.yml

@@ -1 +1,2 @@
+---
 zh-TW:

data/db/migrate/20181016142511_make_authors_polymorphic_for_comments.rb

@@ -4,6 +4,7 @@ class MakeAuthorsPolymorphicForComments < ActiveRecord::Migration[5.2]
   class Comment < ApplicationRecord
     self.table_name = :decidim_comments_comments
   end
+
   def change
     add_column :decidim_comments_comments, :decidim_author_type, :string
 

data/db/migrate/20181019092928_make_author_polymorphic_for_comment_votes.rb

@@ -4,6 +4,7 @@ class MakeAuthorPolymorphicForCommentVotes < ActiveRecord::Migration[5.2]
   class CommentVote < ApplicationRecord
     self.table_name = :decidim_comments_comment_votes
   end
+
   def change
     add_column :decidim_comments_comment_votes, :decidim_author_type, :string
 

data/lib/decidim/comments/comment_serializer.rb

@@ -32,7 +32,7 @@ module Decidim
       private
 
       def root_commentable_url
-        @root_commentable_url ||= if resource.root_commentable&.respond_to?(:polymorphic_resource_url)
+        @root_commentable_url ||= if resource.root_commentable.respond_to?(:polymorphic_resource_url)
                                     resource.root_commentable.polymorphic_resource_url
                                   else
                                     ResourceLocatorPresenter.new(resource.root_commentable).url

data/lib/decidim/comments/comment_vote_serializer.rb

@@ -37,7 +37,7 @@ module Decidim
       private
 
       def root_commentable_url
-        @root_commentable_url ||= if resource.comment.root_commentable&.respond_to?(:polymorphic_resource_url)
+        @root_commentable_url ||= if resource.comment.root_commentable.respond_to?(:polymorphic_resource_url)
                                     resource.comment.root_commentable.polymorphic_resource_url
                                   else
                                     ResourceLocatorPresenter.new(resource.comment.root_commentable).url

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

@@ -19,6 +19,11 @@ FactoryBot.define do
       comment.body = Decidim::ContentProcessor.parse_with_processor(:hashtag, comment.body, current_organization: comment.root_commentable.organization).rewrite
     end
 
+    trait :deleted do
+      created_at { 1.day.ago }
+      deleted_at { 1.hour.ago }
+    end
+
     trait :comment_on_comment do
       author { build(:user, organization: root_commentable.organization) }
       commentable do

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

@@ -5,7 +5,7 @@ require "spec_helper"
 shared_examples_for "a translated comment event" do
   describe "translated notifications" do
     let(:en_body) { "This is Sparta!" }
-    let(:body) { { "en": en_body, "machine_translations": { "ca": "C'est Sparta!" } } }
+    let(:body) { { en: en_body, machine_translations: { ca: "C'est Sparta!" } } }
     let(:participatory_process) { create :participatory_process, organization: organization }
     let(:component) { create(:component, participatory_space: participatory_process) }
     let(:commentable) { create(:dummy_resource, component: component) }

data/lib/decidim/comments/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-06-27 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.26.0
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.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.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -107,6 +107,7 @@ files:
 - app/cells/decidim/comments/comment_thread_cell.rb
 - app/cells/decidim/comments/comments/add_comment.erb
 - app/cells/decidim/comments/comments/blocked_comments_warning.erb
+- app/cells/decidim/comments/comments/comments_loading.erb
 - app/cells/decidim/comments/comments/order_control.erb
 - app/cells/decidim/comments/comments/show.erb
 - app/cells/decidim/comments/comments/single_comment_warning.erb
@@ -296,14 +297,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim comments module