decidim-comments 0.28.4 → 0.28.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbdb2c1ba078deb03eb9266fe4047dae36f65eb0f078fb0f96bc7ea605f0a3e9
-  data.tar.gz: d67caef2f4d9c176f64c754fedba78de154962543bcae08aefb3c72a0c902a36
+  metadata.gz: 8df268a35db56cb108b71a7442761c7a6c74a3a53a4849c93d42111defbceefd
+  data.tar.gz: 4083707523af88229f93f3efa583a9fd35ebae7f40aea143696831ffb1c27f30
 SHA512:
-  metadata.gz: 5e42856ddfb862b6fd0c2be7689710691d139cf07fdbbe015f479d78bac644cc278fcd900413fc1df80968ae25a6edff46396d471386e804af2b31479b622d53
-  data.tar.gz: 980cdf18259b3a89a2b86ed96b65a299272694dc2f8e1e920d07d0ffd49aa5208a893c48f3c62f6947b71e7a33d7b55e80e44089b4eebf27770f0fc6ada507f3
+  metadata.gz: e23b591dc87c94a3bcab34da91347b04ddb48a529affb366e33075f3bda1dac4af608f47b9ae4fd0d2e970767c9d9a884020773144c5ef53989fd6ee1bbf30b5
+  data.tar.gz: 34e686b75054282b6dab8f754056eef7ed08daefc81daebf0c33a6f8d62968f6b0ed52a8dff5cbe0b76996159f158e9da733918ed34308235c10d5438cc2680c

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

@@ -10,6 +10,12 @@ $(() => {
   var commentId = <%= @comment.id.to_json %>;
   var $comment = $("#comment_<%= @comment.id %>");
 
+  var $edit_modal = document.getElementById(`editCommentModal${commentId}`)
+
+  if ($edit_modal !== undefined) {
+    $edit_modal.remove()
+  }
+
   $comment.replaceWith(commentHtml);
 
   // Re-create the component

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1,15 @@
+---
+bs:
+  decidim:
+    components:
+      comments:
+        comment_details_title: Detalji o komentaru
+        single_comment_warning_title: Vidite samo jedan komentar
+    events:
+      comments:
+        comment_by_followed_user_group:
+          email_intro: 'Grupa %{author_name} je ostavila komentar na %{resource_title}. Možete ga pročitati na ovoj strani:'
+        user_group_mentioned:
+          email_intro: Grupa kojoj pripadate je pomenuta
+          email_outro: Dobili ste ovo obaveštenje jer ste član grupe %{group_name} koja je pomenuta u %{resource_title}.
+          email_subject: Pomenuti ste u %{resource_title} kao član grupe %{group_name}

data/config/locales/ca.yml

@@ -137,7 +137,7 @@ ca:
           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_intro: "Algú ha deixat un comentari a \"%{resource_title}\". Pots llegir el comentari a través del següent enllaç:"
           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>

data/config/locales/de.yml

@@ -87,7 +87,7 @@ de:
           details: Zusätzliche Kommentare
           reasons:
             does_not_belong: Enthält illegale Aktivitäten, Selbstmorddrohungen, persönliche Informationen oder etwas anderes, von dem Sie denken, dass es nicht auf %{organization_name} gehört.
-            offensive: Enthält Rassismus, Sexismus, Verleumdungen, persönliche Angriffe, Morddrohungen, Selbstmordanträge oder jegliche Form von Hassreden.
+            offensive: Enthält Formen von Rassismus, Sexismus, Verleumdungen, persönliche Angriffe, Morddrohungen, Selbstmordanträge oder andere Formen von seelischer Gewalt.
             spam: Enthält Clickbait, Werbung, Scams oder Script Bots.
           title: Ungeeigneten Inhalt melden
         show_replies:

data/config/locales/es.yml

@@ -137,7 +137,7 @@ 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_created:
-          email_intro: "%{resource_title} ha sido comentado. Puedes leer el comentario en esta página:"
+          email_intro: "Alguien ha dejado un comentario en \"%{resource_title}\". Puedes leer el comentario a través del siguiente enlace:"
           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>

data/config/locales/eu.yml

@@ -14,15 +14,15 @@ eu:
         one: Iruzkina
         other: Iruzkinak
       decidim/comments/comment_vote:
-        one: Bozkatu
-        other: Botoak
+        one: Babesa
+        other: Babesak
   decidim:
     comments:
       admin:
         shared:
           availability_fields:
             enabled: Iruzkinak gaituta
-            end_time: Iruzkinak gaituta daude
+            end_time: Iruzkinak noiz arte gaituta
             start_time: Iruzkinak noiztik aktibatuta
       comments:
         create:
@@ -33,10 +33,10 @@ eu:
           error: Arazo bat ego da iruzkina eguneratzean.
       comments_title: Iruzkina
       last_activity:
-        new_comment: 'Beste iruzkin bat:'
+        new_comment: 'Iruzkin berria:'
       votes:
         create:
-          error: Arazo bat egon da iruzkina bozkatzean.
+          error: Arazo bat dago iruzkina bozkatzeko.
     components:
       add_comment_form:
         account_message: <a href="%{sign_in_url}">Sartu zure kontuarekin</a> edo <a href="%{sign_up_url}">erregistratu</a> zure iruzkina gehitzeko.
@@ -45,8 +45,8 @@ eu:
             label: Iruzkina
             placeholder: Zer deritzozu honi?
           form_error: Testua behar da, eta ezin du izan %{length} karaktere baino gehiago.
-          submit_reply: Argitaratu erantzuna
-          submit_root_comment: Argitaratu iruzkina
+          submit_reply: Erantzuna argitaratu
+          submit_root_comment: Iruzkina argitaratu
           user_group_id:
             label: 'Egin iruzkina honako honen gisa:'
         opinion:
@@ -57,14 +57,14 @@ eu:
           neutral_selected: Zure iritzia gai honi buruz neutroa da
           positive: Positiboa
           positive_selected: Zure iritzia gai honi buruz positiboa da
-        remaining_characters: "%{count} karaktere geratzen dira"
+        remaining_characters: "%{count} kakaktere geratzen dira"
         remaining_characters_1: "karaktere %{count} geratzen da"
         title: Gehitu zure iruzkina
       comment:
         alignment:
           against: Aurka
           in_favor: Alde
-        cancel_reply: Ezeztatu erantzuna
+        cancel_reply: Erantzuna ezabatu
         comment_label: Iruzkindu %{comment_id}
         comment_label_reply: Iruzkindu %{comment_id} (erantzun %{parent_comment_id} iruzkinei)
         confirm_destroy: Ziur zaude iruzkin hau ezabatu nahi duzula?
@@ -74,6 +74,9 @@ eu:
         deleted_user: Parte-hartzailea ezabatua
         edit: Editatu
         edited: Editatuta
+        hide_replies:
+          one: Ezkutatu erantzuna
+          other: Ezkutatu %{count} erantzun
         moderated_at: Iruzkina %{date}-an moderatu egin da
         reply: Erantzuna
         report:
@@ -107,7 +110,7 @@ eu:
         single_comment_warning: <a href="%{url}">k erakusten ditu iruzkin guztiak</a>
         single_comment_warning_title: Iruzkin bakar bat ikusten ari zara
         title:
-          one: "%{count} iruzkin"
+          one: "Iruzkin bat"
           other: "%{count} iruzkin"
       down_vote_button:
         text: Ez nago ados iruzkin honekin
@@ -125,7 +128,7 @@ eu:
       comments:
         comment_by_followed_user:
           email_intro: "%{author_name} egileak iruzkin bat utzi du %{resource_title} helbidean. Orri honetan irakur dezakezu:"
-          email_outro: Jakinarazpen hau jaso duzu %{author_name} erabiltzailea jarraitzen duzulako. Nahi izatekotan erabiltzaile hori bere profil-orritik jarraitzeari utz diezaiokezu.
+          email_outro: Jakinarazpen hau jaso duzu %{author_name} parte-hartzailea jarraitzen duzulako. Nahi izatekotan erabiltzaile hori bere profil-orritik jarraitzeari utz diezaiokezu.
           email_subject: '%{author_name} k beste iruzkin bat egin du hemen: %{resource_title}'
           notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> k iruzkin berri bat egin du hemen: <a href="%{resource_path}">%{resource_title}</a>-an.'
         comment_by_followed_user_group:
@@ -139,7 +142,7 @@ eu:
           email_subject: '%{author_name} k beste iruzkin berri bat egin du hemen: %{resource_title}'
           notification_title: '<a href="%{author_path}">%{author_name} %{author_nickname}</a> k iruzkin berri bat egin du hemen: <a href="%{resource_path}">%{resource_title}</a></a>'
         comment_downvoted:
-          email_intro: Zure iruzkina hemen "%{resource_title}" negatiboki bozkatu da. Orain %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu guztira.
+          email_intro: Zure iruzkina hemen "%{resource_title}" negatiboki bozkatu da. Orain %{upvotes} babes positibo eta %{downvotes} boto negatibo dituzu guztira.
           email_outro: Jakinarazpen hau jaso duzu iruzkin honen egilea zarelako.
           email_subject: Zure iruzkina hemen "%{resource_title}" negatiboki bozkatu da.
           notification_title: Zure <a href="%{resource_path}">iruzkina</a> hemen "%{resource_title}" negatiboki bozkatu da. Orain guztira %{upvotes} boto positibo eta %{downvotes} boto negatibo dituzu.
@@ -149,9 +152,9 @@ eu:
           email_subject: Zure iruzkina hemen "%{resource_title}" positiboki bozkatu da.
           notification_title: Zure <a href="%{resource_path}">iruzkina </a> "%{resource_title}"-an positiboki bozkatu da. Orain guztira %{upvotes} botos positibo eta %{downvotes} boto negatibo dituzu.
         reply_created:
-          email_intro: "%{author_name} k zure iruzkina erantzun du hemen: %{resource_title}. Orri honetan irakur dezakezu:"
+          email_intro: "%{author_name} egileak zure iruzkina erantzun du hemen: %{resource_title}. Orri honetan irakur dezakezu:"
           email_outro: Jakinarazpen hau jaso duzu zure iruzkina erantzun delako.
-          email_subject: "%{author_name}-k zure iruzkina erantzun du hemen: %{resource_title}"
+          email_subject: "%{author_name} k zure iruzkina erantzun du hemen: %{resource_title}"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> -k zure iruzkinari erantzun dio <a href="%{resource_path}">%{resource_title}</a>
         user_group_mentioned:
           email_intro: Zure talde bat aipatu dute
@@ -165,7 +168,7 @@ eu:
           notification_title: 'Hemen: <a href="%{group_path}">%{group_name} %{group_nickname}</a> egile honek: <a href="%{author_path}">%{author_name} %{author_nickname}</a> aipatu zaitu'
     metrics:
       comments:
-        description: Erabiltzaileek sortutako iruzkin kopurua
+        description: Parte-hatzaileek sortutako iruzkin kopurua
         object: iruzkinak
         title: Iruzkinak
   errors:

data/config/locales/fi.yml

@@ -102,7 +102,7 @@ fi:
           recent: Uusimmat
         title: 'Järjestä tulokset:'
       comments:
-        blocked_comments_for_unauthorized_user_warning: Tilisi tulee olla varmennettu, jotta voit kommentoida tällä hetkellä. Voit kuitenkin lukea muiden jättämiä kommentteja.
+        blocked_comments_for_unauthorized_user_warning: Tilisi tulee olla vahvistettu, jotta voit kommentoida tällä hetkellä. Voit kuitenkin lukea muiden jättämiä kommentteja.
         blocked_comments_for_user_warning: Et voi kommentoida tällä hetkellä, mutta voit lukea aikaisempia kommentteja.
         blocked_comments_warning: Kommentit on poistettu käytöstä tällä hetkellä, mutta voit lukea aikaisempia kommentteja.
         comment_details_title: Kommentin yksityiskohdat
@@ -128,7 +128,7 @@ fi:
       comments:
         comment_by_followed_user:
           email_intro: "%{author_name} on jättänyt kommentin kohteessa %{resource_title}. Voit lukea sen sivulta:"
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat %{author_name}. Voit perua seuraamisen kyseisen käyttäjän profiilisivulta.
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat osallistujaa %{author_name}. Voit perua seuraamisen kyseisen osallistujan profiilisivulta.
           email_subject: '%{author_name} on jättänyt uuden kommentin kohteessa %{resource_title}'
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on jättänyt uuden kommentin kohteessa <a href="%{resource_path}">%{resource_title}</a>.
         comment_by_followed_user_group:
@@ -155,7 +155,7 @@ fi:
           email_intro: "%{author_name} on vastannut kommentiisi kohdassa %{resource_title}. Voit lukea sen sivulta:"
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska kommenttiisi vastattiin.
           email_subject: "%{author_name} on vastannut kommentiisi %{resource_title}"
-          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on vastannut kommentiisi kohdassa <a href="%{resource_path}">%{resource_title}</a>
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on vastannut kommentiisi kohteessa <a href="%{resource_path}">%{resource_title}</a>
         user_group_mentioned:
           email_intro: Ryhmä, jonka jäsen olet, on mainittu
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet jäsenenä ryhmässä %{group_name} ja ryhmä on mainittu kohteessa %{resource_title}.
@@ -165,7 +165,7 @@ fi:
           email_intro: Sinut on mainittu
           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>
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> on maininnut sinut kohteessa <a href="%{resource_path}">%{resource_title}</a>
     metrics:
       comments:
         description: Käyttäjien kirjoittamien kommenttien määrä

data/decidim-comments.gemspec

@@ -10,7 +10,7 @@ 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.license = "AGPL-3.0-or-later"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",

data/lib/decidim/api/comment_type.rb

@@ -84,6 +84,19 @@ module Decidim
       def user_allowed_to_comment
         object.root_commentable.commentable? && object.root_commentable.user_allowed_to_comment?(context[:current_user])
       end
+
+      def self.authorized?(object, context)
+        chain = []
+        if object.respond_to?(:commentable) && !object.commentable.is_a?(Decidim::Comments::Comment)
+          chain.unshift(allowed_to?(:read, object.commentable, object.commentable,
+                                    context))
+        end
+
+        chain.unshift(!object.hidden?)
+        chain.unshift(!object.deleted?)
+
+        super && chain.all?
+      end
     end
   end
 end

data/lib/decidim/api/commentable_interface.rb

@@ -17,7 +17,7 @@ module Decidim
 
       field :comments_have_votes, GraphQL::Types::Boolean, "Whether the object comments have votes or not", method: :comments_have_votes?, null: false
 
-      field :comments, [Decidim::Comments::CommentType], null: false do
+      field :comments, [Decidim::Comments::CommentType, { null: false }], null: false do
         argument :order_by, GraphQL::Types::String, "Order the comments", required: false
         argument :single_comment_id, GraphQL::Types::String, "ID of the single comment to look at", required: false
       end
@@ -45,6 +45,12 @@ module Decidim
       def user_allowed_to_comment
         object.commentable? && object.user_allowed_to_comment?(context[:current_user])
       end
+
+      definition_methods do
+        def resolve_type(object, _context)
+          GraphQL::Types.const_get("#{object.class.name}Type")
+        end
+      end
     end
   end
 end

data/lib/decidim/comments/commentable_with_component.rb

@@ -9,6 +9,7 @@ module Decidim
     module CommentableWithComponent
       extend ActiveSupport::Concern
       include Decidim::Comments::Commentable
+      include Decidim::UserRoleChecker
 
       included do
         # Public: Overrides the `commentable?` Commentable concern method.
@@ -23,7 +24,8 @@ module Decidim
 
         # Public: Whether the object can have new comments or not.
         def user_allowed_to_comment?(user)
-          return unless can_participate?(user)
+          return true if user_has_any_role?(user, component.participatory_space)
+          return false unless can_participate?(user)
 
           ActionAuthorizer.new(user, "comment", component, self).authorize.ok?
         end

data/lib/decidim/comments/query_extensions.rb

@@ -11,7 +11,7 @@ module Decidim
       #
       # Returns nothing.
       def self.included(type)
-        type.field :commentable, CommentableType, null: false do
+        type.field :commentable, Decidim::Comments::CommentableInterface do
           argument :id, GraphQL::Types::String, "The commentable's ID", required: true
           argument :type, GraphQL::Types::String, "The commentable's class name. i.e. `Decidim::ParticipatoryProcess`", required: true
           argument :locale, GraphQL::Types::String, "The locale for which to get the comments text", required: true

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

@@ -8,7 +8,7 @@ FactoryBot.define do
       skip_injection { false }
     end
     author { build(:user, organization: commentable.organization, skip_injection:) }
-    commentable { build(:dummy_resource, skip_injection:) }
+    commentable { build(:dummy_resource, :published, skip_injection:) }
     root_commentable { commentable }
     body { Decidim::Faker::Localized.paragraph }
     participatory_space { commentable.try(:participatory_space) }

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.4"
+      "0.28.5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.28.4
+  version: 0.28.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2025-02-12 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.4
+        version: 0.28.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.5
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +52,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.28.5
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -173,6 +173,8 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
+- config/locales/bn-BD.yml
+- config/locales/bs-BA.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -299,7 +301,7 @@ files:
 - lib/tasks/decidim_comments.rake
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0
+- AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/