decidim-comments 0.17.2 → 0.18.0

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

@@ -36,7 +36,7 @@ export const UpVoteButton: React.SFC<UpVoteButtonProps> = ({
   }
 
   const userLoggedIn = session && session.user;
-  const disabled = upVoted || downVoted;
+  const disabled = false;
 
   return (
     <VoteButton
@@ -67,7 +67,7 @@ const UpVoteButtonWithMutation = graphql<UpVoteMutation, UpVoteButtonProps>(upVo
           upVote: {
             __typename: "Comment",
             ...ownProps.comment,
-            upVotes: ownProps.comment.upVotes + 1,
+            upVotes: ownProps.comment.upVotes + (ownProps.comment.upVoted ? -1 : 1),
             upVoted: true
           }
         }

data/app/frontend/fragments/comment_data.fragment.graphql

@@ -19,6 +19,7 @@ fragment CommentData on Comment {
   }
   hasComments
   acceptsNewComments
+  userAllowedToComment
   alignment
   alreadyReported
   ...UpVoteButton

data/app/frontend/queries/comments.query.graphql

@@ -13,6 +13,7 @@ query GetComments($commentableId: String!, $commentableType: String!, $orderBy:
   }
   commentable(id: $commentableId, type: $commentableType) {
     acceptsNewComments
+    userAllowedToComment
     commentsHaveAlignment
     commentsHaveVotes
     totalCommentsCount

data/app/frontend/support/generate_comments_data.ts

@@ -32,6 +32,7 @@ const generateCommentsData = (num = 1) => {
       hasComments: false,
       comments: [],
       acceptsNewComments: true,
+      userAllowedToComment: true,
       alignment: 0,
       upVotes: random.number(),
       upVoted: false,

data/app/frontend/support/schema.ts

@@ -61,6 +61,8 @@ export interface addCommentMutation {
       ),
       // Whether the object can have new comments or not
       acceptsNewComments: boolean,
+      // Check if the current user can comment
+      userAllowedToComment: boolean,
       // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
       alignment: number | null,
       // Check if the current user has reported the comment
@@ -121,6 +123,8 @@ export interface addCommentMutation {
         hasComments: boolean,
         // Whether the object can have new comments or not
         acceptsNewComments: boolean,
+        // Check if the current user can comment
+        userAllowedToComment: boolean,
         // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
         alignment: number | null,
         // Check if the current user has reported the comment
@@ -181,6 +185,8 @@ export interface addCommentMutation {
           hasComments: boolean,
           // Whether the object can have new comments or not
           acceptsNewComments: boolean,
+          // Check if the current user can comment
+          userAllowedToComment: boolean,
           // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
           alignment: number | null,
           // Check if the current user has reported the comment
@@ -241,6 +247,8 @@ export interface addCommentMutation {
             hasComments: boolean,
             // Whether the object can have new comments or not
             acceptsNewComments: boolean,
+            // Check if the current user can comment
+            userAllowedToComment: boolean,
             // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
             alignment: number | null,
             // Check if the current user has reported the comment
@@ -315,6 +323,8 @@ export interface DownVoteMutation {
       hasComments: boolean,
       // Whether the object can have new comments or not
       acceptsNewComments: boolean,
+      // Check if the current user can comment
+      userAllowedToComment: boolean,
       // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
       alignment: number | null,
       // Check if the current user has reported the comment
@@ -375,6 +385,8 @@ export interface DownVoteMutation {
         hasComments: boolean,
         // Whether the object can have new comments or not
         acceptsNewComments: boolean,
+        // Check if the current user can comment
+        userAllowedToComment: boolean,
         // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
         alignment: number | null,
         // Check if the current user has reported the comment
@@ -435,6 +447,8 @@ export interface DownVoteMutation {
           hasComments: boolean,
           // Whether the object can have new comments or not
           acceptsNewComments: boolean,
+          // Check if the current user can comment
+          userAllowedToComment: boolean,
           // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
           alignment: number | null,
           // Check if the current user has reported the comment
@@ -495,6 +509,8 @@ export interface DownVoteMutation {
             hasComments: boolean,
             // Whether the object can have new comments or not
             acceptsNewComments: boolean,
+            // Check if the current user can comment
+            userAllowedToComment: boolean,
             // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
             alignment: number | null,
             // Check if the current user has reported the comment
@@ -569,6 +585,8 @@ export interface UpVoteMutation {
       hasComments: boolean,
       // Whether the object can have new comments or not
       acceptsNewComments: boolean,
+      // Check if the current user can comment
+      userAllowedToComment: boolean,
       // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
       alignment: number | null,
       // Check if the current user has reported the comment
@@ -629,6 +647,8 @@ export interface UpVoteMutation {
         hasComments: boolean,
         // Whether the object can have new comments or not
         acceptsNewComments: boolean,
+        // Check if the current user can comment
+        userAllowedToComment: boolean,
         // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
         alignment: number | null,
         // Check if the current user has reported the comment
@@ -689,6 +709,8 @@ export interface UpVoteMutation {
           hasComments: boolean,
           // Whether the object can have new comments or not
           acceptsNewComments: boolean,
+          // Check if the current user can comment
+          userAllowedToComment: boolean,
           // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
           alignment: number | null,
           // Check if the current user has reported the comment
@@ -749,6 +771,8 @@ export interface UpVoteMutation {
             hasComments: boolean,
             // Whether the object can have new comments or not
             acceptsNewComments: boolean,
+            // Check if the current user can comment
+            userAllowedToComment: boolean,
             // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
             alignment: number | null,
             // Check if the current user has reported the comment
@@ -799,6 +823,8 @@ export interface GetCommentsQuery {
   commentable:  {
     // Whether the object can have new comments or not
     acceptsNewComments: boolean,
+    // Check if the current user can comment
+    userAllowedToComment: boolean,
     // Whether the object comments have alignment or not
     commentsHaveAlignment: boolean,
     // Whether the object comments have votes or not
@@ -853,6 +879,8 @@ export interface GetCommentsQuery {
       ),
       // Whether the object can have new comments or not
       acceptsNewComments: boolean,
+      // Check if the current user can comment
+      userAllowedToComment: boolean,
       // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
       alignment: number | null,
       // Check if the current user has reported the comment
@@ -913,6 +941,8 @@ export interface GetCommentsQuery {
         hasComments: boolean,
         // Whether the object can have new comments or not
         acceptsNewComments: boolean,
+        // Check if the current user can comment
+        userAllowedToComment: boolean,
         // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
         alignment: number | null,
         // Check if the current user has reported the comment
@@ -973,6 +1003,8 @@ export interface GetCommentsQuery {
           hasComments: boolean,
           // Whether the object can have new comments or not
           acceptsNewComments: boolean,
+          // Check if the current user can comment
+          userAllowedToComment: boolean,
           // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
           alignment: number | null,
           // Check if the current user has reported the comment
@@ -1033,6 +1065,8 @@ export interface GetCommentsQuery {
             hasComments: boolean,
             // Whether the object can have new comments or not
             acceptsNewComments: boolean,
+            // Check if the current user can comment
+            userAllowedToComment: boolean,
             // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
             alignment: number | null,
             // Check if the current user has reported the comment
@@ -1121,6 +1155,8 @@ export interface CommentFragment {
   hasComments: boolean,
   // Whether the object can have new comments or not
   acceptsNewComments: boolean,
+  // Check if the current user can comment
+  userAllowedToComment: boolean,
   // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
   alignment: number | null,
   // Check if the current user has reported the comment
@@ -1181,6 +1217,8 @@ export interface CommentFragment {
     hasComments: boolean,
     // Whether the object can have new comments or not
     acceptsNewComments: boolean,
+    // Check if the current user can comment
+    userAllowedToComment: boolean,
     // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
     alignment: number | null,
     // Check if the current user has reported the comment
@@ -1241,6 +1279,8 @@ export interface CommentFragment {
       hasComments: boolean,
       // Whether the object can have new comments or not
       acceptsNewComments: boolean,
+      // Check if the current user can comment
+      userAllowedToComment: boolean,
       // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
       alignment: number | null,
       // Check if the current user has reported the comment
@@ -1301,6 +1341,8 @@ export interface CommentFragment {
         hasComments: boolean,
         // Whether the object can have new comments or not
         acceptsNewComments: boolean,
+        // Check if the current user can comment
+        userAllowedToComment: boolean,
         // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
         alignment: number | null,
         // Check if the current user has reported the comment
@@ -1366,6 +1408,8 @@ export interface CommentDataFragment {
   hasComments: boolean,
   // Whether the object can have new comments or not
   acceptsNewComments: boolean,
+  // Check if the current user can comment
+  userAllowedToComment: boolean,
   // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
   alignment: number | null,
   // Check if the current user has reported the comment
@@ -1428,6 +1472,8 @@ export interface CommentThreadFragment {
   ),
   // Whether the object can have new comments or not
   acceptsNewComments: boolean,
+  // Check if the current user can comment
+  userAllowedToComment: boolean,
   // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
   alignment: number | null,
   // Check if the current user has reported the comment
@@ -1488,6 +1534,8 @@ export interface CommentThreadFragment {
     hasComments: boolean,
     // Whether the object can have new comments or not
     acceptsNewComments: boolean,
+    // Check if the current user can comment
+    userAllowedToComment: boolean,
     // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
     alignment: number | null,
     // Check if the current user has reported the comment
@@ -1548,6 +1596,8 @@ export interface CommentThreadFragment {
       hasComments: boolean,
       // Whether the object can have new comments or not
       acceptsNewComments: boolean,
+      // Check if the current user can comment
+      userAllowedToComment: boolean,
       // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
       alignment: number | null,
       // Check if the current user has reported the comment
@@ -1608,6 +1658,8 @@ export interface CommentThreadFragment {
         hasComments: boolean,
         // Whether the object can have new comments or not
         acceptsNewComments: boolean,
+        // Check if the current user can comment
+        userAllowedToComment: boolean,
         // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
         alignment: number | null,
         // Check if the current user has reported the comment

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

@@ -53,6 +53,13 @@ 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
@@ -91,6 +98,13 @@ module Decidim
         Decidim::Comments::CommentSerializer
       end
 
+      def self.newsletter_participant_ids(space)
+        Decidim::Comments::Comment.includes(:root_commentable).not_hidden
+                                  .where("decidim_comments_comments.decidim_author_id IN (?)", Decidim::User.where(organization: space.organization).pluck(:id))
+                                  .where("decidim_comments_comments.decidim_author_type IN (?)", "Decidim::UserBaseEntity")
+                                  .map(&:author).pluck(:id).flatten.compact.uniq
+      end
+
       private
 
       # Private: Check if commentable can have comments and if not adds

data/app/types/decidim/comments/commentable_interface.rb

@@ -49,6 +49,12 @@ module Decidim
           obj.comment_threads.size.positive?
         }
       end
+
+      field :userAllowedToComment, !types.Boolean, "Check if the current user can comment" do
+        resolve lambda { |obj, _args, ctx|
+          obj.commentable? && obj.user_allowed_to_comment?(ctx[:current_user])
+        }
+      end
     end
   end
 end

data/config/locales/ar-SA.yml

@@ -72,6 +72,7 @@ ar:
       comment_thread:
         title: المحادثة مع %{authorName}
       comments:
+        blocked_comments_for_user_warning: لا يمكنك التعليق في هذه اللحظة ، ولكن يمكنك قراءة التعليقات السابقة.
         blocked_comments_warning: التعليقات معطلة في هذا الوقت ، لكن يمكنك قراءة التعليقات السابقة.
         loading: جارٍ تحميل التعليقات ...
         title: "%{count} تعليقات"

data/config/locales/ar.yml

@@ -0,0 +1,108 @@
+ar:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: تعليق
+      decidim/comments/comment_created_event: تعليق
+      decidim/comments/reply_created_event: تعليق الرد
+      decidim/comments/user_mentioned_event: أشير
+  activerecord:
+    models:
+      decidim/comments/comment:
+        zero: تعليقات
+        one: تعليق
+        two: تعليقات
+        few: تعليقات
+        many: تعليقات
+        other: تعليقات
+      decidim/comments/comment_vote:
+        zero: الأصوات
+        one: تصويت
+        two: الأصوات
+        few: الأصوات
+        many: الأصوات
+        other: الأصوات
+  decidim:
+    comments:
+      comments: تعليقات
+      last_activity:
+        new_comment_at_html: "<span>تعليق جديد على %{link}</span>"
+      votes:
+        create:
+          error: حدثت مشكلة في التصويت على التعليق.
+    components:
+      add_comment_form:
+        account_message: <a href="%{sign_in_url}">سجل الدخول بحسابك</a> أو <a href="%{sign_up_url}">اشترك</a> لإضافة تعليقك.
+        form:
+          body:
+            label: تعليق
+            placeholder: ما رأيك بهذا؟
+          form_error: النص مطلوب ولا يمكن أن يكون أطول من %{length} حرف.
+          submit: إرسال
+          user_group_id:
+            label: التعليق باسم
+        opinion:
+          neutral: محايد
+        remaining_characters: "%{count} الحروف المتبقية"
+        remaining_characters_1: "%{count} حرف اليسار"
+        title: أضف تعليقك
+      comment:
+        alignment:
+          against: ضد
+          in_favor: لصالح
+        deleted_user: مشارك محذوف
+        reply: الرد
+        report:
+          action: أبلغ عن
+          already_reported: تم الإبلاغ عن هذا المحتوى بالفعل وسيتم مراجعته من قبل المشرف.
+          close: قريب
+          description: هل هذا المحتوى غير مناسب؟
+          details: تعليقات اضافية
+          reasons:
+            does_not_belong: يحتوي على نشاط غير قانوني أو تهديدات انتحارية أو معلومات شخصية أو أي شيء آخر تعتقد أنه لا ينتمي إلى %{organization_name}.
+            offensive: يحتوي على العنصرية والتمييز الجنسي والتشهير والهجمات الشخصية والتهديدات بالقتل أو طلبات الانتحار أو أي شكل من أشكال خطاب الكراهية.
+            spam: يحتوي على clickbait أو الإعلان أو الخدع أو روبوت البرامج النصية.
+          title: الإبلاغ عن مشكلة
+      comment_order_selector:
+        order:
+          best_rated: أفضل تصنيف
+          most_discussed: الأكثر مناقشة
+          older: اكبر سنا
+          recent: الأخيرة
+        title: 'ترتيب حسب:'
+      comment_thread:
+        title: المحادثة مع %{authorName}
+      comments:
+        blocked_comments_for_user_warning: لا يمكنك التعليق في هذه اللحظة ، ولكن يمكنك قراءة التعليقات السابقة.
+        blocked_comments_warning: التعليقات معطلة في هذا الوقت ، لكن يمكنك قراءة التعليقات السابقة.
+        loading: جارٍ تحميل التعليقات ...
+        title: "%{count} تعليقات"
+    events:
+      comments:
+        comment_by_followed_user:
+          email_intro: "%{author_name} ترك تعليق في %{resource_title}. يمكنك قراءتها في هذه الصفحة:"
+          email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{author_name}. يمكنك إلغاء تتبع هذا المستخدم من صفحة ملفه الشخصي.
+          email_subject: هناك تعليق جديد مِن %{author_name} على %{resource_title}
+          notification_title: هناك تعليق جديد مِن <a href="%{author_path}">%{author_name} %{author_nickname}</a> على <a href="%{resource_path}">%{resource_title}</a>.
+        comment_created:
+          email_intro: "%{resource_title} تم التعليق. يمكنك قراءة التعليق في هذه الصفحة:"
+          email_outro: لقد تلقيت هذا الإشعار لأنك تتابع "%{resource_title}" أو مؤلفه. يمكنك إلغاء تتبعه من الرابط السابق.
+          email_subject: هناك تعليق جديد من %{author_name} في %{resource_title}
+          notification_title: هناك تعليق جديد مِن <a href="%{author_path}">%{author_name} %{author_nickname}</a> على <a href="%{resource_path}">%{resource_title}</a>
+        reply_created:
+          email_intro: "%{author_name} رد على تعليقك في %{resource_title}. يمكنك قراءتها في هذه الصفحة:"
+          email_outro: لقد تلقيت هذا الإشعار لأنه تم الرد على تعليقك.
+          email_subject: "%{author_name} رد على تعليقك في %{resource_title}"
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> رد على تعليقك في <a href="%{resource_path}">%{resource_title}</a>
+        user_mentioned:
+          email_intro: لقد ذكرت
+          email_outro: لقد تلقيت هذا الإشعار لأنك ذكرت في %{resource_title}.
+          email_subject: لقد ذكرت في %{resource_title}
+          notification_title: لقد ذكرت في <a href="%{resource_path}">%{resource_title}</a> من <a href="%{author_path}">%{author_name} %{author_nickname}</a>
+    metrics:
+      comments:
+        description: عدد التعليقات الناتجة عن المشاركين
+        object: تعليقات
+        title: تعليقات
+  errors:
+    messages:
+      cannot_have_comments: لا يمكن أن يكون لديك تعليقات

data/config/locales/ca.yml

@@ -64,6 +64,7 @@ ca:
       comment_thread:
         title: Conversa amb %{authorName}
       comments:
+        blocked_comments_for_user_warning: No pots fer comentaris en aquest moment, però pots llegir els anteriors.
         blocked_comments_warning: Els comentaris estan desactivats en aquest moment, però pots llegir els anteriors.
         loading: Carregant els comentaris ...
         title: "%{count} comentaris"

data/config/locales/cs.yml

@@ -68,6 +68,7 @@ cs:
       comment_thread:
         title: Konverzace s číslem %{authorName}
       comments:
+        blocked_comments_for_user_warning: V tuto chvíli nemůžete komentovat, ale můžete si přečíst předchozí.
         blocked_comments_warning: Komentáře jsou v tuto chvíli zakázány, ale můžete si přečíst předchozí.
         loading: Načítání komentářů ...
         title: "%{count} komentářů"

data/config/locales/de.yml

@@ -64,6 +64,7 @@ de:
       comment_thread:
         title: Konversation mit %{authorName}
       comments:
+        blocked_comments_for_user_warning: Sie können momentan nichts kommentieren, aber Sie können die vorherigen lesen.
         blocked_comments_warning: Kommentare sind zu diesem Zeitpunkt deaktiviert, aber Sie können die vorherigen lesen.
         loading: Kommentare werden geladen ...
         title: "%{count} Kommentare"