decidim-comments 0.22.0 → 0.23.0

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Comments
+    # Custom helpers for comments cells.
+    #
+    module CommentCellsHelper
+      def renderable?
+        comment.present? && root_commentable.present?
+      end
+
+      def resource_link_text
+        comment.formatted_body
+      end
+
+      def resource_link_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
+
+      delegate :root_commentable, to: :comment
+
+      def root_commentable_title
+        decidim_html_escape(translated_attribute(root_commentable.title))
+      end
+
+      def url_params
+        { commentId: comment.id }
+      end
+    end
+  end
+end

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

@@ -13,6 +13,9 @@ module Decidim
       include Decidim::DataPortability
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::Searchable
+      include Decidim::TranslatableResource
+      include Decidim::TranslatableAttributes
 
       # Limit the max depth of a comment tree. If C is a comment and R is a reply:
       # C          (depth 0)
@@ -22,23 +25,42 @@ module Decidim
       #       |--R (depth 3)
       MAX_DEPTH = 3
 
+      translatable_fields :body
+
       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
+      belongs_to :root_commentable, foreign_key: "decidim_root_commentable_id", foreign_type: "decidim_root_commentable_type", polymorphic: true, touch: true
       has_many :up_votes, -> { where(weight: 1) }, foreign_key: "decidim_comment_id", class_name: "CommentVote", dependent: :destroy
       has_many :down_votes, -> { where(weight: -1) }, foreign_key: "decidim_comment_id", class_name: "CommentVote", dependent: :destroy
 
-      validates :body, presence: true
-      validates :depth, numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: MAX_DEPTH }
-      validates :alignment, inclusion: { in: [0, 1, -1] }
+      # Updates the counter caches for the root_commentable when a comment is
+      # created or updated.
+      after_save :update_counter
 
-      validates :body, length: { maximum: 1000 }
+      # Updates the counter caches for the root_commentable when a comment is
+      # deleted.
+      after_destroy :update_counter
 
-      validate :commentable_can_have_comments
+      # Updates the counter caches for the root_commentable when a comment is
+      # touched, which happens when a comment was reported and its moderation
+      # is accepted and sets the comment as hidden.
+      after_touch :update_counter
 
       before_validation :compute_depth
+      validates :body, presence: true
+      validates :depth, numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: MAX_DEPTH }
+      validates :alignment, inclusion: { in: [0, 1, -1] }
+      validate :body_length
+      validate :commentable_can_have_comments
 
       delegate :organization, to: :commentable
 
+      translatable_fields :body
+      searchable_fields(
+        participatory_space: :itself,
+        A: :body,
+        datetime: :created_at
+      )
+
       def self.positive
         where(alignment: 1)
       end
@@ -99,12 +121,13 @@ module Decidim
 
       # Public: Overrides the `reported_content_url` Reportable concern method.
       def reported_content_url
-        ResourceLocatorPresenter.new(root_commentable).url(anchor: "comment_#{id}")
-      end
+        url_params = { anchor: "comment_#{id}" }
 
-      # Public: Returns the comment message ready to display (it is expected to include HTML)
-      def formatted_body
-        @formatted_body ||= Decidim::ContentProcessor.render(sanitized_body, "div")
+        if root_commentable&.respond_to?(:polymorphic_resource_url)
+          root_commentable.polymorphic_resource_url(url_params)
+        else
+          ResourceLocatorPresenter.new(root_commentable).url(url_params)
+        end
       end
 
       def self.export_serializer
@@ -112,10 +135,10 @@ module Decidim
       end
 
       def self.newsletter_participant_ids(space)
-        Decidim::Comments::Comment.includes(:root_commentable).not_hidden
-                                  .where("decidim_comments_comments.decidim_author_id IN (?)", Decidim::User.where(organization: space.organization).pluck(:id))
-                                  .where("decidim_comments_comments.decidim_author_type IN (?)", "Decidim::UserBaseEntity")
-                                  .map(&:author).pluck(:id).flatten.compact.uniq
+        authors_sql = Decidim::Comments::Comment.select("DISTINCT decidim_comments_comments.decidim_author_id").not_hidden
+                                                .where("decidim_comments_comments.decidim_author_type" => "Decidim::UserBaseEntity").to_sql
+
+        Decidim::User.where(organization: space.organization).where("id IN (#{authors_sql})").pluck(:id)
       end
 
       def can_participate?(user)
@@ -124,8 +147,35 @@ module Decidim
         root_commentable.can_participate?(user)
       end
 
+      def formatted_body
+        Decidim::ContentProcessor.render(sanitize_content(render_markdown(translated_body)), "div")
+      end
+
+      def translated_body
+        @translated_body ||= translated_attribute(body, organization)
+      end
+
       private
 
+      def body_length
+        language = (body.keys - ["machine_translations"]).first
+        errors.add(:body, :too_long, count: comment_maximum_length) unless body[language].length <= comment_maximum_length
+      end
+
+      def comment_maximum_length
+        return unless commentable.commentable?
+        return component.settings.comments_max_length if component_settings_comments_max_length?
+        return organization.comments_max_length if organization.comments_max_length.positive?
+
+        1000
+      end
+
+      def component_settings_comments_max_length?
+        return unless component&.settings.respond_to?(:comments_max_length)
+
+        component.settings.comments_max_length.positive?
+      end
+
       # Private: Check if commentable can have comments and if not adds
       # a validation error to the model
       def commentable_can_have_comments
@@ -138,11 +188,8 @@ module Decidim
       end
 
       # Private: Returns the comment body sanitized, sanitizing HTML tags
-      def sanitized_body
-        Rails::Html::WhiteListSanitizer.new.sanitize(
-          render_markdown(body),
-          scrubber: Decidim::Comments::UserInputScrubber.new
-        ).try(:html_safe)
+      def sanitize_content(content)
+        Decidim::ContentProcessor.sanitize(content)
       end
 
       # Private: Initializes the Markdown parser
@@ -154,6 +201,12 @@ module Decidim
       def render_markdown(string)
         markdown.render(string)
       end
+
+      def update_counter
+        return unless root_commentable
+
+        root_commentable.update_comments_count
+      end
     end
   end
 end

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

@@ -25,7 +25,7 @@ module Decidim
           params = {
             commentable: resource,
             root_commentable: resource,
-            body: ::Faker::Lorem.sentence(50),
+            body: { en: ::Faker::Lorem.sentence(50) },
             author: author,
             user_group: user_group
           }

data/app/types/decidim/comments/commentable_interface.rb

@@ -41,7 +41,7 @@ module Decidim
         description "The number of comments in all levels this resource holds"
 
         resolve lambda { |obj, _args, _ctx|
-          obj.comments.count
+          obj.comments_count
         }
       end
 

data/app/types/decidim/comments/commentable_mutation_type.rb

@@ -17,7 +17,10 @@ module Decidim
 
         resolve lambda { |obj, args, ctx|
           params = { "comment" => { "body" => args[:body], "alignment" => args[:alignment], "user_group_id" => args[:userGroupId], "commentable" => obj } }
-          form = Decidim::Comments::CommentForm.from_params(params).with_context(current_organization: ctx[:current_organization])
+          form = Decidim::Comments::CommentForm.from_params(params).with_context(
+            current_organization: ctx[:current_organization],
+            current_component: obj.component
+          )
           Decidim::Comments::CreateComment.call(form, ctx[:current_user]) do
             on(:ok) do |comment|
               return comment

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/bg.yml

@@ -0,0 +1,6 @@
+bg:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Коментар
+      decidim/comments/comment_created_event: Коментар
+      decidim/comments/reply_created_event: Отговор на коментар

data/config/locales/ca.yml

@@ -20,6 +20,7 @@ ca:
       comments_count: Número de comentaris
       last_activity:
         new_comment_at_html: "<span>Nou comentari a %{link}</span>"
+      view: Mostrar
       votes:
         create:
           error: S'ha produït un error en votar el comentari.

data/config/locales/cs.yml

@@ -24,6 +24,7 @@ cs:
       comments_count: Počet komentářů
       last_activity:
         new_comment_at_html: "<span>Nový komentář v %{link}</span>"
+      view: Zobrazit
       votes:
         create:
           error: Při hlasování o komentáři došlo k chybě.

data/config/locales/da.yml

@@ -0,0 +1 @@
+da:

data/config/locales/en.yml

@@ -21,6 +21,7 @@ en:
       comments_count: Comments count
       last_activity:
         new_comment_at_html: "<span>New comment at %{link}</span>"
+      view: View
       votes:
         create:
           error: There was a problem voting the comment.

data/config/locales/eo.yml

@@ -0,0 +1 @@
+eo:

data/config/locales/es-MX.yml

@@ -20,6 +20,7 @@ es-MX:
       comments_count: Número de comentarios
       last_activity:
         new_comment_at_html: "<span>Nuevo comentario en %{link}</span>"
+      view: Ver
       votes:
         create:
           error: Ha habido errores al votar el comentario.

data/config/locales/es-PY.yml

@@ -20,6 +20,7 @@ es-PY:
       comments_count: Número de comentarios
       last_activity:
         new_comment_at_html: "<span>Nuevo comentario en %{link}</span>"
+      view: Ver
       votes:
         create:
           error: Ha habido errores al votar el comentario.

data/config/locales/es.yml

@@ -20,6 +20,7 @@ es:
       comments_count: Número de comentarios
       last_activity:
         new_comment_at_html: "<span>Nuevo comentario en %{link}</span>"
+      view: Ver
       votes:
         create:
           error: Se ha producido un error al votar el comentario.
@@ -88,8 +89,8 @@ es:
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
           notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>.
         comment_by_followed_user_group:
-          email_intro: '%{author_name} ha dejado un comentario en %{resource_title}. Puede leerlo en esta página:'
-          email_outro: Recibes esta notificación porque sigues a %{author_name}. Puedes dejar de seguir a este grupo des de su página de perfil.
+          email_intro: '%{author_name} ha dejado un comentario en %{resource_title}. Puedes leerlo en esta página:'
+          email_outro: Recibes esta notificación porque sigues a %{author_name}. Puedes dejar de seguir a este grupo desde su página de perfil.
           email_subject: Hay un nuevo comentario de %{author_name} en %{resource_title}
           notification_title: Hay un nuevo comentario de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:

data/config/locales/et.yml

@@ -0,0 +1 @@
+et:

data/config/locales/fi-plain.yml

@@ -20,6 +20,7 @@ fi-pl:
       comments_count: Kommenttien määrä
       last_activity:
         new_comment_at_html: "<span>Uusi kommentti osoitteessa %{link}</span>"
+      view: Näytä
       votes:
         create:
           error: Äänestettäessä kommenttia tapahtui virhe.

data/config/locales/fi.yml

@@ -20,6 +20,7 @@ fi:
       comments_count: Kommenttien määrä
       last_activity:
         new_comment_at_html: "<span>Uusi kommentti osoitteessa %{link}</span>"
+      view: Näytä
       votes:
         create:
           error: Kommentin äänestys epäonnistui.
@@ -109,7 +110,7 @@ fi:
           notification_title: Käyttäjä <a href="%{author_path}">%{author_name}%{author_nickname}</a> on maininnut sinut kohteessa <a href="%{resource_path}">%{resource_title}</a> ryhmän <a href="%{group_path}">%{group_name} %{group_nickname}</a> jäsenenä
         user_mentioned:
           email_intro: Sinut on mainittu
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska sinut on mainittu kohdssa %{resource_title}.
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska sinut on mainittu kohteessa %{resource_title}.
           email_subject: Sinut on mainittu kohdassa %{resource_title}
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on maininnut sinut kohdassa <a href="%{resource_path}">%{resource_title}</a>
     metrics:

data/config/locales/fr-CA.yml

@@ -16,10 +16,11 @@ fr-CA:
         other: Votes
   decidim:
     comments:
-      comments: Commentaires
+      comments: commentaires
       comments_count: Nombre de commentaires
       last_activity:
         new_comment_at_html: "<span>Nouveau commentaire à %{link}</span>"
+      view: Voir
       votes:
         create:
           error: Une erreur s'est produite lors du vote sur le commentaire.

data/config/locales/fr.yml

@@ -16,10 +16,11 @@ fr:
         other: Votes
   decidim:
     comments:
-      comments: Commentaires
+      comments: commentaires
       comments_count: Nombre de commentaires
       last_activity:
         new_comment_at_html: "<span>Nouveau commentaire à %{link}</span>"
+      view: Voir
       votes:
         create:
           error: Une erreur s'est produite lors du vote sur le commentaire.

data/config/locales/hr.yml

@@ -0,0 +1 @@
+hr:

data/config/locales/hu.yml

@@ -16,7 +16,7 @@ hu:
         other: Szavazatok
   decidim:
     comments:
-      comments: Megjegyzések
+      comments: Hozzászólások
       last_activity:
         new_comment_at_html: "<span>Új megjegyzés: %{link}</span>"
       votes:

data/config/locales/is-IS.yml

@@ -1,7 +1,5 @@
 is-IS:
   decidim:
-    comments:
-      comments: Athugasemdir
     components:
       add_comment_form:
         account_message: <a href="%{sign_in_url}">Skráðu þig inn með reikningnum þínum</a> eða <a href="%{sign_up_url}">skráðu þig</a> til að bæta við ummælum þínum.

data/config/locales/is.yml

@@ -0,0 +1,76 @@
+is:
+  decidim:
+    comments:
+      comments: Athugasemdir
+    components:
+      add_comment_form:
+        account_message: <a href="%{sign_in_url}">Skráðu þig inn með reikningnum þínum</a> eða <a href="%{sign_up_url}">skráðu þig</a> til að bæta við ummælum þínum.
+        form:
+          body:
+            label: Athugasemd
+            placeholder: Hvað finnst þér um þetta?
+          form_error: Textinn er krafist og það má ekki vera lengri en %{length} stafir.
+          submit: Senda
+          user_group_id:
+            label: Athugasemd sem
+        opinion:
+          neutral: Hlutlaus
+        remaining_characters: "%{count} stafir eftir"
+        remaining_characters_1: "%{count} stafur eftir"
+        title: Bæta við athugasemd þinni
+      comment:
+        alignment:
+          against: Gegn
+          in_favor: Í hag
+        reply: Svara
+        report:
+          action: Skýrsla
+          already_reported: Þetta efni er þegar tilkynnt og það verður endurskoðað af stjórnanda.
+          close: Loka
+          description: Er þetta efni óviðeigandi?
+          details: Önnur athugasemdir
+          reasons:
+            does_not_belong: Inniheldur ólöglega starfsemi, sjálfsvígshugmyndir, persónulegar upplýsingar eða eitthvað sem þér finnst ekki tilheyra %{organization_name}.
+            offensive: Inniheldur kynþáttafordóma, kynhneigð, slurðir, persónulegar árásir, dauðarefsárásir, sjálfsvígstilraunir eða hvers konar hatursmál.
+            spam: Inniheldur clickbait, auglýsingar, óþekktarangi eða handritabots.
+      comment_order_selector:
+        order:
+          best_rated: Bestu einkunnir
+          most_discussed: Mest rætt
+          older: Eldri
+          recent: Nýleg
+        title: 'Raða eftir:'
+      comment_thread:
+        title: Samtal við %{authorName}
+      comments:
+        blocked_comments_warning: Athugasemdir eru gerðar óvirkar á þessum tíma, en þú getur lesið þau fyrri.
+        loading: Hleð inn athugasemdir ...
+        title: "%{count} athugasemdir"
+    events:
+      comments:
+        comment_by_followed_user:
+          email_intro: "%{author_name} hefur skilið eftir athugasemd í %{resource_title}. Þú getur lesið það á þessari síðu:"
+          email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með %{author_name}. Þú getur sleppt þessari notanda frá prófílssíðunni sinni.
+          email_subject: Það er nýtt ummæli um %{author_name} í %{resource_title}
+          notification_title: Það er nýtt ummæli við <a href="%{author_path}">%{author_name} %{author_nickname}</a> í <a href="%{resource_path}">%{resource_title}</a>.
+        comment_by_followed_user_group:
+          email_subject: Það er nýtt ummæli um %{author_name} í %{resource_title}
+          notification_title: Það er nýtt ummæli við <a href="%{author_path}">%{author_name} %{author_nickname}</a> í <a href="%{resource_path}">%{resource_title}</a>.
+        comment_created:
+          email_intro: "%{resource_title} hefur verið skrifað ummæli. Þú getur lesið athugasemdina á þessari síðu:"
+          email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með "%{resource_title}" eða höfundinum. Þú getur sleppt því frá fyrri tengilinn.
+          email_subject: Það er nýtt ummæli frá %{author_name} í %{resource_title}
+          notification_title: Það er nýtt ummæli frá <a href="%{author_path}">%{author_name} %{author_nickname}</a> í <a href="%{resource_path}">%{resource_title}</a>
+        reply_created:
+          email_intro: "%{author_name} hefur svarað ummæli þín í %{resource_title}. Þú getur lesið það á þessari síðu:"
+          email_outro: Þú hefur fengið þessa tilkynningu vegna þess að ummæli þín voru svarað.
+          email_subject: "%{author_name} hefur svarað ummæli þín í %{resource_title}"
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> hefur svarað athugasemd þinni í <a href="%{resource_path}">%{resource_title}</a>
+        user_mentioned:
+          email_intro: Þú hefur verið nefndur
+          email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú hefur verið nefndur í %{resource_title}.
+          email_subject: Þú hefur verið nefndur í %{resource_title}
+          notification_title: Þú hefur verið nefndur í <a href="%{resource_path}">%{resource_title}</a> af <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+  errors:
+    messages:
+      cannot_have_comments: getur ekki haft athugasemdir