decidim-comments 0.3.2 → 0.4.0

data/app/frontend/comments/up_vote_button.component.tsx

@@ -1,9 +1,10 @@
 import * as React from "react";
-import { graphql } from "react-apollo";
+import { graphql, MutationFunc } from "react-apollo";
 
 import VoteButton from "./vote_button.component";
 
 import {
+  AddCommentFormCommentableFragment,
   AddCommentFormSessionFragment,
   CommentFragment,
   GetCommentsQuery,
@@ -17,6 +18,8 @@ interface UpVoteButtonProps {
   } | null;
   comment: UpVoteButtonFragment;
   upVote?: () => void;
+  rootCommentable: AddCommentFormCommentableFragment;
+  orderBy: string;
 }
 
 export const UpVoteButton: React.SFC<UpVoteButtonProps> = ({
@@ -49,9 +52,10 @@ export const UpVoteButton: React.SFC<UpVoteButtonProps> = ({
 };
 
 const upVoteMutation = require("../mutations/up_vote.mutation.graphql");
+const getCommentsQuery = require("../queries/comments.query.graphql");
 
 const UpVoteButtonWithMutation = graphql(upVoteMutation, {
-  props: ({ ownProps, mutate }) => ({
+  props: ({ ownProps, mutate }: { ownProps: UpVoteButtonProps, mutate: MutationFunc<UpVoteMutation> }) => ({
     upVote: () => mutate({
       variables: {
         id: ownProps.comment.id,
@@ -68,28 +72,39 @@ const UpVoteButtonWithMutation = graphql(upVoteMutation, {
           },
         },
       },
-      updateQueries: {
-        GetComments: (prev: GetCommentsQuery, { mutationResult: { data } }: { mutationResult: { data: UpVoteMutation}}) => {
-          const commentReducer = (comment: CommentFragment): CommentFragment => {
-            const replies = comment.comments || [];
+      update: (store, result: UpVoteMutation) => {
+        const variables = {
+          commentableId: ownProps.rootCommentable.id,
+          commentableType: ownProps.rootCommentable.type,
+          orderBy: ownProps.orderBy,
+        };
 
-            if (comment.id === ownProps.comment.id && data.comment) {
-              return data.comment.upVote;
-            }
-            return {
-              ...comment,
-              comments: replies.map(commentReducer),
-            };
-          };
+        const commentReducer = (comment: CommentFragment): CommentFragment => {
+          const replies = comment.comments || [];
+
+          if (comment.id === ownProps.comment.id && result.comment) {
+            return result.comment.upVote;
+          }
 
           return {
+            ...comment,
+            comments: replies.map(commentReducer),
+          };
+        };
+
+        const prev = store.readQuery<GetCommentsQuery>({ query: getCommentsQuery, variables });
+
+        store.writeQuery({
+          query: getCommentsQuery,
+          data: {
             ...prev,
             commentable: {
               ...prev.commentable,
               comments: prev.commentable.comments.map(commentReducer),
             },
-          };
-        },
+          },
+          variables,
+        });
       },
     }),
   }),

data/app/frontend/comments/vote_button.component.tsx

@@ -36,6 +36,9 @@ const VoteButton: React.SFC<VoteButtonProps> = ({
 );
 
 VoteButton.defaultProps = {
+  buttonClassName: "",
+  iconName: "",
+  votes: 0,
   selectedClass: "selected",
   disabled: false,
 };

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

@@ -9,26 +9,28 @@ module Decidim
 
       helper_method :commentable_title
 
-      def comment_created(comment, commentable)
-        with_user(commentable.author) do
+      def comment_created(user, comment, commentable)
+        with_user(user) do
+          @user = user
           @comment = comment
           @commentable = commentable
           @locator = Decidim::ResourceLocatorPresenter.new(@commentable)
           @organization = commentable.organization
           subject = I18n.t("comment_created.subject", scope: "decidim.comments.mailer.comment_notification")
-          mail(to: commentable.author.email, subject: subject)
+          mail(to: user.email, subject: subject)
         end
       end
 
-      def reply_created(reply, comment, commentable)
-        with_user(comment.author) do
+      def reply_created(user, reply, comment, commentable)
+        with_user(user) do
+          @user = user
           @reply = reply
           @comment = comment
           @commentable = commentable
           @locator = Decidim::ResourceLocatorPresenter.new(@commentable)
           @organization = commentable.organization
           subject = I18n.t("reply_created.subject", scope: "decidim.comments.mailer.comment_notification")
-          mail(to: comment.author.email, subject: subject)
+          mail(to: user.email, subject: subject)
         end
       end
 

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

@@ -6,7 +6,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::Reportable
       include Decidim::Authorable
       include Decidim::Comments::Commentable
 
@@ -59,6 +59,18 @@ 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/app/views/decidim/comments/comment_notification_mailer/comment_created.html.erb

@@ -1,4 +1,4 @@
-<p><%= t("decidim.comments.comment_notification_mailer.hello", name: @commentable.author.name) %></p>
+<p><%= t("decidim.comments.comment_notification_mailer.hello", name: @user.name) %></p>
 
 <p>
   <%=

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

@@ -1,4 +1,4 @@
-<p><%= t("decidim.comments.comment_notification_mailer.hello", name: @comment.author.name) %></p>
+<p><%= t("decidim.comments.comment_notification_mailer.hello", name: @user.name) %></p>
 
 <p>
   <%=

data/config/locales/ca.yml

@@ -35,6 +35,8 @@ ca:
             label: Comentar com a
         opinion:
           neutral: Neutral
+        remaining_characters: "Queden %{count} caràcters"
+        remaining_characters_1: "Queda %{count} caràcter"
         title: Deixa el teu comentari
       comment:
         alignment:

data/config/locales/en.yml

@@ -36,6 +36,8 @@ en:
             label: Comment as
         opinion:
           neutral: Neutral
+        remaining_characters: "%{count} characters left"
+        remaining_characters_1: "%{count} character left"
         title: Add your comment
       comment:
         alignment:

data/config/locales/es.yml

@@ -35,6 +35,8 @@ es:
             label: Comentar como
         opinion:
           neutral: Neutral
+        remaining_characters: "Quedan %{count} caracteres"
+        remaining_characters_1: "Queda %{count} carácter"
         title: Deje su comentario
       comment:
         alignment:

data/config/locales/fr.yml

@@ -27,7 +27,7 @@ fr:
             label: Commentaire
             placeholder: Que pensez-vous de cela?
           form_error: Le texte est requis et ne peut pas dépasser %{length} caractères.
-          submit: Envoyer
+          submit: Publier
           user_group_id:
             label: Commenter en tant que
         opinion:
@@ -46,7 +46,7 @@ fr:
           details: Commentaires additionnels
           reasons:
             does_not_belong: Contient des activités illégales, des menaces suicidaires, des informations personnelles, ou autre chose que vous pensez ne pas être approprié à %{organization_name}.
-            offensive: Contient des propos racisme, sexiste, des insultes, des attaques personnelles, des menaces de mort, des incitations au suicide ou toute forme de discours de haine.
+            offensive: Contient des propos racistes, sexistes, des insultes, des attaques personnelles, des menaces de mort, des incitations au suicide ou toute forme de discours de haine.
             spam: Contient des piège-à-clic (clickbait), des publicités, des escroqueries ou des robots fonctionnant au script (script bots).
           title: Signaler un problème
       comment_order_selector:

data/lib/decidim/comments/commentable.rb

@@ -7,6 +7,7 @@ module Decidim
     # Shared behaviour for commentable models.
     module Commentable
       extend ActiveSupport::Concern
+      include Decidim::Notifiable
 
       included do
         has_many :comments, as: :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", class_name: "Decidim::Comments::Comment"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-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.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com