decidim-comments 0.26.0.rc2 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 491d732fb467090bacdc4ab8f9551398af9a52c16125572a92a1051f41995a17
-  data.tar.gz: 6f7d9fa298644e456edf95f9c45dc6909018a02a9ddd8b60b60c4d048e6b79ad
+  metadata.gz: 9903736806a3d7efe85f3d373935800106918e251e43cf8ec24cc7e9ec8f8797
+  data.tar.gz: 3a2649ef1b67bdc602b203de100b7ef51b8ff9751cd399244170690082880e2f
 SHA512:
-  metadata.gz: 62343580a36c2b6485610784eeacb6180492e2a3f998cfcc0c4ebce8849652c80bc34b4d19e2415444a394c920524159b2f07062c3b177f65bd81287ba6a2901
-  data.tar.gz: 80d702e7c49c1e326b029ad7ec67c0739f4227cdcb93bc94ce85cf5a8ad4b1a3e170496fc579c06b7a79eee0fc8956dfbfc5b7a2392d50b133c68ca927fe7fce
+  metadata.gz: 50a349c6acd1b0e54e2d94e7fa98304e90ac052485058e78e9b1e67b647a9cacecb679f2843bfaf31db1e9bf6186bf07b2fc359bf7058eae035791196012c924
+  data.tar.gz: 3d2f9498c1ebecafd97f386fc2fdbfc2d8033959880148be737e2187a0cb53640d2345234e21c9568c5685de6bbcc11b4f19f66fb71599ef1932ffd33fc001da

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

@@ -0,0 +1 @@
+<%= render partial: "decidim/comments/comments/moderated.html", locals: { comment: model } %>

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

@@ -1,5 +1,7 @@
 <%= content_tag :div, id: "comment_#{model.id}", class: comment_classes, data: { comment_id: model.id } do %>
-  <% if model.deleted? %>
+  <% if model.hidden? %>
+    <%= render :moderation_data %>
+  <% elsif model.deleted? %>
     <%= render :deletion_data %>
   <% else %>
     <div class="comment__header">
@@ -30,14 +32,14 @@
     </div>
   <% end %>
   <div id="comment-<%= model.id %>-replies">
-    <% if has_replies? %>
+    <% if has_replies_in_children? %>
       <% replies.each do |reply| %>
         <%= cell("decidim/comments/comment", reply, root_depth: root_depth, order: order, reloaded: reloaded?) %>
       <% end %>
     <% end %>
   </div>
   <% if can_reply? %>
-    <div class="comment__additionalreply<%= " hide" unless has_replies? %>">
+    <div class="comment__additionalreply<%= " hide" unless commentable? %>">
       <button class="comment__reply muted-link" aria-controls="<%= reply_id %>" data-toggle="<%= reply_id %>">
         <%= icon "pencil", class: "icon--small", role: "img", "aria-hidden": true %>&nbsp;<%= t("decidim.components.comment.reply") %>
       </button>

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

@@ -34,7 +34,7 @@ module Decidim
       end
 
       def perform_caching?
-        super && has_replies? == false
+        super && has_replies_in_children? == false
       end
 
       private
@@ -181,8 +181,16 @@ module Decidim
         depth.even?
       end
 
+      def commentable?
+        has_replies? && !model.deleted? && !model.hidden?
+      end
+
       def has_replies?
-        model.comment_threads.any?
+        model.comment_threads.includes(:moderation).collect { |c| !c.deleted? && !c.hidden? }.any?
+      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?
       end
 
       # action_authorization_button expects current_component to be available

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

@@ -83,9 +83,10 @@ module Decidim
       end
 
       alias original_participatory_space participatory_space
+
       def participatory_space
         return original_participatory_space if original_participatory_space.present?
-        return root_commentable if root_commentable.is_a?(Decidim::Participable)
+        return root_commentable unless root_commentable.respond_to?(:participatory_space)
 
         root_commentable.participatory_space
       end
@@ -101,13 +102,6 @@ module Decidim
         root_commentable.accepts_new_comments? && depth < MAX_DEPTH
       end
 
-      # Public: Override comment threads to exclude hidden ones.
-      #
-      # Returns comment.
-      def comment_threads
-        super.reject(&:hidden?)
-      end
-
       # Public: Override Commentable concern method `users_to_notify_on_comment_created`.
       # Return the comment author together with whatever ActiveRecord::Relation is returned by
       # the `commentable`. This will cause the comment author to be notified when the

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

@@ -31,7 +31,6 @@ module Decidim
       # level of nested replies.
       def query
         scope = base_scope
-                .not_hidden
                 .includes(:author, :user_group, :up_votes, :down_votes)
 
         case @options[:order_by]

data/app/views/decidim/comments/comments/_moderated.html.erb

@@ -0,0 +1,5 @@
+<div class="comment__header">
+  <div class="comment__moderated">
+    <%= t("decidim.components.comment.moderated_at", date: l(comment.moderation.hidden_at, format: :decidim_short)) %>
+  </div>
+</div>

data/config/locales/ca.yml

@@ -70,6 +70,7 @@ ca:
         edit: Editar
         edited: Editat
         hide_replies: Oculta les respostes
+        moderated_at: Comentari moderat el %{date}
         reply: Respondre
         report:
           action: Denúncia

data/config/locales/de.yml

@@ -70,6 +70,7 @@ de:
         edit: Bearbeiten
         edited: Bearbeitet
         hide_replies: Antworten verbergen
+        moderated_at: Kommentar moderiert am %{date}
         reply: Antworten
         report:
           action: Melden

data/config/locales/en.yml

@@ -71,6 +71,7 @@ en:
         edit: Edit
         edited: Edited
         hide_replies: Hide replies
+        moderated_at: Comment moderated on %{date}
         reply: Reply
         report:
           action: Report

data/config/locales/es-MX.yml

@@ -70,6 +70,7 @@ es-MX:
         edit: Editar
         edited: Editado
         hide_replies: Ocultar respuestas
+        moderated_at: Comentario moderado el %{date}
         reply: Respuesta
         report:
           action: Denunciar

data/config/locales/es-PY.yml

@@ -70,6 +70,7 @@ es-PY:
         edit: Editar
         edited: Editado
         hide_replies: Ocultar respuestas
+        moderated_at: Comentario moderado el %{date}
         reply: Respuesta
         report:
           action: Denunciar

data/config/locales/es.yml

@@ -70,6 +70,7 @@ es:
         edit: Editar
         edited: Editado
         hide_replies: Ocultar respuestas
+        moderated_at: Comentario moderado el %{date}
         reply: Respuesta
         report:
           action: Denunciar

data/config/locales/fr-CA.yml

@@ -70,6 +70,7 @@ fr-CA:
         edit: Modifier
         edited: Modifié
         hide_replies: Cacher les réponses
+        moderated_at: Commentaire modéré le %{date}
         reply: Répondre
         report:
           action: Signaler

data/config/locales/fr.yml

@@ -70,6 +70,7 @@ fr:
         edit: Modifier
         edited: Modifié
         hide_replies: Cacher les réponses
+        moderated_at: Commentaire modéré le %{date}
         reply: Répondre
         report:
           action: Signaler

data/config/locales/hu.yml

@@ -43,6 +43,7 @@ hu:
           in_favor: Támogatom
         deleted_user: Törölt felhasználó
         hide_replies: Válaszok elrejtése
+        moderated_at: Hozzászólás moderálva %{date}
         reply: Válasz
         report:
           action: Jelentés

data/config/locales/ja.yml

@@ -68,6 +68,7 @@ ja:
         edit: 編集
         edited: 編集済み
         hide_replies: 返信を非表示
+        moderated_at: '%{date} にモデレートされたコメント'
         reply: 返信
         report:
           action: レポート

data/config/locales/no.yml

@@ -16,9 +16,24 @@
         other: Stemmer
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Kommentarer aktivert
+            end_time: Kommentarer aktivert til
+            start_time: Kommentarer aktivert fra
+      comments:
+        create:
+          error: Et problem oppstod med å opprette kommentaren.
+        delete:
+          error: Kommentaren kunne ikke slettes.
+        update:
+          error: Et problem oppstod med å oppdatere kommentaren.
       comments_count: Antall kommentarer
+      comments_title: Kommentarer
       last_activity:
         new_comment_at_html: "<span>Ny kommentar på %{link}</span>"
+      view: Vis
       votes:
         create:
           error: Det oppstod et problem med å stemme kommentaren.
@@ -34,7 +49,13 @@
           user_group_id:
             label: Kommenter som
         opinion:
+          label: Din mening om dette temaet
+          negative: Negativ
+          negative_selected: Din mening om dette emnet er negativ
           neutral: Nøytral
+          neutral_selected: Din mening om dette emnet er nøytral
+          positive: Positiv
+          positive_selected: Din mening om dette emnet er positivt
         remaining_characters: "%{count} tegn igjen"
         remaining_characters_1: "%{count} tegn igjen"
         title: Legg til kommentar
@@ -42,7 +63,12 @@
         alignment:
           against: Imot
           in_favor: I favør
+        confirm_destroy: Er du sikker på at du vil slette denne kommentaren?
+        delete: Slett
+        deleted_at: Kommentar slettet den %{date}
         deleted_user: Slettet deltaker
+        edit: Rediger
+        edited: Redigert
         hide_replies: Skjul svar
         reply: Svar
         report:
@@ -57,6 +83,7 @@
             spam: Inneholder klikkagn, reklame, svindel eller manus-roboter.
           title: Rapporter upassende innhold
         show_replies: Vis %{replies_count} svar
+        single_comment_link_title: Få lenke
       comment_order_selector:
         order:
           best_rated: Best vurdert
@@ -67,13 +94,26 @@
       comment_thread:
         title: Samtale med %{authorName}
       comments:
+        blocked_comments_for_unauthorized_user_warning: Du må verifiseres for å kommentere, men du kan lese de forrige.
         blocked_comments_for_user_warning: Du kan ikke kommentere for øyeblikket, men du kan lese de forrige.
         blocked_comments_warning: Kommenterer er deaktivert på dette tidspunktet, men du kan lese de forrige.
         comment_details_title: Kommenter detaljer
         loading: Laster inn kommenterer ...
+        single_comment_warning: <a href="%{url}">Se alle kommentarer</a>
         single_comment_warning_title: Du ser en enkelt kommentar
+        title:
+          one: "%{count} kommentar"
+          other: "%{count} kommentarer"
       down_vote_button:
         text: Jeg er uenig med denne kommentaren
+      edit_comment_modal_form:
+        close: Lukk
+        form:
+          body:
+            label: Kommenter
+            placeholder: Hva mener du om dette?
+          submit: Send
+        title: Rediger din kommentar
       up_vote_button:
         text: Jeg er enig med denne kommentaren
     events:
@@ -93,6 +133,16 @@
           email_outro: Du har mottatt denne varslingen fordi du følger "%{resource_title}" eller dens forfatter. Du kan slutte å følge den fra den forrige lenken.
           email_subject: Det er en ny kommentar fra %{author_name} i %{resource_title}
           notification_title: Det er en ny kommentar fra <a href="%{author_path}">%{author_name} %{author_nickname}</a> i <a href="%{resource_path}">%{resource_title}</a>
+        comment_downvoted:
+          email_intro: Din kommentar i "%{resource_title}" har blitt stemt ned. Den har nå totalt %{upvotes} stemmer opp og %{downvotes} stemmer ned.
+          email_outro: Du har mottatt dette varselet fordi du er forfatteren av denne kommentaren.
+          email_subject: Din kommentar i "%{resource_title}" har blitt stemt ned.
+          notification_title: Din <a href="%{resource_path}">kommentar</a> i "%{resource_title}" har blitt stemt ned. Den har nå totalt %{upvotes} stemmer opp og %{downvotes} stemmer ned.
+        comment_upvoted:
+          email_intro: Din kommentar i "%{resource_title}" har blitt stemt opp. Den har nå totalt %{upvotes} stemmer opp og %{downvotes} stemmer ned.
+          email_outro: Du har mottatt dette varselet fordi du er forfatteren av denne kommentaren.
+          email_subject: Din kommentar i "%{resource_title}" har blitt stemt opp.
+          notification_title: Din <a href="%{resource_path}">kommentar</a> i "%{resource_title}" har blitt stemt opp. Den har nå totalt %{upvotes} stemmer opp og %{downvotes} stemmer ned.
         reply_created:
           email_intro: "%{author_name} har svart kommentaren din i %{resource_title}. Du kan lese den på denne siden:"
           email_outro: Du har mottatt denne varslingen fordi din kommentar er besvart.

data/lib/decidim/api/comment_type.rb

@@ -74,7 +74,7 @@ module Decidim
       end
 
       def has_comments?
-        object.comment_threads.size.positive?
+        object.comment_threads.not_hidden.size.positive?
       end
 
       def already_reported

data/lib/decidim/api/commentable_interface.rb

@@ -25,7 +25,7 @@ module Decidim
       field :total_comments_count, GraphQL::Types::Int, description: "The number of comments in all levels this resource holds", null: false
 
       def comments(order_by: nil, single_comment_id: nil)
-        SortedComments.for(object, order_by: order_by, id: single_comment_id)
+        SortedComments.for(object, order_by: order_by, id: single_comment_id).not_hidden
       end
 
       def total_comments_count
@@ -36,7 +36,7 @@ module Decidim
 
       # rubocop:disable Naming/PredicateName
       def has_comments
-        object.comment_threads.size.positive?
+        object.comment_threads.not_hidden.size.positive?
       end
       # rubocop:enable Naming/PredicateName
 

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.rc2"
+      "0.26.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.26.0.rc2
+  version: 0.26.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-02-22 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.rc2
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
 - !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.rc2
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -89,6 +89,7 @@ files:
 - app/cells/decidim/comments/comment/alignment_badge.erb
 - app/cells/decidim/comments/comment/author.erb
 - app/cells/decidim/comments/comment/deletion_data.erb
+- app/cells/decidim/comments/comment/moderation_data.erb
 - app/cells/decidim/comments/comment/show.erb
 - app/cells/decidim/comments/comment/utilities.erb
 - app/cells/decidim/comments/comment/votes.erb
@@ -153,6 +154,7 @@ files:
 - app/views/decidim/comments/comments/_comments.html.erb
 - app/views/decidim/comments/comments/_delete.html.erb
 - app/views/decidim/comments/comments/_edited_comment.html.erb
+- app/views/decidim/comments/comments/_moderated.html.erb
 - app/views/decidim/comments/comments/create.js.erb
 - app/views/decidim/comments/comments/delete.js.erb
 - app/views/decidim/comments/comments/deletion_error.js.erb
@@ -297,9 +299,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: