decidim-comments 0.27.8 → 0.28.0.rc4

data/config/locales/ru.yml

@@ -21,20 +21,15 @@ ru:
         other: Голосов
   decidim:
     comments:
-      comments_title: Комментарии
-      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} символов.
           user_group_id:
             label: Комментировать как
         opinion:
@@ -55,7 +50,6 @@ ru:
           description: Это сообщение неприемлемо?
           details: Дополнительные комментарии
           reasons:
-            does_not_belong: Содержит незаконную деятельность, угрозы самоубийства, личные сведения или что-то еще, недопустимое, на ваш взгляд, для %{organization_name}.
             offensive: Содержит расизм, сексизм, оскорбления, личные нападки, угрозы убийства, заявления о самоубийстве, или любую форму разжигания ненависти.
             spam: Содержит кликоловки (манипулятивно-сенсационные заголовки), рекламу, мошенничество или лохотроны.
       comment_order_selector:
@@ -65,8 +59,6 @@ ru:
           older: Старые
           recent: Недавние
         title: 'Упорядочить по:'
-      comment_thread:
-        title: Беседа с %{authorName}
       comments:
         blocked_comments_for_user_warning: Сейчас вам недоступно комментирование, но вы можете прочесть предыдущие комментарии.
         blocked_comments_warning: Комментарии сейчас отключены, но вы можете прочитать предыдущие.
@@ -101,6 +93,3 @@ ru:
         description: Количество комментариев, созданных участниками
         object: коментарии
         title: Комментарии
-  errors:
-    messages:
-      cannot_have_comments: не подлежит комментированию

data/config/locales/sk.yml

@@ -21,20 +21,15 @@ sk:
         other: Hlasy
   decidim:
     comments:
-      comments_title: Komentáre
-      last_activity:
-        new_comment_at_html: "<span>Nový komentár na %{link}</span>"
       votes:
         create:
           error: Pri hlasovaní za komentár sa vyskytol problém.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Prihláste sa so svojím účtom</a> alebo <a href="%{sign_up_url}"> sa zaregistrujte</a>, aby ste pridali svoj komentár.
         form:
           body:
             label: Komentár
             placeholder: Čo si myslíte o tomto?
-          form_error: Tento text je požadovaný a nesmie byť dlhší, než %{length} znakov.
           user_group_id:
             label: Komentovať ako
         opinion:
@@ -56,7 +51,6 @@ sk:
           description: Je tento obsah nevhodný?
           details: Ďalšie komentáre
           reasons:
-            does_not_belong: Obsahuje ilegálnu činnosť, vyhrážky, osobné informácie, alebo niečo ďalšie, o čom si myslíte, že nepatrí na %{organization_name}.
             offensive: Obsahuje rasizmus, sexizmus, urážky, osobné útoky, vyhrážky alebo inú podobu nenávistného prejavu.
             spam: Obsahuje clickbait, reklamy, scam alebo je to skriptovací robot.
       comment_order_selector:
@@ -66,8 +60,6 @@ sk:
           older: Staršie
           recent: Nedávne
         title: 'Zoradiť podľa:'
-      comment_thread:
-        title: Konverzácia s %{authorName}
       comments:
         blocked_comments_for_user_warning: V súčasnosti nemôžete komentovať, ale môžete si prečítať predchádzajúce komentáre.
         blocked_comments_warning: Komentáre nie sú v súčasnosti povolené, ale môžete si prečítať predchádzajúce komentáre.
@@ -111,6 +103,3 @@ sk:
         description: Počet komentárov všetkých účastníkov
         object: komentáre
         title: Komentáre
-  errors:
-    messages:
-      cannot_have_comments: nie je možné komentovať

data/config/locales/sq-AL.yml

@@ -1,39 +1 @@
----
 sq:
-  decidim:
-    components:
-      add_comment_form:
-        form:
-          user_group_id:
-            label: Komento si
-        opinion:
-          label: Mendimi jot mbi këtë temë
-          negative: Negativ
-          negative_selected: Mendimi jot mbi këtë temë është negativ
-          neutral: Neutral
-          neutral_selected: Mendimi jot mbi këtë temë është neutral
-          positive: Pozitiv
-          positive_selected: Mendimi jot mbi këtë temë është pozitiv
-        remaining_characters: "%{count} karaktere të mbetura"
-        remaining_characters_1: "%{count} karakter i mbetur"
-        title: Shto komentin tënd
-      comment:
-        alignment:
-          against: Kundër
-          in_favor: Pro
-        confirm_destroy: A je i sigurt që do ta fshish këtë koment?
-        delete: Fshi
-        deleted_at: Komenti u fshi në datën %{date}
-        edit: Përpuno
-        edited: Ndryshuar
-        hide_replies: Fshih përgjigjet
-        moderated_at: Komenti u moderua në datën %{date}
-        reply: Përgjigju
-        report:
-          action: Raporto
-          already_reported: Kjo përmbajtje është raportuar nga të tjerë dhe do rishikohet nga administratorët.
-          close: Mbyll
-          description: Përmbajtje e papërshtatshme?
-          details: Komente të tjera
-          reasons:
-            offensive: Përmban racizëm, seksizëm, ofendime, sulme personale, kërcënime me vdekje, shtyrje për vetëvrasje apo forma të tjera të gjuhës së urrejtjes.

data/config/locales/sv.yml

@@ -27,27 +27,19 @@ sv:
       comments:
         create:
           error: Det gick inte att skapa kommentaren.
-        delete:
-          error: Kommentaren kunde inte tas bort.
         update:
           error: Det gick inte att uppdatera kommentaren.
-      comments_count: Antal kommentarer
-      comments_title: Kommentarer
-      last_activity:
-        new_comment_at_html: "<span>Ny kommentar på %{link}</span>"
-      view: Visa
+      comments_title: Kommentar
       votes:
         create:
           error: Det gick inte att rösta om kommentaren.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Logga in med ditt konto</a> eller <a href="%{sign_up_url}">registrera dig</a> för att lägga till din kommentar.
         form:
           body:
             label: Kommentera
             placeholder: Vad tycker du om detta?
-          form_error: Texten är obligatorisk och den kan inte vara längre än %{length} tecken.
-          submit: Skicka
+          submit_reply: Publicera svar
           user_group_id:
             label: Kommentera som
         opinion:
@@ -81,7 +73,6 @@ sv:
           description: Är detta innehåll olämpligt?
           details: Ytterligare kommentarer
           reasons:
-            does_not_belong: Innehåller olaglig aktivitet, självmordshot, personlig information eller något annat du tycker inte hör hemma på %{organization_name}.
             offensive: Innehåller rasism, sexism, skällsord, personliga attacker, dödshot, uppmaningar att begå självmord eller någon form av hatpropaganda.
             spam: Innehåller clickbait, reklam, bedrägerier eller skriptrobotar.
           title: Rapportera olämpligt innehåll
@@ -96,8 +87,6 @@ sv:
           older: Äldre
           recent: Senaste
         title: 'Sortera efter:'
-      comment_thread:
-        title: Samtal med %{authorName}
       comments:
         blocked_comments_for_unauthorized_user_warning: Du behöver verifiera dig för att kunna kommentera just nu, men du kan läsa tidigare kommentarer.
         blocked_comments_for_user_warning: Du kan inte kommentera just nu, men du kan läsa tidigare kommentarer.
@@ -168,6 +157,3 @@ sv:
         description: Antal kommentarer från deltagare
         object: kommentarer
         title: Kommentarer
-  errors:
-    messages:
-      cannot_have_comments: kan inte ha kommentarer

data/config/locales/tr-TR.yml

@@ -20,22 +20,16 @@ tr:
       comments:
         create:
           error: Yorum oluşturulurken bir sorunla karşılaşıldı.
-      comments_count: Yorum sayısı
-      comments_title: Yorumlar
-      last_activity:
-        new_comment_at_html: "<span> %{link}</span> yeni yorum"
-      view: Görünüm
       votes:
         create:
           error: Yorum oylanırken bir sorun oluştu.
     components:
       add_comment_form:
-        account_message: Yorumunuzu eklemek için <a href="%{sign_in_url}"> hesabınızla oturum açın </a> veya <a href="%{sign_up_url}"> kaydolun </a>.
+        account_message: <a href="%{sign_in_url}">Hesabınızla giriş yapın</a> veya yorumunuzu eklemek için <a href="%{sign_up_url}">kaydolun</a>.
         form:
           body:
             label: Yorum
             placeholder: Bunun hakkında ne düşünüyorsun?
-          form_error: Metin zorunludur ve %{length} karakterden uzun olamaz.
           user_group_id:
             label: Olarak yorum yap
         opinion:
@@ -57,7 +51,6 @@ tr:
           description: Bu içerik uygunsuz mu?
           details: Ek Yorumlar
           reasons:
-            does_not_belong: Yasadışı faaliyet, intihar tehditleri, kişisel bilgiler veya %{organization_name} kuruluşuna ait olmadığını düşündüğünüz başka bir şey içeriyor.
             offensive: Irkçılık, cinsiyetçilik, hakaretler, kişisel saldırılar, ölüm tehditleri, intihar talepleri veya herhangi bir nefret söylemi içerir.
             spam: Clickbait, reklam, dolandırıcılık veya script botları içerir.
           title: Uygunsuz içerik bildir
@@ -68,8 +61,6 @@ tr:
           older: Daha eski
           recent: Son
         title: 'Tarafından sipariş:'
-      comment_thread:
-        title: '%{authorName}ile sohbet'
       comments:
         blocked_comments_for_user_warning: Şu anda yorum yapamıyorsunuz, ancak öncekileri okuyabilirsiniz.
         blocked_comments_warning: Yorumlar şu anda devre dışı, ancak öncekileri okuyabilirsiniz.
@@ -120,6 +111,3 @@ tr:
         description: Katılımcılar tarafından oluşturulan yorum sayısı
         object: yorumlar
         title: Yorumlar
-  errors:
-    messages:
-      cannot_have_comments: yorum alamaz

data/config/locales/uk.yml

@@ -26,12 +26,10 @@ uk:
           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} символів.
           user_group_id:
             label: Коментувати як
         opinion:
@@ -52,7 +50,6 @@ uk:
           description: Чи цей вміст неприпустимий?
           details: Додаткові коментарі
           reasons:
-            does_not_belong: Містить незаконну діяльність, загрози самогубства, особисті відомості чи ще щось, неприпустиме, на вашу думку, для %{organization_name}.
             offensive: Містить расизм, сексизм, образи, особисті напади, погрози вбивства, заяви про самогубство або будь-які ненависницькі висловлювання.
             spam: Містить клацоловки (маніпулятивно-сенсаційні заголовки), рекламу, афери або лохотрони.
       comment_order_selector:
@@ -62,8 +59,6 @@ uk:
           older: Давніші
           recent: Нещодавнє
         title: 'Впорядкувати за:'
-      comment_thread:
-        title: Бесіда з %{authorName}
       comments:
         blocked_comments_warning: Коментарі зараз вимкнені, але ви можете прочитати попередні.
         loading: Завантаження коментарів...
@@ -92,6 +87,3 @@ uk:
           email_outro: Ви отримали це сповіщення, оскільки вас згадали в %{resource_title}.
           email_subject: Вас згадали у %{resource_title}
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> згадав вас у <a href="%{resource_path}">%{resource_title}</a>
-  errors:
-    messages:
-      cannot_have_comments: не підлягає коментуванню

data/config/locales/zh-CN.yml

@@ -15,22 +15,15 @@ zh-CN:
         other: 所得票数
   decidim:
     comments:
-      comments_count: 评论计数
-      comments_title: 评论
-      last_activity:
-        new_comment_at_html: "<span>在 %{link}的新评论</span>"
-      view: 查看
       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} 个字符。
           user_group_id:
             label: 评论为
         opinion:
@@ -52,7 +45,6 @@ zh-CN:
           description: 这个内容是否不适当？
           details: 其他评论
           reasons:
-            does_not_belong: 包含非法活动、自杀威胁、个人信息或你认为不属于 %{organization_name} 的其他东西。
             offensive: 包括种族主义、性别主义、污泥、个人攻击、死亡威胁、自杀请求或任何形式的仇恨言论。
             spam: 包含点击、广告、骗子或脚本机器人。
           title: 报告不恰当的内容
@@ -63,8 +55,6 @@ zh-CN:
           older: 更旧的
           recent: 最近的
         title: '排序方式：'
-      comment_thread:
-        title: 与 %{authorName} 的对话
       comments:
         blocked_comments_for_user_warning: 您此时无法评论，但您可以阅读前面的评论。
         blocked_comments_warning: 评论此时被禁用，但您可以阅读前面的评论。
@@ -112,6 +102,3 @@ zh-CN:
         description: 与会者生成的评论数
         object: 评论
         title: 评论
-  errors:
-    messages:
-      cannot_have_comments: 不能有评论

data/config/locales/zh-TW.yml

@@ -29,23 +29,17 @@ zh-TW:
           error: 該評論無法被刪除。
         update:
           error: 更新評論時出現問題。
-      comments_count: 評論次數
       comments_title: 評論
-      last_activity:
-        new_comment_at_html: "<span>在 %{link} 上發布了新評論</span>"
-      view: 檢視
       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:
@@ -93,8 +87,6 @@ zh-TW:
           older: 較早的
           recent: 最近
         title: '排序方式:'
-      comment_thread:
-        title: 與 %{authorName} 的對話
       comments:
         blocked_comments_for_unauthorized_user_warning: 目前需要驗證您的身份才能發表評論，但您可以閱讀先前的評論。
         blocked_comments_for_user_warning: 目前您無法發表評論，但您可以閱讀先前的評論。
@@ -166,4 +158,4 @@ zh-TW:
         title: 評論
   errors:
     messages:
-      cannot_have_comments: 無法留言
+      cannot_have_comments: 無法評論

data/lib/decidim/api/comment_type.rb

@@ -58,7 +58,7 @@ module Decidim
       end
 
       def up_votes
-        object.up_votes_count
+        object.up_votes.size
       end
 
       def up_voted
@@ -66,7 +66,7 @@ module Decidim
       end
 
       def down_votes
-        object.down_votes_count
+        object.down_votes.size
       end
 
       def down_voted

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).not_hidden
+        SortedComments.for(object, order_by:, id: single_comment_id).not_hidden
       end
 
       def total_comments_count

data/lib/decidim/comments/comment_serializer.rb

@@ -25,7 +25,7 @@ module Decidim
           },
           commentable_id: resource.decidim_commentable_id,
           commentable_type: resource.decidim_commentable_type,
-          root_commentable_url: root_commentable_url
+          root_commentable_url:
         }
       end
 

data/lib/decidim/comments/comment_vote_serializer.rb

@@ -26,7 +26,7 @@ module Decidim
             },
             commentable_id: resource.comment.decidim_commentable_id,
             commentable_type: resource.comment.decidim_commentable_type,
-            root_commentable_url: root_commentable_url
+            root_commentable_url:
 
           },
           created_at: resource.created_at,

data/lib/decidim/comments/commentable.rb

@@ -64,7 +64,7 @@ module Decidim
         # rubocop:disable Rails/SkipsModelValidations
         def update_comments_count
           comments_count = comments.not_hidden.not_deleted.count
-          update_columns(comments_count: comments_count, updated_at: Time.current)
+          update_columns(comments_count:, updated_at: Time.current)
         end
         # rubocop:enable Rails/SkipsModelValidations
       end

data/lib/decidim/comments/comments_helper.rb

@@ -10,9 +10,12 @@ module Decidim
       def comments_for(resource, options = {})
         return unless resource.commentable?
 
-        content_for :expanded do
-          inline_comments_for(resource, options)
-        end
+        append_stylesheet_pack_tag "decidim_comments"
+        # This script cannot be deferred, otherwise the DOMReady and turbo:load listeners are not
+        # executed from a Turbo Frame call
+        append_javascript_pack_tag "decidim_comments", defer: false
+
+        inline_comments_for(resource, options)
       end
 
       # Creates a Comments component through the comments cell.

data/lib/decidim/comments/engine.rb

@@ -29,7 +29,7 @@ module Decidim
         Decidim::Api::MutationType.include MutationExtensions
       end
 
-      initializer "decidim.stats" do
+      initializer "decidim_comments.stats" do
         Decidim.stats.register :comments_count, priority: StatsRegistry::MEDIUM_PRIORITY do |organization|
           Decidim.component_manifests.sum do |component|
             component.stats.filter(tag: :comments).with_context(organization.published_components).map { |_name, value| value }.sum
@@ -37,6 +37,19 @@ module Decidim
         end
       end
 
+      initializer "decidim_comments.register_icons" do
+        common_parameters = { category: "action", engine: :comments }
+
+        Decidim.icons.register(name: "Decidim::Comments::Comment", icon: "chat-1-line", description: "Comment", category: "activity", engine: :comments)
+        Decidim.icons.register(name: "comments_count", icon: "wechat-line", description: "Comments Count", category: "activity", engine: :comments)
+
+        Decidim.icons.register(name: "thumb-up-line", icon: "thumb-up-line", description: "Upvote comment button", **common_parameters)
+        Decidim.icons.register(name: "thumb-up-fill", icon: "thumb-up-fill", description: "User upvoted comment", **common_parameters)
+        Decidim.icons.register(name: "thumb-down-line", icon: "thumb-down-line", description: "Downvote comment button", **common_parameters)
+        Decidim.icons.register(name: "thumb-down-fill", icon: "thumb-down-fill", description: "User downvoted comment", **common_parameters)
+        Decidim.icons.register(name: "edit-line", icon: "edit-line", description: "Edit comment button", **common_parameters)
+      end
+
       initializer "decidim_comments.register_metrics" do
         Decidim.metrics_registry.register(:comments) do |metric_registry|
           metric_registry.manager_class = "Decidim::Comments::Metrics::CommentsMetricManage"
@@ -70,6 +83,23 @@ module Decidim
       initializer "decidim_comments.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_comments.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:comments) do |transfer|
+            transfer.move_records(Decidim::Comments::Comment, :decidim_author_id)
+            transfer.move_records(Decidim::Comments::CommentVote, :decidim_author_id)
+          end
+        end
+      end
+
+      initializer "decidim_comments.moderation_content" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.admin.block_user:after") do |_event_name, data|
+            Decidim::Comments::HideAllCreatedByAuthorJob.perform_later(**data)
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/comments/export.rb

@@ -12,9 +12,9 @@ module Decidim
       # Returns an Arel::Relation with all the comments for that component and resource.
       def comments_for_resource(resource_class, component)
         Comment
-          .where(decidim_root_commentable_id: resource_class.where(component: component))
           .not_deleted
           .not_hidden
+          .where(decidim_root_commentable_id: resource_class.where(component:))
           .where(decidim_root_commentable_type: resource_class.to_s)
       end
 

data/lib/decidim/comments/test/factories.rb

@@ -4,11 +4,8 @@ require "decidim/core/test/factories"
 
 FactoryBot.define do
   factory :comment, class: "Decidim::Comments::Comment" do
-    transient do
-      skip_injection { false }
-    end
-    author { build(:user, organization: commentable.organization, skip_injection: skip_injection) }
-    commentable { build(:dummy_resource, skip_injection: skip_injection) }
+    author { build(:user, organization: commentable.organization) }
+    commentable { build(:dummy_resource) }
     root_commentable { commentable }
     body { Decidim::Faker::Localized.paragraph }
     participatory_space { commentable.try(:participatory_space) }
@@ -28,32 +25,22 @@ FactoryBot.define do
     end
 
     trait :comment_on_comment do
-      author { build(:user, organization: root_commentable.organization, skip_injection: skip_injection) }
+      author { build(:user, organization: root_commentable.organization) }
       commentable do
         build(
           :comment,
-          author: author,
-          root_commentable: root_commentable,
-          commentable: root_commentable,
-          skip_injection: skip_injection
+          author:,
+          root_commentable:,
+          commentable: root_commentable
         )
       end
-      root_commentable { build(:dummy_resource, skip_injection: skip_injection) }
-    end
-
-    trait :moderated do
-      after(:create) do |comment, evaluator|
-        create(:moderation, reportable: comment, hidden_at: 2.days.ago, skip_injection: evaluator.skip_injection)
-      end
+      root_commentable { build(:dummy_resource) }
     end
   end
 
   factory :comment_vote, class: "Decidim::Comments::CommentVote" do
-    transient do
-      skip_injection { false }
-    end
-    comment { build(:comment, skip_injection: skip_injection) }
-    author { build(:user, organization: comment.organization, skip_injection: skip_injection) }
+    comment { build(:comment) }
+    author { build(:user, organization: comment.organization) }
     weight { [-1, 1].sample }
 
     trait :up_vote do

data/lib/decidim/comments/test/shared_examples/comment_event.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-shared_context "when it's a comment event" do
+shared_context "when it is a comment event" do
   include Decidim::ComponentPathHelper
   include Decidim::SanitizeHelper
 
@@ -16,10 +16,10 @@ shared_context "when it's a comment event" do
   let(:comment_author_name) { decidim_html_escape comment.author.name }
 
   let(:extra) { { comment_id: comment.id } }
-  let(:resource_title) { decidim_sanitize_translated(resource.title) }
+  let(:resource_title) { decidim_html_escape(translated(resource.title)) }
   let(:user_group) do
-    user_group = create(:user_group, :verified, organization: organization, users: [comment_author])
-    comment.update!(user_group: user_group)
+    user_group = create(:user_group, :verified, organization:, users: [comment_author])
+    comment.update!(user_group:)
     user_group
   end
 end
@@ -42,37 +42,4 @@ shared_examples_for "a comment event" do
       expect(subject.resource_text).to eq comment.formatted_body
     end
   end
-
-  describe "hidden_resource?" do
-    context "when comment is not moderated" do
-      it "returns false" do
-        expect(subject.hidden_resource?).to be false
-      end
-    end
-
-    context "when comment is moderated" do
-      let(:comment) { create(:comment, :moderated) }
-
-      it "returns true" do
-        expect(subject.hidden_resource?).to be true
-      end
-    end
-
-    context "when resource is not moderated" do
-      it "returns false" do
-        expect(subject.hidden_resource?).to be false
-      end
-    end
-
-    context "when resource is moderated" do
-      before do
-        create(:moderation, reportable: resource, hidden_at: 2.days.ago)
-        resource.reload
-      end
-
-      it "returns true" do
-        expect(subject.hidden_resource?).to be true
-      end
-    end
-  end
 end

data/lib/decidim/comments/test/shared_examples/comment_voted_event.rb

@@ -3,16 +3,16 @@
 require "spec_helper"
 
 shared_examples_for "a comment voted event" do
-  include_context "when it's a comment event"
+  include_context "when it is a comment event"
 
   let(:resource) { comment.commentable }
 
   let(:comment) { create :comment }
-  let(:comment_vote) { create :comment_vote, comment: comment }
+  let(:comment_vote) { create :comment_vote, comment: }
   let(:comment_vote_author) { comment_vote.author }
 
-  let(:extra) { { comment_id: comment.id, author_id: comment_vote_author.id, weight: weight, downvotes: 100, upvotes: 999 } }
-  let(:resource_title) { decidim_sanitize_translated(resource.title) }
+  let(:extra) { { comment_id: comment.id, author_id: comment_vote_author.id, weight:, downvotes: 100, upvotes: 999 } }
+  let(:resource_title) { decidim_html_escape(translated(resource.title)) }
   let(:resource_text) { subject.resource_text }
 
   let(:verb) { weight.positive? ? "upvoted" : "downvoted" }

data/lib/decidim/comments/test/shared_examples/create_comment_context.rb

@@ -2,13 +2,13 @@
 
 RSpec.shared_context "when creating a comment" do
   let(:organization) { create(:organization) }
-  let(:participatory_process) { create(:participatory_process, organization: organization) }
+  let(:participatory_process) { create(:participatory_process, organization:) }
   let(:component) { create(:component, participatory_space: participatory_process) }
-  let(:user) { create(:user, organization: organization) }
-  let(:author) { create(:user, organization: organization) }
-  let(:dummy_resource) { create :dummy_resource, component: component }
+  let(:user) { create(:user, organization:) }
+  let(:author) { create(:user, organization:) }
+  let(:dummy_resource) { create :dummy_resource, component: }
   let(:commentable) { dummy_resource }
-  let(:body) { ::Faker::Lorem.paragraph }
+  let(:body) { Faker::Lorem.paragraph }
   let(:alignment) { 1 }
   let(:user_group_id) { nil }
   let(:form_params) do