decidim-comments 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b3b1d43c2cc461e99009bcc30c168382b996b92811ce6309aa5b42f56caaff7
-  data.tar.gz: aabe481592164317440bb4d865c7bc50b9d24baaf244386aa2fda2802cd481b1
+  metadata.gz: f56674cf1871898096ef02f63583abeb149286e0500056e747b74be60e2028ed
+  data.tar.gz: 8d6a096ed694a4a833c376c9a9c7fe1cf0b691dd571fd33bdc439796f025d3b1
 SHA512:
-  metadata.gz: e174a71860cbd31fea5cee3dc7b93d59463396f46147d530f81e5b69569c6d3990b41055eb069405260ae952ed88d852b45c39e4f9fea7e6635d580e9fabcc50
-  data.tar.gz: 7181c8c9c711e14d7edf86ad680dc002c75e33fda2c160dbd30c3d15bb49f13216d921b431ab6c7957d8feb69e7b27c3d92c875367e630ae58b283b9ad7f38ff
+  metadata.gz: 76c1112767d32925c6ebc0ee12e153f050b4814554aca1357aecfb905bdb734541d104d65208b5cfcdade9792a225cb83b1c1e5afd34a31984c9af2d35d3f604
+  data.tar.gz: 52718130d906ccc942afaff78dd4e75ba5274c6bf88bd8b3fd8aa4215c74afc005a09c7e6f0493340c56d1adca7ed2a48c782413ee13a561a157abd90f7cd549

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

@@ -30,20 +30,20 @@
               </li>
             <% end %>
             <li>
-              <%= link_to "#{commentable_path("commentId" => model.id)}#comment_#{model.id}", target: "_blank", data: { "external-link": "false" }, class: "dropdown__item", title: t("decidim.components.comment.single_comment_link_title") do %>
+              <%= link_to "#{commentable_path("commentId" => model.id)}#comment_#{model.id}", target: "_blank", data: { "external-link": "text-only" }, class: "dropdown__item", title: t("decidim.components.comment.single_comment_link_title") do %>
                 <%= icon "share-line" %>
                 <span><%= t("decidim.components.comment.single_comment_link_title") %></span>
               <% end %>
             </li>
             <% if model.authored_by?(current_user) %>
               <li>
-                <button type="button" class="dropdown__item" data-dialog-open="<%= "editCommentModal#{model.id}" %>" title="<%= t("decidim.components.comment.edit") %>" aria-controls="<%= "editCommentModal#{model.id}" %>" aria-haspopup="dialog" tabindex="2">
+                <button type="button" class="dropdown__item" data-dialog-open="<%= "editCommentModal#{model.id}" %>" title="<%= t("decidim.components.comment.edit") %>" aria-controls="<%= "editCommentModal#{model.id}" %>" aria-haspopup="dialog">
                   <%= icon "edit-line" %>
                   <span><%= t("decidim.components.comment.edit") %></span>
                 </button>
               </li>
               <li>
-                <%= link_to comment_path, remote: true, method: :delete, class: "dropdown__item", data: { confirm: t("decidim.components.comment.confirm_destroy") }, tabindex: 3 do %>
+                <%= link_to comment_path, remote: true, method: :delete, class: "dropdown__item", data: { confirm: t("decidim.components.comment.confirm_destroy") } do %>
                   <%= icon "delete-bin-line" %>
                   <span><%= t("decidim.components.comment.delete") %></span>
                 <% end %>

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

@@ -47,6 +47,8 @@ module Decidim
         hash.push(model.must_render_translation?(current_organization) ? 1 : 0)
         hash.push(model.authored_by?(current_user) ? 1 : 0)
         hash.push(model.reported_by?(current_user) ? 1 : 0)
+        hash.push(model.up_votes_count)
+        hash.push(model.down_votes_count)
         hash.push(model.cache_key_with_version)
         hash.push(model.author.cache_key_with_version)
         @hash = hash.join(Decidim.cache_key_separator)
@@ -137,11 +139,11 @@ module Decidim
       end
 
       def up_votes_count
-        model.up_votes.count
+        model.up_votes_count
       end
 
       def down_votes_count
-        model.down_votes.count
+        model.down_votes_count
       end
 
       def root_depth
@@ -157,11 +159,11 @@ module Decidim
       end
 
       def voted_up?
-        model.up_voted_by?(current_user)
+        @up_voted ||= model.up_voted_by?(current_user)
       end
 
       def voted_down?
-        model.down_voted_by?(current_user)
+        @down_voted ||= model.down_voted_by?(current_user)
       end
 
       def nested?

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

@@ -122,14 +122,14 @@ module Decidim
       #
       # Returns a bool value to indicate if the condition is truthy or not
       def up_voted_by?(user)
-        up_votes.any? { |vote| vote.author == user }
+        up_votes.exists?(author: user)
       end
 
       # Public: Check if the user has downvoted the comment
       #
       # Returns a bool value to indicate if the condition is truthy or not
       def down_voted_by?(user)
-        down_votes.any? { |vote| vote.author == user }
+        down_votes.exists?(author: user)
       end
 
       # Public: Overrides the `reported_content_url` Reportable concern method.

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

@@ -14,12 +14,22 @@ module Decidim
       validates :weight, inclusion: { in: [-1, 1] }
       validate :author_and_comment_same_organization
 
+      after_create :update_comment_votes_count
+      after_destroy :update_comment_votes_count
+
       def self.export_serializer
         Decidim::Comments::CommentVoteSerializer
       end
 
       private
 
+      def update_comment_votes_count
+        up_votes_count = self.class.where(decidim_comment_id: comment.id, weight: 1).count
+        down_votes_count = self.class.where(decidim_comment_id: comment.id, weight: -1).count
+
+        comment.update(up_votes_count:, down_votes_count:)
+      end
+
       # Private: check if the comment and the author have the same organization
       def author_and_comment_same_organization
         return unless author.present? && comment.present?

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

@@ -18,8 +18,8 @@ window.Rails = Rails;
 // Fake timers for testing polling
 jest.useFakeTimers();
 
-import { createCharacterCounter } from "../../../../../../decidim-core/app/packs/src/decidim/input_character_counter";
-import Configuration from "../../../../../../decidim-core/app/packs/src/decidim/configuration";
+import { createCharacterCounter } from "src/decidim/input_character_counter";
+import Configuration from "src/decidim/configuration";
 // Component is loaded with require because using import loads it before $ has been mocked
 // so tests are not able to check the spied behaviours
 const CommentsComponent = require("./comments.component_for_testing.js");

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

@@ -1,4 +1,5 @@
 /* eslint no-undef: 0 */
+/* eslint-disable no-relative-import-paths/no-relative-import-paths */
 
 import CommentsComponent from "./comments.component"
 

data/config/locales/ca.yml

@@ -123,27 +123,27 @@ ca:
       comments:
         comment_by_followed_user:
           email_intro: "%{author_name} ha deixat un comentari a %{resource_title}. Podeu llegir-lo en aquesta pàgina:"
-          email_outro: Has rebut aquesta notificació perquè estàs seguint %{author_name}. Pots deixar de seguir a aquesta participant des de la seva pàgina de perfil.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint el comentari "%{author_name}". Pots deixar de seguir a aquesta participant des de la seva pàgina de perfil.
           email_subject: Hi ha un nou comentari de %{author_name} en %{resource_title}
           notification_title: Hi ha un nou comentari per <a href="%{author_path}">%{author_name} %{author_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>.
         comment_by_followed_user_group:
           email_intro: '%{author_name} ha deixat un comentari a%{resource_title}. Pots llegir-lo en aquesta pàgina:'
-          email_outro: Reps aquesta notificació perquè segueixes a %{author_name}. Pots deixar de seguir aquest grup des de la seva pàgina de perfil.
+          email_outro: Reps aquesta notificació perquè segueixes a "%{author_name}". Pots deixar de seguir aquest grup des de la seva pàgina de perfil.
           email_subject: Hi ha un nou comentari de %{author_name} en %{resource_title}
           notification_title: Hi ha un nou comentari per <a href="%{author_path}">%{author_name} %{author_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "S'ha comentat %{resource_title}. Pots llegir el comentari d'aquesta pàgina:"
-          email_outro: Has rebut aquesta notificació perquè estàs seguint "%{resource_title}" o la seva autora. Pots deixar de seguir-la des de l'enllaç anterior.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint el comentari "%{resource_title}" o la seva autora. Pots deixar de seguir-la des de l'enllaç anterior.
           email_subject: Hi ha un nou comentari de %{author_name} a %{resource_title}
           notification_title: Hi ha un nou comentari de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:
           email_intro: El teu comentari a "%{resource_title}" ha rebut un vot negatiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
-          email_outro: Has rebut aquesta notificació perquè ets autora d'aquest comentari.
+          email_outro: Has rebut aquesta notificació perquè vas fer aquest comentari.
           email_subject: El teu comentari a "%{resource_title}" ha rebut un vot negatiu.
           notification_title: El teu <a href="%{resource_path}">comentari</a> a "%{resource_title}" ha rebut un vot negatiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
         comment_upvoted:
           email_intro: El teu comentari a "%{resource_title}" ha rebut un vot positiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
-          email_outro: Has rebut aquesta notificació perquè ets autora d'aquest comentari.
+          email_outro: Has rebut aquesta notificació perquè vas fer aquest comentari.
           email_subject: El teu comentari a "%{resource_title}" ha rebut un vot positiu.
           notification_title: El teu <a href="%{resource_path}">comentari</a> a "%{resource_title}" ha rebut un vot positiu. Ara té un total de %{upvotes} vots positius i %{downvotes} vots negatius.
         reply_created:
@@ -153,12 +153,12 @@ ca:
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respost el teu comentari a <a href="%{resource_path}">%{resource_title}</a>
         user_group_mentioned:
           email_intro: Un grup al qual pertanys ha estat esmentat
-          email_outro: Has rebut aquesta notificació perquè formes part del grup %{group_name} que ha estat esmentat a %{resource_title}.
+          email_outro: Has rebut aquesta notificació perquè formes part del grup "%{group_name}" que ha estat esmentat a %{resource_title}.
           email_subject: T'han esmentat a %{resource_title} com a membre de %{group_name}
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> t'ha esmentat com a membre de <a href="%{group_path}">%{group_name} %{group_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Has estat esmentada
-          email_outro: Has rebut aquesta notificació perquè has estat esmentada a %{resource_title}.
+          email_outro: Has rebut aquesta notificació perquè t'han esmentat al comentari "%{resource_title}".
           email_subject: Has estat esmentada a %{resource_title}
           notification_title: Has estat esmentada a <a href="%{resource_path}">%{resource_title}</a> per <a href="%{author_path}">%{author_name} %{author_nickname}</a>
     metrics:

data/config/locales/es.yml

@@ -123,7 +123,7 @@ es:
       comments:
         comment_by_followed_user:
           email_intro: "%{author_name} ha dejado un comentario en %{resource_title}. Puedes leerlo en esta página:"
-          email_outro: Has recibido esta notificación porque sigues "%{author_name}". Puedes dejar de seguir a esta participante desde su página de perfil.
+          email_outro: Has recibido esta notificación porque sigues a "%{author_name}". Puedes dejar de seguir a esta participante 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_by_followed_user_group:
@@ -133,32 +133,32 @@ es:
           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:
           email_intro: "%{resource_title} ha sido comentado. Puedes leer el comentario en esta página:"
-          email_outro: Has recibido esta notificación porque está siguiendo "%{resource_title}" o su autora. Puedes dejar de seguirla desde el enlace anterior.
+          email_outro: Has recibido esta notificación porque estás siguiendo el comentario "%{resource_title}" o a su autora. Puedes dejar de seguirla desde el enlace anterior.
           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_downvoted:
           email_intro: Tu comentario en "%{resource_title}" ha sido votado negativamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
-          email_outro: Has recibido esta notificación porque eres la autora de este comentario.
+          email_outro: Has recibido esta notificación porque hiciste este comentario.
           email_subject: Su comentario en "%{resource_title}" ha sido votado negativamente.
           notification_title: Tu <a href="%{resource_path}">comentario</a> en "%{resource_title}" ha sido votado negativamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
         comment_upvoted:
           email_intro: Tu comentario en "%{resource_title}" ha sido votado postivamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
-          email_outro: Has recibido esta notificación porque eres la autora de este comentario.
+          email_outro: Has recibido esta notificación porque hiciste este comentario.
           email_subject: Tu comentario en "%{resource_title}" ha sido votado positivamente.
           notification_title: Tu <a href="%{resource_path}">comentario</a> en "%{resource_title}" ha sido votado positivamente. Ahora tiene un total de %{upvotes} votos positivos y %{downvotes} votos negativos.
         reply_created:
           email_intro: "%{author_name} ha respondido a tu comentario en %{resource_title}. Puedes leerlo en esta página:"
-          email_outro: Has recibido esta notificación porque tu comentario fue respondido.
+          email_outro: Has recibido esta notificación porque han respondido a tu comentario.
           email_subject: "%{author_name} ha respondido a tu comentario en %{resource_title}"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respondido a tu comentario en <a href="%{resource_path}">%{resource_title}</a>
         user_group_mentioned:
           email_intro: Se ha mencionado un grupo al que perteneces
-          email_outro: Has recibido esta notificación porque formas parte del grupo %{group_name} que ha sido mencionado en %{resource_title}.
+          email_outro: Has recibido esta notificación porque formas parte del grupo "%{group_name}" que ha sido mencionado en "%{resource_title}".
           email_subject: Te han mencionado en %{resource_title} como miembro de %{group_name}
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> te ha mencionado en <a href="%{resource_path}">%{resource_title}</a> como miembro de <a href="%{group_path}">%{group_name} %{group_nickname}</a>
         user_mentioned:
           email_intro: Has sido mencionada
-          email_outro: Has recibido esta notificación porque has sido mencionada en %{resource_title}.
+          email_outro: Has recibido esta notificación porque te han mencionado en el comentario "%{resource_title}".
           email_subject: Has sido mencionada en %{resource_title}
           notification_title: Has sido mencionada en <a href="%{resource_path}">%{resource_title}</a> por <a href="%{author_path}">%{author_name} %{author_nickname}</a>
     metrics:

data/config/locales/he-IL.yml

@@ -0,0 +1 @@
+he:

data/config/locales/hu.yml

@@ -32,6 +32,8 @@ hu:
         update:
           error: Hiba történt a hozzászólás frissítése során.
       comments_title: Hozzászólás
+      last_activity:
+        new_comment: 'Új megjegyzés:'
       votes:
         create:
           error: Hiba történt a megjegyzésre való szavazáskor.
@@ -42,6 +44,8 @@ hu:
             label: Megjegyzés
             placeholder: Mit gondolsz erről?
           form_error: Kötelező kitölteni, és nem lehet hosszabb, mint %{length} karakter.
+          submit_reply: Válasz publikálása
+          submit_root_comment: Megjegyzés publikálása
           user_group_id:
             label: 'Megjegyzés mint:'
         opinion:
@@ -59,6 +63,7 @@ hu:
         alignment:
           against: Ellenzem
           in_favor: Támogatom
+        cancel_reply: Válasz visszavonása
         confirm_destroy: Biztosan szeretné törölni ezt a hozzászólást?
         delete: Törlés
         deleted_at: 'Hozzászólás törölve ekkor:  %{date}'

data/config/locales/pl.yml

@@ -76,6 +76,7 @@ pl:
         edit: Edytuj
         edited: Edytowany
         hide_replies: Ukryj odpowiedzi
+        moderated_at: Komentarz moderowany dnia %{date}
         reply: Odpowiedz
         report:
           action: Zgłoś
@@ -84,6 +85,7 @@ pl:
           description: Czy ta treść jest nieodpowiednia?
           details: Dodatkowe komentarze
           reasons:
+            does_not_belong: Zawiera nielegalną działalność, groźby samobójstwa, dane osobowe lub inne informacje, które są niestosowne w %{organization_name}.
             offensive: Promuje rasizm, seksizm, nienawiść, ataki osobiste, groźby śmierci, groźby samobójcze jakąkolwiek formę mowy nienawiści.
             spam: Zawiera clickbaity, reklamy, oszustwa lub skrypty botów.
           title: Zgłoś niewłaściwą treść

data/config/locales/ro-RO.yml

@@ -34,6 +34,8 @@ ro:
         update:
           error: A apărut o eroare la actualizarea comentariului.
       comments_title: Comentariu
+      last_activity:
+        new_comment: 'Comentariu nou:'
       votes:
         create:
           error: A apărut o problemă la votarea comentariului.
@@ -45,6 +47,8 @@ ro:
             label: Comentariu
             placeholder: Ce părere ai despre asta?
           form_error: Textul este obligatoriu și nu poate fi mai lung de %{length} caractere.
+          submit_reply: Publicați răspuns
+          submit_root_comment: Publicați comentariu
           user_group_id:
             label: Comentează în calitate de
         opinion:
@@ -67,9 +71,9 @@ ro:
         delete: Șterge
         deleted_at: Comentariu șters la %{date}
         deleted_user: Participant șters
-        edit: Editează
-        edited: Editat
-        hide_replies: Ascunde răspunsurile
+        edit: Actualizare
+        edited: Actualizat
+        hide_replies: Ascundeți răspunsurile
         moderated_at: Comentariu moderat pe %{date}
         reply: Răspunde
         report:
@@ -133,7 +137,7 @@ ro:
           notification_title: Există un comentariu nou de la <a href="%{author_path}">%{author_name} %{author_nickname}</a> pentru <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} a primit un comentariu. Poți citi comentariul pe această pagină:"
-          email_outro: Ai primit această notificare deoarece urmărești „%{resource_title}” sau pe autorii săi. Poți anula abonarea de la link-ul anterior.
+          email_outro: Ați primit această notificare deoarece urmăriți „%{resource_title}” sau pe autorii săi. Puteți anula abonarea de la link-ul anterior.
           email_subject: Există un nou comentariu de la %{author_name} pentru %{resource_title}
           notification_title: Există un nou comentariu de la <a href="%{author_path}">%{author_name} %{author_nickname}</a> pentru <a href="%{resource_path}">%{resource_title}</a>
         comment_downvoted:

data/config/locales/sq-AL.yml

@@ -1 +1,43 @@
+---
 sq:
+  decidim:
+    components:
+      add_comment_form:
+        form:
+          submit_reply: Publiko përgjigje
+          submit_root_comment: Publiko koment
+          user_group_id:
+            label: Komento si
+        opinion:
+          label: Mendimi jot mbi këtë temë
+          negative: Negativ
+          negative_selected: Mendimi jot mbi këtë temë është negativ
+          neutral: Neutral
+          neutral_selected: Mendimi jot mbi këtë temë është neutral
+          positive: Pozitiv
+          positive_selected: Mendimi jot mbi këtë temë është pozitiv
+        remaining_characters: "%{count} karaktere të mbetura"
+        remaining_characters_1: "%{count} karakter i mbetur"
+        title: Shto komentin tënd
+      comment:
+        alignment:
+          against: Kundër
+          in_favor: Pro
+        cancel_reply: Anullo përgjigje
+        confirm_destroy: A je i sigurt që do ta fshish këtë koment?
+        delete: Fshi
+        deleted_at: Komenti u fshi në datën %{date}
+        edit: Përpuno
+        edited: Ndryshuar
+        hide_replies: Fshih përgjigjet
+        moderated_at: Komenti u moderua në datën %{date}
+        reply: Përgjigju
+        report:
+          action: Raporto
+          already_reported: Kjo përmbajtje është raportuar nga të tjerë dhe do rishikohet nga administratorët.
+          close: Mbyll
+          description: Përmbajtje e papërshtatshme?
+          details: Komente të tjera
+          reasons:
+            does_not_belong: Përmban aktivitete të paligjshme, kërcënime për vetëvrasje, informacion personal apo diçka tjetër që mendon se nuk i përket %{organization_name}.
+            offensive: Përmban racizëm, seksizëm, ofendime, sulme personale, kërcënime me vdekje, shtyrje për vetëvrasje apo forma të tjera të gjuhës së urrejtjes.

data/db/migrate/20240304092558_add_comment_vote_counter_cache_to_comments.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddCommentVoteCounterCacheToComments < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_comments_comments, :up_votes_count, :integer, null: false, default: 0, index: true
+    add_column :decidim_comments_comments, :down_votes_count, :integer, null: false, default: 0, index: true
+
+    # We cannot use the reset_counters as up_votes and down_votes are scoped associationws
+    reversible do |dir|
+      dir.up do
+        Decidim::Comments::Comment.reset_column_information
+        Decidim::Comments::Comment.find_each do |record|
+          # rubocop:disable Rails/SkipsModelValidations
+          record.class.update_counters(record.id, up_votes_count: record.up_votes.length)
+          record.class.update_counters(record.id, down_votes_count: record.down_votes.length)
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+      end
+    end
+  end
+end

data/decidim-comments.gemspec

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "decidim/comments/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.version = Decidim::Comments.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://decidim.org"
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
+    "documentation_uri" => "https://docs.decidim.org/",
+    "funding_uri" => "https://opencollective.com/decidim",
+    "homepage_uri" => "https://decidim.org",
+    "source_code_uri" => "https://github.com/decidim/decidim"
+  }
+  s.required_ruby_version = "~> 3.1.0"
+
+  s.name = "decidim-comments"
+  s.summary = "Decidim comments module"
+  s.description = "Pluggable comments system for some components."
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "decidim-core", Decidim::Comments.version
+  s.add_dependency "redcarpet", "~> 3.5", ">= 3.5.1"
+
+  s.add_development_dependency "decidim-admin", Decidim::Comments.version
+  s.add_development_dependency "decidim-dev", Decidim::Comments.version
+end

data/lib/decidim/api/comment_type.rb

@@ -58,7 +58,7 @@ module Decidim
       end
 
       def up_votes
-        object.up_votes.size
+        object.up_votes_count
       end
 
       def up_voted
@@ -66,7 +66,7 @@ module Decidim
       end
 
       def down_votes
-        object.down_votes.size
+        object.down_votes_count
       end
 
       def down_voted

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

@@ -4,8 +4,11 @@ require "decidim/core/test/factories"
 
 FactoryBot.define do
   factory :comment, class: "Decidim::Comments::Comment" do
-    author { build(:user, organization: commentable.organization) }
-    commentable { build(:dummy_resource) }
+    transient do
+      skip_injection { false }
+    end
+    author { build(:user, organization: commentable.organization, skip_injection:) }
+    commentable { build(:dummy_resource, skip_injection:) }
     root_commentable { commentable }
     body { Decidim::Faker::Localized.paragraph }
     participatory_space { commentable.try(:participatory_space) }
@@ -25,22 +28,26 @@ FactoryBot.define do
     end
 
     trait :comment_on_comment do
-      author { build(:user, organization: root_commentable.organization) }
+      author { build(:user, organization: root_commentable.organization, skip_injection:) }
       commentable do
         build(
           :comment,
           author:,
           root_commentable:,
-          commentable: root_commentable
+          commentable: root_commentable,
+          skip_injection:
         )
       end
-      root_commentable { build(:dummy_resource) }
+      root_commentable { build(:dummy_resource, skip_injection:) }
     end
   end
 
   factory :comment_vote, class: "Decidim::Comments::CommentVote" do
-    comment { build(:comment) }
-    author { build(:user, organization: comment.organization) }
+    transient do
+      skip_injection { false }
+    end
+    comment { build(:comment, skip_injection:) }
+    author { build(:user, organization: comment.organization, skip_injection:) }
     weight { [-1, 1].sample }
 
     trait :up_vote do

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

@@ -16,7 +16,7 @@ shared_context "when it is a comment event" do
   let(:comment_author_name) { decidim_html_escape comment.author.name }
 
   let(:extra) { { comment_id: comment.id } }
-  let(:resource_title) { decidim_html_escape(translated(resource.title)) }
+  let(:resource_title) { decidim_sanitize_translated(resource.title) }
   let(:user_group) do
     user_group = create(:user_group, :verified, organization:, users: [comment_author])
     comment.update!(user_group:)

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

@@ -12,7 +12,7 @@ shared_examples_for "a comment voted event" do
   let(:comment_vote_author) { comment_vote.author }
 
   let(:extra) { { comment_id: comment.id, author_id: comment_vote_author.id, weight:, downvotes: 100, upvotes: 999 } }
-  let(:resource_title) { decidim_html_escape(translated(resource.title)) }
+  let(:resource_title) { decidim_sanitize_translated(resource.title) }
   let(:resource_text) { subject.resource_text }
 
   let(:verb) { weight.positive? ? "upvoted" : "downvoted" }

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.0"
+      "0.28.1"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-04-30 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.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -168,7 +168,6 @@ files:
 - app/views/decidim/comments/votes/create.js.erb
 - app/views/decidim/comments/votes/error.js.erb
 - config/assets.rb
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -201,6 +200,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -264,7 +264,9 @@ files:
 - db/migrate/20200828101910_add_commentable_counter_cache_to_comments.rb
 - db/migrate/20210402124534_add_participatory_process_to_comments.rb
 - db/migrate/20210529095942_add_deleted_at_column_to_comments.rb
+- db/migrate/20240304092558_add_comment_vote_counter_cache_to_comments.rb
 - db/seeds.rb
+- decidim-comments.gemspec
 - lib/decidim/api/add_comment_type.rb
 - lib/decidim/api/comment_mutation_type.rb
 - lib/decidim/api/comment_type.rb
@@ -304,23 +306,23 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: Decidim comments module
 test_files: []

data/config/environment.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# Empty line for playing nice with tpope/vim-rails