decidim 0.0.5 → 0.0.6

data/decidim-comments/app/frontend/comments/comment.component.test.jsx

@@ -147,6 +147,11 @@ describe("<Comment />", () => {
       const wrapper = shallow(<Comment comment={comment} session={session} />);
       expect(wrapper.find('button.comment__reply')).not.to.be.present();
     });
+
+    it("should not render the flag modal", () => {
+      const wrapper = shallow(<Comment comment={comment} session={session} />);
+      expect(wrapper.find('.flag-modal')).not.to.be.present();
+    });
   });
 
   it("should render a 'in favor' badge if comment's alignment is 1", () => {
@@ -161,6 +166,19 @@ describe("<Comment />", () => {
     expect(wrapper.find('span.alert.label')).to.have.text('Against');
   });
 
+  it("should render the flag modal", () => {
+    const wrapper = shallow(<Comment comment={comment} session={session} />);
+    expect(wrapper.find('.flag-modal')).to.be.present();
+  });
+
+  describe("when user has already reported the comment", () => {
+    it("should not render the flag form", () => {
+      comment.alreadyReported = true;
+      const wrapper = shallow(<Comment comment={comment} session= {session} />);
+      expect(wrapper.find('.flag-modal form')).not.to.be.present();
+    });
+  });
+
   describe("when the comment is votable", () => {
     it("should render an UpVoteButton component", () => {
       const wrapper = shallow(<Comment comment={comment} session={session} votable />);

data/decidim-comments/app/frontend/comments/comment_data.fragment.graphql

@@ -1,5 +1,6 @@
 fragment CommentData on Comment {
   id
+  sgid
   type
   body
   createdAt
@@ -10,6 +11,7 @@ fragment CommentData on Comment {
   hasComments
   acceptsNewComments
   alignment
+  alreadyReported
   ...UpVote
   ...DownVote
 }

data/decidim-comments/app/frontend/comments/comment_order_selector.component.jsx

@@ -16,17 +16,16 @@ class CommentOrderSelector extends Component {
     }
   }
 
-  componentDidMount() {
-    $(document).foundation();
-  }
-
   render() {
     const { orderBy } =  this.state;
 
     return (
       <div className="order-by__dropdown order-by__dropdown--right">
         <span className="order-by__text">{ I18n.t("components.comment_order_selector.title") }</span>
-        <ul className="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+        <ul
+          className="dropdown menu"
+          data-dropdown-menu
+          data-close-on-click-inside="false">
           <li>
             <a>{ I18n.t(`components.comment_order_selector.order.${orderBy}`) }</a>
             <ul className="menu">

data/decidim-comments/app/frontend/comments/comments.query.graphql

@@ -3,6 +3,7 @@ query GetComments($commentableId: String!, $commentableType: String!, $orderBy:
     user {
       name
       avatarUrl
+      organizationName
     }
     ...AddCommentFormSession
   }

data/decidim-comments/app/mailers/decidim/comments/comment_notification_mailer.rb

@@ -6,6 +6,8 @@ module Decidim
     class CommentNotificationMailer < Decidim::ApplicationMailer
       helper Decidim::ResourceHelper
 
+      helper_method :commentable_title
+
       def comment_created(user, comment, commentable)
         with_user(user) do
           @comment = comment
@@ -26,6 +28,12 @@ module Decidim
           mail(to: comment.author.email, subject: subject)
         end
       end
+
+      private
+
+      def commentable_title
+        @commentable.title.kind_of?(Hash) ? @commentable.title[I18n.locale.to_s] : @commentable.title
+      end
     end
   end
 end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module Decidim
+  module Comments
+    module Abilities
+      # Defines the abilities related to comments for a logged in admin user.
+      # Intended to be used with `cancancan`.
+      class AdminUser
+        include CanCan::Ability
+
+        attr_reader :user, :context
+
+        def initialize(user, context)
+          return unless user && user.role?(:admin)
+
+          @user = user
+          @context = context
+
+          can :manage, Comment
+          can :unreport, Comment
+          can :hide, Comment
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+module Decidim
+  module Comments
+    module Abilities
+      # Defines the abilities related to comments for a logged in process admin user.
+      # Intended to be used with `cancancan`.
+      class ProcessAdminUser
+        include CanCan::Ability
+
+        attr_reader :user, :context
+
+        def initialize(user, context)
+          return unless user && !user.role?(:admin)
+
+          @user = user
+          @context = context
+
+          can :manage, Comment do |comment|
+            participatory_processes.include?(comment.feature.participatory_process)
+          end
+          can :unreport, Comment
+          can :hide, Comment
+        end
+
+        private
+
+        def participatory_processes
+          @participatory_processes ||= Decidim::Admin::ManageableParticipatoryProcessesForUser.for(@user)
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ module Decidim
     # comment on them. The will be able to create conversations between users
     # to discuss or share their thoughts about the resource.
     class Comment < ApplicationRecord
+      include Reportable
       include Decidim::Authorable
       include Decidim::Comments::Commentable
 
@@ -28,7 +29,7 @@ module Decidim
 
       before_save :compute_depth
 
-      delegate :organization, to: :commentable
+      delegate :organization, :feature, to: :commentable
 
       # Public: Override Commentable concern method `accepts_new_comments?`
       def accepts_new_comments?
@@ -55,6 +56,11 @@ module Decidim
         commentable.root_commentable
       end
 
+      # Public: Overrides the `reported_content` Reportable concern method.
+      def reported_content
+        "<p>#{body}</p>"
+      end
+
       private
 
       # Private: Check if commentable can have comments and if not adds

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

@@ -7,7 +7,8 @@ module Decidim
       belongs_to :comment, foreign_key: "decidim_comment_id", class_name: Comment
       belongs_to :author, foreign_key: "decidim_author_id", class_name: Decidim::User
 
-      validates :comment, uniqueness: { scope: :author }
+      validates :comment, presence: true, uniqueness: { scope: :author }
+      validates :author, presence: true
       validates :weight, inclusion: { in: [-1, 1] }
       validate :author_and_comment_same_organization
 
@@ -15,6 +16,7 @@ module Decidim
 
       # Private: check if the comment and the author have the same organization
       def author_and_comment_same_organization
+        return unless author.present? && comment.present?
         errors.add(:comment, :invalid) unless author.organization == comment.organization
       end
     end

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

@@ -31,6 +31,7 @@ module Decidim
       def query
         scope = Comment
                 .where(commentable: commentable)
+                .not_hidden
                 .includes(:author, :up_votes, :down_votes)
 
         scope = case @options[:order_by]

data/decidim-comments/app/views/decidim/comments/comment_notification_mailer/comment_created.html.erb

@@ -4,7 +4,7 @@
   <%=
     t(".new_comment_html", {
       commenter: @comment.author.name,
-      commentable_link: link_to(@commentable.title, decidim_resource_url(@commentable))
+      commentable_link: link_to(commentable_title, decidim_resource_url(@commentable))
     })
   %>
 </p>

data/decidim-comments/app/views/decidim/comments/comment_notification_mailer/reply_created.html.erb

@@ -4,7 +4,7 @@
   <%=
     t(".new_reply_html", {
       commenter: @reply.author.name,
-      commentable_link: link_to(@commentable.title, decidim_resource_url(@commentable))
+      commentable_link: link_to(commentable_title, decidim_resource_url(@commentable))
     })
   %>
 </p>

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

@@ -38,6 +38,17 @@ ca:
           against: En contra
           in_favor: A favor
         reply: Respondre
+        report:
+          action: Denuncia
+          already_reported: Aquest contingut ja ha estat denunciat i serà revisat per un administrador.
+          close: Tancar
+          description: Aquest contingut no és apropiat?
+          details: Comentaris addicionals
+          reasons:
+            does_not_belong: Conté activitat il·legal, amenaces de suïcidi, informació personal, o qualsevol altra cosa que creguis que no pertany a %{organization_name}.
+            offensive: Conté racisme, sexisme, insults, atacs personals, amenaces de mort, peticions de suïcidi o qualsevol forma de discurs d'odi.
+            spam: Conté "clickbait", publicitat o estafes.
+          title: Denuncia un problema
       comment_order_selector:
         order:
           best_rated: Més ben valorats

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

@@ -22,8 +22,7 @@ en:
             subject: You have a new reply of your 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
@@ -40,6 +39,17 @@ en:
           against: Against
           in_favor: In favor
         reply: Reply
+        report:
+          action: Report
+          already_reported: This content is already reported and it will be reviewed by an admin.
+          close: Close
+          description: Is this content inappropriate?
+          details: Additional comments
+          reasons:
+            does_not_belong: Contains illegal activity, suicide threats, personal information, or something else you think doesn't belong on %{organization_name}.
+            offensive: Contains racism, sexism, slurs, personal attacks, death threats, suicide requests or any form of hate speech.
+            spam: Contains clickbait, advertising, scams or script bots.
+          title: Report a problem
       comment_order_selector:
         order:
           best_rated: Best rated

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

@@ -38,6 +38,17 @@ es:
           against: En contra
           in_favor: A favor
         reply: Respuesta
+        report:
+          action: Denunciar
+          already_reported: Este contenido ya fue denunciado y será revisado por un administrador.
+          close: Cerrar
+          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}.
+            offensive: Contiene racismo, sexismo, insultos, ataques personales, amenazas de muerte, solicitudes de suicidio o cualquier forma de discurso de odio.
+            spam: Contiene clickbait, publicidad o estafas.
+          title: Denunciar un problema
       comment_order_selector:
         order:
           best_rated: Mejor valoración

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

@@ -2,4 +2,41 @@ eu:
   decidim:
     comments:
       comment_notification_mailer:
-        hello: Kaixo %{name},
+        hello: Kaixo, %{name},
+        notifications_settings_link: jakinarazpenen konfigurazio-orria
+      mailer:
+        comment_notification:
+          comment_created:
+            subject: Iruzkin berri bat duzu
+          reply_created:
+            subject: Zure iruzkinetako bati erantzuna eman diote
+    components:
+      add_comment_form:
+        form:
+          body:
+            label: Iruzkina
+            placeholder: Zer deritzozu honi?
+          form_error: Testua behar da, eta ezin du izan %{length} karaktere baino gehiago.
+          submit: Bidali
+          user_group_id:
+            label: 'Iruzkindu honela:'
+        opinion:
+          neutral: Neutrala
+        title: Jarri hemen zure iruzkina
+      comment:
+        alignment:
+          against: Aurka
+          in_favor: Alde
+        reply: Erantzuna
+      comment_order_selector:
+        order:
+          best_rated: Balorazio hoberena
+          most_discussed: Eztabaidatuenak
+          older: Zaharrena
+          recent: Berri-berria
+        title: 'Ordenatu honen arabera:'
+      comments:
+        loading: Iruzkinak kargatzen...
+        title: "%{count} iruzkin"
+      featured_comment:
+        title: Iruzkin nabarmendua

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

@@ -0,0 +1,66 @@
+fi:
+  activerecord:
+    errors:
+      messages:
+        cannot_have_comments: ei voi poistaa kommentteja
+  decidim:
+    comments:
+      comment_notification_mailer:
+        comment_created:
+          new_comment_html: Uusi kommentti henkilöltä <b>%{commenter}</b> osoitteessa <b>%{commentable_link}</b>
+        hello: Hei %{name},
+        manage_email_subscriptions_html: 'Voit lopettaa näiden viestien vastaanottamisen vaihtamalla asetuksiasi osoitteessa: %{link}.'
+        notifications_settings_link: ilmoitusten asetussivu
+        reply_created:
+          new_reply_html: Henkilö <b>%{commenter}</b> on vastannut kommenttiisi osoitteessa <b>%{commentable_link}</b>
+      mailer:
+        comment_notification:
+          comment_created:
+            subject: Sinulla on uusi kommentti
+          reply_created:
+            subject: Kommenttiisi on vastattu
+    components:
+      add_comment_form:
+        account_message: "<a href=\"%{sign_in_url}\">Kirjaudu sisään käyttäjätililläsi</a> tai <a href=\"%{sign_up_url}\">luo käyttäjätili</a> kommentoidaksesi.\n"
+        form:
+          body:
+            label: Kommentti
+            placeholder: Mitä mieltä olet tästä?
+          form_error: Teksti vaaditaan ja se ei voi olla pidempi kuin %{length} merkkiä.
+          submit: Lähetä
+          user_group_id:
+            label: Kommentoi käyttäjänä
+        opinion:
+          neutral: Neutraali
+        title: Lisää kommenttisi
+      comment:
+        alignment:
+          against: Vastaan
+          in_favor: Puolesta
+        reply: Vastaa
+        report:
+          action: Raportoi
+          already_reported: Tämä sisältö on jo raportoitu ja ylläpitäjä tutkii sen.
+          close: Sulje
+          description: Onko tämä sisältö epäasiallista?
+          details: Lisätiedot
+          reasons:
+            does_not_belong: Sisältää laitonta toimintaa, itsemurhauhkailua, henkilökohtaisia tietoja tai jotain muuta, jonka et usko kuuluvan organisaatioon %{organization_name}.
+            offensive: Sisältää rasismia, seksismiä, haukkumista, henkilökohtaisia hyökkäyksiä, tappouhkauksia, itsemurhapyyntöjä tai muuta vihapuhetta.
+            spam: Sisältää klikkihoukutteita, mainostusta, huijauksia tai bottiskriptejä.
+          title: Raportoi ongelmasta
+      comment_order_selector:
+        order:
+          best_rated: Parhaiksi arvioidut
+          most_discussed: Eniten keskustelua herättäneet
+          older: Vanhemmat
+          recent: Uusimmat
+        title: 'Järjestä tulokset:'
+      comment_thread:
+        title: Keskustelu henkilön %{authorName} kanssa
+      comments:
+        blocked_comments_warning: Kommentointi on estetty tämänhetkisessä vaiheessa, mutta voit lukea kommentteja aikaisemmista vaiheista.
+        loading: Ladataan kommentteja ...
+        title: "%{count} kommenttia"
+      featured_comment:
+        title: Esille nostettu kommentti

data/decidim-comments/lib/decidim/comments.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
+require "decidim/comments/admin"
 require "decidim/comments/engine"
+require "decidim/comments/admin_engine"
 
 module Decidim
   # This module contains all the logic related to the comments feature.

data/decidim-comments/lib/decidim/comments/admin.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+module Decidim
+  module Comments
+    # This module contains all the domain logic associated to Decidim's Comments
+    # component admin panel.
+    module Admin
+    end
+  end
+end

data/decidim-comments/lib/decidim/comments/admin_engine.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module Decidim
+  module Comments
+    # This is the engine that runs on the public interface of `decidim-comments`.
+    class AdminEngine < ::Rails::Engine
+      isolate_namespace Decidim::Comments::Admin
+
+      paths["db/migrate"] = nil
+
+      initializer "decidim_comments.inject_abilities_to_user" do |_app|
+        Decidim.configure do |config|
+          config.admin_abilities += ["Decidim::Comments::Abilities::AdminUser"]
+          config.admin_abilities += ["Decidim::Comments::Abilities::ProcessAdminUser"]
+        end
+      end
+
+      def load_seed
+        nil
+      end
+    end
+  end
+end