decidim-comments 0.30.2 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 961d892e5bcb765e23c2fb3e827821b291ea82a7b739d9f53a0bf61e0b57d84e
-  data.tar.gz: 9ee5a7bd9f898558f06cd3c151072708e228d35c77e60266e7040ee301c1ce23
+  metadata.gz: db61183a2914f1449e47ae59e79af732d2298593b617dccd1f729cdb84201957
+  data.tar.gz: b5822d26479e2a25527c45037210d4594fff730ed10f4ce0ef9e29a9e7c1377d
 SHA512:
-  metadata.gz: bfe95d885027ac452b5b10801ab86dd2a9a631d8b82b81ac0209702425fb680fd8d80150c55f90fab652aa6e9a68bdb43b3653d59ca3b9c465392d8ef23daee6
-  data.tar.gz: 38f9b191adf45e1876397a41e1e89942c864f3528b97c9d430a30c69f1852643b92685be1d574e98b8009a3833c1cd7e5d6ada1c628d2f81096bdb00b10cf8ed
+  metadata.gz: c414291891ac6ad8f8904d6e97599e9bbab52f7c07b4e93dfb60dace6abb80f2042834d82edf080a9cf365fbfdce35613edc8f76b831ae95746c6b11beb833dd
+  data.tar.gz: 53112244ce496b3920f0da1cf74ad31608c19b790d9085053bfbba4e56df39d8a3634f30203905d11c0208649e4d4d1b9d8749d78d4942f2bbbccd5608b38c26

data/app/cells/decidim/comments/comment/deletion_data.erb

@@ -1,6 +1,6 @@
 <%= render partial: "decidim/comments/comments/delete", formats: [:html], locals: { comment: model } %>
 
-<div data-comment-footer data-component="accordion" id="accordion-<%= model.id %>">
+<div data-comment-footer data-controller="accordion" id="accordion-<%= model.id %>">
   <div id="comment-<%= model.id %>-replies" class="<%= "comment-reply" if has_replies_in_children? %>">
     <% if has_replies_in_children? %>
       <%= render :replies %>

data/app/cells/decidim/comments/comment/show.erb

@@ -31,34 +31,34 @@
       <% end %>
 
       <div class="relative ml-auto">
-        <button id="dropdown-trigger-<%= context_menu_id %>" data-component="dropdown" data-target="dropdown-menu-<%= context_menu_id %>" aria-label="<%= t("decidim.components.comment.controls_label") %>">
+        <button id="dropdown-trigger-<%= context_menu_id %>" data-controller="dropdown" data-target="dropdown-menu-<%= context_menu_id %>" aria-label="<%= t("decidim.components.comment.controls_label") %>">
           <%# NOTE: having two times the icon call is intentional, as that is how the `dropdown` CSS code is done %>
           <%= icon "more-fill" %>
           <%= icon "more-fill" %>
         </button>
 
         <div id="dropdown-menu-<%= context_menu_id %>" aria-hidden="true">
-          <ul class="dropdown dropdown__bottom divide-y divide-gray-3 px-4">
+          <ul class="dropdown dropdown__bottom divide-y divide-gray-3">
             <% unless reloaded? %>
-              <li>
-                <%= cell("decidim/report_button", model, only_button: true, button_classes: "dropdown__item flex-row-reverse", modal_id: "flagModalComment#{model.id}") %>
+              <li class="dropdown__item">
+                <%= cell("decidim/report_button", model, only_button: true, button_classes: "dropdown__button", modal_id: "flagModalComment#{model.id}") %>
               </li>
             <% end %>
-            <li>
-              <%= link_to "#{commentable_path("commentId" => model.id)}#comment_#{model.id}", target: "_blank", data: { "external-link": "text-only" }, class: "dropdown__item", title: t("decidim.components.comment.single_comment_link_title") do %>
+            <li class="dropdown__item">
+              <%= link_to "#{commentable_path("commentId" => model.id)}#comment_#{model.id}", class: "dropdown__button", target: "_blank", data: { "external-link": "text-only" }, title: t("decidim.components.comment.single_comment_link_title") do %>
                 <%= icon "share-line" %>
                 <span><%= t("decidim.components.comment.single_comment_link_title") %></span>
               <% end %>
             </li>
             <% if model.authored_by?(current_user) %>
-              <li>
-                <button type="button" class="dropdown__item" data-dialog-open="<%= "editCommentModal#{model.id}" %>" title="<%= t("decidim.components.comment.edit") %>" aria-controls="<%= "editCommentModal#{model.id}" %>" aria-haspopup="dialog">
+              <li class="dropdown__item">
+                <button type="button" data-dialog-open="<%= "editCommentModal#{model.id}" %>" class="dropdown__button" title="<%= t("decidim.components.comment.edit") %>" aria-controls="<%= "editCommentModal#{model.id}" %>" aria-haspopup="dialog">
                   <%= icon "edit-line" %>
                   <span><%= t("decidim.components.comment.edit") %></span>
                 </button>
               </li>
-              <li>
-                <%= link_to comment_path, remote: true, method: :delete, class: "dropdown__item", data: { confirm: t("decidim.components.comment.confirm_destroy") } do %>
+              <li class="dropdown__item">
+                <%= link_to comment_path, remote: true, method: :delete, class: "dropdown__button", data: { confirm: t("decidim.components.comment.confirm_destroy") } do %>
                   <%= icon "delete-bin-line" %>
                   <span><%= t("decidim.components.comment.delete") %></span>
                 <% end %>
@@ -66,7 +66,7 @@
             <% end %>
             <% if (extra_actions) %>
               <% extra_actions.each do |action| %>
-                <li>
+                <li class="dropdown__item">
                   <%= link_to(*action) %>
                 </li>
               <% end %>
@@ -83,7 +83,7 @@
       </div>
     </div>
 
-    <div data-comment-footer data-component="accordion" id="accordion-<%= model.id %>" class="relative">
+    <div data-comment-footer data-controller="accordion" id="accordion-<%= model.id %>" class="relative">
       <div class="comment__footer-grid">
         <div class="comment__votes-actions">
           <%= render :actions %>

data/app/cells/decidim/comments/comment_cell.rb

@@ -105,7 +105,7 @@ module Decidim
             "#{icon(action[:icon]) if action[:icon].present?}#{action[:label]}",
             action[:url],
             {
-              class: "dropdown__item"
+              class: "dropdown__button"
             }
           ].tap do |link|
             link[2][:method] = action[:method] if action[:method].present?
@@ -139,8 +139,6 @@ module Decidim
       def author_presenter
         if model.author.respond_to?(:official?) && model.author.official?
           Decidim::Core::OfficialAuthorPresenter.new
-        elsif model.user_group
-          model.user_group.presenter
         else
           model.author.presenter
         end

data/app/cells/decidim/comments/comment_form/comment_as.erb

@@ -1,28 +1,9 @@
 <div class="comment__as">
-  <button id="dropdown-trigger-<%= comment_as_id %>" data-component="dropdown" data-target="dropdown-menu-<%= comment_as_id %>" data-comments-dropdown>
-    <div class="comment__as-author-selected">
-      <label class="ml-10 text-left text-xs" for="<%= comment_as_id %>">
-        <%= t("decidim.components.add_comment_form.form.user_group_id.your_profile") %>
-      </label>
-      <span class="flex items-center gap-2"></span>
+  <div class="comment__as-author-info">
+    <div class="author__avatar-container border border-white">
+      <%= image_tag author_presenter.avatar_url(:thumb), alt: t("decidim.author.avatar", name: author_presenter.name), class: "author__avatar" %>
     </div>
-    <%= icon "arrow-down-s-line" %>
-    <%= icon "arrow-up-s-line" %>
-  </button>
 
-  <ul id="dropdown-menu-<%= comment_as_id %>" class="gap-4">
-    <% comment_as_options.each do |option| %>
-      <li class="comment__as-author-container">
-        <div class="comment__as-author-info">
-          <div class="author__avatar-container border border-white">
-            <%= image_tag option[0].avatar_url(:thumb), alt: t("decidim.author.avatar", name: option[0].name), class: "author__avatar" %>
-          </div>
-
-          <p class="comment__as-author-name"><%= option[0].name %></p>
-        </div>
-
-        <input type="radio" name="comment[user_group_id]" class="w-5 h-4" value="<%= option[1] %>">
-      </li>
-    <% end %>
-  </ul>
+    <p class="comment__as-author-name"><%= author_presenter.name %></p>
+  </div>
 </div>

data/app/cells/decidim/comments/comment_form/show.erb

@@ -1,4 +1,4 @@
-<%= form_for(form_object, url: decidim_comments.comments_path(order:), method: :post, remote: true, html: { id: form_id }) do |form| %>
+<%= decidim_form_for(form_object, url: decidim_comments.comments_path(order:), method: :post, remote: true, html: { id: form_id }) do |form| %>
   <% unless reply? %>
     <div class="comment__form-mobile-banner">
       <p class="font-semibold text-2xl"><%= t("decidim.components.add_comment_form.add_comment") %></p>
@@ -9,7 +9,7 @@
   <% end %>
   <%= form.hidden_field :commentable_gid, id: nil %>
   <%= form.hidden_field :alignment, id: nil, class: "alignment-input" %>
-  <%= comment_as_for(form) %>
+  <%= comment_as %>
 
   <div class="px-4 md:p-0">
     <%= form.text_area(
@@ -20,7 +20,7 @@
       required: true,
       placeholder: t("decidim.components.add_comment_form.form.body.placeholder"),
       label: false,
-      data: { remaining_characters: "##{add_comment_id}-remaining-characters", input_emoji: true }
+      data: { remaining_characters: "##{add_comment_id}-remaining-characters", controller: "emoji mention character-counter" }
     ) %>
   </div>
   <span id="<%= add_comment_id %>-remaining-characters" class="remaining-character-count"></span>

data/app/cells/decidim/comments/comment_form_cell.rb

@@ -4,13 +4,10 @@ module Decidim
   module Comments
     # A cell to display a form for adding a new comment.
     class CommentFormCell < Decidim::ViewModel
-      def comment_as_for(form)
-        return if verified_user_groups.blank?
+      def comment_as
+        return if current_user.blank?
 
-        # Note that the form.select does not seem to work correctly in the cell
-        # context. The Rails form builder tries to call @template.select which
-        # is not available for the cell objects.
-        render view: :comment_as, locals: { form: }
+        render
       end
 
       def two_columns_layout?
@@ -57,10 +54,6 @@ module Decidim
         "add-comment-#{commentable_type.demodulize}-#{model.id}"
       end
 
-      def comment_as_id
-        "add-comment-#{commentable_type.demodulize}-#{model.id}-user-group-id"
-      end
-
       def root_depth
         options[:root_depth] || 0
       end
@@ -72,16 +65,8 @@ module Decidim
         )
       end
 
-      def verified_user_groups
-        return [] unless current_user
-
-        @verified_user_groups ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
-      end
-
-      def comment_as_options
-        [[UserPresenter.new(current_user), ""]] + verified_user_groups.map do |group|
-          [UserGroupPresenter.new(group), group.id]
-        end
+      def author_presenter
+        current_user&.presenter
       end
 
       def comments_max_length

data/app/cells/decidim/comments/comments/order_control.erb

@@ -1,5 +1,5 @@
 <div class="comment-order-by">
-  <%= form_with url: "#" do %>
+  <%= form_with url: "#", data: { controller: :sort_comments } do %>
     <div class="md:hidden">
       <select id="order-mobile" aria-label="<%= t("decidim.components.comment.sort_by") %>" data-mobile-order-comment-select="true">
         <option class="input-hidden" value="" <%= "disabled selected hidden" %>> <%= t("decidim.components.comment.sort_by") %> </option>

data/app/cells/decidim/comments/edit_comment_modal_form/show.erb

@@ -1,5 +1,5 @@
 <%= decidim_modal id: "editCommentModal#{model.id}" do %>
-  <%= form_for(form_object, url: decidim_comments.comment_path(comment), method: :put, remote: true, html: { id: nil }) do |form| %>
+  <%= decidim_form_for(form_object, url: decidim_comments.comment_path(comment), method: :put, remote: true, html: { id: nil }) do |form| %>
     <div data-dialog-container>
       <%= icon "edit-line" %>
       <h2 class="h2" id="dialog-title-budget-confirm" data-dialog-title>
@@ -19,7 +19,7 @@
           placeholder: t("decidim.components.edit_comment_modal_form.form.body.placeholder"),
           label: false,
           class: "w-full rounded border min-h-[160px] border-text-gray-2",
-          data: { remaining_characters: "##{form_id}-remaining-characters", input_emoji: true }
+          data: { remaining_characters: "##{form_id}-remaining-characters", controller: "emoji mention character-counter" }
         ) %>
       </div>
     </div>

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

@@ -51,7 +51,6 @@ module Decidim
           root_commentable: root_commentable(form.commentable),
           body: { I18n.locale => parsed.rewrite },
           alignment: form.alignment,
-          decidim_user_group_id: form.user_group_id,
           participatory_space: form.current_component.try(:participatory_space)
         }
 
@@ -63,13 +62,12 @@ module Decidim
         )
 
         mentioned_users = parsed.metadata[:user].users
-        mentioned_groups = parsed.metadata[:user_group].groups
         CommentCreation.publish(@comment, parsed.metadata)
-        send_notifications(mentioned_users, mentioned_groups)
+        send_notifications(mentioned_users)
       end
 
-      def send_notifications(mentioned_users, mentioned_groups)
-        NewCommentNotificationCreator.new(comment, mentioned_users, mentioned_groups).create
+      def send_notifications(mentioned_users)
+        NewCommentNotificationCreator.new(comment, mentioned_users).create
       end
 
       def root_commentable(commentable)

data/app/events/decidim/comments/comment_event.rb

@@ -10,6 +10,8 @@ module Decidim
       include Decidim::Events::MachineTranslatedEvent
 
       included do
+        delegate :author, to: :comment
+
         def resource_text(override_translation = nil)
           comment.formatted_body(override_translation)
         end
@@ -18,19 +20,10 @@ module Decidim
           super || (comment.respond_to?(:hidden?) && comment.hidden?)
         end
 
-        def author
-          comment.normalized_author
-        end
-
         def author_presenter
           return unless author
 
-          @author_presenter ||= case author
-                                when Decidim::User
-                                  Decidim::UserPresenter.new(author)
-                                when Decidim::UserGroup
-                                  Decidim::UserGroupPresenter.new(author)
-                                end
+          @author_presenter ||= author.presenter
         end
 
         def translatable_resource

data/app/forms/decidim/comments/comment_form.rb

@@ -9,7 +9,6 @@ module Decidim
 
       attribute :body, Decidim::Attributes::CleanString
       attribute :alignment, Integer
-      attribute :user_group_id, Integer
       attribute :commentable
       attribute :commentable_gid
 

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

@@ -156,7 +156,7 @@ module Decidim
 
       # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
       def reported_searchable_content_extras
-        [normalized_author.name]
+        [author.name]
       end
 
       def self.export_serializer
@@ -208,7 +208,7 @@ module Decidim
       end
 
       def edited?
-        Decidim::ActionLog.where(resource: self).exists?(["extra @> ?", Arel.sql("{\"edit\":true}")])
+        Decidim::ActionLog.where(resource: self).exists?(["extra @> ?", { edit: true }.to_json])
       end
 
       def extra_actions_for(current_user)

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

@@ -22,11 +22,11 @@ module Decidim
 
           rand(0..6).times do
             comment1 = create_comment(resource)
-            NewCommentNotificationCreator.new(comment1, [], []).create
+            NewCommentNotificationCreator.new(comment1, []).create
 
             if [true, false].sample
               comment2 = create_comment(comment1, resource)
-              NewCommentNotificationCreator.new(comment2, [], []).create
+              NewCommentNotificationCreator.new(comment2, []).create
             end
 
             next if [true, false].sample
@@ -50,14 +50,12 @@ module Decidim
         # @return [Decidim::Comments::Comment]
         def create_comment(resource, root_commentable = nil)
           author = random_user
-          user_group = random_user_group(author)
 
           params = {
             commentable: resource,
             root_commentable: root_commentable || resource,
             body: { en: ::Faker::Lorem.sentence(word_count: 50) },
-            author:,
-            user_group:
+            author:
           }
 
           Decidim.traceability.create!(
@@ -69,7 +67,6 @@ module Decidim
         end
 
         # Creates a random amount of votes for a given comment.
-        # The votes can be from a user or a user group.
         #
         # @private
         #
@@ -78,9 +75,7 @@ module Decidim
         # @return nil
         def create_votes(comment)
           rand(0..12).times do
-            user = random_user
-            user_group = random_user_group(user)
-            author = [user, user_group].compact.sample
+            author = random_user
             next if CommentVote.where(comment:, author:).any?
 
             CommentVote.create!(comment:, author:, weight: [1, -1].sample)
@@ -96,13 +91,6 @@ module Decidim
 
           user.valid? ? user : random_user
         end
-
-        def random_user_group(user)
-          user_group = Decidim::UserGroups::ManageableUserGroups.for(user).verified.sample
-          return nil unless user_group&.valid?
-
-          [true, false].sample ? user_group : nil
-        end
       end
     end
   end

data/app/packs/src/decidim/comments/comments.component.js

@@ -12,7 +12,6 @@
 // This is necessary for testing purposes
 const $ = window.$;
 
-import changeReportFormBehavior from "src/decidim/change_report_form_behavior";
 import { initializeCommentsDropdown } from "../../decidim/comments/comments_dropdown";
 
 export default class CommentsComponent {
@@ -158,8 +157,6 @@ export default class CommentsComponent {
       $opinionButtons.on("click.decidim-comments", this._onToggleOpinion);
       $text.on("input.decidim-comments", this._onTextInput);
 
-      $(document).trigger("attach-mentions-element", [$text.get(0)]);
-
       $form.on("submit.decidim-comments", () => {
         const $submit = $("button[type='submit']", $form);
 
@@ -167,15 +164,11 @@ export default class CommentsComponent {
         this._stopPolling();
       });
 
-      document.querySelectorAll(".new_report").forEach((container) => changeReportFormBehavior(container));
-
       const $dropdown = $add.find("[data-comments-dropdown]");
       if ($dropdown.length > 0) {
         initializeCommentsDropdown($dropdown[0]);
       }
 
-      document.querySelectorAll(".new_report").forEach((container) => changeReportFormBehavior(container))
-
       if ($text.length && $text.get(0) !== null) {
         // Attach event to the DOM node, instead of the jQuery object
         $text.get(0).addEventListener("emoji.added", this._onTextInput);

data/app/packs/src/decidim/comments/comments.component.test.js

@@ -18,8 +18,7 @@ window.Rails = Rails;
 // Fake timers for testing polling
 jest.useFakeTimers();
 
-import { createCharacterCounter } from "src/decidim/input_character_counter";
-import Configuration from "src/decidim/configuration";
+import Configuration from "src/decidim/refactor/implementation/configuration";
 // Component is loaded with require because using import loads it before $ has been mocked
 // so tests are not able to check the spied behaviours
 const CommentsComponent = require("./comments.component_for_testing.js");
@@ -213,7 +212,7 @@ describe("CommentsComponent", () => {
             <summary class="button button__sm button__text-secondary" aria-controls="toggle-context-menu-${commentId}">
               <svg width="1em" height="1em" role="img" aria-hidden="true"><use href="/decidim-packs/media/images/remixicon.symbol-5540ed538fb6bd400d2a.svg#ri-more-line" tabindex="-1"></use></svg>
             </summary>
-            <ul id="toggle-context-menu-${commentId}" class="dropdown dropdown__bottom divide-y divide-gray-3 px-4">
+            <ul id="toggle-context-menu-${commentId}" class="dropdown dropdown__bottom divide-y divide-gray-3">
               <li>
                 <button type="button" class="dropdown__item" data-dialog-open="flagModalComment${commentId}" title="Report" aria-controls="flagModalComment${commentId}" aria-haspopup="dialog" tabindex="0">
                   <svg width="1em" height="1em" role="img" aria-hidden="true"><use href="/decidim-packs/media/images/remixicon.symbol-5540ed538fb6bd400d2a.svg#ri-flag-line" tabindex="-1"></use></svg>
@@ -233,7 +232,7 @@ describe("CommentsComponent", () => {
         <div class="comment__content">
           <div><p>${content}</p></div>
         </div>
-        <div data-comment-footer data-component="accordion" role="presentation">
+        <div data-comment-footer data-controller="accordion" role="presentation">
           <div class="comment__footer-grid">
             <div class="comment__actions">
               <button class="button button__sm button__text-secondary" data-controls="panel-comment${commentId}-reply" role="button" tabindex="0" aria-controls="panel-comment${commentId}-reply" aria-expanded="false" aria-disabled="false">
@@ -363,9 +362,6 @@ describe("CommentsComponent", () => {
       lastCommentId: 456,
       pollingInterval: 1000
     });
-    $("textarea[maxlength]", $container).each((_i, elem) => {
-      createCharacterCounter($(elem));
-    });
 
     $doc = $(document);
     addComment = $(".add-comment", subject.$element);
@@ -447,6 +443,7 @@ describe("CommentsComponent", () => {
       spyOnAddComment("on");
       jest.spyOn(orderLinks, "on");
       jest.spyOn($doc, "trigger");
+      jest.spyOn(document, "dispatchEvent");
 
       subject.mountComponent();
     });
@@ -475,15 +472,6 @@ describe("CommentsComponent", () => {
         );
       });
     });
-
-    it("attaches the mentions elements to the text fields", () => {
-      addComment.each((i) => {
-        expect($doc.trigger).toHaveBeenCalledWith(
-          "attach-mentions-element",
-          [addComment[i].commentTextarea[0]]
-        );
-      });
-    });
   });
 
   describe("when interacting", () => {

data/app/packs/src/decidim/comments/comments.js

@@ -100,4 +100,4 @@ const commentsInitializer = () => {
 };
 
 // If no jQuery is used the Tribute feature used in comments to autocomplete mentions stops working
-$(() => commentsInitializer());
+document.addEventListener("turbo:load", commentsInitializer);

data/app/packs/src/decidim/comments/comments_mobile_modal.js

@@ -19,7 +19,7 @@ const closeAddComment = function (addCommentCard) {
   addCommentCard.classList.remove("fullscreen");
 }
 
-document.addEventListener("DOMContentLoaded", () => {
+document.addEventListener("turbo:load", () => {
   // Add comment card for mobile
   const addCommentCard = document.getElementById("add-comment-anchor");
   if (addCommentCard) {

data/app/packs/stylesheets/comments.scss

@@ -1,4 +1,4 @@
-@import "stylesheets/decidim/_tribute.scss";
+@use "stylesheets/decidim/tribute";
 
 .comments {
   &__container {
@@ -109,10 +109,6 @@
   /* overwrite default dropdown styles */
   [data-target*="dropdown"] {
     @apply md:flex w-auto cursor-pointer text-sm text-secondary;
-
-    > svg {
-      @apply h-3 w-3;
-    }
   }
 
   /* overwrite default dropdown styles */

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

@@ -31,7 +31,7 @@ module Decidim
       # level of nested replies.
       def query
         scope = base_scope
-                .includes(:author, :user_group, :up_votes, :down_votes)
+                .includes(:author, :up_votes, :down_votes)
 
         case @options[:order_by]
         when "recent"

data/app/services/decidim/comments/new_comment_notification_creator.rb

@@ -17,12 +17,9 @@ module Decidim
       # comment - the Comment from which to generate notifications.
       # mentioned_users - An ActiveRecord::Relation of the users that have been
       #   mentioned
-      # mentioned_groups - And ActiveRecord::Relation of the user_groups that have
-      #   been mentioned
-      def initialize(comment, mentioned_users, mentioned_groups = nil)
+      def initialize(comment, mentioned_users)
         @comment = comment
         @mentioned_users = mentioned_users
-        @mentioned_groups = mentioned_groups
         @already_notified_users = [comment.author]
       end
 
@@ -31,16 +28,14 @@ module Decidim
       # Returns nothing.
       def create
         notify_mentioned_users
-        notify_mentioned_groups
         notify_parent_comment_author
         notify_author_followers
-        notify_user_group_followers
         notify_commentable_recipients
       end
 
       private
 
-      attr_reader :comment, :mentioned_users, :mentioned_groups, :already_notified_users
+      attr_reader :comment, :mentioned_users, :already_notified_users
 
       def notify_mentioned_users
         affected_users = mentioned_users - already_notified_users
@@ -49,17 +44,6 @@ module Decidim
         notify(:user_mentioned, affected_users:)
       end
 
-      def notify_mentioned_groups
-        return unless mentioned_groups
-
-        mentioned_groups.each do |group|
-          affected_users = group.accepted_users - already_notified_users
-          @already_notified_users += affected_users
-
-          notify(:user_group_mentioned, affected_users:, extra: { group_id: group.id })
-        end
-      end
-
       # Notifies the author of a comment that their comment has been replied.
       # Only applies if the comment is a reply.
       def notify_parent_comment_author
@@ -78,15 +62,6 @@ module Decidim
         notify(:comment_by_followed_user, followers:)
       end
 
-      def notify_user_group_followers
-        return if comment.user_group.blank?
-
-        followers = comment.user_group.followers - already_notified_users
-        @already_notified_users += followers
-
-        notify(:comment_by_followed_user_group, followers:)
-      end
-
       # Notifies the users the `comment.commentable` resource implements as necessary.
       def notify_commentable_recipients
         followers = comment.commentable.users_to_notify_on_comment_created - already_notified_users

data/app/views/decidim/comments/admin/shared/_availability_fields.html.erb

@@ -1,5 +1,5 @@
 <div class="row column">
-  <%= form.check_box :comments_enabled, label: t(".enabled"), "data-toggle": "customize_comments_times-div" %>
+  <%= form.check_box :comments_enabled, label: t(".enabled"), data: { controller: :toggle, "toggle-toggle-value": "customize_comments_times-div" } %>
 </div>
 
 <div id="customize_comments_times-div" data-toggler=".hide" class="row column <%= @form.comments_enabled ? nil : "hide" %>">

data/app/views/decidim/comments/comments/delete.js.erb

@@ -1,4 +1,4 @@
-$(() => {
+document.addEventListener("turbo:load", () => {
   const deleteDataHtml = '<%== j(render partial: "delete", locals: { comment: @comment }).strip %>';
   const rootCommentableId = <%== "comments-for-#{@comment.root_commentable.commentable_type.demodulize}-#{@comment.root_commentable.id}".to_json %>;
   const commentId = <%= @comment.id.to_json %>;
@@ -11,7 +11,7 @@ $(() => {
     $(`#comment_${commentId} > [data-comment-footer] > .comment__${section}`).remove();
   });
   $(`#comment_${commentId} > .comment__header`).remove();
-  $(`#comment_${commentId} > [data-additional-reply]`).remove();
+  $(`#comment_${commentId} > [data-comment-footer] > [data-additional-reply]`).remove();
 
   $commentReply.remove();
   $content.replaceWith(deleteDataHtml);
@@ -21,3 +21,5 @@ $(() => {
 
   $(".comments-count", $(`#${rootCommentableId}`)).text(<%== t("decidim.components.comments.title", count: @comment.root_commentable.comments_count).to_json %>);
 });
+
+document.dispatchEvent(new CustomEvent("turbo:load"));

data/app/views/decidim/comments/comments/reload.js.erb

@@ -15,5 +15,4 @@
   // Update the comments count
   $(".comments-count", $comments).text(<%== t("decidim.components.comments.title", count: @comments_count).to_json %>);
 
-  Decidim.addInputEmoji();
 }());

data/app/views/decidim/comments/comments/update.js.erb

@@ -1,4 +1,4 @@
-$(() => {
+document.addEventListener("turbo:load", () => {
   var rootCommentableId = <%== "comments-for-#{@commentable.class.name.demodulize}-#{@commentable.id}".to_json %>;
   var $comments = $("#" + rootCommentableId);
   var config = $comments.data("decidim-comments");
@@ -25,3 +25,5 @@ $(() => {
     commentsIds: [commentId]
   });
 });
+
+document.dispatchEvent(new CustomEvent("turbo:load"));

data/config/assets.rb

@@ -2,7 +2,7 @@
 
 base_path = File.expand_path("..", __dir__)
 
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_entrypoints(
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_entrypoints(
   decidim_comments: "#{base_path}/app/packs/entrypoints/decidim_comments.js"
 )