decidim 0.5.1 → 0.6.0

data/decidim-budgets/spec/models/project_spec.rb

@@ -42,4 +42,12 @@ describe Decidim::Budgets::Project do
       expect(project.confirmed_orders_count).to eq(1)
     end
   end
+
+  describe "#users_to_notify_on_comment_created" do
+    let!(:follows) { create_list(:follow, 3, followable: subject) }
+
+    it "returns the followers" do
+      expect(subject.users_to_notify_on_comment_created).to match_array(follows.map(&:user))
+    end
+  end
 end

data/decidim-budgets/spec/queries/decidim/budgets/filtered_projects_spec.rb

@@ -5,8 +5,8 @@ require "spec_helper"
 describe Decidim::Budgets::FilteredProjects do
   let(:organization) { create(:organization) }
   let(:participatory_process) { create(:participatory_process, organization: organization) }
-  let(:feature) { create(:budget_feature, participatory_process: participatory_process) }
-  let(:another_feature) { create(:budget_feature, participatory_process: participatory_process) }
+  let(:feature) { create(:budget_feature, participatory_space: participatory_process) }
+  let(:another_feature) { create(:budget_feature, participatory_space: participatory_process) }
 
   let(:projects) { create_list(:project, 3, feature: feature) }
   let(:old_projects) { create_list(:project, 3, feature: feature, created_at: 10.days.ago) }

data/decidim-budgets/spec/services/project_search_spec.rb

@@ -6,7 +6,7 @@ describe Decidim::Budgets::ProjectSearch do
   let(:current_feature) { create :budget_feature }
   let(:scope1) { create :scope, organization: current_feature.organization }
   let(:scope2) { create :scope, organization: current_feature.organization }
-  let(:parent_category) { create :category, participatory_process: current_feature.participatory_process }
+  let(:parent_category) { create :category, participatory_space: current_feature.participatory_space }
   let(:subcategory) { create :subcategory, parent: parent_category }
   let!(:project1) do
     create(

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

@@ -22,8 +22,10 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        create_comment
-        send_notification if @commentable.notifiable?(author: @author)
+        transaction do
+          create_comment
+          send_notification
+        end
 
         broadcast(:ok, @comment)
       end
@@ -42,15 +44,15 @@ module Decidim
       end
 
       def send_notification
-        if @comment.depth.positive?
-          @commentable.users_to_notify.each do |user|
-            CommentNotificationMailer.reply_created(user, @comment, @commentable, @comment.root_commentable).deliver_later
-          end
-        elsif @comment.depth.zero?
-          @commentable.users_to_notify.each do |user|
-            CommentNotificationMailer.comment_created(user, @comment, @commentable).deliver_later
-          end
-        end
+        Decidim::EventsManager.publish(
+          event: "decidim.events.comments.comment_created",
+          event_class: Decidim::Comments::CommentCreatedEvent,
+          resource: @comment.root_commentable,
+          recipient_ids: (@commentable.users_to_notify_on_comment_created - [@author]).pluck(:id),
+          extra: {
+            comment_id: @comment.id
+          }
+        )
       end
 
       def root_commentable(commentable)

data/decidim-comments/app/events/decidim/comments/comment_created_event.rb

@@ -0,0 +1,56 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Comments
+    class CommentCreatedEvent < Decidim::Events::BaseEvent
+      include Decidim::Events::EmailEvent
+      include Decidim::Events::NotificationEvent
+
+      def email_subject
+        I18n.t(
+          "decidim.comments.events.comment_created.#{comment_type}.email_subject",
+          resource_title: resource_title,
+          resource_url: resource_locator.url(url_params),
+          author_name: comment.author.name
+        )
+      end
+
+      def email_intro
+        I18n.t(
+          "decidim.comments.events.comment_created.#{comment_type}.email_intro",
+          resource_title: resource_title
+        ).html_safe
+      end
+
+      def email_outro
+        I18n.t(
+          "decidim.comments.events.comment_created.#{comment_type}.email_outro",
+          resource_title: resource_title
+        )
+      end
+
+      def notification_title
+        I18n.t(
+          "decidim.comments.events.comment_created.#{comment_type}.notification_title",
+          resource_title: resource_title,
+          resource_path: resource_locator.path(url_params),
+          author_name: comment.author.name
+        ).html_safe
+      end
+
+      private
+
+      def comment
+        @comment ||= Decidim::Comments::Comment.find(extra["comment_id"])
+      end
+
+      def comment_type
+        comment.depth.zero? ? :comment : :reply
+      end
+
+      def url_params
+        comment_type == :comment ? {} : { anchor: "comment_#{comment.id}" }
+      end
+    end
+  end
+end

data/decidim-comments/app/frontend/comments/add_comment_form.component.tsx

@@ -38,7 +38,7 @@ interface AddCommentFormState {
   remainingCharacterCount: number;
 }
 
-export const MAX_LENGTH = 500;
+export const MAX_LENGTH = 1000;
 
 /**
  * Renders a form to create new comments.

data/decidim-comments/app/models/decidim/comments/abilities/participatory_process_admin_ability.rb

@@ -10,7 +10,7 @@ module Decidim
           super
 
           can [:manage, :unreport, :hide], Comment do |comment|
-            can_manage_process?(comment.feature.participatory_process)
+            can_manage_process?(comment.feature.participatory_space)
           end
         end
       end

data/decidim-comments/app/models/decidim/comments/abilities/participatory_process_moderator_ability.rb

@@ -10,7 +10,7 @@ module Decidim
           super
 
           can [:unreport, :hide], Comment do |comment|
-            can_manage_process?(comment.feature.participatory_process)
+            can_manage_process?(comment.feature.participatory_space)
           end
         end
       end

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

@@ -27,7 +27,7 @@ module Decidim
       validates :depth, numericality: { greater_than_or_equal_to: 0 }
       validates :alignment, inclusion: { in: [0, 1, -1] }
 
-      validates :body, length: { maximum: 500 }
+      validates :body, length: { maximum: 1000 }
 
       validate :commentable_can_have_comments
 
@@ -40,6 +40,11 @@ module Decidim
         depth < MAX_DEPTH
       end
 
+      # Public: Override Commentable concern method `users_to_notify_on_comment_created`
+      def users_to_notify_on_comment_created
+        root_commentable.users_to_notify_on_comment_created
+      end
+
       # Public: Check if the user has upvoted the comment
       #
       # Returns a bool value to indicate if the condition is truthy or not
@@ -59,18 +64,6 @@ module Decidim
         ResourceLocatorPresenter.new(root_commentable).url(anchor: "comment_#{id}")
       end
 
-      # Public: Overrides the `notifiable?` Notifiable concern method.
-      # When a comment is commented the comment's author is notified if it is not the same
-      # who has replied the comment and if the comment's author has replied notifiations enabled.
-      def notifiable?(context)
-        context[:author] != author && author.replies_notifications?
-      end
-
-      # Public: Overrides the `users_to_notify` Notifiable concern method.
-      def users_to_notify
-        [author]
-      end
-
       private
 
       # Private: Check if commentable can have comments and if not adds

data/decidim-comments/config/locales/ca.yml

@@ -1,30 +1,25 @@
+---
 ca:
-  activerecord:
-    errors:
-      messages:
-        cannot_have_comments: no pot tenir comentaris
   decidim:
     comments:
-      comment_notification_mailer:
+      events:
         comment_created:
-          new_comment_html: Hi ha un nou comentari d'<b>%{commenter}</b> a <b>%{commentable_link}</b>
-        hello: Hola %{name},
-        manage_email_subscriptions_html: Pots deixar de rebre aquests correus electrònics canviant la configuració a %{link}.
-        notifications_settings_link: la pàgina de configuració de les notificacions
-        reply_created:
-          new_reply_html: Hi ha una nova resposta del teu comentari de l'<b>%{commenter}</b> a <b>%{commentable_link}</b>
-      mailer:
-        comment_notification:
-          comment_created:
-            subject: Tens un nou comentari
-          reply_created:
-            subject: Tens una nova resposta del teu comentari
+          comment:
+            email_intro: S'ha comentat el "%{resource_title}"
+            email_outro: Has rebut aquesta notificació perquè que segueixes "%{resource_title}". El pots deixar de seguir al link anterior.
+            email_subject: Hi ha un nou comentari de %{author_name} a <a href="%{resource_url}">%{resource_title}</a>
+            notification_title: Hi ha un nou comentari de %{author_name} a <a href="%{resource_path}">%{resource_title}</a>
+          reply:
+            email_intro: S'ha comentat "%{resource_title}"
+            email_outro: Has rebut aquesta notificació perquè que segueixes "%{resource_title}". El pots deixar de seguir al link anterior.
+            email_subject: Hi ha una nova resposta del vostre comentari de %{author_name} a <a href="%{resource_url}">%{resource_title}</a>
+            notification_title: Hi ha una nova resposta del teu comentari de %{author_name} a <a href="%{resource_path}">%{resource_title}</a>
       votes:
         create:
           error: Hi ha hagut errors en votar el comentari.
     components:
       add_comment_form:
-        account_message: "<a href=\"%{sign_in_url}\">Entra amb el teu compte</a> o <a href=\"%{sign_up_url}\">registra't</a> per a deixar un comentari.\n"
+        account_message: <a href="%{sign_in_url}">Inicia la sessió amb el teu compte</a> o <a href="%{sign_up_url}">registra't</a> per afegir el teu comentari.
         form:
           body:
             label: Comentari
@@ -35,8 +30,8 @@ ca:
             label: Comentar com a
         opinion:
           neutral: Neutral
-        remaining_characters: "Queden %{count} caràcters"
-        remaining_characters_1: "Queda %{count} caràcter"
+        remaining_characters: Queden %{count} caràcters
+        remaining_characters_1: Queda %{count} caràcter
         title: Deixa el teu comentari
       comment:
         alignment:
@@ -71,3 +66,6 @@ ca:
         title: "%{count} comentaris"
       featured_comment:
         title: Comentari destacat
+  errors:
+    messages:
+      cannot_have_comments: no pot tenir comentaris

data/decidim-comments/config/locales/en.yml

@@ -1,31 +1,25 @@
 ---
 en:
-  activerecord:
-    errors:
-      messages:
-        cannot_have_comments: can't have comments
   decidim:
     comments:
-      comment_notification_mailer:
+      events:
         comment_created:
-          new_comment_html: There is a new comment from <b>%{commenter}</b> in <b>%{commentable_link}</b>
-        hello: Hello %{name},
-        manage_email_subscriptions_html: You can stop receiving these emails by changing your settings in %{link}.
-        notifications_settings_link: the notifications settings page
-        reply_created:
-          new_reply_html: There is a new reply of your comment from <b>%{commenter}</b> in <b>%{commentable_link}</b>
-      mailer:
-        comment_notification:
-          comment_created:
-            subject: You have a new comment
-          reply_created:
-            subject: You have a new reply of your comment
+          comment:
+            email_intro: The "%{resource_title}" has been commented
+            email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
+            email_subject: There is a new comment from %{author_name} in <a href="%{resource_url}">%{resource_title}</a>
+            notification_title: There is a new comment from %{author_name} in <a href="%{resource_path}">%{resource_title}</a>
+          reply:
+            email_intro: The "%{resource_title}" has been commented
+            email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
+            email_subject: There is a new reply of your comment from %{author_name} in <a href="%{resource_url}">%{resource_title}</a>
+            notification_title: There is a new reply of your comment from %{author_name} in <a href="%{resource_path}">%{resource_title}</a>
       votes:
         create:
           error: There's been errors when voting the comment.
     components:
       add_comment_form:
-        account_message: '<a href="%{sign_in_url}">Sign in with your account</a> or <a href="%{sign_up_url}">sign up</a> to add your comment. '
+        account_message: <a href="%{sign_in_url}">Sign in with your account</a> or <a href="%{sign_up_url}">sign up</a> to add your comment.
         form:
           body:
             label: Comment
@@ -72,3 +66,6 @@ en:
         title: "%{count} comments"
       featured_comment:
         title: Featured comment
+  errors:
+    messages:
+      cannot_have_comments: can't have comments

data/decidim-comments/config/locales/es.yml

@@ -1,42 +1,37 @@
+---
 es:
-  activerecord:
-    errors:
-      messages:
-        cannot_have_comments: no puede tener comentarios
   decidim:
     comments:
-      comment_notification_mailer:
+      events:
         comment_created:
-          new_comment_html: Hay un nuevo comentario de <b>%{commenter}</b> en <b>%{commentable_link}</b>
-        hello: Hola %{name},
-        manage_email_subscriptions_html: Puedes dejar de recibir estos correos electrónicos cambiando la configuración en %{link}.
-        notifications_settings_link: la página de configuración de las notificaciones
-        reply_created:
-          new_reply_html: Hay una nueva respuesta de tu comentario de <b>%{commenter}</b> en <b>%{commentable_link}</b>
-      mailer:
-        comment_notification:
-          comment_created:
-            subject: Tienes un nuevo comentario
-          reply_created:
-            subject: Uno de tus comentarios ha recibido respuesta
+          comment:
+            email_intro: Se ha comentado en "%{resource_title}"
+            email_outro: Has recibido esta notificación porque sigues "%{resource_title}". Puedes dejar de seguirlo en el enlace anterior.
+            email_subject: Hay un nuevo comentario de %{author_name} en <a href="%{resource_url}">%{resource_title}</a>
+            notification_title: Hay un nuevo comentario de %{author_name} en <a href="%{resource_path}">%{resource_title}</a>
+          reply:
+            email_intro: Se ha comentado en "%{resource_title}"
+            email_outro: Has recibido esta notificación porque sigues "%{resource_title}". Puedes dejar de seguirlo en el enlace anterior.
+            email_subject: Hay una nueva respuesta a tu comentario de %{author_name} en <a href="%{resource_url}">%{resource_title}</a>
+            notification_title: Hay una nueva respuesta a su comentario de %{author_name} en <a href="%{resource_path}">%{resource_title}</a>
       votes:
         create:
           error: Ha habido errores al votar el comentario.
     components:
       add_comment_form:
-        account_message: "<a href=\"%{sign_in_url}\">Entra con tu cuenta</a> o <a href=\"%{sign_up_url}\">regístrate</a> para dejar tu comentario.\n"
+        account_message: <a href="%{sign_in_url}">Inicia sesión con tu cuenta</a> o <a href="%{sign_up_url}">regístrate</a> para añadir tu comentario.
         form:
           body:
             label: Comentario
-            placeholder: '¿Qué piensas sobre esto?'
+            placeholder: "¿Qué piensas sobre esto?"
           form_error: El texto es necesario y no puede ser más de caracteres %{length}.
           submit: Enviar
           user_group_id:
             label: Comentar como
         opinion:
           neutral: Neutral
-        remaining_characters: "Quedan %{count} caracteres"
-        remaining_characters_1: "Queda %{count} carácter"
+        remaining_characters: Quedan %{count} caracteres
+        remaining_characters_1: Queda %{count} carácter
         title: Deje su comentario
       comment:
         alignment:
@@ -48,7 +43,7 @@ es:
           action: Denunciar
           already_reported: Este contenido ya fue denunciado y será revisado por un administrador.
           close: Cerrar
-          description: '¿Es inapropiado este contenido?'
+          description: "¿Es inapropiado este contenido?"
           details: Comentarios adicionales
           reasons:
             does_not_belong: Contiene actividad ilegal, amenazas de suicidio, información personal o cualquier otra cosa que usted piense que no pertenece en %{organization_name}.
@@ -71,3 +66,6 @@ es:
         title: "%{count} comentarios"
       featured_comment:
         title: Comentario destacado
+  errors:
+    messages:
+      cannot_have_comments: no puede tener comentarios

data/decidim-comments/config/locales/eu.yml

@@ -1,27 +1,24 @@
 eu:
-  activerecord:
-    errors:
-      messages:
-        cannot_have_comments: ezin zaio iruzkinik egin
   decidim:
     comments:
-      comment_notification_mailer:
+      events:
         comment_created:
-          new_comment_html: 'Iruzkin berri bat dago, <b>%{commenter}</b> iruzkingilearena, hemen: <b>%{commentable_link}</b>'
-        hello: Kaixo, %{name},
-        manage_email_subscriptions_html: 'Halako mezurik jaso nahi ez baduzu, aldatu konfigurazioa hemen: %{link}.'
-        notifications_settings_link: jakinarazpenen konfigurazio-orria
-        reply_created:
-          new_reply_html: 'Iruzkin berri bat dago, <b>%{commenter}</b> iruzkingilearena, hemen: <b>%{commentable_link}</b>'
-      mailer:
-        comment_notification:
-          comment_created:
-            subject: Iruzkin berri bat duzu
-          reply_created:
-            subject: Zure iruzkinetako bati erantzuna eman diote
+          comment:
+            email_intro: '"%{resource_title}" iruzkindu da'
+            email_outro: Jakinarazpena jaso duzu "%{resource_title}" jarraitzen ari zarenagatik. Aurreko esteka estekan jarrai dezakezu.
+            email_subject: '%{author_name}-tik <a href="%{resource_url}">%{resource_title}</a> iruzkin berri bat dago'
+            notification_title: '%{author_name}-en iruzkin berri bat dago <a href="%{resource_path}">%{resource_title}</a>'
+          reply:
+            email_intro: '"%{resource_title}" iruzkindu da'
+            email_outro: Jakinarazpena jaso duzu "%{resource_title}" jarraitzen ari zarenagatik. Aurreko esteka estekan jarrai dezakezu.
+            email_subject: Zure iruzkina erantzun berria da %{author_name} <a href="%{resource_url}">%{resource_title}</a>-n.
+            notification_title: Zure iruzkina erantzun berria da %{author_name} <a href="%{resource_path}">%{resource_title}</a>-tik
+      votes:
+        create:
+          error: Erroreak gertatu dira iruzkina bozkatzean.
     components:
       add_comment_form:
-        account_message: '<a href="%{sign_in_url}">Sartu zure kontuarekin</a> o <a href="%{sign_up_url}">erregistratu</a> zure iruzkina egiteko. '
+        account_message: <a href="%{sign_in_url}">Sartu zure kontuarekin</a> o <a href="%{sign_up_url}">erregistratu</a> zure iruzkina egiteko.
         form:
           body:
             label: Iruzkina
@@ -32,23 +29,27 @@ eu:
             label: 'Egin iruzkina honako honen gisa:'
         opinion:
           neutral: Neutrala
+        remaining_characters: "%{count} karaktere geratzen dira"
+        remaining_characters_1: "karaktere %{count} geratzen da"
         title: Egin hemen zure iruzkina
       comment:
         alignment:
           against: Aurka
           in_favor: Alde
+        deleted_user: Erabiltzaile ezabatua
         reply: Erantzuna
         report:
           action: Salatu
-          already_reported: Eduki hau jada salatuta dago, eta administratzaile batek berrikusiko du.
+          already_reported: Eduki hau jada salatuta dago, eta administratzaile batek.
           close: Itxi
           description: Eduki hau desegokia da?
-          details: iruzkin gehigarriak
+          details: Iruzkin gehigarriak
           reasons:
             does_not_belong: Bertan badago legez kontrako jardunik, suizidio-mehatxurik, informazio pertsonalik edo beste zernahi, zure ustez %{organization_name}-ri ez dagokionik.
-            offensive: Bertan badago arrazakeriarik, sexismorik, irainik, eraso pertsonalik, heriotza-mehatxurik, suizidio-eskaerarik edo beste edozein eratako gorroto-diskurtsorik.
+            offensive: Ertan badago arrazakeriarik, sexismorik, irainik, eraso pertsonalik, heriotza-mehatxurik, suizidio-eskaerarik edo beste edozein eratako gorroto-diskurtsorik.
             spam: Bertan badago clickbait-ik, publizitaterik edo iruzurrik.
           title: Salatu arazo bat
+        verified_user_group: Egiaztatutako erakundea
       comment_order_selector:
         order:
           best_rated: Balorazio hoberenak
@@ -64,3 +65,6 @@ eu:
         title: "%{count} iruzkin"
       featured_comment:
         title: Iruzkin nabarmendua
+  errors:
+    messages:
+      cannot_have_comments: ezin zaio iruzkinik egin