From a6f526b9c4e7e6600852bcc5c7c10f3b11b12084 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 16 Jun 2023 18:07:53 +0200
Subject: [PATCH 001/590] Update inbox/notification counters when paginating

---
 app/views/inbox/show.turbo_stream.haml              | 12 ++++++++++++
 app/views/navigation/_desktop.html.haml             | 10 +++-------
 app/views/navigation/_mobile.html.haml              |  7 ++++---
 app/views/navigation/icons/_notifications.html.haml |  6 ++++++
 app/views/notifications/index.turbo_stream.haml     |  3 +++
 5 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 app/views/navigation/icons/_notifications.html.haml

diff --git a/app/views/inbox/show.turbo_stream.haml b/app/views/inbox/show.turbo_stream.haml
index bbd233bd..e88cfc8d 100644
--- a/app/views/inbox/show.turbo_stream.haml
+++ b/app/views/inbox/show.turbo_stream.haml
@@ -1,3 +1,5 @@
+- inbox_count = current_user.unread_inbox_count
+
 = turbo_stream.append "entries" do
   - @inbox.each do |i|
     = render "inbox/entry", i:
@@ -10,3 +12,13 @@
       params: { last_id: @inbox_last_id, author: @author }.compact,
       data: { controller: :hotkey, hotkey: "." },
       form: { data: { turbo_stream: true } }
+
+= turbo_stream.update "nav-inbox-desktop" do
+  = nav_entry t("navigation.inbox"), "/inbox",
+              badge: inbox_count, badge_attr: { data: { controller: "pwa-badge" } },
+              icon: "inbox", hotkey: "g i"
+
+= turbo_stream.update "nav-inbox-mobile" do
+  = nav_entry t("navigation.inbox"), "/inbox",
+              badge: inbox_count, badge_color: "primary", badge_pill: true,
+              icon: "inbox", icon_only: true
diff --git a/app/views/navigation/_desktop.html.haml b/app/views/navigation/_desktop.html.haml
index 05e9a6a3..167ff830 100644
--- a/app/views/navigation/_desktop.html.haml
+++ b/app/views/navigation/_desktop.html.haml
@@ -10,7 +10,8 @@
           DEV
     %ul.nav.navbar-nav.me-auto
       = nav_entry t("navigation.timeline"), root_path, icon: "home", hotkey: "g t"
-      = nav_entry t("navigation.inbox"), "/inbox", icon: "inbox", badge: inbox_count, badge_attr: { data: { controller: "pwa-badge" } }, hotkey: "g i"
+      #nav-inbox-desktop
+        = nav_entry t("navigation.inbox"), "/inbox", icon: "inbox", badge: inbox_count, badge_attr: { data: { controller: "pwa-badge" } }, hotkey: "g i"
       - if APP_CONFIG.dig(:features, :discover, :enabled) || current_user.mod?
         = nav_entry t("navigation.discover"), discover_path, icon: "compass", hotkey: "g d"
     %ul.nav.navbar-nav
@@ -23,12 +24,7 @@
       %li.nav-item.dropdown.d-none.d-sm-block
         %a.nav-link.dropdown-toggle{ href: '#', data: { bs_toggle: :dropdown } }
           %turbo-frame#notification-desktop-icon
-            - if notification_count.nil?
-              %i.fa.fa-bell-o
-            - else
-              %i.fa.fa-bell
-            %span.visually-hidden= t("navigation.notifications")
-            %span.badge= notification_count
+            = render "navigation/icons/notifications", notification_count:
         .dropdown-menu.dropdown-menu-end.notification-dropdown
           %turbo-frame#notifications-dropdown-list
             - cache current_user.notification_dropdown_cache_key do
diff --git a/app/views/navigation/_mobile.html.haml b/app/views/navigation/_mobile.html.haml
index 97e37ccc..9c53586d 100644
--- a/app/views/navigation/_mobile.html.haml
+++ b/app/views/navigation/_mobile.html.haml
@@ -3,9 +3,10 @@
   .container
     %ul.nav.navbar-nav.navbar-icon-row
       = nav_entry t("navigation.timeline"), root_path, icon: 'home', icon_only: true
-      = nav_entry t("navigation.inbox"), '/inbox',
-        badge: inbox_count, badge_color: 'primary', badge_pill: true,
-        icon: 'inbox', icon_only: true
+      #nav-inbox-mobile
+        = nav_entry t("navigation.inbox"), '/inbox',
+          badge: inbox_count, badge_color: 'primary', badge_pill: true,
+          icon: 'inbox', icon_only: true
       - if APP_CONFIG.dig(:features, :discover, :enabled) || current_user.mod?
         = nav_entry t("navigation.discover"), discover_path, icon: 'compass', icon_only: true
       = nav_entry t("navigation.notifications"), notifications_path("all"), icon: notifications_icon,
diff --git a/app/views/navigation/icons/_notifications.html.haml b/app/views/navigation/icons/_notifications.html.haml
new file mode 100644
index 00000000..767ee980
--- /dev/null
+++ b/app/views/navigation/icons/_notifications.html.haml
@@ -0,0 +1,6 @@
+- if notification_count.nil?
+  %i.fa.fa-bell-o
+- else
+  %i.fa.fa-bell
+%span.visually-hidden= t("navigation.notifications")
+%span.badge= notification_count
diff --git a/app/views/notifications/index.turbo_stream.haml b/app/views/notifications/index.turbo_stream.haml
index 4339faae..378a9a44 100644
--- a/app/views/notifications/index.turbo_stream.haml
+++ b/app/views/notifications/index.turbo_stream.haml
@@ -13,3 +13,6 @@
       params: { last_id: @notifications_last_id },
       data: { controller: :hotkey, hotkey: "." },
       form: { data: { turbo_stream: true } }
+
+= turbo_stream.update "notification-desktop-icon" do
+  = render "navigation/icons/notifications", notification_count: current_user.unread_notification_count

From 1b05063f4a623c9ab98f54e1ee9ccd95179d26a4 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 16 Jun 2023 18:09:38 +0200
Subject: [PATCH 002/590] Update tests to check for touching of caching
 timestamps

---
 spec/controllers/ajax/answer_controller_spec.rb   |  2 ++
 spec/controllers/ajax/comment_controller_spec.rb  | 15 +++++++++++++++
 spec/controllers/inbox_controller_spec.rb         |  9 +++------
 .../settings/export_controller_spec.rb            |  6 ++++--
 spec/shared_examples/touches_timestamps.rb        | 11 +++++++++++
 5 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 spec/shared_examples/touches_timestamps.rb

diff --git a/spec/controllers/ajax/answer_controller_spec.rb b/spec/controllers/ajax/answer_controller_spec.rb
index 18c65354..dd2a1ca6 100644
--- a/spec/controllers/ajax/answer_controller_spec.rb
+++ b/spec/controllers/ajax/answer_controller_spec.rb
@@ -26,6 +26,8 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
         end
 
         include_examples "returns the expected response"
+
+        include_examples "touches user timestamp", :inbox_updated_at
       end
 
       shared_examples "does not create the answer" do
diff --git a/spec/controllers/ajax/comment_controller_spec.rb b/spec/controllers/ajax/comment_controller_spec.rb
index 0f4189b8..a93fc126 100644
--- a/spec/controllers/ajax/comment_controller_spec.rb
+++ b/spec/controllers/ajax/comment_controller_spec.rb
@@ -4,6 +4,8 @@
 require "rails_helper"
 
 describe Ajax::CommentController, :ajax_controller, type: :controller do
+  include ActiveSupport::Testing::TimeHelpers
+
   let(:answer) { FactoryBot.create(:answer, user: FactoryBot.create(:user)) }
 
   describe "#create" do
@@ -23,6 +25,19 @@ describe Ajax::CommentController, :ajax_controller, type: :controller do
           expect(answer.reload.comments.ids).to include(Comment.last.id)
         end
 
+        context "a user is subscribed to the answer" do
+          let(:subscribed_user) { FactoryBot.create(:user) }
+
+          it "updates the notification caching timestamp for a subscribed user" do
+            Subscription.subscribe(subscribed_user, answer)
+
+            travel_to(1.day.from_now) do
+              expect { subject }.to change { subscribed_user.reload.notifications_updated_at }.to(DateTime.now)
+            end
+          end
+
+        end
+
         include_examples "returns the expected response"
       end
 
diff --git a/spec/controllers/inbox_controller_spec.rb b/spec/controllers/inbox_controller_spec.rb
index 94a8accf..a6e5917c 100644
--- a/spec/controllers/inbox_controller_spec.rb
+++ b/spec/controllers/inbox_controller_spec.rb
@@ -65,12 +65,7 @@ describe InboxController, type: :controller do
           expect { subject }.to change { inbox_entry.reload.new? }.from(true).to(false)
         end
 
-        it "updates the the timestamp used for caching" do
-          user.update(inbox_updated_at: original_inbox_updated_at)
-          travel 1.second do
-            expect { subject }.to change { user.reload.inbox_updated_at.floor }.from(original_inbox_updated_at.floor).to(Time.now.utc.floor)
-          end
-        end
+        include_examples "touches user timestamp", :inbox_updated_at
 
         context "when requested the turbo stream format" do
           subject { get :show, format: :turbo_stream }
@@ -280,6 +275,8 @@ describe InboxController, type: :controller do
       it "creates an inbox entry" do
         expect { subject }.to(change { user.inboxes.count }.by(1))
       end
+
+      include_examples "touches user timestamp", :inbox_updated_at
     end
   end
 end
diff --git a/spec/controllers/settings/export_controller_spec.rb b/spec/controllers/settings/export_controller_spec.rb
index 0750ed6e..0bc87796 100644
--- a/spec/controllers/settings/export_controller_spec.rb
+++ b/spec/controllers/settings/export_controller_spec.rb
@@ -17,18 +17,20 @@ describe Settings::ExportController, type: :controller do
       end
 
       context "when user has a new DataExported notification" do
-        let(:notification) do
+        let!(:notification) do
           Notification::DataExported.create(
             target_id:   user.id,
             target_type: "User::DataExport",
             recipient:   user,
-            new:         true
+            new:         true,
           )
         end
 
         it "marks the notification as read" do
           expect { subject }.to change { notification.reload.new }.from(true).to(false)
         end
+
+        include_examples "touches user timestamp", :notifications_updated_at
       end
     end
   end
diff --git a/spec/shared_examples/touches_timestamps.rb b/spec/shared_examples/touches_timestamps.rb
new file mode 100644
index 00000000..339a1b95
--- /dev/null
+++ b/spec/shared_examples/touches_timestamps.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for "touches user timestamp" do |timestamp_column|
+  include ActiveSupport::Testing::TimeHelpers
+
+  it "touches #{timestamp_column}" do
+    travel_to(1.day.from_now) do
+      expect { subject }.to change { user.reload.send(timestamp_column) }.to(DateTime.now)
+    end
+  end
+end

From ece64669a11c6bcca825b80b8fe3fdfcf99c98e3 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 16 Jun 2023 18:18:40 +0200
Subject: [PATCH 003/590] Update caching timestamps in model events

---
 app/models/inbox.rb        | 12 ++++++++++++
 app/models/notification.rb | 16 ++++++++++++++--
 app/models/subscription.rb |  7 ++++++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 6a74687f..1a1a0066 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -13,6 +13,18 @@ class Inbox < ApplicationRecord
       !user.privacy_allow_anonymous_questions?
   end
 
+  after_create do
+    user.touch(:inbox_updated_at)
+  end
+
+  after_update do
+    user.touch(:inbox_updated_at)
+  end
+
+  after_destroy do
+    user.touch(:inbox_updated_at)
+  end
+
   def answer(answer_content, user)
     raise Errors::AnsweringOtherBlockedSelf if question.user&.blocking?(user)
     raise Errors::AnsweringSelfBlockedOther if user.blocking?(question.user)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 3e15eae4..e36cad0a 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,9 +1,21 @@
 # frozen_string_literal: true
 
 class Notification < ApplicationRecord
-  belongs_to :recipient, class_name: "User", touch: :notifications_updated_at
+  belongs_to :recipient, class_name: "User"
   belongs_to :target, polymorphic: true
 
+  after_create do
+    recipient.touch(:notifications_updated_at)
+  end
+
+  after_update do
+    recipient.touch(:notifications_updated_at)
+  end
+
+  after_destroy do
+    recipient.touch(:notifications_updated_at)
+  end
+
   class << self
     include CursorPaginatable
 
@@ -45,7 +57,7 @@ class Notification < ApplicationRecord
 
       n = notification_type.new(target:,
                                 recipient:,
-                                new:       true)
+                                new:       true,)
       n.save!
       n
     end
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index 0b05a1b9..2e8e7b3c 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -39,7 +39,12 @@ class Subscription < ApplicationRecord
         { target_id: source.id, target_type: Comment, recipient_id: s.user_id, new: true, type: Notification::Commented, created_at: source.created_at, updated_at: source.created_at }
       end
 
-      Notification.insert_all!(notifications) unless notifications.empty? # rubocop:disable Rails/SkipsModelValidations
+      return if notifications.empty?
+
+      # rubocop:disable Rails/SkipsModelValidations
+      Notification.insert_all!(notifications)
+      User.where(id: notifications.pluck(:recipient_id)).touch_all(:notifications_updated_at)
+      # rubocop:enable Rails/SkipsModelValidations
     end
 
     def denotify(source, target)

From 5a3f65e39abc1c26c36bd92efb84217c9f5a18a6 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 16 Jun 2023 18:19:31 +0200
Subject: [PATCH 004/590] Ensure counters are up to date when rendering
 inbox/notifications views

---
 app/controllers/inbox_controller.rb         | 17 ++++++-----------
 app/controllers/notifications_controller.rb |  7 +++----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/controllers/inbox_controller.rb b/app/controllers/inbox_controller.rb
index 661d49f4..7f3db342 100644
--- a/app/controllers/inbox_controller.rb
+++ b/app/controllers/inbox_controller.rb
@@ -3,8 +3,6 @@
 class InboxController < ApplicationController
   before_action :authenticate_user!
 
-  after_action :mark_inbox_entries_as_read, only: %i[show]
-
   def show # rubocop:disable Metrics/MethodLength
     find_author
     find_inbox_entries
@@ -19,14 +17,11 @@ class InboxController < ApplicationController
     @delete_id = find_delete_id
     @disabled = true if @inbox.empty?
 
-    respond_to do |format|
-      format.html { render "show" }
-      format.turbo_stream do
-        render "show", layout: false, status: :see_other
+    mark_inbox_entries_as_read
 
-        # rubocop disabled as just flipping a flag doesn't need to have validations to be run
-        @inbox.update_all(new: false) # rubocop:disable Rails/SkipsModelValidations
-      end
+    respond_to do |format|
+      format.html
+      format.turbo_stream
     end
   end
 
@@ -85,8 +80,8 @@ class InboxController < ApplicationController
   # rubocop:disable Rails/SkipsModelValidations
   def mark_inbox_entries_as_read
     # using .dup to not modify @inbox -- useful in tests
-    @inbox&.dup&.update_all(new: false)
-    current_user.touch(:inbox_updated_at)
+    updated = @inbox&.dup&.update_all(new: false)
+    current_user.touch(:inbox_updated_at) if updated.positive?
   end
   # rubocop:enable Rails/SkipsModelValidations
 
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index b0088074..a240d3f7 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -3,8 +3,6 @@
 class NotificationsController < ApplicationController
   before_action :authenticate_user!
 
-  after_action :mark_notifications_as_read, only: %i[index]
-
   TYPE_MAPPINGS = {
     "answer"       => Notification::QuestionAnswered.name,
     "comment"      => Notification::Commented.name,
@@ -18,6 +16,7 @@ class NotificationsController < ApplicationController
     @notifications = cursored_notifications_for(type: @type, last_id: params[:last_id])
     paginate_notifications
     @counters = count_unread_by_type
+    mark_notifications_as_read
 
     respond_to do |format|
       format.html
@@ -52,8 +51,8 @@ class NotificationsController < ApplicationController
   # rubocop:disable Rails/SkipsModelValidations
   def mark_notifications_as_read
     # using .dup to not modify @notifications -- useful in tests
-    @notifications&.dup&.update_all(new: false)
-    current_user.touch(:notifications_updated_at)
+    updated = @notifications&.dup&.update_all(new: false)
+    current_user.touch(:notifications_updated_at) if updated.positive?
   end
   # rubocop:enable Rails/SkipsModelValidations
 

From bcfb215f8c4b7e21e213f101105f035edd71ea72 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 16 Jun 2023 18:20:21 +0200
Subject: [PATCH 005/590] Ensure caching timestamp is updated when marking
 notifications as read

---
 app/controllers/answer_controller.rb          | 3 ++-
 app/controllers/settings/export_controller.rb | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/answer_controller.rb b/app/controllers/answer_controller.rb
index ac52ab40..2a6e5625 100644
--- a/app/controllers/answer_controller.rb
+++ b/app/controllers/answer_controller.rb
@@ -51,11 +51,12 @@ class AnswerController < ApplicationController
   private
 
   def mark_notifications_as_read
-    Notification.where(recipient_id: current_user.id, new: true)
+    updated = Notification.where(recipient_id: current_user.id, new: true)
                 .and(Notification.where(type: "Notification::QuestionAnswered", target_id: @answer.id)
                 .or(Notification.where(type: "Notification::Commented", target_id: @answer.comments.pluck(:id)))
                 .or(Notification.where(type: "Notification::Smiled", target_id: @answer.smiles.pluck(:id)))
                 .or(Notification.where(type: "Notification::CommentSmiled", target_id: @answer.comment_smiles.pluck(:id))))
                 .update_all(new: false) # rubocop:disable Rails/SkipsModelValidations
+    current_user.touch(:notifications_updated_at) if updated.positive?
   end
 end
diff --git a/app/controllers/settings/export_controller.rb b/app/controllers/settings/export_controller.rb
index 1a8bc0a2..3957e427 100644
--- a/app/controllers/settings/export_controller.rb
+++ b/app/controllers/settings/export_controller.rb
@@ -21,9 +21,12 @@ class Settings::ExportController < ApplicationController
 
   private
 
+  # rubocop:disable Rails/SkipsModelValidations
   def mark_notifications_as_read
-    Notification::DataExported
-      .where(recipient: current_user, new: true)
-      .update_all(new: false) # rubocop:disable Rails/SkipsModelValidations
+    updated = Notification::DataExported
+              .where(recipient: current_user, new: true)
+              .update_all(new: false)
+    current_user.touch(:notifications_updated_at) if updated.positive?
   end
+  # rubocop:enable Rails/SkipsModelValidations
 end

From cb89d42813f391eafdf66ae2c3afc7378e7371b8 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 16 Aug 2023 21:17:18 +0200
Subject: [PATCH 006/590] Put IDs directly on nav entries

---
 app/helpers/bootstrap_helper.rb         | 3 ++-
 app/views/navigation/_desktop.html.haml | 5 ++---
 app/views/navigation/_mobile.html.haml  | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/helpers/bootstrap_helper.rb b/app/helpers/bootstrap_helper.rb
index 4d14e3dc..55544265 100644
--- a/app/helpers/bootstrap_helper.rb
+++ b/app/helpers/bootstrap_helper.rb
@@ -8,6 +8,7 @@ module BootstrapHelper
       badge_attr:  {},
       icon:        nil,
       class:       "",
+      id:          nil,
       hotkey:      nil,
     }.merge(options)
 
@@ -34,7 +35,7 @@ module BootstrapHelper
       body += " #{content_tag(:span, options[:badge], class: badge_class, **options[:badge_attr])}".html_safe
     end
 
-    content_tag(:li, link_to(body.html_safe, path, class: "nav-link", data: { hotkey: options[:hotkey] }), class: classes)
+    content_tag(:li, link_to(body.html_safe, path, class: "nav-link", data: { hotkey: options[:hotkey] }), class: classes, id: options[:id])
   end
 
   def list_group_item(body, path, options = {})
diff --git a/app/views/navigation/_desktop.html.haml b/app/views/navigation/_desktop.html.haml
index 167ff830..8efb1151 100644
--- a/app/views/navigation/_desktop.html.haml
+++ b/app/views/navigation/_desktop.html.haml
@@ -1,4 +1,4 @@
-%nav.navbar.navbar-themed.navbar-expand-lg.bg-primary.fixed-top.d-lg-block.d-none.d-print-none{ class: Rails.env.development? ? "navbar-dev" : "", role: :navigation }
+%nav.navbar.navbar-themed.navbar-expand-lg.bg-primary.fixed-top.d-lg-block.d-none.d-print-none{ class: Rails.env.tdevelopment? ? "navbar-dev" : "", role: :navigation }
   .container
     %a.navbar-brand{ href: '/', title: APP_CONFIG["site_name"] }
       - if APP_CONFIG["use_svg_logo"]
@@ -10,8 +10,7 @@
           DEV
     %ul.nav.navbar-nav.me-auto
       = nav_entry t("navigation.timeline"), root_path, icon: "home", hotkey: "g t"
-      #nav-inbox-desktop
-        = nav_entry t("navigation.inbox"), "/inbox", icon: "inbox", badge: inbox_count, badge_attr: { data: { controller: "pwa-badge" } }, hotkey: "g i"
+      = nav_entry t("navigation.inbox"), "/inbox", icon: "inbox", badge: inbox_count, badge_attr: { data: { controller: "pwa-badge" } }, hotkey: "g i", id: "nav-inbox-desktop"
       - if APP_CONFIG.dig(:features, :discover, :enabled) || current_user.mod?
         = nav_entry t("navigation.discover"), discover_path, icon: "compass", hotkey: "g d"
     %ul.nav.navbar-nav
diff --git a/app/views/navigation/_mobile.html.haml b/app/views/navigation/_mobile.html.haml
index 9c53586d..2b68f081 100644
--- a/app/views/navigation/_mobile.html.haml
+++ b/app/views/navigation/_mobile.html.haml
@@ -3,10 +3,9 @@
   .container
     %ul.nav.navbar-nav.navbar-icon-row
       = nav_entry t("navigation.timeline"), root_path, icon: 'home', icon_only: true
-      #nav-inbox-mobile
-        = nav_entry t("navigation.inbox"), '/inbox',
-          badge: inbox_count, badge_color: 'primary', badge_pill: true,
-          icon: 'inbox', icon_only: true
+      = nav_entry t("navigation.inbox"), '/inbox',
+        badge: inbox_count, badge_color: 'primary', badge_pill: true,
+        icon: 'inbox', icon_only: true, id: "nav-inbox-mobile"
       - if APP_CONFIG.dig(:features, :discover, :enabled) || current_user.mod?
         = nav_entry t("navigation.discover"), discover_path, icon: 'compass', icon_only: true
       = nav_entry t("navigation.notifications"), notifications_path("all"), icon: notifications_icon,

From eed4ed5d4bd5147a5df68d4d092e3006ac0ff900 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 16 Aug 2023 21:19:05 +0200
Subject: [PATCH 007/590] Add test for putting IDs on nav entries

---
 spec/helpers/bootstrap_helper_spec.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spec/helpers/bootstrap_helper_spec.rb b/spec/helpers/bootstrap_helper_spec.rb
index b996f162..4cacecd7 100644
--- a/spec/helpers/bootstrap_helper_spec.rb
+++ b/spec/helpers/bootstrap_helper_spec.rb
@@ -42,6 +42,13 @@ describe BootstrapHelper, :type => :helper do
         eq('<li class="nav-item "><a class="nav-link" href="/example">Example <span class="badge badge-primary badge-pill">3</span></a></li>')
       )
     end
+
+    it 'should put an ID on the entry an id if given' do
+      allow(self).to receive(:current_page?).and_return(false)
+      expect(nav_entry('Example', '/example', id: "testing")).to(
+        eq('<li class="nav-item " id="testing"><a class="nav-link" href="/example">Example</a></li>')
+      )
+    end
   end
 
   describe "#list_group_item" do

From 54ac832c9195c90393d3ac13758e4bb8bc720460 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 16 Aug 2023 21:57:31 +0200
Subject: [PATCH 008/590] Ensure inbox caching timestamp gets updated when
 answering questions and returning to inbox

---
 app/models/answer.rb                            |  1 +
 spec/controllers/ajax/answer_controller_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 5e43464b..71417252 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -20,6 +20,7 @@ class Answer < ApplicationRecord
 
   after_create do
     Inbox.where(user: self.user, question: self.question).destroy_all
+    user.touch :inbox_updated_at # rubocop:disable Rails/SkipsModelValidations
 
     Notification.notify self.question.user, self unless self.question.user == self.user or self.question.user.nil?
     Subscription.subscribe self.user, self
diff --git a/spec/controllers/ajax/answer_controller_spec.rb b/spec/controllers/ajax/answer_controller_spec.rb
index dd2a1ca6..3e42c2e7 100644
--- a/spec/controllers/ajax/answer_controller_spec.rb
+++ b/spec/controllers/ajax/answer_controller_spec.rb
@@ -4,6 +4,8 @@
 require "rails_helper"
 
 describe Ajax::AnswerController, :ajax_controller, type: :controller do
+  include ActiveSupport::Testing::TimeHelpers
+
   let(:question) { FactoryBot.create(:question, user: FactoryBot.build(:user, privacy_allow_stranger_answers: asker_allows_strangers)) }
   let(:asker_allows_strangers) { true }
 
@@ -327,6 +329,14 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
           user.save
           expect { subject }.to(change { Inbox.where(question_id: answer.question.id, user_id: user.id).count }.by(1))
         end
+
+        it "updates the inbox caching timestamp for the user who answered" do
+          initial_timestamp = 1.day.ago
+          answer.user.update(inbox_updated_at: initial_timestamp)
+          freeze_time do
+            expect { subject }.to(change { answer.user.reload.inbox_updated_at }.from(initial_timestamp).to(DateTime.now))
+          end
+        end
       end
 
       context "when the answer exists and was not made by the current user" do

From a5c58da48c257d2c57cdb8b8d5506f98ad044724 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Thu, 17 Aug 2023 20:54:37 +0200
Subject: [PATCH 009/590] Set time explicitly

---
 spec/controllers/ajax/answer_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/ajax/answer_controller_spec.rb b/spec/controllers/ajax/answer_controller_spec.rb
index 3e42c2e7..1f1632f2 100644
--- a/spec/controllers/ajax/answer_controller_spec.rb
+++ b/spec/controllers/ajax/answer_controller_spec.rb
@@ -333,7 +333,7 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
         it "updates the inbox caching timestamp for the user who answered" do
           initial_timestamp = 1.day.ago
           answer.user.update(inbox_updated_at: initial_timestamp)
-          freeze_time do
+          travel_to 1.day.from_now do
             expect { subject }.to(change { answer.user.reload.inbox_updated_at }.from(initial_timestamp).to(DateTime.now))
           end
         end

From efb9b032951115b8fb2e8e84ce4f006509850d6f Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 18 Aug 2023 18:22:45 +0200
Subject: [PATCH 010/590] Compare time using string representation

---
 spec/controllers/ajax/answer_controller_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/controllers/ajax/answer_controller_spec.rb b/spec/controllers/ajax/answer_controller_spec.rb
index 1f1632f2..2a8906ca 100644
--- a/spec/controllers/ajax/answer_controller_spec.rb
+++ b/spec/controllers/ajax/answer_controller_spec.rb
@@ -334,7 +334,8 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
           initial_timestamp = 1.day.ago
           answer.user.update(inbox_updated_at: initial_timestamp)
           travel_to 1.day.from_now do
-            expect { subject }.to(change { answer.user.reload.inbox_updated_at }.from(initial_timestamp).to(DateTime.now))
+            # using string representation to avoid precision issues
+            expect { subject }.to(change { answer.user.reload.inbox_updated_at.to_s }.from(initial_timestamp.to_s).to(DateTime.now))
           end
         end
       end

From 620121341e9aa313693298d1d1167927cf1012fd Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 18 Aug 2023 19:41:21 +0200
Subject: [PATCH 011/590] Fix typo

---
 app/views/navigation/_desktop.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/navigation/_desktop.html.haml b/app/views/navigation/_desktop.html.haml
index 8efb1151..fc0cce38 100644
--- a/app/views/navigation/_desktop.html.haml
+++ b/app/views/navigation/_desktop.html.haml
@@ -1,4 +1,4 @@
-%nav.navbar.navbar-themed.navbar-expand-lg.bg-primary.fixed-top.d-lg-block.d-none.d-print-none{ class: Rails.env.tdevelopment? ? "navbar-dev" : "", role: :navigation }
+%nav.navbar.navbar-themed.navbar-expand-lg.bg-primary.fixed-top.d-lg-block.d-none.d-print-none{ class: Rails.env.development? ? "navbar-dev" : "", role: :navigation }
   .container
     %a.navbar-brand{ href: '/', title: APP_CONFIG["site_name"] }
       - if APP_CONFIG["use_svg_logo"]

From d39f37072d76614e603433694375a8abd0d8402e Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 18 Aug 2023 19:43:59 +0200
Subject: [PATCH 012/590] Fix lint errors

---
 app/models/subscription.rb                    | 25 +++++++++++++------
 .../ajax/comment_controller_spec.rb           |  1 -
 spec/helpers/bootstrap_helper_spec.rb         |  6 ++---
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index 2e8e7b3c..2274fcac 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -28,15 +28,18 @@ class Subscription < ApplicationRecord
     def notify(source, target)
       return nil if source.nil? || target.nil?
 
-      muted_by = Relationships::Mute.where(target: source.user).pluck(&:source_id)
-
       # As we will need to notify for each person subscribed,
       # it's much faster to bulk insert than to use +Notification.notify+
-      notifications = Subscription.where(answer: target)
-                                  .where.not(user: source.user)
-                                  .where.not(user_id: muted_by)
-                                  .map do |s|
-        { target_id: source.id, target_type: Comment, recipient_id: s.user_id, new: true, type: Notification::Commented, created_at: source.created_at, updated_at: source.created_at }
+      notifications = Subscription.for(source, target).pluck(:user_id).map do |recipient_id|
+        {
+          target_id:    source.id,
+          target_type:  Comment,
+          recipient_id:,
+          new:          true,
+          type:         Notification::Commented,
+          created_at:   source.created_at,
+          updated_at:   source.created_at,
+        }
       end
 
       return if notifications.empty?
@@ -53,5 +56,13 @@ class Subscription < ApplicationRecord
       subs = Subscription.where(answer: target)
       Notification.where(target:, recipient: subs.map(&:user)).delete_all
     end
+
+    def for(source, target)
+      muted_by = Relationships::Mute.where(target: source.user).pluck(&:source_id)
+
+      Subscription.where(answer: target)
+                  .where.not(user: source.user)
+                  .where.not(user_id: muted_by)
+    end
   end
 end
diff --git a/spec/controllers/ajax/comment_controller_spec.rb b/spec/controllers/ajax/comment_controller_spec.rb
index a93fc126..ace88ce6 100644
--- a/spec/controllers/ajax/comment_controller_spec.rb
+++ b/spec/controllers/ajax/comment_controller_spec.rb
@@ -35,7 +35,6 @@ describe Ajax::CommentController, :ajax_controller, type: :controller do
               expect { subject }.to change { subscribed_user.reload.notifications_updated_at }.to(DateTime.now)
             end
           end
-
         end
 
         include_examples "returns the expected response"
diff --git a/spec/helpers/bootstrap_helper_spec.rb b/spec/helpers/bootstrap_helper_spec.rb
index 4cacecd7..0f31f85e 100644
--- a/spec/helpers/bootstrap_helper_spec.rb
+++ b/spec/helpers/bootstrap_helper_spec.rb
@@ -43,10 +43,10 @@ describe BootstrapHelper, :type => :helper do
       )
     end
 
-    it 'should put an ID on the entry an id if given' do
+    it "should put an ID on the entry an id if given" do
       allow(self).to receive(:current_page?).and_return(false)
-      expect(nav_entry('Example', '/example', id: "testing")).to(
-        eq('<li class="nav-item " id="testing"><a class="nav-link" href="/example">Example</a></li>')
+      expect(nav_entry("Example", "/example", id: "testing")).to(
+        eq("<li class=\"nav-item \" id=\"testing\"><a class=\"nav-link\" href=\"/example\">Example</a></li>"),
       )
     end
   end

From dc355d1dd28c9ad993ab3bd37f69eb16dbd08afd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:12:14 +0000
Subject: [PATCH 013/590] Bump sass from 1.66.1 to 1.67.0

Bumps [sass](https://github.com/sass/dart-sass) from 1.66.1 to 1.67.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.66.1...1.67.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 49f471aa..3931e773 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.66.1",
+    "sass": "^1.67.0",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.2.2"
diff --git a/yarn.lock b/yarn.lock
index 83cc6805..4ee4f418 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2268,10 +2268,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.66.1:
-  version "1.66.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.66.1.tgz#04b51c4671e4650aa393740e66a4e58b44d055b1"
-  integrity sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==
+sass@^1.67.0:
+  version "1.67.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.67.0.tgz#fed84d74b9cd708db603b1380d6dc1f71bb24f6f"
+  integrity sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 884505a311e1f4d0fbaf01aa39e3e7e8852f6fd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:12:25 +0000
Subject: [PATCH 014/590] Bump stylelint-scss from 5.1.0 to 5.2.1

Bumps [stylelint-scss](https://github.com/stylelint-scss/stylelint-scss) from 5.1.0 to 5.2.1.
- [Release notes](https://github.com/stylelint-scss/stylelint-scss/releases)
- [Changelog](https://github.com/stylelint-scss/stylelint-scss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint-scss/stylelint-scss/compare/v5.1.0...v5.2.1)

---
updated-dependencies:
- dependency-name: stylelint-scss
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 49f471aa..24b91576 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,6 @@
     "eslint-plugin-import": "^2.28.1",
     "stylelint": "^15.10.3",
     "stylelint-config-standard-scss": "^11.0.0",
-    "stylelint-scss": "^5.1.0"
+    "stylelint-scss": "^5.2.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 83cc6805..7115a590 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2475,11 +2475,12 @@ stylelint-config-standard@^34.0.0:
   dependencies:
     stylelint-config-recommended "^13.0.0"
 
-stylelint-scss@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.1.0.tgz#dd318bc5c65f7a11f3ecacc7b6e8b67e7f2f1df1"
-  integrity sha512-E+KlQFXv1Euha43qw3q+wKBSli557wxbbo6/39DWhRNXlUa9Cz+FYrcgz+PT6ag0l6UisCYjAGCNhoSl4FcwlA==
+stylelint-scss@^5.1.0, stylelint-scss@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.2.1.tgz#810299e4141fa38852bd14536a90e4942c8f387f"
+  integrity sha512-ZoTJUM85/qqpQHfEppjW/St//8s6p9Qsg8deWlYlr56F9iUgC9vXeIDQvH4odkRRJLTLFQzYMALSOFCQ3MDkgw==
   dependencies:
+    known-css-properties "^0.28.0"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-selector-parser "^6.0.13"

From 223cfc189053129ebb42ecf2ff559f455bceaa85 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:14:49 +0000
Subject: [PATCH 015/590] Bump docker/build-push-action from 4 to 5

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 36b98fa1..895123df 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -46,7 +46,7 @@ jobs:
         if: github.event_name != 'pull_request'
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           build-args: |
             BUNDLER_VERSION=${{ env.BUNDLER_VERSION }}

From 829ed00955ae929215c4b7284378f838e9ec6131 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:14:53 +0000
Subject: [PATCH 016/590] Bump docker/login-action from 2 to 3

Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 36b98fa1..a4b0b57d 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -38,7 +38,7 @@ jobs:
           esac
 
       - name: Login to registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From a997696570450e49fac2fe2230e43b7b806d0e20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:53:34 +0000
Subject: [PATCH 017/590] Bump cssbundling-rails from 1.2.0 to 1.3.2

Bumps [cssbundling-rails](https://github.com/rails/cssbundling-rails) from 1.2.0 to 1.3.2.
- [Release notes](https://github.com/rails/cssbundling-rails/releases)
- [Commits](https://github.com/rails/cssbundling-rails/compare/v1.2.0...v1.3.2)

---
updated-dependencies:
- dependency-name: cssbundling-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4d6b3573..da35a354 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem "i18n-js", "4.0"
 gem "rails", "~> 6.1"
 gem "rails-i18n", "~> 7.0"
 
-gem "cssbundling-rails", "~> 1.2"
+gem "cssbundling-rails", "~> 1.3"
 gem "jsbundling-rails", "~> 1.1"
 gem "sassc-rails"
 gem "sprockets", "~> 4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1293ed02..d5c87a8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -107,7 +107,7 @@ GEM
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     crass (1.0.6)
-    cssbundling-rails (1.2.0)
+    cssbundling-rails (1.3.2)
       railties (>= 6.0.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
@@ -504,7 +504,7 @@ DEPENDENCIES
   carrierwave_backgrounder!
   colorize
   connection_pool
-  cssbundling-rails (~> 1.2)
+  cssbundling-rails (~> 1.3)
   database_cleaner
   devise (~> 4.9)
   devise-async

From 0d7c2316a72966dffc0ec8f4ee5f9b1983cabfc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:54:20 +0000
Subject: [PATCH 018/590] Bump rubocop-rails from 2.21.0 to 2.21.1

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.21.0 to 2.21.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.21.0...v2.21.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1293ed02..18c6668e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -404,7 +404,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.21.0)
+    rubocop-rails (2.21.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

From b1fa1083db80df75f5b088000b1be35fe8134533 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:55:18 +0000
Subject: [PATCH 019/590] Bump sanitize from 6.0.2 to 6.1.0

Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.2...v6.1.0)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1293ed02..f794762f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -412,7 +412,7 @@ GEM
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     rubyzip (2.3.2)
-    sanitize (6.0.2)
+    sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sassc (2.4.0)

From adc994f658cf95d8a08c158303e71b32f3a044ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 15:42:24 +0000
Subject: [PATCH 020/590] Bump jsbundling-rails from 1.1.2 to 1.2.1

Bumps [jsbundling-rails](https://github.com/rails/jsbundling-rails) from 1.1.2 to 1.2.1.
- [Release notes](https://github.com/rails/jsbundling-rails/releases)
- [Commits](https://github.com/rails/jsbundling-rails/compare/v1.1.2...v1.2.1)

---
updated-dependencies:
- dependency-name: jsbundling-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index da35a354..08789eae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem "rails", "~> 6.1"
 gem "rails-i18n", "~> 7.0"
 
 gem "cssbundling-rails", "~> 1.3"
-gem "jsbundling-rails", "~> 1.1"
+gem "jsbundling-rails", "~> 1.2"
 gem "sassc-rails"
 gem "sprockets", "~> 4.2"
 gem "sprockets-rails", require: "sprockets/railtie"
diff --git a/Gemfile.lock b/Gemfile.lock
index d5c87a8d..6c151c5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,7 +209,7 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    jsbundling-rails (1.1.2)
+    jsbundling-rails (1.2.1)
       railties (>= 6.0.0)
     json (2.6.3)
     json-schema (4.0.0)
@@ -523,7 +523,7 @@ DEPENDENCIES
   hcaptcha (~> 7.0)
   httparty
   i18n-js (= 4.0)
-  jsbundling-rails (~> 1.1)
+  jsbundling-rails (~> 1.2)
   json-schema
   jwt (~> 2.7)
   letter_opener

From cd5a885f9ed6156efcddaa0d963e549f011671c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 15:47:17 +0000
Subject: [PATCH 021/590] Bump json-schema from 4.0.0 to 4.1.1

Bumps [json-schema](https://github.com/voxpupuli/json-schema) from 4.0.0 to 4.1.1.
- [Changelog](https://github.com/voxpupuli/json-schema/blob/master/CHANGELOG.md)
- [Commits](https://github.com/voxpupuli/json-schema/compare/v4.0.0...v4.1.1)

---
updated-dependencies:
- dependency-name: json-schema
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6c151c5b..22f083d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,7 +75,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.4)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.1.1)
@@ -212,7 +212,7 @@ GEM
     jsbundling-rails (1.2.1)
       railties (>= 6.0.0)
     json (2.6.3)
-    json-schema (4.0.0)
+    json-schema (4.1.1)
       addressable (>= 2.8)
     jwt (2.7.1)
     kaminari (1.2.2)
@@ -286,7 +286,7 @@ GEM
     pghero (3.3.4)
       activerecord (>= 6)
     prometheus-client (4.2.1)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     puma (6.3.1)
       nio4r (~> 2.0)
     pundit (2.3.1)

From 8fad702d9b3441101c9c638be085a4e0138bd6f8 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
Date: Fri, 22 Sep 2023 18:31:05 +0200
Subject: [PATCH 022/590] Ignore carrierwave_backgrounder in Dependabot

It slips into a sentry-related update PR, and it won't update anyway since it's a fork from us.
---
 .github/dependabot.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0d514c8e..809c1178 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,6 +18,8 @@ updates:
     schedule:
       interval: weekly
     open-pull-requests-limit: 99
+    ignore:
+      - dependency-name: 'carrierwave_backgrounder'
     allow:
       - dependency-type: direct
 
@@ -27,4 +29,4 @@ updates:
       interval: weekly
     open-pull-requests-limit: 99
     allow:
-      - dependency-type: direct
\ No newline at end of file
+      - dependency-type: direct

From 57b7c9666040f8271cec5adf91adc865716c9330 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 17:05:21 +0000
Subject: [PATCH 023/590] Bump net-smtp from 0.3.3 to 0.4.0

Bumps [net-smtp](https://github.com/ruby/net-smtp) from 0.3.3 to 0.4.0.
- [Release notes](https://github.com/ruby/net-smtp/releases)
- [Changelog](https://github.com/ruby/net-smtp/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/net-smtp/compare/v0.3.3...v0.4.0)

---
updated-dependencies:
- dependency-name: net-smtp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ea97f4c..7f75fd48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -269,7 +269,7 @@ GEM
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.15.4)

From bf315baa6aefdda2b198a5a7e054135a84ed0f06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 17:06:03 +0000
Subject: [PATCH 024/590] Bump openssl from 3.1.0 to 3.2.0

Bumps [openssl](https://github.com/ruby/openssl) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/ruby/openssl/releases)
- [Changelog](https://github.com/ruby/openssl/blob/master/History.md)
- [Commits](https://github.com/ruby/openssl/compare/v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: openssl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 08789eae..dac7c564 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ gem "pundit", "~> 2.3"
 gem "rubyzip", "~> 2.3"
 
 # to solve https://github.com/jwt/ruby-jwt/issues/526
-gem "openssl", "~> 3.1"
+gem "openssl", "~> 3.2"
 
 # mail 2.8.0 breaks sendmail usage: https://github.com/mikel/mail/issues/1538
 gem "mail", "~> 2.7.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 8ea97f4c..09926e74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -276,7 +276,7 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.1)
-    openssl (3.1.0)
+    openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.23.0)
     parser (3.2.2.3)
@@ -534,7 +534,7 @@ DEPENDENCIES
   net-pop
   net-smtp
   oj
-  openssl (~> 3.1)
+  openssl (~> 3.2)
   pg
   pghero
   prometheus-client (~> 4.2)

From b78e9cf4c061ca966f775185251e3c23ec1be854 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 17:06:45 +0000
Subject: [PATCH 025/590] Bump cssbundling-rails from 1.3.2 to 1.3.3

Bumps [cssbundling-rails](https://github.com/rails/cssbundling-rails) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/rails/cssbundling-rails/releases)
- [Commits](https://github.com/rails/cssbundling-rails/compare/v1.3.2...v1.3.3)

---
updated-dependencies:
- dependency-name: cssbundling-rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ea97f4c..36e6f89b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -107,7 +107,7 @@ GEM
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     crass (1.0.6)
-    cssbundling-rails (1.3.2)
+    cssbundling-rails (1.3.3)
       railties (>= 6.0.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)

From 79fb904db02e1c78baa618e76e4daf09b4b5c62a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 17:06:59 +0000
Subject: [PATCH 026/590] Bump puma from 6.3.1 to 6.4.0

Bumps [puma](https://github.com/puma/puma) from 6.3.1 to 6.4.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.1...v6.4.0)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ea97f4c..fd0d7ca5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -287,7 +287,7 @@ GEM
       activerecord (>= 6)
     prometheus-client (4.2.1)
     public_suffix (5.0.3)
-    puma (6.3.1)
+    puma (6.4.0)
       nio4r (~> 2.0)
     pundit (2.3.1)
       activesupport (>= 3.0.0)

From 66219ee433e5ca5314a877bd0f473fa32659e764 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 17:16:11 +0000
Subject: [PATCH 027/590] Bump sass from 1.67.0 to 1.68.0

Bumps [sass](https://github.com/sass/dart-sass) from 1.67.0 to 1.68.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.67.0...1.68.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 47e52286..17eefbca 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.67.0",
+    "sass": "^1.68.0",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.2.2"
diff --git a/yarn.lock b/yarn.lock
index 4a677035..ba1d0abb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2268,10 +2268,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.67.0:
-  version "1.67.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.67.0.tgz#fed84d74b9cd708db603b1380d6dc1f71bb24f6f"
-  integrity sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==
+sass@^1.68.0:
+  version "1.68.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.68.0.tgz#0034b0cc9a50248b7d1702ac166fd25990023669"
+  integrity sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From f99e4dc1d8ce2933c85ca17357188c43c60ccddf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 09:37:54 +0000
Subject: [PATCH 028/590] Bump actions/checkout from 4.0.0 to 4.1.0

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml     | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/lint.yml            | 8 ++++----
 .github/workflows/retrospring.yml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index f3048f8d..88760a4d 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -20,7 +20,7 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
 
       - name: Discover build-time variables
         run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index da1c33c7..a28d196c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 27e57015..237b9882 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v39
@@ -37,7 +37,7 @@ jobs:
     name: ESLint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v39
@@ -63,7 +63,7 @@ jobs:
   haml-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v39
@@ -86,7 +86,7 @@ jobs:
   stylelint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v39
diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index fefbfc04..e46aeeaa 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -41,7 +41,7 @@ jobs:
       BUNDLE_WITHOUT: 'production'
 
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
       - name: Install dependencies
         run: sudo apt update && sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev libmagickwand-dev imagemagick libidn11-dev
       - name: Set up Ruby

From 9bf56e463bd2dabfe26c9e9b368ebdce8452d3d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:21:24 +0000
Subject: [PATCH 029/590] Bump rubocop-rails from 2.21.1 to 2.21.2

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.21.1 to 2.21.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.21.1...v2.21.2)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9485d52c..7028c97e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -404,7 +404,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.21.1)
+    rubocop-rails (2.21.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -477,7 +477,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -487,7 +487,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby

From 12ca8e5efea4dc12de2c009f9075185734c1f085 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:22:21 +0000
Subject: [PATCH 030/590] Bump rubocop from 1.56.3 to 1.56.4

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.56.3 to 1.56.4.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.56.3...v1.56.4)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9485d52c..9e4f1a37 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -390,7 +390,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.56.3)
+    rubocop (1.56.4)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -477,7 +477,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     warden (1.2.9)
       rack (>= 2.0.9)

From b6df1483eb238ad38d25d1d2a624ce2968ca649b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:22:55 +0000
Subject: [PATCH 031/590] Bump haml from 6.1.2 to 6.1.4

Bumps [haml](https://github.com/haml/haml) from 6.1.2 to 6.1.4.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v6.1.2...v6.1.4)

---
updated-dependencies:
- dependency-name: haml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9485d52c..9b924eef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
     glob (0.3.1)
     globalid (1.1.0)
       activesupport (>= 5.0)
-    haml (6.1.2)
+    haml (6.1.4)
       temple (>= 0.8.2)
       thor
       tilt
@@ -460,7 +460,7 @@ GEM
     sysexits (1.2.0)
     temple (0.10.2)
     thor (1.2.2)
-    tilt (2.2.0)
+    tilt (2.3.0)
     timeout (0.4.0)
     tldv (0.1.0)
       tldv-data (~> 1.0)

From 8d8aa2f6ed719a6484a7c3cd36229cafe1c5eb64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:24:44 +0000
Subject: [PATCH 032/590] Bump fog-aws from 3.19.0 to 3.21.0

Bumps [fog-aws](https://github.com/fog/fog-aws) from 3.19.0 to 3.21.0.
- [Changelog](https://github.com/fog/fog-aws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fog/fog-aws/compare/v3.19.0...v3.21.0)

---
updated-dependencies:
- dependency-name: fog-aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9485d52c..426d7509 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,7 +150,7 @@ GEM
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
     erubi (1.12.0)
-    excon (0.99.0)
+    excon (0.104.0)
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
@@ -162,7 +162,7 @@ GEM
     faker (3.1.1)
       i18n (>= 1.8.11, < 2)
     ffi (1.15.5)
-    fog-aws (3.19.0)
+    fog-aws (3.21.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -244,9 +244,9 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (1.0.2)
     method_source (1.0.0)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
+    mime-types-data (3.2023.0808)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake

From 215693316cc6ef853e7fddf24355a3c23daf274f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:53:06 +0000
Subject: [PATCH 033/590] Bump @rails/request.js from 0.0.8 to 0.0.9

Bumps [@rails/request.js](https://github.com/rails/request.js) from 0.0.8 to 0.0.9.
- [Release notes](https://github.com/rails/request.js/releases)
- [Commits](https://github.com/rails/request.js/compare/v0.0.8...v0.0.9)

---
updated-dependencies:
- dependency-name: "@rails/request.js"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 17eefbca..0593c57b 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "@hotwired/turbo-rails": "^7.3.0",
     "@melloware/coloris": "^0.21.1",
     "@popperjs/core": "^2.11",
-    "@rails/request.js": "^0.0.8",
+    "@rails/request.js": "^0.0.9",
     "bootstrap": "^5.2",
     "buffer": "^6.0.3",
     "cheet.js": "^0.3.3",
diff --git a/yarn.lock b/yarn.lock
index ba1d0abb..ea40ac95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -272,10 +272,10 @@
   resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.3.tgz#71f08e958883af64f6a20489318b5e95d2c6dc5b"
   integrity sha512-Iefl21FZD+ck1di6xSHMYzSzRiNJTHV4NrAzCfDfqc/wPz4xncrP8f2/fJ+2jzwKIaDn76UVMsALh7R5OzsF8Q==
 
-"@rails/request.js@^0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@rails/request.js/-/request.js-0.0.8.tgz#5e2e8da15013b1af7f04d759e4e9d1cff981865c"
-  integrity sha512-ysHYZDl+XjBwFVXz7EI7XW+ZWiTFY8t7TrC/ahpAPt0p7NE4DZxm1nJQY9gmF4PBf+4pAYa+D/rLIGmrn1ZMvg==
+"@rails/request.js@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/@rails/request.js/-/request.js-0.0.9.tgz#89e2a575405dc07eb8a9b3d2fe04289e1f057cd0"
+  integrity sha512-VleYUyrA3rwKMvYnz7MI9Ada85Vekjb/WVz7NuGgDO24Y3Zy9FFSpDMQW+ea/tlftD+CdX/W/sUosRA9/HkDOQ==
 
 "@types/json-schema@^7.0.7":
   version "7.0.9"

From a3b8ce64d7dcad7c8f012ddb5548652a9e898e79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 11:49:50 +0000
Subject: [PATCH 034/590] Bump postcss from 8.4.28 to 8.4.31

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.28 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.28...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ba1d0abb..7a19d016 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2116,9 +2116,9 @@ postcss-value-parser@^4.2.0:
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
 postcss@^8.4.27:
-  version "8.4.28"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.28.tgz#c6cc681ed00109072816e1557f889ef51cf950a5"
-  integrity sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"

From 6c7a7fba5e84aa6b44afe2c65b691762ec77a60e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 09:06:27 +0000
Subject: [PATCH 035/590] Bump sass from 1.68.0 to 1.69.0

Bumps [sass](https://github.com/sass/dart-sass) from 1.68.0 to 1.69.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.68.0...1.69.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0593c57b..7bc670e2 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.68.0",
+    "sass": "^1.69.0",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.2.2"
diff --git a/yarn.lock b/yarn.lock
index 001859f2..21b7897a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2268,10 +2268,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.68.0:
-  version "1.68.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.68.0.tgz#0034b0cc9a50248b7d1702ac166fd25990023669"
-  integrity sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==
+sass@^1.69.0:
+  version "1.69.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.0.tgz#5195075371c239ed556280cf2f5944d234f42679"
+  integrity sha512-l3bbFpfTOGgQZCLU/gvm1lbsQ5mC/WnLz3djL2v4WCJBDrWm58PO+jgngcGRNnKUh6wSsdm50YaovTqskZ0xDQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 0c946fd1ba60850718fa8258f874667290785e2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 09:10:07 +0000
Subject: [PATCH 036/590] Bump net-imap from 0.3.7 to 0.4.0

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.3.7 to 0.4.0.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.3.7...v0.4.0)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0aec7b99..febea898 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -262,7 +262,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.4)
       http-2 (~> 0.11)
-    net-imap (0.3.7)
+    net-imap (0.4.0)
       date
       net-protocol
     net-pop (0.1.2)

From 568409bfc59d7e67fe2f1e8547a23839f1eb02d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 09:13:31 +0000
Subject: [PATCH 037/590] Bump haml_lint from 0.50.0 to 0.51.0

Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.50.0 to 0.51.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.50.0...v0.51.0)

---
updated-dependencies:
- dependency-name: haml_lint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0aec7b99..0457cf88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -187,8 +187,8 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    haml_lint (0.50.0)
-      haml (>= 4.0, < 6.2)
+    haml_lint (0.51.0)
+      haml (>= 4.0)
       parallel (~> 1.10)
       rainbow
       rubocop (>= 1.0)
@@ -279,7 +279,7 @@ GEM
     openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
@@ -458,7 +458,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sysexits (1.2.0)
-    temple (0.10.2)
+    temple (0.10.3)
     thor (1.2.2)
     tilt (2.3.0)
     timeout (0.4.0)

From 5d958259c0e1f6458197c5a18f0f8ee71cf28ef9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 09:13:56 +0000
Subject: [PATCH 038/590] Bump bullet from 7.0.7 to 7.1.1

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.0.7 to 7.1.1.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.7...7.1.1)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0aec7b99..738aead0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,7 +92,7 @@ GEM
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     builder (3.2.4)
-    bullet (7.0.7)
+    bullet (7.1.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     carrierwave (2.1.0)

From 9e35c036b19514451b69cbfe2a2062f33b328cd0 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 14 Oct 2023 20:57:09 +0200
Subject: [PATCH 039/590] Rewrite WebPush enable handler to properly catch
 errors

---
 .../retrospring/features/webpush/enable.ts    | 81 ++++++++++---------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/app/javascript/retrospring/features/webpush/enable.ts b/app/javascript/retrospring/features/webpush/enable.ts
index c92aed64..3a77485a 100644
--- a/app/javascript/retrospring/features/webpush/enable.ts
+++ b/app/javascript/retrospring/features/webpush/enable.ts
@@ -3,52 +3,53 @@ import I18n from "retrospring/i18n";
 import { showNotification } from "utilities/notifications";
 import { Buffer } from "buffer";
 
-export function enableHandler (event: Event): void {
+export async function enableHandler (event: Event): Promise<void> {
   event.preventDefault();
   const sender = event.target as HTMLButtonElement;
 
   try {
-    getServiceWorker()
-      .then(subscribe)
-      .then(async subscription => {
-        return Notification.requestPermission().then(permission => {
-          if (permission != "granted") {
-            return;
-          }
+    const registration = await getServiceWorker();
+    const subscription = await subscribe(registration);
+    const permission = await Notification.requestPermission();
 
-          post('/ajax/webpush', {
-            body: {
-              subscription
-            },
-            contentType: 'application/json'
-          }).then(async response => {
-            const data = await response.json;
-
-            if (data.success) {
-              new Notification(I18n.translate("frontend.push_notifications.subscribe.success.title"), {
-                body: I18n.translate("frontend.push_notifications.subscribe.success.body")
-              });
-
-              document.querySelectorAll<HTMLButtonElement>('button[data-action="push-disable"], button[data-action="push-remove-all"]')
-                .forEach(button => button.classList.remove('d-none'));
-
-              sender.classList.add('d-none');
-              document.querySelector<HTMLDivElement>('.push-settings')?.classList.add('d-none');
-              localStorage.setItem('dismiss-push-settings-prompt', 'true');
-
-              document.getElementById('subscription-count').textContent = data.message;
-            } else {
-              new Notification(I18n.translate("frontend.push_notifications.fail.title"), {
-                body: I18n.translate("frontend.push_notifications.fail.body")
-              });
-            }
-          });
-        });
-      });
-    } catch (error) {
-      console.error("Failed to set up push notifications", error);
-      showNotification(I18n.translate("frontend.push_notifications.setup_fail"));
+    if (permission != "granted") {
+      return;
     }
+
+    const response = await post('/ajax/webpush', {
+      body: {
+        subscription
+      },
+      contentType: 'application/json'
+    });
+
+    const data = await response.json;
+
+    if (data.success) {
+      new Notification(I18n.translate("frontend.push_notifications.subscribe.success.title"), {
+        body: I18n.translate("frontend.push_notifications.subscribe.success.body")
+      });
+
+      document.querySelectorAll<HTMLButtonElement>('button[data-action="push-disable"], button[data-action="push-remove-all"]')
+        .forEach(button => button.classList.remove('d-none'));
+
+      sender.classList.add('d-none');
+      document.querySelector<HTMLDivElement>('.push-settings')?.classList.add('d-none');
+      localStorage.setItem('dismiss-push-settings-prompt', 'true');
+
+      const subscriptionCountElement = document.getElementById('subscription-count');
+      if (subscriptionCountElement != null) {
+        subscriptionCountElement.textContent = data.message;
+      }
+    } else {
+      new Notification(I18n.translate("frontend.push_notifications.fail.title"), {
+        body: I18n.translate("frontend.push_notifications.fail.body")
+      });
+    }
+  } catch (error) {
+    console.error("Failed to set up push notifications", error);
+    showNotification(I18n.translate("frontend.push_notifications.setup_fail"), false);
+  }
 }
 
 async function getServiceWorker(): Promise<ServiceWorkerRegistration> {

From ec05b3c062a33ae1c4d057f77bf8c91fee559e90 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 14 Oct 2023 21:14:02 +0200
Subject: [PATCH 040/590] Update `hcaptcha` gem to forked version with fixed
 Turbo handling

---
 Gemfile      |  2 +-
 Gemfile.lock | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index dac7c564..02cf3416 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem "fog-aws"
 gem "fog-core"
 gem "fog-local"
 gem "haml", "~> 6.1"
-gem "hcaptcha", "~> 7.0"
+gem "hcaptcha", git: "https://github.com/raccube/hcaptcha", ref: "fix/flash-in-turbo-streams"
 gem "mini_magick"
 gem "oj"
 gem "rpush"
diff --git a/Gemfile.lock b/Gemfile.lock
index ae7fcfbf..539ed2e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,14 @@ GIT
       carrierwave (>= 0.5, <= 2.1)
       mime-types (>= 3.0.0)
 
+GIT
+  remote: https://github.com/raccube/hcaptcha
+  revision: f8de70ee2d629ac34395902dbee724c21297960c
+  ref: fix/flash-in-turbo-streams
+  specs:
+    hcaptcha (7.1.0)
+      json
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -193,8 +201,6 @@ GEM
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hcaptcha (7.1.0)
-      json
     hkdf (0.3.0)
     http-2 (0.11.0)
     httparty (0.21.0)
@@ -520,7 +526,7 @@ DEPENDENCIES
   fog-local
   haml (~> 6.1)
   haml_lint
-  hcaptcha (~> 7.0)
+  hcaptcha!
   httparty
   i18n-js (= 4.0)
   jsbundling-rails (~> 1.2)

From d40519dffa1f0db55b055489c0011371b73a3bdf Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 06:39:50 +0200
Subject: [PATCH 041/590] Handle Rails validation errors in TurboStreamable
 concern

---
 app/controllers/concerns/turbo_streamable.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/concerns/turbo_streamable.rb b/app/controllers/concerns/turbo_streamable.rb
index 5066bc05..da9a3a95 100644
--- a/app/controllers/concerns/turbo_streamable.rb
+++ b/app/controllers/concerns/turbo_streamable.rb
@@ -23,6 +23,8 @@ module TurboStreamable
     render_error t("errors.parameter_error", parameter: e.instance_of?(KeyError) ? e.key : e.param.capitalize)
   rescue Dry::Types::CoercionError, Dry::Types::ConstraintError
     render_error t("errors.invalid_parameter")
+  rescue ActiveRecord::RecordInvalid => e
+    render_error e.record.errors.full_messages.flatten.join(" ")
   rescue ActiveRecord::RecordNotFound
     render_error t("errors.record_not_found")
   end

From f3f8e99045c16d091333cb9d91985ab3bead15ad Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 06:40:32 +0200
Subject: [PATCH 042/590] Use `length` validation instead of `presence` for
 `MuteRule`

---
 app/models/mute_rule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/mute_rule.rb b/app/models/mute_rule.rb
index 3e2a66af..4ca5e15d 100644
--- a/app/models/mute_rule.rb
+++ b/app/models/mute_rule.rb
@@ -3,7 +3,7 @@
 class MuteRule < ApplicationRecord
   belongs_to :user
 
-  validates :muted_phrase, presence: true
+  validates :muted_phrase, length: { minimum: 1 }
 
   def applies_to?(post)
     !!(post.content =~ /\b#{Regexp.escape(muted_phrase)}\b/i)

From 9f8450a83ca8631a23ac9e933a6a3f3f1b029c47 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 06:40:47 +0200
Subject: [PATCH 043/590] Add frontend validation for mute rule creation

---
 app/views/settings/mutes/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/settings/mutes/_form.html.haml b/app/views/settings/mutes/_form.html.haml
index 33213d32..8cd73afb 100644
--- a/app/views/settings/mutes/_form.html.haml
+++ b/app/views/settings/mutes/_form.html.haml
@@ -1,6 +1,6 @@
 #form.form-group
   %form{ action: settings_muted_path, method: "post" }
     .input-group
-      %input.form-control#muted_phrase{ name: :muted_phrase, placeholder: t(".placeholder"), data: { controller: :autofocus } }
+      %input.form-control#muted_phrase{ name: :muted_phrase, placeholder: t(".placeholder"), required: true, minlength: 1, data: { controller: :autofocus } }
       .input-group-append
         %button.btn.btn-primary{ type: "submit" }= t("voc.add")

From 454438091bd86431dacab8a7d50383b3525c35d3 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 06:42:59 +0200
Subject: [PATCH 044/590] Use explicit `create!` call in mute rule creation use
 case

---
 lib/use_case/mute_rule/create.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/use_case/mute_rule/create.rb b/lib/use_case/mute_rule/create.rb
index 68a587aa..eee45dd6 100644
--- a/lib/use_case/mute_rule/create.rb
+++ b/lib/use_case/mute_rule/create.rb
@@ -7,7 +7,7 @@ module UseCase
       option :phrase, type: Types::Coercible::String
 
       def call
-        rule = ::MuteRule.create(
+        rule = ::MuteRule.create!(
           user:,
           muted_phrase: phrase
         )

From 6efee0053e528f8fd2ec93d81cbc9b5a62aa83bd Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 06:55:13 +0200
Subject: [PATCH 045/590] Adjust mute rule test case to now expect an error

---
 spec/lib/use_case/mute_rule/create_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/lib/use_case/mute_rule/create_spec.rb b/spec/lib/use_case/mute_rule/create_spec.rb
index 4321048e..24e267d9 100644
--- a/spec/lib/use_case/mute_rule/create_spec.rb
+++ b/spec/lib/use_case/mute_rule/create_spec.rb
@@ -11,8 +11,8 @@ describe UseCase::MuteRule::Create do
     context "phrase is empty" do
       let(:phrase) { "" }
 
-      it "does not create the rule" do
-        expect { subject }.not_to(change { MuteRule.count })
+      it "raises an error" do
+        expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
       end
     end
 

From bff579661fdca286e908399216ccdb4ce1b437ab Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 07:12:55 +0200
Subject: [PATCH 046/590] Add spec for invalid record toasts in
 `TurboStreamable` concern

---
 spec/controllers/concerns/turbo_streamable_spec.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spec/controllers/concerns/turbo_streamable_spec.rb b/spec/controllers/concerns/turbo_streamable_spec.rb
index 3a2c9c60..491c159a 100644
--- a/spec/controllers/concerns/turbo_streamable_spec.rb
+++ b/spec/controllers/concerns/turbo_streamable_spec.rb
@@ -6,7 +6,7 @@ describe TurboStreamable, type: :controller do
   controller do
     include TurboStreamable
 
-    turbo_stream_actions :create, :blocked, :not_found
+    turbo_stream_actions :create, :blocked, :not_found, :invalid_record
 
     def create
       params.require :message
@@ -25,6 +25,10 @@ describe TurboStreamable, type: :controller do
     def not_found
       raise ActiveRecord::RecordNotFound
     end
+
+    def invalid_record
+      ::MuteRule.create!(muted_phrase: "", user: FactoryBot.create(:user))
+    end
   end
 
   before do
@@ -32,6 +36,7 @@ describe TurboStreamable, type: :controller do
       get "create" => "anonymous#create"
       get "blocked" => "anonymous#blocked"
       get "not_found" => "anonymous#not_found"
+      get "invalid_record" => "anonymous#invalid_record"
     end
   end
 
@@ -68,4 +73,5 @@ describe TurboStreamable, type: :controller do
   it_behaves_like "it returns a toast as Turbo Stream response", :create, "Message is required"
   it_behaves_like "it returns a toast as Turbo Stream response", :blocked, "You have been blocked from performing this request"
   it_behaves_like "it returns a toast as Turbo Stream response", :not_found, "Record not found"
+  it_behaves_like "it returns a toast as Turbo Stream response", :invalid_record, "too short"
 end

From 905348395251bd987e03c267fde6dc8eb44859fd Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 07:20:32 +0200
Subject: [PATCH 047/590] Fix rubocop nits

---
 spec/controllers/concerns/turbo_streamable_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/concerns/turbo_streamable_spec.rb b/spec/controllers/concerns/turbo_streamable_spec.rb
index 491c159a..19e0079c 100644
--- a/spec/controllers/concerns/turbo_streamable_spec.rb
+++ b/spec/controllers/concerns/turbo_streamable_spec.rb
@@ -27,7 +27,7 @@ describe TurboStreamable, type: :controller do
     end
 
     def invalid_record
-      ::MuteRule.create!(muted_phrase: "", user: FactoryBot.create(:user))
+      MuteRule.create!(muted_phrase: "", user: FactoryBot.create(:user))
     end
   end
 

From 3afa52c59e6098bfa6a9853046d2bd1ecdf6fd63 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 07:32:31 +0200
Subject: [PATCH 048/590] Fix haml-lint nits

---
 app/views/settings/mutes/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/settings/mutes/_form.html.haml b/app/views/settings/mutes/_form.html.haml
index 8cd73afb..ba13cd14 100644
--- a/app/views/settings/mutes/_form.html.haml
+++ b/app/views/settings/mutes/_form.html.haml
@@ -1,6 +1,6 @@
 #form.form-group
   %form{ action: settings_muted_path, method: "post" }
     .input-group
-      %input.form-control#muted_phrase{ name: :muted_phrase, placeholder: t(".placeholder"), required: true, minlength: 1, data: { controller: :autofocus } }
+      %input.form-control#muted-phrase{ name: :muted_phrase, placeholder: t(".placeholder"), required: true, minlength: 1, data: { controller: :autofocus } }
       .input-group-append
         %button.btn.btn-primary{ type: "submit" }= t("voc.add")

From ac0548932917cd08229b6ca759673f0ff4e93c6a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 08:23:11 +0200
Subject: [PATCH 049/590] Limit comment toggle querySelector call to nearest
 answerbox

---
 .../retrospring/features/answerbox/comment/hotkey.ts       | 7 +++++--
 .../retrospring/features/answerbox/comment/toggle.ts       | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/javascript/retrospring/features/answerbox/comment/hotkey.ts b/app/javascript/retrospring/features/answerbox/comment/hotkey.ts
index 0e15dd7f..e56cb0e9 100644
--- a/app/javascript/retrospring/features/answerbox/comment/hotkey.ts
+++ b/app/javascript/retrospring/features/answerbox/comment/hotkey.ts
@@ -1,7 +1,10 @@
 export function commentHotkeyHandler(event: Event): void {
   const button = event.target as HTMLButtonElement;
   const id = button.dataset.aId;
+  const answerbox = button.closest('.answerbox');
 
-  document.querySelector(`#ab-comments-section-${id}`).classList.remove('d-none');
-  document.querySelector<HTMLElement>(`[name="ab-comment-new"][data-a-id="${id}"]`).focus();
+  if (answerbox !== null) {
+    answerbox.querySelector(`#ab-comments-section-${id}`).classList.toggle('d-none');
+    answerbox.querySelector<HTMLElement>(`[name="ab-comment-new"][data-a-id="${id}"]`).focus();
+  }
 }
diff --git a/app/javascript/retrospring/features/answerbox/comment/toggle.ts b/app/javascript/retrospring/features/answerbox/comment/toggle.ts
index 578351f8..c53b9cfc 100644
--- a/app/javascript/retrospring/features/answerbox/comment/toggle.ts
+++ b/app/javascript/retrospring/features/answerbox/comment/toggle.ts
@@ -1,6 +1,9 @@
 export function commentToggleHandler(event: Event): void {
   const button = event.target as HTMLButtonElement;
   const id = button.dataset.aId;
+  const answerbox = button.closest('.answerbox');
 
-  document.querySelector(`#ab-comments-section-${id}`).classList.toggle('d-none');
-}
\ No newline at end of file
+  if (answerbox !== null) {
+    answerbox.querySelector(`#ab-comments-section-${id}`).classList.toggle('d-none');
+  }
+}

From ace3df932a898396f6fb612f0c82a207d4bb8302 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 10:09:49 +0200
Subject: [PATCH 050/590] Disable `Metrics/*Length` and `AbcSize` cops

---
 .rubocop.yml | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index ed74d1c9..41696d20 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -31,39 +31,25 @@ Lint/NestedMethodDefinition:
 ### Metrics
 
 Metrics/AbcSize:
-  Max: 20
-  Exclude:
-    - 'db/**/*'
+  Enabled: false
 
 Layout/LineLength:
   Enabled: false
 
 Metrics/MethodLength:
-  Max: 15
-  Exclude:
-    - 'db/migrate/*.rb'
+  Enabled: false
 
 Metrics/BlockLength:
-  Exclude:
-    - '*.gemspec'
-    - '**/*.rake'
-    - 'api/**/*'
-    - 'app/api/routes.rb'
-    - 'config/initialize/**/*'
-    - 'config/initializers/**/*'
-    - 'spec/**/*'
+  Enabled: false
 
 Metrics/ClassLength:
-  Exclude:
-    - spec/**/*
+  Enabled: false
 
 Metrics/CyclomaticComplexity:
   Severity: refactor
 
 Metrics/ModuleLength:
-  Exclude:
-    - 'app/api/routes.rb'
-    - 'spec/requests/**/*'
+  Enabled: false
 
 
 ### Style / Layout

From f6e26f1751af92a69382377f4f74690cde4076f4 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 10:21:46 +0200
Subject: [PATCH 051/590] Remove superfluous rubocop:disable comments

---
 Rakefile                                    | 2 +-
 app/controllers/ajax/web_push_controller.rb | 2 +-
 app/controllers/inbox_controller.rb         | 2 +-
 app/models/user.rb                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index 17ba7dcf..dfd42972 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,7 +7,7 @@ require File.expand_path("config/application", __dir__)
 
 Rails.application.load_tasks
 
-namespace :justask do # rubocop:disable Metrics/BlockLength
+namespace :justask do
   desc "Gives admin status to a user."
   task :admin, [:screen_name] => :environment do |_t, args|
     abort "screen name required" if args[:screen_name].nil?
diff --git a/app/controllers/ajax/web_push_controller.rb b/app/controllers/ajax/web_push_controller.rb
index 4dd9ecdd..04d7fb40 100644
--- a/app/controllers/ajax/web_push_controller.rb
+++ b/app/controllers/ajax/web_push_controller.rb
@@ -41,7 +41,7 @@ class Ajax::WebPushController < AjaxController
     @response[:message] = t(".subscription_count", count: current_user.web_push_subscriptions.count)
   end
 
-  def unsubscribe # rubocop:disable Metrics/AbcSize
+  def unsubscribe
     removed = if params.key?(:endpoint)
                 current_user.web_push_subscriptions.where("subscription ->> 'endpoint' = ?", params[:endpoint]).destroy_all
               else
diff --git a/app/controllers/inbox_controller.rb b/app/controllers/inbox_controller.rb
index 7f3db342..56b01f5a 100644
--- a/app/controllers/inbox_controller.rb
+++ b/app/controllers/inbox_controller.rb
@@ -3,7 +3,7 @@
 class InboxController < ApplicationController
   before_action :authenticate_user!
 
-  def show # rubocop:disable Metrics/MethodLength
+  def show
     find_author
     find_inbox_entries
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 2b2241e0..762f7020 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
+class User < ApplicationRecord
   include User::Relationship
   include User::Relationship::Follow
   include User::Relationship::Block

From 9658f1083886d2d680c531ca328fda2767cc8e99 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 10:34:19 +0200
Subject: [PATCH 052/590] Don't check `Style/RedundantSelf` in the models
 directory

---
 .rubocop.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 41696d20..12052185 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -123,3 +123,7 @@ Style/TrailingCommaInHashLiteral:
 
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: consistent_comma
+
+Style/RedundantSelf:
+  Exclude:
+    - app/models/**/*

From ffcaa5c4d9f73729f9c5ccd1d71edc6c6a907657 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 10:35:52 +0200
Subject: [PATCH 053/590] Remove superfluous rubocop:disable comments

---
 app/models/user.rb                     | 4 ----
 app/models/user/reaction_methods.rb    | 2 --
 app/models/user/relationship/follow.rb | 2 --
 3 files changed, 8 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 762f7020..1f157482 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -117,10 +117,8 @@ class User < ApplicationRecord
   # @param question [Question] the question to answer
   # @param content [String] the answer content
   def answer(question, content)
-    # rubocop:disable Style/RedundantSelf
     raise Errors::AnsweringOtherBlockedSelf if question.user&.blocking?(self)
     raise Errors::AnsweringSelfBlockedOther if self.blocking?(question.user)
-    # rubocop:enable Style/RedundantSelf
 
     Retrospring::Metrics::QUESTIONS_ANSWERED.increment
 
@@ -132,10 +130,8 @@ class User < ApplicationRecord
   def answered?(question) = question.answers.pluck(:user_id).include? id
 
   def comment(answer, content)
-    # rubocop:disable Style/RedundantSelf
     raise Errors::CommentingSelfBlockedOther if self.blocking?(answer.user)
     raise Errors::CommentingOtherBlockedSelf if answer.user.blocking?(self)
-    # rubocop:enable Style/RedundantSelf
 
     Retrospring::Metrics::COMMENTS_CREATED.increment
 
diff --git a/app/models/user/reaction_methods.rb b/app/models/user/reaction_methods.rb
index 18ecac25..fa3e6545 100644
--- a/app/models/user/reaction_methods.rb
+++ b/app/models/user/reaction_methods.rb
@@ -4,10 +4,8 @@ module User::ReactionMethods
   # smiles an answer or comment
   # @param item [ApplicationRecord] the answer/comment to smile
   def smile(item)
-    # rubocop:disable Style/RedundantSelf
     raise Errors::ReactingSelfBlockedOther if self.blocking?(item.user)
     raise Errors::ReactingOtherBlockedSelf if item.user.blocking?(self)
-    # rubocop:enable Style/RedundantSelf
 
     ::Appendable::Reaction.create!(user: self, parent: item, content: "🙂")
   end
diff --git a/app/models/user/relationship/follow.rb b/app/models/user/relationship/follow.rb
index 4e034821..50dc321e 100644
--- a/app/models/user/relationship/follow.rb
+++ b/app/models/user/relationship/follow.rb
@@ -19,10 +19,8 @@ class User
       # Follow an user
       def follow(target_user)
         raise Errors::FollowingSelf if target_user == self
-        # rubocop:disable Style/RedundantSelf
         raise Errors::FollowingOtherBlockedSelf if target_user.blocking?(self)
         raise Errors::FollowingSelfBlockedOther if self.blocking?(target_user)
-        # rubocop:enable Style/RedundantSelf
 
         create_relationship(active_follow_relationships, target_user)
       end

From 439797ee1e2ba0727a046f9aeb240dcfe2616554 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
Date: Sun, 15 Oct 2023 12:50:55 +0200
Subject: [PATCH 054/590] Fix `build-image` workflow (#1375)

Co-authored-by: Georg Gadinger <nilsding@nilsding.org>
---
 Containerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Containerfile b/Containerfile
index 700b458e..249f7323 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,6 +1,6 @@
 # Container image for a production Retrospring setup
 
-FROM registry.opensuse.org/opensuse/leap:15.4
+FROM registry.opensuse.org/opensuse/leap:15.5
 
 LABEL org.opencontainers.image.title="Retrospring (production)"
 LABEL org.opencontainers.image.description="Image containing everything to run Retrospring in production mode.  Do not use this for development."
@@ -15,7 +15,8 @@ ARG BUNDLER_VERSION=2.3.18
 ENV RAILS_ENV=production
 
 # update and install dependencies
-RUN zypper up -y \
+RUN zypper addrepo https://download.opensuse.org/repositories/devel:languages:nodejs/15.5/devel:languages:nodejs.repo \
+ && zypper --gpg-auto-import-keys up -y \
  && zypper in -y \
       # build dependencies (ruby-install)
       automake         \
@@ -31,12 +32,13 @@ RUN zypper up -y \
       tar              \
       xz               \
       zlib-devel       \
+      curl             \
       # build dependencies (app)
       gcc-c++          \
       git              \
       libidn-devel     \
-      nodejs14         \
-      npm14            \
+      nodejs16         \
+      npm16            \
       postgresql-devel \
       # runtime dependencies
       ImageMagick      \

From e3e45acf9f7f6202ef41e9c1039ab067df811da7 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 15 Oct 2023 13:13:52 +0200
Subject: [PATCH 055/590] Use Node 16 across the project

---
 .docker/ruby/Dockerfile           | 2 +-
 .github/workflows/lint.yml        | 8 ++++----
 .github/workflows/retrospring.yml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.docker/ruby/Dockerfile b/.docker/ruby/Dockerfile
index 205ec80a..6e6e33d2 100644
--- a/.docker/ruby/Dockerfile
+++ b/.docker/ruby/Dockerfile
@@ -8,7 +8,7 @@ ARG GID=1000
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
 
 RUN apt-get update -qq \
     && apt-get install -y --no-install-recommends build-essential \
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 237b9882..297ca717 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -43,10 +43,10 @@ jobs:
         uses: tj-actions/changed-files@v39
         with:
           files: "**/*.ts"
-      - name: Set up Node 14
+      - name: Set up Node 16
         uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '16'
           cache: 'yarn'
         if: steps.changed-files.outputs.any_changed == 'true'
       - name: Install node modules
@@ -92,10 +92,10 @@ jobs:
         uses: tj-actions/changed-files@v39
         with:
           files: "**/*.scss"
-      - name: Set up Node 14
+      - name: Set up Node 16
         uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '16'
           cache: 'yarn'
         if: steps.changed-files.outputs.any_changed == 'true'
       - name: Install node modules
diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index e46aeeaa..4ab0ab64 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -48,10 +48,10 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-      - name: Set up Node 14
+      - name: Set up Node 16
         uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '16'
           cache: 'yarn'
       - name: Copy default configuration
         run: |

From 849d4f74f263e6327c838f680598de189a7bcf9d Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 11 Mar 2023 19:48:04 +0100
Subject: [PATCH 056/590] Move comments to a turbo frame

---
 app/controllers/ajax/comment_controller.rb |  4 +++-
 app/controllers/comment_controller.rb      | 10 ++++++++++
 app/views/answerbox/_comments.html.haml    | 21 ++------------------
 app/views/application/_answerbox.html.haml | 23 ++++++++++++++++++++--
 app/views/comment/index.html.haml          |  3 +++
 config/locales/views.en.yml                |  8 ++++----
 config/locales/voc.en.yml                  |  1 +
 config/routes.rb                           |  1 +
 8 files changed, 45 insertions(+), 26 deletions(-)
 create mode 100644 app/controllers/comment_controller.rb
 create mode 100644 app/views/comment/index.html.haml

diff --git a/app/controllers/ajax/comment_controller.rb b/app/controllers/ajax/comment_controller.rb
index 72dd305e..c2ef3341 100644
--- a/app/controllers/ajax/comment_controller.rb
+++ b/app/controllers/ajax/comment_controller.rb
@@ -14,10 +14,12 @@ class Ajax::CommentController < AjaxController
       return
     end
 
+    comments = Comment.where(answer:).includes([{user: :profile}, :smiles])
+
     @response[:status] = :okay
     @response[:message] = t(".success")
     @response[:success] = true
-    @response[:render] = render_to_string(partial: 'answerbox/comments', locals: { a: answer })
+    @response[:render] = render_to_string(partial: 'answerbox/comments', locals: { a: answer, comments: })
     @response[:count] = answer.comment_count
   end
 
diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
new file mode 100644
index 00000000..62def069
--- /dev/null
+++ b/app/controllers/comment_controller.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CommentController < ApplicationController
+  def index
+    answer = Answer.find(params[:id])
+    comments = Comment.where(answer:).includes([{user: :profile}, :smiles])
+
+    render "index", locals: { a: answer, comments: }
+  end
+end
diff --git a/app/views/answerbox/_comments.html.haml b/app/views/answerbox/_comments.html.haml
index 023990e9..62a1035c 100644
--- a/app/views/answerbox/_comments.html.haml
+++ b/app/views/answerbox/_comments.html.haml
@@ -1,8 +1,8 @@
-- if a.comments.all.count.zero?
+- if comments.all.count.zero?
   = t(".none")
 - else
   %ul.comment__container
-    - a.comments.order(:created_at).each do |comment|
+    - comments.order(:created_at).each do |comment|
       %li.comment{ data: { comment_id: comment.id } }
         %div{ style: "height: 0; width: 0" }= render "modal/comment_smiles", comment: comment
         .d-flex
@@ -24,20 +24,3 @@
               %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
                 %span.caret
               = render "actions/comment", comment: comment, answer: a
-- if user_signed_in?
-  %button.d-none{ name: "ab-open-and-comment", data: { a_id: a.id, selection_hotkey: "c" } }
-  .comment__compose-wrapper{
-    name: "ab-comment-new-group",
-    data: { a_id: a.id, controller: "character-count", character_count_max_value: 512 }
-  }
-    .form-group.has-feedback.comment__input-group.input-group
-      %textarea.form-control.comment__input{ type: :text, placeholder: t(".placeholder"), name: "ab-comment-new", data: { a_id: a.id, "character-count-target": "input" } }
-    .comment__submit-wrapper
-      %button.btn.btn-primary{
-        type: :button,
-        name: "ab-comment-new-submit",
-        title: t(".action"),
-        data: { a_id: a.id, "character-count-target": "action" }
-      }
-        %i.fa.fa-paper-plane-o
-      %span.text-muted.form-control-feedback.comment__character-count{ id: "ab-comment-charcount-#{a.id}", data: { "character-count-target": "counter" } } 512
diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml
index b84a5f17..c6236f3c 100644
--- a/app/views/application/_answerbox.html.haml
+++ b/app/views/application/_answerbox.html.haml
@@ -35,5 +35,24 @@
         .col-md-6.d-md-flex.answerbox__actions
           = render "answerbox/actions", a:, display_all:, subscribed_answer_ids:
   .card-footer{ id: "ab-comments-section-#{a.id}", class: display_all.nil? ? "d-none" : nil }
-    %div{ id: "ab-smiles-#{a.id}" }= render "answerbox/smiles", a: a
-    %div{ id: "ab-comments-#{a.id}" }= render "answerbox/comments", a: a
+    = turbo_frame_tag("ab-comments-list-#{a.id}", src: comments_path(a.question, a), loading: :lazy) do
+      .d-flex.justify-content-center
+        .spinner-border{ role: :status }
+          .visually-hidden= t("voc.loading")
+    - if user_signed_in?
+      %button.d-none{ name: "ab-open-and-comment", data: { a_id: a.id, selection_hotkey: "c" } }
+      .comment__compose-wrapper{
+        name: "ab-comment-new-group",
+        data: { a_id: a.id, controller: "character-count", character_count_max_value: 512 }
+      }
+        .form-group.has-feedback.comment__input-group.input-group
+          %textarea.form-control.comment__input{ type: :text, placeholder: t(".comments.placeholder"), name: "ab-comment-new", data: { a_id: a.id, "character-count-target": "input" } }
+        .comment__submit-wrapper
+          %button.btn.btn-primary{
+            type: :button,
+            name: "ab-comment-new-submit",
+            title: t(".comments.action"),
+            data: { a_id: a.id, "character-count-target": "action" }
+          }
+            %i.fa.fa-paper-plane-o
+          %span.text-muted.form-control-feedback.comment__character-count{ id: "ab-comment-charcount-#{a.id}", data: { "character-count-target": "counter" } } 512
diff --git a/app/views/comment/index.html.haml b/app/views/comment/index.html.haml
new file mode 100644
index 00000000..d13a5cf0
--- /dev/null
+++ b/app/views/comment/index.html.haml
@@ -0,0 +1,3 @@
+= turbo_frame_tag "ab-comments-list-#{a.id}" do
+  %div{ id: "ab-smiles-#{a.id}" }= render "answerbox/smiles", a:
+  %div{ id: "ab-comments-#{a.id}" }= render "answerbox/comments", a:, comments:
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 20994bce..473f38bb 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -117,18 +117,18 @@ en:
     actions:
       share:
         title: "Share"
-    comments:
-      none: "There are no comments yet."
-      placeholder: "Comment..."
-      action: "Post comment"
     smiles:
       none: "No one smiled this yet."
+    comments:
+      none: "There are no comments yet."
   application:
     answerbox:
       read: "Read the entire answer"
       answered: "%{hide} %{user}" # resolves into "Answered by %{user}"
       hide: "Answered by"
       pinned: "Pinned"
+      comments:
+        placeholder: "Comment…"
     questionbox:
       title: "Ask something!"
       placeholder: "Type your question here…"
diff --git a/config/locales/voc.en.yml b/config/locales/voc.en.yml
index a05407eb..01f1ff9c 100644
--- a/config/locales/voc.en.yml
+++ b/config/locales/voc.en.yml
@@ -12,6 +12,7 @@ en:
     follow: "Follow"
     format_markdown: "Styling with Markdown is supported"
     load: "Load more"
+    loading: "Loading…"
     login: "Sign in"
     logout: "Sign out"
     mute: "Mute"
diff --git a/config/routes.rb b/config/routes.rb
index 3af4b3a8..85fc5a6e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -153,6 +153,7 @@ Rails.application.routes.draw do
   get "/@:username/a/:id", to: "answer#show", as: :answer
   post "/@:username/a/:id/pin", to: "answer#pin", as: :pin_answer
   delete "/@:username/a/:id/pin", to: "answer#unpin", as: :unpin_answer
+  get "/@:username/a/:id/comments", to: "comment#index", as: :comments
   get "/@:username/q/:id", to: "question#show", as: :question
   get "/@:username/followers", to: "user#followers", as: :show_user_followers
   get "/@:username/followings", to: "user#followings", as: :show_user_followings

From adf294e6cbd0dadce724a9a3efc2e581aa4eafdb Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 5 May 2023 15:58:19 +0200
Subject: [PATCH 057/590] Add tests for viewing comments

---
 app/controllers/comment_controller.rb         |   4 +-
 app/views/comment/index.html.haml             |   2 +-
 spec/controllers/comment_controller_spec.rb   |  37 +++++++
 .../answerbox/_comments.html.haml_spec.rb     | 101 ++++++++++++++++++
 4 files changed, 141 insertions(+), 3 deletions(-)
 create mode 100644 spec/controllers/comment_controller_spec.rb
 create mode 100644 spec/views/answerbox/_comments.html.haml_spec.rb

diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
index 62def069..0b61f2eb 100644
--- a/app/controllers/comment_controller.rb
+++ b/app/controllers/comment_controller.rb
@@ -3,8 +3,8 @@
 class CommentController < ApplicationController
   def index
     answer = Answer.find(params[:id])
-    comments = Comment.where(answer:).includes([{user: :profile}, :smiles])
+    @comments = Comment.where(answer:).includes([{user: :profile}, :smiles])
 
-    render "index", locals: { a: answer, comments: }
+    render "index", locals: { a: answer }
   end
 end
diff --git a/app/views/comment/index.html.haml b/app/views/comment/index.html.haml
index d13a5cf0..52cad691 100644
--- a/app/views/comment/index.html.haml
+++ b/app/views/comment/index.html.haml
@@ -1,3 +1,3 @@
 = turbo_frame_tag "ab-comments-list-#{a.id}" do
   %div{ id: "ab-smiles-#{a.id}" }= render "answerbox/smiles", a:
-  %div{ id: "ab-comments-#{a.id}" }= render "answerbox/comments", a:, comments:
+  %div{ id: "ab-comments-#{a.id}" }= render "answerbox/comments", a:, comments: @comments
diff --git a/spec/controllers/comment_controller_spec.rb b/spec/controllers/comment_controller_spec.rb
new file mode 100644
index 00000000..ace2aad8
--- /dev/null
+++ b/spec/controllers/comment_controller_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe CommentController, type: :controller do
+  describe "#index" do
+    shared_examples_for "succeeds" do
+      it "returns the correct response" do
+        subject
+        expect(response).to have_rendered("comment/index")
+        expect(response).to have_http_status(200)
+        expect(assigns(:comments)).to eq(comments)
+        expect(assigns(:comments)).to_not include(unrelated_comment)
+      end
+    end
+
+    subject { get :index, params: { username: answer_author.screen_name, id: answer.id } }
+
+    let(:answer_author) { FactoryBot.create(:user) }
+    let(:answer) { FactoryBot.create(:answer, user: answer_author) }
+    let(:commenter) { FactoryBot.create(:user) }
+    let!(:comments) { FactoryBot.create_list(:comment, num_comments, answer:, user: commenter) }
+    let!(:unrelated_comment) do
+      FactoryBot.create(:comment,
+                        answer: FactoryBot.create(:answer, user: FactoryBot.create(:user)),
+                        user:   commenter,)
+    end
+
+    [0, 1, 5, 30].each do |num_comments|
+      context "#{num_comments} comments" do
+        let(:num_comments) { num_comments }
+
+        include_examples "succeeds"
+      end
+    end
+  end
+end
diff --git a/spec/views/answerbox/_comments.html.haml_spec.rb b/spec/views/answerbox/_comments.html.haml_spec.rb
new file mode 100644
index 00000000..90090069
--- /dev/null
+++ b/spec/views/answerbox/_comments.html.haml_spec.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe "answerbox/_comments.html.haml", type: :view do
+  subject(:rendered) do
+    render partial: "answerbox/comments", locals: {
+      comments:, a:
+    }
+  end
+
+  let(:a) { FactoryBot.create(:answer, user: FactoryBot.create(:user)) }
+  let(:comments) { Comment.all }
+
+  context "no comments" do
+    it "shows an empty list" do
+      expect(rendered).to eq("There are no comments yet.\n")
+    end
+  end
+
+  context "comments are present" do
+    let!(:expected_comments) { FactoryBot.create_list(:comment, 5, answer: a, user: FactoryBot.create(:user)) }
+
+    it "shows a list of comments" do
+      html = Nokogiri::HTML.parse(rendered)
+      selector = %(li.comment .comment__content)
+      comment_elements = html.css(selector)
+      expect(comment_elements.size).to eq(5)
+      expect(comment_elements.map(&:text).map(&:strip)).to eq(expected_comments.map(&:content))
+    end
+  end
+
+  context "containing your own comment" do
+    let(:user) { FactoryBot.create(:user) }
+    let!(:comment) { FactoryBot.create(:comment, user:, answer: a) }
+
+    before do
+      sign_in user
+    end
+
+    it "shows the delete option" do
+      html = Nokogiri::HTML.parse(rendered)
+      selector = %(li.comment[data-comment-id="#{comment.id}"] .btn-group a[data-action="ab-comment-destroy"])
+      element = html.css(selector)
+      expect(element).to_not be_nil
+      expect(element.text.strip).to eq("Delete")
+    end
+  end
+
+  context "containing someone else's comment" do
+    let(:user) { FactoryBot.create(:user) }
+    let!(:comment) { FactoryBot.create(:comment, user: FactoryBot.create(:user), answer: a) }
+
+    before do
+      sign_in user
+    end
+
+    it "does not show the delete option" do
+      html = Nokogiri::HTML.parse(rendered)
+      selector = %(li.comment[data-comment-id="#{comment.id}"] .btn-group a[data-action="ab-comment-destroy"])
+      expect(html.css(selector)).to be_empty
+    end
+  end
+
+  context "containing a comment with smiles" do
+    let(:comment_author) { FactoryBot.create(:user) }
+    let(:comment) { FactoryBot.create(:comment, answer: a, user: comment_author) }
+    let(:other_comment) { FactoryBot.create(:comment, answer: a, user: comment_author) }
+
+    before do
+      5.times do
+        user = FactoryBot.create(:user)
+        user.smile comment
+      end
+
+      User.last.smile other_comment
+    end
+
+    it "shows the correct number of smiles" do
+      html = Nokogiri::HTML.parse(rendered)
+      selector = %(li.comment[data-comment-id="#{comment.id}"] button[data-action="smile"]>span)
+      expect(html.css(selector).text).to eq("5")
+    end
+  end
+
+  context "containing a comment you've smiled" do
+    let(:user) { FactoryBot.create(:user) }
+    let!(:comment) { FactoryBot.create(:comment, user: FactoryBot.create(:user), answer: a) }
+
+    before do
+      sign_in user
+      user.smile comment
+    end
+
+    it "displays the comment as smiled" do
+      html = Nokogiri::HTML.parse(rendered)
+      selector = %(li.comment[data-comment-id="#{comment.id}"] button[data-action="unsmile"])
+      expect(html.css(selector)).to_not be_empty
+    end
+  end
+end

From 9563a586c27809898748c27f0c11b92d10456fda Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 7 May 2023 17:33:46 +0200
Subject: [PATCH 058/590] Appease the dog overlords (mostly)

---
 app/controllers/ajax/comment_controller.rb       | 4 ++--
 app/controllers/comment_controller.rb            | 2 +-
 spec/views/answerbox/_comments.html.haml_spec.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/ajax/comment_controller.rb b/app/controllers/ajax/comment_controller.rb
index c2ef3341..c7264464 100644
--- a/app/controllers/ajax/comment_controller.rb
+++ b/app/controllers/ajax/comment_controller.rb
@@ -14,12 +14,12 @@ class Ajax::CommentController < AjaxController
       return
     end
 
-    comments = Comment.where(answer:).includes([{user: :profile}, :smiles])
+    comments = Comment.where(answer:).includes([{ user: :profile }, :smiles])
 
     @response[:status] = :okay
     @response[:message] = t(".success")
     @response[:success] = true
-    @response[:render] = render_to_string(partial: 'answerbox/comments', locals: { a: answer, comments: })
+    @response[:render] = render_to_string(partial: "answerbox/comments", locals: { a: answer, comments: })
     @response[:count] = answer.comment_count
   end
 
diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
index 0b61f2eb..d8b9ea6f 100644
--- a/app/controllers/comment_controller.rb
+++ b/app/controllers/comment_controller.rb
@@ -3,7 +3,7 @@
 class CommentController < ApplicationController
   def index
     answer = Answer.find(params[:id])
-    @comments = Comment.where(answer:).includes([{user: :profile}, :smiles])
+    @comments = Comment.where(answer:).includes([{ user: :profile }, :smiles])
 
     render "index", locals: { a: answer }
   end
diff --git a/spec/views/answerbox/_comments.html.haml_spec.rb b/spec/views/answerbox/_comments.html.haml_spec.rb
index 90090069..3af138d6 100644
--- a/spec/views/answerbox/_comments.html.haml_spec.rb
+++ b/spec/views/answerbox/_comments.html.haml_spec.rb
@@ -5,7 +5,7 @@ require "rails_helper"
 describe "answerbox/_comments.html.haml", type: :view do
   subject(:rendered) do
     render partial: "answerbox/comments", locals: {
-      comments:, a:
+      comments:, a:,
     }
   end
 

From 81b271ab03737c78a811b2326e24c912d2cb1996 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 13 Sep 2023 23:21:59 +0100
Subject: [PATCH 059/590] Move reactions to separate view/endpoint

---
 app/controllers/reaction_controller.rb       |  9 ++++++
 app/views/application/_answerbox.html.haml   |  4 +++
 app/views/comment/index.html.haml            |  1 -
 app/views/reaction/index.html.haml           |  2 ++
 config/routes.rb                             |  1 +
 spec/controllers/reaction_controller_spec.rb | 34 ++++++++++++++++++++
 6 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/reaction_controller.rb
 create mode 100644 app/views/reaction/index.html.haml
 create mode 100644 spec/controllers/reaction_controller_spec.rb

diff --git a/app/controllers/reaction_controller.rb b/app/controllers/reaction_controller.rb
new file mode 100644
index 00000000..c6df6000
--- /dev/null
+++ b/app/controllers/reaction_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ReactionController < ApplicationController
+  def index
+    answer = Answer.includes([smiles: { user: :profile }]).find(params[:id])
+
+    render "index", locals: { a: answer }
+  end
+end
diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml
index c6236f3c..4524f405 100644
--- a/app/views/application/_answerbox.html.haml
+++ b/app/views/application/_answerbox.html.haml
@@ -35,6 +35,10 @@
         .col-md-6.d-md-flex.answerbox__actions
           = render "answerbox/actions", a:, display_all:, subscribed_answer_ids:
   .card-footer{ id: "ab-comments-section-#{a.id}", class: display_all.nil? ? "d-none" : nil }
+    = turbo_frame_tag("ab-reactions-list-#{a.id}", src: reactions_path(a.question, a), loading: :lazy) do
+      .d-flex.smiles
+        .flex-shrink-0.me-1
+          %i.fa.fa-smile-o
     = turbo_frame_tag("ab-comments-list-#{a.id}", src: comments_path(a.question, a), loading: :lazy) do
       .d-flex.justify-content-center
         .spinner-border{ role: :status }
diff --git a/app/views/comment/index.html.haml b/app/views/comment/index.html.haml
index 52cad691..e5334203 100644
--- a/app/views/comment/index.html.haml
+++ b/app/views/comment/index.html.haml
@@ -1,3 +1,2 @@
 = turbo_frame_tag "ab-comments-list-#{a.id}" do
-  %div{ id: "ab-smiles-#{a.id}" }= render "answerbox/smiles", a:
   %div{ id: "ab-comments-#{a.id}" }= render "answerbox/comments", a:, comments: @comments
diff --git a/app/views/reaction/index.html.haml b/app/views/reaction/index.html.haml
new file mode 100644
index 00000000..b717a281
--- /dev/null
+++ b/app/views/reaction/index.html.haml
@@ -0,0 +1,2 @@
+= turbo_frame_tag "ab-reactions-list-#{a.id}" do
+  %div{ id: "ab-smiles-#{a.id}" }= render "answerbox/smiles", a:
diff --git a/config/routes.rb b/config/routes.rb
index 85fc5a6e..e5fcf899 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -154,6 +154,7 @@ Rails.application.routes.draw do
   post "/@:username/a/:id/pin", to: "answer#pin", as: :pin_answer
   delete "/@:username/a/:id/pin", to: "answer#unpin", as: :unpin_answer
   get "/@:username/a/:id/comments", to: "comment#index", as: :comments
+  get "/@:username/a/:id/reactions", to: "reaction#index", as: :reactions
   get "/@:username/q/:id", to: "question#show", as: :question
   get "/@:username/followers", to: "user#followers", as: :show_user_followers
   get "/@:username/followings", to: "user#followings", as: :show_user_followings
diff --git a/spec/controllers/reaction_controller_spec.rb b/spec/controllers/reaction_controller_spec.rb
new file mode 100644
index 00000000..1b76617f
--- /dev/null
+++ b/spec/controllers/reaction_controller_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe ReactionController, type: :controller do
+  describe "#index" do
+    shared_examples_for "succeeds" do
+      it "returns the correct response" do
+        subject
+        expect(response).to have_rendered("reaction/index")
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    subject { get :index, params: { username: answer_author.screen_name, id: answer.id } }
+
+    let(:answer_author) { FactoryBot.create(:user) }
+    let(:answer) { FactoryBot.create(:answer, user: answer_author) }
+    let!(:reactees) { FactoryBot.create_list(:user, num_comments) }
+
+    [0, 1, 5, 30].each do |num_comments|
+      context "#{num_comments} reactions" do
+        let(:num_comments) { num_comments }
+
+        before do
+          reactees.each { _1.smile(answer) }
+        end
+
+        include_examples "succeeds"
+      end
+    end
+
+  end
+end

From ed664c9580b412c47e7b0b90a499e7c9fc29b9d7 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Thu, 14 Sep 2023 16:37:11 +0100
Subject: [PATCH 060/590] Add view tests for smiles list partial

---
 .../views/answerbox/_smiles.html.haml_spec.rb | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 spec/views/answerbox/_smiles.html.haml_spec.rb

diff --git a/spec/views/answerbox/_smiles.html.haml_spec.rb b/spec/views/answerbox/_smiles.html.haml_spec.rb
new file mode 100644
index 00000000..5530d648
--- /dev/null
+++ b/spec/views/answerbox/_smiles.html.haml_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe "answerbox/_smiles.html.haml", type: :view do
+  subject(:rendered) do
+    render partial: "answerbox/smiles", locals: { a: }
+  end
+
+  let(:a) { FactoryBot.create(:answer, user: FactoryBot.create(:user)) }
+
+  context "no reactions" do
+    it "shows an empty list" do
+      expect(rendered).to match("No one smiled this yet.")
+    end
+  end
+
+  context "reactions are present" do
+    let!(:reactions) { FactoryBot.create_list(:smile, 5, parent: a) }
+
+    it "shows a list of users" do
+      html = Nokogiri::HTML.parse(rendered)
+      selector = %(.smiles a)
+      reaction_elements = html.css(selector)
+      expect(reaction_elements.size).to eq(5)
+    end
+  end
+end

From b4a36c6617053ef87d9339dfc11cbf90ea8b5cdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:06:58 +0000
Subject: [PATCH 061/590] Bump sass from 1.69.0 to 1.69.3

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.0 to 1.69.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.0...1.69.3)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7bc670e2..4598486a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.69.0",
+    "sass": "^1.69.3",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.2.2"
diff --git a/yarn.lock b/yarn.lock
index 21b7897a..932f95b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2268,10 +2268,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.69.0:
-  version "1.69.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.0.tgz#5195075371c239ed556280cf2f5944d234f42679"
-  integrity sha512-l3bbFpfTOGgQZCLU/gvm1lbsQ5mC/WnLz3djL2v4WCJBDrWm58PO+jgngcGRNnKUh6wSsdm50YaovTqskZ0xDQ==
+sass@^1.69.3:
+  version "1.69.3"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.3.tgz#f8a0c488697e6419519834a13335e7b65a609c11"
+  integrity sha512-X99+a2iGdXkdWn1akFPs0ZmelUzyAQfvqYc2P/MPTrJRuIRoTffGzT9W9nFqG00S+c8hXzVmgxhUuHFdrwxkhQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From b4231491b31333b96360ca156f2f848261839815 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:07:20 +0000
Subject: [PATCH 062/590] Bump @github/hotkey from 2.0.1 to 2.1.1

Bumps [@github/hotkey](https://github.com/github/hotkey) from 2.0.1 to 2.1.1.
- [Release notes](https://github.com/github/hotkey/releases)
- [Commits](https://github.com/github/hotkey/compare/v2.0.1...v2.1.1)

---
updated-dependencies:
- dependency-name: "@github/hotkey"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7bc670e2..e9734251 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@fontsource/lexend": "^4.5.15",
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@github/hotkey": "^2.0.1",
+    "@github/hotkey": "^2.1.1",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^7.3.0",
     "@melloware/coloris": "^0.21.1",
diff --git a/yarn.lock b/yarn.lock
index 21b7897a..b59d23e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -199,10 +199,10 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz#36b6a9cb5ffbecdf89815c94d0c0ffa489ac5ecb"
   integrity sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==
 
-"@github/hotkey@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-2.0.1.tgz#24ad6b49313cee5b98368174eab16a4b53a08ec7"
-  integrity sha512-qKXjAJjtheJbf4ie3hi8IwrHWJZHB5qdojR6JGo6jvQNPpsdUbk/NIdU8sxu4PW41CjW80vfciDMu3MAP3j2Fg==
+"@github/hotkey@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-2.1.1.tgz#0e1da799c7a43d719b21f740bc59107dec30ea3b"
+  integrity sha512-UPb3mbKQzw3uskbRu+jsJwhAP2lFhxH0vI799camXiNbV5q3w61VNGt3oX7yxn4HhC5V4S701NoOqGbosCJhiw==
 
 "@hotwired/stimulus@^3.2.2":
   version "3.2.2"

From 83d2de1294f2ba192a38ebf3b46e3e84c74db099 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:57:00 +0000
Subject: [PATCH 063/590] Bump lograge from 0.13.0 to 0.14.0

Bumps [lograge](https://github.com/roidrage/lograge) from 0.13.0 to 0.14.0.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.13.0...v0.14.0)

---
updated-dependencies:
- dependency-name: lograge
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 539ed2e2..b1b1ea16 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -238,12 +238,12 @@ GEM
       addressable (~> 2.7)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
-    lograge (0.13.0)
+    lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.7.1)

From 29d6437b3ef73c44cdd25ceac71bdfc9620072f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:57:32 +0000
Subject: [PATCH 064/590] Bump bullet from 7.1.1 to 7.1.2

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.1 to 7.1.2.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.1...7.1.2)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 539ed2e2..6c7c40d8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,7 +100,7 @@ GEM
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     builder (3.2.4)
-    bullet (7.1.1)
+    bullet (7.1.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     carrierwave (2.1.0)

From 4ac8e6dd41991b23784fc08760054d9b3893ad79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:58:19 +0000
Subject: [PATCH 065/590] Bump net-imap from 0.4.0 to 0.4.1

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.0 to 0.4.1.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.0...v0.4.1)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 539ed2e2..b15527b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -268,7 +268,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.4)
       http-2 (~> 0.11)
-    net-imap (0.4.0)
+    net-imap (0.4.1)
       date
       net-protocol
     net-pop (0.1.2)

From c1124fc94c9e13c50c1dd9ae62d0b7dcca24408b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:58:58 +0000
Subject: [PATCH 066/590] Bump devise from 4.9.2 to 4.9.3

Bumps [devise](https://github.com/heartcombo/devise) from 4.9.2 to 4.9.3.
- [Release notes](https://github.com/heartcombo/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/devise/compare/v4.9.2...v4.9.3)

---
updated-dependencies:
- dependency-name: devise
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 539ed2e2..123baa56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,7 +125,7 @@ GEM
     database_cleaner-core (2.0.1)
     date (3.3.3)
     debug_inspector (1.1.0)
-    devise (4.9.2)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -243,7 +243,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.7.1)
@@ -350,7 +350,7 @@ GEM
     regexp_parser (2.8.1)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.6)

From d4eabbe05f08d0f24a52738ebce084e11e5136ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 09:59:48 +0000
Subject: [PATCH 067/590] Bump rubocop from 1.56.4 to 1.57.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.56.4 to 1.57.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.56.4...v1.57.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 02cf3416..6366c330 100644
--- a/Gemfile
+++ b/Gemfile
@@ -91,7 +91,7 @@ group :development, :test do
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.0"
   gem "rspec-sidekiq", "~> 4.0", require: false
-  gem "rubocop", "~> 1.56"
+  gem "rubocop", "~> 1.57"
   gem "rubocop-rails", "~> 2.21"
   gem "shoulda-matchers", "~> 5.3"
   gem "simplecov", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 539ed2e2..aa53bb9b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -347,7 +347,7 @@ GEM
     rake (13.0.6)
     redcarpet (3.6.0)
     redis (4.8.0)
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.2)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.0)
@@ -396,12 +396,12 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.56.4)
+    rubocop (1.57.1)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -561,7 +561,7 @@ DEPENDENCIES
   rspec-mocks
   rspec-rails (~> 6.0)
   rspec-sidekiq (~> 4.0)
-  rubocop (~> 1.56)
+  rubocop (~> 1.57)
   rubocop-rails (~> 2.21)
   rubyzip (~> 2.3)
   sanitize

From b706e6e6dc8b0fc5594f39a753e52f70be9bdd20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 10:04:44 +0000
Subject: [PATCH 068/590] Bump turbo-rails from 1.4.0 to 1.5.0

Bumps [turbo-rails](https://github.com/hotwired/turbo-rails) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/hotwired/turbo-rails/releases)
- [Commits](https://github.com/hotwired/turbo-rails/compare/v1.4.0...v1.5.0)

---
updated-dependencies:
- dependency-name: turbo-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 539ed2e2..fb6aaf62 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,8 +189,8 @@ GEM
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (1.1.0)
     glob (0.3.1)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     haml (6.1.4)
       temple (>= 0.8.2)
       thor
@@ -243,7 +243,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.7.1)
@@ -471,7 +471,7 @@ GEM
     tldv (0.1.0)
       tldv-data (~> 1.0)
     tldv-data (1.0.2023031000)
-    turbo-rails (1.4.0)
+    turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)

From 6b6614ba1367d1c072941e54a532a30dd7c46957 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 10:41:38 +0000
Subject: [PATCH 069/590] Bump haml from 6.1.4 to 6.2.3

Bumps [haml](https://github.com/haml/haml) from 6.1.4 to 6.2.3.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v6.1.4...v6.2.3)

---
updated-dependencies:
- dependency-name: haml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 02cf3416..bad5a989 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ gem "devise-i18n"
 gem "fog-aws"
 gem "fog-core"
 gem "fog-local"
-gem "haml", "~> 6.1"
+gem "haml", "~> 6.2"
 gem "hcaptcha", git: "https://github.com/raccube/hcaptcha", ref: "fix/flash-in-turbo-streams"
 gem "mini_magick"
 gem "oj"
diff --git a/Gemfile.lock b/Gemfile.lock
index e6ed540b..d24d93b4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -191,7 +191,7 @@ GEM
     glob (0.3.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    haml (6.1.4)
+    haml (6.2.3)
       temple (>= 0.8.2)
       thor
       tilt
@@ -524,7 +524,7 @@ DEPENDENCIES
   fog-aws
   fog-core
   fog-local
-  haml (~> 6.1)
+  haml (~> 6.2)
   haml_lint
   hcaptcha!
   httparty

From 26e1a9df1a5ae45d43288435b36eb1f309940a79 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 13:33:57 +0200
Subject: [PATCH 070/590] Suggest pure iPhone two factor capabilities

---
 .../otp_authentication/_totp_setup.html.haml                | 6 ++++++
 config/locales/views.en.yml                                 | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml b/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml
index 6c707a48..85b1630f 100644
--- a/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml
+++ b/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml
@@ -36,6 +36,12 @@
                 %a{ href: "https://apps.apple.com/gb/app/microsoft-authenticator/id983156458" }= t(".source.app_store")
               %li.list-inline-item
                 %a{ href: "https://play.google.com/store/apps/details?id=com.azure.authenticator" }= t(".source.google_play")
+          %li
+            %i.fa.fa-apple
+            = t(".app.iphone")
+            %ul.list-inline
+              %li.list-inline-item
+                %a{ href: "https://support.apple.com/en-gb/guide/iphone/ipha6173c19f/ios" }= t(".source.apple_support")
         %p= t(".setup_qr", app_name: APP_CONFIG['site_name'])
         = f.text_field :otp_validation, class: "totp-setup__code-field", inputmode: :numeric, label: t(".otp_validation"), autofocus: true
         = f.primary
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 20994bce..ed2280b5 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -492,7 +492,9 @@ en:
             aegis: "Aegis Authenticator for Android"
             strongbox: "Strongbox Authenticator for iOS"
             microsoft: "Microsoft Authenticator"
+            iphone: "iPhone (Passwords/Camera)"
           source:
+            apple_support: "Apple Support"
             app_store: "App Store"
             fdroid: "F-Droid"
             google_play: "Google Play"

From 6aee2baa45462c6c205e49e3530e9cd06e88e69e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 15:27:07 +0200
Subject: [PATCH 071/590] Name label iOS instead of iPhone

---
 .../otp_authentication/_totp_setup.html.haml                    | 2 +-
 config/locales/views.en.yml                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml b/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml
index 85b1630f..4388bf05 100644
--- a/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml
+++ b/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml
@@ -38,7 +38,7 @@
                 %a{ href: "https://play.google.com/store/apps/details?id=com.azure.authenticator" }= t(".source.google_play")
           %li
             %i.fa.fa-apple
-            = t(".app.iphone")
+            = t(".app.ios")
             %ul.list-inline
               %li.list-inline-item
                 %a{ href: "https://support.apple.com/en-gb/guide/iphone/ipha6173c19f/ios" }= t(".source.apple_support")
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index ed2280b5..5b909fde 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -492,7 +492,7 @@ en:
             aegis: "Aegis Authenticator for Android"
             strongbox: "Strongbox Authenticator for iOS"
             microsoft: "Microsoft Authenticator"
-            iphone: "iPhone (Passwords/Camera)"
+            ios: "iOS (Passwords/Camera)"
           source:
             apple_support: "Apple Support"
             app_store: "App Store"

From e4c054ad92e06e0c232fa8ac7890323a02009351 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 17 Oct 2023 19:52:00 +0200
Subject: [PATCH 072/590] Set rel=me on website link in profiles

---
 app/views/user/_profile.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/user/_profile.html.haml b/app/views/user/_profile.html.haml
index 8ceffb5c..7afb27f8 100644
--- a/app/views/user/_profile.html.haml
+++ b/app/views/user/_profile.html.haml
@@ -32,7 +32,7 @@
     - unless user.profile.website.blank?
       .profile__website
         %i.fa.fa-fw.fa-globe
-        %a{ href: user.profile.website, target: "_blank", rel: "nofollow" }= user.profile.display_website
+        %a{ href: user.profile.website, target: "_blank", rel: "me nofollow" }= user.profile.display_website
     - unless user.profile.location.blank?
       .profile__location
         %i.fa.fa-fw.fa-location-arrow

From 3feb827b16b187b38316cf2201e74399feb714e1 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 15:02:57 +0200
Subject: [PATCH 073/590] Add support for sharing dialog in inbox answer
 sharing

---
 .../stylesheets/components/_inbox-entry.scss  |  6 +++
 .../controllers/inbox_sharing_controller.ts   |  4 +-
 .../controllers/share_controller.ts           | 42 +++++++++++++++++++
 .../features/inbox/entry/answer.ts            |  5 +++
 .../retrospring/initializers/stimulus.ts      |  2 +
 app/views/inbox/_entry.html.haml              |  3 ++
 6 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/retrospring/controllers/share_controller.ts

diff --git a/app/assets/stylesheets/components/_inbox-entry.scss b/app/assets/stylesheets/components/_inbox-entry.scss
index a56875cd..b10ee20b 100644
--- a/app/assets/stylesheets/components/_inbox-entry.scss
+++ b/app/assets/stylesheets/components/_inbox-entry.scss
@@ -57,3 +57,9 @@
     position: relative;
   }
 }
+
+body:not(.cap-web-share) {
+  [data-controller="share"] {
+    display: none;
+  }
+}
diff --git a/app/javascript/retrospring/controllers/inbox_sharing_controller.ts b/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
index 6d0218b1..d087d62d 100644
--- a/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
+++ b/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
@@ -1,12 +1,13 @@
 import { Controller } from '@hotwired/stimulus';
 
 export default class extends Controller {
-  static targets = ['twitter', 'tumblr', 'telegram', 'custom'];
+  static targets = ['twitter', 'tumblr', 'telegram', 'other', 'custom'];
 
   declare readonly twitterTarget: HTMLAnchorElement;
   declare readonly tumblrTarget: HTMLAnchorElement;
   declare readonly telegramTarget: HTMLAnchorElement;
   declare readonly customTarget: HTMLAnchorElement;
+  declare readonly otherTarget: HTMLButtonElement;
   declare readonly hasCustomTarget: boolean;
 
   static values = {
@@ -22,6 +23,7 @@ export default class extends Controller {
       this.twitterTarget.addEventListener('click', () => this.close());
       this.tumblrTarget.addEventListener('click', () => this.close());
       this.telegramTarget.addEventListener('click', () => this.close());
+      this.otherTarget.addEventListener('click', () => this.close());
 
       if (this.hasCustomTarget) {
         this.customTarget.addEventListener('click', () => this.close());
diff --git a/app/javascript/retrospring/controllers/share_controller.ts b/app/javascript/retrospring/controllers/share_controller.ts
new file mode 100644
index 00000000..e9e8d250
--- /dev/null
+++ b/app/javascript/retrospring/controllers/share_controller.ts
@@ -0,0 +1,42 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class extends Controller {
+  static values = {
+    url: String,
+    text: String,
+    title: String
+  };
+
+  declare readonly urlValue: string;
+  declare readonly textValue: string;
+  declare readonly titleValue: string;
+
+  share() {
+    let shareConfiguration = {};
+
+    if (this.urlValue.length >= 1) {
+      shareConfiguration = {
+        ...shareConfiguration,
+        ...{ url: this.urlValue }
+      };
+    }
+
+    if (this.textValue.length >= 1) {
+      shareConfiguration = {
+        ...shareConfiguration,
+        ...{ text: this.textValue }
+      };
+    }
+
+    if (this.titleValue.length >= 1) {
+      shareConfiguration = {
+        ...shareConfiguration,
+        ...{ title: this.titleValue }
+      };
+    }
+
+    navigator.share(shareConfiguration).then(() => {
+      this.element.dispatchEvent(new CustomEvent('retrospring:shared'));
+    });
+  }
+}
diff --git a/app/javascript/retrospring/features/inbox/entry/answer.ts b/app/javascript/retrospring/features/inbox/entry/answer.ts
index 93b0cefc..77440d17 100644
--- a/app/javascript/retrospring/features/inbox/entry/answer.ts
+++ b/app/javascript/retrospring/features/inbox/entry/answer.ts
@@ -34,6 +34,11 @@ export function answerEntryHandler(event: Event): void {
       if (sharing != null) {
         sharing.dataset.inboxSharingConfigValue = JSON.stringify(data.sharing);
       }
+
+      const shareButton = inboxEntry.querySelector<HTMLButtonElement>('[data-controller="share"]');
+      if (shareButton != null) {
+        shareButton.dataset.shareTextValue = decodeURIComponent(data.sharing.custom).replaceAll('+', ' ');
+      }
       else {
         (inboxEntry as HTMLElement).remove();
       }
diff --git a/app/javascript/retrospring/initializers/stimulus.ts b/app/javascript/retrospring/initializers/stimulus.ts
index aee44e36..79116e3e 100644
--- a/app/javascript/retrospring/initializers/stimulus.ts
+++ b/app/javascript/retrospring/initializers/stimulus.ts
@@ -13,6 +13,7 @@ import InboxSharingController from "retrospring/controllers/inbox_sharing_contro
 import ToastController from "retrospring/controllers/toast_controller";
 import PwaBadgeController from "retrospring/controllers/pwa_badge_controller";
 import NavigationController from "retrospring/controllers/navigation_controller";
+import ShareController from "retrospring/controllers/share_controller";
 
 /**
  * This module sets up Stimulus and our controllers
@@ -37,4 +38,5 @@ export default function (): void {
   window['Stimulus'].register('navigation', NavigationController);
   window['Stimulus'].register('theme', ThemeController);
   window['Stimulus'].register('toast', ToastController);
+  window['Stimulus'].register('share', ShareController);
 }
diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index eb92ed7d..1d37c711 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -52,6 +52,9 @@
             %a.btn.btn-primary{ href: "#", data: { inbox_sharing_target: "telegram" }, target: "_blank" }
               %i.fab.fa-telegram.fa-fw
               Telegram
+            %button.btn.btn-primary{ data: { controller: "share", action: "share#share", inbox_sharing_target: "other" } }
+              %i.fa.fa-fw.fa-share-alt
+              = t("actions.share.other")
             - if current_user.sharing_custom_url.present?
               %a.btn.btn-primary{ href: current_user.sharing_custom_url, data: { inbox_sharing_target: "custom" }, target: "_blank" }
                 = current_user.display_sharing_custom_url

From 5ccdd9bbc2f1a3fef7f3e232c484e71d764276d2 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 15:19:45 +0200
Subject: [PATCH 074/590] Remove answerbox-specific sharing feature

---
 app/assets/stylesheets/components/_answerbox.scss    |  6 ------
 .../retrospring/features/answerbox/index.ts          |  2 --
 .../retrospring/features/answerbox/share.ts          | 12 ------------
 3 files changed, 20 deletions(-)
 delete mode 100644 app/javascript/retrospring/features/answerbox/share.ts

diff --git a/app/assets/stylesheets/components/_answerbox.scss b/app/assets/stylesheets/components/_answerbox.scss
index adb1b732..e0e3936f 100644
--- a/app/assets/stylesheets/components/_answerbox.scss
+++ b/app/assets/stylesheets/components/_answerbox.scss
@@ -97,9 +97,3 @@
     display: inline;
   }
 }
-
-body:not(.cap-web-share) {
-  [name="ab-share"] {
-    display: none;
-  }
-}
diff --git a/app/javascript/retrospring/features/answerbox/index.ts b/app/javascript/retrospring/features/answerbox/index.ts
index b0a3a897..61dc7edc 100644
--- a/app/javascript/retrospring/features/answerbox/index.ts
+++ b/app/javascript/retrospring/features/answerbox/index.ts
@@ -2,13 +2,11 @@ import registerEvents from 'utilities/registerEvents';
 import registerAnswerboxCommentEvents from './comment';
 import { answerboxDestroyHandler } from './destroy';
 import { answerboxReportHandler } from './report';
-import { shareEventHandler } from './share';
 import { answerboxSmileHandler } from './smile';
 import { answerboxSubscribeHandler } from './subscribe';
 
 export default (): void => {
   registerEvents([
-    { type: 'click', target: '[name=ab-share]', handler: shareEventHandler, global: true },
     { type: 'click', target: '[data-action=ab-submarine]', handler: answerboxSubscribeHandler, global: true },
     { type: 'click', target: '[data-action=ab-report]', handler: answerboxReportHandler, global: true },
     { type: 'click', target: '[data-action=ab-destroy]', handler: answerboxDestroyHandler, global: true },
diff --git a/app/javascript/retrospring/features/answerbox/share.ts b/app/javascript/retrospring/features/answerbox/share.ts
deleted file mode 100644
index 9018550e..00000000
--- a/app/javascript/retrospring/features/answerbox/share.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import noop from 'utilities/noop';
-
-export function shareEventHandler(event: Event): void {
-  event.preventDefault();
-  const answerbox = (event.target as HTMLElement).closest('.answerbox');
-
-  navigator.share({
-    url: answerbox.querySelector<HTMLAnchorElement>('.answerbox__answer-date > a, a.answerbox__permalink').href
-  })
-    .then(noop)
-    .catch(noop)
-}

From 9f999189cd87eed3291efb24bd5ae3a543719a69 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 15:20:04 +0200
Subject: [PATCH 075/590] Add Stimulus sharing feature to answerboxes

---
 app/helpers/social_helper.rb       | 9 +++++++++
 app/views/actions/_share.html.haml | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/helpers/social_helper.rb b/app/helpers/social_helper.rb
index e1ffe35f..b8ce3b9d 100644
--- a/app/helpers/social_helper.rb
+++ b/app/helpers/social_helper.rb
@@ -4,4 +4,13 @@ module SocialHelper
   include SocialHelper::TwitterMethods
   include SocialHelper::TumblrMethods
   include SocialHelper::TelegramMethods
+
+  def answer_share_url(answer)
+    answer_url(
+      id:       answer.id,
+      username: answer.user.screen_name,
+      host:     APP_CONFIG["hostname"],
+      protocol: (APP_CONFIG["https"] ? :https : :http)
+    )
+  end
 end
diff --git a/app/views/actions/_share.html.haml b/app/views/actions/_share.html.haml
index 65daacc2..5fc3c26b 100644
--- a/app/views/actions/_share.html.haml
+++ b/app/views/actions/_share.html.haml
@@ -8,5 +8,5 @@
   %a.dropdown-item{ href: telegram_share_url(answer), target: "_blank" }
     %i.fa.fa-fw.fa-telegram
     = t(".telegram")
-  %a.dropdown-item{ href: "#", name: "ab-share" }
+  %a.dropdown-item{ href: "#", data: { controller: :share, action: "share#share", share_url_value: answer_share_url(answer) } }
     = t(".other")

From e74e233548f6cb4804ed9551e4272276d1f9264d Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 15:20:24 +0200
Subject: [PATCH 076/590] Add spec for `answer_share_url`

---
 spec/helpers/social_helper_spec.rb | 33 ++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 spec/helpers/social_helper_spec.rb

diff --git a/spec/helpers/social_helper_spec.rb b/spec/helpers/social_helper_spec.rb
new file mode 100644
index 00000000..6841cdef
--- /dev/null
+++ b/spec/helpers/social_helper_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe SocialHelper, type: :helper do
+  let(:user) { FactoryBot.create(:user) }
+  let(:answer) do
+    FactoryBot.create(
+      :answer,
+      user:,
+      content:          "this is an answer\nwith multiple lines\nand **FORMATTING**",
+      question_content: "this is a question .... or is it?"
+    )
+  end
+
+  before do
+    stub_const("APP_CONFIG", {
+                 "hostname"       => "example.com",
+                 "https"          => true,
+                 "items_per_page" => 5,
+               })
+  end
+
+  describe "#answer_share_url" do
+    subject { answer_share_url(answer) }
+
+    it "returns a proper share link" do
+      expect(subject).to eq(<<~URL.strip)
+        https://example.com/@#{answer.user.screen_name}/a/#{answer.id}
+      URL
+    end
+  end
+end

From af3caf9be1509b2a0716dea386427d5053b0dd05 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 15:24:18 +0200
Subject: [PATCH 077/590] Fix stylelint nit

---
 app/assets/stylesheets/components/_inbox-entry.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/components/_inbox-entry.scss b/app/assets/stylesheets/components/_inbox-entry.scss
index b10ee20b..3583a3f3 100644
--- a/app/assets/stylesheets/components/_inbox-entry.scss
+++ b/app/assets/stylesheets/components/_inbox-entry.scss
@@ -59,6 +59,7 @@
 }
 
 body:not(.cap-web-share) {
+
   [data-controller="share"] {
     display: none;
   }

From 5f0fed8c94ae7a27ab4efcab084474c68f1e20cb Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 15:32:48 +0200
Subject: [PATCH 078/590] Fix rubocop nits

---
 app/helpers/social_helper.rb       | 2 +-
 spec/helpers/social_helper_spec.rb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/helpers/social_helper.rb b/app/helpers/social_helper.rb
index b8ce3b9d..c4d8b329 100644
--- a/app/helpers/social_helper.rb
+++ b/app/helpers/social_helper.rb
@@ -10,7 +10,7 @@ module SocialHelper
       id:       answer.id,
       username: answer.user.screen_name,
       host:     APP_CONFIG["hostname"],
-      protocol: (APP_CONFIG["https"] ? :https : :http)
+      protocol: (APP_CONFIG["https"] ? :https : :http),
     )
   end
 end
diff --git a/spec/helpers/social_helper_spec.rb b/spec/helpers/social_helper_spec.rb
index 6841cdef..1c165eb0 100644
--- a/spec/helpers/social_helper_spec.rb
+++ b/spec/helpers/social_helper_spec.rb
@@ -9,7 +9,7 @@ describe SocialHelper, type: :helper do
       :answer,
       user:,
       content:          "this is an answer\nwith multiple lines\nand **FORMATTING**",
-      question_content: "this is a question .... or is it?"
+      question_content: "this is a question .... or is it?",
     )
   end
 
@@ -18,7 +18,8 @@ describe SocialHelper, type: :helper do
                  "hostname"       => "example.com",
                  "https"          => true,
                  "items_per_page" => 5,
-               })
+               },
+              )
   end
 
   describe "#answer_share_url" do

From 0f0f3ae0c64bd193f8fe7790bbb3b68df227fa32 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 15:33:02 +0200
Subject: [PATCH 079/590] Fix sharing view spec test case

---
 spec/views/actions/_share.html.haml_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/views/actions/_share.html.haml_spec.rb b/spec/views/actions/_share.html.haml_spec.rb
index 16153d1c..f3dfc49f 100644
--- a/spec/views/actions/_share.html.haml_spec.rb
+++ b/spec/views/actions/_share.html.haml_spec.rb
@@ -24,6 +24,6 @@ describe "actions/_share.html.haml", type: :view do
   end
 
   it "has a dropdown item to share to anywhere else" do
-    expect(rendered).to have_css(%(a.dropdown-item[name="ab-share"]))
+    expect(rendered).to have_css(%(a.dropdown-item[data-controller="share"]))
   end
 end

From 87813d30057d29b67b2737f2d62f136e0c86641a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 16 Oct 2023 19:38:20 +0200
Subject: [PATCH 080/590] Fix sharing condition

---
 .../retrospring/features/inbox/entry/answer.ts         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/retrospring/features/inbox/entry/answer.ts b/app/javascript/retrospring/features/inbox/entry/answer.ts
index 77440d17..c515dc30 100644
--- a/app/javascript/retrospring/features/inbox/entry/answer.ts
+++ b/app/javascript/retrospring/features/inbox/entry/answer.ts
@@ -30,15 +30,15 @@ export function answerEntryHandler(event: Event): void {
       updateDeleteButton(false);
       showNotification(data.message);
 
-      const sharing = inboxEntry.querySelector<HTMLElement>('.inbox-entry__sharing');
-      if (sharing != null) {
-        sharing.dataset.inboxSharingConfigValue = JSON.stringify(data.sharing);
-      }
-
       const shareButton = inboxEntry.querySelector<HTMLButtonElement>('[data-controller="share"]');
       if (shareButton != null) {
         shareButton.dataset.shareTextValue = decodeURIComponent(data.sharing.custom).replaceAll('+', ' ');
       }
+
+      const sharing = inboxEntry.querySelector<HTMLElement>('.inbox-entry__sharing');
+      if (sharing != null) {
+        sharing.dataset.inboxSharingConfigValue = JSON.stringify(data.sharing);
+      }
       else {
         (inboxEntry as HTMLElement).remove();
       }

From 3aa18ef7c746b5694dd48f132945a7db8ba29379 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 17 Oct 2023 20:09:12 +0200
Subject: [PATCH 081/590] only initialize service workers if they are available

---
 app/javascript/retrospring/initializers/serviceWorker.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/retrospring/initializers/serviceWorker.ts b/app/javascript/retrospring/initializers/serviceWorker.ts
index fdf5f1ff..e5dfb081 100644
--- a/app/javascript/retrospring/initializers/serviceWorker.ts
+++ b/app/javascript/retrospring/initializers/serviceWorker.ts
@@ -1,3 +1,5 @@
 export default function (): void {
-  navigator.serviceWorker.register("/service_worker.js", { scope: "/" });
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.register("/service_worker.js", { scope: "/" });
+  }
 }

From 97a826be332bca3f642eaff7fb559b6cb757dcb6 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 17 Oct 2023 20:22:26 +0200
Subject: [PATCH 082/590] Bump version to 2023.1017.0

---
 lib/retrospring/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index 7a679293..6483f4e9 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -15,9 +15,9 @@ module Retrospring
 
     def year = 2023
 
-    def month = 9
+    def month = 10
 
-    def day = 1
+    def day = 17
 
     def patch = 0
 

From fce3d7c587cf57c291f70f1e09b8aa0e261bd54a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 17 Oct 2023 21:48:49 +0200
Subject: [PATCH 083/590] Disable Turbo on registration form

---
 app/views/devise/registrations/new.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 698e63b9..d0fa29d6 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -5,7 +5,7 @@
       .card.mt-3
         .card-body
           %h1= t(".title")
-          = bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+          = bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), data: { turbo: false }) do |f|
             = render "devise/shared/error_messages", resource: resource
             = render "layouts/messages"
 

From bdedd92817837a57377df020f48761d3484c3912 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 17 Oct 2023 21:51:18 +0200
Subject: [PATCH 084/590] Bump version to 2023.1017.1

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index 6483f4e9..9046c9d6 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -19,7 +19,7 @@ module Retrospring
 
     def day = 17
 
-    def patch = 0
+    def patch = 1
 
     def suffix = ""
 

From 4f1b6ca03e8b91221fb69af51fe36fb5d0217d91 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 17 Oct 2023 21:59:08 +0200
Subject: [PATCH 085/590] Allow setting extra hosts in development environments

---
 config/environments/development.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index c2434c8c..bf96e5b2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -75,6 +75,7 @@ Rails.application.configure do
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  config.hosts += ENV["EXTRA_HOSTS"].split(':') if ENV["EXTRA_HOSTS"].present?
 end
 
 # For better_errors to work inside Docker we need

From dda12956539b7ff5d00a5b827283a10cf58834f5 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 17 Oct 2023 21:59:37 +0200
Subject: [PATCH 086/590] Use Ruby 3.2.2

---
 .docker/ruby/Dockerfile | 2 +-
 .ruby-version           | 2 +-
 Containerfile           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.docker/ruby/Dockerfile b/.docker/ruby/Dockerfile
index 6e6e33d2..5cba21a9 100644
--- a/.docker/ruby/Dockerfile
+++ b/.docker/ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.1
+FROM ruby:3.2
 
 USER root
 
diff --git a/.ruby-version b/.ruby-version
index ef538c28..be94e6f5 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.2
+3.2.2
diff --git a/Containerfile b/Containerfile
index 249f7323..adc849a8 100644
--- a/Containerfile
+++ b/Containerfile
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.vendor="The Retrospring team"
 LABEL org.opencontainers.image.url="https://github.com/Retrospring/retrospring"
 
 ARG RETROSPRING_VERSION=2023.0131.1
-ARG RUBY_VERSION=3.1.2
+ARG RUBY_VERSION=3.2.2
 ARG RUBY_INSTALL_VERSION=0.9.0
 ARG BUNDLER_VERSION=2.3.18
 

From 3539c3264b2e7c1ff777342e442466230876b5e6 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <6197148+raccube@users.noreply.github.com>
Date: Wed, 18 Oct 2023 09:10:28 +0200
Subject: [PATCH 087/590] Bump ruby-install version to 0.9.2

Co-authored-by: Georg Gadinger <nilsding@nilsding.org>
---
 Containerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index adc849a8..73044568 100644
--- a/Containerfile
+++ b/Containerfile
@@ -9,7 +9,7 @@ LABEL org.opencontainers.image.url="https://github.com/Retrospring/retrospring"
 
 ARG RETROSPRING_VERSION=2023.0131.1
 ARG RUBY_VERSION=3.2.2
-ARG RUBY_INSTALL_VERSION=0.9.0
+ARG RUBY_INSTALL_VERSION=0.9.2
 ARG BUNDLER_VERSION=2.3.18
 
 ENV RAILS_ENV=production

From 2a6d88abfcf7f99d2d52130e243aa04152726205 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 18 Oct 2023 19:29:44 +0200
Subject: [PATCH 088/590] Include type in relationship unique constraint

---
 ...8_include_type_in_relationship_unique_constraint.rb | 10 ++++++++++
 db/schema.rb                                           |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20231018172518_include_type_in_relationship_unique_constraint.rb

diff --git a/db/migrate/20231018172518_include_type_in_relationship_unique_constraint.rb b/db/migrate/20231018172518_include_type_in_relationship_unique_constraint.rb
new file mode 100644
index 00000000..171fe00f
--- /dev/null
+++ b/db/migrate/20231018172518_include_type_in_relationship_unique_constraint.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class IncludeTypeInRelationshipUniqueConstraint < ActiveRecord::Migration[6.1]
+  def change
+    change_table :relationships do |t|
+      t.remove_index(%i[source_id target_id])
+      t.index(%i[source_id target_id type], unique: true)
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c45fb69c..ea268655 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_05_26_181715) do
+ActiveRecord::Schema.define(version: 2023_10_18_172518) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -159,7 +159,7 @@ ActiveRecord::Schema.define(version: 2023_05_26_181715) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string "type", null: false
-    t.index ["source_id", "target_id"], name: "index_relationships_on_source_id_and_target_id", unique: true
+    t.index ["source_id", "target_id", "type"], name: "index_relationships_on_source_id_and_target_id_and_type", unique: true
     t.index ["source_id"], name: "index_relationships_on_source_id"
     t.index ["target_id"], name: "index_relationships_on_target_id"
     t.index ["type"], name: "index_relationships_on_type"

From dc8c5fbf824b73e5bf149579ef0e7c2fb7442abc Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 18 Oct 2023 20:01:07 +0200
Subject: [PATCH 089/590] Add option to omit URL to `prepare_tweet` helper

---
 app/helpers/social_helper/twitter_methods.rb       |  4 ++--
 spec/helpers/social_helper/twitter_methods_spec.rb | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/helpers/social_helper/twitter_methods.rb b/app/helpers/social_helper/twitter_methods.rb
index 7f025f71..716060f8 100644
--- a/app/helpers/social_helper/twitter_methods.rb
+++ b/app/helpers/social_helper/twitter_methods.rb
@@ -3,7 +3,7 @@ require 'cgi'
 module SocialHelper::TwitterMethods
   include MarkdownHelper
 
-  def prepare_tweet(answer, post_tag = nil)
+  def prepare_tweet(answer, post_tag = nil, omit_url = false)
     question_content = twitter_markdown answer.question.content.gsub(/\@(\w+)/, '\1')
     original_question_length = question_content.length
     answer_content = twitter_markdown answer.content
@@ -13,7 +13,7 @@ module SocialHelper::TwitterMethods
       username: answer.user.screen_name,
       host: APP_CONFIG['hostname'],
       protocol: (APP_CONFIG['https'] ? :https : :http)
-    )
+    ) unless omit_url
 
     parsed_tweet = { :valid => false }
     tweet_text = ""
diff --git a/spec/helpers/social_helper/twitter_methods_spec.rb b/spec/helpers/social_helper/twitter_methods_spec.rb
index 7074f6e6..ad630bc4 100644
--- a/spec/helpers/social_helper/twitter_methods_spec.rb
+++ b/spec/helpers/social_helper/twitter_methods_spec.rb
@@ -38,6 +38,17 @@ describe SocialHelper::TwitterMethods, :type => :helper do
       end
     end
 
+    context "when the url should be omitted" do
+      let(:question_content) { "question" }
+      let(:answer_content) { "answer" }
+
+      subject { prepare_tweet(answer, nil, true) }
+
+      it "should include the suffix after the link" do
+        expect(subject).to eq("question — answer")
+      end
+    end
+
     context 'when a suffix has been passed and the tweet needs to be shortened' do
       subject { prepare_tweet(answer, '#askracc') }
 
@@ -69,4 +80,4 @@ describe SocialHelper::TwitterMethods, :type => :helper do
       expect(subject).to eq("https://twitter.com/intent/tweet?text=#{CGI.escape(prepare_tweet(answer))}")
     end
   end
-end
\ No newline at end of file
+end

From 8b86e2f1233aab000bcde620daaae585feec9406 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 18 Oct 2023 20:01:59 +0200
Subject: [PATCH 090/590] Set text and URL separately for `navigator.share`

Apparently for most mobile OSses `url` is a required share option
---
 app/controllers/ajax/answer_controller.rb                 | 6 +++---
 app/javascript/retrospring/features/inbox/entry/answer.ts | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/ajax/answer_controller.rb b/app/controllers/ajax/answer_controller.rb
index 0c401638..65f8f29d 100644
--- a/app/controllers/ajax/answer_controller.rb
+++ b/app/controllers/ajax/answer_controller.rb
@@ -3,9 +3,7 @@
 require "cgi"
 
 class Ajax::AnswerController < AjaxController
-  include SocialHelper::TwitterMethods
-  include SocialHelper::TumblrMethods
-  include SocialHelper::TelegramMethods
+  include SocialHelper
 
   def create
     params.require :id
@@ -73,6 +71,8 @@ class Ajax::AnswerController < AjaxController
   private
 
   def sharing_hash(answer) = {
+    url:      answer_share_url(answer),
+    text:     prepare_tweet(answer, nil, true),
     twitter:  twitter_share_url(answer),
     tumblr:   tumblr_share_url(answer),
     telegram: telegram_share_url(answer),
diff --git a/app/javascript/retrospring/features/inbox/entry/answer.ts b/app/javascript/retrospring/features/inbox/entry/answer.ts
index c515dc30..b5a142ab 100644
--- a/app/javascript/retrospring/features/inbox/entry/answer.ts
+++ b/app/javascript/retrospring/features/inbox/entry/answer.ts
@@ -32,7 +32,8 @@ export function answerEntryHandler(event: Event): void {
 
       const shareButton = inboxEntry.querySelector<HTMLButtonElement>('[data-controller="share"]');
       if (shareButton != null) {
-        shareButton.dataset.shareTextValue = decodeURIComponent(data.sharing.custom).replaceAll('+', ' ');
+        shareButton.dataset.shareUrlValue = data.sharing.url;
+        shareButton.dataset.shareTextValue = data.sharing.text;
       }
 
       const sharing = inboxEntry.querySelector<HTMLElement>('.inbox-entry__sharing');

From bc45bda5178cb802d6468c74427d2b9ed99bbbbd Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 18 Oct 2023 20:04:14 +0200
Subject: [PATCH 091/590] Only remove inbox entry after share has been
 triggered

---
 .../retrospring/controllers/inbox_sharing_controller.ts     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/javascript/retrospring/controllers/inbox_sharing_controller.ts b/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
index d087d62d..dcc7b44f 100644
--- a/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
+++ b/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
@@ -23,7 +23,7 @@ export default class extends Controller {
       this.twitterTarget.addEventListener('click', () => this.close());
       this.tumblrTarget.addEventListener('click', () => this.close());
       this.telegramTarget.addEventListener('click', () => this.close());
-      this.otherTarget.addEventListener('click', () => this.close());
+      this.otherTarget.addEventListener('click', () => this.closeAfterShare());
 
       if (this.hasCustomTarget) {
         this.customTarget.addEventListener('click', () => this.close());
@@ -50,4 +50,8 @@ export default class extends Controller {
   close(): void {
     (this.element.closest(".inbox-entry")).remove();
   }
+
+  closeAfterShare(): void {
+    this.otherTarget.addEventListener('retrospring:shared', () => this.close());
+  }
 }

From 7156dc5c9b629faab8bc123aabdea262a85680b7 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 18 Oct 2023 20:04:41 +0200
Subject: [PATCH 092/590] Catch `navigator.share` errors with a no-op

---
 .../retrospring/controllers/share_controller.ts          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/javascript/retrospring/controllers/share_controller.ts b/app/javascript/retrospring/controllers/share_controller.ts
index e9e8d250..c1b5d350 100644
--- a/app/javascript/retrospring/controllers/share_controller.ts
+++ b/app/javascript/retrospring/controllers/share_controller.ts
@@ -1,4 +1,5 @@
 import { Controller } from '@hotwired/stimulus';
+import noop from 'utilities/noop';
 
 export default class extends Controller {
   static values = {
@@ -35,8 +36,10 @@ export default class extends Controller {
       };
     }
 
-    navigator.share(shareConfiguration).then(() => {
-      this.element.dispatchEvent(new CustomEvent('retrospring:shared'));
-    });
+    navigator.share(shareConfiguration)
+      .then(() => {
+        this.element.dispatchEvent(new CustomEvent('retrospring:shared'));
+      })
+      .catch(noop);
   }
 }

From 274d480ba82aeae8c03ab053c4e03ca7c50f1595 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 18 Oct 2023 20:54:41 +0200
Subject: [PATCH 093/590] Adjust specs for AJAX answer endpoint

---
 spec/controllers/ajax/answer_controller_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/controllers/ajax/answer_controller_spec.rb b/spec/controllers/ajax/answer_controller_spec.rb
index 2a8906ca..fd6b50ca 100644
--- a/spec/controllers/ajax/answer_controller_spec.rb
+++ b/spec/controllers/ajax/answer_controller_spec.rb
@@ -91,6 +91,8 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
               let(:expected_response) do
                 super().merge(
                   "sharing" => {
+                    "url"      => a_string_matching("https://#{APP_CONFIG['hostname']}/"),
+                    "text"     => a_string_matching("Werfen Sie nicht länger das Fenster zum Geld hinaus!"),
                     "twitter"  => a_string_matching("https://twitter.com/"),
                     "tumblr"   => a_string_matching("https://www.tumblr.com/"),
                     "telegram" => a_string_matching("https://t.me/"),
@@ -170,6 +172,8 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
               let(:expected_response) do
                 super().merge(
                   "sharing" => {
+                    "url"      => a_string_matching("https://#{APP_CONFIG['hostname']}/"),
+                    "text"     => a_string_matching("Werfen Sie nicht länger das Fenster zum Geld hinaus!"),
                     "twitter"  => a_string_matching("https://twitter.com/"),
                     "tumblr"   => a_string_matching("https://www.tumblr.com/"),
                     "telegram" => a_string_matching("https://t.me/"),

From f76c4e236b5a7f4350a0a464c9f95f9fdca84f8b Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 18 Oct 2023 21:07:17 +0200
Subject: [PATCH 094/590] Fix rubocop nits

---
 app/helpers/social_helper/twitter_methods.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/helpers/social_helper/twitter_methods.rb b/app/helpers/social_helper/twitter_methods.rb
index 716060f8..318dd1f9 100644
--- a/app/helpers/social_helper/twitter_methods.rb
+++ b/app/helpers/social_helper/twitter_methods.rb
@@ -8,12 +8,15 @@ module SocialHelper::TwitterMethods
     original_question_length = question_content.length
     answer_content = twitter_markdown answer.content
     original_answer_length = answer_content.length
-    answer_url = answer_url(
-      id: answer.id,
-      username: answer.user.screen_name,
-      host: APP_CONFIG['hostname'],
-      protocol: (APP_CONFIG['https'] ? :https : :http)
-    ) unless omit_url
+
+    unless omit_url
+      answer_url = answer_url(
+        id:       answer.id,
+        username: answer.user.screen_name,
+        host:     APP_CONFIG["hostname"],
+        protocol: (APP_CONFIG["https"] ? :https : :http),
+      )
+    end
 
     parsed_tweet = { :valid => false }
     tweet_text = ""

From dc41f150971f11e5ce45f5775541806b84ca342f Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Wed, 18 Oct 2023 21:42:19 +0200
Subject: [PATCH 095/590] fix deletion of inbox entries when deleting an user

---
 app/models/inbox.rb       |  3 ++-
 spec/models/inbox_spec.rb | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 spec/models/inbox_spec.rb

diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 1a1a0066..b12beb29 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -22,7 +22,8 @@ class Inbox < ApplicationRecord
   end
 
   after_destroy do
-    user.touch(:inbox_updated_at)
+    # user might not exist at this point (account deleted, records are cleaned up async)
+    user&.touch(:inbox_updated_at)
   end
 
   def answer(answer_content, user)
diff --git a/spec/models/inbox_spec.rb b/spec/models/inbox_spec.rb
new file mode 100644
index 00000000..9a00635a
--- /dev/null
+++ b/spec/models/inbox_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Inbox, type: :model do
+  describe "associations" do
+    it { should belong_to(:user) }
+    it { should belong_to(:question) }
+  end
+
+  describe "before_destroy" do
+    let(:user) { FactoryBot.create(:user) }
+    let(:question) { FactoryBot.create(:question, author_is_anonymous: true) }
+
+    it "does not fail if the user wants to delete their account" do
+      Inbox.create(user:, question:)
+
+      # this deletes the User record and enqueues the deletion of all
+      # associated records in sidekiq
+      user.destroy!
+
+      # so let's drain the queues
+      expect { Sidekiq::Worker.drain_all }.not_to raise_error
+    end
+  end
+end

From 8a26232fe6ce1290aacf99eae11686090d60450f Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Wed, 18 Oct 2023 21:53:30 +0200
Subject: [PATCH 096/590] bad dog

---
 app/models/inbox.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index b12beb29..ada94803 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -50,7 +50,7 @@ class Inbox < ApplicationRecord
                 user.profile.anon_display_name || APP_CONFIG["anonymous_name"]
               else
                 question.user.profile.safe_name
-              end
+              end,
       ),
       icon:  notification_icon,
       body:  question.content.truncate(Question::SHORT_QUESTION_MAX_LENGTH),

From b53462e4e5847c351f5e3d7ae22c9d09fc50d4a8 Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Wed, 18 Oct 2023 21:55:22 +0200
Subject: [PATCH 097/590] update Bundler

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8f56f560..d9e04dd7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -582,4 +582,4 @@ DEPENDENCIES
   twitter-text
 
 BUNDLED WITH
-   2.3.18
+   2.4.21

From f5a77bc882a25790e95287988cd17a7e3b3bf6ba Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Wed, 18 Oct 2023 21:55:38 +0200
Subject: [PATCH 098/590] update tldv-data

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d9e04dd7..c9dfd28f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -470,7 +470,7 @@ GEM
     timeout (0.4.0)
     tldv (0.1.0)
       tldv-data (~> 1.0)
-    tldv-data (1.0.2023031000)
+    tldv-data (1.0.2023080900)
     turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)

From a85ce45b25ac921a440d7a94f068a16c73fd070e Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Wed, 18 Oct 2023 21:57:09 +0200
Subject: [PATCH 099/590] appease the paw patrol

---
 app/models/inbox.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index ada94803..96f3dc84 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -14,16 +14,16 @@ class Inbox < ApplicationRecord
   end
 
   after_create do
-    user.touch(:inbox_updated_at)
+    user.touch(:inbox_updated_at) # rubocop:disable Rails/SkipsModelValidations
   end
 
   after_update do
-    user.touch(:inbox_updated_at)
+    user.touch(:inbox_updated_at) # rubocop:disable Rails/SkipsModelValidations
   end
 
   after_destroy do
     # user might not exist at this point (account deleted, records are cleaned up async)
-    user&.touch(:inbox_updated_at)
+    user&.touch(:inbox_updated_at) # rubocop:disable Rails/SkipsModelValidations
   end
 
   def answer(answer_content, user)

From c4da510fe71fb0d0d88b88ca730ebeee9d98276c Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Wed, 18 Oct 2023 22:13:25 +0200
Subject: [PATCH 100/590] fix deletion of notification entries when deleting a
 user

---
 app/models/notification.rb       |  7 ++++---
 spec/models/notification_spec.rb | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 spec/models/notification_spec.rb

diff --git a/app/models/notification.rb b/app/models/notification.rb
index e36cad0a..76233c67 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -5,15 +5,16 @@ class Notification < ApplicationRecord
   belongs_to :target, polymorphic: true
 
   after_create do
-    recipient.touch(:notifications_updated_at)
+    recipient.touch(:notifications_updated_at) # rubocop:disable Rails/SkipsModelValidations
   end
 
   after_update do
-    recipient.touch(:notifications_updated_at)
+    recipient.touch(:notifications_updated_at) # rubocop:disable Rails/SkipsModelValidations
   end
 
   after_destroy do
-    recipient.touch(:notifications_updated_at)
+    # recipient might not exist at this point (account deleted, records are cleaned up async)
+    recipient&.touch(:notifications_updated_at) # rubocop:disable Rails/SkipsModelValidations
   end
 
   class << self
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
new file mode 100644
index 00000000..9bf3aea8
--- /dev/null
+++ b/spec/models/notification_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Notification, type: :model do
+  describe "associations" do
+    it { should belong_to(:recipient) }
+    it { should belong_to(:target) }
+  end
+
+  describe "before_destroy" do
+    let(:user) { FactoryBot.create(:user) }
+    let(:answer) { FactoryBot.create(:answer, user: FactoryBot.create(:user)) }
+
+    it "does not fail if the user wants to delete their account" do
+      Notification::QuestionAnswered.create(recipient: user, target: answer)
+
+      # this deletes the User record and enqueues the deletion of all
+      # associated records in sidekiq
+      user.destroy!
+
+      # so let's drain the queues
+      expect { Sidekiq::Worker.drain_all }.not_to raise_error
+    end
+  end
+end

From e37532e0ebba5fd64f84727ae4a6e05b9cc2a1dc Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 19 Oct 2023 10:50:00 +0200
Subject: [PATCH 101/590] Bump version to 2023.1019.0

---
 lib/retrospring/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index 9046c9d6..5b2806e4 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -17,9 +17,9 @@ module Retrospring
 
     def month = 10
 
-    def day = 17
+    def day = 19
 
-    def patch = 1
+    def patch = 0
 
     def suffix = ""
 

From 9cb6b25cc72c8bf48e67dd3215d641994de981b2 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 18 Oct 2023 23:25:16 +0200
Subject: [PATCH 102/590] Disable `Metrics/*Complexity` cops

---
 .rubocop.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 12052185..0d6c9020 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -46,7 +46,10 @@ Metrics/ClassLength:
   Enabled: false
 
 Metrics/CyclomaticComplexity:
-  Severity: refactor
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
 
 Metrics/ModuleLength:
   Enabled: false

From 25adb11df3701a119f56d79c0759bd1ef6cd3131 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 18 Oct 2023 23:26:10 +0200
Subject: [PATCH 103/590] Fix rubocop nits in helper code and specs

---
 app/helpers/ajax_helper.rb                    |  2 +
 .../application_helper/graph_methods.rb       | 10 +--
 .../application_helper/title_methods.rb       |  2 +-
 app/helpers/bootstrap_helper.rb               | 21 +++---
 app/helpers/feedback_helper.rb                |  2 +-
 app/helpers/markdown_helper.rb                |  2 +-
 app/helpers/social_helper/telegram_methods.rb |  2 +-
 app/helpers/social_helper/tumblr_methods.rb   | 18 ++---
 app/helpers/social_helper/twitter_methods.rb  | 20 +++---
 app/helpers/theme_helper.rb                   |  2 +-
 .../application_helper/graph_methods_spec.rb  | 70 +++++++++++--------
 .../application_helper/title_methods_spec.rb  | 10 +--
 spec/helpers/bootstrap_helper_spec.rb         | 70 ++++++++++---------
 spec/helpers/feedback_helper_spec.rb          |  6 +-
 spec/helpers/markdown_helper_spec.rb          |  4 +-
 .../social_helper/telegram_methods_spec.rb    |  4 +-
 .../social_helper/tumblr_methods_spec.rb      | 44 ++++++------
 .../social_helper/twitter_methods_spec.rb     | 60 ++++++++--------
 spec/helpers/social_helper_spec.rb            |  3 +-
 spec/helpers/theme_helper_spec.rb             | 36 +++++-----
 spec/helpers/user_helper_spec.rb              | 14 ++--
 21 files changed, 214 insertions(+), 188 deletions(-)

diff --git a/app/helpers/ajax_helper.rb b/app/helpers/ajax_helper.rb
index 3f1a4867..6a7aa743 100644
--- a/app/helpers/ajax_helper.rb
+++ b/app/helpers/ajax_helper.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module AjaxHelper
 end
diff --git a/app/helpers/application_helper/graph_methods.rb b/app/helpers/application_helper/graph_methods.rb
index cde48656..a9487db9 100644
--- a/app/helpers/application_helper/graph_methods.rb
+++ b/app/helpers/application_helper/graph_methods.rb
@@ -4,13 +4,13 @@ module ApplicationHelper::GraphMethods
   # Creates <meta> tags for OpenGraph properties from a hash
   # @param values [Hash]
   def opengraph_meta_tags(values)
-    safe_join(values.map { |name, content| tag.meta(property: name, content: content) }, "\n")
+    safe_join(values.map { |name, content| tag.meta(property: name, content:) }, "\n")
   end
 
   # Creates <meta> tags from a hash
   # @param values [Hash]
   def meta_tags(values)
-    safe_join(values.map { |name, content| tag.meta(name: name, content: content) }, "\n")
+    safe_join(values.map { |name, content| tag.meta(name:, content:) }, "\n")
   end
 
   # @param user [User]
@@ -22,7 +22,7 @@ module ApplicationHelper::GraphMethods
                           "og:url":           user_url(user),
                           "og:description":   user.profile.description,
                           "og:site_name":     APP_CONFIG["site_name"],
-                          "profile:username": user.screen_name
+                          "profile:username": user.screen_name,
                         })
   end
 
@@ -33,7 +33,7 @@ module ApplicationHelper::GraphMethods
                 "twitter:site":        "@retrospring",
                 "twitter:title":       user.profile.motivation_header.presence || "Ask me anything!",
                 "twitter:description": "Ask #{user.profile.safe_name} anything on Retrospring",
-                "twitter:image":       full_profile_picture_url(user)
+                "twitter:image":       full_profile_picture_url(user),
               })
   end
 
@@ -45,7 +45,7 @@ module ApplicationHelper::GraphMethods
                           "og:image":       full_profile_picture_url(answer.user),
                           "og:url":         answer_url(answer.user.screen_name, answer.id),
                           "og:description": answer.content,
-                          "og:site_name":   APP_CONFIG["site_name"]
+                          "og:site_name":   APP_CONFIG["site_name"],
                         })
   end
 
diff --git a/app/helpers/application_helper/title_methods.rb b/app/helpers/application_helper/title_methods.rb
index b80deee3..9784e646 100644
--- a/app/helpers/application_helper/title_methods.rb
+++ b/app/helpers/application_helper/title_methods.rb
@@ -28,7 +28,7 @@ module ApplicationHelper::TitleMethods
   def question_title(question)
     context_user = question.answers&.first&.user if question.direct
     name = user_screen_name question.user,
-                            context_user:      context_user,
+                            context_user:,
                             author_identifier: question.author_is_anonymous ? question.author_identifier : nil,
                             url:               false
     generate_title name, "asked", question.content
diff --git a/app/helpers/bootstrap_helper.rb b/app/helpers/bootstrap_helper.rb
index 55544265..e6ae6981 100644
--- a/app/helpers/bootstrap_helper.rb
+++ b/app/helpers/bootstrap_helper.rb
@@ -25,24 +25,24 @@ module BootstrapHelper
                "#{content_tag(:i, '', class: "fa fa-#{options[:icon]}")} #{body}"
              end
     end
-    if options[:badge].present? || options.dig(:badge_attr, :data)&.has_key?(:controller)
+    if options[:badge].present? || options.dig(:badge_attr, :data)&.key?(:controller)
       badge_class = [
         "badge",
         ("badge-#{options[:badge_color]}" unless options[:badge_color].nil?),
         ("badge-pill" if options[:badge_pill])
       ].compact.join(" ")
 
-      body += " #{content_tag(:span, options[:badge], class: badge_class, **options[:badge_attr])}".html_safe
+      body += " #{content_tag(:span, options[:badge], class: badge_class, **options[:badge_attr])}".html_safe # rubocop:disable Rails/OutputSafety
     end
 
-    content_tag(:li, link_to(body.html_safe, path, class: "nav-link", data: { hotkey: options[:hotkey] }), class: classes, id: options[:id])
+    content_tag(:li, link_to(body.html_safe, path, class: "nav-link", data: { hotkey: options[:hotkey] }), class: classes, id: options[:id]) # rubocop:disable Rails/OutputSafety
   end
 
   def list_group_item(body, path, options = {})
     options = {
       badge:       nil,
       badge_color: nil,
-      class:       ""
+      class:       "",
     }.merge(options)
 
     classes = [
@@ -54,13 +54,18 @@ module BootstrapHelper
 
     unless options[:badge].nil? || (options[:badge]).zero?
       # TODO: make this prettier?
-      body << " #{
-        content_tag(:span, options[:badge], class: "badge#{
+      badge = content_tag(:span, options[:badge], class: "badge#{
           " badge-#{options[:badge_color]}" unless options[:badge_color].nil?
-        }")}"
+        }",)
     end
 
-    content_tag(:a, body.html_safe, href: path, class: classes)
+    html = if badge
+             "#{body} #{badge}"
+           else
+             body
+           end
+
+    content_tag(:a, html.html_safe, href: path, class: classes) # rubocop:disable Rails/OutputSafety
   end
 
   def tooltip(body, tooltip_content, placement = "bottom")
diff --git a/app/helpers/feedback_helper.rb b/app/helpers/feedback_helper.rb
index ff51d91b..ac47c27a 100644
--- a/app/helpers/feedback_helper.rb
+++ b/app/helpers/feedback_helper.rb
@@ -8,7 +8,7 @@ module FeedbackHelper
       avatarURL: current_user.profile_picture.url(:large),
       name:      current_user.screen_name,
       id:        current_user.id,
-      email:     current_user.email
+      email:     current_user.email,
     }
 
     JWT.encode(user_data, APP_CONFIG.dig("canny", "sso"))
diff --git a/app/helpers/markdown_helper.rb b/app/helpers/markdown_helper.rb
index ef634209..6ae71c17 100644
--- a/app/helpers/markdown_helper.rb
+++ b/app/helpers/markdown_helper.rb
@@ -30,7 +30,7 @@ module MarkdownHelper
   def raw_markdown(content)
     renderer = Redcarpet::Render::HTML.new(**MARKDOWN_RENDERER_OPTS)
     md = Redcarpet::Markdown.new(renderer, **MARKDOWN_OPTS)
-    raw md.render content
+    raw md.render content # rubocop:disable Rails/OutputSafety
   end
 
   def get_markdown(path, relative_to = Rails.root)
diff --git a/app/helpers/social_helper/telegram_methods.rb b/app/helpers/social_helper/telegram_methods.rb
index ec13f9ea..046d2392 100644
--- a/app/helpers/social_helper/telegram_methods.rb
+++ b/app/helpers/social_helper/telegram_methods.rb
@@ -15,7 +15,7 @@ module SocialHelper::TelegramMethods
       id:       answer.id,
       username: answer.user.screen_name,
       host:     APP_CONFIG["hostname"],
-      protocol: (APP_CONFIG["https"] ? :https : :http)
+      protocol: (APP_CONFIG["https"] ? :https : :http),
     )
 
     %(https://t.me/share/url?url=#{CGI.escape(url)}&text=#{CGI.escape(telegram_text(answer))})
diff --git a/app/helpers/social_helper/tumblr_methods.rb b/app/helpers/social_helper/tumblr_methods.rb
index 868f31d3..683199b9 100644
--- a/app/helpers/social_helper/tumblr_methods.rb
+++ b/app/helpers/social_helper/tumblr_methods.rb
@@ -1,4 +1,6 @@
-require 'cgi'
+# frozen_string_literal: true
+
+require "cgi"
 
 module SocialHelper::TumblrMethods
   def tumblr_title(answer)
@@ -13,10 +15,10 @@ module SocialHelper::TumblrMethods
 
   def tumblr_body(answer)
     answer_url = answer_url(
-        id: answer.id,
-        username: answer.user.screen_name,
-        host: APP_CONFIG['hostname'],
-        protocol: (APP_CONFIG['https'] ? :https : :http)
+      id:       answer.id,
+      username: answer.user.screen_name,
+      host:     APP_CONFIG["hostname"],
+      protocol: (APP_CONFIG["https"] ? :https : :http),
     )
 
     "#{answer.content}\n\n[Smile or comment on the answer here](#{answer_url})"
@@ -24,10 +26,10 @@ module SocialHelper::TumblrMethods
 
   def tumblr_share_url(answer)
     answer_url = answer_url(
-      id: answer.id,
+      id:       answer.id,
       username: answer.user.screen_name,
-      host: APP_CONFIG['hostname'],
-      protocol: (APP_CONFIG['https'] ? :https : :http)
+      host:     APP_CONFIG["hostname"],
+      protocol: (APP_CONFIG["https"] ? :https : :http),
     )
 
     "https://www.tumblr.com/widgets/share/tool?shareSource=legacy&posttype=text&title=#{CGI.escape(tumblr_title(answer))}&url=#{CGI.escape(answer_url)}&caption=&content=#{CGI.escape(tumblr_body(answer))}"
diff --git a/app/helpers/social_helper/twitter_methods.rb b/app/helpers/social_helper/twitter_methods.rb
index 7f025f71..fd143392 100644
--- a/app/helpers/social_helper/twitter_methods.rb
+++ b/app/helpers/social_helper/twitter_methods.rb
@@ -1,21 +1,23 @@
-require 'cgi'
+# frozen_string_literal: true
+
+require "cgi"
 
 module SocialHelper::TwitterMethods
   include MarkdownHelper
 
   def prepare_tweet(answer, post_tag = nil)
-    question_content = twitter_markdown answer.question.content.gsub(/\@(\w+)/, '\1')
+    question_content = twitter_markdown answer.question.content.gsub(/@(\w+)/, '\1')
     original_question_length = question_content.length
     answer_content = twitter_markdown answer.content
     original_answer_length = answer_content.length
     answer_url = answer_url(
-      id: answer.id,
+      id:       answer.id,
       username: answer.user.screen_name,
-      host: APP_CONFIG['hostname'],
-      protocol: (APP_CONFIG['https'] ? :https : :http)
+      host:     APP_CONFIG["hostname"],
+      protocol: (APP_CONFIG["https"] ? :https : :http),
     )
 
-    parsed_tweet = { :valid => false }
+    parsed_tweet = { valid: false }
     tweet_text = ""
 
     until parsed_tweet[:valid]
@@ -23,14 +25,14 @@ module SocialHelper::TwitterMethods
       shortened_answer = "#{answer_content[0..123]}#{'…' if original_answer_length > [124, answer_content.length].min}"
       components = [
         shortened_question,
-        '—',
+        "—",
         shortened_answer,
         post_tag,
         answer_url
       ]
-      tweet_text = components.compact.join(' ')
+      tweet_text = components.compact.join(" ")
 
-      parsed_tweet = Twitter::TwitterText::Validation::parse_tweet(tweet_text)
+      parsed_tweet = Twitter::TwitterText::Validation.parse_tweet(tweet_text)
 
       question_content = question_content[0..-2]
       answer_content = answer_content[0..-2]
diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb
index 4c1a735f..9cd04910 100644
--- a/app/helpers/theme_helper.rb
+++ b/app/helpers/theme_helper.rb
@@ -25,7 +25,7 @@ module ThemeHelper
     "input_color"        => "input-bg",
     "input_text"         => "input-text",
     "input_placeholder"  => "input-placeholder",
-    "muted_text"         => "muted-text"
+    "muted_text"         => "muted-text",
   }.freeze
 
   def render_theme
diff --git a/spec/helpers/application_helper/graph_methods_spec.rb b/spec/helpers/application_helper/graph_methods_spec.rb
index 63baa848..1d79b78c 100644
--- a/spec/helpers/application_helper/graph_methods_spec.rb
+++ b/spec/helpers/application_helper/graph_methods_spec.rb
@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
-require 'rails_helper'
+require "rails_helper"
 
-describe ApplicationHelper::GraphMethods, :type => :helper do
+describe ApplicationHelper::GraphMethods, type: :helper do
   describe "#user_opengraph" do
     context "sample user" do
-      let(:user) { FactoryBot.create(:user,
-                                     profile: { display_name: 'Cunes',
-                                                description: 'A bunch of raccoons in a trenchcoat.' },
-                                     screen_name: 'raccoons') }
+      let(:user) do
+        FactoryBot.create(:user,
+                          profile:     { display_name: "Cunes",
+                                         description:  "A bunch of raccoons in a trenchcoat.", },
+                          screen_name: "raccoons",)
+      end
 
       subject { user_opengraph(user) }
 
-      it 'should generate a matching OpenGraph structure for a user' do
-        allow(APP_CONFIG).to receive(:[]).with('site_name').and_return('pineapplespring')
-        expect(subject).to eq(<<~EOS.chomp)
+      it "should generate a matching OpenGraph structure for a user" do
+        allow(APP_CONFIG).to receive(:[]).with("site_name").and_return("pineapplespring")
+        expect(subject).to eq(<<~META.chomp)
           <meta property="og:title" content="Cunes">
           <meta property="og:type" content="profile">
           <meta property="og:image" content="http://test.host/images/large/no_avatar.png">
@@ -22,55 +24,63 @@ describe ApplicationHelper::GraphMethods, :type => :helper do
           <meta property="og:description" content="A bunch of raccoons in a trenchcoat.">
           <meta property="og:site_name" content="pineapplespring">
           <meta property="profile:username" content="raccoons">
-        EOS
+        META
       end
     end
   end
 
   describe "#user_twitter_card" do
     context "sample user" do
-      let(:user) { FactoryBot.create(:user,
-                                     profile: {
-                                       display_name: '',
-                                       description: 'A bunch of raccoons in a trenchcoat.'},
-                                     screen_name: 'raccoons') }
+      let(:user) do
+        FactoryBot.create(:user,
+                          profile:     {
+                            display_name: "",
+                            description:  "A bunch of raccoons in a trenchcoat.",
+                          },
+                          screen_name: "raccoons",)
+      end
 
       subject { user_twitter_card(user) }
-      it 'should generate a matching OpenGraph structure for a user' do
-        expect(subject).to eq(<<~EOS.chomp)
+      it "should generate a matching OpenGraph structure for a user" do
+        expect(subject).to eq(<<~META.chomp)
           <meta name="twitter:card" content="summary">
           <meta name="twitter:site" content="@retrospring">
           <meta name="twitter:title" content="Ask me anything!">
           <meta name="twitter:description" content="Ask raccoons anything on Retrospring">
           <meta name="twitter:image" content="http://test.host/images/large/no_avatar.png">
-        EOS
+        META
       end
     end
   end
 
   describe "#answer_opengraph" do
     context "sample user and answer" do
-      let!(:user) { FactoryBot.create(:user,
-                                      profile: {
-                                        display_name: '',
-                                        description: 'A bunch of raccoons in a trenchcoat.'},
-                                     screen_name: 'raccoons') }
-      let(:answer) { FactoryBot.create(:answer,
-                                       user_id: user.id,) }
+      let!(:user) do
+        FactoryBot.create(:user,
+                          profile:     {
+                            display_name: "",
+                            description:  "A bunch of raccoons in a trenchcoat.",
+                          },
+                          screen_name: "raccoons",)
+      end
+      let(:answer) do
+        FactoryBot.create(:answer,
+                          user_id: user.id,)
+      end
 
       subject { answer_opengraph(answer) }
 
-      it 'should generate a matching OpenGraph structure for a user' do
-        allow(APP_CONFIG).to receive(:[]).with('site_name').and_return('pineapplespring')
-        expect(subject).to eq(<<~EOS.chomp)
+      it "should generate a matching OpenGraph structure for a user" do
+        allow(APP_CONFIG).to receive(:[]).with("site_name").and_return("pineapplespring")
+        expect(subject).to eq(<<~META.chomp)
           <meta property="og:title" content="raccoons answered: #{answer.question.content}">
           <meta property="og:type" content="article">
           <meta property="og:image" content="http://test.host/images/large/no_avatar.png">
           <meta property="og:url" content="http://test.host/@raccoons/a/#{answer.id}">
           <meta property="og:description" content="#{answer.content}">
           <meta property="og:site_name" content="pineapplespring">
-        EOS
+        META
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/helpers/application_helper/title_methods_spec.rb b/spec/helpers/application_helper/title_methods_spec.rb
index 2b3c8bf0..92dc74a8 100644
--- a/spec/helpers/application_helper/title_methods_spec.rb
+++ b/spec/helpers/application_helper/title_methods_spec.rb
@@ -12,8 +12,8 @@ describe ApplicationHelper::TitleMethods, type: :helper do
                  "anonymous_name" => "Anonymous",
                  "https"          => true,
                  "items_per_page" => 5,
-                 "sharing"        => {}
-               })
+                 "sharing"        => {},
+               },)
 
     user.profile.display_name = "Cool Man"
     user.profile.save!
@@ -42,7 +42,7 @@ describe ApplicationHelper::TitleMethods, type: :helper do
 
     context "user has custom anonymous display name" do
       before do
-        FactoryBot.create(:answer, question: question, user: user)
+        FactoryBot.create(:answer, question:, user:)
         user.profile.anon_display_name = "Amogus"
         user.profile.save!
       end
@@ -55,9 +55,9 @@ describe ApplicationHelper::TitleMethods, type: :helper do
 
   describe "#answer_title" do
     let(:answer) do
-      FactoryBot.create(:answer, user:             user,
+      FactoryBot.create(:answer, user:,
                                  content:          "a",
-                                 question_content: "q")
+                                 question_content: "q",)
     end
 
     it "should generate a proper title" do
diff --git a/spec/helpers/bootstrap_helper_spec.rb b/spec/helpers/bootstrap_helper_spec.rb
index 0f31f85e..2f335560 100644
--- a/spec/helpers/bootstrap_helper_spec.rb
+++ b/spec/helpers/bootstrap_helper_spec.rb
@@ -1,45 +1,47 @@
+# frozen_string_literal: true
+
 require "rails_helper"
 
-describe BootstrapHelper, :type => :helper do
+describe BootstrapHelper, type: :helper do
   include ActiveSupport::Testing::TimeHelpers
 
-  describe '#nav_entry' do
-    it 'should return a HTML navigation item which links to a given address' do
+  describe "#nav_entry" do
+    it "should return a HTML navigation item which links to a given address" do
       allow(self).to receive(:current_page?).and_return(false)
-      expect(nav_entry('Example', '/example')).to(
-        eq('<li class="nav-item "><a class="nav-link" href="/example">Example</a></li>')
+      expect(nav_entry("Example", "/example")).to(
+        eq('<li class="nav-item "><a class="nav-link" href="/example">Example</a></li>'),
       )
     end
 
-    it 'should return with an active attribute if the link matches the current URL' do
+    it "should return with an active attribute if the link matches the current URL" do
       allow(self).to receive(:current_page?).and_return(true)
-      expect(nav_entry('Example', '/example')).to(
-        eq('<li class="nav-item active "><a class="nav-link" href="/example">Example</a></li>')
+      expect(nav_entry("Example", "/example")).to(
+        eq('<li class="nav-item active "><a class="nav-link" href="/example">Example</a></li>'),
       )
     end
 
-    it 'should include an icon if given' do
+    it "should include an icon if given" do
       allow(self).to receive(:current_page?).and_return(false)
-      expect(nav_entry('Example', '/example', icon: 'beaker')).to(
-        eq('<li class="nav-item "><a class="nav-link" href="/example"><i class="fa fa-beaker"></i> Example</a></li>')
+      expect(nav_entry("Example", "/example", icon: "beaker")).to(
+        eq('<li class="nav-item "><a class="nav-link" href="/example"><i class="fa fa-beaker"></i> Example</a></li>'),
       )
     end
 
-    it 'should only include an icon if wanted' do
+    it "should only include an icon if wanted" do
       allow(self).to receive(:current_page?).and_return(false)
-      expect(nav_entry('Example', '/example', icon: 'beaker', icon_only: true)).to(
-        eq('<li class="nav-item "><a class="nav-link" href="/example"><i class="fa fa-beaker" title="Example"></i></a></li>')
+      expect(nav_entry("Example", "/example", icon: "beaker", icon_only: true)).to(
+        eq('<li class="nav-item "><a class="nav-link" href="/example"><i class="fa fa-beaker" title="Example"></i></a></li>'),
       )
     end
 
-    it 'should include a badge if given' do
+    it "should include a badge if given" do
       allow(self).to receive(:current_page?).and_return(false)
-      expect(nav_entry('Example', '/example', badge: 3)).to(
-        eq('<li class="nav-item "><a class="nav-link" href="/example">Example <span class="badge">3</span></a></li>')
+      expect(nav_entry("Example", "/example", badge: 3)).to(
+        eq('<li class="nav-item "><a class="nav-link" href="/example">Example <span class="badge">3</span></a></li>'),
       )
 
-      expect(nav_entry('Example', '/example', badge: 3, badge_color: 'primary', badge_pill: true)).to(
-        eq('<li class="nav-item "><a class="nav-link" href="/example">Example <span class="badge badge-primary badge-pill">3</span></a></li>')
+      expect(nav_entry("Example", "/example", badge: 3, badge_color: "primary", badge_pill: true)).to(
+        eq('<li class="nav-item "><a class="nav-link" href="/example">Example <span class="badge badge-primary badge-pill">3</span></a></li>'),
       )
     end
 
@@ -52,51 +54,51 @@ describe BootstrapHelper, :type => :helper do
   end
 
   describe "#list_group_item" do
-    it 'should return a HTML navigation item which links to a given address' do
+    it "should return a HTML navigation item which links to a given address" do
       allow(self).to receive(:current_page?).and_return(false)
-      expect(list_group_item('Example', '/example')).to(
-        eq('<a href="/example" class="list-group-item list-group-item-action ">Example</a>')
+      expect(list_group_item("Example", "/example")).to(
+        eq('<a href="/example" class="list-group-item list-group-item-action ">Example</a>'),
       )
     end
 
-    it 'should return with an active attribute if the link matches the current URL' do
+    it "should return with an active attribute if the link matches the current URL" do
       allow(self).to receive(:current_page?).and_return(true)
-      expect(list_group_item('Example', '/example')).to(
-        eq('<a href="/example" class="list-group-item list-group-item-action active ">Example</a>')
+      expect(list_group_item("Example", "/example")).to(
+        eq('<a href="/example" class="list-group-item list-group-item-action active ">Example</a>'),
       )
     end
 
-    it 'should include a badge if given' do
+    it "should include a badge if given" do
       allow(self).to receive(:current_page?).and_return(false)
-      expect(list_group_item('Example', '/example', badge: 3)).to(
-        eq('<a href="/example" class="list-group-item list-group-item-action ">Example <span class="badge">3</span></a>')
+      expect(list_group_item("Example", "/example", badge: 3)).to(
+        eq('<a href="/example" class="list-group-item list-group-item-action ">Example <span class="badge">3</span></a>'),
       )
     end
   end
 
   describe "#bootstrap_color" do
-    it 'should map error and alert to danger' do
+    it "should map error and alert to danger" do
       expect(bootstrap_color("error")).to eq("danger")
       expect(bootstrap_color("alert")).to eq("danger")
     end
 
-    it 'should map notice to info' do
+    it "should map notice to info" do
       expect(bootstrap_color("notice")).to eq("info")
     end
 
-    it 'should return any uncovered value' do
+    it "should return any uncovered value" do
       expect(bootstrap_color("success")).to eq("success")
     end
   end
 
   describe "#tooltip" do
-    it 'should return the proper markup' do
+    it "should return the proper markup" do
       expect(tooltip("Example Text", "This is in a tooltip")).to eq("<span title=\"This is in a tooltip\" data-bs-toggle=\"tooltip\" data-bs-placement=\"bottom\">Example Text</span>")
     end
   end
 
   describe "#time_tooltip" do
-    it 'should return a tooltip with proper time values' do
+    it "should return a tooltip with proper time values" do
       travel_to(Time.utc(1984)) do
         @user = FactoryBot.create(:user)
         travel 10.minutes
@@ -107,7 +109,7 @@ describe BootstrapHelper, :type => :helper do
   end
 
   describe "#hidespan" do
-    it 'should return the proper markup' do
+    it "should return the proper markup" do
       expect(hidespan("Hidden Text", "d-none")).to eq("<span class=\"d-none\">Hidden Text</span>")
     end
   end
diff --git a/spec/helpers/feedback_helper_spec.rb b/spec/helpers/feedback_helper_spec.rb
index 13d2245e..c5aa16df 100644
--- a/spec/helpers/feedback_helper_spec.rb
+++ b/spec/helpers/feedback_helper_spec.rb
@@ -11,9 +11,9 @@ describe FeedbackHelper, type: :helper do
                  "canny"          => {
                    sso:           "sso",
                    feature_board: "feature",
-                   bug_board:     "bug"
-                 }
-               })
+                   bug_board:     "bug",
+                 },
+               },)
   end
 
   describe "#canny_token" do
diff --git a/spec/helpers/markdown_helper_spec.rb b/spec/helpers/markdown_helper_spec.rb
index b4c22b76..39270551 100644
--- a/spec/helpers/markdown_helper_spec.rb
+++ b/spec/helpers/markdown_helper_spec.rb
@@ -10,8 +10,8 @@ describe MarkdownHelper, type: :helper do
                  "items_per_page" => 5,
                  "allowed_hosts"  => [
                    "twitter.com"
-                 ]
-               })
+                 ],
+               },)
   end
 
   describe "#markdown" do
diff --git a/spec/helpers/social_helper/telegram_methods_spec.rb b/spec/helpers/social_helper/telegram_methods_spec.rb
index 5e180373..3a72cff8 100644
--- a/spec/helpers/social_helper/telegram_methods_spec.rb
+++ b/spec/helpers/social_helper/telegram_methods_spec.rb
@@ -9,7 +9,7 @@ describe SocialHelper::TelegramMethods, type: :helper do
       :answer,
       user:,
       content:          "this is an answer\nwith multiple lines\nand **FORMATTING**",
-      question_content: "this is a question .... or is it?"
+      question_content: "this is a question .... or is it?",
     )
   end
 
@@ -18,7 +18,7 @@ describe SocialHelper::TelegramMethods, type: :helper do
                  "hostname"       => "example.com",
                  "https"          => true,
                  "items_per_page" => 5,
-               })
+               },)
   end
 
   describe "#telegram_text" do
diff --git a/spec/helpers/social_helper/tumblr_methods_spec.rb b/spec/helpers/social_helper/tumblr_methods_spec.rb
index 512a35e7..29ba43d0 100644
--- a/spec/helpers/social_helper/tumblr_methods_spec.rb
+++ b/spec/helpers/social_helper/tumblr_methods_spec.rb
@@ -1,33 +1,35 @@
 # frozen_string_literal: true
 
-require 'rails_helper'
+require "rails_helper"
 
-describe SocialHelper::TumblrMethods, :type => :helper do
+describe SocialHelper::TumblrMethods, type: :helper do
   let(:user) { FactoryBot.create(:user) }
-  let(:answer) { FactoryBot.create(:answer, user: user,
-                                    content: 'aaaa',
-                                    question_content: 'q') }
+  let(:answer) do
+    FactoryBot.create(:answer, user:,
+                               content:          "aaaa",
+                               question_content: "q",)
+  end
 
   before do
     stub_const("APP_CONFIG", {
-      'hostname' => 'example.com',
-      'anonymous_name' => 'Anonymous',
-      'https' => true,
-      'items_per_page' => 5,
-      'sharing' => {}
-    })
+                 "hostname"       => "example.com",
+                 "anonymous_name" => "Anonymous",
+                 "https"          => true,
+                 "items_per_page" => 5,
+                 "sharing"        => {},
+               },)
   end
 
-  describe '#tumblr_title' do
-    context 'Asker is anonymous' do
+  describe "#tumblr_title" do
+    context "Asker is anonymous" do
       subject { tumblr_title(answer) }
 
-      it 'should return a proper title' do
-        expect(subject).to eq('Anonymous asked: q')
+      it "should return a proper title" do
+        expect(subject).to eq("Anonymous asked: q")
       end
     end
 
-    context 'Asker is known' do
+    context "Asker is known" do
       before do
         @user = FactoryBot.create(:user)
         answer.question.user = @user
@@ -36,24 +38,24 @@ describe SocialHelper::TumblrMethods, :type => :helper do
 
       subject { tumblr_title(answer) }
 
-      it 'should return a proper title' do
+      it "should return a proper title" do
         expect(subject).to eq("#{answer.question.user.profile.display_name} asked: q")
       end
     end
   end
 
-  describe '#tumblr_body' do
+  describe "#tumblr_body" do
     subject { tumblr_body(answer) }
 
-    it 'should return a proper body' do
+    it "should return a proper body" do
       expect(subject).to eq("aaaa\n\n[Smile or comment on the answer here](https://example.com/@#{answer.user.screen_name}/a/#{answer.id})")
     end
   end
 
-  describe '#tumblr_share_url' do
+  describe "#tumblr_share_url" do
     subject { tumblr_share_url(answer) }
 
-    it 'should return a proper share link' do
+    it "should return a proper share link" do
       expect(subject).to eq("https://www.tumblr.com/widgets/share/tool?shareSource=legacy&posttype=text&title=#{CGI.escape(tumblr_title(answer))}&url=#{CGI.escape("https://example.com/@#{answer.user.screen_name}/a/#{answer.id}")}&caption=&content=#{CGI.escape(tumblr_body(answer))}")
     end
   end
diff --git a/spec/helpers/social_helper/twitter_methods_spec.rb b/spec/helpers/social_helper/twitter_methods_spec.rb
index 7074f6e6..cd97fdcc 100644
--- a/spec/helpers/social_helper/twitter_methods_spec.rb
+++ b/spec/helpers/social_helper/twitter_methods_spec.rb
@@ -1,72 +1,74 @@
 # frozen_string_literal: true
 
-require 'rails_helper'
+require "rails_helper"
 
-describe SocialHelper::TwitterMethods, :type => :helper do
+describe SocialHelper::TwitterMethods, type: :helper do
   let(:user) { FactoryBot.create(:user) }
-  let(:question_content) { 'q' * 255 }
-  let(:answer_content) { 'a' * 255 }
-  let(:answer) { FactoryBot.create(:answer, user: user,
-                                   content: answer_content,
-                                   question_content: question_content) }
+  let(:question_content) { "q" * 255 }
+  let(:answer_content) { "a" * 255 }
+  let(:answer) do
+    FactoryBot.create(:answer, user:,
+                               content:          answer_content,
+                               question_content:,)
+  end
 
   before do
     stub_const("APP_CONFIG", {
-      'hostname' => 'example.com',
-      'https' => true,
-      'items_per_page' => 5
-    })
+                 "hostname"       => "example.com",
+                 "https"          => true,
+                 "items_per_page" => 5,
+               },)
   end
 
-  describe '#prepare_tweet' do
-    context 'when the question and answer need to be shortened' do
+  describe "#prepare_tweet" do
+    context "when the question and answer need to be shortened" do
       subject { prepare_tweet(answer) }
 
-      it 'should return a properly formatted tweet' do
+      it "should return a properly formatted tweet" do
         expect(subject).to eq("#{'q' * 123}… — #{'a' * 124}… https://example.com/@#{user.screen_name}/a/#{answer.id}")
       end
     end
 
-    context 'when a suffix has been passed' do
-      let(:question_content) { 'question' }
-      let(:answer_content) { 'answer' }
+    context "when a suffix has been passed" do
+      let(:question_content) { "question" }
+      let(:answer_content) { "answer" }
 
-      subject { prepare_tweet(answer, '#askracc') }
+      subject { prepare_tweet(answer, "#askracc") }
 
-      it 'should include the suffix after the link' do
+      it "should include the suffix after the link" do
         expect(subject).to eq("question — answer #askracc https://example.com/@#{user.screen_name}/a/#{answer.id}")
       end
     end
 
-    context 'when a suffix has been passed and the tweet needs to be shortened' do
-      subject { prepare_tweet(answer, '#askracc') }
+    context "when a suffix has been passed and the tweet needs to be shortened" do
+      subject { prepare_tweet(answer, "#askracc") }
 
-      it 'should shorten the tweet while keeping the suffix intact' do
+      it "should shorten the tweet while keeping the suffix intact" do
         expect(subject).to eq("#{'q' * 120}… — #{'a' * 120}… #askracc https://example.com/@#{user.screen_name}/a/#{answer.id}")
       end
     end
 
-    context 'when the question and answer are short' do
+    context "when the question and answer are short" do
       before do
-        answer.question.content = 'Why are raccoons so good?'
+        answer.question.content = "Why are raccoons so good?"
         answer.question.save!
-        answer.content = 'Because they are good cunes.'
+        answer.content = "Because they are good cunes."
         answer.save!
       end
 
       subject { prepare_tweet(answer) }
 
-      it 'should return a properly formatted tweet' do
+      it "should return a properly formatted tweet" do
         expect(subject).to eq("#{answer.question.content} — #{answer.content} https://example.com/@#{user.screen_name}/a/#{answer.id}")
       end
     end
   end
 
-  describe '#twitter_share_url' do
+  describe "#twitter_share_url" do
     subject { twitter_share_url(answer) }
 
-    it 'should return a proper share link' do
+    it "should return a proper share link" do
       expect(subject).to eq("https://twitter.com/intent/tweet?text=#{CGI.escape(prepare_tweet(answer))}")
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/helpers/social_helper_spec.rb b/spec/helpers/social_helper_spec.rb
index 1c165eb0..b56d6ab3 100644
--- a/spec/helpers/social_helper_spec.rb
+++ b/spec/helpers/social_helper_spec.rb
@@ -18,8 +18,7 @@ describe SocialHelper, type: :helper do
                  "hostname"       => "example.com",
                  "https"          => true,
                  "items_per_page" => 5,
-               },
-              )
+               },)
   end
 
   describe "#answer_share_url" do
diff --git a/spec/helpers/theme_helper_spec.rb b/spec/helpers/theme_helper_spec.rb
index 3a72ed34..f7de9441 100644
--- a/spec/helpers/theme_helper_spec.rb
+++ b/spec/helpers/theme_helper_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe ThemeHelper, :type => :helper do
+describe ThemeHelper, type: :helper do
   describe "#render_theme" do
     context "when target page doesn't have a theme" do
       it "returns no theme" do
@@ -18,7 +18,7 @@ describe ThemeHelper, :type => :helper do
       end
 
       it "returns a theme" do
-        expect(helper.render_theme).to include('<style>:root {')
+        expect(helper.render_theme).to include("<style>:root {")
       end
 
       it "contains correct theme background colors" do
@@ -193,12 +193,12 @@ describe ThemeHelper, :type => :helper do
     end
   end
 
-  describe '#theme_color' do
+  describe "#theme_color" do
     subject { helper.theme_color }
 
-    context 'when user is signed in' do
+    context "when user is signed in" do
       let(:user) { FactoryBot.create(:user) }
-      let(:theme) { FactoryBot.create(:theme, user: user) }
+      let(:theme) { FactoryBot.create(:theme, user:) }
 
       before(:each) do
         user.theme = theme
@@ -206,24 +206,24 @@ describe ThemeHelper, :type => :helper do
         sign_in(user)
       end
 
-      it 'should return the user theme\'s primary color' do
-        expect(subject).to eq('#8e8cd8')
+      it "should return the user theme's primary color" do
+        expect(subject).to eq("#8e8cd8")
       end
     end
 
-    context 'user is not signed in' do
-      it 'should return the default primary color' do
-        expect(subject).to eq('#5e35b1')
+    context "user is not signed in" do
+      it "should return the default primary color" do
+        expect(subject).to eq("#5e35b1")
       end
     end
   end
 
-  describe '#mobile_theme_color' do
+  describe "#mobile_theme_color" do
     subject { helper.mobile_theme_color }
 
-    context 'when user is signed in' do
+    context "when user is signed in" do
       let(:user) { FactoryBot.create(:user) }
-      let(:theme) { FactoryBot.create(:theme, user: user) }
+      let(:theme) { FactoryBot.create(:theme, user:) }
 
       before(:each) do
         user.theme = theme
@@ -231,14 +231,14 @@ describe ThemeHelper, :type => :helper do
         sign_in(user)
       end
 
-      it 'should return the user theme\'s background color' do
-        expect(subject).to eq('#c6c5eb')
+      it "should return the user theme's background color" do
+        expect(subject).to eq("#c6c5eb")
       end
     end
 
-    context 'user is not signed in' do
-      it 'should return the default background color' do
-        expect(subject).to eq('#f0edf4')
+    context "user is not signed in" do
+      it "should return the default background color" do
+        expect(subject).to eq("#f0edf4")
       end
     end
   end
diff --git a/spec/helpers/user_helper_spec.rb b/spec/helpers/user_helper_spec.rb
index 254c6b6e..e30fb498 100644
--- a/spec/helpers/user_helper_spec.rb
+++ b/spec/helpers/user_helper_spec.rb
@@ -6,10 +6,10 @@ describe UserHelper, type: :helper do
   describe "#user_screen_name" do
     subject do
       helper.user_screen_name(user,
-                              context_user:      context_user,
-                              author_identifier: author_identifier,
-                              url:               url,
-                              link_only:         link_only)
+                              context_user:,
+                              author_identifier:,
+                              url:,
+                              link_only:,)
     end
 
     let(:user) { FactoryBot.create(:user) }
@@ -20,8 +20,8 @@ describe UserHelper, type: :helper do
 
     before do
       stub_const("APP_CONFIG", {
-                   "anonymous_name" => "Anonymous"
-                 })
+                   "anonymous_name" => "Anonymous",
+                 },)
     end
 
     context "moderation view enabled" do
@@ -80,7 +80,7 @@ describe UserHelper, type: :helper do
       context "author is anonymous" do
         let(:author_identifier) { "some_identifier" }
 
-        let(:context_user) { FactoryBot.create(:user, profile: { anon_display_name: anon_display_name }) }
+        let(:context_user) { FactoryBot.create(:user, profile: { anon_display_name: }) }
         context "context user has custom anonymous name" do
           let(:anon_display_name) { "Sneaky Raccoon" }
 

From 86f9fe067103c2f5b8481c433ee735c3b8fa5a50 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 18 Oct 2023 23:27:58 +0200
Subject: [PATCH 104/590] Ignore large lint fix commits in blame views

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000..19dece1d
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1 @@
+71894d6c4987547533606258447b576ecb604c2b

From f95e11cffcc5a97634e9a26ff3535ac86f027b63 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 19 Oct 2023 23:53:21 +0200
Subject: [PATCH 105/590] Fix rubocop nits

---
 app/helpers/social_helper/twitter_methods.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/social_helper/twitter_methods.rb b/app/helpers/social_helper/twitter_methods.rb
index 6c7649ca..61ce366a 100644
--- a/app/helpers/social_helper/twitter_methods.rb
+++ b/app/helpers/social_helper/twitter_methods.rb
@@ -4,13 +4,13 @@ require "cgi"
 
 module SocialHelper::TwitterMethods
   include MarkdownHelper
-  
+
   def prepare_tweet(answer, post_tag = nil, omit_url = false)
     question_content = twitter_markdown answer.question.content.gsub(/@(\w+)/, '\1')
     original_question_length = question_content.length
     answer_content = twitter_markdown answer.content
     original_answer_length = answer_content.length
-    
+
     unless omit_url
       answer_url = answer_url(
         id:       answer.id,

From 50b925ec48ae0c16f345ac8d63a36bf4239e5ed7 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 02:21:52 +0200
Subject: [PATCH 106/590] Prefer render responders in settings controllers

---
 app/controllers/settings/privacy_controller.rb       | 2 +-
 app/controllers/settings/profile_controller.rb       | 2 +-
 app/controllers/settings/theme_controller.rb         | 2 +-
 spec/controllers/settings/privacy_controller_spec.rb | 4 ++--
 spec/controllers/settings/profile_controller_spec.rb | 2 +-
 spec/controllers/settings/theme_controller_spec.rb   | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/settings/privacy_controller.rb b/app/controllers/settings/privacy_controller.rb
index a4980d25..99d63515 100644
--- a/app/controllers/settings/privacy_controller.rb
+++ b/app/controllers/settings/privacy_controller.rb
@@ -19,6 +19,6 @@ class Settings::PrivacyController < ApplicationController
     else
       flash[:error] = t(".error")
     end
-    redirect_to settings_privacy_path
+    render :edit
   end
 end
diff --git a/app/controllers/settings/profile_controller.rb b/app/controllers/settings/profile_controller.rb
index 75091ed0..81344ca3 100644
--- a/app/controllers/settings/profile_controller.rb
+++ b/app/controllers/settings/profile_controller.rb
@@ -14,6 +14,6 @@ class Settings::ProfileController < ApplicationController
       flash[:error] = t(".error")
     end
 
-    redirect_to settings_profile_path
+    render :edit
   end
 end
diff --git a/app/controllers/settings/theme_controller.rb b/app/controllers/settings/theme_controller.rb
index 58829a67..94c87192 100644
--- a/app/controllers/settings/theme_controller.rb
+++ b/app/controllers/settings/theme_controller.rb
@@ -22,7 +22,7 @@ class Settings::ThemeController < ApplicationController
     else
       flash[:error] = t(".error", errors: current_user.theme.errors.messages.flatten.join(" "))
     end
-    redirect_to settings_theme_path
+    render :edit
   end
 
   def destroy
diff --git a/spec/controllers/settings/privacy_controller_spec.rb b/spec/controllers/settings/privacy_controller_spec.rb
index ad47b751..6ca5a979 100644
--- a/spec/controllers/settings/privacy_controller_spec.rb
+++ b/spec/controllers/settings/privacy_controller_spec.rb
@@ -13,7 +13,7 @@ describe Settings::PrivacyController, type: :controller do
 
       it "renders the edit template" do
         subject
-        expect(response).to render_template("edit")
+        expect(response).to render_template(:edit)
       end
     end
   end
@@ -43,7 +43,7 @@ describe Settings::PrivacyController, type: :controller do
 
       it "redirects to the privacy settings page" do
         subject
-        expect(response).to redirect_to(:settings_privacy)
+        expect(response).to render_template(:edit)
       end
     end
   end
diff --git a/spec/controllers/settings/profile_controller_spec.rb b/spec/controllers/settings/profile_controller_spec.rb
index 299fecf7..f91b7eb4 100644
--- a/spec/controllers/settings/profile_controller_spec.rb
+++ b/spec/controllers/settings/profile_controller_spec.rb
@@ -37,7 +37,7 @@ describe Settings::ProfileController, type: :controller do
 
       it "redirects to the edit_user_profile page" do
         subject
-        expect(response).to redirect_to(:settings_profile)
+        expect(response).to render_template(:edit)
       end
     end
   end
diff --git a/spec/controllers/settings/theme_controller_spec.rb b/spec/controllers/settings/theme_controller_spec.rb
index a2d4451e..bf25644f 100644
--- a/spec/controllers/settings/theme_controller_spec.rb
+++ b/spec/controllers/settings/theme_controller_spec.rb
@@ -61,7 +61,7 @@ describe Settings::ThemeController, type: :controller do
 
         it "renders the edit template" do
           subject
-          expect(response).to redirect_to(:settings_theme)
+          expect(response).to render_template(:edit)
         end
       end
 
@@ -75,7 +75,7 @@ describe Settings::ThemeController, type: :controller do
 
         it "renders the edit template" do
           subject
-          expect(response).to redirect_to(:settings_theme)
+          expect(response).to render_template(:edit)
         end
       end
     end

From 8ddfd903f3418f07b6249cdb8247bd180b451d88 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 12 Feb 2023 19:04:07 +0100
Subject: [PATCH 107/590] Bump rails to 7.0.4.2

---
 Gemfile      |   2 +-
 Gemfile.lock | 132 +++++++++++++++++++++++++++------------------------
 2 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/Gemfile b/Gemfile
index 63e2ae23..810499c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "i18n-js", "4.0"
-gem "rails", "~> 6.1"
+gem "rails", "~> 7.0"
 gem "rails-i18n", "~> 7.0"
 
 gem "cssbundling-rails", "~> 1.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index c9dfd28f..adbc4b05 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,40 +17,47 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actioncable (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionmailbox (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activestorage (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      actionview (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.6)
-      actionview (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.4.2)
+      actionview (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actiontext (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activestorage (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionview (7.0.4.2)
+      activesupport (= 7.0.4.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -58,26 +65,26 @@ GEM
     active_model_otp (2.3.2)
       activemodel
       rotp (~> 6.2.0)
-    activejob (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activejob (7.0.4.2)
+      activesupport (= 7.0.4.2)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activemodel (7.0.4.2)
+      activesupport (= 7.0.4.2)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activestorage (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activerecord (7.0.4.2)
+      activemodel (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activestorage (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.6)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -159,7 +166,7 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     excon (0.104.0)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
@@ -188,7 +195,7 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (1.1.0)
-    glob (0.3.1)
+    glob (0.4.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     haml (6.2.3)
@@ -211,7 +218,7 @@ GEM
     i18n-js (4.0.0)
       glob
       i18n
-    idn-ruby (0.1.4)
+    idn-ruby (0.1.5)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
@@ -234,8 +241,8 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     language_server-protocol (3.17.0.3)
-    launchy (2.5.0)
-      addressable (~> 2.7)
+    launchy (2.5.2)
+      addressable (~> 2.8)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     lograge (0.14.0)
@@ -302,20 +309,20 @@ GEM
     rack (2.2.8)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.6)
-      actioncable (= 6.1.7.6)
-      actionmailbox (= 6.1.7.6)
-      actionmailer (= 6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actiontext (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    rails (7.0.4.2)
+      actioncable (= 7.0.4.2)
+      actionmailbox (= 7.0.4.2)
+      actionmailer (= 7.0.4.2)
+      actionpack (= 7.0.4.2)
+      actiontext (= 7.0.4.2)
+      actionview (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activemodel (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activestorage (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.6)
+      railties (= 7.0.4.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -337,16 +344,17 @@ GEM
       nested_form (~> 0.3)
       rails (>= 6.0, < 8)
       turbo-rails (~> 1.0)
-    railties (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    railties (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
     redcarpet (3.6.0)
-    redis (4.8.0)
+    redis (4.8.1)
     regexp_parser (2.8.2)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -482,7 +490,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     warden (1.2.9)
@@ -547,7 +555,7 @@ DEPENDENCIES
   puma
   pundit (~> 2.3)
   questiongenerator (~> 1.1)
-  rails (~> 6.1)
+  rails (~> 7.0)
   rails-controller-testing
   rails-i18n (~> 7.0)
   rails_admin

From 488ab85653a2df4b5fd048493d58ebaaf611327c Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 12 Feb 2023 19:05:05 +0100
Subject: [PATCH 108/590] Adjust autoloading

---
 config/application.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index e832eb9e..a92cf4cb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -27,12 +27,14 @@ module Justask
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    config.load_defaults 6.0
+    config.load_defaults 7.0
     # add `lib/` to the autoload paths so zeitwerk can find e.g. our `UseCase`s
     # without an explicit `require`, and also take care of hot reloading the code
     # (really useful in development!)
-    config.autoload_paths << config.root.join("lib")
+    config.autoload_once_paths << config.root.join("lib")
     config.eager_load_paths << config.root.join("lib")
+    # This lowers memory usage from Bootsnap
+    config.add_autoload_paths_to_load_path = false
 
     # Use Sidekiq for background jobs
     config.active_job.queue_adapter = :sidekiq

From 6e7c625f3fbb92f780157a486d29b2c5d1710a0c Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 12 Feb 2023 19:05:15 +0100
Subject: [PATCH 109/590] Stub out Trix editor

---
 app/assets/config/actiontext.js  | 1 +
 app/assets/config/trix.js        | 1 +
 app/assets/stylesheets/trix.scss | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 app/assets/config/actiontext.js
 create mode 100644 app/assets/config/trix.js
 create mode 100644 app/assets/stylesheets/trix.scss

diff --git a/app/assets/config/actiontext.js b/app/assets/config/actiontext.js
new file mode 100644
index 00000000..9da9b2bc
--- /dev/null
+++ b/app/assets/config/actiontext.js
@@ -0,0 +1 @@
+// This is a stub so that we don't have to install actiontext
diff --git a/app/assets/config/trix.js b/app/assets/config/trix.js
new file mode 100644
index 00000000..915e526b
--- /dev/null
+++ b/app/assets/config/trix.js
@@ -0,0 +1 @@
+// This is a stub so that we don't have to install Trix
diff --git a/app/assets/stylesheets/trix.scss b/app/assets/stylesheets/trix.scss
new file mode 100644
index 00000000..915e526b
--- /dev/null
+++ b/app/assets/stylesheets/trix.scss
@@ -0,0 +1 @@
+// This is a stub so that we don't have to install Trix

From 23dc19a665fda5a62cd35eaaf820070b93fa901c Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 14 Feb 2023 12:47:09 +0100
Subject: [PATCH 110/590] Add cookie rotation for switching from SHA1 to SHA256

---
 config/initializers/cookie_rotator.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 config/initializers/cookie_rotator.rb

diff --git a/config/initializers/cookie_rotator.rb b/config/initializers/cookie_rotator.rb
new file mode 100644
index 00000000..65a33147
--- /dev/null
+++ b/config/initializers/cookie_rotator.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+Rails.application.config.after_initialize do
+  Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies|
+    salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt
+    secret_key_base = Rails.application.secret_key_base
+
+    key_generator = ActiveSupport::KeyGenerator.new(
+      secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1
+    )
+    key_len = ActiveSupport::MessageEncryptor.key_len
+    secret = key_generator.generate_key(salt, key_len)
+
+    cookies.rotate :encrypted, secret
+  end
+end

From 13e6943fc6eda3ba47b2dd11efa6fcd4e7ae5cbc Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 20 Oct 2023 09:39:52 +0200
Subject: [PATCH 111/590] Bump rails to 7.0.8

---
 Gemfile      |   2 +-
 Gemfile.lock | 154 +++++++++++++++++++++++++--------------------------
 2 files changed, 77 insertions(+), 79 deletions(-)

diff --git a/Gemfile b/Gemfile
index 810499c5..e1d1eb41 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "i18n-js", "4.0"
-gem "rails", "~> 7.0"
+gem "rails", "~> 7.0.8"
 gem "rails-i18n", "~> 7.0"
 
 gem "cssbundling-rails", "~> 1.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index adbc4b05..ce5431b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,47 +17,47 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4.2)
-      actionpack (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4.2)
-      actionpack (= 7.0.4.2)
-      activejob (= 7.0.4.2)
-      activerecord (= 7.0.4.2)
-      activestorage (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
+    actionmailbox (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.4.2)
-      actionpack (= 7.0.4.2)
-      actionview (= 7.0.4.2)
-      activejob (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
+    actionmailer (7.0.8)
+      actionpack (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4.2)
-      actionview (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4.2)
-      actionpack (= 7.0.4.2)
-      activerecord (= 7.0.4.2)
-      activestorage (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
+    actiontext (7.0.8)
+      actionpack (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4.2)
-      activesupport (= 7.0.4.2)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -65,31 +65,30 @@ GEM
     active_model_otp (2.3.2)
       activemodel
       rotp (~> 6.2.0)
-    activejob (7.0.4.2)
-      activesupport (= 7.0.4.2)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemodel (7.0.4.2)
-      activesupport (= 7.0.4.2)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (7.0.4.2)
-      activemodel (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
-    activestorage (7.0.4.2)
-      actionpack (= 7.0.4.2)
-      activejob (= 7.0.4.2)
-      activerecord (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activestorage (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activesupport (= 7.0.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.4.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
@@ -103,9 +102,9 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
-    bootstrap_form (5.1.0)
-      actionpack (>= 5.2)
-      activemodel (>= 5.2)
+    bootstrap_form (5.3.2)
+      actionpack (>= 6.1)
+      activemodel (>= 6.1)
     builder (3.2.4)
     bullet (7.1.2)
       activesupport (>= 3.0.0)
@@ -141,15 +140,15 @@ GEM
     devise-async (1.0.0)
       activejob (>= 5.0)
       devise (>= 4.0)
-    devise-i18n (1.10.3)
-      devise (>= 4.8.0)
+    devise-i18n (1.12.0)
+      devise (>= 4.9.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    dry-core (1.0.0)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
     dry-inflector (1.0.0)
@@ -174,9 +173,9 @@ GEM
     fake_email_validator (1.0.11)
       activemodel
       mail
-    faker (3.1.1)
+    faker (3.2.1)
       i18n (>= 1.8.11, < 2)
-    ffi (1.15.5)
+    ffi (1.16.3)
     fog-aws (3.21.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
@@ -259,7 +258,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0808)
+    mime-types-data (3.2023.1003)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
@@ -267,13 +266,13 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.4)
     minitest (5.20.0)
-    msgpack (1.6.0)
+    msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     nested_form (0.3.2)
-    net-http-persistent (4.0.1)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-http2 (0.18.4)
+    net-http2 (0.18.5)
       http-2 (~> 0.11)
     net-imap (0.4.1)
       date
@@ -309,21 +308,20 @@ GEM
     rack (2.2.8)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.4.2)
-      actioncable (= 7.0.4.2)
-      actionmailbox (= 7.0.4.2)
-      actionmailer (= 7.0.4.2)
-      actionpack (= 7.0.4.2)
-      actiontext (= 7.0.4.2)
-      actionview (= 7.0.4.2)
-      activejob (= 7.0.4.2)
-      activemodel (= 7.0.4.2)
-      activerecord (= 7.0.4.2)
-      activestorage (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
+    rails (7.0.8)
+      actioncable (= 7.0.8)
+      actionmailbox (= 7.0.8)
+      actionmailer (= 7.0.8)
+      actionpack (= 7.0.8)
+      actiontext (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activemodel (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       bundler (>= 1.15.0)
-      railties (= 7.0.4.2)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.8)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -344,9 +342,9 @@ GEM
       nested_form (~> 0.3)
       rails (>= 6.0, < 8)
       turbo-rails (~> 1.0)
-    railties (7.0.4.2)
-      actionpack (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -364,7 +362,7 @@ GEM
     rexml (3.2.6)
     rolify (6.0.1)
     rotp (6.2.2)
-    rouge (4.1.2)
+    rouge (4.1.3)
     rpush (7.0.1)
       activesupport (>= 5.2)
       jwt (>= 1.5.6)
@@ -423,7 +421,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.0)
       ffi (~> 1.12)
     rubyzip (2.3.2)
     sanitize (6.1.0)
@@ -437,17 +435,17 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-rails (5.10.0)
+    sentry-rails (5.12.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.10.0)
-    sentry-ruby (5.10.0)
+      sentry-ruby (~> 5.12.0)
+    sentry-ruby (5.12.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.10.0)
-      sentry-ruby (~> 5.10.0)
+    sentry-sidekiq (5.12.0)
+      sentry-ruby (~> 5.12.0)
       sidekiq (>= 3.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.5.8)
+    sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
@@ -473,7 +471,7 @@ GEM
       sprockets (>= 3.0.0)
     sysexits (1.2.0)
     temple (0.10.3)
-    thor (1.2.2)
+    thor (1.3.0)
     tilt (2.3.0)
     timeout (0.4.0)
     tldv (0.1.0)
@@ -555,7 +553,7 @@ DEPENDENCIES
   puma
   pundit (~> 2.3)
   questiongenerator (~> 1.1)
-  rails (~> 7.0)
+  rails (~> 7.0.8)
   rails-controller-testing
   rails-i18n (~> 7.0)
   rails_admin

From e21f5cb39d8f67ee6f4ab14cb61f0bcf5494d1ef Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 20 Oct 2023 09:41:03 +0200
Subject: [PATCH 112/590] Remove spring

Spring is no longer included with Rails by default
See https://rubyonrails.org/2021/12/15/Rails-7-fulfilling-a-vision#a-few-other-highlights
---
 Gemfile      | 1 -
 Gemfile.lock | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index e1d1eb41..706e2ba6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,6 @@ gem "jwt", "~> 2.7"
 
 group :development do
   gem "binding_of_caller"
-  gem "spring", "~> 4.1"
 end
 
 gem "puma"
diff --git a/Gemfile.lock b/Gemfile.lock
index ce5431b3..0fdfc9eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -461,7 +461,6 @@ GEM
       json
       simplecov
     simplecov_json_formatter (0.1.4)
-    spring (4.1.1)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -580,7 +579,6 @@ DEPENDENCIES
   simplecov
   simplecov-cobertura
   simplecov-json
-  spring (~> 4.1)
   sprockets (~> 4.2)
   sprockets-rails
   tldv (~> 0.1.0)

From dad0d72cca10acfe889f13b15b6103e6c30e0417 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 20 Oct 2023 09:52:48 +0200
Subject: [PATCH 113/590] Allow faker TLDs in testing

---
 app/validators/typoed_email_validator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/validators/typoed_email_validator.rb b/app/validators/typoed_email_validator.rb
index 717fae97..73dbc446 100644
--- a/app/validators/typoed_email_validator.rb
+++ b/app/validators/typoed_email_validator.rb
@@ -56,7 +56,7 @@ class TypoedEmailValidator < ActiveModel::EachValidator
 
     # check if the TLD is valid
     tld = domain_parts.last
-    return false unless TLDv.valid?(tld)
+    return false unless TLDv.valid?(tld) || (Rails.env.test? && %w[example test].include?(tld))
 
     # finally, common typos
     return false if INVALID_ENDINGS.any? { value.end_with?(_1) }

From 62c26771b92087fd16a28f97d8a8c607de34a21c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 11:34:01 +0200
Subject: [PATCH 114/590] Install `view_component` gem

---
 Gemfile      | 2 ++
 Gemfile.lock | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/Gemfile b/Gemfile
index 63e2ae23..c85349e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,6 +66,8 @@ gem "fake_email_validator"
 # TLD validation
 gem "tldv", "~> 0.1.0"
 
+gem "view_component"
+
 gem "jwt", "~> 2.7"
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index c9dfd28f..410d2741 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -485,6 +485,10 @@ GEM
     unf_ext (0.0.8)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
+    view_component (3.6.0)
+      activesupport (>= 5.2.0, < 8.0)
+      concurrent-ruby (~> 1.0)
+      method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
     webpush (1.1.0)
@@ -580,6 +584,7 @@ DEPENDENCIES
   tldv (~> 0.1.0)
   turbo-rails
   twitter-text
+  view_component
 
 BUNDLED WITH
    2.4.21

From e19786cbaa1331c448bbfc94fd08e26e2fcd988e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 11:34:42 +0200
Subject: [PATCH 115/590] Add avatar component

---
 app/components/avatar_component.html.haml |  4 +++
 app/components/avatar_component.rb        | 30 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 app/components/avatar_component.html.haml
 create mode 100644 app/components/avatar_component.rb

diff --git a/app/components/avatar_component.html.haml b/app/components/avatar_component.html.haml
new file mode 100644
index 00000000..379979c6
--- /dev/null
+++ b/app/components/avatar_component.html.haml
@@ -0,0 +1,4 @@
+%img{ class: avatar_classes,
+      alt: alt_text,
+      src: avatar_image,
+      loading: :lazy }
diff --git a/app/components/avatar_component.rb b/app/components/avatar_component.rb
new file mode 100644
index 00000000..c970576a
--- /dev/null
+++ b/app/components/avatar_component.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class AvatarComponent < ViewComponent::Base
+  ALLOWED_SIZES = %w[xs sm md lg xl xxl].freeze
+
+  def initialize(user:, size:, classes: [])
+    @user = user
+    @size = size if ALLOWED_SIZES.include? size
+    @classes = classes
+  end
+
+  private
+
+  def size_to_version(size)
+    case size
+    when "xs", "sm"
+      :small
+    when "md", "lg"
+      :medium
+    when "xl", "xxl"
+      :large
+    end
+  end
+
+  def alt_text = "@#{@user.screen_name}"
+
+  def avatar_classes = @classes.unshift("avatar-#{@size}")
+
+  def avatar_image = @user.profile_picture.url(size_to_version(@size))
+end

From a58e902a01d0f01259711bd13e56d41d8e36ff05 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 11:45:53 +0200
Subject: [PATCH 116/590] Replace plain avatar usage with `AvatarComponent`

---
 app/views/answerbox/_comments.html.haml          | 2 +-
 app/views/answerbox/_header.html.haml            | 2 +-
 app/views/answerbox/_smiles.html.haml            | 2 +-
 app/views/application/_answerbox.html.haml       | 2 +-
 app/views/discover/_userbox.html.haml            | 2 +-
 app/views/inbox/_entry.html.haml                 | 2 +-
 app/views/moderation/_moderationbox.html.haml    | 2 +-
 app/views/moderation/inbox/_header.html.haml     | 2 +-
 app/views/navigation/_desktop.html.haml          | 2 +-
 app/views/navigation/_mobile.html.haml           | 2 +-
 app/views/notifications/type/_answer.html.haml   | 2 +-
 app/views/notifications/type/_comment.html.haml  | 2 +-
 app/views/notifications/type/_follow.html.haml   | 2 +-
 app/views/notifications/type/_reaction.html.haml | 2 +-
 app/views/question/_question.html.haml           | 2 +-
 app/views/settings/blocks/index.html.haml        | 2 +-
 app/views/settings/mutes/_user.html.haml         | 2 +-
 app/views/settings/profile/edit.html.haml        | 2 +-
 app/views/shared/_question.html.haml             | 2 +-
 app/views/tabs/_feed.html.haml                   | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/answerbox/_comments.html.haml b/app/views/answerbox/_comments.html.haml
index 62a1035c..a03e4e10 100644
--- a/app/views/answerbox/_comments.html.haml
+++ b/app/views/answerbox/_comments.html.haml
@@ -8,7 +8,7 @@
         .d-flex
           .flex-shrink-0
             %a{ href: user_path(comment.user) }
-              %img.comment__user-avatar.avatar-sm{ src: comment.user.profile_picture.url(:small), loading: :lazy }
+              = render AvatarComponent.new(user: comment.user, size: "sm", classes: ["comment__user-avatar"])
           .flex-grow-1
             %h6.comment__user
               = user_screen_name comment.user
diff --git a/app/views/answerbox/_header.html.haml b/app/views/answerbox/_header.html.haml
index 30dd9738..37f5b406 100644
--- a/app/views/answerbox/_header.html.haml
+++ b/app/views/answerbox/_header.html.haml
@@ -3,7 +3,7 @@
     - unless a.question.author_is_anonymous
       .flex-shrink-0
         %a{ href: user_path(a.question.user) }
-          %img.answerbox__question-user-avatar.avatar-md{ src: a.question.user.profile_picture.url(:small), loading: :lazy }
+          = render AvatarComponent.new(user: a.question.user, size: "md", classes: ["answerbox__question-user-avatar"])
     .flex-grow-1
       %h6.text-muted.answerbox__question-user
         - if a.question.author_is_anonymous
diff --git a/app/views/answerbox/_smiles.html.haml b/app/views/answerbox/_smiles.html.haml
index 518c72ee..89e90539 100644
--- a/app/views/answerbox/_smiles.html.haml
+++ b/app/views/answerbox/_smiles.html.haml
@@ -9,4 +9,4 @@
         %a{ href: user_path(smile.user),
           title: user_screen_name(smile.user, url: false),
           data: { bs_toggle: :tooltip, bs_placement: :top, smile_id: smile.id } }
-          %img.avatar-xs{ src: smile.user.profile_picture.url(:small), loading: :lazy }
+          = render AvatarComponent.new(user: smile.user, size: "xs")
diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml
index 4524f405..47010105 100644
--- a/app/views/application/_answerbox.html.haml
+++ b/app/views/application/_answerbox.html.haml
@@ -14,7 +14,7 @@
           .d-flex
             .flex-shrink-0
               %a{ href: user_path(a.user) }
-                %img.answerbox__answer-user-avatar.avatar-sm{ src: a.user.profile_picture.url(:small), loading: :lazy }
+                = render AvatarComponent.new(user: a.user, size: "sm", classes: ["answerbox__answer-user-avatar"])
             .flex-grow-1
               %h6.answerbox__answer-user
                 = raw t(".answered", hide: hidespan(t(".hide"), "d-none d-sm-inline"), user: user_screen_name(a.user))
diff --git a/app/views/discover/_userbox.html.haml b/app/views/discover/_userbox.html.haml
index 8c322b50..165ccc51 100644
--- a/app/views/discover/_userbox.html.haml
+++ b/app/views/discover/_userbox.html.haml
@@ -3,7 +3,7 @@
     .d-flex
       .flex-shrink-0
         %a{ href: user_path(u) }
-          %img.avatar-md.me-2{ src: u.profile_picture.url(:medium) }
+          = render AvatarComponent.new(user: u, size: "md", classes: ["me-2"])
       .flex-grow-1
         %h6.answerbox__question-user
           - if u.profile.display_name.blank?
diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 1d37c711..873d3795 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -4,7 +4,7 @@
       - unless i.question.author_is_anonymous
         .flex-shrink-0
           %a.pull-left{ href: user_path(i.question.user) }
-            %img.answerbox__question-user-avatar.avatar-md{ src: i.question.user.profile_picture.url(:small), loading: :lazy }
+            = render AvatarComponent.new(user: i.question.user, size: "md", classes: ["answerbox__question-user-avatar"])
       .flex-grow-1
         %h6.text-muted.answerbox__question-user
           - if i.question.author_is_anonymous
diff --git a/app/views/moderation/_moderationbox.html.haml b/app/views/moderation/_moderationbox.html.haml
index 721177af..ef0c16fb 100644
--- a/app/views/moderation/_moderationbox.html.haml
+++ b/app/views/moderation/_moderationbox.html.haml
@@ -1,6 +1,6 @@
 .card.moderationbox{ data: { id: report.id } }
   .card-header
-    %img.avatar-sm{ src: report.user.profile_picture.url(:small), loading: :lazy }
+    = render AvatarComponent.new(user: report.user, size: "sm")
     = t(".reported_html",
       user: user_screen_name(report.user),
       content: report.type.sub("Reports::", ""),
diff --git a/app/views/moderation/inbox/_header.html.haml b/app/views/moderation/inbox/_header.html.haml
index eae01b4b..cd57e8d8 100644
--- a/app/views/moderation/inbox/_header.html.haml
+++ b/app/views/moderation/inbox/_header.html.haml
@@ -4,6 +4,6 @@
       .d-flex
         .flex-shrink-0
           %a{ href: user_path(user) }
-            %img.answerbox__question-user-avatar.avatar-md{ src: user.profile_picture.url(:medium) }
+            = render AvatarComponent.new(user:, size: "md", classes: ["answerbox__question-user-avatar"])
         .flex-grow-1
           = t(".title_html", screen_name: user.screen_name, user_id: user.id)
diff --git a/app/views/navigation/_desktop.html.haml b/app/views/navigation/_desktop.html.haml
index fc0cce38..267c59ff 100644
--- a/app/views/navigation/_desktop.html.haml
+++ b/app/views/navigation/_desktop.html.haml
@@ -34,7 +34,7 @@
           %i.fa.fa-pencil-square-o
       %li.nav-item.dropdown.profile--image-dropdown
         %a.nav-link.dropdown-toggle.p-sm-0{ href: "#", data: { bs_toggle: :dropdown } }
-          %img.avatar-md.d-none.d-sm-inline{ src: current_user.profile_picture.url(:small) }
+          = render AvatarComponent.new(user: current_user, size: "md", classes: ["d-none", "d-sm-inline"])
           %span.d-inline.d-sm-none
             = current_user.screen_name
             %b.caret
diff --git a/app/views/navigation/_mobile.html.haml b/app/views/navigation/_mobile.html.haml
index 2b68f081..010d592c 100644
--- a/app/views/navigation/_mobile.html.haml
+++ b/app/views/navigation/_mobile.html.haml
@@ -12,5 +12,5 @@
         badge: notification_count, badge_color: "primary", badge_attr: { id: "notification-mobile-count" }, icon_only: true
       %li.nav-item.profile--image-dropdown
         %a.nav-link{ href: '#', data: { bs_toggle: 'dropdown', bs_target: '#rs-mobile-nav-profile' }, aria: { controls: 'rs-mobile-nav-profile', expanded: 'false' } }
-          %img.avatar-md.d-inline{ src: current_user.profile_picture.url(:small) }
+          = render AvatarComponent.new(user: current_user, size: "md", classes: ["d-inline"])
         = render 'navigation/dropdown/profile', size: "mobile"
diff --git a/app/views/notifications/type/_answer.html.haml b/app/views/notifications/type/_answer.html.haml
index 890fb394..a85836eb 100644
--- a/app/views/notifications/type/_answer.html.haml
+++ b/app/views/notifications/type/_answer.html.haml
@@ -3,7 +3,7 @@
     %i.fa.fa-2x.fa-fw.fa-exclamation
   .flex-grow-1
     .notification__heading
-      %img.avatar-xs{ src: notification.target.user.profile_picture.url(:small), loading: :lazy }
+      = render AvatarComponent.new(user: notification.target.user, size: "xs")
       = t(".heading_html",
           user: user_screen_name(notification.target.user),
           question: link_to(t(".link_text"), answer_path(username: notification.target.user.screen_name, id: notification.target.id), target: "_top"),
diff --git a/app/views/notifications/type/_comment.html.haml b/app/views/notifications/type/_comment.html.haml
index 56c3797c..a3371df1 100644
--- a/app/views/notifications/type/_comment.html.haml
+++ b/app/views/notifications/type/_comment.html.haml
@@ -3,7 +3,7 @@
     %i.fa.fa-2x.fa-fw.fa-comments
   .flex-grow-1
     .notification__heading
-      %img.avatar-xs{ src: notification.target.user.profile_picture.url(:small), loading: :lazy }
+      = render AvatarComponent.new(user: notification.target.user, size: "xs")
       - if notification.target.answer.user == current_user
         = t(".heading_html",
               user: user_screen_name(notification.target.user),
diff --git a/app/views/notifications/type/_follow.html.haml b/app/views/notifications/type/_follow.html.haml
index 0994b6de..d142943f 100644
--- a/app/views/notifications/type/_follow.html.haml
+++ b/app/views/notifications/type/_follow.html.haml
@@ -1,6 +1,6 @@
 .d-flex.notification
   .flex-shrink-0.notification__icon
-    %img.avatar-sm{ src: notification.target.source.profile_picture.url(:small), loading: :lazy }
+    = render AvatarComponent.new(user: notification.target.source, size: "sm")
   .flex-grow-1
     %h6.notification__user
       = user_screen_name notification.target.source
diff --git a/app/views/notifications/type/_reaction.html.haml b/app/views/notifications/type/_reaction.html.haml
index ae9259c1..0f0e68f8 100644
--- a/app/views/notifications/type/_reaction.html.haml
+++ b/app/views/notifications/type/_reaction.html.haml
@@ -3,7 +3,7 @@
     %i.fa.fa-2x.fa-fw.fa-smile-o
   .flex-grow-1
     .notification__heading
-      %img.avatar-xs{ src: notification.target.user.profile_picture.url(:small), loading: :lazy }
+      = render AvatarComponent.new(user: notification.target.user, size: "xs")
       - if notification.target.parent_type == "Answer"
         = t(".heading_html",
               user: user_screen_name(notification.target.user),
diff --git a/app/views/question/_question.html.haml b/app/views/question/_question.html.haml
index 1128bb5f..c25594f0 100644
--- a/app/views/question/_question.html.haml
+++ b/app/views/question/_question.html.haml
@@ -5,7 +5,7 @@
         - unless question.author_is_anonymous
           .flex-shrink-0
             %a{ href: unless hidden then user_path(question.user) end }
-              %img.answerbox__question-user-avatar.avatar-md{ src: question.user.profile_picture.url(:small) }
+              = render AvatarComponent.new(user: question.user, size: "md", classes: ["answerbox__question-user-avatar"])
         .flex-grow-1
           %h6.text-muted.answerbox__question-user
             - identifier = question.author_is_anonymous ? question.author_identifier : nil
diff --git a/app/views/settings/blocks/index.html.haml b/app/views/settings/blocks/index.html.haml
index 51e18a11..e11aa255 100644
--- a/app/views/settings/blocks/index.html.haml
+++ b/app/views/settings/blocks/index.html.haml
@@ -6,7 +6,7 @@
       - @blocks.each do |block|
         %li.list-group-item
           .d-flex
-            %img.avatar-md.d-none.d-sm-inline.me-2{ src: block.target.profile_picture.url(:small) }
+            = render AvatarComponent.new(user: block.target, size: "md", classes: ["d-none", "d-sm-inline", "me-2"])
             %div
               %p.mb-0= user_screen_name(block.target)
               %p.text-muted.mb-0= t(".blocked", time: time_ago_in_words(block.created_at))
diff --git a/app/views/settings/mutes/_user.html.haml b/app/views/settings/mutes/_user.html.haml
index e669270a..a2324bcc 100644
--- a/app/views/settings/mutes/_user.html.haml
+++ b/app/views/settings/mutes/_user.html.haml
@@ -1,5 +1,5 @@
 .d-flex.mb-2
-  %img.avatar-md.me-2{ src: user.profile_picture.url(:small), loading: :lazy }
+  = render AvatarComponent.new(user:, size: "md", classes: ["me-2"])
   %p.align-self-center.m-0= user_screen_name(user, context_user: current_user)
   .ms-auto.d-inline-flex
     %button.btn.btn-default.align-self-center{ data: { action: :unmute, target: user.screen_name } }
diff --git a/app/views/settings/profile/edit.html.haml b/app/views/settings/profile/edit.html.haml
index 32721590..d2311e51 100644
--- a/app/views/settings/profile/edit.html.haml
+++ b/app/views/settings/profile/edit.html.haml
@@ -5,7 +5,7 @@
       %div{ data: { controller: "cropper", cropper_aspect_ratio_value: "1" } }
         .d-flex
           .flex-shrink-0
-            %img.avatar-lg.me-3{ src: current_user.profile_picture.url(:medium) }
+            = render AvatarComponent.new(user: current_user, size: "lg", classes: ["me-3"])
           .flex-grow-1
             = f.file_field :profile_picture, accept: APP_CONFIG[:accepted_image_formats].join(","), data: { cropper_target: "input", action: "cropper#change" }
 
diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml
index e1a4df80..6ebd7d93 100644
--- a/app/views/shared/_question.html.haml
+++ b/app/views/shared/_question.html.haml
@@ -5,7 +5,7 @@
       - if type == "discover"
         .flex-shrink-0
           %a{ href: user_screen_name(q.user, link_only: true) }
-            %img.avatar-md.me-2{ src: q.user&.profile_picture&.url(:small), loading: :lazy }
+            = render AvatarComponent.new(user: q.user, size: "md", classes: ["me-2"])
       .flex-grow-1
         %h6.text-muted.answerbox__question-user
           - if type.nil? && q.direct
diff --git a/app/views/tabs/_feed.html.haml b/app/views/tabs/_feed.html.haml
index 778c1cea..fc92d7a0 100644
--- a/app/views/tabs/_feed.html.haml
+++ b/app/views/tabs/_feed.html.haml
@@ -18,7 +18,7 @@
           %p.px-4.pb-2
             - list.members.each do |member|
               %a{ href: user_path(member.user), title: member.user.screen_name, data: { bs_toggle: :tooltip, bs_placement: :top } }
-                %img.avatar-xs{ src: member.user.profile_picture.url(:small), loading: :lazy }
+                = render AvatarComponent.new(user: member.user, size: "xs")
       - if !list && lists.empty?
         .p-3= t(".lists.notice_html")
       - lists.each do |list|

From f97d98d00aaa100d43cda10f93741187559f5818 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 11:46:26 +0200
Subject: [PATCH 117/590] Include `view_component` testing helpers

---
 spec/rails_helper.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 11da5afa..74cb6c76 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -11,6 +11,8 @@ require "rspec/rails"
 require "rspec/its"
 require "devise"
 require "rspec-sidekiq"
+require "view_component/test_helpers"
+require "view_component/system_test_helpers"
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
@@ -68,6 +70,8 @@ RSpec.configure do |config|
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.include Devise::Test::ControllerHelpers, type: :helper
   config.include Devise::Test::ControllerHelpers, type: :view
+  config.include ViewComponent::TestHelpers, type: :component
+  config.include ViewComponent::SystemTestHelpers, type: :component
 end
 
 Shoulda::Matchers.configure do |config|

From ae4210d36f3ce1d8f02e7a183acc32130ddf8d2e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 11:46:43 +0200
Subject: [PATCH 118/590] Add spec for `AvatarComponent`

---
 spec/components/avatar_component_spec.rb | 39 ++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 spec/components/avatar_component_spec.rb

diff --git a/spec/components/avatar_component_spec.rb b/spec/components/avatar_component_spec.rb
new file mode 100644
index 00000000..922c52d0
--- /dev/null
+++ b/spec/components/avatar_component_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe AvatarComponent, type: :component do
+  let(:user) { FactoryBot.create(:user) }
+
+  it "renders an avatar" do
+    expect(
+      render_inline(described_class.new(user:, size: "sm")).to_html,
+    ).to include(
+      "no_avatar.png",
+    )
+  end
+
+  it "gets the medium version of a profile picture if requested" do
+    expect(
+      render_inline(described_class.new(user:, size: "md")).to_html,
+    ).to include(
+      "medium/",
+    )
+  end
+
+  it "gets the large version of a profile picture if requested" do
+    expect(
+      render_inline(described_class.new(user:, size: "xl")).to_html,
+    ).to include(
+      "large/",
+    )
+  end
+
+  it "includes additionally passed classes" do
+    expect(
+      render_inline(described_class.new(user:, size: "md", classes: %w[first-class second-class])).to_html,
+    ).to include(
+      'class="avatar-md first-class second-class"',
+    )
+  end
+end

From 0e68a67d13fe70920d539851ff0f175f9357b046 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 12:51:48 +0200
Subject: [PATCH 119/590] Ignore `Lint/MissingSuper` in `app/components/`

---
 .rubocop.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0d6c9020..7aca81c7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -27,6 +27,10 @@ Lint/NestedMethodDefinition:
   Exclude:
     - api/sinatra/**/*
 
+Lint/MissingSuper:
+  Exclude:
+    - app/components/**/*
+
 
 ### Metrics
 

From 72af3c4d0ba7e395c12732e360d3f79935bf2c55 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 01:37:34 +0200
Subject: [PATCH 120/590] Fix lints in database/migration code

---
 .../20140801095807_devise_create_users.rb     |  3 +-
 ...20140801103309_add_screen_name_to_users.rb |  2 +
 db/migrate/20140801174930_create_questions.rb |  4 +-
 db/migrate/20140801175112_create_answers.rb   |  4 +-
 db/migrate/20140801175137_create_comments.rb  |  4 +-
 .../20141102153520_add_counts_to_users.rb     |  2 +
 ...0141104143648_add_display_name_to_users.rb |  2 +
 db/migrate/20141110210154_create_inboxes.rb   |  2 +
 ...141113164048_add_smile_count_to_answers.rb |  2 +
 ...0141113164314_add_smiled_count_to_users.rb |  2 +
 .../20141126154451_add_admin_to_users.rb      |  2 +
 ...29211448_add_motivation_header_to_users.rb |  4 +-
 .../20141130130221_create_relationships.rb    |  4 +-
 db/migrate/20141130175749_create_smiles.rb    |  4 +-
 ...0141130180152_rename_columns_in_answers.rb |  2 +
 .../20141201191324_add_fields_to_users.rb     |  8 ++--
 ...207194424_add_answer_count_to_questions.rb |  2 +
 ...11714_change_answer_content_column_type.rb |  2 +
 db/migrate/20141212193625_create_services.rb  |  2 +
 .../20141213182609_create_notifications.rb    |  2 +
 .../20141226115905_add_moderator_to_users.rb  |  2 +
 db/migrate/20141227130438_create_reports.rb   |  2 +
 .../20141227130545_create_moderation_votes.rb |  4 +-
 ...141227130618_create_moderation_comments.rb |  4 +-
 .../20141228202825_add_deleted_to_reports.rb  |  2 +
 ...add_attachment_profile_picture_to_users.rb |  2 +
 ...add_profile_picture_processing_to_users.rb |  2 +
 ...20141229133149_add_crop_values_to_users.rb |  2 +
 .../20150102231343_add_supporter_to_users.rb  |  2 +
 ...0103200732_add_privacy_options_to_users.rb |  6 ++-
 .../20150112210754_add_banned_to_users.rb     |  2 +
 db/migrate/20150112210755_create_groups.rb    |  6 ++-
 .../20150125191224_add_blogger_to_users.rb    |  4 +-
 ...20150419201122_add_contributor_to_users.rb |  4 +-
 .../20150420232305_create_subscriptions.rb    |  2 +
 ...21120557_add_is_active_to_subscriptions.rb |  4 +-
 .../20150422024104_add_reason_to_report.rb    |  2 +
 ...e_banned_to_permanently_banned_in_users.rb |  2 +
 ...dd_ban_reason_and_banned_until_to_users.rb |  2 +
 .../20150504004931_create_comment_smiles.rb   |  4 +-
 ..._add_attachment_profile_header_to_users.rb |  2 +
 .../20150526031159_add_locale_to_user.rb      |  2 +
 .../20150619123121_add_translator_to_users.rb |  4 +-
 ...04072402_change_default_value_of_locale.rb |  4 +-
 ...0150721154255_add_confirmable_to_devise.rb |  2 +
 db/migrate/20150825073030_create_themes.rb    |  4 +-
 ...180139_add_show_foreign_themes_to_users.rb |  2 +
 ...26224857_add_input_and_outline_to_theme.rb |  2 +
 ...160105165913_add_export_fields_to_users.rb |  2 +
 .../20200419183714_create_announcements.rb    |  2 +
 .../20200419185535_create_initial_roles.rb    | 12 +++---
 ...00425194536_remove_unused_profile_flags.rb |  2 +
 .../20200504214933_update_theme_fields.rb     |  2 +
 .../20200517190138_rename_crop_fields.rb      |  2 +
 .../20200517192431_remove_paperclip_fields.rb |  2 +
 .../20200704163504_use_timestamped_ids.rb     | 16 ++++----
 ...01001172537_add_otp_secret_key_to_users.rb |  2 +
 ...201101155648_create_totp_recovery_codes.rb |  4 +-
 .../20210811133004_add_direct_to_questions.rb |  2 +-
 db/migrate/20210814134115_create_user_bans.rb |  3 +-
 db/migrate/20211219153054_create_profiles.rb  | 12 +++---
 .../20211222165159_create_mute_rules.rb       |  2 +
 ...1228135426_add_indexes_to_notifications.rb |  2 +
 ...20220104180510_add_post_tag_to_services.rb |  2 +
 db/schema.rb                                  | 39 ++++++++++---------
 db/seeds.rb                                   |  2 +
 66 files changed, 187 insertions(+), 64 deletions(-)

diff --git a/db/migrate/20140801095807_devise_create_users.rb b/db/migrate/20140801095807_devise_create_users.rb
index 0115292e..85ab1dfb 100644
--- a/db/migrate/20140801095807_devise_create_users.rb
+++ b/db/migrate/20140801095807_devise_create_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DeviseCreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:users) do |t|
@@ -30,7 +32,6 @@ class DeviseCreateUsers < ActiveRecord::Migration[4.2]
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
 
-
       t.timestamps
     end
 
diff --git a/db/migrate/20140801103309_add_screen_name_to_users.rb b/db/migrate/20140801103309_add_screen_name_to_users.rb
index ad028c8f..a54abe42 100644
--- a/db/migrate/20140801103309_add_screen_name_to_users.rb
+++ b/db/migrate/20140801103309_add_screen_name_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddScreenNameToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :screen_name, :string
diff --git a/db/migrate/20140801174930_create_questions.rb b/db/migrate/20140801174930_create_questions.rb
index ae872a7e..962748db 100644
--- a/db/migrate/20140801174930_create_questions.rb
+++ b/db/migrate/20140801174930_create_questions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateQuestions < ActiveRecord::Migration[4.2]
   def change
     create_table :questions do |t|
@@ -9,6 +11,6 @@ class CreateQuestions < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :questions, [:user_id, :created_at]
+    add_index :questions, %i[user_id created_at]
   end
 end
diff --git a/db/migrate/20140801175112_create_answers.rb b/db/migrate/20140801175112_create_answers.rb
index 510d73bc..21eff7a1 100644
--- a/db/migrate/20140801175112_create_answers.rb
+++ b/db/migrate/20140801175112_create_answers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAnswers < ActiveRecord::Migration[4.2]
   def change
     create_table :answers do |t|
@@ -9,6 +11,6 @@ class CreateAnswers < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :answers, [:user_id, :created_at]
+    add_index :answers, %i[user_id created_at]
   end
 end
diff --git a/db/migrate/20140801175137_create_comments.rb b/db/migrate/20140801175137_create_comments.rb
index cb785fff..9d90f710 100644
--- a/db/migrate/20140801175137_create_comments.rb
+++ b/db/migrate/20140801175137_create_comments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateComments < ActiveRecord::Migration[4.2]
   def change
     create_table :comments do |t|
@@ -7,6 +9,6 @@ class CreateComments < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index :comments, [:user_id, :created_at]
+    add_index :comments, %i[user_id created_at]
   end
 end
diff --git a/db/migrate/20141102153520_add_counts_to_users.rb b/db/migrate/20141102153520_add_counts_to_users.rb
index 37db7152..92f934d3 100644
--- a/db/migrate/20141102153520_add_counts_to_users.rb
+++ b/db/migrate/20141102153520_add_counts_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCountsToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :friend_count, :integer, default: 0, null: false
diff --git a/db/migrate/20141104143648_add_display_name_to_users.rb b/db/migrate/20141104143648_add_display_name_to_users.rb
index 6db1c1c1..0ce6171c 100644
--- a/db/migrate/20141104143648_add_display_name_to_users.rb
+++ b/db/migrate/20141104143648_add_display_name_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddDisplayNameToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :display_name, :string
diff --git a/db/migrate/20141110210154_create_inboxes.rb b/db/migrate/20141110210154_create_inboxes.rb
index bfb140d0..cbed4da6 100644
--- a/db/migrate/20141110210154_create_inboxes.rb
+++ b/db/migrate/20141110210154_create_inboxes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateInboxes < ActiveRecord::Migration[4.2]
   def change
     create_table :inboxes do |t|
diff --git a/db/migrate/20141113164048_add_smile_count_to_answers.rb b/db/migrate/20141113164048_add_smile_count_to_answers.rb
index c40b7166..16346497 100644
--- a/db/migrate/20141113164048_add_smile_count_to_answers.rb
+++ b/db/migrate/20141113164048_add_smile_count_to_answers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSmileCountToAnswers < ActiveRecord::Migration[4.2]
   def change
     add_column :answers, :smile_count, :integer, default: 0, null: false
diff --git a/db/migrate/20141113164314_add_smiled_count_to_users.rb b/db/migrate/20141113164314_add_smiled_count_to_users.rb
index dda9e08b..b88e3e4d 100644
--- a/db/migrate/20141113164314_add_smiled_count_to_users.rb
+++ b/db/migrate/20141113164314_add_smiled_count_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSmiledCountToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :smiled_count, :integer, default: 0, null: false
diff --git a/db/migrate/20141126154451_add_admin_to_users.rb b/db/migrate/20141126154451_add_admin_to_users.rb
index d225ea61..3a745490 100644
--- a/db/migrate/20141126154451_add_admin_to_users.rb
+++ b/db/migrate/20141126154451_add_admin_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAdminToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :admin, :boolean, default: false, null: false
diff --git a/db/migrate/20141129211448_add_motivation_header_to_users.rb b/db/migrate/20141129211448_add_motivation_header_to_users.rb
index 7cd1d6dd..b87c1382 100644
--- a/db/migrate/20141129211448_add_motivation_header_to_users.rb
+++ b/db/migrate/20141129211448_add_motivation_header_to_users.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class AddMotivationHeaderToUsers < ActiveRecord::Migration[4.2]
   def change
-    add_column :users, :motivation_header, :string, default: '', null: false
+    add_column :users, :motivation_header, :string, default: "", null: false
   end
 end
diff --git a/db/migrate/20141130130221_create_relationships.rb b/db/migrate/20141130130221_create_relationships.rb
index 98ab31e8..6b28185d 100644
--- a/db/migrate/20141130130221_create_relationships.rb
+++ b/db/migrate/20141130130221_create_relationships.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateRelationships < ActiveRecord::Migration[4.2]
   def change
     create_table :relationships do |t|
@@ -9,6 +11,6 @@ class CreateRelationships < ActiveRecord::Migration[4.2]
 
     add_index :relationships, :source_id
     add_index :relationships, :target_id
-    add_index :relationships, [:source_id, :target_id], unique: true
+    add_index :relationships, %i[source_id target_id], unique: true
   end
 end
diff --git a/db/migrate/20141130175749_create_smiles.rb b/db/migrate/20141130175749_create_smiles.rb
index de5004b4..3650c00d 100644
--- a/db/migrate/20141130175749_create_smiles.rb
+++ b/db/migrate/20141130175749_create_smiles.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateSmiles < ActiveRecord::Migration[4.2]
   def change
     create_table :smiles do |t|
@@ -9,6 +11,6 @@ class CreateSmiles < ActiveRecord::Migration[4.2]
 
     add_index :smiles, :user_id
     add_index :smiles, :answer_id
-    add_index :smiles, [:user_id, :answer_id], unique: true
+    add_index :smiles, %i[user_id answer_id], unique: true
   end
 end
diff --git a/db/migrate/20141130180152_rename_columns_in_answers.rb b/db/migrate/20141130180152_rename_columns_in_answers.rb
index 0a3fac1f..a94551c5 100644
--- a/db/migrate/20141130180152_rename_columns_in_answers.rb
+++ b/db/migrate/20141130180152_rename_columns_in_answers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameColumnsInAnswers < ActiveRecord::Migration[4.2]
   def change
     rename_column :answers, :comments, :comment_count
diff --git a/db/migrate/20141201191324_add_fields_to_users.rb b/db/migrate/20141201191324_add_fields_to_users.rb
index 6ba0d729..38a18cf6 100644
--- a/db/migrate/20141201191324_add_fields_to_users.rb
+++ b/db/migrate/20141201191324_add_fields_to_users.rb
@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class AddFieldsToUsers < ActiveRecord::Migration[4.2]
   def change
-    add_column :users, :website, :string, default: '', null: false
-    add_column :users, :location, :string, default: '', null: false
-    add_column :users, :bio, :text, default: '', null: false
+    add_column :users, :website, :string, default: "", null: false
+    add_column :users, :location, :string, default: "", null: false
+    add_column :users, :bio, :text, default: "", null: false
   end
 end
diff --git a/db/migrate/20141207194424_add_answer_count_to_questions.rb b/db/migrate/20141207194424_add_answer_count_to_questions.rb
index ff3acb3e..1ad3ee56 100644
--- a/db/migrate/20141207194424_add_answer_count_to_questions.rb
+++ b/db/migrate/20141207194424_add_answer_count_to_questions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAnswerCountToQuestions < ActiveRecord::Migration[4.2]
   def change
     add_column :questions, :answer_count, :integer, default: 0, null: false
diff --git a/db/migrate/20141208111714_change_answer_content_column_type.rb b/db/migrate/20141208111714_change_answer_content_column_type.rb
index 454b897c..f704a5d5 100644
--- a/db/migrate/20141208111714_change_answer_content_column_type.rb
+++ b/db/migrate/20141208111714_change_answer_content_column_type.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeAnswerContentColumnType < ActiveRecord::Migration[4.2]
   def change
     change_table :answers do |t|
diff --git a/db/migrate/20141212193625_create_services.rb b/db/migrate/20141212193625_create_services.rb
index 7426d605..471a51d0 100644
--- a/db/migrate/20141212193625_create_services.rb
+++ b/db/migrate/20141212193625_create_services.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateServices < ActiveRecord::Migration[4.2]
   def change
     create_table :services do |t|
diff --git a/db/migrate/20141213182609_create_notifications.rb b/db/migrate/20141213182609_create_notifications.rb
index a3fa3bcc..c8652cb9 100644
--- a/db/migrate/20141213182609_create_notifications.rb
+++ b/db/migrate/20141213182609_create_notifications.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateNotifications < ActiveRecord::Migration[4.2]
   def change
     create_table :notifications do |t|
diff --git a/db/migrate/20141226115905_add_moderator_to_users.rb b/db/migrate/20141226115905_add_moderator_to_users.rb
index 1ef1db05..db9b3d8e 100644
--- a/db/migrate/20141226115905_add_moderator_to_users.rb
+++ b/db/migrate/20141226115905_add_moderator_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddModeratorToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :moderator, :boolean, default: false, null: false
diff --git a/db/migrate/20141227130438_create_reports.rb b/db/migrate/20141227130438_create_reports.rb
index ce3c795c..932bf9b4 100644
--- a/db/migrate/20141227130438_create_reports.rb
+++ b/db/migrate/20141227130438_create_reports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateReports < ActiveRecord::Migration[4.2]
   def change
     create_table :reports do |t|
diff --git a/db/migrate/20141227130545_create_moderation_votes.rb b/db/migrate/20141227130545_create_moderation_votes.rb
index 4e73c91a..14a3543e 100644
--- a/db/migrate/20141227130545_create_moderation_votes.rb
+++ b/db/migrate/20141227130545_create_moderation_votes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateModerationVotes < ActiveRecord::Migration[4.2]
   def change
     create_table :moderation_votes do |t|
@@ -10,6 +12,6 @@ class CreateModerationVotes < ActiveRecord::Migration[4.2]
 
     add_index :moderation_votes, :user_id
     add_index :moderation_votes, :report_id
-    add_index :moderation_votes, [:user_id, :report_id], unique: true
+    add_index :moderation_votes, %i[user_id report_id], unique: true
   end
 end
diff --git a/db/migrate/20141227130618_create_moderation_comments.rb b/db/migrate/20141227130618_create_moderation_comments.rb
index c06d8410..8c1025a7 100644
--- a/db/migrate/20141227130618_create_moderation_comments.rb
+++ b/db/migrate/20141227130618_create_moderation_comments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateModerationComments < ActiveRecord::Migration[4.2]
   def change
     create_table :moderation_comments do |t|
@@ -8,6 +10,6 @@ class CreateModerationComments < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index :moderation_comments, [:user_id, :created_at]
+    add_index :moderation_comments, %i[user_id created_at]
   end
 end
diff --git a/db/migrate/20141228202825_add_deleted_to_reports.rb b/db/migrate/20141228202825_add_deleted_to_reports.rb
index c8c6d343..d849baa8 100644
--- a/db/migrate/20141228202825_add_deleted_to_reports.rb
+++ b/db/migrate/20141228202825_add_deleted_to_reports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddDeletedToReports < ActiveRecord::Migration[4.2]
   def change
     add_column :reports, :deleted, :boolean, default: false
diff --git a/db/migrate/20141229085904_add_attachment_profile_picture_to_users.rb b/db/migrate/20141229085904_add_attachment_profile_picture_to_users.rb
index ff05535d..24d3accf 100644
--- a/db/migrate/20141229085904_add_attachment_profile_picture_to_users.rb
+++ b/db/migrate/20141229085904_add_attachment_profile_picture_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAttachmentProfilePictureToUsers < ActiveRecord::Migration[4.2]
   def self.up
     change_table :users do |t|
diff --git a/db/migrate/20141229105013_add_profile_picture_processing_to_users.rb b/db/migrate/20141229105013_add_profile_picture_processing_to_users.rb
index 0832cc17..47d882e8 100644
--- a/db/migrate/20141229105013_add_profile_picture_processing_to_users.rb
+++ b/db/migrate/20141229105013_add_profile_picture_processing_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddProfilePictureProcessingToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :profile_picture_processing, :boolean
diff --git a/db/migrate/20141229133149_add_crop_values_to_users.rb b/db/migrate/20141229133149_add_crop_values_to_users.rb
index 8da16793..a41eab5d 100644
--- a/db/migrate/20141229133149_add_crop_values_to_users.rb
+++ b/db/migrate/20141229133149_add_crop_values_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCropValuesToUsers < ActiveRecord::Migration[4.2]
   def change
     # this is a ugly hack and will stay until I find a way to pass parameters
diff --git a/db/migrate/20150102231343_add_supporter_to_users.rb b/db/migrate/20150102231343_add_supporter_to_users.rb
index e23d5eb2..1cc574a9 100644
--- a/db/migrate/20150102231343_add_supporter_to_users.rb
+++ b/db/migrate/20150102231343_add_supporter_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSupporterToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :supporter, :boolean, default: false
diff --git a/db/migrate/20150103200732_add_privacy_options_to_users.rb b/db/migrate/20150103200732_add_privacy_options_to_users.rb
index 2d7ec342..cfe87cda 100644
--- a/db/migrate/20150103200732_add_privacy_options_to_users.rb
+++ b/db/migrate/20150103200732_add_privacy_options_to_users.rb
@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 class AddPrivacyOptionsToUsers < ActiveRecord::Migration[4.2]
   def change
-    %i{
+    %i[
       privacy_allow_anonymous_questions
       privacy_allow_public_timeline
       privacy_allow_stranger_answers
       privacy_show_in_search
-    }.each do |sym|
+    ].each do |sym|
       add_column :users, sym, :boolean, default: true
     end
   end
diff --git a/db/migrate/20150112210754_add_banned_to_users.rb b/db/migrate/20150112210754_add_banned_to_users.rb
index 7a857608..5c256971 100644
--- a/db/migrate/20150112210754_add_banned_to_users.rb
+++ b/db/migrate/20150112210754_add_banned_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddBannedToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :banned, :boolean, default: false
diff --git a/db/migrate/20150112210755_create_groups.rb b/db/migrate/20150112210755_create_groups.rb
index 9c44ef5c..ba7436e0 100644
--- a/db/migrate/20150112210755_create_groups.rb
+++ b/db/migrate/20150112210755_create_groups.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateGroups < ActiveRecord::Migration[4.2]
   def change
     create_table :groups do |t|
@@ -11,7 +13,7 @@ class CreateGroups < ActiveRecord::Migration[4.2]
 
     add_index :groups, :user_id
     add_index :groups, :name
-    add_index :groups, [:user_id, :name], unique: true
+    add_index :groups, %i[user_id name], unique: true
 
     create_table :group_members do |t|
       t.integer :group_id, null: false
@@ -22,6 +24,6 @@ class CreateGroups < ActiveRecord::Migration[4.2]
 
     add_index :group_members, :group_id
     add_index :group_members, :user_id
-    add_index :group_members, [:group_id, :user_id], unique: true
+    add_index :group_members, %i[group_id user_id], unique: true
   end
 end
diff --git a/db/migrate/20150125191224_add_blogger_to_users.rb b/db/migrate/20150125191224_add_blogger_to_users.rb
index 05edee57..f2a89b12 100644
--- a/db/migrate/20150125191224_add_blogger_to_users.rb
+++ b/db/migrate/20150125191224_add_blogger_to_users.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class AddBloggerToUsers < ActiveRecord::Migration[4.2]
   def change
-    add_column :users, :blogger, :boolean, default: :false
+    add_column :users, :blogger, :boolean, default: false
   end
 end
diff --git a/db/migrate/20150419201122_add_contributor_to_users.rb b/db/migrate/20150419201122_add_contributor_to_users.rb
index 91a548aa..72f5488c 100644
--- a/db/migrate/20150419201122_add_contributor_to_users.rb
+++ b/db/migrate/20150419201122_add_contributor_to_users.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class AddContributorToUsers < ActiveRecord::Migration[4.2]
   def change
-    add_column :users, :contributor, :boolean, default: :false
+    add_column :users, :contributor, :boolean, default: false
   end
 end
diff --git a/db/migrate/20150420232305_create_subscriptions.rb b/db/migrate/20150420232305_create_subscriptions.rb
index 72061a84..26180ede 100644
--- a/db/migrate/20150420232305_create_subscriptions.rb
+++ b/db/migrate/20150420232305_create_subscriptions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateSubscriptions < ActiveRecord::Migration[4.2]
   def change
     create_table :subscriptions do |t|
diff --git a/db/migrate/20150421120557_add_is_active_to_subscriptions.rb b/db/migrate/20150421120557_add_is_active_to_subscriptions.rb
index 059d4a7b..50372127 100644
--- a/db/migrate/20150421120557_add_is_active_to_subscriptions.rb
+++ b/db/migrate/20150421120557_add_is_active_to_subscriptions.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class AddIsActiveToSubscriptions < ActiveRecord::Migration[4.2]
   def change
-    add_column :subscriptions, :is_active, :boolean, default: :true
+    add_column :subscriptions, :is_active, :boolean, default: true
   end
 end
diff --git a/db/migrate/20150422024104_add_reason_to_report.rb b/db/migrate/20150422024104_add_reason_to_report.rb
index 51531b65..e3bef6df 100644
--- a/db/migrate/20150422024104_add_reason_to_report.rb
+++ b/db/migrate/20150422024104_add_reason_to_report.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReasonToReport < ActiveRecord::Migration[4.2]
   def change
     add_column :reports, :reason, :string, default: nil
diff --git a/db/migrate/20150422224203_rename_banned_to_permanently_banned_in_users.rb b/db/migrate/20150422224203_rename_banned_to_permanently_banned_in_users.rb
index 81954d3f..3e74cb2d 100644
--- a/db/migrate/20150422224203_rename_banned_to_permanently_banned_in_users.rb
+++ b/db/migrate/20150422224203_rename_banned_to_permanently_banned_in_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameBannedToPermanentlyBannedInUsers < ActiveRecord::Migration[4.2]
   def up
     rename_column :users, :banned, :permanently_banned
diff --git a/db/migrate/20150422224225_add_ban_reason_and_banned_until_to_users.rb b/db/migrate/20150422224225_add_ban_reason_and_banned_until_to_users.rb
index 55936ff8..d312f8ca 100644
--- a/db/migrate/20150422224225_add_ban_reason_and_banned_until_to_users.rb
+++ b/db/migrate/20150422224225_add_ban_reason_and_banned_until_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddBanReasonAndBannedUntilToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :ban_reason, :string, default: nil
diff --git a/db/migrate/20150504004931_create_comment_smiles.rb b/db/migrate/20150504004931_create_comment_smiles.rb
index ea86bca2..064cc1f0 100644
--- a/db/migrate/20150504004931_create_comment_smiles.rb
+++ b/db/migrate/20150504004931_create_comment_smiles.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateCommentSmiles < ActiveRecord::Migration[4.2]
   def change
     create_table :comment_smiles do |t|
@@ -9,7 +11,7 @@ class CreateCommentSmiles < ActiveRecord::Migration[4.2]
 
     add_index :comment_smiles, :user_id
     add_index :comment_smiles, :comment_id
-    add_index :comment_smiles, [:user_id, :comment_id], unique: true
+    add_index :comment_smiles, %i[user_id comment_id], unique: true
 
     add_column :users,    :comment_smiled_count, :integer, default: 0, null: false
     add_column :comments, :smile_count,          :integer, default: 0, null: false
diff --git a/db/migrate/20150508144336_add_attachment_profile_header_to_users.rb b/db/migrate/20150508144336_add_attachment_profile_header_to_users.rb
index fabf823d..2f704186 100644
--- a/db/migrate/20150508144336_add_attachment_profile_header_to_users.rb
+++ b/db/migrate/20150508144336_add_attachment_profile_header_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAttachmentProfileHeaderToUsers < ActiveRecord::Migration[4.2]
   def change
     change_table :users do |t|
diff --git a/db/migrate/20150526031159_add_locale_to_user.rb b/db/migrate/20150526031159_add_locale_to_user.rb
index 76c828c5..090c66a7 100644
--- a/db/migrate/20150526031159_add_locale_to_user.rb
+++ b/db/migrate/20150526031159_add_locale_to_user.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddLocaleToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :locale, :string
diff --git a/db/migrate/20150619123121_add_translator_to_users.rb b/db/migrate/20150619123121_add_translator_to_users.rb
index 8f8da49b..c340278a 100644
--- a/db/migrate/20150619123121_add_translator_to_users.rb
+++ b/db/migrate/20150619123121_add_translator_to_users.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class AddTranslatorToUsers < ActiveRecord::Migration[4.2]
   def change
-    add_column :users, :translator, :boolean, default: :false
+    add_column :users, :translator, :boolean, default: false
   end
 end
diff --git a/db/migrate/20150704072402_change_default_value_of_locale.rb b/db/migrate/20150704072402_change_default_value_of_locale.rb
index ed8f0fe8..aa45d331 100644
--- a/db/migrate/20150704072402_change_default_value_of_locale.rb
+++ b/db/migrate/20150704072402_change_default_value_of_locale.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class ChangeDefaultValueOfLocale < ActiveRecord::Migration[4.2]
   def change
-    change_column :users, :locale, :string, :default => 'en'
+    change_column :users, :locale, :string, default: "en"
   end
 end
diff --git a/db/migrate/20150721154255_add_confirmable_to_devise.rb b/db/migrate/20150721154255_add_confirmable_to_devise.rb
index fb435503..8167abab 100644
--- a/db/migrate/20150721154255_add_confirmable_to_devise.rb
+++ b/db/migrate/20150721154255_add_confirmable_to_devise.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddConfirmableToDevise < ActiveRecord::Migration[4.2]
   def up
     add_column :users, :confirmation_token, :string
diff --git a/db/migrate/20150825073030_create_themes.rb b/db/migrate/20150825073030_create_themes.rb
index ac8da0e8..b556f09e 100644
--- a/db/migrate/20150825073030_create_themes.rb
+++ b/db/migrate/20150825073030_create_themes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateThemes < ActiveRecord::Migration[4.2]
   def change
     create_table :themes do |t|
@@ -38,6 +40,6 @@ class CreateThemes < ActiveRecord::Migration[4.2]
       t.timestamps null: false
     end
 
-    add_index :themes, [:user_id, :created_at]
+    add_index :themes, %i[user_id created_at]
   end
 end
diff --git a/db/migrate/20150825180139_add_show_foreign_themes_to_users.rb b/db/migrate/20150825180139_add_show_foreign_themes_to_users.rb
index 9d00452e..96164b0c 100644
--- a/db/migrate/20150825180139_add_show_foreign_themes_to_users.rb
+++ b/db/migrate/20150825180139_add_show_foreign_themes_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddShowForeignThemesToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :show_foreign_themes, :boolean, default: true, null: false
diff --git a/db/migrate/20150826224857_add_input_and_outline_to_theme.rb b/db/migrate/20150826224857_add_input_and_outline_to_theme.rb
index e4d24e3c..69d3516c 100644
--- a/db/migrate/20150826224857_add_input_and_outline_to_theme.rb
+++ b/db/migrate/20150826224857_add_input_and_outline_to_theme.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddInputAndOutlineToTheme < ActiveRecord::Migration[4.2]
   def change
     add_column :themes, :input_color, :integer, default: 0xFFFFFF, null: false
diff --git a/db/migrate/20160105165913_add_export_fields_to_users.rb b/db/migrate/20160105165913_add_export_fields_to_users.rb
index fe4a4fe8..7ffbbbcb 100644
--- a/db/migrate/20160105165913_add_export_fields_to_users.rb
+++ b/db/migrate/20160105165913_add_export_fields_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddExportFieldsToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :export_url, :string
diff --git a/db/migrate/20200419183714_create_announcements.rb b/db/migrate/20200419183714_create_announcements.rb
index 1aedd713..8fe9990c 100644
--- a/db/migrate/20200419183714_create_announcements.rb
+++ b/db/migrate/20200419183714_create_announcements.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAnnouncements < ActiveRecord::Migration[5.2]
   def change
     create_table :announcements do |t|
diff --git a/db/migrate/20200419185535_create_initial_roles.rb b/db/migrate/20200419185535_create_initial_roles.rb
index f3f0788c..0b13b04b 100644
--- a/db/migrate/20200419185535_create_initial_roles.rb
+++ b/db/migrate/20200419185535_create_initial_roles.rb
@@ -7,11 +7,11 @@ class CreateInitialRoles < ActiveRecord::Migration[5.2]
     end
 
     {
-      admin: :administrator,
-      moderator: :moderator
+      admin:     :administrator,
+      moderator: :moderator,
     }.each do |legacy_role, new_role|
-      User.where(legacy_role => true).each do |u|
-        puts "-- migrating #{u.screen_name} (#{u.id}) from field:#{legacy_role} to role:#{new_role}"
+      User.where(legacy_role => true).find_each do |u|
+        Rails.logger.debug { "-- migrating #{u.screen_name} (#{u.id}) from field:#{legacy_role} to role:#{new_role}" }
         u.add_role new_role
         u.public_send("#{legacy_role}=", false)
         u.save!
@@ -22,10 +22,10 @@ class CreateInitialRoles < ActiveRecord::Migration[5.2]
   def down
     {
       administrator: :admin,
-      moderator: :moderator
+      moderator:     :moderator,
     }.each do |new_role, legacy_role|
       User.with_role(new_role).each do |u|
-        puts "-- migrating #{u.screen_name} (#{u.id}) from role:#{new_role} to field:#{legacy_role}"
+        Rails.logger.debug { "-- migrating #{u.screen_name} (#{u.id}) from role:#{new_role} to field:#{legacy_role}" }
         u.public_send("#{legacy_role}=", true)
         u.save!
       end
diff --git a/db/migrate/20200425194536_remove_unused_profile_flags.rb b/db/migrate/20200425194536_remove_unused_profile_flags.rb
index 8ce20806..9804b080 100644
--- a/db/migrate/20200425194536_remove_unused_profile_flags.rb
+++ b/db/migrate/20200425194536_remove_unused_profile_flags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveUnusedProfileFlags < ActiveRecord::Migration[5.2]
   def change
     remove_column :users, :admin
diff --git a/db/migrate/20200504214933_update_theme_fields.rb b/db/migrate/20200504214933_update_theme_fields.rb
index ec577f1d..beda7b69 100644
--- a/db/migrate/20200504214933_update_theme_fields.rb
+++ b/db/migrate/20200504214933_update_theme_fields.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UpdateThemeFields < ActiveRecord::Migration[5.2]
   def up
     # CSS file related fields
diff --git a/db/migrate/20200517190138_rename_crop_fields.rb b/db/migrate/20200517190138_rename_crop_fields.rb
index 12e81325..54781a64 100644
--- a/db/migrate/20200517190138_rename_crop_fields.rb
+++ b/db/migrate/20200517190138_rename_crop_fields.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameCropFields < ActiveRecord::Migration[5.2]
   def change
     rename_column :users, :crop_h, :profile_picture_h
diff --git a/db/migrate/20200517192431_remove_paperclip_fields.rb b/db/migrate/20200517192431_remove_paperclip_fields.rb
index 00d4181e..7f4a4d02 100644
--- a/db/migrate/20200517192431_remove_paperclip_fields.rb
+++ b/db/migrate/20200517192431_remove_paperclip_fields.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemovePaperclipFields < ActiveRecord::Migration[5.2]
   def change
     remove_column :users, :profile_picture_content_type
diff --git a/db/migrate/20200704163504_use_timestamped_ids.rb b/db/migrate/20200704163504_use_timestamped_ids.rb
index 49b44bd7..eaf70732 100644
--- a/db/migrate/20200704163504_use_timestamped_ids.rb
+++ b/db/migrate/20200704163504_use_timestamped_ids.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'securerandom'
+require "securerandom"
 
 # This migration changes the IDs of several tables from serial to a
 # timestamped/"snowflake" one.
@@ -13,7 +13,7 @@ class UseTimestampedIds < ActiveRecord::Migration[5.2]
   def up
     # PL/pgSQL is just spicy pascal
     # don't @ me
-    execute <<~SQL
+    execute <<~SQL.squish
       CREATE or replace FUNCTION gen_timestamp_id(tblname text) RETURNS bigint AS $$
       DECLARE
         timepart bigint;
@@ -30,15 +30,15 @@ class UseTimestampedIds < ActiveRecord::Migration[5.2]
 
     # we need to migrate related columns to bigints for this to work
     {
-      question: %i[answers inboxes],
-      answer: %i[comments smiles subscriptions],
-      comment: %i[comment_smiles],
-      user: %i[announcements answers comment_smiles comments inboxes list_members lists moderation_comments moderation_votes questions reports services smiles subscriptions themes users_roles],
+      question:  %i[answers inboxes],
+      answer:    %i[comments smiles subscriptions],
+      comment:   %i[comment_smiles],
+      user:      %i[announcements answers comment_smiles comments inboxes list_members lists moderation_comments moderation_votes questions reports services smiles subscriptions themes users_roles],
 
       # polymorphic tables go brrr
       recipient: %i[notifications],
-      source: %i[relationships],
-      target: %i[notifications relationships reports],
+      source:    %i[relationships],
+      target:    %i[notifications relationships reports],
     }.each do |ref, tbls|
       tbls.each do |tbl|
         say "Migrating #{tbl}.#{ref}_id to bigint"
diff --git a/db/migrate/20201001172537_add_otp_secret_key_to_users.rb b/db/migrate/20201001172537_add_otp_secret_key_to_users.rb
index 59a33b48..31dc4ed6 100644
--- a/db/migrate/20201001172537_add_otp_secret_key_to_users.rb
+++ b/db/migrate/20201001172537_add_otp_secret_key_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddOtpSecretKeyToUsers < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :otp_secret_key, :string
diff --git a/db/migrate/20201101155648_create_totp_recovery_codes.rb b/db/migrate/20201101155648_create_totp_recovery_codes.rb
index 3b506256..1d7fac98 100644
--- a/db/migrate/20201101155648_create_totp_recovery_codes.rb
+++ b/db/migrate/20201101155648_create_totp_recovery_codes.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class CreateTotpRecoveryCodes < ActiveRecord::Migration[5.2]
   def change
     create_table :totp_recovery_codes do |t|
       t.bigint :user_id
       t.string :code, limit: 8
     end
-    add_index :totp_recovery_codes, [:user_id, :code]
+    add_index :totp_recovery_codes, %i[user_id code]
   end
 end
diff --git a/db/migrate/20210811133004_add_direct_to_questions.rb b/db/migrate/20210811133004_add_direct_to_questions.rb
index 092426b9..30632fd6 100644
--- a/db/migrate/20210811133004_add_direct_to_questions.rb
+++ b/db/migrate/20210811133004_add_direct_to_questions.rb
@@ -5,7 +5,7 @@ class AddDirectToQuestions < ActiveRecord::Migration[5.2]
     add_column :questions, :direct, :boolean, null: false, default: false
 
     # default all legacy questions to direct
-    execute 'UPDATE questions SET direct = true;'
+    execute "UPDATE questions SET direct = true;"
 
     # All questions where
     # - the author is not 'justask' (generated questions), and
diff --git a/db/migrate/20210814134115_create_user_bans.rb b/db/migrate/20210814134115_create_user_bans.rb
index a5146c90..7778d590 100644
--- a/db/migrate/20210814134115_create_user_bans.rb
+++ b/db/migrate/20210814134115_create_user_bans.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateUserBans < ActiveRecord::Migration[5.2]
   def up
     create_table :user_bans do |t|
@@ -15,7 +17,6 @@ class CreateUserBans < ActiveRecord::Migration[5.2]
     SELECT users.id, users.ban_reason, users.banned_until, users.updated_at, NOW() FROM users
     WHERE banned_until IS NOT NULL AND NOT permanently_banned;"
 
-
     execute "INSERT INTO user_bans
     (user_id, reason, expires_at, created_at, updated_at)
     SELECT users.id, users.ban_reason, NULL, users.updated_at, NOW() FROM users
diff --git a/db/migrate/20211219153054_create_profiles.rb b/db/migrate/20211219153054_create_profiles.rb
index d6480af9..933be933 100644
--- a/db/migrate/20211219153054_create_profiles.rb
+++ b/db/migrate/20211219153054_create_profiles.rb
@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 class CreateProfiles < ActiveRecord::Migration[5.2]
   def change
     create_table :profiles do |t|
       t.references :user, index: true, foreign_key: true
       t.string :display_name, length: 50
-      t.string :description, length: 200, null: false, default: ''
-      t.string :location, length: 72, null: false, default: ''
-      t.string :website, null: false, default: ''
-      t.string :motivation_header, null: false, default: ''
+      t.string :description, length: 200, null: false, default: ""
+      t.string :location, length: 72, null: false, default: ""
+      t.string :website, null: false, default: ""
+      t.string :motivation_header, null: false, default: ""
 
       t.timestamps
     end
 
     transaction do
-      execute 'INSERT INTO profiles (user_id, display_name, description, location, website, motivation_header, created_at, updated_at) SELECT users.id as user_id, users.display_name, users.bio as description, users.location, users.website, users.motivation_header, users.created_at, users.updated_at FROM users;'
+      execute "INSERT INTO profiles (user_id, display_name, description, location, website, motivation_header, created_at, updated_at) SELECT users.id as user_id, users.display_name, users.bio as description, users.location, users.website, users.motivation_header, users.created_at, users.updated_at FROM users;"
 
       remove_column :users, :display_name
       remove_column :users, :bio
diff --git a/db/migrate/20211222165159_create_mute_rules.rb b/db/migrate/20211222165159_create_mute_rules.rb
index 0e548bc5..57057fc4 100644
--- a/db/migrate/20211222165159_create_mute_rules.rb
+++ b/db/migrate/20211222165159_create_mute_rules.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateMuteRules < ActiveRecord::Migration[5.2]
   def change
     create_table :mute_rules do |t|
diff --git a/db/migrate/20211228135426_add_indexes_to_notifications.rb b/db/migrate/20211228135426_add_indexes_to_notifications.rb
index 15288920..46c9bae9 100644
--- a/db/migrate/20211228135426_add_indexes_to_notifications.rb
+++ b/db/migrate/20211228135426_add_indexes_to_notifications.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddIndexesToNotifications < ActiveRecord::Migration[5.2]
   def change
     add_index :notifications, :recipient_id
diff --git a/db/migrate/20220104180510_add_post_tag_to_services.rb b/db/migrate/20220104180510_add_post_tag_to_services.rb
index ab09c201..85789e8e 100644
--- a/db/migrate/20220104180510_add_post_tag_to_services.rb
+++ b/db/migrate/20220104180510_add_post_tag_to_services.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPostTagToServices < ActiveRecord::Migration[5.2]
   def change
     add_column :services, :post_tag, :string, limit: 20
diff --git a/db/schema.rb b/db/schema.rb
index ea268655..9e2e9bc1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,7 +13,6 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 2023_10_18_172518) do
-
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -51,8 +52,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "pinned_at"
     t.index ["created_at"], name: "index_answers_on_created_at", order: :desc
     t.index ["question_id"], name: "index_answers_on_question_id"
-    t.index ["user_id", "created_at"], name: "index_answers_on_user_id_and_created_at"
-    t.index ["user_id", "pinned_at"], name: "index_answers_on_user_id_and_pinned_at"
+    t.index %w[user_id created_at], name: "index_answers_on_user_id_and_created_at"
+    t.index %w[user_id pinned_at], name: "index_answers_on_user_id_and_pinned_at"
   end
 
   create_table "appendables", force: :cascade do |t|
@@ -63,8 +64,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.text "content"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index ["parent_id", "parent_type"], name: "index_appendables_on_parent_id_and_parent_type"
-    t.index ["user_id", "created_at"], name: "index_appendables_on_user_id_and_created_at"
+    t.index %w[parent_id parent_type], name: "index_appendables_on_parent_id_and_parent_type"
+    t.index %w[user_id created_at], name: "index_appendables_on_user_id_and_created_at"
   end
 
   create_table "comments", id: :bigint, default: -> { "gen_timestamp_id('comments'::text)" }, force: :cascade do |t|
@@ -75,7 +76,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "updated_at"
     t.integer "smile_count", default: 0, null: false
     t.index ["answer_id"], name: "index_comments_on_answer_id"
-    t.index ["user_id", "created_at"], name: "index_comments_on_user_id_and_created_at"
+    t.index %w[user_id created_at], name: "index_comments_on_user_id_and_created_at"
   end
 
   create_table "inboxes", id: :serial, force: :cascade do |t|
@@ -93,7 +94,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "user_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["list_id", "user_id"], name: "index_list_members_on_list_id_and_user_id", unique: true
+    t.index %w[list_id user_id], name: "index_list_members_on_list_id_and_user_id", unique: true
   end
 
   create_table "lists", id: :serial, force: :cascade do |t|
@@ -103,7 +104,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.boolean "private", default: true
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["user_id", "name"], name: "index_lists_on_user_id_and_name", unique: true
+    t.index %w[user_id name], name: "index_lists_on_user_id_and_name", unique: true
   end
 
   create_table "mute_rules", id: :bigint, default: -> { "gen_timestamp_id('mute_rules'::text)" }, force: :cascade do |t|
@@ -150,7 +151,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "updated_at"
     t.integer "answer_count", default: 0, null: false
     t.boolean "direct", default: false, null: false
-    t.index ["user_id", "created_at"], name: "index_questions_on_user_id_and_created_at"
+    t.index %w[user_id created_at], name: "index_questions_on_user_id_and_created_at"
   end
 
   create_table "relationships", id: :serial, force: :cascade do |t|
@@ -159,7 +160,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string "type", null: false
-    t.index ["source_id", "target_id", "type"], name: "index_relationships_on_source_id_and_target_id_and_type", unique: true
+    t.index %w[source_id target_id type], name: "index_relationships_on_source_id_and_target_id_and_type", unique: true
     t.index ["source_id"], name: "index_relationships_on_source_id"
     t.index ["target_id"], name: "index_relationships_on_target_id"
     t.index ["type"], name: "index_relationships_on_type"
@@ -173,8 +174,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "updated_at"
     t.boolean "deleted", default: false
     t.string "reason"
-    t.index ["type", "target_id"], name: "index_reports_on_type_and_target_id"
-    t.index ["user_id", "created_at"], name: "index_reports_on_user_id_and_created_at"
+    t.index %w[type target_id], name: "index_reports_on_type_and_target_id"
+    t.index %w[user_id created_at], name: "index_reports_on_user_id_and_created_at"
   end
 
   create_table "roles", force: :cascade do |t|
@@ -183,8 +184,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "resource_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
-    t.index ["resource_type", "resource_id"], name: "index_roles_on_resource_type_and_resource_id"
+    t.index %w[name resource_type resource_id], name: "index_roles_on_name_and_resource_type_and_resource_id"
+    t.index %w[resource_type resource_id], name: "index_roles_on_resource_type_and_resource_id"
   end
 
   create_table "rpush_apps", force: :cascade do |t|
@@ -253,7 +254,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.string "thread_id"
     t.boolean "dry_run", default: false, null: false
     t.boolean "sound_is_json", default: false
-    t.index ["delivered", "failed", "processing", "deliver_after", "created_at"], name: "index_rpush_notifications_multi", where: "((NOT delivered) AND (NOT failed))"
+    t.index %w[delivered failed processing deliver_after created_at], name: "index_rpush_notifications_multi", where: "((NOT delivered) AND (NOT failed))"
   end
 
   create_table "subscriptions", id: :serial, force: :cascade do |t|
@@ -261,7 +262,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "answer_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["user_id", "answer_id"], name: "index_subscriptions_on_user_id_and_answer_id"
+    t.index %w[user_id answer_id], name: "index_subscriptions_on_user_id_and_answer_id"
   end
 
   create_table "themes", id: :serial, force: :cascade do |t|
@@ -292,13 +293,13 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.integer "input_placeholder", default: 7107965, null: false
     t.integer "raised_text", default: 0, null: false
     t.integer "raised_accent_text", default: 0, null: false
-    t.index ["user_id", "created_at"], name: "index_themes_on_user_id_and_created_at"
+    t.index %w[user_id created_at], name: "index_themes_on_user_id_and_created_at"
   end
 
   create_table "totp_recovery_codes", force: :cascade do |t|
     t.bigint "user_id"
     t.string "code", limit: 8
-    t.index ["user_id", "code"], name: "index_totp_recovery_codes_on_user_id_and_code"
+    t.index %w[user_id code], name: "index_totp_recovery_codes_on_user_id_and_code"
   end
 
   create_table "user_bans", force: :cascade do |t|
@@ -375,7 +376,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "user_id"
     t.bigint "role_id"
     t.index ["role_id"], name: "index_users_roles_on_role_id"
-    t.index ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id"
+    t.index %w[user_id role_id], name: "index_users_roles_on_user_id_and_role_id"
     t.index ["user_id"], name: "index_users_roles_on_user_id"
   end
 
diff --git a/db/seeds.rb b/db/seeds.rb
index 9874789c..8136d5c0 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #

From 0bc40cb59b0fbc63fc6ff3098ce238bdfe931e16 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 01:38:59 +0200
Subject: [PATCH 121/590] Ignore previous commit in blame views

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 19dece1d..2fb6d1c3 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1 +1,2 @@
 71894d6c4987547533606258447b576ecb604c2b
+1532741485af266f7ff04a1d6529abe9807a6815

From 2f573535916302c90d13fca73f376c346ac542ad Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 01:50:24 +0200
Subject: [PATCH 122/590] Remove `squish` call from timestamp function setup

---
 db/migrate/20200704163504_use_timestamped_ids.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20200704163504_use_timestamped_ids.rb b/db/migrate/20200704163504_use_timestamped_ids.rb
index eaf70732..fa52f40d 100644
--- a/db/migrate/20200704163504_use_timestamped_ids.rb
+++ b/db/migrate/20200704163504_use_timestamped_ids.rb
@@ -13,7 +13,7 @@ class UseTimestampedIds < ActiveRecord::Migration[5.2]
   def up
     # PL/pgSQL is just spicy pascal
     # don't @ me
-    execute <<~SQL.squish
+    execute <<~SQL
       CREATE or replace FUNCTION gen_timestamp_id(tblname text) RETURNS bigint AS $$
       DECLARE
         timepart bigint;

From 3dbbcd1b8530d46115297ed92325deb9682ddfb6 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 20 Oct 2023 08:37:07 +0200
Subject: [PATCH 123/590] Revert schema.rb rubocop changes

---
 db/schema.rb | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 9e2e9bc1..ea268655 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -13,6 +11,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 2023_10_18_172518) do
+
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -52,8 +51,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "pinned_at"
     t.index ["created_at"], name: "index_answers_on_created_at", order: :desc
     t.index ["question_id"], name: "index_answers_on_question_id"
-    t.index %w[user_id created_at], name: "index_answers_on_user_id_and_created_at"
-    t.index %w[user_id pinned_at], name: "index_answers_on_user_id_and_pinned_at"
+    t.index ["user_id", "created_at"], name: "index_answers_on_user_id_and_created_at"
+    t.index ["user_id", "pinned_at"], name: "index_answers_on_user_id_and_pinned_at"
   end
 
   create_table "appendables", force: :cascade do |t|
@@ -64,8 +63,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.text "content"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index %w[parent_id parent_type], name: "index_appendables_on_parent_id_and_parent_type"
-    t.index %w[user_id created_at], name: "index_appendables_on_user_id_and_created_at"
+    t.index ["parent_id", "parent_type"], name: "index_appendables_on_parent_id_and_parent_type"
+    t.index ["user_id", "created_at"], name: "index_appendables_on_user_id_and_created_at"
   end
 
   create_table "comments", id: :bigint, default: -> { "gen_timestamp_id('comments'::text)" }, force: :cascade do |t|
@@ -76,7 +75,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "updated_at"
     t.integer "smile_count", default: 0, null: false
     t.index ["answer_id"], name: "index_comments_on_answer_id"
-    t.index %w[user_id created_at], name: "index_comments_on_user_id_and_created_at"
+    t.index ["user_id", "created_at"], name: "index_comments_on_user_id_and_created_at"
   end
 
   create_table "inboxes", id: :serial, force: :cascade do |t|
@@ -94,7 +93,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "user_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index %w[list_id user_id], name: "index_list_members_on_list_id_and_user_id", unique: true
+    t.index ["list_id", "user_id"], name: "index_list_members_on_list_id_and_user_id", unique: true
   end
 
   create_table "lists", id: :serial, force: :cascade do |t|
@@ -104,7 +103,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.boolean "private", default: true
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index %w[user_id name], name: "index_lists_on_user_id_and_name", unique: true
+    t.index ["user_id", "name"], name: "index_lists_on_user_id_and_name", unique: true
   end
 
   create_table "mute_rules", id: :bigint, default: -> { "gen_timestamp_id('mute_rules'::text)" }, force: :cascade do |t|
@@ -151,7 +150,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "updated_at"
     t.integer "answer_count", default: 0, null: false
     t.boolean "direct", default: false, null: false
-    t.index %w[user_id created_at], name: "index_questions_on_user_id_and_created_at"
+    t.index ["user_id", "created_at"], name: "index_questions_on_user_id_and_created_at"
   end
 
   create_table "relationships", id: :serial, force: :cascade do |t|
@@ -160,7 +159,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string "type", null: false
-    t.index %w[source_id target_id type], name: "index_relationships_on_source_id_and_target_id_and_type", unique: true
+    t.index ["source_id", "target_id", "type"], name: "index_relationships_on_source_id_and_target_id_and_type", unique: true
     t.index ["source_id"], name: "index_relationships_on_source_id"
     t.index ["target_id"], name: "index_relationships_on_target_id"
     t.index ["type"], name: "index_relationships_on_type"
@@ -174,8 +173,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.datetime "updated_at"
     t.boolean "deleted", default: false
     t.string "reason"
-    t.index %w[type target_id], name: "index_reports_on_type_and_target_id"
-    t.index %w[user_id created_at], name: "index_reports_on_user_id_and_created_at"
+    t.index ["type", "target_id"], name: "index_reports_on_type_and_target_id"
+    t.index ["user_id", "created_at"], name: "index_reports_on_user_id_and_created_at"
   end
 
   create_table "roles", force: :cascade do |t|
@@ -184,8 +183,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "resource_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index %w[name resource_type resource_id], name: "index_roles_on_name_and_resource_type_and_resource_id"
-    t.index %w[resource_type resource_id], name: "index_roles_on_resource_type_and_resource_id"
+    t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
+    t.index ["resource_type", "resource_id"], name: "index_roles_on_resource_type_and_resource_id"
   end
 
   create_table "rpush_apps", force: :cascade do |t|
@@ -254,7 +253,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.string "thread_id"
     t.boolean "dry_run", default: false, null: false
     t.boolean "sound_is_json", default: false
-    t.index %w[delivered failed processing deliver_after created_at], name: "index_rpush_notifications_multi", where: "((NOT delivered) AND (NOT failed))"
+    t.index ["delivered", "failed", "processing", "deliver_after", "created_at"], name: "index_rpush_notifications_multi", where: "((NOT delivered) AND (NOT failed))"
   end
 
   create_table "subscriptions", id: :serial, force: :cascade do |t|
@@ -262,7 +261,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "answer_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index %w[user_id answer_id], name: "index_subscriptions_on_user_id_and_answer_id"
+    t.index ["user_id", "answer_id"], name: "index_subscriptions_on_user_id_and_answer_id"
   end
 
   create_table "themes", id: :serial, force: :cascade do |t|
@@ -293,13 +292,13 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.integer "input_placeholder", default: 7107965, null: false
     t.integer "raised_text", default: 0, null: false
     t.integer "raised_accent_text", default: 0, null: false
-    t.index %w[user_id created_at], name: "index_themes_on_user_id_and_created_at"
+    t.index ["user_id", "created_at"], name: "index_themes_on_user_id_and_created_at"
   end
 
   create_table "totp_recovery_codes", force: :cascade do |t|
     t.bigint "user_id"
     t.string "code", limit: 8
-    t.index %w[user_id code], name: "index_totp_recovery_codes_on_user_id_and_code"
+    t.index ["user_id", "code"], name: "index_totp_recovery_codes_on_user_id_and_code"
   end
 
   create_table "user_bans", force: :cascade do |t|
@@ -376,7 +375,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "user_id"
     t.bigint "role_id"
     t.index ["role_id"], name: "index_users_roles_on_role_id"
-    t.index %w[user_id role_id], name: "index_users_roles_on_user_id_and_role_id"
+    t.index ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id"
     t.index ["user_id"], name: "index_users_roles_on_user_id"
   end
 

From 198ea0d50df367ab092694b7895a51d5710fe151 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 22 Oct 2023 19:48:04 +0200
Subject: [PATCH 124/590] Use `smile_count` in answerbox

---
 app/views/answerbox/_actions.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/answerbox/_actions.html.haml b/app/views/answerbox/_actions.html.haml
index 5c152abe..a4d59648 100644
--- a/app/views/answerbox/_actions.html.haml
+++ b/app/views/answerbox/_actions.html.haml
@@ -1,6 +1,6 @@
 %button.btn.btn-link.answerbox__action{ type: :button, name: "ab-smile", data: { a_id: a.id, action: current_user&.smiled?(a) ? :unsmile : :smile, selection_hotkey: "s" }, disabled: !user_signed_in? }
   %i.fa.fa-fw.fa-smile-o
-  %span{ id: "ab-smile-count-#{a.id}" }= a.smiles.count
+  %span{ id: "ab-smile-count-#{a.id}" }= a.smile_count
 - unless display_all
   %button.btn.btn-link.answerbox__action{ type: :button, name: "ab-comments", data: { a_id: a.id, state: :hidden, selection_hotkey: "x" } }
     %i.fa.fa-fw.fa-comments

From 491fb359d223276f7f51cf728150ac2efe36f6dc Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 22 Oct 2023 19:51:23 +0200
Subject: [PATCH 125/590] Ensure user profiles and questions are eager loaded

---
 app/controllers/user_controller.rb    | 2 +-
 app/models/answer/timeline_methods.rb | 2 +-
 app/models/list/timeline_methods.rb   | 3 ++-
 app/models/question/answer_methods.rb | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 7b9084b9..7a7be8ef 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -8,7 +8,7 @@ class UserController < ApplicationController
   after_action :mark_notification_as_read, only: %i[show]
 
   def show
-    @pinned_answers = @user.answers.pinned.order(pinned_at: :desc).limit(10)
+    @pinned_answers = @user.answers.pinned.includes([{ user: :profile }, :question]).order(pinned_at: :desc).limit(10)
     paginate_answers { |args| @user.cursored_answers(**args) }
 
     respond_to do |format|
diff --git a/app/models/answer/timeline_methods.rb b/app/models/answer/timeline_methods.rb
index 8c6085bf..3245aa7e 100644
--- a/app/models/answer/timeline_methods.rb
+++ b/app/models/answer/timeline_methods.rb
@@ -6,7 +6,7 @@ module Answer::TimelineMethods
   define_cursor_paginator :cursored_public_timeline, :public_timeline
 
   def public_timeline(current_user: nil)
-    joins(:user)
+    includes([{ user: :profile }, :question])
       .then do |query|
         next query unless current_user
 
diff --git a/app/models/list/timeline_methods.rb b/app/models/list/timeline_methods.rb
index 7909d544..b02d87e3 100644
--- a/app/models/list/timeline_methods.rb
+++ b/app/models/list/timeline_methods.rb
@@ -5,9 +5,10 @@ module List::TimelineMethods
 
   define_cursor_paginator :cursored_timeline, :timeline
 
-  # @return [Array] the lists' timeline
+  # @return [ActiveRecord::Relation<Answer>] the lists' timeline
   def timeline(current_user: nil)
     Answer
+      .includes([{ user: :profile }, :question])
       .then do |query|
         next query unless current_user
 
diff --git a/app/models/question/answer_methods.rb b/app/models/question/answer_methods.rb
index efb94a7b..1a01dc7b 100644
--- a/app/models/question/answer_methods.rb
+++ b/app/models/question/answer_methods.rb
@@ -7,6 +7,7 @@ module Question::AnswerMethods
 
   def ordered_answers(current_user: nil)
     answers
+      .includes([{ user: :profile }, :question])
       .then do |query|
         next query unless current_user
 

From 12ff30a2e61b115d3767e89d5bbb62bfbefbb66a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 22 Oct 2023 20:17:37 +0200
Subject: [PATCH 126/590] Set all theme color inputs to be read-only

---
 app/views/settings/theme/edit.html.haml | 48 ++++++++++++-------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/views/settings/theme/edit.html.haml b/app/views/settings/theme/edit.html.haml
index a5064c23..c1ab1f9d 100644
--- a/app/views/settings/theme/edit.html.haml
+++ b/app/views/settings/theme/edit.html.haml
@@ -18,9 +18,9 @@
 
       .row
         .col-sm-6
-          = f.text_field :background_color, class: "color", data: { default: 0xF0EDF4, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :background_color, class: "color", data: { default: 0xF0EDF4, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :body_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :body_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
   .card
     .card-body
       %h2= t(".raised.heading")
@@ -28,14 +28,14 @@
 
       .row
         .col-sm-6
-          = f.text_field :raised_background, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :raised_background, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :raised_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :raised_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
       .row
         .col-sm-6
-          = f.text_field :raised_accent, class: "color", data: { default: 0xF7F7F7, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :raised_accent, class: "color", data: { default: 0xF7F7F7, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :raised_accent_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :raised_accent_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
     .card-footer
       %p= t(".raised.accent.example")
   .card
@@ -45,56 +45,56 @@
 
       .row
         .col-sm-6
-          = f.text_field :primary_color, class: "color", data: { default: 0x5E35B1, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :primary_color, class: "color", data: { default: 0x5E35B1, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :primary_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :primary_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-12
           .alert.alert-primary= t(".colors.alert.example", type: t(".colors.alert.type.primary"))
       .row
         .col-sm-6
-          = f.text_field :danger_color, class: "color", data: { default: 0xDC3545, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :danger_color, class: "color", data: { default: 0xDC3545, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :danger_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :danger_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-12
           .alert.alert-danger= t(".colors.alert.example", type: t(".colors.alert.type.danger"))
       .row
         .col-sm-6
-          = f.text_field :warning_color, class: "color", data: { default: 0xFFC107, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :warning_color, class: "color", data: { default: 0xFFC107, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :warning_text, class: "color", data: { default: 0x292929, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :warning_text, class: "color", data: { default: 0x292929, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-12
           .alert.alert-warning= t(".colors.alert.example", type: t(".colors.alert.type.warning"))
       .row
         .col-sm-6
-          = f.text_field :info_color, class: "color", data: { default: 0x17A2B8, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :info_color, class: "color", data: { default: 0x17A2B8, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :info_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :info_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-12
           .alert.alert-info= t(".colors.alert.example", type: t(".colors.alert.type.info"))
       .row
         .col-sm-6
-          = f.text_field :success_color, class: "color", data: { default: 0x28A745, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :success_color, class: "color", data: { default: 0x28A745, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :success_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :success_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-12
           .alert.alert-success= t(".colors.alert.example", type: t(".colors.alert.type.success"))
       .row
         .col-sm-6
-          = f.text_field :dark_color, class: "color", data: { default: 0x343A40, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :dark_color, class: "color", data: { default: 0x343A40, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :dark_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :dark_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-12
           %a.btn.btn-dark.mb-3{ href: "#" }= t(".colors.button.example", type: t(".colors.button.type.dark"))
       .row
         .col-sm-6
-          = f.text_field :light_color, class: "color", data: { default: 0xF8F9FA, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :light_color, class: "color", data: { default: 0xF8F9FA, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :light_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :light_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-12
           %a.btn.btn-light.mb-3{ href: "#" }= t(".colors.button.example", type: t(".colors.button.type.light"))
       .row
         .col-sm-6
-          = f.text_field :muted_text, class: "color", data: { default: 0x6C757D, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :muted_text, class: "color", data: { default: 0x6C757D, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
           %p.pt-4.text-muted= t(".colors.text.example")
   .card
@@ -104,13 +104,13 @@
 
       .row
         .col-sm-6
-          = f.text_field :input_color, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :input_color, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
-          = f.text_field :input_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :input_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
 
       .row
         .col-sm-6
-          = f.text_field :input_placeholder, class: "color", data: { default: 0x6C757D, theme_target: "color", action: "theme#updatePreview" }
+          = f.text_field :input_placeholder, class: "color", data: { default: 0x6C757D, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
         .col-sm-6
           .form-group
             %label.form-label Example Input

From 6672315e6b2e6b8cd015858cc6efd551bb772c08 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 22 Oct 2023 20:43:28 +0200
Subject: [PATCH 127/590] Refactor theme inputs into a partial

---
 app/views/settings/theme/_input.html.haml |  2 +
 app/views/settings/theme/edit.html.haml   | 72 ++++++++---------------
 2 files changed, 26 insertions(+), 48 deletions(-)
 create mode 100644 app/views/settings/theme/_input.html.haml

diff --git a/app/views/settings/theme/_input.html.haml b/app/views/settings/theme/_input.html.haml
new file mode 100644
index 00000000..81a1c6ee
--- /dev/null
+++ b/app/views/settings/theme/_input.html.haml
@@ -0,0 +1,2 @@
+.col-sm-6
+  = f.text_field field_name, class: "color", data: { default:, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
diff --git a/app/views/settings/theme/edit.html.haml b/app/views/settings/theme/edit.html.haml
index c1ab1f9d..1d5c84b0 100644
--- a/app/views/settings/theme/edit.html.haml
+++ b/app/views/settings/theme/edit.html.haml
@@ -17,25 +17,19 @@
       %p= t(".general.body")
 
       .row
-        .col-sm-6
-          = f.text_field :background_color, class: "color", data: { default: 0xF0EDF4, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :body_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :background_color, default: 0xF0EDF4
+        = render "settings/theme/input", f:, field_name: :body_text, default: 0x000000
   .card
     .card-body
       %h2= t(".raised.heading")
       %p= t(".raised.body")
 
       .row
-        .col-sm-6
-          = f.text_field :raised_background, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :raised_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :raised_background, default: 0xFFFFFF
+        = render "settings/theme/input", f:, field_name: :raised_text, default: 0x000000
       .row
-        .col-sm-6
-          = f.text_field :raised_accent, class: "color", data: { default: 0xF7F7F7, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :raised_accent_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :raised_accent, default: 0xF7F7F7
+        = render "settings/theme/input", f:, field_name: :raised_accent_text, default: 0x000000
     .card-footer
       %p= t(".raised.accent.example")
   .card
@@ -44,57 +38,42 @@
       %p= t(".colors.body")
 
       .row
-        .col-sm-6
-          = f.text_field :primary_color, class: "color", data: { default: 0x5E35B1, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :primary_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :primary_color, default: 0x5E35B1
+        = render "settings/theme/input", f:, field_name: :primary_text, default: 0xFFFFFF
         .col-sm-12
           .alert.alert-primary= t(".colors.alert.example", type: t(".colors.alert.type.primary"))
       .row
-        .col-sm-6
-          = f.text_field :danger_color, class: "color", data: { default: 0xDC3545, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :danger_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :danger_color, default: 0xDC3545
+        = render "settings/theme/input", f:, field_name: :danger_text, default: 0xFFFFFF
         .col-sm-12
           .alert.alert-danger= t(".colors.alert.example", type: t(".colors.alert.type.danger"))
       .row
-        .col-sm-6
-          = f.text_field :warning_color, class: "color", data: { default: 0xFFC107, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :warning_text, class: "color", data: { default: 0x292929, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :warning_color, default: 0xFFC107
+        = render "settings/theme/input", f:, field_name: :warning_text, default: 0x292929
         .col-sm-12
           .alert.alert-warning= t(".colors.alert.example", type: t(".colors.alert.type.warning"))
       .row
-        .col-sm-6
-          = f.text_field :info_color, class: "color", data: { default: 0x17A2B8, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :info_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :info_color, default: 0x17A2B8
+        = render "settings/theme/input", f:, field_name: :info_text, default: 0xFFFFFF
         .col-sm-12
           .alert.alert-info= t(".colors.alert.example", type: t(".colors.alert.type.info"))
       .row
-        .col-sm-6
-          = f.text_field :success_color, class: "color", data: { default: 0x28A745, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :success_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :success_color, default: 0x28A745
+        = render "settings/theme/input", f:, field_name: :success_text, default: 0xFFFFFF
         .col-sm-12
           .alert.alert-success= t(".colors.alert.example", type: t(".colors.alert.type.success"))
       .row
-        .col-sm-6
-          = f.text_field :dark_color, class: "color", data: { default: 0x343A40, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :dark_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :dark_color, default: 0x343A40
+        = render "settings/theme/input", f:, field_name: :dark_text, default: 0xFFFFFF
         .col-sm-12
           %a.btn.btn-dark.mb-3{ href: "#" }= t(".colors.button.example", type: t(".colors.button.type.dark"))
       .row
-        .col-sm-6
-          = f.text_field :light_color, class: "color", data: { default: 0xF8F9FA, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :light_text, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :light_color, default: 0xF8F9FA
+        = render "settings/theme/input", f:, field_name: :light_text, default: 0xFFFFFF
         .col-sm-12
           %a.btn.btn-light.mb-3{ href: "#" }= t(".colors.button.example", type: t(".colors.button.type.light"))
       .row
-        .col-sm-6
-          = f.text_field :muted_text, class: "color", data: { default: 0x6C757D, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :muted_text, default: 0x6C757D
         .col-sm-6
           %p.pt-4.text-muted= t(".colors.text.example")
   .card
@@ -103,14 +82,11 @@
       %p= t(".forms.body")
 
       .row
-        .col-sm-6
-          = f.text_field :input_color, class: "color", data: { default: 0xFFFFFF, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
-        .col-sm-6
-          = f.text_field :input_text, class: "color", data: { default: 0x000000, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :input_color, default: 0xFFFFFF
+        = render "settings/theme/input", f:, field_name: :input_text, default: 0x000000
 
       .row
-        .col-sm-6
-          = f.text_field :input_placeholder, class: "color", data: { default: 0x6C757D, theme_target: "color", action: "theme#updatePreview" }, readonly: :readonly
+        = render "settings/theme/input", f:, field_name: :input_placeholder, default: 0x6C757D
         .col-sm-6
           .form-group
             %label.form-label Example Input

From a4208f3a9a79fa6c096511a21395c1dcc1d70485 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 21 Oct 2023 00:24:44 +0200
Subject: [PATCH 128/590] Add base `ApplicationComponent`

---
 app/components/application_component.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 app/components/application_component.rb

diff --git a/app/components/application_component.rb b/app/components/application_component.rb
new file mode 100644
index 00000000..d9b18556
--- /dev/null
+++ b/app/components/application_component.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class ApplicationComponent < ViewComponent::Base
+  include ApplicationHelper
+
+  def current_user = helpers.current_user
+
+  def user_signed_in? = helpers.user_signed_in?
+
+end

From 07a423bba053037f2e3b14f663b863bfb2e9e380 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 21 Oct 2023 00:25:08 +0200
Subject: [PATCH 129/590] Add `QuestionComponent`

---
 app/components/question_component.rb          | 24 +++++++++++++++
 .../question_component.en.yml                 |  8 +++++
 .../question_component.html.haml              | 30 +++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 app/components/question_component.rb
 create mode 100644 app/components/question_component/question_component.en.yml
 create mode 100644 app/components/question_component/question_component.html.haml

diff --git a/app/components/question_component.rb b/app/components/question_component.rb
new file mode 100644
index 00000000..82b9cd93
--- /dev/null
+++ b/app/components/question_component.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class QuestionComponent < ApplicationComponent
+  include ApplicationHelper
+  include BootstrapHelper
+  include UserHelper
+
+  def initialize(question:, context_user: nil, collapse: true, hide_avatar: false, profile_question: false)
+    @question = question
+    @context_user = context_user
+    @collapse = true
+    @hide_avatar = hide_avatar
+    @profile_question = profile_question
+  end
+
+  private
+
+  def author_identifier = @question.author_is_anonymous ? @question.author_identifier : nil
+
+  def follower_question? = !@question.author_is_anonymous && !@question.direct && @question.answer_count > 0
+
+  def hide_avatar? = @hide_avatar || @question.author_is_anonymous
+
+end
diff --git a/app/components/question_component/question_component.en.yml b/app/components/question_component/question_component.en.yml
new file mode 100644
index 00000000..3978ea98
--- /dev/null
+++ b/app/components/question_component/question_component.en.yml
@@ -0,0 +1,8 @@
+en:
+  answers:
+    zero: "0 answers"
+    one: "1 answer"
+    other: "%{count} answers"
+  asked_html: "%{user} asked %{time} ago"
+  visible_to_you: "Only visible to you as it was asked directly"
+  visible_mod_mode: "You can see this because you are in moderation view"
diff --git a/app/components/question_component/question_component.html.haml b/app/components/question_component/question_component.html.haml
new file mode 100644
index 00000000..5716b279
--- /dev/null
+++ b/app/components/question_component/question_component.html.haml
@@ -0,0 +1,30 @@
+.d-flex
+  - unless hide_avatar?
+    .flex-shrink-0
+      %a{ href: user_path(@question.user) }
+        = render AvatarComponent.new(user: @question.user, size: "md", classes: ["question__avatar"])
+  .flex-grow-1
+    %h6.text-muted.question__user
+      - if @question.author_is_anonymous
+        %i.fas.fa-user-secret{ title: t(".anon_hint") }
+      - if @profile_question && @question.direct
+        - if user_signed_in? && @question.user == current_user
+          %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_to_you") } }
+        - elsif moderation_view?
+          %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_mod_mode") } }
+      = t(".asked_html", user: user_screen_name(@question.user, context_user: @context_user, author_identifier: author_identifier), time: time_tooltip(@question))
+      - if follower_question?
+        ·
+        %a{ href: question_path(@question.user.screen_name, @question.id), data: { selection_hotkey: "a" } }
+          = t(".answers", count: @question.answer_count)
+    .question__body{ data: { controller: @question.long? ? "collapse" : nil } }
+      .question__text{ class: @question.long? && @collapse ? "collapsed" : "", data: { collapse_target: "content" } }
+        = question_markdown @question.content
+      - if @question.long? && @collapse
+        = render "shared/collapse", type: "question"
+  - if user_signed_in?
+    .flex-shrink-0.ms-auto
+      .btn-group
+        %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
+          %span.caret
+        = render "actions/question", question: @question

From 36b13c536603b4e65f8eebf3cfd4369940481728 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 21 Oct 2023 00:25:51 +0200
Subject: [PATCH 130/590] Extract question styling from answerbox

---
 .../stylesheets/components/_answerbox.scss    |  3 --
 .../stylesheets/components/_question.scss     | 30 ++++++++++++-------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/components/_answerbox.scss b/app/assets/stylesheets/components/_answerbox.scss
index e0e3936f..ed550dc6 100644
--- a/app/assets/stylesheets/components/_answerbox.scss
+++ b/app/assets/stylesheets/components/_answerbox.scss
@@ -1,8 +1,6 @@
 @use "sass:map";
 
 .answerbox {
-  &__question-text,
-  &__question-user,
   &__answer-user,
   &__answer-date {
     margin-bottom: 0;
@@ -25,7 +23,6 @@
     margin-bottom: map.get($spacers, 3);
   }
 
-  &__question-user-avatar,
   &__answer-user-avatar {
     margin-right: map.get($spacers, 2);
     border-radius: $avatar-border-radius;
diff --git a/app/assets/stylesheets/components/_question.scss b/app/assets/stylesheets/components/_question.scss
index 7d03e06b..1a32ded7 100644
--- a/app/assets/stylesheets/components/_question.scss
+++ b/app/assets/stylesheets/components/_question.scss
@@ -1,18 +1,26 @@
+@use "sass:map";
+
 .question {
-  &--fixed {
-    position: absolute;
+
+  &__avatar {
+    margin-right: map.get($spacers, 2);
+    border-radius: $avatar-border-radius;
+  }
+
+  &__text,
+  &__user {
+    margin-bottom: 0;
+    overflow: hidden;
+    word-break: break-word;
+  }
+
+  &--sticky {
+    border-radius: 0;
     width: 100%;
-    z-index: 999;
 
     @include media-breakpoint-up('sm') {
-      position: fixed;
+      position: sticky;
+      top: $navbar-height;
     }
   }
-
-  &--hidden {
-    visibility: hidden;
-    position: relative;
-    box-shadow: none;
-    z-index: -1;
-  }
 }

From e6bd19790a1999f1736d22125c5fe738bb222b6e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 21 Oct 2023 00:27:36 +0200
Subject: [PATCH 131/590] Replace question markup with `QuestionComponent`

---
 app/views/application/_answerbox.html.haml |  3 ++-
 app/views/inbox/_entry.html.haml           | 26 +-------------------
 app/views/question/show.html.haml          |  6 +++--
 app/views/shared/_question.html.haml       | 28 +---------------------
 4 files changed, 8 insertions(+), 55 deletions(-)

diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml
index 47010105..de1349f1 100644
--- a/app/views/application/_answerbox.html.haml
+++ b/app/views/application/_answerbox.html.haml
@@ -1,7 +1,8 @@
 - display_all ||= nil
 .card.answerbox{ data: { id: a.id, q_id: a.question.id, navigation_target: "traversable" } }
   - if @question.nil?
-    = render "answerbox/header", a: a, display_all: display_all
+    .card-header
+      = render QuestionComponent.new(question: a.question, context_user: a.user, collapse: !display_all)
   .card-body
     .answerbox__answer-body{ data: { controller: a.long? ? "collapse" : nil } }
       .answerbox__answer-text{ class: a.long? && !display_all ? "collapsed" : "", data: { collapse_target: "content" } }
diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 873d3795..4c9bd37b 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -1,30 +1,6 @@
 .card.inbox-entry{ id: "inbox_#{i.id}", class: i.new? ? "inbox-entry--new" : "", data: { id: i.id } }
   .card-header
-    .d-flex
-      - unless i.question.author_is_anonymous
-        .flex-shrink-0
-          %a.pull-left{ href: user_path(i.question.user) }
-            = render AvatarComponent.new(user: i.question.user, size: "md", classes: ["answerbox__question-user-avatar"])
-      .flex-grow-1
-        %h6.text-muted.answerbox__question-user
-          - if i.question.author_is_anonymous
-            %i.fas.fa-user-secret{ title: t('.anon_hint') }
-          = t(".asked_html", user: user_screen_name(i.question.user, context_user: i.user, author_identifier: i.question.author_is_anonymous ? i.question.author_identifier : nil), time: time_tooltip(i.question))
-          - if !i.question.author_is_anonymous && i.question.answer_count.positive?
-            ·
-            %a{ href: question_path(i.question.user.screen_name, i.question.id) }
-              = t(".answers", count: i.question.answer_count)
-        .answerbox__question-body{ data: { controller: i.question.long? ? "collapse" : nil } }
-          .answerbox__question-text{ class: i.question.long? ? "collapsed" : "", data: { collapse_target: "content" } }
-            = question_markdown i.question.content
-          - if i.question.long?
-            = render "shared/collapse", type: "question"
-      - if i.question.user_id != current_user.id || current_user.has_cached_role?(:administrator)
-        .flex-shrink-0.ms-auto
-          .btn-group
-            %button.btn.btn-default.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
-              %span.caret
-            = render "actions/question", question: i.question
+    = render QuestionComponent.new(question: i.question, context_user: i.user)
   - if current_user == i.user
     .card-body
       %textarea.form-control.mb-3{ name: "ib-answer", placeholder: t(".placeholder"), data: { id: i.id } }
diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index e1d0b238..96651790 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -1,6 +1,8 @@
 - provide(:title, question_title(@question))
-= render "question", question: @question, hidden: false
-= render "question", question: @question, hidden: true
+.card.question--sticky
+  .container
+    .card-body
+      = render QuestionComponent.new(question: @question)
 .container.question-page
   #answers{ data: { controller: "navigation" } }
     %button.d-none{ data: { hotkey: "j", action: "navigation#down" } }
diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml
index 6ebd7d93..022cc71a 100644
--- a/app/views/shared/_question.html.haml
+++ b/app/views/shared/_question.html.haml
@@ -1,30 +1,4 @@
 - type ||= nil
 .card.questionbox{ data: { id: q.id } }
   .card-body{ data: { controller: q.long? ? "collapse" : nil } }
-    .d-flex
-      - if type == "discover"
-        .flex-shrink-0
-          %a{ href: user_screen_name(q.user, link_only: true) }
-            = render AvatarComponent.new(user: q.user, size: "md", classes: ["me-2"])
-      .flex-grow-1
-        %h6.text-muted.answerbox__question-user
-          - if type.nil? && q.direct
-            - if user_signed_in? && q.user == current_user
-              %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_to_you") } }
-            - elsif moderation_view?
-              %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_mod_mode") } }
-          = t("answerbox.header.asked_html", user: user_screen_name(q.user), time: time_tooltip(q))
-          - if q.answer_count > 1
-            ·
-            %a{ href: question_path(q.user.screen_name, q.id) }
-              = pluralize(q.answer_count, t("voc.answer"))
-        .answerbox__question-text{ class: q.long? ? "collapsed" : "", data: { collapse_target: "content" } }
-          = question_markdown q.content
-        - if q.long?
-          = render "shared/collapse", type: "question"
-      - if user_signed_in?
-        .flex-shrink-0.ms-auto
-          .btn-group
-            %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
-              %span.caret
-            = render "actions/question", question: q
+    = render QuestionComponent.new(question: q, hide_avatar: type == "discover" ? false : true, profile_question: true)

From c4959ae548ca0f0134da6c89a82c1f8c4c406c57 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 21 Oct 2023 00:27:58 +0200
Subject: [PATCH 132/590] Remove obsolete question-related partials

---
 app/views/answerbox/_header.html.haml  | 26 -------------------------
 app/views/question/_question.html.haml | 27 --------------------------
 2 files changed, 53 deletions(-)
 delete mode 100644 app/views/answerbox/_header.html.haml
 delete mode 100644 app/views/question/_question.html.haml

diff --git a/app/views/answerbox/_header.html.haml b/app/views/answerbox/_header.html.haml
deleted file mode 100644
index 37f5b406..00000000
--- a/app/views/answerbox/_header.html.haml
+++ /dev/null
@@ -1,26 +0,0 @@
-.card-header
-  .d-flex
-    - unless a.question.author_is_anonymous
-      .flex-shrink-0
-        %a{ href: user_path(a.question.user) }
-          = render AvatarComponent.new(user: a.question.user, size: "md", classes: ["answerbox__question-user-avatar"])
-    .flex-grow-1
-      %h6.text-muted.answerbox__question-user
-        - if a.question.author_is_anonymous
-          %i.fas.fa-user-secret{ title: t(".anon_hint") }
-        = t(".asked_html", user: user_screen_name(a.question.user, context_user: a.user, author_identifier: a.question.author_is_anonymous ? a.question.author_identifier: nil), time: time_tooltip(a.question))
-        - if !a.question.author_is_anonymous && !a.question.direct
-          ·
-          %a{ href: question_path(a.question.user.screen_name, a.question.id), data: { selection_hotkey: "a" } }
-            = t(".answers", count: a.question.answer_count)
-      .answerbox__question-body{ data: { controller: a.question.long? ? "collapse" : nil } }
-        .answerbox__question-text{ class: a.question.long? && !display_all ? "collapsed" : "", data: { collapse_target: "content" } }
-          = question_markdown a.question.content
-        - if a.question.long? && !display_all
-          = render "shared/collapse", type: "question"
-    - if user_signed_in?
-      .flex-shrink-0.ms-auto
-        .btn-group
-          %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
-            %span.caret
-          = render "actions/question", question: a.question
diff --git a/app/views/question/_question.html.haml b/app/views/question/_question.html.haml
deleted file mode 100644
index c25594f0..00000000
--- a/app/views/question/_question.html.haml
+++ /dev/null
@@ -1,27 +0,0 @@
-.card.question--fixed{ class: hidden ? 'question--hidden' : '', tabindex: hidden ? -1 : '', aria: { hidden: hidden } }
-  .container
-    .card-body
-      .d-flex
-        - unless question.author_is_anonymous
-          .flex-shrink-0
-            %a{ href: unless hidden then user_path(question.user) end }
-              = render AvatarComponent.new(user: question.user, size: "md", classes: ["answerbox__question-user-avatar"])
-        .flex-grow-1
-          %h6.text-muted.answerbox__question-user
-            - identifier = question.author_is_anonymous ? question.author_identifier : nil
-            - if hidden
-              = user_screen_name question.user, author_identifier: identifier, url: false
-            - else
-              = t("answerbox.header.asked_html", user: user_screen_name(question.user, author_identifier: identifier), time: time_tooltip(question))
-          .answerbox__question-body{ data: { controller: question.long? ? "collapse" : nil } }
-            .answerbox__question-text{ class: question.long? ? "collapsed" : "", data: { collapse_target: "content" } }
-              = question_markdown question.content
-            - if question.long?
-              = render "shared/collapse", type: "question"
-        - if user_signed_in?
-          .flex-shrink-0.ms-auto
-            .btn-group
-              %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
-                %span.caret
-              - unless hidden
-                = render "actions/question", question: question

From c09cc85c4f5262867ae39ea4ca6a9a5f42abda88 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 21 Oct 2023 00:28:50 +0200
Subject: [PATCH 133/590] Adjust class references to question CSS classes

---
 app/assets/stylesheets/components/_collapse.scss   | 2 +-
 app/javascript/retrospring/features/memes/index.ts | 4 ++--
 app/views/discover/_userbox.html.haml              | 4 ++--
 app/views/moderation/inbox/_header.html.haml       | 2 +-
 spec/views/inbox/_entry.html.haml_spec.rb          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/components/_collapse.scss b/app/assets/stylesheets/components/_collapse.scss
index 0f8afd60..a54dfca0 100644
--- a/app/assets/stylesheets/components/_collapse.scss
+++ b/app/assets/stylesheets/components/_collapse.scss
@@ -12,7 +12,7 @@
     }
   }
 
-  &.answerbox__question-text {
+  &.question__text {
     max-height: 15rem;
 
     @include media-breakpoint-up('sm') {
diff --git a/app/javascript/retrospring/features/memes/index.ts b/app/javascript/retrospring/features/memes/index.ts
index fe509ce7..9f74598f 100644
--- a/app/javascript/retrospring/features/memes/index.ts
+++ b/app/javascript/retrospring/features/memes/index.ts
@@ -4,8 +4,8 @@ export default (): void => {
   cheet('up up down down left right left right b a', () => {
     document.body.classList.add('fa-spin');
 
-    Array.from(document.querySelectorAll('.answerbox__question-text')).forEach((element: HTMLElement) => {
+    Array.from(document.querySelectorAll('.question__text')).forEach((element: HTMLElement) => {
       element.innerText = ':^)';
     });
   });
-}
\ No newline at end of file
+}
diff --git a/app/views/discover/_userbox.html.haml b/app/views/discover/_userbox.html.haml
index 165ccc51..8293104b 100644
--- a/app/views/discover/_userbox.html.haml
+++ b/app/views/discover/_userbox.html.haml
@@ -5,7 +5,7 @@
         %a{ href: user_path(u) }
           = render AvatarComponent.new(user: u, size: "md", classes: ["me-2"])
       .flex-grow-1
-        %h6.answerbox__question-user
+        %h6.question__user
           - if u.profile.display_name.blank?
             %a{ href: user_path(u) }
               = u.screen_name
@@ -13,4 +13,4 @@
             %a{ href: user_path(u) }
               = u.profile.display_name
             %span.text-muted= u.screen_name
-        %p.answerbox__question-text= t(".#{type}", value: value, count: value)
+        %p.question__text= t(".#{type}", value: value, count: value)
diff --git a/app/views/moderation/inbox/_header.html.haml b/app/views/moderation/inbox/_header.html.haml
index cd57e8d8..14d9f868 100644
--- a/app/views/moderation/inbox/_header.html.haml
+++ b/app/views/moderation/inbox/_header.html.haml
@@ -4,6 +4,6 @@
       .d-flex
         .flex-shrink-0
           %a{ href: user_path(user) }
-            = render AvatarComponent.new(user:, size: "md", classes: ["answerbox__question-user-avatar"])
+            = render AvatarComponent.new(user:, size: "md", classes: ["question__avatar"])
         .flex-grow-1
           = t(".title_html", screen_name: user.screen_name, user_id: user.id)
diff --git a/spec/views/inbox/_entry.html.haml_spec.rb b/spec/views/inbox/_entry.html.haml_spec.rb
index a94c2c1c..111cef6f 100644
--- a/spec/views/inbox/_entry.html.haml_spec.rb
+++ b/spec/views/inbox/_entry.html.haml_spec.rb
@@ -45,7 +45,7 @@ describe "inbox/_entry.html.haml", type: :view do
     let(:author_is_anonymous) { false }
 
     it "has an avatar" do
-      expect(rendered).to have_css(%(img.answerbox__question-user-avatar))
+      expect(rendered).to have_css(%(img.question__avatar))
     end
 
     it "does not have an icon indicating the author is anonymous" do

From 80477d17ac0e2437dff1fda38d69ec0691f1c579 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 21 Oct 2023 00:29:10 +0200
Subject: [PATCH 134/590] Remove transferred locales

---
 config/locales/views.en.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 8613ff57..1af7cb01 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -584,9 +584,6 @@ en:
     anonymous_block:
       deleted_question: "Deleted question"
       blocked: "blocked %{time} ago"
-    question:
-      visible_to_you: "Only visible to you as it was asked directly"
-      visible_mod_mode: "You can see this because you are in moderation view"
     hotkeys:
       navigation:
         title: "Navigation"

From 778d4c7b444d437ffb8c92d0479039b71d0a39f0 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 21 Oct 2023 00:53:30 +0200
Subject: [PATCH 135/590] Tighten inbox entry view spec

Non-direct questions can't have a non-null answer count
---
 spec/views/inbox/_entry.html.haml_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/views/inbox/_entry.html.haml_spec.rb b/spec/views/inbox/_entry.html.haml_spec.rb
index 111cef6f..c8df132f 100644
--- a/spec/views/inbox/_entry.html.haml_spec.rb
+++ b/spec/views/inbox/_entry.html.haml_spec.rb
@@ -8,7 +8,7 @@ describe "inbox/_entry.html.haml", type: :view do
   let(:user)                { FactoryBot.create(:user, sharing_enabled:, sharing_custom_url:) }
   let(:sharing_enabled)     { true }
   let(:sharing_custom_url)  { nil }
-  let(:question)            { FactoryBot.create(:question, content: "owo what's this?", author_is_anonymous:, user: question_user, answer_count:) }
+  let(:question)            { FactoryBot.create(:question, content: "owo what's this?", author_is_anonymous:, user: question_user, answer_count:, direct: false) }
   let(:author_is_anonymous) { true }
   let(:question_user)       { nil }
   let(:answer_count)        { 0 }

From e01e973d767bac9078710f5436392ea066fdf882 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
Date: Sun, 22 Oct 2023 17:42:56 +0200
Subject: [PATCH 136/590] Apply review suggestion from @nilsding

Co-authored-by: Georg Gadinger <nilsding@nilsding.org>
---
 app/components/question_component.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/question_component.rb b/app/components/question_component.rb
index 82b9cd93..afebfdda 100644
--- a/app/components/question_component.rb
+++ b/app/components/question_component.rb
@@ -8,7 +8,7 @@ class QuestionComponent < ApplicationComponent
   def initialize(question:, context_user: nil, collapse: true, hide_avatar: false, profile_question: false)
     @question = question
     @context_user = context_user
-    @collapse = true
+    @collapse = collapse
     @hide_avatar = hide_avatar
     @profile_question = profile_question
   end

From b5347decb41a96e0131971af7ace7444b1c3c91e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 22 Oct 2023 21:00:25 +0200
Subject: [PATCH 137/590] Fix rubocop nits

---
 app/components/application_component.rb | 7 ++-----
 app/components/question_component.rb    | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/components/application_component.rb b/app/components/application_component.rb
index d9b18556..0be055fa 100644
--- a/app/components/application_component.rb
+++ b/app/components/application_component.rb
@@ -2,9 +2,6 @@
 
 class ApplicationComponent < ViewComponent::Base
   include ApplicationHelper
-
-  def current_user = helpers.current_user
-
-  def user_signed_in? = helpers.user_signed_in?
-
+  delegate :current_user, to: :helpers
+  delegate :user_signed_in?, to: :helpers
 end
diff --git a/app/components/question_component.rb b/app/components/question_component.rb
index afebfdda..f14a1de3 100644
--- a/app/components/question_component.rb
+++ b/app/components/question_component.rb
@@ -17,8 +17,7 @@ class QuestionComponent < ApplicationComponent
 
   def author_identifier = @question.author_is_anonymous ? @question.author_identifier : nil
 
-  def follower_question? = !@question.author_is_anonymous && !@question.direct && @question.answer_count > 0
+  def follower_question? = !@question.author_is_anonymous && !@question.direct && @question.answer_count.positive?
 
   def hide_avatar? = @hide_avatar || @question.author_is_anonymous
-
 end

From 65e802f51d8a3c18798ca884ea285356122fe21e Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 22 Oct 2023 21:51:21 +0200
Subject: [PATCH 138/590] Stop eager loading comments and smiles

---
 app/controllers/answer_controller.rb | 2 +-
 app/models/user/answer_methods.rb    | 2 +-
 app/models/user/timeline_methods.rb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/answer_controller.rb b/app/controllers/answer_controller.rb
index 2a6e5625..1b3a7ca3 100644
--- a/app/controllers/answer_controller.rb
+++ b/app/controllers/answer_controller.rb
@@ -8,7 +8,7 @@ class AnswerController < ApplicationController
   turbo_stream_actions :pin, :unpin
 
   def show
-    @answer = Answer.includes(comments: %i[user smiles], question: [:user], smiles: [:user]).find(params[:id])
+    @answer = Answer.includes(question: [:user], smiles: [:user]).find(params[:id])
     @display_all = true
     @subscribed_answer_ids = []
 
diff --git a/app/models/user/answer_methods.rb b/app/models/user/answer_methods.rb
index e40eb82b..74e1a44e 100644
--- a/app/models/user/answer_methods.rb
+++ b/app/models/user/answer_methods.rb
@@ -10,6 +10,6 @@ module User::AnswerMethods
     answers
       .order(:created_at)
       .reverse_order
-      .includes(comments: %i[user smiles], question: { user: :profile }, smiles: [:user])
+      .includes(question: { user: [:profile] })
   end
 end
diff --git a/app/models/user/timeline_methods.rb b/app/models/user/timeline_methods.rb
index 822f9d8f..79da93d3 100644
--- a/app/models/user/timeline_methods.rb
+++ b/app/models/user/timeline_methods.rb
@@ -21,6 +21,6 @@ module User::TimelineMethods
       .where("answers.user_id in (?) OR answers.user_id = ?", following_ids, id)
       .order(:created_at)
       .reverse_order
-      .includes(comments: %i[user smiles], question: { user: :profile }, user: [:profile], smiles: [:user])
+      .includes(question: { user: [:profile] }, user: [:profile])
   end
 end

From 8ac50878be020de74085b861d6737e4458ef4f8e Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 22 Oct 2023 21:52:04 +0200
Subject: [PATCH 139/590] Use load_async for loading pinned answers

---
 app/controllers/user_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 7a7be8ef..1e9940d4 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -8,7 +8,7 @@ class UserController < ApplicationController
   after_action :mark_notification_as_read, only: %i[show]
 
   def show
-    @pinned_answers = @user.answers.pinned.includes([{ user: :profile }, :question]).order(pinned_at: :desc).limit(10)
+    @pinned_answers = @user.answers.pinned.includes([{ user: :profile }, :question]).order(pinned_at: :desc).limit(10).load_async
     paginate_answers { |args| @user.cursored_answers(**args) }
 
     respond_to do |format|

From c9030d5ca19294237e58df73c15bd647acca1753 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 09:45:45 +0000
Subject: [PATCH 140/590] Bump stylelint from 15.10.3 to 15.11.0

Bumps [stylelint](https://github.com/stylelint/stylelint) from 15.10.3 to 15.11.0.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint/compare/15.10.3...15.11.0)

---
updated-dependencies:
- dependency-name: stylelint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 64 +++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 030eaa23..b8590e5e 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "esbuild": "^0.17.0",
     "eslint": "^7.16.0",
     "eslint-plugin-import": "^2.28.1",
-    "stylelint": "^15.10.3",
+    "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.0.0",
     "stylelint-scss": "^5.2.1"
   }
diff --git a/yarn.lock b/yarn.lock
index 27103891..790b5faa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -699,10 +699,10 @@ cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-css-functions-list@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.0.tgz#8290b7d064bf483f48d6559c10e98dc4d1ad19ee"
-  integrity sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==
+css-functions-list@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.1.tgz#2eb205d8ce9f9ce74c5c1d7490b66b77c45ce3ea"
+  integrity sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==
 
 css-tree@^2.3.1:
   version "2.3.1"
@@ -1195,6 +1195,13 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+file-entry-cache@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-7.0.1.tgz#c71b3509badb040f362255a53e21f15a4e74fc0f"
+  integrity sha512-uLfFktPmRetVCbHe5UPuekWrQ6hENufnA46qEGbfACkK5drjTTdQYUragRgMjHldcbYG+nslUerqMPjbBSHXjQ==
+  dependencies:
+    flat-cache "^3.1.1"
+
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -1218,11 +1225,25 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
+flat-cache@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b"
+  integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==
+  dependencies:
+    flatted "^3.2.9"
+    keyv "^4.5.3"
+    rimraf "^3.0.2"
+
 flatted@^3.1.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"
   integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
 
+flatted@^3.2.9:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
+  integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
+
 for-each@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
@@ -1743,6 +1764,11 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
@@ -1770,6 +1796,13 @@ json5@^1.0.2:
   dependencies:
     minimist "^1.2.0"
 
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
@@ -1780,6 +1813,11 @@ known-css-properties@^0.28.0:
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.28.0.tgz#8a8be010f368b3036fe6ab0ef4bbbed972bd6274"
   integrity sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==
 
+known-css-properties@^0.29.0:
+  version "0.29.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.29.0.tgz#e8ba024fb03886f23cb882e806929f32d814158f"
+  integrity sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==
+
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -2115,7 +2153,7 @@ postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.27:
+postcss@^8.4.28:
   version "8.4.31"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
   integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
@@ -2486,10 +2524,10 @@ stylelint-scss@^5.1.0, stylelint-scss@^5.2.1:
     postcss-selector-parser "^6.0.13"
     postcss-value-parser "^4.2.0"
 
-stylelint@^15.10.3:
-  version "15.10.3"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.10.3.tgz#995e4512fdad450fb83e13f3472001f6edb6469c"
-  integrity sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==
+stylelint@^15.11.0:
+  version "15.11.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.11.0.tgz#3ff8466f5f5c47362bc7c8c9d382741c58bc3292"
+  integrity sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==
   dependencies:
     "@csstools/css-parser-algorithms" "^2.3.1"
     "@csstools/css-tokenizer" "^2.2.0"
@@ -2498,12 +2536,12 @@ stylelint@^15.10.3:
     balanced-match "^2.0.0"
     colord "^2.9.3"
     cosmiconfig "^8.2.0"
-    css-functions-list "^3.2.0"
+    css-functions-list "^3.2.1"
     css-tree "^2.3.1"
     debug "^4.3.4"
     fast-glob "^3.3.1"
     fastest-levenshtein "^1.0.16"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^7.0.0"
     global-modules "^2.0.0"
     globby "^11.1.0"
     globjoin "^0.1.4"
@@ -2512,13 +2550,13 @@ stylelint@^15.10.3:
     import-lazy "^4.0.0"
     imurmurhash "^0.1.4"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.28.0"
+    known-css-properties "^0.29.0"
     mathml-tag-names "^2.1.3"
     meow "^10.1.5"
     micromatch "^4.0.5"
     normalize-path "^3.0.0"
     picocolors "^1.0.0"
-    postcss "^8.4.27"
+    postcss "^8.4.28"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-safe-parser "^6.0.0"
     postcss-selector-parser "^6.0.13"

From cd3e3f683c5273be65eeecc55fa07e44d3ecc875 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 09:46:09 +0000
Subject: [PATCH 141/590] Bump sass from 1.69.3 to 1.69.4

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.3 to 1.69.4.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.3...1.69.4)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 030eaa23..f74fba3d 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.69.3",
+    "sass": "^1.69.4",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.2.2"
diff --git a/yarn.lock b/yarn.lock
index 27103891..8284d767 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2268,10 +2268,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.69.3:
-  version "1.69.3"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.3.tgz#f8a0c488697e6419519834a13335e7b65a609c11"
-  integrity sha512-X99+a2iGdXkdWn1akFPs0ZmelUzyAQfvqYc2P/MPTrJRuIRoTffGzT9W9nFqG00S+c8hXzVmgxhUuHFdrwxkhQ==
+sass@^1.69.4:
+  version "1.69.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.4.tgz#10c735f55e3ea0b7742c6efa940bce30e07fbca2"
+  integrity sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 319592bef0cb5644cf041f4de6a4b17cacb904cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 09:48:49 +0000
Subject: [PATCH 142/590] Bump actions/checkout from 4.1.0 to 4.1.1

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml     | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/lint.yml            | 8 ++++----
 .github/workflows/retrospring.yml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 88760a4d..9d1f180e 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -20,7 +20,7 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: Discover build-time variables
         run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a28d196c..cfe3e67d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 297ca717..a30800bb 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v39
@@ -37,7 +37,7 @@ jobs:
     name: ESLint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v39
@@ -63,7 +63,7 @@ jobs:
   haml-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v39
@@ -86,7 +86,7 @@ jobs:
   stylelint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v39
diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index 4ab0ab64..c08facae 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -41,7 +41,7 @@ jobs:
       BUNDLE_WITHOUT: 'production'
 
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - name: Install dependencies
         run: sudo apt update && sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev libmagickwand-dev imagemagick libidn11-dev
       - name: Set up Ruby

From 2029c177352165bbe4fcd3b135a81720855a7fd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 10:00:24 +0000
Subject: [PATCH 143/590] Bump net-imap from 0.4.1 to 0.4.2

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.1 to 0.4.2.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.1...v0.4.2)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9c41da07..d669b99d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.1)
+    net-imap (0.4.2)
       date
       net-protocol
     net-pop (0.1.2)

From d926346f221c58ea71e8f28c6262b999617a4fa6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 19:33:29 +0000
Subject: [PATCH 144/590] Bump eslint-plugin-import from 2.28.1 to 2.29.0

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.1 to 2.29.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.28.1...v2.29.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 510 ++++++++++++++++++++++-----------------------------
 2 files changed, 217 insertions(+), 295 deletions(-)

diff --git a/package.json b/package.json
index a9549efe..4279333e 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "@typescript-eslint/parser": "^4.11.0",
     "esbuild": "^0.17.0",
     "eslint": "^7.16.0",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-import": "^2.29.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.0.0",
     "stylelint-scss": "^5.2.1"
diff --git a/yarn.lock b/yarn.lock
index 269ddd43..12e78b10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -449,15 +449,15 @@ array-buffer-byte-length@^1.0.0:
     call-bind "^1.0.2"
     is-array-buffer "^3.0.1"
 
-array-includes@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
-  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+array-includes@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
     is-string "^1.0.7"
 
 array-union@^2.1.0:
@@ -465,45 +465,46 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.findlastindex@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz#bc229aef98f6bd0533a2bc61ff95209875526c9b"
-  integrity sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==
+array.prototype.findlastindex@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207"
+  integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
-    get-intrinsic "^1.1.3"
+    get-intrinsic "^1.2.1"
 
-array.prototype.flat@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.flatmap@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
-  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-arraybuffer.prototype.slice@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
-  integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
   dependencies:
     array-buffer-byte-length "^1.0.0"
     call-bind "^1.0.2"
     define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     get-intrinsic "^1.2.1"
     is-array-buffer "^3.0.2"
     is-shared-array-buffer "^1.0.2"
@@ -584,6 +585,15 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.4, call-bind@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
+  dependencies:
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -754,6 +764,15 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
+define-data-property@^1.0.1, define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
 define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -817,91 +836,26 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
-    is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
-
-es-abstract@^1.20.4:
-  version "1.21.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6"
-  integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    es-set-tostringtag "^2.0.1"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
-    get-symbol-description "^1.0.0"
-    globalthis "^1.0.3"
-    gopd "^1.0.1"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.4"
-    is-array-buffer "^3.0.1"
-    is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-typed-array "^1.1.10"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
-    typed-array-length "^1.0.4"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
-
-es-abstract@^1.21.2:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
-  integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
+es-abstract@^1.22.1:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
+  integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
   dependencies:
     array-buffer-byte-length "^1.0.0"
-    arraybuffer.prototype.slice "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.2"
     available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    call-bind "^1.0.5"
     es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.2"
     get-symbol-description "^1.0.0"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has "^1.0.3"
     has-property-descriptors "^1.0.0"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
     internal-slot "^1.0.5"
     is-array-buffer "^3.0.2"
     is-callable "^1.2.7"
@@ -909,23 +863,23 @@ es-abstract@^1.21.2:
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.12"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.3"
+    object-inspect "^1.13.1"
     object-keys "^1.1.1"
     object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.0"
-    safe-array-concat "^1.0.0"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
     safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.7"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
     typed-array-buffer "^1.0.0"
     typed-array-byte-length "^1.0.0"
     typed-array-byte-offset "^1.0.0"
     typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.10"
+    which-typed-array "^1.1.13"
 
 es-set-tostringtag@^2.0.1:
   version "2.0.1"
@@ -990,14 +944,14 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.11.0"
-    resolve "^1.22.1"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
 eslint-module-utils@^2.8.0:
   version "2.8.0"
@@ -1006,26 +960,26 @@ eslint-module-utils@^2.8.0:
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-import@^2.28.1:
-  version "2.28.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz#63b8b5b3c409bfc75ebaf8fb206b07ab435482c4"
-  integrity sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==
+eslint-plugin-import@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
+  integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
   dependencies:
-    array-includes "^3.1.6"
-    array.prototype.findlastindex "^1.2.2"
-    array.prototype.flat "^1.3.1"
-    array.prototype.flatmap "^1.3.1"
+    array-includes "^3.1.7"
+    array.prototype.findlastindex "^1.2.3"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
     debug "^3.2.7"
     doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.7"
+    eslint-import-resolver-node "^0.3.9"
     eslint-module-utils "^2.8.0"
-    has "^1.0.3"
-    is-core-module "^2.13.0"
+    hasown "^2.0.0"
+    is-core-module "^2.13.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.fromentries "^2.0.6"
-    object.groupby "^1.0.0"
-    object.values "^1.1.6"
+    object.fromentries "^2.0.7"
+    object.groupby "^1.0.1"
+    object.values "^1.1.7"
     semver "^6.3.1"
     tsconfig-paths "^3.14.2"
 
@@ -1266,27 +1220,32 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
   integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
@@ -1314,6 +1273,16 @@ get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
+get-intrinsic@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
+  dependencies:
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -1456,6 +1425,13 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
 hosted-git-info@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
@@ -1537,24 +1513,6 @@ ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
-  dependencies:
-    get-intrinsic "^1.1.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
-internal-slot@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3"
-  integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==
-  dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
 internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
@@ -1614,17 +1572,17 @@ is-callable@^1.1.3, is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-callable@^1.1.4, is-callable@^1.2.4:
+is-callable@^1.1.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.11.0, is-core-module@^2.12.0, is-core-module@^2.13.0, is-core-module@^2.5.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
+is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.5"
@@ -1650,7 +1608,7 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-negative-zero@^2.0.1, is-negative-zero@^2.0.2:
+is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
@@ -1685,11 +1643,6 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -1722,7 +1675,14 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.9:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
-is-weakref@^1.0.1, is-weakref@^1.0.2:
+is-typed-array@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
+  dependencies:
+    which-typed-array "^1.1.11"
+
+is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
@@ -1972,31 +1932,21 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-object-inspect@^1.11.0, object-inspect@^1.9.0:
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+
+object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
 
-object-inspect@^1.12.2, object-inspect@^1.12.3:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
-
 object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
 object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
@@ -2007,33 +1957,33 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.fromentries@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
-  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-object.groupby@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.0.tgz#cb29259cf90f37e7bac6437686c1ea8c916d12a9"
-  integrity sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==
+object.fromentries@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.2.0"
-    es-abstract "^1.21.2"
-    get-intrinsic "^1.2.1"
+    es-abstract "^1.22.1"
 
-object.values@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
-  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+object.groupby@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee"
+  integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+
+object.values@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 once@^1.3.0:
   version "1.4.0"
@@ -2221,23 +2171,14 @@ redent@^4.0.0:
     indent-string "^5.0.0"
     strip-indent "^4.0.0"
 
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
-
-regexp.prototype.flags@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
-  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
+regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.2.0"
-    functions-have-names "^1.2.3"
+    set-function-name "^2.0.0"
 
 regexpp@^3.1.0:
   version "3.2.0"
@@ -2259,12 +2200,12 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.22.1:
-  version "1.22.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
-  integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
+resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
-    is-core-module "^2.12.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -2287,13 +2228,13 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-array-concat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
-  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
+safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
+    get-intrinsic "^1.2.1"
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
@@ -2327,6 +2268,25 @@ semver@^7.2.1, semver@^7.3.4, semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+set-function-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+  dependencies:
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -2412,48 +2372,32 @@ string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string.prototype.trim@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533"
-  integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
@@ -2723,16 +2667,6 @@ typescript@^5.2.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
   integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
-  dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
-    which-boxed-primitive "^1.0.2"
-
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
@@ -2779,29 +2713,17 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-typed-array@^1.1.10:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
-  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
+which-typed-array@^1.1.11, which-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
+  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
   dependencies:
     available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    call-bind "^1.0.4"
     for-each "^0.3.3"
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
-which-typed-array@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
-  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.10"
-
 which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

From cefb805243585888fa966ecb0dee82c66b49fb09 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 25 Oct 2023 02:50:10 +0200
Subject: [PATCH 145/590] Add `SubscriptionsController`

---
 app/controllers/subscriptions_controller.rb | 39 +++++++++++++++++++++
 app/views/subscriptions/_create.html.haml   |  3 ++
 app/views/subscriptions/_destroy.html.haml  |  3 ++
 config/routes.rb                            |  2 ++
 4 files changed, 47 insertions(+)
 create mode 100644 app/controllers/subscriptions_controller.rb
 create mode 100644 app/views/subscriptions/_create.html.haml
 create mode 100644 app/views/subscriptions/_destroy.html.haml

diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
new file mode 100644
index 00000000..388e72a6
--- /dev/null
+++ b/app/controllers/subscriptions_controller.rb
@@ -0,0 +1,39 @@
+class SubscriptionsController < ApplicationController
+  include TurboStreamable
+
+  before_action :authenticate_user!
+
+  turbo_stream_actions :create, :destroy
+
+  def create
+    answer = Answer.find(params[:answer])
+    result = Subscription.subscribe(current_user, answer)
+
+    respond_to do |format|
+      format.turbo_stream do
+        render turbo_stream: [
+          turbo_stream.replace("subscription-#{answer.id}", partial: "subscriptions/destroy", locals: { answer: }),
+          render_toast(t(result.present? ? ".success" : ".error"), result.present?)
+        ]
+      end
+
+      format.html { redirect_to answer_path(username: answer.user.screen_name, id: answer.id) }
+    end
+  end
+
+  def destroy
+    answer = Answer.find(params[:answer])
+    result = Subscription.unsubscribe(current_user, answer)
+
+    respond_to do |format|
+      format.turbo_stream do
+        render turbo_stream: [
+          turbo_stream.replace("subscription-#{answer.id}", partial: "subscriptions/create", locals: { answer: }),
+          render_toast(t(result.present? ? ".success" : ".error"), result.present?)
+        ]
+      end
+
+      format.html { redirect_to answer_path(username: answer.user.screen_name, id: answer.id) }
+    end
+  end
+end
diff --git a/app/views/subscriptions/_create.html.haml b/app/views/subscriptions/_create.html.haml
new file mode 100644
index 00000000..d35861aa
--- /dev/null
+++ b/app/views/subscriptions/_create.html.haml
@@ -0,0 +1,3 @@
+= button_to subscriptions_path(answer: answer.id), class: "dropdown-item", id: "subscription-#{answer.id}" do
+  %i.fa.fa-fw.fa-bell
+  = t("voc.subscribe")
diff --git a/app/views/subscriptions/_destroy.html.haml b/app/views/subscriptions/_destroy.html.haml
new file mode 100644
index 00000000..89f57ede
--- /dev/null
+++ b/app/views/subscriptions/_destroy.html.haml
@@ -0,0 +1,3 @@
+= button_to subscriptions_path(answer: answer.id), method: :delete, class: "dropdown-item", id: "subscription-#{answer.id}" do
+  %i.fa.fa-fw.fa-bell-slash
+  = t("voc.unsubscribe")
diff --git a/config/routes.rb b/config/routes.rb
index e5fcf899..5004d57c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -148,6 +148,8 @@ Rails.application.routes.draw do
   post "/inbox/create", to: "inbox#create", as: :inbox_create
   get "/inbox", to: "inbox#show", as: :inbox
 
+  resource :subscriptions, controller: :subscriptions, only: %i[create destroy]
+
   get "/user/:username", to: "user#show"
   get "/@:username", to: "user#show", as: :user
   get "/@:username/a/:id", to: "answer#show", as: :answer

From 563f834287c1096329bee378b4a82d86194e7f6b Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 25 Oct 2023 02:51:49 +0200
Subject: [PATCH 146/590] Remove `Ajax::SubscriptionController`

---
 app/controllers/ajax/subscription_controller.rb | 17 -----------------
 config/routes.rb                                |  2 --
 2 files changed, 19 deletions(-)
 delete mode 100644 app/controllers/ajax/subscription_controller.rb

diff --git a/app/controllers/ajax/subscription_controller.rb b/app/controllers/ajax/subscription_controller.rb
deleted file mode 100644
index fd574e78..00000000
--- a/app/controllers/ajax/subscription_controller.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class Ajax::SubscriptionController < AjaxController
-  before_action :authenticate_user!
-
-  def subscribe
-    params.require :answer
-    @response[:status] = :okay
-    result = Subscription.subscribe(current_user, Answer.find(params[:answer]))
-    @response[:success] = result.present?
-  end
-
-  def unsubscribe
-    params.require :answer
-    @response[:status] = :okay
-    result = Subscription.unsubscribe(current_user, Answer.find(params[:answer]))
-    @response[:success] = result&.destroyed? || false
-  end
-end
diff --git a/config/routes.rb b/config/routes.rb
index 5004d57c..faaabed1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -128,8 +128,6 @@ Rails.application.routes.draw do
     post "/create_list", to: "list#create", as: :create_list
     post "/destroy_list", to: "list#destroy", as: :destroy_list
     post "/list_membership", to: "list#membership", as: :list_membership
-    post "/subscribe", to: "subscription#subscribe", as: :subscribe_answer
-    post "/unsubscribe", to: "subscription#unsubscribe", as: :unsubscribe_answer
     get "/webpush/key", to: "web_push#key", as: :webpush_key
     post "/webpush/check", to: "web_push#check", as: :webpush_check
     post "/webpush", to: "web_push#subscribe", as: :webpush_subscribe

From 42b5b6ccc2e796a4a9bfd236fd3e184b3bb29130 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 25 Oct 2023 02:52:19 +0200
Subject: [PATCH 147/590] Remove TypeScript subscription functionality

---
 .../retrospring/features/answerbox/index.ts   |  2 -
 .../features/answerbox/subscribe.ts           | 44 -------------------
 2 files changed, 46 deletions(-)
 delete mode 100644 app/javascript/retrospring/features/answerbox/subscribe.ts

diff --git a/app/javascript/retrospring/features/answerbox/index.ts b/app/javascript/retrospring/features/answerbox/index.ts
index 61dc7edc..cf088f8b 100644
--- a/app/javascript/retrospring/features/answerbox/index.ts
+++ b/app/javascript/retrospring/features/answerbox/index.ts
@@ -3,11 +3,9 @@ import registerAnswerboxCommentEvents from './comment';
 import { answerboxDestroyHandler } from './destroy';
 import { answerboxReportHandler } from './report';
 import { answerboxSmileHandler } from './smile';
-import { answerboxSubscribeHandler } from './subscribe';
 
 export default (): void => {
   registerEvents([
-    { type: 'click', target: '[data-action=ab-submarine]', handler: answerboxSubscribeHandler, global: true },
     { type: 'click', target: '[data-action=ab-report]', handler: answerboxReportHandler, global: true },
     { type: 'click', target: '[data-action=ab-destroy]', handler: answerboxDestroyHandler, global: true },
     { type: 'click', target: '[name=ab-smile]', handler: answerboxSmileHandler, global: true }
diff --git a/app/javascript/retrospring/features/answerbox/subscribe.ts b/app/javascript/retrospring/features/answerbox/subscribe.ts
deleted file mode 100644
index 977d410e..00000000
--- a/app/javascript/retrospring/features/answerbox/subscribe.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { post } from '@rails/request.js';
-
-import I18n from 'retrospring/i18n';
-import { showNotification, showErrorNotification } from 'utilities/notifications';
-
-export function answerboxSubscribeHandler(event: Event): void {
-  const button = event.target as HTMLButtonElement;
-  const id = button.dataset.aId;
-  let torpedo = 0;
-  let targetUrl;
-  event.preventDefault();
-
-  if (button.dataset.torpedo === 'yes') {
-    torpedo = 1;
-  }
-
-  if (torpedo) {
-    targetUrl = '/ajax/subscribe';
-  } else {
-    targetUrl = '/ajax/unsubscribe';
-  }
-
-  post(targetUrl, {
-    body: {
-      answer: id
-    },
-    contentType: 'application/json'
-  })
-    .then(async response => {
-      const data = await response.json;
-
-      if (data.success) {
-        button.dataset.torpedo = ["yes", "no"][torpedo];
-        button.children[0].nextSibling.textContent = ' ' + (torpedo ? I18n.translate('voc.unsubscribe') : I18n.translate('voc.subscribe'));
-        showNotification(I18n.translate(`frontend.subscription.${torpedo ? 'subscribe' : 'unsubscribe'}`));
-      } else {
-        showErrorNotification(I18n.translate(`frontend.subscription.fail.${torpedo ? 'subscribe' : 'unsubscribe'}`));
-      }
-    })
-    .catch(err => {
-      console.log(err);
-      showErrorNotification(I18n.translate('frontend.error.message'));
-    });
-}
\ No newline at end of file

From 88429982295c2c63acb096f34ec1c376a4753bd8 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 25 Oct 2023 02:52:38 +0200
Subject: [PATCH 148/590] Render shared subscription actions in answerbox
 actions

---
 app/views/actions/_answer.html.haml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/views/actions/_answer.html.haml b/app/views/actions/_answer.html.haml
index e63e452b..78b81363 100644
--- a/app/views/actions/_answer.html.haml
+++ b/app/views/actions/_answer.html.haml
@@ -1,13 +1,8 @@
 .dropdown-menu.dropdown-menu-end{ role: :menu }
   - if subscribed_answer_ids&.include?(answer.id)
-    -#                                            fun joke    should subscribe?
-    %a.dropdown-item{ href: "#", data: { a_id: answer.id, action: "ab-submarine", torpedo: "no" } }
-      %i.fa.fa-fw.fa-anchor
-      = t("voc.unsubscribe")
+    = render "subscriptions/destroy", answer: answer
   - else
-    %a.dropdown-item{ href: "#", data: { a_id: answer.id, action: "ab-submarine", torpedo: "yes" } }
-      %i.fa.fa-fw.fa-anchor
-      = t("voc.subscribe")
+    = render "subscriptions/create", answer: answer
   - if privileged? answer.user
     %a.dropdown-item.text-danger{ href: "#", data: { a_id: answer.id, action: "ab-destroy" } }
       %i.fa.fa-fw.fa-trash-o

From 1bc7d040540340de973f2ed7954fba0da0f482a1 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 25 Oct 2023 02:52:57 +0200
Subject: [PATCH 149/590] Move subscription locales into controller scope

---
 config/locales/controllers.en.yml | 7 +++++++
 config/locales/frontend.en.yml    | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/locales/controllers.en.yml b/config/locales/controllers.en.yml
index b0347cc9..08b549dc 100644
--- a/config/locales/controllers.en.yml
+++ b/config/locales/controllers.en.yml
@@ -196,6 +196,13 @@ en:
           error: :errors.invalid_otp
         destroy:
           success: "Two factor authentication has been disabled for your account."
+  subscriptions:
+    create:
+      success: "Successfully subscribed."
+      error: "Failed to subscribe to answer."
+    destroy:
+      success: "Successfully unsubscribed."
+      error: "Failed to unsubscribe from answer."
   user:
     sessions:
       create:
diff --git a/config/locales/frontend.en.yml b/config/locales/frontend.en.yml
index 96228659..327e780b 100644
--- a/config/locales/frontend.en.yml
+++ b/config/locales/frontend.en.yml
@@ -6,12 +6,6 @@ en:
     error:
       title: "Uh-oh…"
       message: "An error occurred, a developer should check the console for details"
-    subscription:
-      subscribe: "Successfully subscribed."
-      unsubscribe: "Successfully unsubscribed."
-      fail:
-        subscribe: "Failed to subscribe to answer."
-        unsubscribe: "Failed to unsubscribe from answer."
     list:
       confirm:
         title: "Are you sure?"

From 7fdf978be138a35ab0d691b75f57508b7eeca17b Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 25 Oct 2023 02:59:27 +0200
Subject: [PATCH 150/590] Fix rubocop nits

---
 app/controllers/subscriptions_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
index 388e72a6..87049981 100644
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SubscriptionsController < ApplicationController
   include TurboStreamable
 

From 6e6cf5358bc11ebbcf9b4a1440ee53fb258c8431 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 25 Oct 2023 03:10:24 +0200
Subject: [PATCH 151/590] Add specs for `SubscriptionsController`

These are mostly the old `AjaxController::SubscriptionController` specs, but adjusted for Turbo (and the proper action names)
---
 ...ec.rb => subscriptions_controller_spec.rb} | 63 +++----------------
 1 file changed, 8 insertions(+), 55 deletions(-)
 rename spec/controllers/{ajax/subscription_controller_spec.rb => subscriptions_controller_spec.rb} (66%)

diff --git a/spec/controllers/ajax/subscription_controller_spec.rb b/spec/controllers/subscriptions_controller_spec.rb
similarity index 66%
rename from spec/controllers/ajax/subscription_controller_spec.rb
rename to spec/controllers/subscriptions_controller_spec.rb
index 23499211..6b9951d4 100644
--- a/spec/controllers/ajax/subscription_controller_spec.rb
+++ b/spec/controllers/subscriptions_controller_spec.rb
@@ -2,41 +2,33 @@
 
 require "rails_helper"
 
-describe Ajax::SubscriptionController, :ajax_controller, type: :controller do
+describe SubscriptionsController, type: :controller do
   # need to use a different user here, as after a create the user owning the
   # answer is automatically subscribed to it
   let(:answer_user) { FactoryBot.create(:user) }
   let(:answer) { FactoryBot.create(:answer, user: answer_user) }
+  let(:user) { FactoryBot.create(:user) }
 
-  describe "#subscribe" do
+  describe "#create" do
     let(:params) do
       {
-        answer: answer_id
+        answer: answer_id,
       }
     end
 
-    subject { post(:subscribe, params: params) }
+    subject { post(:create, params:, format: :turbo_stream) }
 
     context "when user is signed in" do
       before(:each) { sign_in(user) }
 
       context "when answer exists" do
         let(:answer_id) { answer.id }
-        let(:expected_response) do
-          {
-            "success" => true,
-            "status" =>  "okay",
-            "message" => anything
-          }
-        end
 
         context "when subscription does not exist" do
           it "creates a subscription on the answer" do
             expect { subject }.to(change { answer.subscriptions.count }.by(1))
             expect(answer.subscriptions.map { |s| s.user.id }.sort).to eq([answer_user.id, user.id].sort)
           end
-
-          include_examples "returns the expected response"
         end
 
         context "when subscription already exists" do
@@ -46,26 +38,15 @@ describe Ajax::SubscriptionController, :ajax_controller, type: :controller do
             expect { subject }.to(change { answer.subscriptions.count }.by(0))
             expect(answer.subscriptions.map { |s| s.user.id }.sort).to eq([answer_user.id, user.id].sort)
           end
-
-          include_examples "returns the expected response"
         end
       end
 
       context "when answer does not exist" do
         let(:answer_id) { "Bielefeld" }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status" => "not_found",
-            "message" => anything
-          }
-        end
 
         it "does not create a new subscription" do
           expect { subject }.not_to(change { Subscription.count })
         end
-
-        include_examples "returns the expected response"
       end
     end
 
@@ -79,27 +60,20 @@ describe Ajax::SubscriptionController, :ajax_controller, type: :controller do
     end
   end
 
-  describe "#unsubscribe" do
+  describe "#destroy" do
     let(:params) do
       {
-        answer: answer_id
+        answer: answer_id,
       }
     end
 
-    subject { post(:unsubscribe, params: params) }
+    subject { delete(:destroy, params:, format: :turbo_stream) }
 
     context "when user is signed in" do
       before(:each) { sign_in(user) }
 
       context "when answer exists" do
         let(:answer_id) { answer.id }
-        let(:expected_response) do
-          {
-            "success" => true,
-            "status" =>  "okay",
-            "message" => anything
-          }
-        end
 
         context "when subscription exists" do
           before(:each) { Subscription.subscribe(user, answer) }
@@ -108,43 +82,22 @@ describe Ajax::SubscriptionController, :ajax_controller, type: :controller do
             expect { subject }.to(change { answer.subscriptions.count }.by(-1))
             expect(answer.subscriptions.map { |s| s.user.id }.sort).to eq([answer_user.id].sort)
           end
-
-          include_examples "returns the expected response"
         end
 
         context "when subscription does not exist" do
-          let(:expected_response) do
-            {
-              "success" => false,
-              "status" =>  "okay",
-              "message" => anything
-            }
-          end
-
           it "does not modify the answer's subscriptions" do
             expect { subject }.to(change { answer.subscriptions.count }.by(0))
             expect(answer.subscriptions.map { |s| s.user.id }.sort).to eq([answer_user.id].sort)
           end
-
-          include_examples "returns the expected response"
         end
       end
 
       context "when answer does not exist" do
         let(:answer_id) { "Bielefeld" }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status" => "not_found",
-            "message" => anything
-          }
-        end
 
         it "does not create a new subscription" do
           expect { subject }.not_to(change { Subscription.count })
         end
-
-        include_examples "returns the expected response"
       end
     end
 

From 46cee3a19219846e7db9685fab296a68f7380ad5 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 08:20:56 +0200
Subject: [PATCH 152/590] Fix Turbo Stream replace targeting the wrong element

---
 app/views/subscriptions/_create.html.haml  | 2 +-
 app/views/subscriptions/_destroy.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/subscriptions/_create.html.haml b/app/views/subscriptions/_create.html.haml
index d35861aa..64d289a9 100644
--- a/app/views/subscriptions/_create.html.haml
+++ b/app/views/subscriptions/_create.html.haml
@@ -1,3 +1,3 @@
-= button_to subscriptions_path(answer: answer.id), class: "dropdown-item", id: "subscription-#{answer.id}" do
+= button_to subscriptions_path(answer: answer.id), class: "dropdown-item", form: { id: "subscription-#{answer.id}" } do
   %i.fa.fa-fw.fa-bell
   = t("voc.subscribe")
diff --git a/app/views/subscriptions/_destroy.html.haml b/app/views/subscriptions/_destroy.html.haml
index 89f57ede..31e6d967 100644
--- a/app/views/subscriptions/_destroy.html.haml
+++ b/app/views/subscriptions/_destroy.html.haml
@@ -1,3 +1,3 @@
-= button_to subscriptions_path(answer: answer.id), method: :delete, class: "dropdown-item", id: "subscription-#{answer.id}" do
+= button_to subscriptions_path(answer: answer.id), method: :delete, class: "dropdown-item", form: { id: "subscription-#{answer.id}" } do
   %i.fa.fa-fw.fa-bell-slash
   = t("voc.unsubscribe")

From 91c9a86af7518250eabc375b4de255b79583ea85 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 27 Oct 2023 06:53:30 +0200
Subject: [PATCH 153/590] Add Pull Request Labeler action

---
 .github/labeler.yml           |  5 +++++
 .github/workflows/labeler.yml | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/labeler.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 00000000..6712e91a
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,5 @@
+feature:
+- head-branch: ['^feature', 'feature']
+
+bugfix:
+- head-branch: ['^bugfix', 'bugfix']
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 00000000..50b7f536
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,13 @@
+name: "Pull Request Labeler"
+
+on:
+- pull_request_target
+
+jobs:
+  triage:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5.0.0-beta.1

From 3a14c0358441f730251d49451da4fee4d62f343a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 27 Oct 2023 06:54:08 +0200
Subject: [PATCH 154/590] Add automated GitHub release categorization

---
 .github/release.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/release.yml

diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 00000000..76cf7f65
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,17 @@
+changelog:
+  categories:
+    - title: Added
+      labels:
+        - feature
+    - title: Fixed
+      labels:
+        - bugfix
+    - title: Changed
+      labels:
+        - '*'
+    - title: Developer experience
+      labels:
+        - developer experience
+    - title: Dependency updates
+      labels:
+        - dependencies

From 6dbc57ddc34010d0d54c2b4dacd8ef5d64bdd360 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 27 Oct 2023 20:41:09 +0200
Subject: [PATCH 155/590] Update contribution guidelines

---
 .github/CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 45d4f725..71d8ab05 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,7 +24,8 @@ using. We find screenshots (for front-end issues) very helpful.
 We love pull requests! We are very happy to work with you to get your changes
 merged in, however please keep the following in mind.
 
-* Please use the core team standard of `feature/*` or `fix/*` branch naming.
+* Please use the core team standard of `feature/*` or `bugfix/*` branch naming.
+  * Using these branch prefixes tags the Pull Requests with the appropriate labels for release categorization.
 * Adhere to the coding conventions you see in the surrounding code.
 * If you include a new feature also include tests, and make sure they'll pass.
 * Before submitting a pull-request, clean up the history by going over your

From 1e29d3f86f1bbbffab7b16683e99845f253d1266 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 05:54:48 +0200
Subject: [PATCH 156/590] Rename `Appendable::Reaction` to `Reaction`

---
 app/models/answer.rb                          |   2 +-
 app/models/appendable.rb                      |   6 -
 app/models/comment.rb                         |   2 +-
 app/models/{appendable => }/reaction.rb       |   5 +-
 app/models/user.rb                            |   2 +-
 app/models/user/reaction_methods.rb           |   4 +-
 config/initializers/rails_admin.rb            |   6 +-
 ...026032527_rename_appendable_to_reaction.rb |   6 +
 db/schema.rb                                  | 152 +++++++++---------
 lib/exporter.rb                               |   2 +-
 lib/use_case/data_export/appendables.rb       |  23 ---
 lib/use_case/data_export/reactions.rb         |  23 +++
 .../controllers/ajax/smile_controller_spec.rb |  20 +--
 spec/factories/comment_smile.rb               |   2 +-
 spec/factories/smile.rb                       |   2 +-
 ...{appendables_spec.rb => reactions_spec.rb} |  30 ++--
 spec/models/{appendable => }/reaction_spec.rb |   2 +-
 17 files changed, 144 insertions(+), 145 deletions(-)
 delete mode 100644 app/models/appendable.rb
 rename app/models/{appendable => }/reaction.rb (85%)
 create mode 100644 db/migrate/20231026032527_rename_appendable_to_reaction.rb
 delete mode 100644 lib/use_case/data_export/appendables.rb
 create mode 100644 lib/use_case/data_export/reactions.rb
 rename spec/lib/use_case/data_export/{appendables_spec.rb => reactions_spec.rb} (61%)
 rename spec/models/{appendable => }/reaction_spec.rb (97%)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 71417252..3c8736e1 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -4,7 +4,7 @@ class Answer < ApplicationRecord
   belongs_to :user, counter_cache: :answered_count
   belongs_to :question, counter_cache: :answer_count
   has_many :comments, dependent: :destroy
-  has_many :smiles, class_name: "Appendable::Reaction", foreign_key: :parent_id, dependent: :destroy
+  has_many :smiles, class_name: "Reaction", foreign_key: :parent_id, dependent: :destroy
   has_many :subscriptions, dependent: :destroy
   has_many :comment_smiles, through: :comments, source: :smiles
 
diff --git a/app/models/appendable.rb b/app/models/appendable.rb
deleted file mode 100644
index f736acfa..00000000
--- a/app/models/appendable.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-class Appendable < ApplicationRecord
-  belongs_to :parent, polymorphic: true
-  belongs_to :user
-end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 00472037..9c052206 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -3,7 +3,7 @@ class Comment < ApplicationRecord
   belongs_to :answer, counter_cache: :comment_count
   validates :user_id, presence: true
   validates :answer_id, presence: true
-  has_many :smiles, class_name: "Appendable::Reaction", foreign_key: :parent_id, dependent: :destroy
+  has_many :smiles, class_name: "Reaction", foreign_key: :parent_id, dependent: :destroy
 
   validates :content, length: { maximum: 512 }
 
diff --git a/app/models/appendable/reaction.rb b/app/models/reaction.rb
similarity index 85%
rename from app/models/appendable/reaction.rb
rename to app/models/reaction.rb
index 4486fb0f..17bfb8c8 100644
--- a/app/models/appendable/reaction.rb
+++ b/app/models/reaction.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-class Appendable::Reaction < Appendable
+class Reaction < ApplicationRecord
+  belongs_to :parent, polymorphic: true
+  belongs_to :user
+
   # rubocop:disable Rails/SkipsModelValidations
   after_create do
     Notification.notify parent.user, self unless parent.user == user
diff --git a/app/models/user.rb b/app/models/user.rb
index 1f157482..1c4b0762 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -34,7 +34,7 @@ class User < ApplicationRecord
   has_many :answers, dependent: :destroy_async
   has_many :comments, dependent: :destroy_async
   has_many :inboxes, dependent: :destroy_async
-  has_many :smiles, class_name: "Appendable::Reaction", dependent: :destroy_async
+  has_many :smiles, class_name: "Reaction", dependent: :destroy_async
   has_many :notifications, foreign_key: :recipient_id, dependent: :destroy_async
   has_many :reports, dependent: :destroy_async
   has_many :lists, dependent: :destroy_async
diff --git a/app/models/user/reaction_methods.rb b/app/models/user/reaction_methods.rb
index fa3e6545..e721b34c 100644
--- a/app/models/user/reaction_methods.rb
+++ b/app/models/user/reaction_methods.rb
@@ -7,13 +7,13 @@ module User::ReactionMethods
     raise Errors::ReactingSelfBlockedOther if self.blocking?(item.user)
     raise Errors::ReactingOtherBlockedSelf if item.user.blocking?(self)
 
-    ::Appendable::Reaction.create!(user: self, parent: item, content: "🙂")
+    Reaction.create!(user: self, parent: item, content: "🙂")
   end
 
   # unsmile an answer or comment
   # @param item [ApplicationRecord] the answer/comment to unsmile
   def unsmile(item)
-    ::Appendable::Reaction.find_by(user: self, parent: item).destroy
+    Reaction.find_by(user: self, parent: item).destroy
   end
 
   def smiled?(item)
diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb
index edc5eebb..b1ebe56e 100644
--- a/config/initializers/rails_admin.rb
+++ b/config/initializers/rails_admin.rb
@@ -29,8 +29,7 @@ RailsAdmin.config do |config|
   end
 
   config.included_models = %w[
-    Appendable
-    Appendable::Reaction
+    Reaction
     Answer
     AnonymousBlock
     Comment
@@ -58,8 +57,7 @@ RailsAdmin.config do |config|
   {
     "AnonymousBlock"        => "user-secret",
     "Answer"                => "exclamation",
-    "Appendable"            => "paperclip",
-    "Appendable::Reaction"  => "smile",
+    "Reaction"              => "smile",
     "Comment"               => "comment",
     "Inbox"                 => "inbox",
     "List"                  => "list",
diff --git a/db/migrate/20231026032527_rename_appendable_to_reaction.rb b/db/migrate/20231026032527_rename_appendable_to_reaction.rb
new file mode 100644
index 00000000..5af26242
--- /dev/null
+++ b/db/migrate/20231026032527_rename_appendable_to_reaction.rb
@@ -0,0 +1,6 @@
+class RenameAppendableToReaction < ActiveRecord::Migration[7.0]
+  def change
+    rename_table :appendables, :reactions
+    remove_column :reactions, :type
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ea268655..700b915b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,8 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_10_18_172518) do
-
+ActiveRecord::Schema[7.0].define(version: 2023_10_26_032527) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -19,11 +18,11 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.text "content", null: false
     t.string "link_text"
     t.string "link_href"
-    t.datetime "starts_at", null: false
-    t.datetime "ends_at", null: false
+    t.datetime "starts_at", precision: nil, null: false
+    t.datetime "ends_at", precision: nil, null: false
     t.bigint "user_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["user_id"], name: "index_announcements_on_user_id"
   end
 
@@ -31,8 +30,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "user_id"
     t.string "identifier"
     t.bigint "question_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "target_user_id"
     t.index ["identifier"], name: "index_anonymous_blocks_on_identifier"
     t.index ["question_id"], name: "index_anonymous_blocks_on_question_id"
@@ -45,34 +44,22 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "question_id"
     t.integer "comment_count", default: 0, null: false
     t.bigint "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "smile_count", default: 0, null: false
-    t.datetime "pinned_at"
+    t.datetime "pinned_at", precision: nil
     t.index ["created_at"], name: "index_answers_on_created_at", order: :desc
     t.index ["question_id"], name: "index_answers_on_question_id"
     t.index ["user_id", "created_at"], name: "index_answers_on_user_id_and_created_at"
     t.index ["user_id", "pinned_at"], name: "index_answers_on_user_id_and_pinned_at"
   end
 
-  create_table "appendables", force: :cascade do |t|
-    t.string "type", null: false
-    t.bigint "user_id", null: false
-    t.bigint "parent_id", null: false
-    t.string "parent_type", null: false
-    t.text "content"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.index ["parent_id", "parent_type"], name: "index_appendables_on_parent_id_and_parent_type"
-    t.index ["user_id", "created_at"], name: "index_appendables_on_user_id_and_created_at"
-  end
-
   create_table "comments", id: :bigint, default: -> { "gen_timestamp_id('comments'::text)" }, force: :cascade do |t|
     t.string "content"
     t.bigint "answer_id"
     t.bigint "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "smile_count", default: 0, null: false
     t.index ["answer_id"], name: "index_comments_on_answer_id"
     t.index ["user_id", "created_at"], name: "index_comments_on_user_id_and_created_at"
@@ -82,8 +69,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "user_id"
     t.bigint "question_id"
     t.boolean "new"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["question_id"], name: "index_inboxes_on_question_id"
     t.index ["user_id"], name: "index_inboxes_on_user_id"
   end
@@ -91,8 +78,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
   create_table "list_members", id: :serial, force: :cascade do |t|
     t.integer "list_id", null: false
     t.bigint "user_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["list_id", "user_id"], name: "index_list_members_on_list_id_and_user_id", unique: true
   end
 
@@ -101,16 +88,16 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.string "name"
     t.string "display_name"
     t.boolean "private", default: true
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["user_id", "name"], name: "index_lists_on_user_id_and_name", unique: true
   end
 
   create_table "mute_rules", id: :bigint, default: -> { "gen_timestamp_id('mute_rules'::text)" }, force: :cascade do |t|
     t.bigint "user_id"
     t.string "muted_phrase"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["user_id"], name: "index_mute_rules_on_user_id"
   end
 
@@ -119,8 +106,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.bigint "target_id"
     t.bigint "recipient_id"
     t.boolean "new"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "type", null: false
     t.index ["new"], name: "index_notifications_on_new"
     t.index ["recipient_id"], name: "index_notifications_on_recipient_id"
@@ -134,8 +121,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.string "location", default: "", null: false
     t.string "website", default: "", null: false
     t.string "motivation_header", default: "", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "anon_display_name"
     t.boolean "allow_long_questions", default: false
     t.index ["user_id"], name: "index_profiles_on_user_id"
@@ -146,18 +133,29 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.boolean "author_is_anonymous"
     t.string "author_identifier"
     t.bigint "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "answer_count", default: 0, null: false
     t.boolean "direct", default: false, null: false
     t.index ["user_id", "created_at"], name: "index_questions_on_user_id_and_created_at"
   end
 
+  create_table "reactions", force: :cascade do |t|
+    t.bigint "user_id", null: false
+    t.bigint "parent_id", null: false
+    t.string "parent_type", null: false
+    t.text "content"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["parent_id", "parent_type"], name: "index_reactions_on_parent_id_and_parent_type"
+    t.index ["user_id", "created_at"], name: "index_reactions_on_user_id_and_created_at"
+  end
+
   create_table "relationships", id: :serial, force: :cascade do |t|
     t.bigint "source_id"
     t.bigint "target_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "type", null: false
     t.index ["source_id", "target_id", "type"], name: "index_relationships_on_source_id_and_target_id_and_type", unique: true
     t.index ["source_id"], name: "index_relationships_on_source_id"
@@ -169,8 +167,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.string "type", null: false
     t.bigint "target_id", null: false
     t.bigint "user_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "deleted", default: false
     t.string "reason"
     t.index ["type", "target_id"], name: "index_reports_on_type_and_target_id"
@@ -181,8 +179,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.string "name"
     t.string "resource_type"
     t.bigint "resource_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
     t.index ["resource_type", "resource_id"], name: "index_roles_on_resource_type_and_resource_id"
   end
@@ -193,14 +191,14 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.text "certificate"
     t.string "password"
     t.integer "connections", default: 1, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "type", null: false
     t.string "auth_key"
     t.string "client_id"
     t.string "client_secret"
     t.string "access_token"
-    t.datetime "access_token_expiration"
+    t.datetime "access_token_expiration", precision: nil
     t.text "apn_key"
     t.string "apn_key_id"
     t.string "team_id"
@@ -210,9 +208,9 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
 
   create_table "rpush_feedback", force: :cascade do |t|
     t.string "device_token"
-    t.datetime "failed_at", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "failed_at", precision: nil, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "app_id"
     t.index ["device_token"], name: "index_rpush_feedback_on_device_token"
   end
@@ -225,14 +223,14 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.text "data"
     t.integer "expiry", default: 86400
     t.boolean "delivered", default: false, null: false
-    t.datetime "delivered_at"
+    t.datetime "delivered_at", precision: nil
     t.boolean "failed", default: false, null: false
-    t.datetime "failed_at"
+    t.datetime "failed_at", precision: nil
     t.integer "error_code"
     t.text "error_description"
-    t.datetime "deliver_after"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "deliver_after", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "alert_is_json", default: false, null: false
     t.string "type", null: false
     t.string "collapse_key"
@@ -241,7 +239,7 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.integer "app_id", null: false
     t.integer "retries", default: 0
     t.string "uri"
-    t.datetime "fail_after"
+    t.datetime "fail_after", precision: nil
     t.boolean "processing", default: false, null: false
     t.integer "priority"
     t.text "url_args"
@@ -259,8 +257,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
   create_table "subscriptions", id: :serial, force: :cascade do |t|
     t.bigint "user_id", null: false
     t.bigint "answer_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["user_id", "answer_id"], name: "index_subscriptions_on_user_id_and_answer_id"
   end
 
@@ -282,8 +280,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.integer "background_color", default: 15789556
     t.integer "body_text", default: 0
     t.integer "muted_text", default: 7107965
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "input_color", default: 15789556, null: false
     t.integer "input_text", default: 0, null: false
     t.integer "raised_accent", default: 16250871
@@ -304,25 +302,25 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
   create_table "user_bans", force: :cascade do |t|
     t.bigint "user_id"
     t.string "reason"
-    t.datetime "expires_at"
+    t.datetime "expires_at", precision: nil
     t.bigint "banned_by_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "users", id: :bigint, default: -> { "gen_timestamp_id('users'::text)" }, force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
     t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
+    t.datetime "reset_password_sent_at", precision: nil
+    t.datetime "remember_created_at", precision: nil
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
+    t.datetime "current_sign_in_at", precision: nil
+    t.datetime "last_sign_in_at", precision: nil
     t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "screen_name"
     t.integer "asked_count", default: 0, null: false
     t.integer "answered_count", default: 0, null: false
@@ -347,13 +345,13 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.integer "profile_header_h"
     t.string "locale", default: "en"
     t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "confirmation_sent_at", precision: nil
     t.string "unconfirmed_email"
     t.boolean "show_foreign_themes", default: true, null: false
     t.string "export_url"
     t.boolean "export_processing", default: false, null: false
-    t.datetime "export_created_at"
+    t.datetime "export_created_at", precision: nil
     t.string "otp_secret_key"
     t.integer "otp_module", default: 0, null: false
     t.boolean "privacy_lock_inbox", default: false
@@ -363,8 +361,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
     t.boolean "sharing_enabled", default: false
     t.boolean "sharing_autoclose", default: false
     t.string "sharing_custom_url"
-    t.datetime "notifications_updated_at"
-    t.datetime "inbox_updated_at"
+    t.datetime "notifications_updated_at", precision: nil
+    t.datetime "inbox_updated_at", precision: nil
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
@@ -382,8 +380,8 @@ ActiveRecord::Schema.define(version: 2023_10_18_172518) do
   create_table "web_push_subscriptions", force: :cascade do |t|
     t.bigint "user_id", null: false
     t.json "subscription"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "failures", default: 0
     t.index ["user_id"], name: "index_web_push_subscriptions_on_user_id"
   end
diff --git a/lib/exporter.rb b/lib/exporter.rb
index 07f2ae46..dca0361c 100644
--- a/lib/exporter.rb
+++ b/lib/exporter.rb
@@ -7,7 +7,7 @@ require "zip/filesystem"
 # require all data export use cases via Zeitwerk
 # rubocop:disable Lint/Void
 UseCase::DataExport::Answers
-UseCase::DataExport::Appendables
+UseCase::DataExport::Reactions
 UseCase::DataExport::Comments
 UseCase::DataExport::MuteRules
 UseCase::DataExport::Questions
diff --git a/lib/use_case/data_export/appendables.rb b/lib/use_case/data_export/appendables.rb
deleted file mode 100644
index 19221aee..00000000
--- a/lib/use_case/data_export/appendables.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module UseCase
-  module DataExport
-    class Appendables < UseCase::DataExport::Base
-      def files = {
-        "appendables.json" => json_file!(
-          appendables: [
-            *user.smiles.map(&method(:collect_appendable))
-          ]
-        )
-      }
-
-      def collect_appendable(appendable)
-        {}.tap do |h|
-          column_names(::Appendable).each do |field|
-            h[field] = appendable[field]
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/use_case/data_export/reactions.rb b/lib/use_case/data_export/reactions.rb
new file mode 100644
index 00000000..661592f6
--- /dev/null
+++ b/lib/use_case/data_export/reactions.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module UseCase
+  module DataExport
+    class Reactions < UseCase::DataExport::Base
+      def files = {
+        "reactions.json" => json_file!(
+          reactions: [
+            *user.smiles.map(&method(:collect_reaction))
+          ]
+        )
+      }
+
+      def collect_reaction(reaction)
+        {}.tap do |h|
+          column_names(::Reaction).each do |field|
+            h[field] = reaction[field]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/controllers/ajax/smile_controller_spec.rb b/spec/controllers/ajax/smile_controller_spec.rb
index 9d6d0506..c457e19f 100644
--- a/spec/controllers/ajax/smile_controller_spec.rb
+++ b/spec/controllers/ajax/smile_controller_spec.rb
@@ -28,8 +28,8 @@ describe Ajax::SmileController, :ajax_controller, type: :controller do
         end
 
         it "creates a smile to the answer" do
-          expect { subject }.to(change { Appendable::Reaction.count }.by(1))
-          expect(answer.reload.smiles.ids).to include(Appendable::Reaction.last.id)
+          expect { subject }.to(change { Reaction.count }.by(1))
+          expect(answer.reload.smiles.ids).to include(Reaction.last.id)
         end
 
         include_examples "returns the expected response"
@@ -47,7 +47,7 @@ describe Ajax::SmileController, :ajax_controller, type: :controller do
         end
 
         it "does not create a smile" do
-          expect { subject }.not_to(change { Appendable::Reaction.count })
+          expect { subject }.not_to(change { Reaction.count })
         end
 
         include_examples "returns the expected response"
@@ -100,7 +100,7 @@ describe Ajax::SmileController, :ajax_controller, type: :controller do
       end
 
       it "does not create a smile" do
-        expect { subject }.not_to(change { Appendable::Reaction.count })
+        expect { subject }.not_to(change { Reaction.count })
       end
 
       include_examples "returns the expected response"
@@ -124,7 +124,7 @@ describe Ajax::SmileController, :ajax_controller, type: :controller do
       end
 
       it "does not create a smile" do
-        expect { subject }.not_to(change { Appendable::Reaction.count })
+        expect { subject }.not_to(change { Reaction.count })
       end
 
       include_examples "returns the expected response"
@@ -160,7 +160,7 @@ describe Ajax::SmileController, :ajax_controller, type: :controller do
         end
 
         it "deletes the smile" do
-          expect { subject }.to(change { Appendable::Reaction.count }.by(-1))
+          expect { subject }.to(change { Reaction.count }.by(-1))
         end
 
         include_examples "returns the expected response"
@@ -219,8 +219,8 @@ describe Ajax::SmileController, :ajax_controller, type: :controller do
         end
 
         it "creates a smile to the comment" do
-          expect { subject }.to(change { Appendable::Reaction.count }.by(1))
-          expect(comment.reload.smiles.ids).to include(Appendable::Reaction.last.id)
+          expect { subject }.to(change { Reaction.count }.by(1))
+          expect(comment.reload.smiles.ids).to include(Reaction.last.id)
         end
 
         include_examples "returns the expected response"
@@ -238,7 +238,7 @@ describe Ajax::SmileController, :ajax_controller, type: :controller do
         end
 
         it "does not create a smile" do
-          expect { subject }.not_to(change { Appendable::Reaction.count })
+          expect { subject }.not_to(change { Reaction.count })
         end
 
         include_examples "returns the expected response"
@@ -304,7 +304,7 @@ describe Ajax::SmileController, :ajax_controller, type: :controller do
         end
 
         it "deletes the smile" do
-          expect { subject }.to(change { Appendable::Reaction.count }.by(-1))
+          expect { subject }.to(change { Reaction.count }.by(-1))
         end
 
         include_examples "returns the expected response"
diff --git a/spec/factories/comment_smile.rb b/spec/factories/comment_smile.rb
index 6923e121..09c65313 100644
--- a/spec/factories/comment_smile.rb
+++ b/spec/factories/comment_smile.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :comment_smile, class: Appendable::Reaction do
+  factory :comment_smile, class: Reaction do
     user { FactoryBot.build(:user) }
     parent { FactoryBot.build(:comment) }
     content { "🙂" }
diff --git a/spec/factories/smile.rb b/spec/factories/smile.rb
index 43bd9bf4..1726e9fa 100644
--- a/spec/factories/smile.rb
+++ b/spec/factories/smile.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :smile, class: Appendable::Reaction do
+  factory :smile, class: Reaction do
     user { FactoryBot.create(:user) }
     parent { FactoryBot.create(:answer, user: FactoryBot.create(:user)) }
     content { "🙂" }
diff --git a/spec/lib/use_case/data_export/appendables_spec.rb b/spec/lib/use_case/data_export/reactions_spec.rb
similarity index 61%
rename from spec/lib/use_case/data_export/appendables_spec.rb
rename to spec/lib/use_case/data_export/reactions_spec.rb
index e57b3dbf..cab38f43 100644
--- a/spec/lib/use_case/data_export/appendables_spec.rb
+++ b/spec/lib/use_case/data_export/reactions_spec.rb
@@ -2,14 +2,14 @@
 
 require "rails_helper"
 
-describe UseCase::DataExport::Appendables, :data_export do
+describe UseCase::DataExport::Reactions, :data_export do
   include ActiveSupport::Testing::TimeHelpers
 
-  context "when user doesn't have any appendable" do
-    it "returns an empty set of appendables" do
-      expect(json_file("appendables.json")).to eq(
+  context "when user doesn't have any reactions" do
+    it "returns an empty set of reactions" do
+      expect(json_file("reactions.json")).to eq(
         {
-          appendables: []
+          reactions: []
         }
       )
     end
@@ -19,32 +19,32 @@ describe UseCase::DataExport::Appendables, :data_export do
     let(:answer) { FactoryBot.create(:answer, user:) }
     let(:comment) { FactoryBot.create(:comment, user:, answer:) }
 
-    let!(:appendables) do
+    let!(:reactions) do
       [
         travel_to(Time.utc(2022, 12, 10, 13, 37, 42)) { FactoryBot.create(:comment_smile, user:, parent: comment) },
         travel_to(Time.utc(2022, 12, 10, 13, 39, 21)) { FactoryBot.create(:smile, user:, parent: answer) }
       ]
     end
 
-    it "returns the appendables as json" do
-      expect(json_file("appendables.json")).to eq(
+    it "returns the reactions as json" do
+      expect(json_file("reactions.json")).to eq(
         {
-          appendables: [
+          reactions: [
             {
-              id:          appendables[0].id,
-              type:        "Appendable::Reaction",
+              id:          reactions[0].id,
+              type:        "Reaction",
               user_id:     user.id,
-              parent_id:   appendables[0].parent_id,
+              parent_id:   reactions[0].parent_id,
               parent_type: "Comment",
               content:     "🙂",
               created_at:  "2022-12-10T13:37:42.000Z",
               updated_at:  "2022-12-10T13:37:42.000Z"
             },
             {
-              id:          appendables[1].id,
-              type:        "Appendable::Reaction",
+              id:          reactions[1].id,
+              type:        "Reaction",
               user_id:     user.id,
-              parent_id:   appendables[1].parent_id,
+              parent_id:   reactions[1].parent_id,
               parent_type: "Answer",
               content:     "🙂",
               created_at:  "2022-12-10T13:39:21.000Z",
diff --git a/spec/models/appendable/reaction_spec.rb b/spec/models/reaction_spec.rb
similarity index 97%
rename from spec/models/appendable/reaction_spec.rb
rename to spec/models/reaction_spec.rb
index 72e1ebd9..e0da592e 100644
--- a/spec/models/appendable/reaction_spec.rb
+++ b/spec/models/reaction_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Appendable::Reaction do
+describe Reaction do
   let(:user) { FactoryBot.create(:user) }
   let(:owner) { FactoryBot.create(:user) }
   let(:parent) { FactoryBot.create(:answer, user: owner) }

From 20cf1ac85b28e70328987eccfc34ff2a668dd34c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 06:05:14 +0200
Subject: [PATCH 157/590] Fix rubocop nits

---
 db/migrate/20231026032527_rename_appendable_to_reaction.rb | 4 +++-
 lib/use_case/data_export/reactions.rb                      | 4 ++--
 spec/lib/use_case/data_export/reactions_spec.rb            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/db/migrate/20231026032527_rename_appendable_to_reaction.rb b/db/migrate/20231026032527_rename_appendable_to_reaction.rb
index 5af26242..6a7b5d9d 100644
--- a/db/migrate/20231026032527_rename_appendable_to_reaction.rb
+++ b/db/migrate/20231026032527_rename_appendable_to_reaction.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class RenameAppendableToReaction < ActiveRecord::Migration[7.0]
   def change
     rename_table :appendables, :reactions
-    remove_column :reactions, :type
+    remove_column :reactions, :type, :string
   end
 end
diff --git a/lib/use_case/data_export/reactions.rb b/lib/use_case/data_export/reactions.rb
index 661592f6..7710f8e7 100644
--- a/lib/use_case/data_export/reactions.rb
+++ b/lib/use_case/data_export/reactions.rb
@@ -7,8 +7,8 @@ module UseCase
         "reactions.json" => json_file!(
           reactions: [
             *user.smiles.map(&method(:collect_reaction))
-          ]
-        )
+          ],
+        ),
       }
 
       def collect_reaction(reaction)
diff --git a/spec/lib/use_case/data_export/reactions_spec.rb b/spec/lib/use_case/data_export/reactions_spec.rb
index cab38f43..2431da77 100644
--- a/spec/lib/use_case/data_export/reactions_spec.rb
+++ b/spec/lib/use_case/data_export/reactions_spec.rb
@@ -9,7 +9,7 @@ describe UseCase::DataExport::Reactions, :data_export do
     it "returns an empty set of reactions" do
       expect(json_file("reactions.json")).to eq(
         {
-          reactions: []
+          reactions: [],
         }
       )
     end

From 795e687bc89c7bd6edd7b80b0466f2769fbd3d16 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 06:05:41 +0200
Subject: [PATCH 158/590] Fix reaction exporter spec

---
 spec/lib/use_case/data_export/reactions_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/lib/use_case/data_export/reactions_spec.rb b/spec/lib/use_case/data_export/reactions_spec.rb
index 2431da77..3e1f3980 100644
--- a/spec/lib/use_case/data_export/reactions_spec.rb
+++ b/spec/lib/use_case/data_export/reactions_spec.rb
@@ -32,7 +32,6 @@ describe UseCase::DataExport::Reactions, :data_export do
           reactions: [
             {
               id:          reactions[0].id,
-              type:        "Reaction",
               user_id:     user.id,
               parent_id:   reactions[0].parent_id,
               parent_type: "Comment",
@@ -42,7 +41,6 @@ describe UseCase::DataExport::Reactions, :data_export do
             },
             {
               id:          reactions[1].id,
-              type:        "Reaction",
               user_id:     user.id,
               parent_id:   reactions[1].parent_id,
               parent_type: "Answer",

From f30b1b820e088dac26441468f901a77bbb4a487f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 23 Oct 2023 00:45:00 +0200
Subject: [PATCH 159/590] Add `show_reactions` action and move markup into it

---
 app/controllers/comment_controller.rb      |  7 +++++++
 app/views/actions/_comment.html.haml       |  2 +-
 app/views/answerbox/_comments.html.haml    |  1 -
 app/views/comment/show_reactions.html.haml | 21 +++++++++++++++++++++
 app/views/modal/_comment_smiles.html.haml  | 17 -----------------
 config/locales/views.en.yml                |  7 ++++---
 config/routes.rb                           |  1 +
 7 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 app/views/comment/show_reactions.html.haml
 delete mode 100644 app/views/modal/_comment_smiles.html.haml

diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
index d8b9ea6f..3b9c2e93 100644
--- a/app/controllers/comment_controller.rb
+++ b/app/controllers/comment_controller.rb
@@ -7,4 +7,11 @@ class CommentController < ApplicationController
 
     render "index", locals: { a: answer }
   end
+
+  def show_reactions
+    comment = Comment.find(params[:id])
+    @reactions = Appendable::Reaction.where(parent_type: "Comment", parent: comment.id).includes([{ user: :profile }])
+
+    redirect_to answer_path(username: comment.answer.user.screen_name, id: comment.answer.id) unless turbo_frame_request?
+  end
 end
diff --git a/app/views/actions/_comment.html.haml b/app/views/actions/_comment.html.haml
index 23b8e408..a88d7a4a 100644
--- a/app/views/actions/_comment.html.haml
+++ b/app/views/actions/_comment.html.haml
@@ -1,5 +1,5 @@
 .dropdown-menu.dropdown-menu-end{ role: :menu }
-  %a.dropdown-item{ href: "#", data: { bs_target: "#modal-view-comment#{comment.id}-smiles", bs_toggle: :modal } }
+  = link_to comment_reactions_path(username: comment.user.screen_name, id: comment.id), class: "dropdown-item", data: { turbo_frame: "modal" } do
     %i.fa.fa-fw.fa-smile-o
     = t(".view_smiles")
   - if privileged?(comment.user) || privileged?(answer.user)
diff --git a/app/views/answerbox/_comments.html.haml b/app/views/answerbox/_comments.html.haml
index a03e4e10..78ce559b 100644
--- a/app/views/answerbox/_comments.html.haml
+++ b/app/views/answerbox/_comments.html.haml
@@ -4,7 +4,6 @@
   %ul.comment__container
     - comments.order(:created_at).each do |comment|
       %li.comment{ data: { comment_id: comment.id } }
-        %div{ style: "height: 0; width: 0" }= render "modal/comment_smiles", comment: comment
         .d-flex
           .flex-shrink-0
             %a{ href: user_path(comment.user) }
diff --git a/app/views/comment/show_reactions.html.haml b/app/views/comment/show_reactions.html.haml
new file mode 100644
index 00000000..90ec41fe
--- /dev/null
+++ b/app/views/comment/show_reactions.html.haml
@@ -0,0 +1,21 @@
+= turbo_frame_tag "modal" do
+  .modal.fade.show.d-block{ id: "modal-view-comment-smiles", aria: { hidden: false, labelledby: "modal-commentsmile-label" }, role: :dialog, tabindex: -1 }
+    .modal-dialog
+      .modal-content
+        .modal-header
+          %h5.modal-title#modal-commentsmile-label= t(".title")
+          = button_to modal_close_path, method: :get, class: "btn-close" do
+            %span.visually-hidden Close
+        .modal-body
+          - if @reactions.count.zero?
+            = t(".none")
+          - else
+            %ul.smiles__user-list
+              - @reactions.each do |smile|
+                %li.smiles__user-list-entry
+                  %a{ href: user_path(smile.user) }
+                    %img{ src: smile.user.profile_picture.url(:small), alt: user_screen_name(smile.user, url: false) }
+                    %span= user_screen_name(smile.user, url: false)
+        .modal-footer
+          = button_to t("voc.close"), modal_close_path, method: :get, class: "btn btn-default"
+  .modal-backdrop.fade.show
diff --git a/app/views/modal/_comment_smiles.html.haml b/app/views/modal/_comment_smiles.html.haml
deleted file mode 100644
index 70cf7772..00000000
--- a/app/views/modal/_comment_smiles.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-.modal.fade{ id: "modal-view-comment#{comment.id}-smiles", aria: { hidden: true, labelledby: "modal-commentsmile-label" }, role: :dialog, tabindex: -1 }
-  .modal-dialog
-    .modal-content
-      .modal-header
-        %h5.modal-title#modal-commentsmile-label= t(".title")
-        %button.btn-close{ data: { bs_dismiss: :modal }, type: :button }
-          %span.visually-hidden Close
-      .modal-body
-        - if comment.smiles.all.count.zero?
-          = t(".none")
-        - else
-          %ul.smiles__user-list
-            - comment.smiles.all.each do |smile|
-              %li.smiles__user-list-entry
-                %a{ href: user_path(smile.user) }
-                  %img{ src: smile.user.profile_picture.url(:small), alt: user_screen_name(smile.user, url: false) }
-                  %span= user_screen_name(smile.user, url: false)
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 1af7cb01..d0426826 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -150,6 +150,10 @@ en:
         non_anonymous_html: |
           This user does not want to receive anonymous questions. <br/>
           (%{sign_in} or %{sign_up})
+  comment:
+    show_reactions:
+      title: "People who smiled this comment"
+      none: "No one has smiled this comment yet."
   devise:
     registrations:
       edit:
@@ -262,9 +266,6 @@ en:
       action: "Ask"
       loading: "Asking…"
       long_question_warning: "This question will only be sent to those who allow long questions in their profile settings."
-    comment_smiles:
-      title: "People who smiled this comment"
-      none: "No one has smiled this comment yet."
     list:
       title: "Manage list memberships"
       tab:
diff --git a/config/routes.rb b/config/routes.rb
index e5fcf899..51e170f9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -156,6 +156,7 @@ Rails.application.routes.draw do
   get "/@:username/a/:id/comments", to: "comment#index", as: :comments
   get "/@:username/a/:id/reactions", to: "reaction#index", as: :reactions
   get "/@:username/q/:id", to: "question#show", as: :question
+  get "/@:username/c/:id/reactions", to: "comment#show_reactions", as: :comment_reactions
   get "/@:username/followers", to: "user#followers", as: :show_user_followers
   get "/@:username/followings", to: "user#followings", as: :show_user_followings
   get "/@:username/friends", to: redirect("/@%{username}/followings")

From 4c393defb7901f581b503336ab08bfb2ca775930 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 23 Oct 2023 00:45:40 +0200
Subject: [PATCH 160/590] Add `ModalController#close` action

---
 app/controllers/modal_controller.rb | 13 +++++++++++++
 app/views/layouts/base.html.haml    |  1 +
 config/routes.rb                    |  2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 app/controllers/modal_controller.rb

diff --git a/app/controllers/modal_controller.rb b/app/controllers/modal_controller.rb
new file mode 100644
index 00000000..16ae890e
--- /dev/null
+++ b/app/controllers/modal_controller.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ModalController < ApplicationController
+  include ActionView::Helpers::TagHelper
+  include Turbo::FramesHelper
+
+  skip_before_action :find_active_announcements, :banned?
+
+  def close
+    redirect_to root_path unless turbo_frame_request?
+    render inline: turbo_frame_tag("modal")
+  end
+end
diff --git a/app/views/layouts/base.html.haml b/app/views/layouts/base.html.haml
index 0607c377..cf829de8 100644
--- a/app/views/layouts/base.html.haml
+++ b/app/views/layouts/base.html.haml
@@ -32,6 +32,7 @@
     = yield
     = render "shared/formatting"
     = render "shared/hotkeys"
+    = turbo_frame_tag "modal"
     .d-none#toasts
     - if Rails.env.development?
       #debug
diff --git a/config/routes.rb b/config/routes.rb
index 51e170f9..5fcac30f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -181,5 +181,7 @@ Rails.application.routes.draw do
 
   get "/nodeinfo/2.1", to: "well_known/node_info#nodeinfo", as: :node_info
 
+  get "/modal/close", to: "modal#close", as: :modal_close
+
   puts "processing time of routes.rb: #{"#{(Time.zone.now - start).round(3).to_s.ljust(5, '0')}s".light_green}"
 end

From bc0ce6be3f1fb9bc2ca8de8b3105467e17fc2d27 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 23 Oct 2023 22:48:08 +0200
Subject: [PATCH 161/590] Add specs for comment and modal controller Turbo
 Frame actions

---
 app/controllers/modal_controller.rb         |  2 +-
 spec/controllers/comment_controller_spec.rb | 29 +++++++++++++++++++++
 spec/controllers/modal_controller_spec.rb   | 29 +++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 spec/controllers/modal_controller_spec.rb

diff --git a/app/controllers/modal_controller.rb b/app/controllers/modal_controller.rb
index 16ae890e..a8d61d60 100644
--- a/app/controllers/modal_controller.rb
+++ b/app/controllers/modal_controller.rb
@@ -7,7 +7,7 @@ class ModalController < ApplicationController
   skip_before_action :find_active_announcements, :banned?
 
   def close
-    redirect_to root_path unless turbo_frame_request?
+    return redirect_to root_path unless turbo_frame_request?
     render inline: turbo_frame_tag("modal")
   end
 end
diff --git a/spec/controllers/comment_controller_spec.rb b/spec/controllers/comment_controller_spec.rb
index ace2aad8..63812485 100644
--- a/spec/controllers/comment_controller_spec.rb
+++ b/spec/controllers/comment_controller_spec.rb
@@ -34,4 +34,33 @@ describe CommentController, type: :controller do
       end
     end
   end
+
+  describe "#show_reactions" do
+    let(:answer_author) { FactoryBot.create(:user) }
+    let(:answer) { FactoryBot.create(:answer, user: answer_author) }
+    let(:commenter) { FactoryBot.create(:user) }
+    let(:comment) { FactoryBot.create(:comment, answer:, user: commenter) }
+
+    context "a regular web navigation request" do
+      subject { get :show_reactions, params: { username: commenter.screen_name, id: comment.id } }
+
+      it "should redirect to the answer page" do
+        subject
+
+        expect(response).to redirect_to answer_path(username: answer_author.screen_name, id: answer.id)
+      end
+    end
+
+    context "a Turbo Frame request" do
+      subject { get :show_reactions, params: { username: commenter.screen_name, id: comment.id } }
+
+      it "renders the show_reaction template" do
+        @request.headers["Turbo-Frame"] = "some_id"
+
+        subject
+
+        expect(response).to render_template(:show_reactions)
+      end
+    end
+  end
 end
diff --git a/spec/controllers/modal_controller_spec.rb b/spec/controllers/modal_controller_spec.rb
new file mode 100644
index 00000000..d927173a
--- /dev/null
+++ b/spec/controllers/modal_controller_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe ModalController, type: :controller do
+  describe "#close" do
+    context "a regular web navigation request" do
+      subject { get :close }
+
+      it "should redirect to the root page" do
+        subject
+
+        expect(response).to redirect_to root_path
+      end
+    end
+
+    context "a Turbo Frame request" do
+      subject { get :close }
+
+      it "renders the show_reaction template" do
+        @request.headers["Turbo-Frame"] = "some_id"
+
+        subject
+
+        expect(response.body).to include('<turbo-frame id="modal"></turbo-frame>')
+      end
+    end
+  end
+end

From 1573c2f70256164d5f9b0bd20f53761817a3021a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 24 Oct 2023 01:11:04 +0200
Subject: [PATCH 162/590] Fix rubocop nits

---
 app/controllers/modal_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/modal_controller.rb b/app/controllers/modal_controller.rb
index a8d61d60..0a45285b 100644
--- a/app/controllers/modal_controller.rb
+++ b/app/controllers/modal_controller.rb
@@ -8,6 +8,7 @@ class ModalController < ApplicationController
 
   def close
     return redirect_to root_path unless turbo_frame_request?
-    render inline: turbo_frame_tag("modal")
+
+    render inline: turbo_frame_tag("modal") # rubocop:disable Rails/RenderInline
   end
 end

From 09b0ec6888ebdfbcdca69be2b77dd6d79789b85f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 28 Oct 2023 04:31:35 +0200
Subject: [PATCH 163/590] Use proper reaction model class in
 `CommentController`

---
 app/controllers/comment_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
index 3b9c2e93..b3e12514 100644
--- a/app/controllers/comment_controller.rb
+++ b/app/controllers/comment_controller.rb
@@ -10,7 +10,7 @@ class CommentController < ApplicationController
 
   def show_reactions
     comment = Comment.find(params[:id])
-    @reactions = Appendable::Reaction.where(parent_type: "Comment", parent: comment.id).includes([{ user: :profile }])
+    @reactions = Reaction.where(parent_type: "Comment", parent: comment.id).includes([{ user: :profile }])
 
     redirect_to answer_path(username: comment.answer.user.screen_name, id: comment.answer.id) unless turbo_frame_request?
   end

From 2fdd2045f010d01a3337e6cf322f1483ae55566c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 28 Oct 2023 04:34:49 +0200
Subject: [PATCH 164/590] Make comment reaction modal backdrop clickable

---
 app/assets/stylesheets/_utilities.scss     | 5 +++++
 app/views/comment/show_reactions.html.haml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/_utilities.scss b/app/assets/stylesheets/_utilities.scss
index 5fe1bbae..c102283c 100644
--- a/app/assets/stylesheets/_utilities.scss
+++ b/app/assets/stylesheets/_utilities.scss
@@ -25,3 +25,8 @@
 .pull-left {
   float: left;
 }
+
+// FIXME: Backport from Bootstrap 5.3, remove once updated
+.z-n1 {
+  z-index: -1;
+}
diff --git a/app/views/comment/show_reactions.html.haml b/app/views/comment/show_reactions.html.haml
index 90ec41fe..690943f8 100644
--- a/app/views/comment/show_reactions.html.haml
+++ b/app/views/comment/show_reactions.html.haml
@@ -18,4 +18,4 @@
                     %span= user_screen_name(smile.user, url: false)
         .modal-footer
           = button_to t("voc.close"), modal_close_path, method: :get, class: "btn btn-default"
-  .modal-backdrop.fade.show
+    = link_to "", modal_close_path, method: :get, class: "modal-backdrop fade show z-n1"

From be947bf4e2181c001cabce84f9befc541fa660fc Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 08:16:18 +0200
Subject: [PATCH 165/590] Add `RelationshipsController`

---
 app/controllers/relationships_controller.rb | 47 +++++++++++++++++++++
 app/views/relationships/_create.html.haml   | 13 ++++++
 app/views/relationships/_destroy.html.haml  | 13 ++++++
 config/routes.rb                            |  1 +
 4 files changed, 74 insertions(+)
 create mode 100644 app/controllers/relationships_controller.rb
 create mode 100644 app/views/relationships/_create.html.haml
 create mode 100644 app/views/relationships/_destroy.html.haml

diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
new file mode 100644
index 00000000..d5c134ae
--- /dev/null
+++ b/app/controllers/relationships_controller.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class RelationshipsController < ApplicationController
+  include TurboStreamable
+
+  before_action :authenticate_user!
+
+  turbo_stream_actions :create, :destroy
+
+  def create
+    UseCase::Relationship::Create.call(
+      source_user: current_user,
+      target_user: ::User.find_by!(screen_name: params[:screen_name]),
+      type:        params[:type]
+    )
+
+    respond_to do |format|
+      format.turbo_stream do
+        render turbo_stream: [
+          turbo_stream.replace("#{params[:type]}-#{params[:screen_name]}", partial: "relationships/destroy", locals: { type: params[:type], screen_name: params[:screen_name] }),
+          render_toast(t(".#{params[:type]}.success"))
+        ]
+      end
+
+      format.html { redirect_back(fallback_location: user_path(username: params[:screen_name])) }
+    end
+  end
+
+  def destroy
+    UseCase::Relationship::Destroy.call(
+      source_user: current_user,
+      target_user: ::User.find_by!(screen_name: params[:screen_name]),
+      type:        params[:type]
+    )
+
+    respond_to do |format|
+      format.turbo_stream do
+        render turbo_stream: [
+          turbo_stream.replace("#{params[:type]}-#{params[:screen_name]}", partial: "relationships/create", locals: { type: params[:type], screen_name: params[:screen_name] }),
+          render_toast(t(".#{params[:type]}.success"))
+        ]
+      end
+
+      format.html { redirect_back(fallback_location: user_path(username: params[:screen_name])) }
+    end
+  end
+end
diff --git a/app/views/relationships/_create.html.haml b/app/views/relationships/_create.html.haml
new file mode 100644
index 00000000..23c91782
--- /dev/null
+++ b/app/views/relationships/_create.html.haml
@@ -0,0 +1,13 @@
+- if type == "follow"
+  = button_to relationships_path(screen_name:, type:), form: { id: "#{type}-#{screen_name}" }, class: "btn btn-primary", form_class: "d-grid" do
+    = t("voc.follow")
+
+- if type == "block"
+  = button_to relationships_path(screen_name:, type:), form: { id: "#{type}-#{screen_name}" }, class: "dropdown-item" do
+    %i.fa.fa-minus-circle.fa-fw
+    = t("voc.block")
+
+- if type == "mute"
+  = button_to relationships_path(screen_name:, type:), form: { id: "#{type}-#{screen_name}" }, class: "dropdown-item" do
+    %i.fa.fa-volume-off.fa-fw
+    = t("voc.mute")
diff --git a/app/views/relationships/_destroy.html.haml b/app/views/relationships/_destroy.html.haml
new file mode 100644
index 00000000..00b81b93
--- /dev/null
+++ b/app/views/relationships/_destroy.html.haml
@@ -0,0 +1,13 @@
+- if type == "follow"
+  = button_to relationships_path(screen_name:, type:), method: :delete, form: { id: "#{type}-#{screen_name}" }, class: "btn btn-primary", form_class: "d-grid" do
+    = t("voc.unfollow")
+
+- if type == "block"
+  = button_to relationships_path(screen_name:, type:), method: :delete, form: { id: "#{type}-#{screen_name}" }, class: "dropdown-item" do
+    %i.fa.fa-minus-circle.fa-fw
+    = t("voc.unblock")
+
+- if type == "mute"
+  = button_to relationships_path(screen_name:, type:), method: :delete, form: { id: "#{type}-#{screen_name}" }, class: "dropdown-item" do
+    %i.fa.fa-volume-off.fa-fw
+    = t("voc.unmute")
diff --git a/config/routes.rb b/config/routes.rb
index 46db96a8..7e5e259c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -147,6 +147,7 @@ Rails.application.routes.draw do
   get "/inbox", to: "inbox#show", as: :inbox
 
   resource :subscriptions, controller: :subscriptions, only: %i[create destroy]
+  resource :relationships, only: %i[create destroy]
 
   get "/user/:username", to: "user#show"
   get "/@:username", to: "user#show", as: :user

From e9290a73f840e486a40e82ffea66b5da1b747d0b Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 08:16:43 +0200
Subject: [PATCH 166/590] Replace action targets with relationship partials

---
 app/views/user/_actions.html.haml | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/views/user/_actions.html.haml b/app/views/user/_actions.html.haml
index 23960a38..a70f1935 100644
--- a/app/views/user/_actions.html.haml
+++ b/app/views/user/_actions.html.haml
@@ -9,11 +9,9 @@
   - elsif user_signed_in?
     .d-grid.gap-2
       - if own_followings&.include?(user.id) || current_user.following?(user)
-        %button.btn.btn-primary{ type: :button, name: 'user-action', data: { action: :unfollow, type: type, target: user.screen_name } }
-          = t("voc.unfollow")
+        = render "relationships/destroy", type: "follow", screen_name: user.screen_name
       - else
-        %button.btn.btn-primary{ type: :button, name: 'user-action', data: { action: :follow, type: type, target: user.screen_name } }
-          = t("voc.follow")
+        = render "relationships/create", type: "follow", screen_name: user.screen_name
       .btn-group
         %button.btn.btn-light.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
           = t(".title")
@@ -23,21 +21,13 @@
             %i.fa.fa-list.fa-fw
             = t(".list")
           - if own_blocks&.include?(user.id) || current_user.blocking?(user)
-            %a.dropdown-item{ href: '#', data: { action: :unblock, target: user.screen_name } }
-              %i.fa.fa-minus-circle.fa-fw
-              %span.pe-none= t("voc.unblock")
+            = render "relationships/destroy", type: "block", screen_name: user.screen_name
           - else
-            %a.dropdown-item{ href: '#', data: { action: :block, target: user.screen_name } }
-              %i.fa.fa-minus-circle.fa-fw
-              %span.pe-none= t("voc.block")
+            = render "relationships/create", type: "block", screen_name: user.screen_name
           - if own_mutes&.include?(user.id) || current_user.muting?(user)
-            %a.dropdown-item{ href: '#', data: { action: :unmute, target: user.screen_name } }
-              %i.fa.fa-volume-off.fa-fw
-              %span.pe-none= t("voc.unmute")
+            = render "relationships/destroy", type: "mute", screen_name: user.screen_name
           - else
-            %a.dropdown-item{ href: '#', data: { action: :mute, target: user.screen_name } }
-              %i.fa.fa-volume-off.fa-fw
-              %span.pe-none= t("voc.mute")
+            = render "relationships/create", type: "mute", screen_name: user.screen_name
           %a.dropdown-item{ href: '#', data: { action: 'report-user', target: user.screen_name } }
             %i.fa.fa-exclamation-triangle.fa-fw
             = t("voc.report")

From 82b959f7515ecfb3a0c8a3a11bd1047ed005aac1 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 08:17:02 +0200
Subject: [PATCH 167/590] Move relationship locales to controller scope

---
 config/locales/controllers.en.yml | 42 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/config/locales/controllers.en.yml b/config/locales/controllers.en.yml
index 08b549dc..684b7f19 100644
--- a/config/locales/controllers.en.yml
+++ b/config/locales/controllers.en.yml
@@ -101,27 +101,6 @@ en:
         notfound: "Question does not exist."
         noauth: "You are not allowed to delete this question."
         success: "Successfully deleted question."
-    relationship:
-      create:
-        block:
-          success: "Successfully blocked user."
-          error: "You are already blocking that user."
-        follow:
-          success: "Successfully followed user."
-          error: "You are already following that user."
-        mute:
-          success: "Successfully muted user."
-          error: "You are already muting that user."
-      destroy:
-        block:
-          success: "Successfully unblocked user."
-          error: "You are not blocking that user."
-        follow:
-          success: "Successfully unfollowed user."
-          error: "You are not following that user."
-        mute:
-          success: "Successfully unmuted user."
-          error: "You are not muting that user."
     report:
       create:
         noauth: :ajax.noauth
@@ -216,6 +195,27 @@ en:
     registrations:
       destroy:
         export_pending: "You may not delete your account while account data is currently being exported."
+  relationships:
+    create:
+      block:
+        success: "Successfully blocked user."
+        error: "You are already blocking that user."
+      follow:
+        success: "Successfully followed user."
+        error: "You are already following that user."
+      mute:
+        success: "Successfully muted user."
+        error: "You are already muting that user."
+    destroy:
+      block:
+        success: "Successfully unblocked user."
+        error: "You are not blocking that user."
+      follow:
+        success: "Successfully unfollowed user."
+        error: "You are not following that user."
+      mute:
+        success: "Successfully unmuted user."
+        error: "You are not muting that user."
   timeline:
     public:
       title: "Public Timeline"

From 10473f4ed0ffaf20863f73b1396f2fccf61778ab Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 21:38:21 +0200
Subject: [PATCH 168/590] Remove `Ajax::RelationshipController` and spec

---
 .../ajax/relationship_controller.rb           |  35 ----
 .../ajax/relationship_controller_spec.rb      | 153 ------------------
 2 files changed, 188 deletions(-)
 delete mode 100644 app/controllers/ajax/relationship_controller.rb
 delete mode 100644 spec/controllers/ajax/relationship_controller_spec.rb

diff --git a/app/controllers/ajax/relationship_controller.rb b/app/controllers/ajax/relationship_controller.rb
deleted file mode 100644
index ba9f4546..00000000
--- a/app/controllers/ajax/relationship_controller.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-class Ajax::RelationshipController < AjaxController
-  before_action :authenticate_user!
-
-  def create
-    params.require :screen_name
-
-    UseCase::Relationship::Create.call(
-      source_user: current_user,
-      target_user: ::User.find_by!(screen_name: params[:screen_name]),
-      type:        params[:type]
-    )
-    @response[:success] = true
-    @response[:message] = t(".#{params[:type]}.success")
-  rescue Errors::Base => e
-    @response[:message] = t(e.locale_tag)
-  ensure
-    return_response
-  end
-
-  def destroy
-    UseCase::Relationship::Destroy.call(
-      source_user: current_user,
-      target_user: ::User.find_by!(screen_name: params[:screen_name]),
-      type:        params[:type]
-    )
-    @response[:success] = true
-    @response[:message] = t(".#{params[:type]}.success")
-  rescue Errors::Base => e
-    @response[:message] = t(e.locale_tag)
-  ensure
-    return_response
-  end
-end
diff --git a/spec/controllers/ajax/relationship_controller_spec.rb b/spec/controllers/ajax/relationship_controller_spec.rb
deleted file mode 100644
index 11d2ddbd..00000000
--- a/spec/controllers/ajax/relationship_controller_spec.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe Ajax::RelationshipController, type: :controller do
-  shared_examples_for "params is empty" do
-    let(:params) { {} }
-
-    include_examples "ajax does not succeed", "is required"
-  end
-
-  let!(:user) { FactoryBot.create(:user) }
-  let!(:user2) { FactoryBot.create(:user) }
-
-  describe "#create" do
-    shared_examples_for "valid relationship type" do
-      it_behaves_like "params is empty"
-
-      context "screen_name does not exist" do
-        let(:screen_name) { "peter-witzig" }
-
-        include_examples "ajax does not succeed", "not found"
-      end
-
-      context "screen_name is current user" do
-        let(:screen_name) { user.screen_name }
-
-        include_examples "ajax does not succeed", "yourself"
-      end
-
-      context "screen_name is different from current_user" do
-        let(:screen_name) { user2.screen_name }
-
-        it "creates the relationship" do
-          expect { subject }.to change { Relationship.count }.by(1)
-          expect(Relationship.last.target.screen_name).to eq(screen_name)
-        end
-      end
-    end
-
-    let(:type)        { "Sauerkraut" }
-    let(:screen_name) { user2.screen_name }
-    let(:params)      { { type: type, screen_name: screen_name } }
-
-    subject { post(:create, params: params) }
-
-    it_behaves_like "requires login"
-
-    context "user signed in" do
-      before(:each) { sign_in(user) }
-
-      context "type = 'follow'" do
-        let(:type) { "follow" }
-
-        include_examples "valid relationship type"
-
-        context "target user mutes source user" do
-          before do
-            user2.mute(user)
-          end
-
-          it "creates the relationship but no notification" do
-            expect { subject }.to change { Notification.count }.by(0)
-          end
-        end
-      end
-
-      context "type = 'block'" do
-        let(:type) { "block" }
-
-        include_examples "valid relationship type"
-      end
-
-      context "type = 'mute'" do
-        let(:type) { "mute" }
-
-        include_examples "valid relationship type"
-      end
-
-      context "type = 'dick'" do
-        let(:type) { "dick" }
-
-        it_behaves_like "params is empty"
-        include_examples "ajax does not succeed", "Invalid parameter"
-      end
-    end
-  end
-
-  describe "#destroy" do
-    shared_examples_for "valid relationship type" do
-      let(:screen_name) { user2.screen_name }
-
-      context "relationship exists" do
-        before do
-          user.public_send(type, user2)
-        end
-
-        it "destroys a relationship" do
-          expect { subject }.to change { Relationship.count }.by(-1)
-        end
-      end
-
-      context "relationship does not exist" do
-        it "does not change anything at all" do
-          expect { subject }.to change { Relationship.count }.by(0)
-        end
-      end
-
-      context "screen_name does not exist" do
-        let(:screen_name) { "peter-witzig" }
-
-        include_examples "ajax does not succeed", "not found"
-      end
-    end
-
-    let(:type)        { "Sauerkraut" }
-    let(:screen_name) { user2.screen_name }
-    let(:params)      { { type: type, screen_name: screen_name } }
-
-    subject { delete(:destroy, params: params) }
-
-    it_behaves_like "requires login"
-
-    context "user signed in" do
-      before(:each) { sign_in(user) }
-
-      context "type = 'follow'" do
-        let(:type) { "follow" }
-
-        include_examples "valid relationship type"
-      end
-
-      context "type = 'block'" do
-        let(:type) { "block" }
-
-        include_examples "valid relationship type"
-      end
-
-      context "type = 'mute'" do
-        let(:type) { "mute" }
-
-        include_examples "valid relationship type"
-      end
-
-      context "type = 'dick'" do
-        let(:type) { "dick" }
-
-        include_examples "ajax does not succeed", "Invalid parameter"
-      end
-    end
-  end
-end

From 31ccc7c11bc962104cbbd43aaa5dd88419a43289 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 21:39:24 +0200
Subject: [PATCH 169/590] Remove TypeScript relationship functionality

---
 .../retrospring/features/user/action.ts       | 115 ------------------
 .../retrospring/features/user/index.ts        |   4 -
 2 files changed, 119 deletions(-)
 delete mode 100644 app/javascript/retrospring/features/user/action.ts

diff --git a/app/javascript/retrospring/features/user/action.ts b/app/javascript/retrospring/features/user/action.ts
deleted file mode 100644
index 91ad152e..00000000
--- a/app/javascript/retrospring/features/user/action.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { post } from '@rails/request.js';
-import { showNotification, showErrorNotification } from 'utilities/notifications';
-import I18n from 'retrospring/i18n';
-
-export function userActionHandler(event: Event): void {
-  event.preventDefault();
-  const button: HTMLButtonElement = event.target as HTMLButtonElement;
-  const target = button.dataset.target;
-  const action = button.dataset.action;
-  button.disabled = true;
-
-  let targetURL, relationshipType;
-
-  switch (action) {
-    case 'follow':
-      targetURL = '/ajax/create_relationship';
-      relationshipType = 'follow';
-      break;
-    case 'unfollow':
-      targetURL = '/ajax/destroy_relationship';
-      relationshipType = 'follow';
-      break;
-    case 'block':
-      targetURL = '/ajax/create_relationship';
-      relationshipType = 'block';
-      break;
-    case 'unblock':
-      targetURL = '/ajax/destroy_relationship';
-      relationshipType = 'block';
-      break;
-    case 'mute':
-      targetURL = '/ajax/create_relationship';
-      relationshipType = 'mute';
-      break;
-    case 'unmute':
-      targetURL = '/ajax/destroy_relationship';
-      relationshipType = 'mute';
-      break;
-  }
-  let success = false;
-
-  post(targetURL, {
-    body: {
-      screen_name: target,
-      type: relationshipType,
-    },
-    contentType: 'application/json'
-  })
-    .then(async response => {
-      const data = await response.json;
-
-      success = data.success;
-      showNotification(data.message, data.success);
-    })
-    .catch(err => {
-      console.log(err);
-      showErrorNotification(I18n.translate('frontend.error.message'));
-    })
-    .finally(() => {
-      button.disabled = false;
-      if (!success) return;
-
-      switch (action) {
-        case 'follow':
-          button.dataset.action = 'unfollow';
-          button.innerText = I18n.translate('voc.unfollow');
-          button.classList.remove('btn-primary');
-          button.classList.add('btn-default');
-          break;
-        case 'unfollow':
-          resetFollowButton(button);
-          break;
-        case 'block':
-          button.dataset.action = 'unblock';
-          button.querySelector('span').innerText = I18n.translate('voc.unblock');
-          if (button.classList.contains('btn')) {
-            button.classList.remove('btn-primary');
-            button.classList.add('btn-default');
-          }
-          resetFollowButton(document.querySelector<HTMLButtonElement>('button[data-action="unfollow"]'));
-          break;
-        case 'unblock':
-          button.dataset.action = 'block';
-          button.querySelector('span').innerText = I18n.translate('voc.block');
-          if (button.classList.contains('btn')) {
-            button.classList.remove('btn-default');
-            button.classList.add('btn-primary');
-          }
-          break;
-        case 'mute':
-          button.dataset.action = 'unmute';
-          button.querySelector('span').innerText = I18n.translate('voc.unmute');
-          if (button.classList.contains('btn')) {
-            button.classList.remove('btn-primary');
-            button.classList.add('btn-default');
-          }
-          break;
-        case 'unmute':
-          button.dataset.action = 'mute';
-          button.querySelector('span').innerText = I18n.translate('voc.mute');
-          if (button.classList.contains('btn')) {
-            button.classList.remove('btn-default');
-            button.classList.add('btn-primary');
-          }
-          break;
-      }
-    });
-}
-
-function resetFollowButton(button: HTMLButtonElement) {
-  button.dataset.action = 'follow';
-  button.innerText = I18n.translate('voc.follow');
-  button.classList.remove('btn-default');
-  button.classList.add('btn-primary');
-}
diff --git a/app/javascript/retrospring/features/user/index.ts b/app/javascript/retrospring/features/user/index.ts
index 00256485..9d56c74f 100644
--- a/app/javascript/retrospring/features/user/index.ts
+++ b/app/javascript/retrospring/features/user/index.ts
@@ -1,12 +1,8 @@
-import { userActionHandler } from './action';
 import { userReportHandler } from './report';
 import registerEvents from 'retrospring/utilities/registerEvents';
 
 export default (): void => {
   registerEvents([
-    { type: 'click', target: 'button[name=user-action]', handler: userActionHandler, global: true },
-    { type: 'click', target: '[data-action=block], [data-action=unblock]', handler: userActionHandler, global: true },
-    { type: 'click', target: '[data-action=mute], [data-action=unmute]', handler: userActionHandler, global: true },
     { type: 'click', target: 'a[data-action=report-user]', handler: userReportHandler, global: true }
   ]);
 }

From fc420a8091dff107ddd941a0e1ffb6c671be91ab Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 21:39:47 +0200
Subject: [PATCH 170/590] Add specs for `RelationshipsController`

---
 .../relationships_controller_spec.rb          | 153 ++++++++++++++++++
 spec/shared_examples/error_raising.rb         |   7 +
 2 files changed, 160 insertions(+)
 create mode 100644 spec/controllers/relationships_controller_spec.rb

diff --git a/spec/controllers/relationships_controller_spec.rb b/spec/controllers/relationships_controller_spec.rb
new file mode 100644
index 00000000..6b3bed06
--- /dev/null
+++ b/spec/controllers/relationships_controller_spec.rb
@@ -0,0 +1,153 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe RelationshipsController, type: :controller do
+  shared_examples_for "params is empty" do
+    let(:params) { {} }
+
+    include_examples "turbo does not succeed", "is required"
+  end
+
+  let!(:user) { FactoryBot.create(:user) }
+  let!(:user2) { FactoryBot.create(:user) }
+
+  describe "#create" do
+    shared_examples_for "valid relationship type" do
+      it_behaves_like "params is empty"
+
+      context "screen_name does not exist" do
+        let(:screen_name) { "peter-witzig" }
+
+        include_examples "turbo does not succeed", "not found"
+      end
+
+      context "screen_name is current user" do
+        let(:screen_name) { user.screen_name }
+
+        include_examples "turbo does not succeed", "yourself"
+      end
+
+      context "screen_name is different from current_user" do
+        let(:screen_name) { user2.screen_name }
+
+        it "creates the relationship" do
+          expect { subject }.to change { Relationship.count }.by(1)
+          expect(Relationship.last.target.screen_name).to eq(screen_name)
+        end
+      end
+    end
+
+    let(:type)        { "Sauerkraut" }
+    let(:screen_name) { user2.screen_name }
+    let(:params)      { { type: type, screen_name: screen_name } }
+
+    subject { post(:create, params: params, format: :turbo_stream) }
+
+    it_behaves_like "requires login"
+
+    context "user signed in" do
+      before(:each) { sign_in(user) }
+
+      context "type = 'follow'" do
+        let(:type) { "follow" }
+
+        include_examples "valid relationship type"
+
+        context "target user mutes source user" do
+          before do
+            user2.mute(user)
+          end
+
+          it "creates the relationship but no notification" do
+            expect { subject }.to change { Notification.count }.by(0)
+          end
+        end
+      end
+
+      context "type = 'block'" do
+        let(:type) { "block" }
+
+        include_examples "valid relationship type"
+      end
+
+      context "type = 'mute'" do
+        let(:type) { "mute" }
+
+        include_examples "valid relationship type"
+      end
+
+      context "type = 'dick'" do
+        let(:type) { "dick" }
+
+        it_behaves_like "params is empty"
+        include_examples "turbo does not succeed", "Invalid parameter"
+      end
+    end
+  end
+
+  describe "#destroy" do
+    shared_examples_for "valid relationship type" do
+      let(:screen_name) { user2.screen_name }
+
+      context "relationship exists" do
+        before do
+          user.public_send(type, user2)
+        end
+
+        it "destroys a relationship" do
+          expect { subject }.to change { Relationship.count }.by(-1)
+        end
+      end
+
+      context "relationship does not exist" do
+        it "does not change anything at all" do
+          expect { subject }.to change { Relationship.count }.by(0)
+        end
+      end
+
+      context "screen_name does not exist" do
+        let(:screen_name) { "peter-witzig" }
+
+        include_examples "turbo does not succeed", "not found"
+      end
+    end
+
+    let(:type)        { "Sauerkraut" }
+    let(:screen_name) { user2.screen_name }
+    let(:params)      { { type: type, screen_name: screen_name } }
+
+    subject { delete(:destroy, params: params, format: :turbo_stream) }
+
+    it_behaves_like "requires login"
+
+    context "user signed in" do
+      before(:each) { sign_in(user) }
+
+      context "type = 'follow'" do
+        let(:type) { "follow" }
+
+        include_examples "valid relationship type"
+      end
+
+      context "type = 'block'" do
+        let(:type) { "block" }
+
+        include_examples "valid relationship type"
+      end
+
+      context "type = 'mute'" do
+        let(:type) { "mute" }
+
+        include_examples "valid relationship type"
+      end
+
+      context "type = 'dick'" do
+        let(:type) { "dick" }
+
+        include_examples "turbo does not succeed", "Invalid parameter"
+      end
+    end
+  end
+end
diff --git a/spec/shared_examples/error_raising.rb b/spec/shared_examples/error_raising.rb
index 03290783..527318b1 100644
--- a/spec/shared_examples/error_raising.rb
+++ b/spec/shared_examples/error_raising.rb
@@ -13,3 +13,10 @@ RSpec.shared_examples_for "ajax does not succeed" do |part_of_error_message|
     expect(assigns(:response)[:message]).to include(part_of_error_message)
   end
 end
+
+RSpec.shared_examples_for "turbo does not succeed" do |part_of_error_message|
+  it "turbo does not succeed" do
+    subject
+    expect(response.body).to include(part_of_error_message)
+  end
+end

From e222ab7c3080bd8218807563230611591ae8e13a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 22:06:58 +0200
Subject: [PATCH 171/590] Temporarily fix turbo stream error example

---
 spec/shared_examples/error_raising.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/shared_examples/error_raising.rb b/spec/shared_examples/error_raising.rb
index 527318b1..34417e22 100644
--- a/spec/shared_examples/error_raising.rb
+++ b/spec/shared_examples/error_raising.rb
@@ -17,6 +17,7 @@ end
 RSpec.shared_examples_for "turbo does not succeed" do |part_of_error_message|
   it "turbo does not succeed" do
     subject
-    expect(response.body).to include(part_of_error_message)
+    # FIXME: for some reason, partials are not rendered, making the actual error message not accessible
+    expect(response.body).to include "turbo-stream action=\"append\" target=\"toasts\""
   end
 end

From 54fb4d09fd39c426c2c4c4116f20a8d2b67f704c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 22:15:51 +0200
Subject: [PATCH 172/590] Fix lint nits

---
 app/controllers/relationships_controller.rb       | 4 ++--
 app/views/relationships/_destroy.html.haml        | 3 ++-
 spec/controllers/relationships_controller_spec.rb | 8 ++++----
 spec/shared_examples/error_raising.rb             | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
index d5c134ae..c750d9c4 100644
--- a/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@@ -11,7 +11,7 @@ class RelationshipsController < ApplicationController
     UseCase::Relationship::Create.call(
       source_user: current_user,
       target_user: ::User.find_by!(screen_name: params[:screen_name]),
-      type:        params[:type]
+      type:        params[:type],
     )
 
     respond_to do |format|
@@ -30,7 +30,7 @@ class RelationshipsController < ApplicationController
     UseCase::Relationship::Destroy.call(
       source_user: current_user,
       target_user: ::User.find_by!(screen_name: params[:screen_name]),
-      type:        params[:type]
+      type:        params[:type],
     )
 
     respond_to do |format|
diff --git a/app/views/relationships/_destroy.html.haml b/app/views/relationships/_destroy.html.haml
index 00b81b93..f26ec521 100644
--- a/app/views/relationships/_destroy.html.haml
+++ b/app/views/relationships/_destroy.html.haml
@@ -1,5 +1,6 @@
 - if type == "follow"
-  = button_to relationships_path(screen_name:, type:), method: :delete, form: { id: "#{type}-#{screen_name}" }, class: "btn btn-primary", form_class: "d-grid" do
+  = button_to relationships_path(screen_name:, type:), method: :delete, form: { id: "#{type}-#{screen_name}" }, class: "btn btn-primary",
+                                                       form_class: "d-grid" do
     = t("voc.unfollow")
 
 - if type == "block"
diff --git a/spec/controllers/relationships_controller_spec.rb b/spec/controllers/relationships_controller_spec.rb
index 6b3bed06..68c6a4e3 100644
--- a/spec/controllers/relationships_controller_spec.rb
+++ b/spec/controllers/relationships_controller_spec.rb
@@ -41,9 +41,9 @@ describe RelationshipsController, type: :controller do
 
     let(:type)        { "Sauerkraut" }
     let(:screen_name) { user2.screen_name }
-    let(:params)      { { type: type, screen_name: screen_name } }
+    let(:params)      { { type:, screen_name: } }
 
-    subject { post(:create, params: params, format: :turbo_stream) }
+    subject { post(:create, params:, format: :turbo_stream) }
 
     it_behaves_like "requires login"
 
@@ -116,9 +116,9 @@ describe RelationshipsController, type: :controller do
 
     let(:type)        { "Sauerkraut" }
     let(:screen_name) { user2.screen_name }
-    let(:params)      { { type: type, screen_name: screen_name } }
+    let(:params)      { { type:, screen_name: } }
 
-    subject { delete(:destroy, params: params, format: :turbo_stream) }
+    subject { delete(:destroy, params:, format: :turbo_stream) }
 
     it_behaves_like "requires login"
 
diff --git a/spec/shared_examples/error_raising.rb b/spec/shared_examples/error_raising.rb
index 34417e22..8ddf0b63 100644
--- a/spec/shared_examples/error_raising.rb
+++ b/spec/shared_examples/error_raising.rb
@@ -14,7 +14,7 @@ RSpec.shared_examples_for "ajax does not succeed" do |part_of_error_message|
   end
 end
 
-RSpec.shared_examples_for "turbo does not succeed" do |part_of_error_message|
+RSpec.shared_examples_for "turbo does not succeed" do
   it "turbo does not succeed" do
     subject
     # FIXME: for some reason, partials are not rendered, making the actual error message not accessible

From e802e0197dbc79745e062413545fb883beaed559 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 26 Oct 2023 22:43:01 +0200
Subject: [PATCH 173/590] Make `turbo does not succeed` example for in
 `RelationshipsController`

---
 app/controllers/relationships_controller.rb       | 2 ++
 spec/controllers/relationships_controller_spec.rb | 2 ++
 spec/shared_examples/error_raising.rb             | 5 ++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
index c750d9c4..e9965f79 100644
--- a/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@@ -8,6 +8,8 @@ class RelationshipsController < ApplicationController
   turbo_stream_actions :create, :destroy
 
   def create
+    params.require :screen_name
+
     UseCase::Relationship::Create.call(
       source_user: current_user,
       target_user: ::User.find_by!(screen_name: params[:screen_name]),
diff --git a/spec/controllers/relationships_controller_spec.rb b/spec/controllers/relationships_controller_spec.rb
index 68c6a4e3..9642b34b 100644
--- a/spec/controllers/relationships_controller_spec.rb
+++ b/spec/controllers/relationships_controller_spec.rb
@@ -4,6 +4,8 @@
 require "rails_helper"
 
 describe RelationshipsController, type: :controller do
+  render_views
+
   shared_examples_for "params is empty" do
     let(:params) { {} }
 
diff --git a/spec/shared_examples/error_raising.rb b/spec/shared_examples/error_raising.rb
index 8ddf0b63..527318b1 100644
--- a/spec/shared_examples/error_raising.rb
+++ b/spec/shared_examples/error_raising.rb
@@ -14,10 +14,9 @@ RSpec.shared_examples_for "ajax does not succeed" do |part_of_error_message|
   end
 end
 
-RSpec.shared_examples_for "turbo does not succeed" do
+RSpec.shared_examples_for "turbo does not succeed" do |part_of_error_message|
   it "turbo does not succeed" do
     subject
-    # FIXME: for some reason, partials are not rendered, making the actual error message not accessible
-    expect(response.body).to include "turbo-stream action=\"append\" target=\"toasts\""
+    expect(response.body).to include(part_of_error_message)
   end
 end

From a9f988df7d3ffe4c9b7076547e530b6b1ac49912 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 28 Oct 2023 10:45:15 +0200
Subject: [PATCH 174/590] Bump version to 2023.1028.0

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index 5b2806e4..a79bd8bd 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -17,7 +17,7 @@ module Retrospring
 
     def month = 10
 
-    def day = 19
+    def day = 28
 
     def patch = 0
 

From a9ed8a608953a938926740abdbace7e22ca2c656 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 28 Oct 2023 11:20:17 +0200
Subject: [PATCH 175/590] Add migration for moving notifications for
 appendables to reactions

---
 .../20231028091613_move_appendable_notifications.rb   | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 db/migrate/20231028091613_move_appendable_notifications.rb

diff --git a/db/migrate/20231028091613_move_appendable_notifications.rb b/db/migrate/20231028091613_move_appendable_notifications.rb
new file mode 100644
index 00000000..0763ed42
--- /dev/null
+++ b/db/migrate/20231028091613_move_appendable_notifications.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class MoveAppendableNotifications < ActiveRecord::Migration[7.0]
+  def up
+    Notification::where(target_type: "Appendable").update_all(target_type: "Reaction") # rubocop:disable Rails/SkipsModelValidations
+  end
+
+  def down
+    Notification::where(target_type: "Reaction").update_all(type: "Appendable") # rubocop:disable Rails/SkipsModelValidations
+  end
+end

From 1ab7f5c3ca180de159c4b9fb606bed4c407eefed Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 28 Oct 2023 11:23:28 +0200
Subject: [PATCH 176/590] Bump version to 2023.1028.1

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index a79bd8bd..b14021c0 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -19,7 +19,7 @@ module Retrospring
 
     def day = 28
 
-    def patch = 0
+    def patch = 1
 
     def suffix = ""
 

From c0d169367e20d6d10c451b488caa28fa32348359 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 28 Oct 2023 13:02:57 +0200
Subject: [PATCH 177/590] Update schema.rb

---
 db/schema.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 700b915b..a5ce9094 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_10_26_032527) do
+ActiveRecord::Schema[7.0].define(version: 2023_10_28_091613) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 

From 3811f15bd7f0621a2376846b6190b2f0413fefcc Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 28 Oct 2023 17:16:03 +0200
Subject: [PATCH 178/590] Add use cases for creating and destroying reactions

---
 lib/use_case/reaction/create.rb  | 20 ++++++++++++++++++++
 lib/use_case/reaction/destroy.rb | 19 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 lib/use_case/reaction/create.rb
 create mode 100644 lib/use_case/reaction/destroy.rb

diff --git a/lib/use_case/reaction/create.rb b/lib/use_case/reaction/create.rb
new file mode 100644
index 00000000..a126bba3
--- /dev/null
+++ b/lib/use_case/reaction/create.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module UseCase
+  module Reaction
+    class Create < UseCase::Base
+      option :source_user, type: Types.Instance(::User)
+      option :target, type: Types.Instance(::Answer) | Types.Instance(::Comment)
+      option :content, type: Types::Coercible::String, optional: true
+
+      def call
+        reaction = source_user.smile target
+
+        {
+          status:   201,
+          resource: reaction,
+        }
+      end
+    end
+  end
+end
diff --git a/lib/use_case/reaction/destroy.rb b/lib/use_case/reaction/destroy.rb
new file mode 100644
index 00000000..52fe3b7a
--- /dev/null
+++ b/lib/use_case/reaction/destroy.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module UseCase
+  module Reaction
+    class Destroy < UseCase::Base
+      option :source_user, type: Types.Instance(::User)
+      option :target, type: Types.Instance(::Answer) | Types.Instance(::Comment)
+
+      def call
+        source_user.unsmile target
+
+        {
+          status:   204,
+          resource: nil,
+        }
+      end
+    end
+  end
+end

From 4458aba37f1ebb7859fac53fb911ae2774f57eea Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 28 Oct 2023 17:16:17 +0200
Subject: [PATCH 179/590] Add tests for reaction use cases

---
 spec/lib/use_case/reaction/create_spec.rb  | 33 ++++++++++++++++++++++
 spec/lib/use_case/reaction/destroy_spec.rb | 31 ++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 spec/lib/use_case/reaction/create_spec.rb
 create mode 100644 spec/lib/use_case/reaction/destroy_spec.rb

diff --git a/spec/lib/use_case/reaction/create_spec.rb b/spec/lib/use_case/reaction/create_spec.rb
new file mode 100644
index 00000000..a438f108
--- /dev/null
+++ b/spec/lib/use_case/reaction/create_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe UseCase::Reaction::Create do
+  shared_examples_for "valid target type" do
+    it "creates a reaction" do
+      expect { subject }.to change { target.smile_count }.by(1)
+    end
+  end
+
+  subject { UseCase::Reaction::Create.call(source_user: user, target:) }
+
+  let(:user) { FactoryBot.create(:user) }
+
+  context "target is an Answer" do
+    let(:target) { FactoryBot.create(:answer, user:) }
+
+    include_examples "valid target type"
+  end
+
+  context "target is a Comment" do
+    let(:target) { FactoryBot.create(:comment, user:, answer: FactoryBot.create(:answer, user:)) }
+
+    include_examples "valid target type"
+  end
+
+  context "target is a Question" do
+    let(:target) { FactoryBot.create(:question) }
+
+    include_examples "raises an error", Dry::Types::ConstraintError
+  end
+end
diff --git a/spec/lib/use_case/reaction/destroy_spec.rb b/spec/lib/use_case/reaction/destroy_spec.rb
new file mode 100644
index 00000000..44c0e9a2
--- /dev/null
+++ b/spec/lib/use_case/reaction/destroy_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe UseCase::Reaction::Destroy do
+  shared_examples_for "valid target type" do
+    before do
+      user.smile target
+    end
+
+    it "destroys a reaction" do
+      expect { subject }.to change { target.smile_count }.by(-1)
+    end
+  end
+
+  subject { UseCase::Reaction::Destroy.call(source_user: user, target:) }
+
+  let(:user) { FactoryBot.create(:user) }
+
+  context "target is an Answer" do
+    let(:target) { FactoryBot.create(:answer, user:) }
+
+    include_examples "valid target type"
+  end
+
+  context "target is a Comment" do
+    let(:target) { FactoryBot.create(:comment, user:, answer: FactoryBot.create(:answer, user:)) }
+
+    include_examples "valid target type"
+  end
+end

From d36fbf85f4b3fdb79ada1675871407757629cf91 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 29 Oct 2023 20:42:37 +0100
Subject: [PATCH 180/590] Reload target before checking smile count

---
 spec/lib/use_case/reaction/create_spec.rb  | 2 +-
 spec/lib/use_case/reaction/destroy_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/lib/use_case/reaction/create_spec.rb b/spec/lib/use_case/reaction/create_spec.rb
index a438f108..243b227a 100644
--- a/spec/lib/use_case/reaction/create_spec.rb
+++ b/spec/lib/use_case/reaction/create_spec.rb
@@ -5,7 +5,7 @@ require "rails_helper"
 describe UseCase::Reaction::Create do
   shared_examples_for "valid target type" do
     it "creates a reaction" do
-      expect { subject }.to change { target.smile_count }.by(1)
+      expect { subject }.to change { target.reload.smile_count }.by(1)
     end
   end
 
diff --git a/spec/lib/use_case/reaction/destroy_spec.rb b/spec/lib/use_case/reaction/destroy_spec.rb
index 44c0e9a2..f979db66 100644
--- a/spec/lib/use_case/reaction/destroy_spec.rb
+++ b/spec/lib/use_case/reaction/destroy_spec.rb
@@ -9,7 +9,7 @@ describe UseCase::Reaction::Destroy do
     end
 
     it "destroys a reaction" do
-      expect { subject }.to change { target.smile_count }.by(-1)
+      expect { subject }.to change { target.reload.smile_count }.by(-1)
     end
   end
 

From 5afaef427ca0a60c39e238a7b8d0ce6dfed991e0 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 29 Oct 2023 21:24:52 +0100
Subject: [PATCH 181/590] Rename `CommentController` to `CommentsController`

---
 .../{comment_controller.rb => comments_controller.rb}         | 2 +-
 app/views/{comment => comments}/index.html.haml               | 0
 app/views/{comment => comments}/show_reactions.html.haml      | 0
 config/routes.rb                                              | 4 ++--
 ...comment_controller_spec.rb => comments_controller_spec.rb} | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename app/controllers/{comment_controller.rb => comments_controller.rb} (91%)
 rename app/views/{comment => comments}/index.html.haml (100%)
 rename app/views/{comment => comments}/show_reactions.html.haml (100%)
 rename spec/controllers/{comment_controller_spec.rb => comments_controller_spec.rb} (97%)

diff --git a/app/controllers/comment_controller.rb b/app/controllers/comments_controller.rb
similarity index 91%
rename from app/controllers/comment_controller.rb
rename to app/controllers/comments_controller.rb
index b3e12514..4aa92962 100644
--- a/app/controllers/comment_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CommentController < ApplicationController
+class CommentsController < ApplicationController
   def index
     answer = Answer.find(params[:id])
     @comments = Comment.where(answer:).includes([{ user: :profile }, :smiles])
diff --git a/app/views/comment/index.html.haml b/app/views/comments/index.html.haml
similarity index 100%
rename from app/views/comment/index.html.haml
rename to app/views/comments/index.html.haml
diff --git a/app/views/comment/show_reactions.html.haml b/app/views/comments/show_reactions.html.haml
similarity index 100%
rename from app/views/comment/show_reactions.html.haml
rename to app/views/comments/show_reactions.html.haml
diff --git a/config/routes.rb b/config/routes.rb
index 7e5e259c..dde406e3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -154,10 +154,10 @@ Rails.application.routes.draw do
   get "/@:username/a/:id", to: "answer#show", as: :answer
   post "/@:username/a/:id/pin", to: "answer#pin", as: :pin_answer
   delete "/@:username/a/:id/pin", to: "answer#unpin", as: :unpin_answer
-  get "/@:username/a/:id/comments", to: "comment#index", as: :comments
+  get "/@:username/a/:id/comments", to: "comments#index", as: :comments
   get "/@:username/a/:id/reactions", to: "reaction#index", as: :reactions
   get "/@:username/q/:id", to: "question#show", as: :question
-  get "/@:username/c/:id/reactions", to: "comment#show_reactions", as: :comment_reactions
+  get "/@:username/c/:id/reactions", to: "comments#show_reactions", as: :comment_reactions
   get "/@:username/followers", to: "user#followers", as: :show_user_followers
   get "/@:username/followings", to: "user#followings", as: :show_user_followings
   get "/@:username/friends", to: redirect("/@%{username}/followings")
diff --git a/spec/controllers/comment_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
similarity index 97%
rename from spec/controllers/comment_controller_spec.rb
rename to spec/controllers/comments_controller_spec.rb
index 63812485..1140f1f3 100644
--- a/spec/controllers/comment_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe CommentController, type: :controller do
+describe CommentsController, type: :controller do
   describe "#index" do
     shared_examples_for "succeeds" do
       it "returns the correct response" do

From e8e833f9bdbef9da4c2f3b9baf0033495d5c1fa6 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 29 Oct 2023 21:32:39 +0100
Subject: [PATCH 182/590] Move comment reactions into own controller

---
 .../comments/reactions_controller.rb          | 10 ++++++
 app/controllers/comments_controller.rb        |  7 ----
 .../show.html.haml}                           |  0
 config/routes.rb                              |  2 +-
 .../comments/reactions_controller_spec.rb     | 34 +++++++++++++++++++
 spec/controllers/comments_controller_spec.rb  | 29 ----------------
 6 files changed, 45 insertions(+), 37 deletions(-)
 create mode 100644 app/controllers/comments/reactions_controller.rb
 rename app/views/comments/{show_reactions.html.haml => reactions/show.html.haml} (100%)
 create mode 100644 spec/controllers/comments/reactions_controller_spec.rb

diff --git a/app/controllers/comments/reactions_controller.rb b/app/controllers/comments/reactions_controller.rb
new file mode 100644
index 00000000..11ca6726
--- /dev/null
+++ b/app/controllers/comments/reactions_controller.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Comments::ReactionsController < ApplicationController
+  def show
+    comment = Comment.find(params[:id])
+    @reactions = Reaction.where(parent_type: "Comment", parent: comment.id).includes([{ user: :profile }])
+
+    redirect_to answer_path(username: comment.answer.user.screen_name, id: comment.answer.id) unless turbo_frame_request?
+  end
+end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 4aa92962..25f4b435 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -7,11 +7,4 @@ class CommentsController < ApplicationController
 
     render "index", locals: { a: answer }
   end
-
-  def show_reactions
-    comment = Comment.find(params[:id])
-    @reactions = Reaction.where(parent_type: "Comment", parent: comment.id).includes([{ user: :profile }])
-
-    redirect_to answer_path(username: comment.answer.user.screen_name, id: comment.answer.id) unless turbo_frame_request?
-  end
 end
diff --git a/app/views/comments/show_reactions.html.haml b/app/views/comments/reactions/show.html.haml
similarity index 100%
rename from app/views/comments/show_reactions.html.haml
rename to app/views/comments/reactions/show.html.haml
diff --git a/config/routes.rb b/config/routes.rb
index dde406e3..906e2ff6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -157,7 +157,7 @@ Rails.application.routes.draw do
   get "/@:username/a/:id/comments", to: "comments#index", as: :comments
   get "/@:username/a/:id/reactions", to: "reaction#index", as: :reactions
   get "/@:username/q/:id", to: "question#show", as: :question
-  get "/@:username/c/:id/reactions", to: "comments#show_reactions", as: :comment_reactions
+  get "/@:username/c/:id/reactions", to: "comments/reactions#show", as: :comment_reactions
   get "/@:username/followers", to: "user#followers", as: :show_user_followers
   get "/@:username/followings", to: "user#followings", as: :show_user_followings
   get "/@:username/friends", to: redirect("/@%{username}/followings")
diff --git a/spec/controllers/comments/reactions_controller_spec.rb b/spec/controllers/comments/reactions_controller_spec.rb
new file mode 100644
index 00000000..2c4dbb4e
--- /dev/null
+++ b/spec/controllers/comments/reactions_controller_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Comments::ReactionsController, type: :controller do
+  describe "#show" do
+    let(:answer_author) { FactoryBot.create(:user) }
+    let(:answer) { FactoryBot.create(:answer, user: answer_author) }
+    let(:commenter) { FactoryBot.create(:user) }
+    let(:comment) { FactoryBot.create(:comment, answer:, user: commenter) }
+
+    context "a regular web navigation request" do
+      subject { get :show, params: { username: commenter.screen_name, id: comment.id } }
+
+      it "should redirect to the answer page" do
+        subject
+
+        expect(response).to redirect_to answer_path(username: answer_author.screen_name, id: answer.id)
+      end
+    end
+
+    context "a Turbo Frame request" do
+      subject { get :show, params: { username: commenter.screen_name, id: comment.id } }
+
+      it "renders the show_reaction template" do
+        @request.headers["Turbo-Frame"] = "some_id"
+
+        subject
+
+        expect(response).to render_template(:show)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 1140f1f3..82145dcc 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -34,33 +34,4 @@ describe CommentsController, type: :controller do
       end
     end
   end
-
-  describe "#show_reactions" do
-    let(:answer_author) { FactoryBot.create(:user) }
-    let(:answer) { FactoryBot.create(:answer, user: answer_author) }
-    let(:commenter) { FactoryBot.create(:user) }
-    let(:comment) { FactoryBot.create(:comment, answer:, user: commenter) }
-
-    context "a regular web navigation request" do
-      subject { get :show_reactions, params: { username: commenter.screen_name, id: comment.id } }
-
-      it "should redirect to the answer page" do
-        subject
-
-        expect(response).to redirect_to answer_path(username: answer_author.screen_name, id: answer.id)
-      end
-    end
-
-    context "a Turbo Frame request" do
-      subject { get :show_reactions, params: { username: commenter.screen_name, id: comment.id } }
-
-      it "renders the show_reaction template" do
-        @request.headers["Turbo-Frame"] = "some_id"
-
-        subject
-
-        expect(response).to render_template(:show_reactions)
-      end
-    end
-  end
 end

From 91716454c3bbb5d3155539b045cc35a57b80a21e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 29 Oct 2023 21:34:13 +0100
Subject: [PATCH 183/590] Render correct template in spec

---
 spec/controllers/comments_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 82145dcc..209c1886 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -7,7 +7,7 @@ describe CommentsController, type: :controller do
     shared_examples_for "succeeds" do
       it "returns the correct response" do
         subject
-        expect(response).to have_rendered("comment/index")
+        expect(response).to have_rendered :index
         expect(response).to have_http_status(200)
         expect(assigns(:comments)).to eq(comments)
         expect(assigns(:comments)).to_not include(unrelated_comment)

From 5d093c621bfeeeea55a67ecb18954fdc7b9eeb0e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 29 Oct 2023 21:48:41 +0100
Subject: [PATCH 184/590] Rename  `#show` to `#index` action for comment
 reactions

---
 app/controllers/comments/reactions_controller.rb       |  2 +-
 .../reactions/{show.html.haml => index.html.haml}      |  0
 config/routes.rb                                       |  2 +-
 spec/controllers/comments/reactions_controller_spec.rb | 10 +++++-----
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename app/views/comments/reactions/{show.html.haml => index.html.haml} (100%)

diff --git a/app/controllers/comments/reactions_controller.rb b/app/controllers/comments/reactions_controller.rb
index 11ca6726..0efe2c2a 100644
--- a/app/controllers/comments/reactions_controller.rb
+++ b/app/controllers/comments/reactions_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Comments::ReactionsController < ApplicationController
-  def show
+  def index
     comment = Comment.find(params[:id])
     @reactions = Reaction.where(parent_type: "Comment", parent: comment.id).includes([{ user: :profile }])
 
diff --git a/app/views/comments/reactions/show.html.haml b/app/views/comments/reactions/index.html.haml
similarity index 100%
rename from app/views/comments/reactions/show.html.haml
rename to app/views/comments/reactions/index.html.haml
diff --git a/config/routes.rb b/config/routes.rb
index 906e2ff6..57e9e243 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -157,7 +157,7 @@ Rails.application.routes.draw do
   get "/@:username/a/:id/comments", to: "comments#index", as: :comments
   get "/@:username/a/:id/reactions", to: "reaction#index", as: :reactions
   get "/@:username/q/:id", to: "question#show", as: :question
-  get "/@:username/c/:id/reactions", to: "comments/reactions#show", as: :comment_reactions
+  get "/@:username/c/:id/reactions", to: "comments/reactions#index", as: :comment_reactions
   get "/@:username/followers", to: "user#followers", as: :show_user_followers
   get "/@:username/followings", to: "user#followings", as: :show_user_followings
   get "/@:username/friends", to: redirect("/@%{username}/followings")
diff --git a/spec/controllers/comments/reactions_controller_spec.rb b/spec/controllers/comments/reactions_controller_spec.rb
index 2c4dbb4e..083b89b5 100644
--- a/spec/controllers/comments/reactions_controller_spec.rb
+++ b/spec/controllers/comments/reactions_controller_spec.rb
@@ -3,14 +3,14 @@
 require "rails_helper"
 
 describe Comments::ReactionsController, type: :controller do
-  describe "#show" do
+  describe "#index" do
     let(:answer_author) { FactoryBot.create(:user) }
     let(:answer) { FactoryBot.create(:answer, user: answer_author) }
     let(:commenter) { FactoryBot.create(:user) }
     let(:comment) { FactoryBot.create(:comment, answer:, user: commenter) }
 
     context "a regular web navigation request" do
-      subject { get :show, params: { username: commenter.screen_name, id: comment.id } }
+      subject { get :index, params: { username: commenter.screen_name, id: comment.id } }
 
       it "should redirect to the answer page" do
         subject
@@ -20,14 +20,14 @@ describe Comments::ReactionsController, type: :controller do
     end
 
     context "a Turbo Frame request" do
-      subject { get :show, params: { username: commenter.screen_name, id: comment.id } }
+      subject { get :index, params: { username: commenter.screen_name, id: comment.id } }
 
-      it "renders the show_reaction template" do
+      it "renders the index template" do
         @request.headers["Turbo-Frame"] = "some_id"
 
         subject
 
-        expect(response).to render_template(:show)
+        expect(response).to render_template(:index)
       end
     end
   end

From ca043d56ef95beffa2c8dfaee14e407458938062 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 29 Oct 2023 21:14:26 +0100
Subject: [PATCH 185/590] Rename `ReactionController` to `ReactionsController`

---
 .../{reaction_controller.rb => reactions_controller.rb}         | 2 +-
 app/views/{reaction => reactions}/index.html.haml               | 0
 config/routes.rb                                                | 2 +-
 ...reaction_controller_spec.rb => reactions_controller_spec.rb} | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename app/controllers/{reaction_controller.rb => reactions_controller.rb} (77%)
 rename app/views/{reaction => reactions}/index.html.haml (100%)
 rename spec/controllers/{reaction_controller_spec.rb => reactions_controller_spec.rb} (94%)

diff --git a/app/controllers/reaction_controller.rb b/app/controllers/reactions_controller.rb
similarity index 77%
rename from app/controllers/reaction_controller.rb
rename to app/controllers/reactions_controller.rb
index c6df6000..fbf01fce 100644
--- a/app/controllers/reaction_controller.rb
+++ b/app/controllers/reactions_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ReactionController < ApplicationController
+class ReactionsController < ApplicationController
   def index
     answer = Answer.includes([smiles: { user: :profile }]).find(params[:id])
 
diff --git a/app/views/reaction/index.html.haml b/app/views/reactions/index.html.haml
similarity index 100%
rename from app/views/reaction/index.html.haml
rename to app/views/reactions/index.html.haml
diff --git a/config/routes.rb b/config/routes.rb
index 7e5e259c..3161f9f8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -155,7 +155,7 @@ Rails.application.routes.draw do
   post "/@:username/a/:id/pin", to: "answer#pin", as: :pin_answer
   delete "/@:username/a/:id/pin", to: "answer#unpin", as: :unpin_answer
   get "/@:username/a/:id/comments", to: "comment#index", as: :comments
-  get "/@:username/a/:id/reactions", to: "reaction#index", as: :reactions
+  get "/@:username/a/:id/reactions", to: "reactions#index", as: :reactions
   get "/@:username/q/:id", to: "question#show", as: :question
   get "/@:username/c/:id/reactions", to: "comment#show_reactions", as: :comment_reactions
   get "/@:username/followers", to: "user#followers", as: :show_user_followers
diff --git a/spec/controllers/reaction_controller_spec.rb b/spec/controllers/reactions_controller_spec.rb
similarity index 94%
rename from spec/controllers/reaction_controller_spec.rb
rename to spec/controllers/reactions_controller_spec.rb
index 1b76617f..605a515c 100644
--- a/spec/controllers/reaction_controller_spec.rb
+++ b/spec/controllers/reactions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe ReactionController, type: :controller do
+describe ReactionsController, type: :controller do
   describe "#index" do
     shared_examples_for "succeeds" do
       it "returns the correct response" do

From b7808e85c616463bcf3bfa198d60069215a984cd Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 29 Oct 2023 21:38:50 +0100
Subject: [PATCH 186/590] Check proper render result in spec

---
 spec/controllers/reactions_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/reactions_controller_spec.rb b/spec/controllers/reactions_controller_spec.rb
index 605a515c..e5e7ede5 100644
--- a/spec/controllers/reactions_controller_spec.rb
+++ b/spec/controllers/reactions_controller_spec.rb
@@ -7,7 +7,7 @@ describe ReactionsController, type: :controller do
     shared_examples_for "succeeds" do
       it "returns the correct response" do
         subject
-        expect(response).to have_rendered("reaction/index")
+        expect(response).to have_rendered :index
         expect(response).to have_http_status(200)
       end
     end

From ed7fd4a9d80fe605878a36f0fb4e5e4a9353e07a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:07:00 +0000
Subject: [PATCH 187/590] Bump rubocop-rails from 2.21.2 to 2.22.1

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.21.2 to 2.22.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.21.2...v2.22.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 86a6d498..e0857857 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ group :development, :test do
   gem "rspec-rails", "~> 6.0"
   gem "rspec-sidekiq", "~> 4.0", require: false
   gem "rubocop", "~> 1.57"
-  gem "rubocop-rails", "~> 2.21"
+  gem "rubocop-rails", "~> 2.22"
   gem "shoulda-matchers", "~> 5.3"
   gem "simplecov", require: false
   gem "simplecov-cobertura", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index d669b99d..fe85926a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -414,9 +414,9 @@ GEM
       rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.21.2)
+    rubocop-rails (2.22.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -571,7 +571,7 @@ DEPENDENCIES
   rspec-rails (~> 6.0)
   rspec-sidekiq (~> 4.0)
   rubocop (~> 1.57)
-  rubocop-rails (~> 2.21)
+  rubocop-rails (~> 2.22)
   rubyzip (~> 2.3)
   sanitize
   sassc-rails

From 82b1214dd1a3114079ee291571177e25d5ed9f86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:08:57 +0000
Subject: [PATCH 188/590] Bump rake from 13.0.6 to 13.1.0

Bumps [rake](https://github.com/ruby/rake) from 13.0.6 to 13.1.0.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rake/compare/v13.0.6...v13.1.0)

---
updated-dependencies:
- dependency-name: rake
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index d669b99d..6060c455 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -350,7 +350,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     redcarpet (3.6.0)
     redis (4.8.1)
     regexp_parser (2.8.2)

From bcead401b50d7186a52284497327c92336631116 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:52:44 +0000
Subject: [PATCH 189/590] Bump sass from 1.69.4 to 1.69.5

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.4 to 1.69.5.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.4...1.69.5)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4279333e..4c7f9984 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.69.4",
+    "sass": "^1.69.5",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.2.2"
diff --git a/yarn.lock b/yarn.lock
index 12e78b10..1c950d47 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2247,10 +2247,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.69.4:
-  version "1.69.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.4.tgz#10c735f55e3ea0b7742c6efa940bce30e07fbca2"
-  integrity sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==
+sass@^1.69.5:
+  version "1.69.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde"
+  integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 7eef377aa0cf8fb4c9657049ba5062aa23b1227e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:53:46 +0000
Subject: [PATCH 190/590] Bump stylelint-scss from 5.2.1 to 5.3.0

Bumps [stylelint-scss](https://github.com/stylelint-scss/stylelint-scss) from 5.2.1 to 5.3.0.
- [Release notes](https://github.com/stylelint-scss/stylelint-scss/releases)
- [Changelog](https://github.com/stylelint-scss/stylelint-scss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint-scss/stylelint-scss/compare/v5.2.1...v5.3.0)

---
updated-dependencies:
- dependency-name: stylelint-scss
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4279333e..f10ece7b 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,6 @@
     "eslint-plugin-import": "^2.29.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.0.0",
-    "stylelint-scss": "^5.2.1"
+    "stylelint-scss": "^5.3.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 12e78b10..eeb429ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2457,10 +2457,10 @@ stylelint-config-standard@^34.0.0:
   dependencies:
     stylelint-config-recommended "^13.0.0"
 
-stylelint-scss@^5.1.0, stylelint-scss@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.2.1.tgz#810299e4141fa38852bd14536a90e4942c8f387f"
-  integrity sha512-ZoTJUM85/qqpQHfEppjW/St//8s6p9Qsg8deWlYlr56F9iUgC9vXeIDQvH4odkRRJLTLFQzYMALSOFCQ3MDkgw==
+stylelint-scss@^5.1.0, stylelint-scss@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.3.0.tgz#32fd2681f8934e87dfa90f5188646d07f08c59c9"
+  integrity sha512-Sc7S1uWqStMc99NREsHNxpxHHFRvjo2pWILNl/UCwWO8PxhODK8qbJH0GHWIALxl6BD5rwJL4cSm4jk36hi6fg==
   dependencies:
     known-css-properties "^0.28.0"
     postcss-media-query-parser "^0.2.3"

From 58bd40607383f3a52257727d6bcae7692c5bb64c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:55:56 +0000
Subject: [PATCH 191/590] Bump tj-actions/changed-files from 39 to 40

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 39 to 40.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/changed-files/compare/v39...v40)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a30800bb..3d2a5f8e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v39
+        uses: tj-actions/changed-files@v40
         with:
           files: "**/*.rb"
       - name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v39
+        uses: tj-actions/changed-files@v40
         with:
           files: "**/*.ts"
       - name: Set up Node 16
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v39
+        uses: tj-actions/changed-files@v40
         with:
           files: "**/*.haml"
       - name: Install dependencies
@@ -89,7 +89,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v39
+        uses: tj-actions/changed-files@v40
         with:
           files: "**/*.scss"
       - name: Set up Node 16

From 4efe5b6774df14751e646934c749b0a9498f8392 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:56:01 +0000
Subject: [PATCH 192/590] Bump actions/setup-node from 3 to 4

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml        | 4 ++--
 .github/workflows/retrospring.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a30800bb..a36c784f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -44,7 +44,7 @@ jobs:
         with:
           files: "**/*.ts"
       - name: Set up Node 16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16'
           cache: 'yarn'
@@ -93,7 +93,7 @@ jobs:
         with:
           files: "**/*.scss"
       - name: Set up Node 16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16'
           cache: 'yarn'
diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index c08facae..2d21adf2 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -49,7 +49,7 @@ jobs:
         with:
           bundler-cache: true
       - name: Set up Node 16
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16'
           cache: 'yarn'

From 513de84664195a9f7319852fe61ec61ff1eee695 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:26:22 +0000
Subject: [PATCH 193/590] Bump rspec-sidekiq from 4.0.2 to 4.1.0

Bumps [rspec-sidekiq](https://github.com/wspurgin/rspec-sidekiq) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/wspurgin/rspec-sidekiq/releases)
- [Changelog](https://github.com/wspurgin/rspec-sidekiq/blob/main/CHANGES.md)
- [Commits](https://github.com/wspurgin/rspec-sidekiq/compare/v4.0.2...v4.1.0)

---
updated-dependencies:
- dependency-name: rspec-sidekiq
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index e0857857..422b121d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -91,7 +91,7 @@ group :development, :test do
   gem "rspec-its", "~> 1.3"
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.0"
-  gem "rspec-sidekiq", "~> 4.0", require: false
+  gem "rspec-sidekiq", "~> 4.1", require: false
   gem "rubocop", "~> 1.57"
   gem "rubocop-rails", "~> 2.22"
   gem "shoulda-matchers", "~> 5.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d764543..8db2160e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -396,7 +396,7 @@ GEM
       rspec-expectations (~> 3.12)
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
-    rspec-sidekiq (4.0.2)
+    rspec-sidekiq (4.1.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
@@ -569,7 +569,7 @@ DEPENDENCIES
   rspec-its (~> 1.3)
   rspec-mocks
   rspec-rails (~> 6.0)
-  rspec-sidekiq (~> 4.0)
+  rspec-sidekiq (~> 4.1)
   rubocop (~> 1.57)
   rubocop-rails (~> 2.22)
   rubyzip (~> 2.3)

From 48096f6c98ca2dfa085521334199b733c59e6ac7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:28:09 +0000
Subject: [PATCH 194/590] Bump rubocop from 1.57.1 to 1.57.2

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.57.1 to 1.57.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.57.1...v1.57.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9d764543..6d906eae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,7 +92,6 @@ GEM
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    base64 (0.1.1)
     bcrypt (3.1.19)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
@@ -402,8 +401,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.57.1)
-      base64 (~> 0.1.1)
+    rubocop (1.57.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 117a595f4925b5c65832e152f9ae9a889cb0a4d9 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 30 Oct 2023 01:03:29 +0100
Subject: [PATCH 195/590] Theme checkboxes using the primary color

---
 app/assets/stylesheets/overrides/_inputs.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/assets/stylesheets/overrides/_inputs.scss b/app/assets/stylesheets/overrides/_inputs.scss
index a1ef2007..aa89b202 100644
--- a/app/assets/stylesheets/overrides/_inputs.scss
+++ b/app/assets/stylesheets/overrides/_inputs.scss
@@ -20,3 +20,12 @@
   background-color: var(--raised-accent);
   border: 0;
 }
+
+.form-check-input:checked {
+  background-color: var(--primary);
+  border-color: var(--primary);
+}
+
+.form-check-input:focus {
+  box-shadow: rgba(var(--primary-rgb), 0.25) 0 0 0 0.25rem;
+}

From 83ac1563829b36ac54907464b703d81e989589b5 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 1 Nov 2023 08:45:56 +0100
Subject: [PATCH 196/590] Refactor `QuestionWorker` to send to individual users
 rather than all followers at once

---
 app/workers/question_worker.rb            | 23 ++++++++++-------------
 lib/use_case/question/create_followers.rb |  9 +++++----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/workers/question_worker.rb b/app/workers/question_worker.rb
index 969b725f..6cffd5af 100644
--- a/app/workers/question_worker.rb
+++ b/app/workers/question_worker.rb
@@ -5,22 +5,17 @@ class QuestionWorker
 
   sidekiq_options queue: :question, retry: false
 
-  # @param user_id [Integer] user id passed from Devise
+  # @param follower_id [Integer] user id passed from Devise
   # @param question_id [Integer] newly created question id
-  def perform(user_id, question_id)
-    user = User.find(user_id)
-    question = Question.find(question_id)
+  def perform(follower_id, question_id)
+    follower = User.includes(:web_push_subscriptions, :mute_rules, :muted_users).find(follower_id)
+    question = Question.includes(:user).find(question_id)
     webpush_app = Rpush::App.find_by(name: "webpush")
 
-    user.followers.each do |f|
-      next if skip_inbox?(f, question, user)
+    return if skip_inbox?(follower, question, user)
 
-      inbox = Inbox.create(user_id: f.id, question_id:, new: true)
-      f.push_notification(webpush_app, inbox) if webpush_app
-    end
-  rescue StandardError => e
-    logger.info "failed to ask question: #{e.message}"
-    Sentry.capture_exception(e)
+    inbox = Inbox.create(user_id: follower.id, question_id:, new: true)
+    follower.push_notification(webpush_app, inbox) if webpush_app
   end
 
   private
@@ -35,7 +30,9 @@ class QuestionWorker
     false
   end
 
+  # @param [User] user
+  # @param [Question] question
   def muted?(user, question)
-    MuteRule.where(user:).any? { |rule| rule.applies_to? question }
+    user.mute_rules.any? { |rule| rule.applies_to? question }
   end
 end
diff --git a/lib/use_case/question/create_followers.rb b/lib/use_case/question/create_followers.rb
index 04fe3844..fd4a73de 100644
--- a/lib/use_case/question/create_followers.rb
+++ b/lib/use_case/question/create_followers.rb
@@ -13,13 +13,14 @@ module UseCase
           author_is_anonymous: false,
           author_identifier:,
           user:                source_user,
-          direct:              false
+          direct:              false,
         )
 
         increment_asked_count
         increment_metric
 
-        QuestionWorker.perform_async(source_user_id, question.id)
+        args = source_user.followers.map { |f| [f.id, question.id] }
+        QuestionWorker.perform_bulk(args)
 
         {
           status:   201,
@@ -40,12 +41,12 @@ module UseCase
             anonymous: false,
             followers: true,
             generated: false,
-          }
+          },
         )
       end
 
       def source_user
-        @source_user ||= ::User.find(source_user_id)
+        @source_user ||= ::User.includes(:followers).find(source_user_id)
       end
     end
   end

From 4cb66c7100db6ac0bfeb206978747b4de10a9ccc Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 29 Oct 2023 23:44:14 +0100
Subject: [PATCH 197/590] Adjust default button styling

Buttons are now slightly wider, include an increased border radius, and the font weight is bold
---
 app/assets/stylesheets/overrides/_buttons.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/overrides/_buttons.scss b/app/assets/stylesheets/overrides/_buttons.scss
index bb33b8d0..576356b7 100644
--- a/app/assets/stylesheets/overrides/_buttons.scss
+++ b/app/assets/stylesheets/overrides/_buttons.scss
@@ -1,5 +1,8 @@
 .btn {
+  --btn-padding-x: 1rem;
+  --btn-border-radius: 2rem;
   color: RGB(var(--body-text));
+  font-weight: bold;
 }
 
 .btn-link:hover {
@@ -61,4 +64,4 @@
   .fa {
     pointer-events: none;
   }
-}
\ No newline at end of file
+}

From fa0aa59e6e394d82236274ba2494b1d8504f4351 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 29 Oct 2023 23:45:19 +0100
Subject: [PATCH 198/590] Adjust layout of inbox entry buttons

---
 app/assets/stylesheets/_utilities.scss |  4 ++++
 app/views/inbox/_entry.html.haml       | 14 ++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/_utilities.scss b/app/assets/stylesheets/_utilities.scss
index c102283c..5f9df7b1 100644
--- a/app/assets/stylesheets/_utilities.scss
+++ b/app/assets/stylesheets/_utilities.scss
@@ -30,3 +30,7 @@
 .z-n1 {
   z-index: -1;
 }
+
+.grid-row-1 {
+  grid-row: 1;
+}
diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 4c9bd37b..8e15a7a7 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -4,13 +4,15 @@
   - if current_user == i.user
     .card-body
       %textarea.form-control.mb-3{ name: "ib-answer", placeholder: t(".placeholder"), data: { id: i.id } }
-      .d-sm-flex
-        %button.btn.btn-success.me-sm-1{ name: "ib-answer", data: { ib_id: i.id } }
-          = t("voc.answer")
-        %button.btn.btn-danger.me-sm-1{ name: "ib-destroy", data: { ib_id: i.id } }
-          = t("voc.delete")
-        %p.format-help.ms-auto.align-self-center.mt-2.mt-sm-0.text-center
+      .d-flex.flex-column-reverse.flex-sm-row
+        %p.format-help.me-sm-auto.align-self-center.mb-0.mt-2.mt-sm-0.text-center
           = render "shared/format_link"
+        .d-grid.gap-2.d-sm-block
+          %button.btn.btn-default.text-muted.me-sm-1.mb-sm-0{ name: "ib-destroy", data: { ib_id: i.id } }
+            %i.fa.fa-trash.fa-fw
+            = t("voc.delete")
+          %button.btn.btn-primary.grid-row-1{ name: "ib-answer", data: { ib_id: i.id } }
+            = t("voc.answer")
     - if current_user.sharing_enabled
       .inbox-entry__sharing.text-center.p-2.justify-content-center.d-none{
         data: { controller: "inbox-sharing", inbox_sharing_config_value: "{}", inbox_sharing_auto_close_value: current_user.sharing_autoclose.to_s } }

From 1dd1c828ebe8237297f6c57f4cbd6a96c41bb9f0 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 1 Nov 2023 22:40:02 +0100
Subject: [PATCH 199/590] Fix broken mute check in question worker

---
 app/workers/question_worker.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/workers/question_worker.rb b/app/workers/question_worker.rb
index 6cffd5af..d0c9eb98 100644
--- a/app/workers/question_worker.rb
+++ b/app/workers/question_worker.rb
@@ -12,7 +12,7 @@ class QuestionWorker
     question = Question.includes(:user).find(question_id)
     webpush_app = Rpush::App.find_by(name: "webpush")
 
-    return if skip_inbox?(follower, question, user)
+    return if skip_inbox?(follower, question)
 
     inbox = Inbox.create(user_id: follower.id, question_id:, new: true)
     follower.push_notification(webpush_app, inbox) if webpush_app
@@ -20,11 +20,11 @@ class QuestionWorker
 
   private
 
-  def skip_inbox?(follower, question, user)
+  def skip_inbox?(follower, question)
     return true if follower.inbox_locked?
     return true if follower.banned?
     return true if muted?(follower, question)
-    return true if user.muting?(question.user)
+    return true if follower.muting?(question.user)
     return true if question.long? && !follower.profile.allow_long_questions
 
     false

From 2327b2ce521b54f99fae553cecb4d89d05ac3a0c Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 1 Nov 2023 22:40:41 +0100
Subject: [PATCH 200/590] Update tests for single-recipient QuestionWorker
 behaviour

---
 .../ajax/question_controller_spec.rb          | 19 ++++--
 .../question/create_followers_spec.rb         | 15 ++++-
 spec/workers/question_worker_spec.rb          | 59 ++++++++-----------
 3 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/spec/controllers/ajax/question_controller_spec.rb b/spec/controllers/ajax/question_controller_spec.rb
index 021a4172..0fc8922b 100644
--- a/spec/controllers/ajax/question_controller_spec.rb
+++ b/spec/controllers/ajax/question_controller_spec.rb
@@ -48,11 +48,13 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
       include_examples "returns the expected response"
     end
 
-    shared_examples "enqueues a QuestionWorker job" do |_expected_rcpt|
+    shared_examples "enqueues QuestionWorker jobs" do
       it "enqueues a QuestionWorker job" do
-        allow(QuestionWorker).to receive(:perform_async)
+        allow(QuestionWorker).to receive(:perform_bulk)
         subject
-        expect(QuestionWorker).to have_received(:perform_async).with(user.id, Question.last.id)
+        question_id = Question.last.id
+        bulk_args = followers.map { |f| [f.id, question_id] }
+        expect(QuestionWorker).to have_received(:perform_bulk).with(bulk_args)
       end
 
       include_examples "returns the expected response"
@@ -61,8 +63,10 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
     shared_examples "does not enqueue a QuestionWorker job" do
       it "does not enqueue a QuestionWorker job" do
         allow(QuestionWorker).to receive(:perform_async)
+        allow(QuestionWorker).to receive(:perform_bulk)
         subject
         expect(QuestionWorker).not_to have_received(:perform_async)
+        expect(QuestionWorker).not_to have_received(:perform_bulk)
       end
 
       include_examples "returns the expected response"
@@ -194,13 +198,18 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
 
       context "when rcpt is followers" do
         let(:rcpt) { "followers" }
+        let(:followers) { FactoryBot.create_list(:user, 3) }
+
+        before do
+          followers.each { |follower| follower.follow(user) }
+        end
 
         context "when anonymousQuestion is true" do
           let(:anonymous_question) { "true" }
           let(:expected_question_anonymous) { false }
 
           include_examples "creates the question", false
-          include_examples "enqueues a QuestionWorker job", "followers"
+          include_examples "enqueues QuestionWorker jobs"
         end
 
         context "when anonymousQuestion is false" do
@@ -208,7 +217,7 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
           let(:expected_question_anonymous) { false }
 
           include_examples "creates the question", false
-          include_examples "enqueues a QuestionWorker job", "followers"
+          include_examples "enqueues QuestionWorker jobs"
         end
       end
 
diff --git a/spec/lib/use_case/question/create_followers_spec.rb b/spec/lib/use_case/question/create_followers_spec.rb
index 7b3e2d75..3f048370 100644
--- a/spec/lib/use_case/question/create_followers_spec.rb
+++ b/spec/lib/use_case/question/create_followers_spec.rb
@@ -6,13 +6,20 @@ describe UseCase::Question::CreateFollowers do
   subject do
     UseCase::Question::CreateFollowers.call(
       source_user_id:    source_user.id,
-      content:           content,
-      author_identifier: author_identifier
+      content:,
+      author_identifier:,
     )
   end
 
   context "user is logged in" do
+    before do
+      followers.each do |target_user|
+        target_user.follow source_user
+      end
+    end
+
     let(:source_user) { create(:user) }
+    let(:followers) { create_list(:user, 5) }
     let(:content) { "content" }
     let(:author_identifier) { nil }
 
@@ -21,7 +28,9 @@ describe UseCase::Question::CreateFollowers do
     end
 
     it "enqueues a QuestionWorker job" do
-      expect(QuestionWorker).to have_enqueued_sidekiq_job(source_user.id, subject[:resource].id)
+      followers.each do |target_user|
+        expect(QuestionWorker).to have_enqueued_sidekiq_job(target_user.id, subject[:resource].id)
+      end
     end
 
     it "increments the asked count" do
diff --git a/spec/workers/question_worker_spec.rb b/spec/workers/question_worker_spec.rb
index 0795e55b..3d03b7e8 100644
--- a/spec/workers/question_worker_spec.rb
+++ b/spec/workers/question_worker_spec.rb
@@ -9,22 +9,21 @@ describe QuestionWorker do
     let(:content) { Faker::Lorem.sentence }
     let(:question) { FactoryBot.create(:question, content:, user:) }
     let(:question_id) { question.id }
+    let(:follower) { FactoryBot.create(:user) }
+    let(:follower_id) { follower.id }
 
     before do
-      5.times do
-        other_user = FactoryBot.create(:user)
-        other_user.follow(user)
-      end
+      follower.follow(user)
     end
 
-    subject { described_class.new.perform(user_id, question_id) }
+    subject { described_class.new.perform(follower_id, question_id) }
 
     it "places the question in the inbox of the user's followers" do
       expect { subject }
         .to(
-          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+          change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
             .from(0)
-            .to(5)
+            .to(1)
         )
     end
 
@@ -32,56 +31,41 @@ describe QuestionWorker do
       question.content = "Some spicy question text"
       question.save
 
-      MuteRule.create(user_id: user.followers.first.id, muted_phrase: "spicy")
+      MuteRule.create(user_id: follower_id, muted_phrase: "spicy")
 
-      expect { subject }
-        .to(
-          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
-            .from(0)
-            .to(4)
-        )
+      subject
+      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
     end
 
     it "respects inbox locks" do
-      user.followers.first.update(privacy_lock_inbox: true)
+      follower.update(privacy_lock_inbox: true)
 
-      expect { subject }
-        .to(
-          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
-            .from(0)
-            .to(4)
-        )
+      subject
+      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
     end
 
     it "does not send questions to banned users" do
-      user.followers.first.ban
+      follower.ban
 
-      expect { subject }
-        .to(
-          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
-            .from(0)
-            .to(4)
-        )
+      subject
+      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
     end
 
     context "receiver has push notifications enabled" do
-      let(:receiver) { FactoryBot.create(:user) }
-
       before do
         Rpush::Webpush::App.create(
           name:        "webpush",
           certificate: { public_key: "AAAA", private_key: "AAAA", subject: "" }.to_json,
-          connections: 1
+          connections: 1,
         )
 
         WebPushSubscription.create!(
-          user:         receiver,
+          user:         follower,
           subscription: {
             endpoint: "This will not be used",
             keys:     {},
           }
         )
-        receiver.follow(user)
       end
 
       it "sends notifications" do
@@ -98,15 +82,20 @@ describe QuestionWorker do
       let(:content) { "x" * 1000 }
 
       it "sends to recipients who allow long questions" do
-        user.followers.first.profile.update(allow_long_questions: true)
+        follower.profile.update(allow_long_questions: true)
 
         expect { subject }
           .to(
-            change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+            change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
               .from(0)
               .to(1)
           )
       end
+
+      it "does not send to recipients who do not allow long questions" do
+        subject
+        expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+      end
     end
   end
 end

From b193ad229f84c4ea462a2ad2ed14be05e6051f45 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 1 Nov 2023 22:44:52 +0100
Subject: [PATCH 201/590] Fix lint error

---
 spec/workers/question_worker_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/workers/question_worker_spec.rb b/spec/workers/question_worker_spec.rb
index 3d03b7e8..5ced7465 100644
--- a/spec/workers/question_worker_spec.rb
+++ b/spec/workers/question_worker_spec.rb
@@ -23,7 +23,7 @@ describe QuestionWorker do
         .to(
           change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
             .from(0)
-            .to(1)
+            .to(1),
         )
     end
 
@@ -64,7 +64,7 @@ describe QuestionWorker do
           subscription: {
             endpoint: "This will not be used",
             keys:     {},
-          }
+          },
         )
       end
 
@@ -73,7 +73,7 @@ describe QuestionWorker do
           .to(
             change { Rpush::Webpush::Notification.count }
               .from(0)
-              .to(1)
+              .to(1),
           )
       end
     end
@@ -88,7 +88,7 @@ describe QuestionWorker do
           .to(
             change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
               .from(0)
-              .to(1)
+              .to(1),
           )
       end
 

From f2bbb6cd030e13d6baf6b69821be05157afa21dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:19:53 +0000
Subject: [PATCH 202/590] Bump @github/hotkey from 2.1.1 to 2.3.0

Bumps [@github/hotkey](https://github.com/github/hotkey) from 2.1.1 to 2.3.0.
- [Release notes](https://github.com/github/hotkey/releases)
- [Commits](https://github.com/github/hotkey/compare/v2.1.1...v2.3.0)

---
updated-dependencies:
- dependency-name: "@github/hotkey"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 24f045ce..f4dc373f 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@fontsource/lexend": "^4.5.15",
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@github/hotkey": "^2.1.1",
+    "@github/hotkey": "^2.3.0",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^7.3.0",
     "@melloware/coloris": "^0.21.1",
diff --git a/yarn.lock b/yarn.lock
index b888593a..a76a5b31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -199,10 +199,10 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz#36b6a9cb5ffbecdf89815c94d0c0ffa489ac5ecb"
   integrity sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==
 
-"@github/hotkey@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-2.1.1.tgz#0e1da799c7a43d719b21f740bc59107dec30ea3b"
-  integrity sha512-UPb3mbKQzw3uskbRu+jsJwhAP2lFhxH0vI799camXiNbV5q3w61VNGt3oX7yxn4HhC5V4S701NoOqGbosCJhiw==
+"@github/hotkey@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-2.3.0.tgz#788037cac92c7281f86228578b42861d08fc87a7"
+  integrity sha512-XVvFrubecf1VPofEiVJMZ60fye+EegbB/+ZSuieFihZ3xMTD0NYNrd3n+RHAA9W1gUNl2Yuyj1alrAp+2tmISw==
 
 "@hotwired/stimulus@^3.2.2":
   version "3.2.2"

From c60b0d7994a0d3a4b220a906fc0ed88d081d9a3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:20:01 +0000
Subject: [PATCH 203/590] Bump stylelint-config-standard-scss from 11.0.0 to
 11.1.0

Bumps [stylelint-config-standard-scss](https://github.com/stylelint-scss/stylelint-config-standard-scss) from 11.0.0 to 11.1.0.
- [Release notes](https://github.com/stylelint-scss/stylelint-config-standard-scss/releases)
- [Changelog](https://github.com/stylelint-scss/stylelint-config-standard-scss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stylelint-scss/stylelint-config-standard-scss/compare/v11.0.0...v11.1.0)

---
updated-dependencies:
- dependency-name: stylelint-config-standard-scss
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 24f045ce..9587a787 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "eslint": "^7.16.0",
     "eslint-plugin-import": "^2.29.0",
     "stylelint": "^15.11.0",
-    "stylelint-config-standard-scss": "^11.0.0",
+    "stylelint-config-standard-scss": "^11.1.0",
     "stylelint-scss": "^5.3.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index b888593a..785a6d79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2085,10 +2085,10 @@ postcss-safe-parser@^6.0.0:
   resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
   integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
 
-postcss-scss@^4.0.7:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.7.tgz#cfe5507aaff81b3d8992039ad015da4bd3dccd2f"
-  integrity sha512-xPv2GseoyXPa58Nro7M73ZntttusuCmZdeOojUFR5PZDz2BR62vfYx1w9TyOnp1+nYFowgOMipsCBhxzVkAEPw==
+postcss-scss@^4.0.9:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.9.tgz#a03c773cd4c9623cb04ce142a52afcec74806685"
+  integrity sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==
 
 postcss-selector-parser@^6.0.13:
   version "6.0.13"
@@ -2428,26 +2428,26 @@ style-search@^0.1.0:
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
   integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==
 
-stylelint-config-recommended-scss@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-13.0.0.tgz#dd8c319e15a6412262cd8554e4aad9bfba1bbb11"
-  integrity sha512-7AmMIsHTsuwUQm7I+DD5BGeIgCvqYZ4BpeYJJpb1cUXQwrJAKjA+GBotFZgUEGP8lAM+wmd91ovzOi8xfAyWEw==
+stylelint-config-recommended-scss@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-13.1.0.tgz#04e529ae0e9c1abb1e04de79258461c07811876f"
+  integrity sha512-8L5nDfd+YH6AOoBGKmhH8pLWF1dpfY816JtGMePcBqqSsLU+Ysawx44fQSlMOJ2xTfI9yTGpup5JU77c17w1Ww==
   dependencies:
-    postcss-scss "^4.0.7"
+    postcss-scss "^4.0.9"
     stylelint-config-recommended "^13.0.0"
-    stylelint-scss "^5.1.0"
+    stylelint-scss "^5.3.0"
 
 stylelint-config-recommended@^13.0.0:
   version "13.0.0"
   resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-13.0.0.tgz#c48a358cc46b629ea01f22db60b351f703e00597"
   integrity sha512-EH+yRj6h3GAe/fRiyaoO2F9l9Tgg50AOFhaszyfov9v6ayXJ1IkSHwTxd7lB48FmOeSGDPLjatjO11fJpmarkQ==
 
-stylelint-config-standard-scss@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-11.0.0.tgz#98332b68a9c98b6fce54c7698741e103719942b5"
-  integrity sha512-fGE79NBOLg09a9afqGH/guJulRULCaQWWv4cv1v2bMX92B+fGb0y56WqIguwvFcliPmmUXiAhKrrnXilIeXoHA==
+stylelint-config-standard-scss@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-11.1.0.tgz#53c2fb9423ed89c0921aa83479892a912cc1ca15"
+  integrity sha512-5gnBgeNTgRVdchMwiFQPuBOtj9QefYtfXiddrOMJA2pI22zxt6ddI2s+e5Oh7/6QYl7QLJujGnaUR5YyGq72ow==
   dependencies:
-    stylelint-config-recommended-scss "^13.0.0"
+    stylelint-config-recommended-scss "^13.1.0"
     stylelint-config-standard "^34.0.0"
 
 stylelint-config-standard@^34.0.0:
@@ -2457,7 +2457,7 @@ stylelint-config-standard@^34.0.0:
   dependencies:
     stylelint-config-recommended "^13.0.0"
 
-stylelint-scss@^5.1.0, stylelint-scss@^5.3.0:
+stylelint-scss@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.3.0.tgz#32fd2681f8934e87dfa90f5188646d07f08c59c9"
   integrity sha512-Sc7S1uWqStMc99NREsHNxpxHHFRvjo2pWILNl/UCwWO8PxhODK8qbJH0GHWIALxl6BD5rwJL4cSm4jk36hi6fg==

From 3b01a29c76e778818ec0a7f061edd33db3466b47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:38:54 +0000
Subject: [PATCH 204/590] Bump net-imap from 0.4.2 to 0.4.4

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.2 to 0.4.4.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.2...v0.4.4)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 01ca5132..90816ea4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.2)
+    net-imap (0.4.4)
       date
       net-protocol
     net-pop (0.1.2)

From 24c708a1bcc7af29c4d92e7d99dabd914f28d14e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:40:29 +0000
Subject: [PATCH 205/590] Bump bootsnap from 1.16.0 to 1.17.0

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.16.0 to 1.17.0.
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.16.0...v1.17.0)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 01ca5132..2b20551f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,7 +99,7 @@ GEM
       rouge (>= 1.0.0)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.16.0)
+    bootsnap (1.17.0)
       msgpack (~> 1.2)
     bootstrap_form (5.3.2)
       actionpack (>= 6.1)

From f0a1a8ffb98b21804e223a3ae70d5cbfc413f2d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:44:54 +0000
Subject: [PATCH 206/590] Bump bullet from 7.1.2 to 7.1.3

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.2 to 7.1.3.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.2...7.1.3)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 01ca5132..54764289 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.2.4)
-    bullet (7.1.2)
+    bullet (7.1.3)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     carrierwave (2.1.0)

From c4b23d811e2427b5f8ee905fe3ba2bca6d5e3459 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:46:42 +0000
Subject: [PATCH 207/590] Bump prometheus-client from 4.2.1 to 4.2.2

Bumps [prometheus-client](https://github.com/prometheus/client_ruby) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/prometheus/client_ruby/releases)
- [Changelog](https://github.com/prometheus/client_ruby/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_ruby/compare/v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: prometheus-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 01ca5132..79ec5bc0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,7 +296,7 @@ GEM
     pg (1.5.4)
     pghero (3.3.4)
       activerecord (>= 6)
-    prometheus-client (4.2.1)
+    prometheus-client (4.2.2)
     public_suffix (5.0.3)
     puma (6.4.0)
       nio4r (~> 2.0)

From 2c9711fe7013434a19fbb440d9fd7d16bf7f4d58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:48:13 +0000
Subject: [PATCH 208/590] Bump faker from 3.2.1 to 3.2.2

Bumps [faker](https://github.com/faker-ruby/faker) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v3.2.1...v3.2.2)

---
updated-dependencies:
- dependency-name: faker
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 01ca5132..9d3c7484 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -172,7 +172,7 @@ GEM
     fake_email_validator (1.0.11)
       activemodel
       mail
-    faker (3.2.1)
+    faker (3.2.2)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
     fog-aws (3.21.0)

From 70f6b47ad0438439b01be4f13524fc26861845c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 09:49:44 +0000
Subject: [PATCH 209/590] Bump view_component from 3.6.0 to 3.7.0

Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.6.0...v3.7.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 01ca5132..b8c02a41 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -488,7 +488,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    view_component (3.6.0)
+    view_component (3.7.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

From 43140105355219ebf23802d9ac506fdb60a562c9 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Mon, 6 Nov 2023 17:58:42 +0500
Subject: [PATCH 210/590]  #1423, fix missing translation issue

---
 config/locales/views.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index d0426826..9c94c671 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -676,7 +676,7 @@ en:
     questions:
       header:
         title_html: "Viewing all questions from <br><abbr title=%{author_identifier}>%{short}</abbr>"
-      index:
+      show:
         title: "Questions from %{author_identifier}"
   user:
     show_follow:

From f91d2f2d7f06149914601384a0ef085632fd0679 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 7 Nov 2023 22:40:37 +0100
Subject: [PATCH 211/590] Pre-emptively fetch answer reaction state

---
 app/controllers/answer_controller.rb          | 2 ++
 app/controllers/concerns/paginates_answers.rb | 6 +++++-
 app/controllers/discover_controller.rb        | 1 +
 app/controllers/timeline_controller.rb        | 1 +
 app/views/answer/show.html.haml               | 2 +-
 app/views/answerbox/_actions.html.haml        | 2 +-
 app/views/application/_answerbox.html.haml    | 4 ++--
 app/views/discover/tab/_answers.html.haml     | 2 +-
 app/views/discover/tab/_discussed.html.haml   | 2 +-
 app/views/question/show.html.haml             | 2 +-
 app/views/question/show.turbo_stream.haml     | 2 +-
 app/views/timeline/timeline.html.haml         | 2 +-
 app/views/timeline/timeline.turbo_stream.haml | 2 +-
 app/views/user/show.html.haml                 | 4 ++--
 app/views/user/show.turbo_stream.haml         | 2 +-
 15 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/controllers/answer_controller.rb b/app/controllers/answer_controller.rb
index 1b3a7ca3..a1b5c516 100644
--- a/app/controllers/answer_controller.rb
+++ b/app/controllers/answer_controller.rb
@@ -10,10 +10,12 @@ class AnswerController < ApplicationController
   def show
     @answer = Answer.includes(question: [:user], smiles: [:user]).find(params[:id])
     @display_all = true
+    @reacted_answer_ids = []
     @subscribed_answer_ids = []
 
     return unless user_signed_in?
 
+    @reacted_answer_ids = Reaction.where(user: current_user, parent: @answer).pluck(:parent_id)
     @subscribed_answer_ids = Subscription.where(user: current_user, answer: @answer).pluck(:answer_id)
     mark_notifications_as_read
   end
diff --git a/app/controllers/concerns/paginates_answers.rb b/app/controllers/concerns/paginates_answers.rb
index 2d5081c5..b4c22c64 100644
--- a/app/controllers/concerns/paginates_answers.rb
+++ b/app/controllers/concerns/paginates_answers.rb
@@ -7,6 +7,10 @@ module PaginatesAnswers
     @answers_last_id = answer_ids.min
     answer_ids += @pinned_answers.pluck(:id) if @pinned_answers.present?
     @more_data_available = !yield(last_id: @answers_last_id, size: 1).count.zero?
-    @subscribed_answer_ids = Subscription.where(user: current_user, answer_id: answer_ids).pluck(:answer_id) if user_signed_in?
+
+    return unless user_signed_in?
+
+    @reacted_answer_ids = Reaction.where(user: current_user, parent_type: "Answer", parent_id: answer_ids).pluck(:parent_id)
+    @subscribed_answer_ids = Subscription.where(user: current_user, answer_id: answer_ids).pluck(:answer_id)
   end
 end
diff --git a/app/controllers/discover_controller.rb b/app/controllers/discover_controller.rb
index 2e1be8b4..eb01e080 100644
--- a/app/controllers/discover_controller.rb
+++ b/app/controllers/discover_controller.rb
@@ -14,6 +14,7 @@ class DiscoverController < ApplicationController
     @new_users = User.where("asked_count > 0").order(:id).reverse_order.limit(top_x).includes(:profile)
 
     answer_ids = @popular_answers.map(&:id) + @most_discussed.map(&:id)
+    @reacted_answer_ids = Reaction.where(user: current_user, parent_type: "Answer", parent_id: answer_ids).pluck(:parent_id)
     @subscribed_answer_ids = Subscription.where(user: current_user, answer_id: answer_ids).pluck(:answer_id)
 
     # .user = the user
diff --git a/app/controllers/timeline_controller.rb b/app/controllers/timeline_controller.rb
index 6b34fdb4..747798e7 100644
--- a/app/controllers/timeline_controller.rb
+++ b/app/controllers/timeline_controller.rb
@@ -35,6 +35,7 @@ class TimelineController < ApplicationController
     timeline_ids = @timeline.map(&:id)
     @timeline_last_id = timeline_ids.min
     @more_data_available = !yield(last_id: @timeline_last_id, size: 1).count.zero?
+    @reacted_answer_ids = Reaction.where(user: current_user, parent_type: "Answer", parent_id: timeline_ids).pluck(:parent_id)
     @subscribed_answer_ids = Subscription.where(user: current_user, answer_id: timeline_ids).pluck(:answer_id)
 
     respond_to do |format|
diff --git a/app/views/answer/show.html.haml b/app/views/answer/show.html.haml
index 55f2a90b..136fcfbe 100644
--- a/app/views/answer/show.html.haml
+++ b/app/views/answer/show.html.haml
@@ -1,4 +1,4 @@
 - provide(:title, answer_title(@answer))
 - provide(:og, answer_opengraph(@answer))
 .container-lg.container--main
-  = render "answerbox", a: @answer, display_all: @display_all, subscribed_answer_ids: @subscribed_answer_ids
+  = render "answerbox", a: @answer, display_all: @display_all, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
diff --git a/app/views/answerbox/_actions.html.haml b/app/views/answerbox/_actions.html.haml
index a4d59648..170f1ec9 100644
--- a/app/views/answerbox/_actions.html.haml
+++ b/app/views/answerbox/_actions.html.haml
@@ -1,4 +1,4 @@
-%button.btn.btn-link.answerbox__action{ type: :button, name: "ab-smile", data: { a_id: a.id, action: current_user&.smiled?(a) ? :unsmile : :smile, selection_hotkey: "s" }, disabled: !user_signed_in? }
+%button.btn.btn-link.answerbox__action{ type: :button, name: "ab-smile", data: { a_id: a.id, action: reacted_answer_ids&.include?(a.id) ? :unsmile : :smile, selection_hotkey: "s" }, disabled: !user_signed_in? }
   %i.fa.fa-fw.fa-smile-o
   %span{ id: "ab-smile-count-#{a.id}" }= a.smile_count
 - unless display_all
diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml
index de1349f1..fb11033d 100644
--- a/app/views/application/_answerbox.html.haml
+++ b/app/views/application/_answerbox.html.haml
@@ -22,7 +22,7 @@
               .answerbox__answer-date
                 = link_to(raw(t("time.distance_ago", time: time_tooltip(a))), answer_path(a.user.screen_name, a.id), data: { selection_hotkey: "l" })
         .col-md-6.d-flex.d-md-block.answerbox__actions
-          = render "answerbox/actions", a:, display_all:, subscribed_answer_ids:
+          = render "answerbox/actions", a:, display_all:, subscribed_answer_ids:, reacted_answer_ids:
     - else
       .row
         .col-md-6.text-start.text-muted
@@ -34,7 +34,7 @@
               %i.fa.fa-thumbtack
               = t(".pinned")
         .col-md-6.d-md-flex.answerbox__actions
-          = render "answerbox/actions", a:, display_all:, subscribed_answer_ids:
+          = render "answerbox/actions", a:, display_all:, subscribed_answer_ids:, reacted_answer_ids:
   .card-footer{ id: "ab-comments-section-#{a.id}", class: display_all.nil? ? "d-none" : nil }
     = turbo_frame_tag("ab-reactions-list-#{a.id}", src: reactions_path(a.question, a), loading: :lazy) do
       .d-flex.smiles
diff --git a/app/views/discover/tab/_answers.html.haml b/app/views/discover/tab/_answers.html.haml
index 4438edec..952004d4 100644
--- a/app/views/discover/tab/_answers.html.haml
+++ b/app/views/discover/tab/_answers.html.haml
@@ -1,3 +1,3 @@
 .tab-pane.active.fade.show{ role: :tabpanel, id: "answers" }
   - answers.each do |a|
-    = render "answerbox", a:, subscribed_answer_ids:
+    = render "answerbox", a:, subscribed_answer_ids:, reacted_answer_ids:
diff --git a/app/views/discover/tab/_discussed.html.haml b/app/views/discover/tab/_discussed.html.haml
index 7b3b7375..0eeeb94c 100644
--- a/app/views/discover/tab/_discussed.html.haml
+++ b/app/views/discover/tab/_discussed.html.haml
@@ -1,3 +1,3 @@
 .tab-pane.fade{ role: :tabpanel, id: "comments" }
   - comments.each do |a|
-    = render "answerbox", a:, subscribed_answer_ids:
+    = render "answerbox", a:, subscribed_answer_ids:, reacted_answer_ids:
diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index 96651790..a2d9d48d 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -8,7 +8,7 @@
     %button.d-none{ data: { hotkey: "j", action: "navigation#down" } }
     %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
     - @answers.each do |a|
-      = render "answerbox", a:, show_question: false, subscribed_answer_ids: @subscribed_answer_ids
+      = render "answerbox", a:, show_question: false, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
 
   - if @more_data_available
     .d-flex.justify-content-center.justify-content-sm-start#paginator
diff --git a/app/views/question/show.turbo_stream.haml b/app/views/question/show.turbo_stream.haml
index 96facf13..f6da225e 100644
--- a/app/views/question/show.turbo_stream.haml
+++ b/app/views/question/show.turbo_stream.haml
@@ -1,6 +1,6 @@
 = turbo_stream.append "answers" do
   - @answers.each do |a|
-    = render "answerbox", a:, show_question: false, subscribed_answer_ids: @subscribed_answer_ids
+    = render "answerbox", a:, show_question: false, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
 
 = turbo_stream.update "paginator" do
   - if @more_data_available
diff --git a/app/views/timeline/timeline.html.haml b/app/views/timeline/timeline.html.haml
index 4ed197a8..bffd66cf 100644
--- a/app/views/timeline/timeline.html.haml
+++ b/app/views/timeline/timeline.html.haml
@@ -2,7 +2,7 @@
   %button.d-none{ data: { hotkey: "j", action: "navigation#down" } }
   %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
   - @timeline.each do |answer|
-    = render "answerbox", a: answer, subscribed_answer_ids: @subscribed_answer_ids
+    = render "answerbox", a: answer, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
 
 - if @more_data_available
   .d-flex.justify-content-center#paginator
diff --git a/app/views/timeline/timeline.turbo_stream.haml b/app/views/timeline/timeline.turbo_stream.haml
index 1802f630..ccbc5211 100644
--- a/app/views/timeline/timeline.turbo_stream.haml
+++ b/app/views/timeline/timeline.turbo_stream.haml
@@ -1,6 +1,6 @@
 = turbo_stream.append "timeline" do
   - @timeline.each do |answer|
-    = render "answerbox", a: answer, subscribed_answer_ids: @subscribed_answer_ids
+    = render "answerbox", a: answer, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
 
 = turbo_stream.update "paginator" do
   - if @more_data_available
diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index e110ca20..382ed8b8 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -4,11 +4,11 @@
     %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
     #pinned-answers
       - @pinned_answers.each do |a|
-        = render "answerbox", a:, subscribed_answer_ids: @subscribed_answer_ids
+        = render "answerbox", a:, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
 
     #answers
       - @answers.each do |a|
-        = render "answerbox", a:, subscribed_answer_ids: @subscribed_answer_ids
+        = render "answerbox", a:, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
 
 - if @more_data_available
   .d-flex.justify-content-center.justify-content-sm-start#paginator
diff --git a/app/views/user/show.turbo_stream.haml b/app/views/user/show.turbo_stream.haml
index d86873da..977cbe4c 100644
--- a/app/views/user/show.turbo_stream.haml
+++ b/app/views/user/show.turbo_stream.haml
@@ -1,6 +1,6 @@
 = turbo_stream.append "answers" do
   - @answers.each do |a|
-    = render "answerbox", a:, subscribed_answer_ids: @subscribed_answer_ids
+    = render "answerbox", a:, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
 
 = turbo_stream.update "paginator" do
   - if @more_data_available

From 2392153af1b61d33aa8267b8b5eb2bf9ad387a99 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Tue, 7 Nov 2023 04:58:21 +0500
Subject: [PATCH 212/590] #1427, fix disabled button issue

---
 .../retrospring/features/inbox/entry/delete.ts           | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/javascript/retrospring/features/inbox/entry/delete.ts b/app/javascript/retrospring/features/inbox/entry/delete.ts
index a03b3914..0036685f 100644
--- a/app/javascript/retrospring/features/inbox/entry/delete.ts
+++ b/app/javascript/retrospring/features/inbox/entry/delete.ts
@@ -7,7 +7,6 @@ import { showNotification, showErrorNotification } from 'utilities/notifications
 
 export function deleteEntryHandler(event: Event): void {
   const element: HTMLButtonElement = event.target as HTMLButtonElement;
-  element.disabled = true;
 
   const data = {
     id: element.getAttribute('data-ib-id')
@@ -22,11 +21,8 @@ export function deleteEntryHandler(event: Event): void {
     confirmButtonText: I18n.translate('voc.delete'),
     cancelButtonText: I18n.translate('voc.cancel'),
     closeOnConfirm: true
-  }, (returnValue) => {
-    if (returnValue === false) {
-      element.disabled = false;
-      return;
-    }
+  }, () => {
+    element.disabled = true;
 
     post('/ajax/delete_inbox', {
       body: data,
@@ -44,6 +40,7 @@ export function deleteEntryHandler(event: Event): void {
         (inboxEntry as HTMLElement).remove();
       })
       .catch(err => {
+        element.disabled = false;
         console.log(err);
         showErrorNotification(I18n.translate('frontend.error.message'));
       });

From 8fa6c24b4a5a2b4f0a476af810cab687ea3778e8 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Fri, 10 Nov 2023 00:30:47 +0500
Subject: [PATCH 213/590] #1443, fix error upon comment

---
 app/javascript/retrospring/features/answerbox/comment/new.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/javascript/retrospring/features/answerbox/comment/new.ts b/app/javascript/retrospring/features/answerbox/comment/new.ts
index 154448e7..8c60b9cf 100644
--- a/app/javascript/retrospring/features/answerbox/comment/new.ts
+++ b/app/javascript/retrospring/features/answerbox/comment/new.ts
@@ -31,10 +31,6 @@ function createComment(input: HTMLInputElement, id: string, counter: Element, gr
         }
         input.value = '';
         counter.innerHTML = String(512);
-
-        const sub = document.querySelector<HTMLElement>(`[data-action=ab-submarine][data-a-id="${id}"]`);
-        sub.dataset.torpedo = "no"
-        sub.children[0].nextSibling.textContent = ' ' + I18n.translate('voc.unsubscribe');
       }
 
       showNotification(data.message, data.success);

From 03e4dad5cc27c6743db4ade3a1202e7895dc3d7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 09:10:36 +0000
Subject: [PATCH 214/590] Bump sentry-sidekiq, sentry-rails and sentry-ruby

Bumps [sentry-sidekiq](https://github.com/getsentry/sentry-ruby), [sentry-rails](https://github.com/getsentry/sentry-ruby) and [sentry-ruby](https://github.com/getsentry/sentry-ruby). These dependencies needed to be updated together.

Updates `sentry-sidekiq` from 5.12.0 to 5.13.0
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.12.0...5.13.0)

Updates `sentry-rails` from 5.12.0 to 5.13.0
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.12.0...5.13.0)

Updates `sentry-ruby` from 5.12.0 to 5.13.0
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.12.0...5.13.0)

---
updated-dependencies:
- dependency-name: sentry-sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-ruby
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6fcacac5..b247f130 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -263,7 +263,7 @@ GEM
       rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -303,7 +303,7 @@ GEM
     pundit (2.3.1)
       activesupport (>= 3.0.0)
     questiongenerator (1.1.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -433,13 +433,13 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-rails (5.12.0)
+    sentry-rails (5.13.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.12.0)
-    sentry-ruby (5.12.0)
+      sentry-ruby (~> 5.13.0)
+    sentry-ruby (5.13.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.12.0)
-      sentry-ruby (~> 5.12.0)
+    sentry-sidekiq (5.13.0)
+      sentry-ruby (~> 5.13.0)
       sidekiq (>= 3.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)

From 7c3817dcee84baee8f05f39930c9c7bb8ee32571 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 09:22:40 +0000
Subject: [PATCH 215/590] Bump @melloware/coloris from 0.21.1 to 0.22.0

Bumps [@melloware/coloris](https://github.com/melloware/coloris-npm) from 0.21.1 to 0.22.0.
- [Release notes](https://github.com/melloware/coloris-npm/releases)
- [Commits](https://github.com/melloware/coloris-npm/compare/0.21.1...0.22.0)

---
updated-dependencies:
- dependency-name: "@melloware/coloris"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 820a1e45..a5bac53b 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@github/hotkey": "^2.3.0",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^7.3.0",
-    "@melloware/coloris": "^0.21.1",
+    "@melloware/coloris": "^0.22.0",
     "@popperjs/core": "^2.11",
     "@rails/request.js": "^0.0.9",
     "bootstrap": "^5.2",
diff --git a/yarn.lock b/yarn.lock
index 8d851e47..73e95e0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -236,10 +236,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@melloware/coloris@^0.21.1":
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/@melloware/coloris/-/coloris-0.21.1.tgz#1fc7b353402820bad058281128c69034c886d520"
-  integrity sha512-0yKUKTrS1wHjcyDSWzcm2Y0ZYm5GORsru5o+Oyut99/qK5hgzm5bJFjjWbfjSPnX8ijx73g9lRksVIDfbDjG6Q==
+"@melloware/coloris@^0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@melloware/coloris/-/coloris-0.22.0.tgz#917fc64a38d951f10dd707996d305fdf166c5fc3"
+  integrity sha512-i06nJM0xQrgOkLFUi8d+8mrJjvFgPrU/nTM9vtRGip/T6yHUFIrNV7QgCyps3dBkKVRP/CeJzAeAIvJBSTSbFQ==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"

From 93d2ba10bd208d396a6f08ffb4ca052d7bb3890d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 09:23:22 +0000
Subject: [PATCH 216/590] Bump stylelint-scss from 5.3.0 to 5.3.1

Bumps [stylelint-scss](https://github.com/stylelint-scss/stylelint-scss) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/stylelint-scss/stylelint-scss/releases)
- [Changelog](https://github.com/stylelint-scss/stylelint-scss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint-scss/stylelint-scss/compare/v5.3.0...v5.3.1)

---
updated-dependencies:
- dependency-name: stylelint-scss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 820a1e45..2a4ffdb9 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,6 @@
     "eslint-plugin-import": "^2.29.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.1.0",
-    "stylelint-scss": "^5.3.0"
+    "stylelint-scss": "^5.3.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 8d851e47..d336986e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1768,11 +1768,6 @@ kind-of@^6.0.2, kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-known-css-properties@^0.28.0:
-  version "0.28.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.28.0.tgz#8a8be010f368b3036fe6ab0ef4bbbed972bd6274"
-  integrity sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==
-
 known-css-properties@^0.29.0:
   version "0.29.0"
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.29.0.tgz#e8ba024fb03886f23cb882e806929f32d814158f"
@@ -2457,12 +2452,12 @@ stylelint-config-standard@^34.0.0:
   dependencies:
     stylelint-config-recommended "^13.0.0"
 
-stylelint-scss@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.3.0.tgz#32fd2681f8934e87dfa90f5188646d07f08c59c9"
-  integrity sha512-Sc7S1uWqStMc99NREsHNxpxHHFRvjo2pWILNl/UCwWO8PxhODK8qbJH0GHWIALxl6BD5rwJL4cSm4jk36hi6fg==
+stylelint-scss@^5.3.0, stylelint-scss@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.3.1.tgz#7f0f5f06d0a2a3c515aa71d3a8de3548045e03e1"
+  integrity sha512-5I9ZDIm77BZrjOccma5WyW2nJEKjXDd4Ca8Kk+oBapSO4pewSlno3n+OyimcyVJJujQZkBN2D+xuMkIamSc6hA==
   dependencies:
-    known-css-properties "^0.28.0"
+    known-css-properties "^0.29.0"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-selector-parser "^6.0.13"

From 06cacc7692b83a98ddb97bb3adf1fcb8a453ea14 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Mon, 13 Nov 2023 03:28:39 +0500
Subject: [PATCH 217/590] #1463, update typescript eslint packages

---
 package.json |   4 +-
 yarn.lock    | 200 +++++++++++++++++++++++++++++----------------------
 2 files changed, 116 insertions(+), 88 deletions(-)

diff --git a/package.json b/package.json
index 820a1e45..5a40ea44 100644
--- a/package.json
+++ b/package.json
@@ -27,8 +27,8 @@
     "typescript": "^5.2.2"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.11.0",
-    "@typescript-eslint/parser": "^4.11.0",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
     "esbuild": "^0.17.0",
     "eslint": "^7.16.0",
     "eslint-plugin-import": "^2.29.0",
diff --git a/yarn.lock b/yarn.lock
index 8d851e47..030cad15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -174,6 +174,18 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
   integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
 
+"@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.5.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@@ -277,10 +289,10 @@
   resolved "https://registry.yarnpkg.com/@rails/request.js/-/request.js-0.0.9.tgz#89e2a575405dc07eb8a9b3d2fe04289e1f057cd0"
   integrity sha512-VleYUyrA3rwKMvYnz7MI9Ada85Vekjb/WVz7NuGgDO24Y3Zy9FFSpDMQW+ea/tlftD+CdX/W/sUosRA9/HkDOQ==
 
-"@types/json-schema@^7.0.7":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+"@types/json-schema@^7.0.12":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
@@ -297,75 +309,95 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
-"@typescript-eslint/eslint-plugin@^4.11.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276"
-  integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "4.33.0"
-    "@typescript-eslint/scope-manager" "4.33.0"
-    debug "^4.3.1"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.1.8"
-    regexpp "^3.1.0"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
+"@types/semver@^7.5.0":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
+  integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
-"@typescript-eslint/experimental-utils@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd"
-  integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q==
+"@typescript-eslint/eslint-plugin@^6.10.0":
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz#cfe2bd34e26d2289212946b96ab19dcad64b661a"
+  integrity sha512-uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg==
   dependencies:
-    "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.33.0"
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/typescript-estree" "4.33.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.10.0"
+    "@typescript-eslint/type-utils" "6.10.0"
+    "@typescript-eslint/utils" "6.10.0"
+    "@typescript-eslint/visitor-keys" "6.10.0"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^4.11.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899"
-  integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==
+"@typescript-eslint/parser@^6.10.0":
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.10.0.tgz#578af79ae7273193b0b6b61a742a2bc8e02f875a"
+  integrity sha512-+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.33.0"
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/typescript-estree" "4.33.0"
-    debug "^4.3.1"
+    "@typescript-eslint/scope-manager" "6.10.0"
+    "@typescript-eslint/types" "6.10.0"
+    "@typescript-eslint/typescript-estree" "6.10.0"
+    "@typescript-eslint/visitor-keys" "6.10.0"
+    debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3"
-  integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==
+"@typescript-eslint/scope-manager@6.10.0":
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz#b0276118b13d16f72809e3cecc86a72c93708540"
+  integrity sha512-TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg==
   dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/visitor-keys" "4.33.0"
+    "@typescript-eslint/types" "6.10.0"
+    "@typescript-eslint/visitor-keys" "6.10.0"
 
-"@typescript-eslint/types@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
-  integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
-
-"@typescript-eslint/typescript-estree@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
-  integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==
+"@typescript-eslint/type-utils@6.10.0":
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz#1007faede067c78bdbcef2e8abb31437e163e2e1"
+  integrity sha512-wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg==
   dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    "@typescript-eslint/visitor-keys" "4.33.0"
-    debug "^4.3.1"
-    globby "^11.0.3"
-    is-glob "^4.0.1"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
+    "@typescript-eslint/typescript-estree" "6.10.0"
+    "@typescript-eslint/utils" "6.10.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
 
-"@typescript-eslint/visitor-keys@4.33.0":
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
-  integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==
+"@typescript-eslint/types@6.10.0":
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.10.0.tgz#f4f0a84aeb2ac546f21a66c6e0da92420e921367"
+  integrity sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg==
+
+"@typescript-eslint/typescript-estree@6.10.0":
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz#667381eed6f723a1a8ad7590a31f312e31e07697"
+  integrity sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg==
   dependencies:
-    "@typescript-eslint/types" "4.33.0"
-    eslint-visitor-keys "^2.0.0"
+    "@typescript-eslint/types" "6.10.0"
+    "@typescript-eslint/visitor-keys" "6.10.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.10.0":
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.10.0.tgz#4d76062d94413c30e402c9b0df8c14aef8d77336"
+  integrity sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.10.0"
+    "@typescript-eslint/types" "6.10.0"
+    "@typescript-eslint/typescript-estree" "6.10.0"
+    semver "^7.5.4"
+
+"@typescript-eslint/visitor-keys@6.10.0":
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz#b9eaf855a1ac7e95633ae1073af43d451e8f84e3"
+  integrity sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg==
+  dependencies:
+    "@typescript-eslint/types" "6.10.0"
+    eslint-visitor-keys "^3.4.1"
 
 acorn-jsx@^5.3.1:
   version "5.3.2"
@@ -734,7 +766,7 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4:
+debug@^4.0.1, debug@^4.1.1, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -998,13 +1030,6 @@ eslint-utils@^2.1.0:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
 eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
@@ -1015,6 +1040,11 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
 eslint@^7.16.0:
   version "7.32.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
@@ -1340,7 +1370,7 @@ globalthis@^1.0.3:
   dependencies:
     define-properties "^1.1.3"
 
-globby@^11.0.3, globby@^11.1.0:
+globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -1364,6 +1394,11 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 hard-rejection@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
@@ -1462,7 +1497,7 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.8, ignore@^5.2.0, ignore@^5.2.4:
+ignore@^5.2.0, ignore@^5.2.4:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
@@ -2261,7 +2296,7 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.2.1, semver@^7.3.4, semver@^7.3.5:
+semver@^7.2.1, semver@^7.3.4, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -2584,6 +2619,11 @@ trim-newlines@^4.0.2:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
   integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
 
+ts-api-utils@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
+  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
+
 tsconfig-paths@^3.14.2:
   version "3.14.2"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
@@ -2594,18 +2634,6 @@ tsconfig-paths@^3.14.2:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"

From 046bc0ca09d11079c4a040ee45c4bcf01caa15a7 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 7 Nov 2023 21:24:49 +0100
Subject: [PATCH 218/590] Optimise DB indices for common queries

---
 db/migrate/20231107200845_optimise_indices.rb | 10 ++++++++++
 db/schema.rb                                  |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20231107200845_optimise_indices.rb

diff --git a/db/migrate/20231107200845_optimise_indices.rb b/db/migrate/20231107200845_optimise_indices.rb
new file mode 100644
index 00000000..fd8aaa5e
--- /dev/null
+++ b/db/migrate/20231107200845_optimise_indices.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class OptimiseIndices < ActiveRecord::Migration[7.0]
+  def change
+    add_index :users, "LOWER(screen_name)", order: :desc, unique: true
+    remove_index :users, :screen_name, unique: true
+    add_index :user_bans, :expires_at, order: :desc
+    add_index :announcements, %i[starts_at ends_at], order: :desc
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a5ce9094..9c37fc5c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_10_28_091613) do
+ActiveRecord::Schema[7.0].define(version: 2023_11_07_200845) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -23,6 +23,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_28_091613) do
     t.bigint "user_id", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.index ["starts_at", "ends_at"], name: "index_announcements_on_starts_at_and_ends_at", order: :desc
     t.index ["user_id"], name: "index_announcements_on_user_id"
   end
 
@@ -306,6 +307,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_28_091613) do
     t.bigint "banned_by_id"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.index ["expires_at"], name: "index_user_bans_on_expires_at", order: :desc
   end
 
   create_table "users", id: :bigint, default: -> { "gen_timestamp_id('users'::text)" }, force: :cascade do |t|
@@ -363,10 +365,10 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_28_091613) do
     t.string "sharing_custom_url"
     t.datetime "notifications_updated_at", precision: nil
     t.datetime "inbox_updated_at", precision: nil
+    t.index "lower((screen_name)::text)", name: "index_users_on_LOWER_screen_name", unique: true
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-    t.index ["screen_name"], name: "index_users_on_screen_name", unique: true
   end
 
   create_table "users_roles", id: false, force: :cascade do |t|

From c7cc537fe91b49096c2c39d1cae1b8a2146d8d31 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 7 Nov 2023 21:44:49 +0100
Subject: [PATCH 219/590] Remove index of `created_at` on themes

---
 db/migrate/20231107200845_optimise_indices.rb | 2 ++
 db/schema.rb                                  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/db/migrate/20231107200845_optimise_indices.rb b/db/migrate/20231107200845_optimise_indices.rb
index fd8aaa5e..955a5b0f 100644
--- a/db/migrate/20231107200845_optimise_indices.rb
+++ b/db/migrate/20231107200845_optimise_indices.rb
@@ -6,5 +6,7 @@ class OptimiseIndices < ActiveRecord::Migration[7.0]
     remove_index :users, :screen_name, unique: true
     add_index :user_bans, :expires_at, order: :desc
     add_index :announcements, %i[starts_at ends_at], order: :desc
+    remove_index :themes, %i[user_id created_at]
+    add_index :themes, :user_id
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 9c37fc5c..9578bac6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -291,7 +291,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_11_07_200845) do
     t.integer "input_placeholder", default: 7107965, null: false
     t.integer "raised_text", default: 0, null: false
     t.integer "raised_accent_text", default: 0, null: false
-    t.index ["user_id", "created_at"], name: "index_themes_on_user_id_and_created_at"
+    t.index ["user_id"], name: "index_themes_on_user_id"
   end
 
   create_table "totp_recovery_codes", force: :cascade do |t|

From d8cbbecadc7f7fc4d7194ccbde03a84c55e41abb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 09:24:23 +0000
Subject: [PATCH 220/590] Bump bullet from 7.1.3 to 7.1.4

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.3 to 7.1.4.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.3...7.1.4)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b247f130..4b43fd37 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.2.4)
-    bullet (7.1.3)
+    bullet (7.1.4)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     carrierwave (2.1.0)

From 4bfefb34a6d431d35cd1e444fdf1b24856675c6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 09:26:21 +0000
Subject: [PATCH 221/590] Bump net-imap from 0.4.4 to 0.4.5

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.4 to 0.4.5.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.4...v0.4.5)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b247f130..3eef3cec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -128,7 +128,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.3.3)
+    date (3.3.4)
     debug_inspector (1.1.0)
     devise (4.9.3)
       bcrypt (~> 3.0)
@@ -273,12 +273,12 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.4)
+    net-imap (0.4.5)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
     net-smtp (0.4.0)
       net-protocol
@@ -470,7 +470,7 @@ GEM
     temple (0.10.3)
     thor (1.3.0)
     tilt (2.3.0)
-    timeout (0.4.0)
+    timeout (0.4.1)
     tldv (0.1.0)
       tldv-data (~> 1.0)
     tldv-data (1.0.2023080900)

From 2b04bf6e1782e5be75c9e1d6e9273eb761049bfa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 09:27:23 +0000
Subject: [PATCH 222/590] Bump rubocop-rails from 2.22.1 to 2.22.2

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.22.1 to 2.22.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.22.1...v2.22.2)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b247f130..a25029f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -414,10 +414,11 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.22.1)
+    rubocop-rails (2.22.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.0)
       ffi (~> 1.12)

From 378f24b3cdc10e50431231c1f5aadb5ed04e0c2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 09:28:15 +0000
Subject: [PATCH 223/590] Bump bcrypt from 3.1.19 to 3.1.20

Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.19 to 3.1.20.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases)
- [Changelog](https://github.com/bcrypt-ruby/bcrypt-ruby/blob/master/CHANGELOG)
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.19...v3.1.20)

---
updated-dependencies:
- dependency-name: bcrypt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 422b121d..bd1d4782 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "pg"
 
 gem "turbo-rails"
 
-gem "bcrypt", "~> 3.1.19"
+gem "bcrypt", "~> 3.1.20"
 
 gem "active_model_otp"
 gem "bootsnap", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index b247f130..55315b67 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,7 +92,7 @@ GEM
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    bcrypt (3.1.19)
+    bcrypt (3.1.20)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
@@ -507,7 +507,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_otp
-  bcrypt (~> 3.1.19)
+  bcrypt (~> 3.1.20)
   better_errors
   binding_of_caller
   bootsnap

From b7df0b83fefec28018f3a051d05e6f4848fee800 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 09:32:48 +0000
Subject: [PATCH 224/590] Bump @typescript-eslint/parser from 6.10.0 to 6.11.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.10.0 to 6.11.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.11.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index f83b0ea6..a76ad1ec 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.10.0",
-    "@typescript-eslint/parser": "^6.10.0",
+    "@typescript-eslint/parser": "^6.11.0",
     "esbuild": "^0.17.0",
     "eslint": "^7.16.0",
     "eslint-plugin-import": "^2.29.0",
diff --git a/yarn.lock b/yarn.lock
index f5412649..80e22e71 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -331,15 +331,15 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.10.0.tgz#578af79ae7273193b0b6b61a742a2bc8e02f875a"
-  integrity sha512-+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog==
+"@typescript-eslint/parser@^6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.11.0.tgz#9640d9595d905f3be4f278bf515130e6129b202e"
+  integrity sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.10.0"
-    "@typescript-eslint/types" "6.10.0"
-    "@typescript-eslint/typescript-estree" "6.10.0"
-    "@typescript-eslint/visitor-keys" "6.10.0"
+    "@typescript-eslint/scope-manager" "6.11.0"
+    "@typescript-eslint/types" "6.11.0"
+    "@typescript-eslint/typescript-estree" "6.11.0"
+    "@typescript-eslint/visitor-keys" "6.11.0"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@6.10.0":
@@ -350,6 +350,14 @@
     "@typescript-eslint/types" "6.10.0"
     "@typescript-eslint/visitor-keys" "6.10.0"
 
+"@typescript-eslint/scope-manager@6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz#621f603537c89f4d105733d949aa4d55eee5cea8"
+  integrity sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A==
+  dependencies:
+    "@typescript-eslint/types" "6.11.0"
+    "@typescript-eslint/visitor-keys" "6.11.0"
+
 "@typescript-eslint/type-utils@6.10.0":
   version "6.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz#1007faede067c78bdbcef2e8abb31437e163e2e1"
@@ -365,6 +373,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.10.0.tgz#f4f0a84aeb2ac546f21a66c6e0da92420e921367"
   integrity sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg==
 
+"@typescript-eslint/types@6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.11.0.tgz#8ad3aa000cbf4bdc4dcceed96e9b577f15e0bf53"
+  integrity sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==
+
 "@typescript-eslint/typescript-estree@6.10.0":
   version "6.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz#667381eed6f723a1a8ad7590a31f312e31e07697"
@@ -378,6 +391,19 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/typescript-estree@6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz#7b52c12a623bf7f8ec7f8a79901b9f98eb5c7990"
+  integrity sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==
+  dependencies:
+    "@typescript-eslint/types" "6.11.0"
+    "@typescript-eslint/visitor-keys" "6.11.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
 "@typescript-eslint/utils@6.10.0":
   version "6.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.10.0.tgz#4d76062d94413c30e402c9b0df8c14aef8d77336"
@@ -399,6 +425,14 @@
     "@typescript-eslint/types" "6.10.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.11.0":
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz#d991538788923f92ec40d44389e7075b359f3458"
+  integrity sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==
+  dependencies:
+    "@typescript-eslint/types" "6.11.0"
+    eslint-visitor-keys "^3.4.1"
+
 acorn-jsx@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"

From 74060ee4718687b454f46ca14d61afbea7f10091 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 26 Nov 2023 15:17:47 +0000
Subject: [PATCH 225/590] Bump @typescript-eslint/eslint-plugin from 6.10.0 to
 6.12.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.10.0 to 6.12.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.12.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 108 +++++++++++++++++++++++++--------------------------
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package.json b/package.json
index a76ad1ec..a3279bc8 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "typescript": "^5.2.2"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
     "@typescript-eslint/parser": "^6.11.0",
     "esbuild": "^0.17.0",
     "eslint": "^7.16.0",
diff --git a/yarn.lock b/yarn.lock
index 80e22e71..dab0e151 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -314,16 +314,16 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
   integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
-"@typescript-eslint/eslint-plugin@^6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz#cfe2bd34e26d2289212946b96ab19dcad64b661a"
-  integrity sha512-uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg==
+"@typescript-eslint/eslint-plugin@^6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz#2a647d278bb48bf397fef07ba0507612ff9dd812"
+  integrity sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.10.0"
-    "@typescript-eslint/type-utils" "6.10.0"
-    "@typescript-eslint/utils" "6.10.0"
-    "@typescript-eslint/visitor-keys" "6.10.0"
+    "@typescript-eslint/scope-manager" "6.12.0"
+    "@typescript-eslint/type-utils" "6.12.0"
+    "@typescript-eslint/utils" "6.12.0"
+    "@typescript-eslint/visitor-keys" "6.12.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -342,14 +342,6 @@
     "@typescript-eslint/visitor-keys" "6.11.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz#b0276118b13d16f72809e3cecc86a72c93708540"
-  integrity sha512-TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg==
-  dependencies:
-    "@typescript-eslint/types" "6.10.0"
-    "@typescript-eslint/visitor-keys" "6.10.0"
-
 "@typescript-eslint/scope-manager@6.11.0":
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz#621f603537c89f4d105733d949aa4d55eee5cea8"
@@ -358,38 +350,33 @@
     "@typescript-eslint/types" "6.11.0"
     "@typescript-eslint/visitor-keys" "6.11.0"
 
-"@typescript-eslint/type-utils@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz#1007faede067c78bdbcef2e8abb31437e163e2e1"
-  integrity sha512-wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg==
+"@typescript-eslint/scope-manager@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz#5833a16dbe19cfbad639d4d33bcca5e755c7044b"
+  integrity sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.10.0"
-    "@typescript-eslint/utils" "6.10.0"
+    "@typescript-eslint/types" "6.12.0"
+    "@typescript-eslint/visitor-keys" "6.12.0"
+
+"@typescript-eslint/type-utils@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz#968f7c95162808d69950ab5dff710ad730e58287"
+  integrity sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.12.0"
+    "@typescript-eslint/utils" "6.12.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.10.0.tgz#f4f0a84aeb2ac546f21a66c6e0da92420e921367"
-  integrity sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg==
-
 "@typescript-eslint/types@6.11.0":
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.11.0.tgz#8ad3aa000cbf4bdc4dcceed96e9b577f15e0bf53"
   integrity sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==
 
-"@typescript-eslint/typescript-estree@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz#667381eed6f723a1a8ad7590a31f312e31e07697"
-  integrity sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg==
-  dependencies:
-    "@typescript-eslint/types" "6.10.0"
-    "@typescript-eslint/visitor-keys" "6.10.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+"@typescript-eslint/types@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.12.0.tgz#ffc5297bcfe77003c8b7b545b51c2505748314ac"
+  integrity sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==
 
 "@typescript-eslint/typescript-estree@6.11.0":
   version "6.11.0"
@@ -404,27 +391,32 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.10.0.tgz#4d76062d94413c30e402c9b0df8c14aef8d77336"
-  integrity sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg==
+"@typescript-eslint/typescript-estree@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz#764ccc32598549e5b48ec99e3b85f89b1385310c"
+  integrity sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==
+  dependencies:
+    "@typescript-eslint/types" "6.12.0"
+    "@typescript-eslint/visitor-keys" "6.12.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.12.0.tgz#c6ce8c06fe9b0212620e5674a2036f6f8f611754"
+  integrity sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.10.0"
-    "@typescript-eslint/types" "6.10.0"
-    "@typescript-eslint/typescript-estree" "6.10.0"
+    "@typescript-eslint/scope-manager" "6.12.0"
+    "@typescript-eslint/types" "6.12.0"
+    "@typescript-eslint/typescript-estree" "6.12.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.10.0":
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz#b9eaf855a1ac7e95633ae1073af43d451e8f84e3"
-  integrity sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg==
-  dependencies:
-    "@typescript-eslint/types" "6.10.0"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.11.0":
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz#d991538788923f92ec40d44389e7075b359f3458"
@@ -433,6 +425,14 @@
     "@typescript-eslint/types" "6.11.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz#5877950de42a0f3344261b7a1eee15417306d7e9"
+  integrity sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==
+  dependencies:
+    "@typescript-eslint/types" "6.12.0"
+    eslint-visitor-keys "^3.4.1"
+
 acorn-jsx@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"

From e160248eca3b1732392b5e93c4ed2982eea53762 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 26 Nov 2023 15:24:32 +0000
Subject: [PATCH 226/590] Bump eslint from 7.32.0 to 8.54.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.32.0 to 8.54.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.32.0...v8.54.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 322 +++++++++++++++++++--------------------------------
 2 files changed, 122 insertions(+), 202 deletions(-)

diff --git a/package.json b/package.json
index a3279bc8..1f5133dd 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "@typescript-eslint/eslint-plugin": "^6.12.0",
     "@typescript-eslint/parser": "^6.11.0",
     "esbuild": "^0.17.0",
-    "eslint": "^7.16.0",
+    "eslint": "^8.54.0",
     "eslint-plugin-import": "^2.29.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.1.0",
diff --git a/yarn.lock b/yarn.lock
index dab0e151..6bfacd43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,12 +2,10 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
 "@babel/code-frame@^7.0.0":
   version "7.18.6"
@@ -16,25 +14,11 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
 "@babel/helper-validator-identifier@^7.18.6":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
-"@babel/highlight@^7.10.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b"
-  integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
@@ -174,33 +158,38 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
   integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
 
-"@eslint-community/eslint-utils@^4.4.0":
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.5.1":
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@eslint/eslintrc@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d"
+  integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@8.54.0":
+  version "8.54.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf"
+  integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==
+
 "@fontsource/lexend@^4.5.15":
   version "4.5.15"
   resolved "https://registry.yarnpkg.com/@fontsource/lexend/-/lexend-4.5.15.tgz#ee033b850224d05b665d6661bf8d32c950f166bb"
@@ -234,19 +223,24 @@
   resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.3.0.tgz#2226000fff1aabda9fd9587474565c9929dbf15d"
   integrity sha512-Dcu+NaSvHLT7EjrDrkEmH4qET2ZJZ5IcCWmNXxNQTBwlnE5tBZfN6WxZ842n5cHV52DH/AKNirbPBtcEXDLW4g==
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.11.13":
+  version "0.11.13"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
+  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@humanwhocodes/object-schema" "^2.0.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
 
-"@humanwhocodes/object-schema@^1.2.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
+  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
 
 "@melloware/coloris@^0.22.0":
   version "0.22.0"
@@ -266,7 +260,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -433,17 +427,22 @@
     "@typescript-eslint/types" "6.12.0"
     eslint-visitor-keys "^3.4.1"
 
-acorn-jsx@^5.3.1:
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+acorn@^8.9.0:
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
 
-ajv@^6.10.0, ajv@^6.12.4:
+ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -463,11 +462,6 @@ ajv@^8.0.1:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -495,13 +489,6 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -800,7 +787,7 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.1, debug@^4.3.4:
+debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -888,13 +875,6 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -1049,100 +1029,76 @@ eslint-plugin-import@^2.29.0:
     semver "^6.3.1"
     tsconfig-paths "^3.14.2"
 
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
-    estraverse "^4.1.1"
+    estraverse "^5.2.0"
 
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^7.16.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+eslint@^8.54.0:
+  version "8.54.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537"
+  integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
-    ajv "^6.10.0"
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.3"
+    "@eslint/js" "8.54.0"
+    "@humanwhocodes/config-array" "^0.11.13"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
-    strip-json-comments "^3.1.0"
-    table "^6.0.9"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -1153,11 +1109,6 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
@@ -1299,11 +1250,6 @@ function.prototype.name@^1.1.6:
     es-abstract "^1.22.1"
     functions-have-names "^1.2.3"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -1362,6 +1308,13 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob@^7.1.3:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
@@ -1390,10 +1343,10 @@ global-prefix@^3.0.0:
     kind-of "^6.0.2"
     which "^1.3.1"
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
-  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
+globals@^13.19.0:
+  version "13.23.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
+  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
   dependencies:
     type-fest "^0.20.2"
 
@@ -1526,11 +1479,6 @@ ieee754@^1.2.1:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
 ignore@^5.2.0, ignore@^5.2.4:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
@@ -1541,7 +1489,7 @@ immutable@^4.0.0:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
   integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -1694,6 +1642,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -1778,14 +1731,6 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -1940,7 +1885,7 @@ min-indent@^1.0.1:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-minimatch@^3.0.4, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -2056,17 +2001,17 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 p-limit@^3.0.2:
   version "3.1.0"
@@ -2181,11 +2126,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -2244,11 +2184,6 @@ regexp.prototype.flags@^1.5.1:
     define-properties "^1.2.0"
     set-function-name "^2.0.0"
 
-regexpp@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
 require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
@@ -2325,7 +2260,7 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.2.1, semver@^7.3.4, semver@^7.5.4:
+semver@^7.3.4, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -2422,11 +2357,6 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779"
   integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
 string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -2463,7 +2393,7 @@ string.prototype.trimstart@^1.0.7:
     define-properties "^1.2.0"
     es-abstract "^1.22.1"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -2482,7 +2412,7 @@ strip-indent@^4.0.0:
   dependencies:
     min-indent "^1.0.1"
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -2615,7 +2545,7 @@ sweetalert@1.1.3:
   resolved "https://registry.yarnpkg.com/sweetalert/-/sweetalert-1.1.3.tgz#d2c31ea492b22b6a8d887aea15989a238fc084ae"
   integrity sha1-0sMepJKyK2qNiHrqFZiaI4/AhK4=
 
-table@^6.0.9, table@^6.8.1:
+table@^6.8.1:
   version "6.8.1"
   resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
   integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
@@ -2746,11 +2676,6 @@ util-deprecate@^1.0.2:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -2795,11 +2720,6 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
-  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

From 93d67a8307af356669a2e8366bf2d399c0b35465 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 12 Nov 2023 02:45:35 +0500
Subject: [PATCH 227/590] #1448, add copy to clipboard option

---
 app/helpers/social_helper.rb       | 5 +++++
 app/views/actions/_share.html.haml | 3 +++
 config/locales/views.en.yml        | 1 +
 3 files changed, 9 insertions(+)

diff --git a/app/helpers/social_helper.rb b/app/helpers/social_helper.rb
index c4d8b329..6925c259 100644
--- a/app/helpers/social_helper.rb
+++ b/app/helpers/social_helper.rb
@@ -13,4 +13,9 @@ module SocialHelper
       protocol: (APP_CONFIG["https"] ? :https : :http),
     )
   end
+
+  def answer_copy_content(answer)
+    # copy content template: "question - answer [link]"
+    "#{answer.question.content} - #{answer.content} [#{answer_share_url(answer)}]"
+  end
 end
diff --git a/app/views/actions/_share.html.haml b/app/views/actions/_share.html.haml
index 5fc3c26b..4e57c056 100644
--- a/app/views/actions/_share.html.haml
+++ b/app/views/actions/_share.html.haml
@@ -8,5 +8,8 @@
   %a.dropdown-item{ href: telegram_share_url(answer), target: "_blank" }
     %i.fa.fa-fw.fa-telegram
     = t(".telegram")
+  %a.dropdown-item{ href: "#", data: { controller: :share, action: "share#copyToClipboard", share_copy_content_value: answer_copy_content(answer) } }
+    %i.fa.fa-fw.fa-solid.fa-copy
+    = t(".copy")
   %a.dropdown-item{ href: "#", data: { controller: :share, action: "share#share", share_url_value: answer_share_url(answer) } }
     = t(".other")
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 9c94c671..0b495cfc 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -79,6 +79,7 @@ en:
       pin: "Pin to Profile"
       unpin: "Unpin from Profile"
     share:
+      copy: "Copy to Clipboard"
       twitter: "Share on Twitter"
       tumblr: "Share on Tumblr"
       telegram: "Share on Telegram"

From e7f2582f59b62ce8902350773d57cc0e756696f6 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 12 Nov 2023 02:46:41 +0500
Subject: [PATCH 228/590] #1448, add copyToClipboard controller action

---
 .../retrospring/controllers/share_controller.ts           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/javascript/retrospring/controllers/share_controller.ts b/app/javascript/retrospring/controllers/share_controller.ts
index c1b5d350..e48daceb 100644
--- a/app/javascript/retrospring/controllers/share_controller.ts
+++ b/app/javascript/retrospring/controllers/share_controller.ts
@@ -5,12 +5,14 @@ export default class extends Controller {
   static values = {
     url: String,
     text: String,
-    title: String
+    title: String,
+    copyContent: String
   };
 
   declare readonly urlValue: string;
   declare readonly textValue: string;
   declare readonly titleValue: string;
+  declare readonly copyContentValue: string;
 
   share() {
     let shareConfiguration = {};
@@ -42,4 +44,8 @@ export default class extends Controller {
       })
       .catch(noop);
   }
+
+  async copyToClipboard(){
+    await navigator.clipboard.writeText(this.copyContentValue)
+  }
 }

From 6d1a8c92eccfab0922ee5e80bdc893b4c08d51bb Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 12 Nov 2023 03:08:14 +0500
Subject: [PATCH 229/590] #1448, add specs

---
 spec/helpers/social_helper_spec.rb          | 10 ++++++++++
 spec/views/actions/_share.html.haml_spec.rb |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/spec/helpers/social_helper_spec.rb b/spec/helpers/social_helper_spec.rb
index b56d6ab3..7583e0de 100644
--- a/spec/helpers/social_helper_spec.rb
+++ b/spec/helpers/social_helper_spec.rb
@@ -30,4 +30,14 @@ describe SocialHelper, type: :helper do
       URL
     end
   end
+
+  describe "#answer_copy_content" do
+    subject { answer_copy_content(answer) }
+
+    it "returns a formatted content to copy" do
+      expectedContent = "#{answer.question.content} - #{answer.content} [https://example.com/@#{answer.user.screen_name}/a/#{answer.id}]"
+
+      expect(subject).to eq(expectedContent)
+    end
+  end
 end
diff --git a/spec/views/actions/_share.html.haml_spec.rb b/spec/views/actions/_share.html.haml_spec.rb
index f3dfc49f..cdef7387 100644
--- a/spec/views/actions/_share.html.haml_spec.rb
+++ b/spec/views/actions/_share.html.haml_spec.rb
@@ -24,6 +24,10 @@ describe "actions/_share.html.haml", type: :view do
   end
 
   it "has a dropdown item to share to anywhere else" do
-    expect(rendered).to have_css(%(a.dropdown-item[data-controller="share"]))
+    expect(rendered).to have_css(%(a.dropdown-item[data-action="share#share"]))
+  end
+
+  it "has a dropdown item to copy to clipboard" do
+    expect(rendered).to have_css(%(a.dropdown-item[data-action="share#copyToClipboard"]))
   end
 end

From ac3dc12ee3041bf76efc7fab19f675d90603a3ae Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 12 Nov 2023 03:15:43 +0500
Subject: [PATCH 230/590] 1448, fix lint issues

---
 spec/helpers/social_helper_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/helpers/social_helper_spec.rb b/spec/helpers/social_helper_spec.rb
index 7583e0de..8b2fd443 100644
--- a/spec/helpers/social_helper_spec.rb
+++ b/spec/helpers/social_helper_spec.rb
@@ -35,9 +35,9 @@ describe SocialHelper, type: :helper do
     subject { answer_copy_content(answer) }
 
     it "returns a formatted content to copy" do
-      expectedContent = "#{answer.question.content} - #{answer.content} [https://example.com/@#{answer.user.screen_name}/a/#{answer.id}]"
+      expected_content = "#{answer.question.content} - #{answer.content} [https://example.com/@#{answer.user.screen_name}/a/#{answer.id}]"
 
-      expect(subject).to eq(expectedContent)
+      expect(subject).to eq(expected_content)
     end
   end
 end

From 03d41ec8b143da957dca306c74f4ef2f3c6d4e8c Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 12 Nov 2023 16:03:59 +0500
Subject: [PATCH 231/590] 1448, add clipboard controller

---
 .../controllers/clipboard_controller.ts            | 14 ++++++++++++++
 .../retrospring/initializers/stimulus.ts           |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 app/javascript/retrospring/controllers/clipboard_controller.ts

diff --git a/app/javascript/retrospring/controllers/clipboard_controller.ts b/app/javascript/retrospring/controllers/clipboard_controller.ts
new file mode 100644
index 00000000..63ee136e
--- /dev/null
+++ b/app/javascript/retrospring/controllers/clipboard_controller.ts
@@ -0,0 +1,14 @@
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+
+  static values = {
+    copy: String
+  }
+
+  declare readonly copyValue: string;
+
+  async copy(){
+    await navigator.clipboard.writeText(this.copyValue)
+  }
+}
diff --git a/app/javascript/retrospring/initializers/stimulus.ts b/app/javascript/retrospring/initializers/stimulus.ts
index 79116e3e..862b7fb9 100644
--- a/app/javascript/retrospring/initializers/stimulus.ts
+++ b/app/javascript/retrospring/initializers/stimulus.ts
@@ -14,6 +14,7 @@ import ToastController from "retrospring/controllers/toast_controller";
 import PwaBadgeController from "retrospring/controllers/pwa_badge_controller";
 import NavigationController from "retrospring/controllers/navigation_controller";
 import ShareController from "retrospring/controllers/share_controller";
+import ClipboardController from "retrospring/controllers/clipboard_controller";
 
 /**
  * This module sets up Stimulus and our controllers
@@ -39,4 +40,5 @@ export default function (): void {
   window['Stimulus'].register('theme', ThemeController);
   window['Stimulus'].register('toast', ToastController);
   window['Stimulus'].register('share', ShareController);
+  window['Stimulus'].register('clipboard', ClipboardController)
 }

From 198b84efe1dddd18081a4e72ccca96a7ff0bac0b Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 12 Nov 2023 16:05:17 +0500
Subject: [PATCH 232/590] 1448, use clipboard controller

---
 app/views/actions/_share.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/actions/_share.html.haml b/app/views/actions/_share.html.haml
index 4e57c056..21dc689b 100644
--- a/app/views/actions/_share.html.haml
+++ b/app/views/actions/_share.html.haml
@@ -8,7 +8,7 @@
   %a.dropdown-item{ href: telegram_share_url(answer), target: "_blank" }
     %i.fa.fa-fw.fa-telegram
     = t(".telegram")
-  %a.dropdown-item{ href: "#", data: { controller: :share, action: "share#copyToClipboard", share_copy_content_value: answer_copy_content(answer) } }
+  %a.dropdown-item{ href: "#", data: { controller: :clipboard, action: "clipboard#copy", clipboard_copy_value: prepare_tweet(answer) } }
     %i.fa.fa-fw.fa-solid.fa-copy
     = t(".copy")
   %a.dropdown-item{ href: "#", data: { controller: :share, action: "share#share", share_url_value: answer_share_url(answer) } }

From dee298fe3327b470feefb42df2146c5c74fc8d6b Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 12 Nov 2023 16:06:43 +0500
Subject: [PATCH 233/590] 1448, remove share#copyToClipboard changes

---
 app/helpers/social_helper.rb                           |  5 -----
 .../retrospring/controllers/share_controller.ts        |  8 +-------
 spec/helpers/social_helper_spec.rb                     | 10 ----------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/app/helpers/social_helper.rb b/app/helpers/social_helper.rb
index 6925c259..c4d8b329 100644
--- a/app/helpers/social_helper.rb
+++ b/app/helpers/social_helper.rb
@@ -13,9 +13,4 @@ module SocialHelper
       protocol: (APP_CONFIG["https"] ? :https : :http),
     )
   end
-
-  def answer_copy_content(answer)
-    # copy content template: "question - answer [link]"
-    "#{answer.question.content} - #{answer.content} [#{answer_share_url(answer)}]"
-  end
 end
diff --git a/app/javascript/retrospring/controllers/share_controller.ts b/app/javascript/retrospring/controllers/share_controller.ts
index e48daceb..c1b5d350 100644
--- a/app/javascript/retrospring/controllers/share_controller.ts
+++ b/app/javascript/retrospring/controllers/share_controller.ts
@@ -5,14 +5,12 @@ export default class extends Controller {
   static values = {
     url: String,
     text: String,
-    title: String,
-    copyContent: String
+    title: String
   };
 
   declare readonly urlValue: string;
   declare readonly textValue: string;
   declare readonly titleValue: string;
-  declare readonly copyContentValue: string;
 
   share() {
     let shareConfiguration = {};
@@ -44,8 +42,4 @@ export default class extends Controller {
       })
       .catch(noop);
   }
-
-  async copyToClipboard(){
-    await navigator.clipboard.writeText(this.copyContentValue)
-  }
 }
diff --git a/spec/helpers/social_helper_spec.rb b/spec/helpers/social_helper_spec.rb
index 8b2fd443..b56d6ab3 100644
--- a/spec/helpers/social_helper_spec.rb
+++ b/spec/helpers/social_helper_spec.rb
@@ -30,14 +30,4 @@ describe SocialHelper, type: :helper do
       URL
     end
   end
-
-  describe "#answer_copy_content" do
-    subject { answer_copy_content(answer) }
-
-    it "returns a formatted content to copy" do
-      expected_content = "#{answer.question.content} - #{answer.content} [https://example.com/@#{answer.user.screen_name}/a/#{answer.id}]"
-
-      expect(subject).to eq(expected_content)
-    end
-  end
 end

From 7ef521ad1fd40ade5517d41a18f0ad27d2f754a9 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 12 Nov 2023 16:06:59 +0500
Subject: [PATCH 234/590] 1448, update specs

---
 spec/views/actions/_share.html.haml_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/views/actions/_share.html.haml_spec.rb b/spec/views/actions/_share.html.haml_spec.rb
index cdef7387..a66ffde4 100644
--- a/spec/views/actions/_share.html.haml_spec.rb
+++ b/spec/views/actions/_share.html.haml_spec.rb
@@ -28,6 +28,6 @@ describe "actions/_share.html.haml", type: :view do
   end
 
   it "has a dropdown item to copy to clipboard" do
-    expect(rendered).to have_css(%(a.dropdown-item[data-action="share#copyToClipboard"]))
+    expect(rendered).to have_css(%(a.dropdown-item[data-action="clipboard#copy"]))
   end
 end

From 877d108c2c513c83057c2885a0e529ba832f58d6 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 12 Nov 2023 16:17:33 +0500
Subject: [PATCH 235/590] 1448, chore: add missing semicolons

---
 .../retrospring/controllers/clipboard_controller.ts           | 4 ++--
 app/javascript/retrospring/initializers/stimulus.ts           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/retrospring/controllers/clipboard_controller.ts b/app/javascript/retrospring/controllers/clipboard_controller.ts
index 63ee136e..f6227d04 100644
--- a/app/javascript/retrospring/controllers/clipboard_controller.ts
+++ b/app/javascript/retrospring/controllers/clipboard_controller.ts
@@ -4,11 +4,11 @@ export default class extends Controller {
 
   static values = {
     copy: String
-  }
+  };
 
   declare readonly copyValue: string;
 
   async copy(){
-    await navigator.clipboard.writeText(this.copyValue)
+    await navigator.clipboard.writeText(this.copyValue);
   }
 }
diff --git a/app/javascript/retrospring/initializers/stimulus.ts b/app/javascript/retrospring/initializers/stimulus.ts
index 862b7fb9..44f3b7e6 100644
--- a/app/javascript/retrospring/initializers/stimulus.ts
+++ b/app/javascript/retrospring/initializers/stimulus.ts
@@ -40,5 +40,5 @@ export default function (): void {
   window['Stimulus'].register('theme', ThemeController);
   window['Stimulus'].register('toast', ToastController);
   window['Stimulus'].register('share', ShareController);
-  window['Stimulus'].register('clipboard', ClipboardController)
+  window['Stimulus'].register('clipboard', ClipboardController);
 }

From bfe1851969ff04a4887d01ae8e3acc3cf8532fbd Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Sun, 19 Nov 2023 16:10:22 +0500
Subject: [PATCH 236/590] #1448, add notification toast for copy success &
 failure

---
 .../retrospring/controllers/clipboard_controller.ts    | 10 +++++++++-
 config/locales/frontend.en.yml                         |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/javascript/retrospring/controllers/clipboard_controller.ts b/app/javascript/retrospring/controllers/clipboard_controller.ts
index f6227d04..23bfc46c 100644
--- a/app/javascript/retrospring/controllers/clipboard_controller.ts
+++ b/app/javascript/retrospring/controllers/clipboard_controller.ts
@@ -1,4 +1,6 @@
 import { Controller } from "@hotwired/stimulus";
+import I18n from 'retrospring/i18n';
+import { showErrorNotification, showNotification } from "retrospring/utilities/notifications";
 
 export default class extends Controller {
 
@@ -9,6 +11,12 @@ export default class extends Controller {
   declare readonly copyValue: string;
 
   async copy(){
-    await navigator.clipboard.writeText(this.copyValue);
+    try {
+      await navigator.clipboard.writeText(this.copyValue);
+      showNotification(I18n.translate("frontend.clipboard_copy.success"));
+    } catch (error) {
+      console.log(error);
+      showErrorNotification(I18n.translate("frontend.clipboard_copy.error"));
+    }
   }
 }
diff --git a/config/locales/frontend.en.yml b/config/locales/frontend.en.yml
index 327e780b..fe55281a 100644
--- a/config/locales/frontend.en.yml
+++ b/config/locales/frontend.en.yml
@@ -62,3 +62,6 @@ en:
         title: "Are you sure you want to report this %{type}?"
         text: "A moderator will review your report and decide what happens.\nYou can optionally specify a reason."
         input: "Specify a reason…"
+    clipboard_copy:
+      success: "Content copied to clipboard."
+      error: "Failed to copy content to clipboard."

From e5fe0c6958715c3f28e58e055a4a84232f2cdcaf Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Wed, 22 Nov 2023 21:54:04 +0500
Subject: [PATCH 237/590] #1448, add copy to clipboard button on inbox share
 dialogue

---
 .../retrospring/controllers/clipboard_controller.ts       | 1 +
 .../retrospring/controllers/inbox_sharing_controller.ts   | 8 +++++++-
 app/javascript/retrospring/features/inbox/entry/answer.ts | 5 +++++
 app/views/inbox/_entry.html.haml                          | 3 +++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/javascript/retrospring/controllers/clipboard_controller.ts b/app/javascript/retrospring/controllers/clipboard_controller.ts
index 23bfc46c..59afaf46 100644
--- a/app/javascript/retrospring/controllers/clipboard_controller.ts
+++ b/app/javascript/retrospring/controllers/clipboard_controller.ts
@@ -14,6 +14,7 @@ export default class extends Controller {
     try {
       await navigator.clipboard.writeText(this.copyValue);
       showNotification(I18n.translate("frontend.clipboard_copy.success"));
+      this.element.dispatchEvent(new CustomEvent('retrospring:copied'));
     } catch (error) {
       console.log(error);
       showErrorNotification(I18n.translate("frontend.clipboard_copy.error"));
diff --git a/app/javascript/retrospring/controllers/inbox_sharing_controller.ts b/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
index dcc7b44f..fe52c0f1 100644
--- a/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
+++ b/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
@@ -1,13 +1,14 @@
 import { Controller } from '@hotwired/stimulus';
 
 export default class extends Controller {
-  static targets = ['twitter', 'tumblr', 'telegram', 'other', 'custom'];
+  static targets = ['twitter', 'tumblr', 'telegram', 'other', 'custom', 'clipboard'];
 
   declare readonly twitterTarget: HTMLAnchorElement;
   declare readonly tumblrTarget: HTMLAnchorElement;
   declare readonly telegramTarget: HTMLAnchorElement;
   declare readonly customTarget: HTMLAnchorElement;
   declare readonly otherTarget: HTMLButtonElement;
+  declare readonly clipboardTarget: HTMLButtonElement;
   declare readonly hasCustomTarget: boolean;
 
   static values = {
@@ -24,6 +25,7 @@ export default class extends Controller {
       this.tumblrTarget.addEventListener('click', () => this.close());
       this.telegramTarget.addEventListener('click', () => this.close());
       this.otherTarget.addEventListener('click', () => this.closeAfterShare());
+      this.clipboardTarget.addEventListener('click', () => this.closeAfterCopyToClipboard());
 
       if (this.hasCustomTarget) {
         this.customTarget.addEventListener('click', () => this.close());
@@ -54,4 +56,8 @@ export default class extends Controller {
   closeAfterShare(): void {
     this.otherTarget.addEventListener('retrospring:shared', () => this.close());
   }
+
+  closeAfterCopyToClipboard(): void {
+    this.clipboardTarget.addEventListener('retrospring:copied', () => this.close());
+  }
 }
diff --git a/app/javascript/retrospring/features/inbox/entry/answer.ts b/app/javascript/retrospring/features/inbox/entry/answer.ts
index b5a142ab..312527c8 100644
--- a/app/javascript/retrospring/features/inbox/entry/answer.ts
+++ b/app/javascript/retrospring/features/inbox/entry/answer.ts
@@ -31,11 +31,16 @@ export function answerEntryHandler(event: Event): void {
       showNotification(data.message);
 
       const shareButton = inboxEntry.querySelector<HTMLButtonElement>('[data-controller="share"]');
+      const clipboardCopyButton = inboxEntry.querySelector<HTMLButtonElement>('[data-action="clipboard#copy"]')
       if (shareButton != null) {
         shareButton.dataset.shareUrlValue = data.sharing.url;
         shareButton.dataset.shareTextValue = data.sharing.text;
       }
 
+      if (clipboardCopyButton != null){
+        clipboardCopyButton.dataset.clipboardCopyValue = `${data.sharing.text} ${data.sharing.url}`;
+      }
+
       const sharing = inboxEntry.querySelector<HTMLElement>('.inbox-entry__sharing');
       if (sharing != null) {
         sharing.dataset.inboxSharingConfigValue = JSON.stringify(data.sharing);
diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 8e15a7a7..c310b7cd 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -30,6 +30,9 @@
             %a.btn.btn-primary{ href: "#", data: { inbox_sharing_target: "telegram" }, target: "_blank" }
               %i.fab.fa-telegram.fa-fw
               Telegram
+            %a.btn.btn-primary{ data: { controller: :clipboard, action: "clipboard#copy", inbox_sharing_target: "clipboard" }}
+              %i.fa.fa-fw.fa-solid.fa-copy
+              = t("actions.share.copy")
             %button.btn.btn-primary{ data: { controller: "share", action: "share#share", inbox_sharing_target: "other" } }
               %i.fa.fa-fw.fa-share-alt
               = t("actions.share.other")

From 91ab795e38138d565a83021874dd4272c6885031 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Wed, 22 Nov 2023 22:11:10 +0500
Subject: [PATCH 238/590] #1448, add specs

---
 spec/views/inbox/_entry.html.haml_spec.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spec/views/inbox/_entry.html.haml_spec.rb b/spec/views/inbox/_entry.html.haml_spec.rb
index c8df132f..02dd3559 100644
--- a/spec/views/inbox/_entry.html.haml_spec.rb
+++ b/spec/views/inbox/_entry.html.haml_spec.rb
@@ -94,6 +94,11 @@ describe "inbox/_entry.html.haml", type: :view do
     expect(rendered).to have_css(%(.inbox-entry__sharing a.btn[data-inbox-sharing-target="twitter"]))
   end
 
+  it "has a link-button to copy to clipboard" do
+    expected_attribute_selectors = %([data-controller="clipboard"][data-action="clipboard#copy"][data-inbox-sharing-target="clipboard"])
+    expect(rendered).to have_css(%(.inbox-entry__sharing a.btn#{expected_attribute_selectors}))
+  end
+
   it "does not have a link-button to share to a custom site" do
     expect(rendered).not_to have_css(%(.inbox-entry__sharing a.btn[data-inbox-sharing-target="custom"]))
   end

From 8d0288c658f40e02dc63a737469553dc86d9c241 Mon Sep 17 00:00:00 2001
From: Ahmed Ejaz <chahmedejaz9050@gmail.com>
Date: Wed, 22 Nov 2023 22:19:35 +0500
Subject: [PATCH 239/590] 1448, fix haml-lint issues

---
 app/views/inbox/_entry.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index c310b7cd..68a55601 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -30,7 +30,7 @@
             %a.btn.btn-primary{ href: "#", data: { inbox_sharing_target: "telegram" }, target: "_blank" }
               %i.fab.fa-telegram.fa-fw
               Telegram
-            %a.btn.btn-primary{ data: { controller: :clipboard, action: "clipboard#copy", inbox_sharing_target: "clipboard" }}
+            %a.btn.btn-primary{ data: { controller: :clipboard, action: "clipboard#copy", inbox_sharing_target: "clipboard" } }
               %i.fa.fa-fw.fa-solid.fa-copy
               = t("actions.share.copy")
             %button.btn.btn-primary{ data: { controller: "share", action: "share#share", inbox_sharing_target: "other" } }

From b55e6da9a5d7ac30d52a730b64f4fb7feaf4a270 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 26 Nov 2023 19:32:50 +0100
Subject: [PATCH 240/590] Use subqueries to check reaction/subscription state

---
 app/controllers/answer_controller.rb          |  6 +-----
 app/controllers/concerns/paginates_answers.rb |  8 +-------
 app/controllers/discover_controller.rb        |  8 ++------
 app/controllers/question_controller.rb        |  3 +--
 app/controllers/timeline_controller.rb        |  6 ++----
 app/controllers/user_controller.rb            |  4 ++--
 app/models/answer.rb                          | 14 ++++++++++++++
 app/models/answer/timeline_methods.rb         |  3 ++-
 app/models/list/timeline_methods.rb           |  1 +
 app/models/question/answer_methods.rb         |  1 +
 app/models/user/answer_methods.rb             |  3 ++-
 app/models/user/timeline_methods.rb           |  1 +
 app/views/actions/_answer.html.haml           |  2 +-
 app/views/answer/show.html.haml               |  2 +-
 app/views/answerbox/_actions.html.haml        |  4 ++--
 app/views/application/_answerbox.html.haml    |  4 ++--
 app/views/discover/tab/_answers.html.haml     |  2 +-
 app/views/discover/tab/_discussed.html.haml   |  2 +-
 app/views/question/show.html.haml             |  2 +-
 app/views/question/show.turbo_stream.haml     |  2 +-
 app/views/timeline/timeline.html.haml         |  2 +-
 app/views/timeline/timeline.turbo_stream.haml |  2 +-
 app/views/user/show.html.haml                 |  4 ++--
 app/views/user/show.turbo_stream.haml         |  2 +-
 24 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/app/controllers/answer_controller.rb b/app/controllers/answer_controller.rb
index a1b5c516..917501e5 100644
--- a/app/controllers/answer_controller.rb
+++ b/app/controllers/answer_controller.rb
@@ -8,15 +8,11 @@ class AnswerController < ApplicationController
   turbo_stream_actions :pin, :unpin
 
   def show
-    @answer = Answer.includes(question: [:user], smiles: [:user]).find(params[:id])
+    @answer = Answer.for_user(current_user).includes(question: [:user], smiles: [:user]).find(params[:id])
     @display_all = true
-    @reacted_answer_ids = []
-    @subscribed_answer_ids = []
 
     return unless user_signed_in?
 
-    @reacted_answer_ids = Reaction.where(user: current_user, parent: @answer).pluck(:parent_id)
-    @subscribed_answer_ids = Subscription.where(user: current_user, answer: @answer).pluck(:answer_id)
     mark_notifications_as_read
   end
 
diff --git a/app/controllers/concerns/paginates_answers.rb b/app/controllers/concerns/paginates_answers.rb
index b4c22c64..fe0b0c0b 100644
--- a/app/controllers/concerns/paginates_answers.rb
+++ b/app/controllers/concerns/paginates_answers.rb
@@ -5,12 +5,6 @@ module PaginatesAnswers
     @answers = yield(last_id: params[:last_id])
     answer_ids = @answers.map(&:id)
     @answers_last_id = answer_ids.min
-    answer_ids += @pinned_answers.pluck(:id) if @pinned_answers.present?
-    @more_data_available = !yield(last_id: @answers_last_id, size: 1).count.zero?
-
-    return unless user_signed_in?
-
-    @reacted_answer_ids = Reaction.where(user: current_user, parent_type: "Answer", parent_id: answer_ids).pluck(:parent_id)
-    @subscribed_answer_ids = Subscription.where(user: current_user, answer_id: answer_ids).pluck(:answer_id)
+    @more_data_available = !yield(last_id: @answers_last_id, size: 1).select("answers.id").count.zero?
   end
 end
diff --git a/app/controllers/discover_controller.rb b/app/controllers/discover_controller.rb
index eb01e080..2af00fc1 100644
--- a/app/controllers/discover_controller.rb
+++ b/app/controllers/discover_controller.rb
@@ -8,15 +8,11 @@ class DiscoverController < ApplicationController
 
     top_x = 10  # only display the top X items
 
-    @popular_answers = Answer.where("created_at > ?", Time.now.ago(1.week)).order(:smile_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
-    @most_discussed = Answer.where("created_at > ?", Time.now.ago(1.week)).order(:comment_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
+    @popular_answers = Answer.for_user(current_user).where("created_at > ?", Time.now.ago(1.week)).order(:smile_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
+    @most_discussed = Answer.for_user(current_user).where("created_at > ?", Time.now.ago(1.week)).order(:comment_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
     @popular_questions = Question.where("created_at > ?", Time.now.ago(1.week)).order(:answer_count).reverse_order.limit(top_x).includes(:user)
     @new_users = User.where("asked_count > 0").order(:id).reverse_order.limit(top_x).includes(:profile)
 
-    answer_ids = @popular_answers.map(&:id) + @most_discussed.map(&:id)
-    @reacted_answer_ids = Reaction.where(user: current_user, parent_type: "Answer", parent_id: answer_ids).pluck(:parent_id)
-    @subscribed_answer_ids = Subscription.where(user: current_user, answer_id: answer_ids).pluck(:answer_id)
-
     # .user = the user
     # .question_count = how many questions did the user ask
     @users_with_most_questions = Question.select('user_id, COUNT(*) AS question_count').
diff --git a/app/controllers/question_controller.rb b/app/controllers/question_controller.rb
index 14dbe80e..6d334ea3 100644
--- a/app/controllers/question_controller.rb
+++ b/app/controllers/question_controller.rb
@@ -8,8 +8,7 @@ class QuestionController < ApplicationController
     @answers = @question.cursored_answers(last_id: params[:last_id], current_user:)
     answer_ids = @answers.map(&:id)
     @answers_last_id = answer_ids.min
-    @more_data_available = !@question.cursored_answers(last_id: @answers_last_id, size: 1, current_user:).count.zero?
-    @subscribed = Subscription.where(user: current_user, answer_id: answer_ids).pluck(:answer_id) if user_signed_in?
+    @more_data_available = !@question.cursored_answers(last_id: @answers_last_id, size: 1, current_user:).select("answers.id").count.zero?
 
     respond_to do |format|
       format.html
diff --git a/app/controllers/timeline_controller.rb b/app/controllers/timeline_controller.rb
index 747798e7..e5c7fd33 100644
--- a/app/controllers/timeline_controller.rb
+++ b/app/controllers/timeline_controller.rb
@@ -32,11 +32,9 @@ class TimelineController < ApplicationController
 
   def paginate_timeline
     @timeline = yield(last_id: params[:last_id])
-    timeline_ids = @timeline.map(&:id)
+    timeline_ids = @timeline.select("answers.id").map(&:id)
     @timeline_last_id = timeline_ids.min
-    @more_data_available = !yield(last_id: @timeline_last_id, size: 1).count.zero?
-    @reacted_answer_ids = Reaction.where(user: current_user, parent_type: "Answer", parent_id: timeline_ids).pluck(:parent_id)
-    @subscribed_answer_ids = Subscription.where(user: current_user, answer_id: timeline_ids).pluck(:answer_id)
+    @more_data_available = !yield(last_id: @timeline_last_id, size: 1).select("answers.id").count.zero?
 
     respond_to do |format|
       format.html { render "timeline/timeline" }
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 1e9940d4..6f03231b 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -8,8 +8,8 @@ class UserController < ApplicationController
   after_action :mark_notification_as_read, only: %i[show]
 
   def show
-    @pinned_answers = @user.answers.pinned.includes([{ user: :profile }, :question]).order(pinned_at: :desc).limit(10).load_async
-    paginate_answers { |args| @user.cursored_answers(**args) }
+    @pinned_answers = @user.answers.for_user(current_user).pinned.includes([{ user: :profile }, :question]).order(pinned_at: :desc).limit(10).load_async
+    paginate_answers { |args| @user.cursored_answers(current_user_id: current_user, **args) }
 
     respond_to do |format|
       format.html
diff --git a/app/models/answer.rb b/app/models/answer.rb
index 3c8736e1..702b7702 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -15,6 +15,20 @@ class Answer < ApplicationRecord
   # rubocop:enable Rails/UniqueValidationWithoutIndex
 
   scope :pinned, -> { where.not(pinned_at: nil) }
+  scope :for_user, lambda { |current_user|
+    next select("answers.*", "false as is_subscribed", "false as has_reacted") if current_user.nil?
+
+    select("answers.*",
+           "EXISTS(SELECT 1
+              FROM subscriptions
+              WHERE answer_id = answers.id
+                AND user_id = #{current_user.id}) as is_subscribed",
+           "EXISTS(SELECT 1
+              FROM reactions
+              WHERE parent_id = answers.id
+                AND parent_type = 'Answer'
+                AND user_id = #{current_user.id}) as has_reacted")
+  }
 
   SHORT_ANSWER_MAX_LENGTH = 640
 
diff --git a/app/models/answer/timeline_methods.rb b/app/models/answer/timeline_methods.rb
index 3245aa7e..465869da 100644
--- a/app/models/answer/timeline_methods.rb
+++ b/app/models/answer/timeline_methods.rb
@@ -6,7 +6,8 @@ module Answer::TimelineMethods
   define_cursor_paginator :cursored_public_timeline, :public_timeline
 
   def public_timeline(current_user: nil)
-    includes([{ user: :profile }, :question])
+    for_user(current_user)
+      .includes([{ user: :profile }, :question])
       .then do |query|
         next query unless current_user
 
diff --git a/app/models/list/timeline_methods.rb b/app/models/list/timeline_methods.rb
index b02d87e3..c55c9471 100644
--- a/app/models/list/timeline_methods.rb
+++ b/app/models/list/timeline_methods.rb
@@ -8,6 +8,7 @@ module List::TimelineMethods
   # @return [ActiveRecord::Relation<Answer>] the lists' timeline
   def timeline(current_user: nil)
     Answer
+      .for_user(current_user)
       .includes([{ user: :profile }, :question])
       .then do |query|
         next query unless current_user
diff --git a/app/models/question/answer_methods.rb b/app/models/question/answer_methods.rb
index 1a01dc7b..63301904 100644
--- a/app/models/question/answer_methods.rb
+++ b/app/models/question/answer_methods.rb
@@ -7,6 +7,7 @@ module Question::AnswerMethods
 
   def ordered_answers(current_user: nil)
     answers
+      .for_user(current_user)
       .includes([{ user: :profile }, :question])
       .then do |query|
         next query unless current_user
diff --git a/app/models/user/answer_methods.rb b/app/models/user/answer_methods.rb
index 74e1a44e..211e4d93 100644
--- a/app/models/user/answer_methods.rb
+++ b/app/models/user/answer_methods.rb
@@ -6,8 +6,9 @@ module User::AnswerMethods
   define_cursor_paginator :cursored_answers, :ordered_answers
 
   # @return [ActiveRecord::Relation<Answer>] List of a user's answers
-  def ordered_answers
+  def ordered_answers(current_user_id:)
     answers
+      .for_user(current_user_id)
       .order(:created_at)
       .reverse_order
       .includes(question: { user: [:profile] })
diff --git a/app/models/user/timeline_methods.rb b/app/models/user/timeline_methods.rb
index 79da93d3..24796954 100644
--- a/app/models/user/timeline_methods.rb
+++ b/app/models/user/timeline_methods.rb
@@ -8,6 +8,7 @@ module User::TimelineMethods
   # @return [ActiveRecord::Relation<Answer>] the user's timeline
   def timeline
     Answer
+      .for_user(self)
       .then do |query|
         blocked_and_muted_user_ids = blocked_user_ids_cached + muted_user_ids_cached
         next query if blocked_and_muted_user_ids.empty?
diff --git a/app/views/actions/_answer.html.haml b/app/views/actions/_answer.html.haml
index 78b81363..e029fe19 100644
--- a/app/views/actions/_answer.html.haml
+++ b/app/views/actions/_answer.html.haml
@@ -1,5 +1,5 @@
 .dropdown-menu.dropdown-menu-end{ role: :menu }
-  - if subscribed_answer_ids&.include?(answer.id)
+  - if answer.is_subscribed
     = render "subscriptions/destroy", answer: answer
   - else
     = render "subscriptions/create", answer: answer
diff --git a/app/views/answer/show.html.haml b/app/views/answer/show.html.haml
index 136fcfbe..4cc12576 100644
--- a/app/views/answer/show.html.haml
+++ b/app/views/answer/show.html.haml
@@ -1,4 +1,4 @@
 - provide(:title, answer_title(@answer))
 - provide(:og, answer_opengraph(@answer))
 .container-lg.container--main
-  = render "answerbox", a: @answer, display_all: @display_all, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
+  = render "answerbox", a: @answer, display_all: @display_all
diff --git a/app/views/answerbox/_actions.html.haml b/app/views/answerbox/_actions.html.haml
index 170f1ec9..6dafce38 100644
--- a/app/views/answerbox/_actions.html.haml
+++ b/app/views/answerbox/_actions.html.haml
@@ -1,4 +1,4 @@
-%button.btn.btn-link.answerbox__action{ type: :button, name: "ab-smile", data: { a_id: a.id, action: reacted_answer_ids&.include?(a.id) ? :unsmile : :smile, selection_hotkey: "s" }, disabled: !user_signed_in? }
+%button.btn.btn-link.answerbox__action{ type: :button, name: "ab-smile", data: { a_id: a.id, action: a.has_reacted ? :unsmile : :smile, selection_hotkey: "s" }, disabled: !user_signed_in? }
   %i.fa.fa-fw.fa-smile-o
   %span{ id: "ab-smile-count-#{a.id}" }= a.smile_count
 - unless display_all
@@ -13,4 +13,4 @@
   .btn-group
     %button.btn.btn-default.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
       %span.caret
-    = render "actions/answer", answer: a, subscribed_answer_ids:
+    = render "actions/answer", answer: a
diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml
index fb11033d..bfe29e4e 100644
--- a/app/views/application/_answerbox.html.haml
+++ b/app/views/application/_answerbox.html.haml
@@ -22,7 +22,7 @@
               .answerbox__answer-date
                 = link_to(raw(t("time.distance_ago", time: time_tooltip(a))), answer_path(a.user.screen_name, a.id), data: { selection_hotkey: "l" })
         .col-md-6.d-flex.d-md-block.answerbox__actions
-          = render "answerbox/actions", a:, display_all:, subscribed_answer_ids:, reacted_answer_ids:
+          = render "answerbox/actions", a:, display_all:
     - else
       .row
         .col-md-6.text-start.text-muted
@@ -34,7 +34,7 @@
               %i.fa.fa-thumbtack
               = t(".pinned")
         .col-md-6.d-md-flex.answerbox__actions
-          = render "answerbox/actions", a:, display_all:, subscribed_answer_ids:, reacted_answer_ids:
+          = render "answerbox/actions", a:, display_all:
   .card-footer{ id: "ab-comments-section-#{a.id}", class: display_all.nil? ? "d-none" : nil }
     = turbo_frame_tag("ab-reactions-list-#{a.id}", src: reactions_path(a.question, a), loading: :lazy) do
       .d-flex.smiles
diff --git a/app/views/discover/tab/_answers.html.haml b/app/views/discover/tab/_answers.html.haml
index 952004d4..cef9a25a 100644
--- a/app/views/discover/tab/_answers.html.haml
+++ b/app/views/discover/tab/_answers.html.haml
@@ -1,3 +1,3 @@
 .tab-pane.active.fade.show{ role: :tabpanel, id: "answers" }
   - answers.each do |a|
-    = render "answerbox", a:, subscribed_answer_ids:, reacted_answer_ids:
+    = render "answerbox", a:
diff --git a/app/views/discover/tab/_discussed.html.haml b/app/views/discover/tab/_discussed.html.haml
index 0eeeb94c..ed288036 100644
--- a/app/views/discover/tab/_discussed.html.haml
+++ b/app/views/discover/tab/_discussed.html.haml
@@ -1,3 +1,3 @@
 .tab-pane.fade{ role: :tabpanel, id: "comments" }
   - comments.each do |a|
-    = render "answerbox", a:, subscribed_answer_ids:, reacted_answer_ids:
+    = render "answerbox", a:
diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index a2d9d48d..cb24fbd1 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -8,7 +8,7 @@
     %button.d-none{ data: { hotkey: "j", action: "navigation#down" } }
     %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
     - @answers.each do |a|
-      = render "answerbox", a:, show_question: false, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
+      = render "answerbox", a:, show_question: false
 
   - if @more_data_available
     .d-flex.justify-content-center.justify-content-sm-start#paginator
diff --git a/app/views/question/show.turbo_stream.haml b/app/views/question/show.turbo_stream.haml
index f6da225e..335a808b 100644
--- a/app/views/question/show.turbo_stream.haml
+++ b/app/views/question/show.turbo_stream.haml
@@ -1,6 +1,6 @@
 = turbo_stream.append "answers" do
   - @answers.each do |a|
-    = render "answerbox", a:, show_question: false, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
+    = render "answerbox", a:, show_question: false
 
 = turbo_stream.update "paginator" do
   - if @more_data_available
diff --git a/app/views/timeline/timeline.html.haml b/app/views/timeline/timeline.html.haml
index bffd66cf..2b3089b8 100644
--- a/app/views/timeline/timeline.html.haml
+++ b/app/views/timeline/timeline.html.haml
@@ -2,7 +2,7 @@
   %button.d-none{ data: { hotkey: "j", action: "navigation#down" } }
   %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
   - @timeline.each do |answer|
-    = render "answerbox", a: answer, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
+    = render "answerbox", a: answer
 
 - if @more_data_available
   .d-flex.justify-content-center#paginator
diff --git a/app/views/timeline/timeline.turbo_stream.haml b/app/views/timeline/timeline.turbo_stream.haml
index ccbc5211..561309e6 100644
--- a/app/views/timeline/timeline.turbo_stream.haml
+++ b/app/views/timeline/timeline.turbo_stream.haml
@@ -1,6 +1,6 @@
 = turbo_stream.append "timeline" do
   - @timeline.each do |answer|
-    = render "answerbox", a: answer, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
+    = render "answerbox", a: answer
 
 = turbo_stream.update "paginator" do
   - if @more_data_available
diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index 382ed8b8..98f36de8 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -4,11 +4,11 @@
     %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
     #pinned-answers
       - @pinned_answers.each do |a|
-        = render "answerbox", a:, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
+        = render "answerbox", a:
 
     #answers
       - @answers.each do |a|
-        = render "answerbox", a:, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
+        = render "answerbox", a:
 
 - if @more_data_available
   .d-flex.justify-content-center.justify-content-sm-start#paginator
diff --git a/app/views/user/show.turbo_stream.haml b/app/views/user/show.turbo_stream.haml
index 977cbe4c..ae7889ad 100644
--- a/app/views/user/show.turbo_stream.haml
+++ b/app/views/user/show.turbo_stream.haml
@@ -1,6 +1,6 @@
 = turbo_stream.append "answers" do
   - @answers.each do |a|
-    = render "answerbox", a:, subscribed_answer_ids: @subscribed_answer_ids, reacted_answer_ids: @reacted_answer_ids
+    = render "answerbox", a:
 
 = turbo_stream.update "paginator" do
   - if @more_data_available

From 4c44bd55aa33cd0365b070f2b67b16bef4240e35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 09:38:05 +0000
Subject: [PATCH 241/590] Bump factory_bot_rails from 6.2.0 to 6.4.2

Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 6.2.0 to 6.4.2.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/main/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.2.0...v6.4.2)

---
updated-dependencies:
- dependency-name: factory_bot_rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7fe1e80b..2d8213f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -164,10 +164,10 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     excon (0.104.0)
-    factory_bot (6.2.1)
+    factory_bot (6.4.2)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
-      factory_bot (~> 6.2.0)
+    factory_bot_rails (6.4.2)
+      factory_bot (~> 6.4)
       railties (>= 5.0.0)
     fake_email_validator (1.0.11)
       activemodel
@@ -248,7 +248,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.7.1)
@@ -283,7 +283,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.1)

From 258cf5cb053c7d83aee6dd098a47fa8ef58319e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 09:38:58 +0000
Subject: [PATCH 242/590] Bump rspec-rails from 6.0.3 to 6.1.0

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.0.3 to 6.1.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.0.3...v6.1.0)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index bd1d4782..195d0dee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -90,7 +90,7 @@ group :development, :test do
   gem "rake"
   gem "rspec-its", "~> 1.3"
   gem "rspec-mocks"
-  gem "rspec-rails", "~> 6.0"
+  gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 4.1", require: false
   gem "rubocop", "~> 1.57"
   gem "rubocop-rails", "~> 2.22"
diff --git a/Gemfile.lock b/Gemfile.lock
index 7fe1e80b..2405a196 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -248,7 +248,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.7.1)
@@ -283,7 +283,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.1)
@@ -387,7 +387,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
+    rspec-rails (6.1.0)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -567,7 +567,7 @@ DEPENDENCIES
   rqrcode
   rspec-its (~> 1.3)
   rspec-mocks
-  rspec-rails (~> 6.0)
+  rspec-rails (~> 6.1)
   rspec-sidekiq (~> 4.1)
   rubocop (~> 1.57)
   rubocop-rails (~> 2.22)

From 8facb44af7b5c15098efae92f23ac8401475b974 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Mon, 27 Nov 2023 22:13:56 +0100
Subject: [PATCH 243/590] Fix lint errors

---
 app/controllers/discover_controller.rb | 6 +++---
 app/models/answer.rb                   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/discover_controller.rb b/app/controllers/discover_controller.rb
index 2af00fc1..05779d99 100644
--- a/app/controllers/discover_controller.rb
+++ b/app/controllers/discover_controller.rb
@@ -8,8 +8,8 @@ class DiscoverController < ApplicationController
 
     top_x = 10  # only display the top X items
 
-    @popular_answers = Answer.for_user(current_user).where("created_at > ?", Time.now.ago(1.week)).order(:smile_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
-    @most_discussed = Answer.for_user(current_user).where("created_at > ?", Time.now.ago(1.week)).order(:comment_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
+    @popular_answers = Answer.for_user(current_user).where("created_at > ?", Time.now.utc.ago(1.week)).order(:smile_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
+    @most_discussed = Answer.for_user(current_user).where("created_at > ?", Time.now.utc.ago(1.week)).order(:comment_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
     @popular_questions = Question.where("created_at > ?", Time.now.ago(1.week)).order(:answer_count).reverse_order.limit(top_x).includes(:user)
     @new_users = User.where("asked_count > 0").order(:id).reverse_order.limit(top_x).includes(:profile)
 
@@ -25,7 +25,7 @@ class DiscoverController < ApplicationController
     # .user = the user
     # .answer_count = how many questions did the user answer
     @users_with_most_answers = Answer.select('user_id, COUNT(*) AS answer_count').
-        where("created_at > ?", Time.now.ago(1.week)).
+        where("created_at > ?", week_ago).
         group(:user_id).
         order('answer_count').
         reverse_order.limit(top_x)
diff --git a/app/models/answer.rb b/app/models/answer.rb
index 702b7702..e115e9a1 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -27,7 +27,8 @@ class Answer < ApplicationRecord
               FROM reactions
               WHERE parent_id = answers.id
                 AND parent_type = 'Answer'
-                AND user_id = #{current_user.id}) as has_reacted")
+                AND user_id = #{current_user.id}) as has_reacted",
+           )
   }
 
   SHORT_ANSWER_MAX_LENGTH = 640

From 8cab7b0dcc232bcf7c5fa5bb6a45e9c61aef48cd Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Mon, 27 Nov 2023 22:30:10 +0100
Subject: [PATCH 244/590] Cache ban state

---
 app/models/user/ban_methods.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/user/ban_methods.rb b/app/models/user/ban_methods.rb
index 07826b1b..2fab74a3 100644
--- a/app/models/user/ban_methods.rb
+++ b/app/models/user/ban_methods.rb
@@ -6,14 +6,17 @@ module User::BanMethods
   end
 
   def banned?
-    bans.current.count.positive?
+    Rails.cache.fetch("#{cache_key}/banned") do
+      bans.current.count.positive?
+    end
   end
 
   def unban
     bans.current.update(
       # -1s to account for flakyness with timings in tests
-      expires_at: DateTime.now.utc - 1.second
+      expires_at: DateTime.now.utc - 1.second,
     )
+    Rails.cache.delete("#{cache_key}/banned")
   end
 
   # Bans a user.
@@ -24,8 +27,9 @@ module User::BanMethods
     ::UserBan.create!(
       user:       self,
       expires_at: expiry,
-      banned_by:  banned_by,
-      reason:     reason
+      banned_by:,
+      reason:,
     )
+    Rails.cache.delete("#{cache_key}/banned")
   end
 end

From c89d4c88208e23057609520bda53873ebd60d317 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:06:12 +0000
Subject: [PATCH 245/590] Bump @typescript-eslint/parser from 6.11.0 to 6.13.1

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.11.0 to 6.13.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.13.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 82 ++++++++++++++++++++++++++--------------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index 1f5133dd..72e5fe48 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@typescript-eslint/parser": "^6.13.1",
     "esbuild": "^0.17.0",
     "eslint": "^8.54.0",
     "eslint-plugin-import": "^2.29.0",
diff --git a/yarn.lock b/yarn.lock
index 6bfacd43..5bf2182e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,25 +325,17 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.11.0":
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.11.0.tgz#9640d9595d905f3be4f278bf515130e6129b202e"
-  integrity sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==
+"@typescript-eslint/parser@^6.13.1":
+  version "6.13.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.13.1.tgz#29d6d4e5fab4669e58bc15f6904b67da65567487"
+  integrity sha512-fs2XOhWCzRhqMmQf0eicLa/CWSaYss2feXsy7xBD/pLyWke/jCIVc2s1ikEAtSW7ina1HNhv7kONoEfVNEcdDQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.11.0"
-    "@typescript-eslint/types" "6.11.0"
-    "@typescript-eslint/typescript-estree" "6.11.0"
-    "@typescript-eslint/visitor-keys" "6.11.0"
+    "@typescript-eslint/scope-manager" "6.13.1"
+    "@typescript-eslint/types" "6.13.1"
+    "@typescript-eslint/typescript-estree" "6.13.1"
+    "@typescript-eslint/visitor-keys" "6.13.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.11.0":
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz#621f603537c89f4d105733d949aa4d55eee5cea8"
-  integrity sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A==
-  dependencies:
-    "@typescript-eslint/types" "6.11.0"
-    "@typescript-eslint/visitor-keys" "6.11.0"
-
 "@typescript-eslint/scope-manager@6.12.0":
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz#5833a16dbe19cfbad639d4d33bcca5e755c7044b"
@@ -352,6 +344,14 @@
     "@typescript-eslint/types" "6.12.0"
     "@typescript-eslint/visitor-keys" "6.12.0"
 
+"@typescript-eslint/scope-manager@6.13.1":
+  version "6.13.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz#58c7c37c6a957d3d9f59bc4f64c2888e0cac1d70"
+  integrity sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==
+  dependencies:
+    "@typescript-eslint/types" "6.13.1"
+    "@typescript-eslint/visitor-keys" "6.13.1"
+
 "@typescript-eslint/type-utils@6.12.0":
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz#968f7c95162808d69950ab5dff710ad730e58287"
@@ -362,28 +362,15 @@
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.11.0":
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.11.0.tgz#8ad3aa000cbf4bdc4dcceed96e9b577f15e0bf53"
-  integrity sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==
-
 "@typescript-eslint/types@6.12.0":
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.12.0.tgz#ffc5297bcfe77003c8b7b545b51c2505748314ac"
   integrity sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==
 
-"@typescript-eslint/typescript-estree@6.11.0":
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz#7b52c12a623bf7f8ec7f8a79901b9f98eb5c7990"
-  integrity sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==
-  dependencies:
-    "@typescript-eslint/types" "6.11.0"
-    "@typescript-eslint/visitor-keys" "6.11.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+"@typescript-eslint/types@6.13.1":
+  version "6.13.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.1.tgz#b56f26130e7eb8fa1e429c75fb969cae6ad7bb5c"
+  integrity sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==
 
 "@typescript-eslint/typescript-estree@6.12.0":
   version "6.12.0"
@@ -398,6 +385,19 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/typescript-estree@6.13.1":
+  version "6.13.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz#d01dda78d2487434d1c503853fa00291c566efa4"
+  integrity sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==
+  dependencies:
+    "@typescript-eslint/types" "6.13.1"
+    "@typescript-eslint/visitor-keys" "6.13.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
 "@typescript-eslint/utils@6.12.0":
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.12.0.tgz#c6ce8c06fe9b0212620e5674a2036f6f8f611754"
@@ -411,14 +411,6 @@
     "@typescript-eslint/typescript-estree" "6.12.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.11.0":
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz#d991538788923f92ec40d44389e7075b359f3458"
-  integrity sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==
-  dependencies:
-    "@typescript-eslint/types" "6.11.0"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.12.0":
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz#5877950de42a0f3344261b7a1eee15417306d7e9"
@@ -427,6 +419,14 @@
     "@typescript-eslint/types" "6.12.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.13.1":
+  version "6.13.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz#c4b692dcc23a4fc60685b718f10fde789d65a540"
+  integrity sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==
+  dependencies:
+    "@typescript-eslint/types" "6.13.1"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"

From 8f2c59183f81015873b7572932a8a09d221b3a5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:06:55 +0000
Subject: [PATCH 246/590] Bump @fortawesome/fontawesome-free from 6.4.2 to
 6.5.1

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.4.2 to 6.5.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.4.2...6.5.1)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1f5133dd..2edbcd95 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@fontsource/lexend": "^4.5.15",
-    "@fortawesome/fontawesome-free": "^6.4.2",
+    "@fortawesome/fontawesome-free": "^6.5.1",
     "@github/hotkey": "^2.3.0",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^7.3.0",
diff --git a/yarn.lock b/yarn.lock
index 6bfacd43..fa2d1442 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -195,10 +195,10 @@
   resolved "https://registry.yarnpkg.com/@fontsource/lexend/-/lexend-4.5.15.tgz#ee033b850224d05b665d6661bf8d32c950f166bb"
   integrity sha512-6edLmDmte8pJWtQ1NIahcJq0iWlf6b0/JLwkd7WbDQ3C5tZWnxjvbP4RSklMv4MPzGjpuYuYnc+QANbjUws1oA==
 
-"@fortawesome/fontawesome-free@^6.4.2":
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz#36b6a9cb5ffbecdf89815c94d0c0ffa489ac5ecb"
-  integrity sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==
+"@fortawesome/fontawesome-free@^6.5.1":
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258"
+  integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==
 
 "@github/hotkey@^2.3.0":
   version "2.3.0"

From a1a168f86ed79c224320f52065c7bfed1cdf1479 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:41:27 +0000
Subject: [PATCH 247/590] Bump sentry-rails, sentry-ruby and sentry-sidekiq

Bumps [sentry-rails](https://github.com/getsentry/sentry-ruby), [sentry-ruby](https://github.com/getsentry/sentry-ruby) and [sentry-sidekiq](https://github.com/getsentry/sentry-ruby). These dependencies needed to be updated together.

Updates `sentry-rails` from 5.13.0 to 5.14.0
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.13.0...5.14.0)

Updates `sentry-ruby` from 5.13.0 to 5.14.0
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.13.0...5.14.0)

Updates `sentry-sidekiq` from 5.13.0 to 5.14.0
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.13.0...5.14.0)

---
updated-dependencies:
- dependency-name: sentry-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-ruby
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7fe1e80b..34a38fba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -248,7 +248,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.7.1)
@@ -283,7 +283,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.1)
@@ -434,13 +434,13 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-rails (5.13.0)
+    sentry-rails (5.14.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.13.0)
-    sentry-ruby (5.13.0)
+      sentry-ruby (~> 5.14.0)
+    sentry-ruby (5.14.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.13.0)
-      sentry-ruby (~> 5.13.0)
+    sentry-sidekiq (5.14.0)
+      sentry-ruby (~> 5.14.0)
       sidekiq (>= 3.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)

From 985176faf406380b011786b0827eab71d330cd3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:45:10 +0000
Subject: [PATCH 248/590] Bump view_component from 3.7.0 to 3.8.0

Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.7.0...v3.8.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7fe1e80b..26c95c0b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -489,7 +489,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    view_component (3.7.0)
+    view_component (3.8.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

From 84c7e0b97e979a62626d1bc519a85ba85001becf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:51:28 +0000
Subject: [PATCH 249/590] Bump net-imap from 0.4.5 to 0.4.7

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.5 to 0.4.7.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.5...v0.4.7)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7fe1e80b..5f297daa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.5)
+    net-imap (0.4.7)
       date
       net-protocol
     net-pop (0.1.2)

From 107d71da638cb7fcd5dc8d2a8935bcc749114918 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:55:17 +0000
Subject: [PATCH 250/590] Bump pghero from 3.3.4 to 3.4.0

Bumps [pghero](https://github.com/ankane/pghero) from 3.3.4 to 3.4.0.
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/pghero/compare/v3.3.4...v3.4.0)

---
updated-dependencies:
- dependency-name: pghero
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7fe1e80b..14137ee8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -294,7 +294,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
-    pghero (3.3.4)
+    pghero (3.4.0)
       activerecord (>= 6)
     prometheus-client (4.2.2)
     public_suffix (5.0.3)

From 88fc0647b42cfb33dc63e7e5b4949a0416e3fe23 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 8 Dec 2023 00:25:44 +0100
Subject: [PATCH 251/590] Place Reactions in User Content within Rails Admin

---
 config/initializers/rails_admin.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb
index b1ebe56e..1ee364a2 100644
--- a/config/initializers/rails_admin.rb
+++ b/config/initializers/rails_admin.rb
@@ -109,6 +109,7 @@ RailsAdmin.config do |config|
       Answer
       Appendable
       Comment
+      Reaction
       Question
       User
     ],

From c9e578840cb41e5ed07d0c74b3d1a0d14ef82447 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Dec 2023 22:02:51 +0000
Subject: [PATCH 252/590] Bump eslint from 8.54.0 to 8.55.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.55.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.54.0...v8.55.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index ee22cfee..b5e448f2 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "@typescript-eslint/eslint-plugin": "^6.12.0",
     "@typescript-eslint/parser": "^6.13.1",
     "esbuild": "^0.17.0",
-    "eslint": "^8.54.0",
+    "eslint": "^8.55.0",
     "eslint-plugin-import": "^2.29.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.1.0",
diff --git a/yarn.lock b/yarn.lock
index 3ac52077..b525d689 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -170,10 +170,10 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d"
-  integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -185,10 +185,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.54.0":
-  version "8.54.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf"
-  integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==
+"@eslint/js@8.55.0":
+  version "8.55.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.55.0.tgz#b721d52060f369aa259cf97392403cb9ce892ec6"
+  integrity sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==
 
 "@fontsource/lexend@^4.5.15":
   version "4.5.15"
@@ -1042,15 +1042,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.54.0:
-  version "8.54.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537"
-  integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==
+eslint@^8.55.0:
+  version "8.55.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.55.0.tgz#078cb7b847d66f2c254ea1794fa395bf8e7e03f8"
+  integrity sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.3"
-    "@eslint/js" "8.54.0"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.55.0"
     "@humanwhocodes/config-array" "^0.11.13"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"

From 3d46ebdc4b17d7b3b838a37bb6628ab2261668ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Dec 2023 22:06:43 +0000
Subject: [PATCH 253/590] Bump rubocop from 1.57.2 to 1.58.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.57.2 to 1.58.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.57.2...v1.58.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 195d0dee..9d3bcfde 100644
--- a/Gemfile
+++ b/Gemfile
@@ -92,7 +92,7 @@ group :development, :test do
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 4.1", require: false
-  gem "rubocop", "~> 1.57"
+  gem "rubocop", "~> 1.58"
   gem "rubocop-rails", "~> 2.22"
   gem "shoulda-matchers", "~> 5.3"
   gem "simplecov", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 328e9cd1..60ae0ded 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -222,7 +222,7 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     jsbundling-rails (1.2.1)
       railties (>= 6.0.0)
-    json (2.6.3)
+    json (2.7.1)
     json-schema (4.1.1)
       addressable (>= 2.8)
     jwt (2.7.1)
@@ -352,7 +352,7 @@ GEM
     rake (13.1.0)
     redcarpet (3.6.0)
     redis (4.8.1)
-    regexp_parser (2.8.2)
+    regexp_parser (2.8.3)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.1)
@@ -401,7 +401,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.57.2)
+    rubocop (1.58.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -409,7 +409,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -569,7 +569,7 @@ DEPENDENCIES
   rspec-mocks
   rspec-rails (~> 6.1)
   rspec-sidekiq (~> 4.1)
-  rubocop (~> 1.57)
+  rubocop (~> 1.58)
   rubocop-rails (~> 2.22)
   rubyzip (~> 2.3)
   sanitize

From f1f58ab8bdfd4edce354e7f4ce7f69e52affce6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Dec 2023 22:13:46 +0000
Subject: [PATCH 254/590] Bump @typescript-eslint/eslint-plugin from 6.12.0 to
 6.13.2

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.12.0 to 6.13.2.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.13.2/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 108 +++++++++++++++++++++++++--------------------------
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package.json b/package.json
index b5e448f2..5221134a 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "typescript": "^5.2.2"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
     "@typescript-eslint/parser": "^6.13.1",
     "esbuild": "^0.17.0",
     "eslint": "^8.55.0",
diff --git a/yarn.lock b/yarn.lock
index b525d689..cb0e9d61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -308,16 +308,16 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
   integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
-"@typescript-eslint/eslint-plugin@^6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz#2a647d278bb48bf397fef07ba0507612ff9dd812"
-  integrity sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==
+"@typescript-eslint/eslint-plugin@^6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz#2e03506c5362a65e43cb132c37c9ce2d3cb51470"
+  integrity sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.12.0"
-    "@typescript-eslint/type-utils" "6.12.0"
-    "@typescript-eslint/utils" "6.12.0"
-    "@typescript-eslint/visitor-keys" "6.12.0"
+    "@typescript-eslint/scope-manager" "6.13.2"
+    "@typescript-eslint/type-utils" "6.13.2"
+    "@typescript-eslint/utils" "6.13.2"
+    "@typescript-eslint/visitor-keys" "6.13.2"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -336,14 +336,6 @@
     "@typescript-eslint/visitor-keys" "6.13.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz#5833a16dbe19cfbad639d4d33bcca5e755c7044b"
-  integrity sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==
-  dependencies:
-    "@typescript-eslint/types" "6.12.0"
-    "@typescript-eslint/visitor-keys" "6.12.0"
-
 "@typescript-eslint/scope-manager@6.13.1":
   version "6.13.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz#58c7c37c6a957d3d9f59bc4f64c2888e0cac1d70"
@@ -352,38 +344,33 @@
     "@typescript-eslint/types" "6.13.1"
     "@typescript-eslint/visitor-keys" "6.13.1"
 
-"@typescript-eslint/type-utils@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz#968f7c95162808d69950ab5dff710ad730e58287"
-  integrity sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==
+"@typescript-eslint/scope-manager@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz#5fa4e4adace028dafac212c770640b94e7b61052"
+  integrity sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.12.0"
-    "@typescript-eslint/utils" "6.12.0"
+    "@typescript-eslint/types" "6.13.2"
+    "@typescript-eslint/visitor-keys" "6.13.2"
+
+"@typescript-eslint/type-utils@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz#ebec2da14a6bb7122e0fd31eea72a382c39c6102"
+  integrity sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.13.2"
+    "@typescript-eslint/utils" "6.13.2"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.12.0.tgz#ffc5297bcfe77003c8b7b545b51c2505748314ac"
-  integrity sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==
-
 "@typescript-eslint/types@6.13.1":
   version "6.13.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.1.tgz#b56f26130e7eb8fa1e429c75fb969cae6ad7bb5c"
   integrity sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==
 
-"@typescript-eslint/typescript-estree@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz#764ccc32598549e5b48ec99e3b85f89b1385310c"
-  integrity sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==
-  dependencies:
-    "@typescript-eslint/types" "6.12.0"
-    "@typescript-eslint/visitor-keys" "6.12.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+"@typescript-eslint/types@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.2.tgz#c044aac24c2f6cefb8e921e397acad5417dd0ae6"
+  integrity sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==
 
 "@typescript-eslint/typescript-estree@6.13.1":
   version "6.13.1"
@@ -398,27 +385,32 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.12.0.tgz#c6ce8c06fe9b0212620e5674a2036f6f8f611754"
-  integrity sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==
+"@typescript-eslint/typescript-estree@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz#ae556ee154c1acf025b48d37c3ef95a1d55da258"
+  integrity sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==
+  dependencies:
+    "@typescript-eslint/types" "6.13.2"
+    "@typescript-eslint/visitor-keys" "6.13.2"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.13.2.tgz#8eb89e53adc6d703a879b131e528807245486f89"
+  integrity sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.12.0"
-    "@typescript-eslint/types" "6.12.0"
-    "@typescript-eslint/typescript-estree" "6.12.0"
+    "@typescript-eslint/scope-manager" "6.13.2"
+    "@typescript-eslint/types" "6.13.2"
+    "@typescript-eslint/typescript-estree" "6.13.2"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz#5877950de42a0f3344261b7a1eee15417306d7e9"
-  integrity sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==
-  dependencies:
-    "@typescript-eslint/types" "6.12.0"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.13.1":
   version "6.13.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz#c4b692dcc23a4fc60685b718f10fde789d65a540"
@@ -427,6 +419,14 @@
     "@typescript-eslint/types" "6.13.1"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz#e0a4a80cf842bb08e6127b903284166ac4a5594c"
+  integrity sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==
+  dependencies:
+    "@typescript-eslint/types" "6.13.2"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"

From 91709ae7043865a40cbb3b25d35d046be370f1c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Dec 2023 22:20:19 +0000
Subject: [PATCH 255/590] Bump typescript from 5.2.2 to 5.3.3

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.2.2 to 5.3.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.2.2...v5.3.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5221134a..9c244791 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "sass": "^1.69.5",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.13.2",
diff --git a/yarn.lock b/yarn.lock
index cb0e9d61..33af63e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2649,10 +2649,10 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
-typescript@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
-  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
+typescript@^5.3.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
+  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"

From 9872d3aacecffd0c5773dd12c2f6b2d78aaeaead Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 31 Oct 2023 23:32:36 +0100
Subject: [PATCH 256/590] Implement reaction create/destroy with Turbo Streams

---
 .../stylesheets/components/_answerbox.scss    | 13 ++---
 app/controllers/reactions_controller.rb       | 56 +++++++++++++++++++
 app/views/answerbox/_actions.html.haml        |  7 ++-
 app/views/answerbox/_comments.html.haml       |  7 ++-
 app/views/reactions/_create.html.haml         | 13 +++++
 app/views/reactions/_destroy.html.haml        | 15 +++++
 config/routes.rb                              |  4 ++
 7 files changed, 102 insertions(+), 13 deletions(-)
 create mode 100644 app/views/reactions/_create.html.haml
 create mode 100644 app/views/reactions/_destroy.html.haml

diff --git a/app/assets/stylesheets/components/_answerbox.scss b/app/assets/stylesheets/components/_answerbox.scss
index ed550dc6..68065498 100644
--- a/app/assets/stylesheets/components/_answerbox.scss
+++ b/app/assets/stylesheets/components/_answerbox.scss
@@ -50,20 +50,19 @@
       text-decoration: none;
     }
 
-    &[name="ab-smile"],
-    &[name="ab-smile-comment"] {
+    &.smile {
       color: var(--primary);
 
       &:hover {
         color: var(--success);
       }
+    }
 
-      &[data-action="unsmile"] {
-        color: var(--success);
+    &.unsmile {
+      color: var(--success);
 
-        &:hover {
-          color: var(--danger);
-        }
+      &:hover {
+        color: var(--danger);
       }
     }
   }
diff --git a/app/controllers/reactions_controller.rb b/app/controllers/reactions_controller.rb
index fbf01fce..350df903 100644
--- a/app/controllers/reactions_controller.rb
+++ b/app/controllers/reactions_controller.rb
@@ -1,9 +1,65 @@
 # frozen_string_literal: true
 
 class ReactionsController < ApplicationController
+  include TurboStreamable
+
+  before_action :authenticate_user!, only: %w[create destroy]
+
+  turbo_stream_actions :create, :destroy
+
   def index
     answer = Answer.includes([smiles: { user: :profile }]).find(params[:id])
 
     render "index", locals: { a: answer }
   end
+
+  def create
+    params.require :id
+    params.require :type
+
+    target = params[:type].constantize.find_by!(id: params[:id])
+
+    UseCase::Reaction::Create.call(
+      source_user: current_user,
+      target:
+    )
+
+    target.reload
+
+    respond_to do |format|
+      format.turbo_stream do
+        render turbo_stream: [
+          turbo_stream.replace("reaction-#{params[:type]}-#{params[:id]}", partial: "reactions/destroy", locals: { type: params[:type], target: }),
+          render_toast(t(".#{params[:type].downcase}.success"))
+        ]
+      end
+
+      format.html { redirect_back(fallback_location: root_path) }
+    end
+  end
+
+  def destroy
+    params.require :id
+    params.require :type
+
+    target = params[:type].constantize.find_by!(id: params[:id])
+
+    UseCase::Reaction::Destroy.call(
+      source_user: current_user,
+      target:
+    )
+
+    target.reload
+
+    respond_to do |format|
+      format.turbo_stream do
+        render turbo_stream: [
+          turbo_stream.replace("reaction-#{params[:type]}-#{params[:id]}", partial: "reactions/create", locals: { type: params[:type], target: }),
+          render_toast(t(".#{params[:type].downcase}.success"))
+        ]
+      end
+
+      format.html { redirect_back(fallback_location: root_path) }
+    end
+  end
 end
diff --git a/app/views/answerbox/_actions.html.haml b/app/views/answerbox/_actions.html.haml
index 6dafce38..4842362d 100644
--- a/app/views/answerbox/_actions.html.haml
+++ b/app/views/answerbox/_actions.html.haml
@@ -1,6 +1,7 @@
-%button.btn.btn-link.answerbox__action{ type: :button, name: "ab-smile", data: { a_id: a.id, action: a.has_reacted ? :unsmile : :smile, selection_hotkey: "s" }, disabled: !user_signed_in? }
-  %i.fa.fa-fw.fa-smile-o
-  %span{ id: "ab-smile-count-#{a.id}" }= a.smile_count
+- if a.has_reacted
+  = render "reactions/destroy", type: "Answer", target: a
+- else
+  = render "reactions/create", type: "Answer", target: a
 - unless display_all
   %button.btn.btn-link.answerbox__action{ type: :button, name: "ab-comments", data: { a_id: a.id, state: :hidden, selection_hotkey: "x" } }
     %i.fa.fa-fw.fa-comments
diff --git a/app/views/answerbox/_comments.html.haml b/app/views/answerbox/_comments.html.haml
index 78ce559b..d992c946 100644
--- a/app/views/answerbox/_comments.html.haml
+++ b/app/views/answerbox/_comments.html.haml
@@ -16,9 +16,10 @@
             .comment__content
               = markdown comment.content
           .flex-shrink-0.ms-auto
-            %button.btn.btn-link.answerbox__action{ type: :button, name: "ab-smile-comment", data: { c_id: comment.id, action: current_user&.smiled?(comment) ? :unsmile : :smile }, disabled: !user_signed_in? }
-              %i.fa.fa-fw.fa-smile-o
-              %span{ id: "ab-comment-smile-count-#{comment.id}" }= comment.smile_count
+            - if current_user&.smiled?(comment)
+              = render "reactions/destroy", type: "Comment", target: comment
+            - else
+              = render "reactions/create", type: "Comment", target: comment
             .btn-group
               %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
                 %span.caret
diff --git a/app/views/reactions/_create.html.haml b/app/views/reactions/_create.html.haml
new file mode 100644
index 00000000..a82c1d60
--- /dev/null
+++ b/app/views/reactions/_create.html.haml
@@ -0,0 +1,13 @@
+- if type == "Answer"
+  = button_to create_reactions_path(id: target.id, username: target.user.screen_name),
+              form: { class: "d-inline-block", id: "reaction-#{type}-#{target.id}" },
+              class: "btn btn-link answerbox__action smile" do
+    %i.fa.fa-fw.fa-smile-o
+    %span= target.smile_count
+
+- if type == "Comment"
+  = button_to create_comment_reactions_path(id: target.id, username: target.user.screen_name),
+              form: { class: "d-inline-block", id: "reaction-#{type}-#{target.id}" },
+              class: "btn btn-link answerbox__action smile" do
+    %i.fa.fa-fw.fa-smile-o
+    %span= target.smile_count
diff --git a/app/views/reactions/_destroy.html.haml b/app/views/reactions/_destroy.html.haml
new file mode 100644
index 00000000..23dffdaf
--- /dev/null
+++ b/app/views/reactions/_destroy.html.haml
@@ -0,0 +1,15 @@
+- if type == "Answer"
+  = button_to destroy_reactions_path(id: target.id, username: target.user.screen_name),
+              method: :delete,
+              form: { class: "d-inline-block", id: "reaction-#{type}-#{target.id}" },
+              class: "btn btn-link answerbox__action unsmile" do
+    %i.fa.fa-fw.fa-smile-o
+    %span= target.smile_count
+
+- if type == "Comment"
+  = button_to destroy_comment_reactions_path(id: target.id, username: target.user.screen_name),
+              method: :delete,
+              form: { class: "d-inline-block", id: "reaction-#{type}-#{target.id}" },
+              class: "btn btn-link answerbox__action unsmile" do
+    %i.fa.fa-fw.fa-smile-o
+    %span= target.smile_count
diff --git a/config/routes.rb b/config/routes.rb
index fabc4263..28556dac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -156,8 +156,12 @@ Rails.application.routes.draw do
   delete "/@:username/a/:id/pin", to: "answer#unpin", as: :unpin_answer
   get "/@:username/a/:id/comments", to: "comments#index", as: :comments
   get "/@:username/a/:id/reactions", to: "reactions#index", as: :reactions
+  post "/@:username/a/:id/reactions", to: "reactions#create", as: :create_reactions, defaults: { type: "Answer" }
+  delete "/@:username/a/:id/reactions", to: "reactions#destroy", as: :destroy_reactions, defaults: { type: "Answer" }
   get "/@:username/q/:id", to: "question#show", as: :question
   get "/@:username/c/:id/reactions", to: "comments/reactions#index", as: :comment_reactions
+  post "/@:username/c/:id/reactions", to: "reactions#create", as: :create_comment_reactions, defaults: { type: "Comment" }
+  delete "/@:username/c/:id/reactions", to: "reactions#destroy", as: :destroy_comment_reactions, defaults: { type: "Comment" }
   get "/@:username/followers", to: "user#followers", as: :show_user_followers
   get "/@:username/followings", to: "user#followings", as: :show_user_followings
   get "/@:username/friends", to: redirect("/@%{username}/followings")

From 4e434dd2686d5b552e49bdb77a2fe9e7040c6dcb Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 31 Oct 2023 23:33:10 +0100
Subject: [PATCH 257/590] Remove legacy SmileController

---
 app/controllers/ajax/smile_controller.rb      |  85 -----
 config/routes.rb                              |   4 -
 .../controllers/ajax/smile_controller_spec.rb | 340 ------------------
 3 files changed, 429 deletions(-)
 delete mode 100644 app/controllers/ajax/smile_controller.rb
 delete mode 100644 spec/controllers/ajax/smile_controller_spec.rb

diff --git a/app/controllers/ajax/smile_controller.rb b/app/controllers/ajax/smile_controller.rb
deleted file mode 100644
index 227b1d9c..00000000
--- a/app/controllers/ajax/smile_controller.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-class Ajax::SmileController < AjaxController
-  def create
-    params.require :id
-
-    answer = Answer.find(params[:id])
-
-    begin
-      current_user.smile answer
-    rescue Errors::Base => e
-      @response[:status] = e.code
-      @response[:message] = I18n.t(e.locale_tag)
-      return
-    rescue => e
-      Sentry.capture_exception(e)
-      @response[:status] = :fail
-      @response[:message] = t(".error")
-      return
-    end
-
-    @response[:status] = :okay
-    @response[:message] = t(".success")
-    @response[:success] = true
-  end
-
-  def destroy
-    params.require :id
-
-    answer = Answer.find(params[:id])
-
-    begin
-      current_user.unsmile answer
-    rescue => e
-      Sentry.capture_exception(e)
-      @response[:status] = :fail
-      @response[:message] = t(".error")
-      return
-    end
-
-    @response[:status] = :okay
-    @response[:message] = t(".success")
-    @response[:success] = true
-  end
-
-  def create_comment
-    params.require :id
-
-    comment = Comment.find(params[:id])
-
-    begin
-      current_user.smile comment
-    rescue Errors::Base => e
-      @response[:status] = e.code
-      @response[:message] = I18n.t(e.locale_tag)
-      return
-    rescue => e
-      Sentry.capture_exception(e)
-      @response[:status] = :fail
-      @response[:message] = t(".error")
-      return
-    end
-
-    @response[:status] = :okay
-    @response[:message] = t(".success")
-    @response[:success] = true
-  end
-
-  def destroy_comment
-    params.require :id
-
-    comment = Comment.find(params[:id])
-
-    begin
-      current_user.unsmile comment
-    rescue => e
-      Sentry.capture_exception(e)
-      @response[:status] = :fail
-      @response[:message] = t(".error")
-      return
-    end
-
-    @response[:status] = :okay
-    @response[:message] = t(".success")
-    @response[:success] = true
-  end
-end
diff --git a/config/routes.rb b/config/routes.rb
index 28556dac..dae367ea 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -118,10 +118,6 @@ Rails.application.routes.draw do
     post "/destroy_answer", to: "answer#destroy", as: :destroy_answer
     post "/create_relationship", to: "relationship#create", as: :create_relationship
     post "/destroy_relationship", to: "relationship#destroy", as: :destroy_relationship
-    post "/create_smile", to: "smile#create", as: :create_smile
-    post "/destroy_smile", to: "smile#destroy", as: :destroy_smile
-    post "/create_comment_smile", to: "smile#create_comment", as: :create_comment_smile
-    post "/destroy_comment_smile", to: "smile#destroy_comment", as: :destroy_comment_smile
     post "/create_comment", to: "comment#create", as: :create_comment
     post "/destroy_comment", to: "comment#destroy", as: :destroy_comment
     post "/report", to: "report#create", as: :report
diff --git a/spec/controllers/ajax/smile_controller_spec.rb b/spec/controllers/ajax/smile_controller_spec.rb
deleted file mode 100644
index c457e19f..00000000
--- a/spec/controllers/ajax/smile_controller_spec.rb
+++ /dev/null
@@ -1,340 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe Ajax::SmileController, :ajax_controller, type: :controller do
-  describe "#create" do
-    let(:params) do
-      {
-        id: answer_id
-      }.compact
-    end
-    let(:answer) { FactoryBot.create(:answer, user: user) }
-
-    subject { post(:create, params: params) }
-
-    context "when user is signed in" do
-      before(:each) { sign_in(user) }
-
-      context "when answer exists" do
-        let(:answer_id) { answer.id }
-        let(:expected_response) do
-          {
-            "success" => true,
-            "status" => "okay",
-            "message" => anything
-          }
-        end
-
-        it "creates a smile to the answer" do
-          expect { subject }.to(change { Reaction.count }.by(1))
-          expect(answer.reload.smiles.ids).to include(Reaction.last.id)
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when answer does not exist" do
-        let(:answer_id) { "nein!" }
-
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status" => anything,
-            "message" => anything
-          }
-        end
-
-        it "does not create a smile" do
-          expect { subject }.not_to(change { Reaction.count })
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when some parameters are missing" do
-        let(:answer_id) { nil }
-
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status" => "parameter_error",
-            "message" => anything
-          }
-        end
-
-        include_examples "returns the expected response"
-      end
-    end
-
-    context "when user is not signed in" do
-      let(:answer_id) { answer.id }
-
-      let(:expected_response) do
-        {
-          "success" => false,
-          "status" => "fail",
-          "message" => anything
-        }
-      end
-
-      include_examples "returns the expected response"
-    end
-
-    context "when blocked by the answer's author" do
-      let(:other_user) { FactoryBot.create(:user) }
-      let(:answer) { FactoryBot.create(:answer, user: other_user) }
-      let(:answer_id) { answer.id }
-
-      before do
-        other_user.block(user)
-      end
-
-      let(:expected_response) do
-        {
-          "success" => false,
-          "status"  => "fail",
-          "message" => anything
-        }
-      end
-
-      it "does not create a smile" do
-        expect { subject }.not_to(change { Reaction.count })
-      end
-
-      include_examples "returns the expected response"
-    end
-
-    context "when blocking the answer's author" do
-      let(:other_user) { FactoryBot.create(:user) }
-      let(:answer) { FactoryBot.create(:answer, user: user) }
-      let(:answer_id) { answer.id }
-
-      before do
-        user.block(other_user)
-      end
-
-      let(:expected_response) do
-        {
-          "success" => false,
-          "status"  => "fail",
-          "message" => anything
-        }
-      end
-
-      it "does not create a smile" do
-        expect { subject }.not_to(change { Reaction.count })
-      end
-
-      include_examples "returns the expected response"
-    end
-  end
-
-  describe "#destroy" do
-    let(:answer) { FactoryBot.create(:answer, user: user) }
-    let(:smile) { FactoryBot.create(:smile, user: user, parent: answer) }
-    let(:answer_id) { answer.id }
-
-    let(:params) do
-      {
-        id: answer_id
-      }
-    end
-
-    subject { delete(:destroy, params: params) }
-
-    context "when user is signed in" do
-      before(:each) { sign_in(user) }
-
-      context "when the smile exists" do
-        # ensure we already have it in the db
-        before(:each) { smile }
-
-        let(:expected_response) do
-          {
-            "success" => true,
-            "status" => "okay",
-            "message" => anything
-          }
-        end
-
-        it "deletes the smile" do
-          expect { subject }.to(change { Reaction.count }.by(-1))
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when the smile does not exist" do
-        let(:answer_id) { "sonic_the_hedgehog" }
-
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status" => anything,
-            "message" => anything
-          }
-        end
-
-        include_examples "returns the expected response"
-      end
-    end
-
-    context "when user is not signed in" do
-      let(:expected_response) do
-        {
-          "success" => false,
-          "status" => "fail",
-          "message" => anything
-        }
-      end
-
-      include_examples "returns the expected response"
-    end
-  end
-
-  describe "#create_comment" do
-    let(:params) do
-      {
-        id: comment_id
-      }.compact
-    end
-    let(:answer) { FactoryBot.create(:answer, user: user) }
-    let(:comment) { FactoryBot.create(:comment, user: user, answer: answer) }
-
-    subject { post(:create_comment, params: params) }
-
-    context "when user is signed in" do
-      before(:each) { sign_in(user) }
-
-      context "when comment exists" do
-        let(:comment_id) { comment.id }
-        let(:expected_response) do
-          {
-            "success" => true,
-            "status" => "okay",
-            "message" => anything
-          }
-        end
-
-        it "creates a smile to the comment" do
-          expect { subject }.to(change { Reaction.count }.by(1))
-          expect(comment.reload.smiles.ids).to include(Reaction.last.id)
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when comment does not exist" do
-        let(:comment_id) { "nein!" }
-
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status" => anything,
-            "message" => anything
-          }
-        end
-
-        it "does not create a smile" do
-          expect { subject }.not_to(change { Reaction.count })
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when some parameters are missing" do
-        let(:comment_id) { nil }
-
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status" => "parameter_error",
-            "message" => anything
-          }
-        end
-
-        include_examples "returns the expected response"
-      end
-    end
-
-    context "when user is not signed in" do
-      let(:comment_id) { comment.id }
-
-      let(:expected_response) do
-        {
-          "success" => false,
-          "status" => "fail",
-          "message" => anything
-        }
-      end
-
-      include_examples "returns the expected response"
-    end
-  end
-
-  describe "#destroy_comment" do
-    let(:answer) { FactoryBot.create(:answer, user: user) }
-    let(:comment) { FactoryBot.create(:comment, user: user, answer: answer) }
-    let(:comment_smile) { FactoryBot.create(:comment_smile, user: user, parent: comment) }
-    let(:comment_id) { comment.id }
-
-    let(:params) do
-      {
-        id: comment_id
-      }
-    end
-
-    subject { delete(:destroy_comment, params: params) }
-
-    context "when user is signed in" do
-      before(:each) { sign_in(user) }
-
-      context "when the smile exists" do
-        # ensure we already have it in the db
-        before(:each) { comment_smile }
-
-        let(:expected_response) do
-          {
-            "success" => true,
-            "status" => "okay",
-            "message" => anything
-          }
-        end
-
-        it "deletes the smile" do
-          expect { subject }.to(change { Reaction.count }.by(-1))
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when the smile does not exist" do
-        let(:answer_id) { "sonic_the_hedgehog" }
-
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status" => anything,
-            "message" => anything
-          }
-        end
-
-        include_examples "returns the expected response"
-      end
-    end
-
-    context "when user is not signed in" do
-      let(:expected_response) do
-        {
-          "success" => false,
-          "status" => "fail",
-          "message" => anything
-        }
-      end
-
-      include_examples "returns the expected response"
-    end
-  end
-end

From e3187638016f720007d2b78b3f7b8a493b8b406a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 31 Oct 2023 23:33:30 +0100
Subject: [PATCH 258/590] Remove legacy smile TypeScript functionality

---
 .../features/answerbox/comment/index.ts       |  2 -
 .../features/answerbox/comment/smile.ts       | 59 -------------------
 .../retrospring/features/answerbox/index.ts   |  2 -
 .../retrospring/features/answerbox/smile.ts   | 59 -------------------
 4 files changed, 122 deletions(-)
 delete mode 100644 app/javascript/retrospring/features/answerbox/comment/smile.ts
 delete mode 100644 app/javascript/retrospring/features/answerbox/smile.ts

diff --git a/app/javascript/retrospring/features/answerbox/comment/index.ts b/app/javascript/retrospring/features/answerbox/comment/index.ts
index 3e5a0f81..649ec286 100644
--- a/app/javascript/retrospring/features/answerbox/comment/index.ts
+++ b/app/javascript/retrospring/features/answerbox/comment/index.ts
@@ -2,7 +2,6 @@ import registerEvents from "retrospring/utilities/registerEvents";
 import { commentDestroyHandler } from "./destroy";
 import { commentComposeEnd, commentComposeStart, commentCreateClickHandler, commentCreateKeyboardHandler } from "./new";
 import { commentReportHandler } from "./report";
-import { commentSmileHandler } from "./smile";
 import { commentToggleHandler } from "./toggle";
 import { commentHotkeyHandler } from "retrospring/features/answerbox/comment/hotkey";
 
@@ -10,7 +9,6 @@ export default (): void => {
   registerEvents([
     { type: 'click', target: '[name=ab-comments]', handler: commentToggleHandler, global: true },
     { type: 'click', target: '[name=ab-open-and-comment]', handler: commentHotkeyHandler, global: true },
-    { type: 'click', target: '[name=ab-smile-comment]', handler: commentSmileHandler, global: true },
     { type: 'click', target: '[data-action=ab-comment-report]', handler: commentReportHandler, global: true },
     { type: 'click', target: '[data-action=ab-comment-destroy]', handler: commentDestroyHandler, global: true },
     { type: 'compositionstart', target: '[name=ab-comment-new]', handler: commentComposeStart, global: true },
diff --git a/app/javascript/retrospring/features/answerbox/comment/smile.ts b/app/javascript/retrospring/features/answerbox/comment/smile.ts
deleted file mode 100644
index b80d5bd5..00000000
--- a/app/javascript/retrospring/features/answerbox/comment/smile.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { post } from '@rails/request.js'; 
-
-import I18n from 'retrospring/i18n';
-import { showNotification, showErrorNotification } from 'utilities/notifications';
-
-export function commentSmileHandler(event: Event): void {
-  const button = event.target as HTMLButtonElement;
-  const id = button.dataset.cId;
-  const action = button.dataset.action;
-  let count = Number(document.querySelector(`#ab-comment-smile-count-${id}`).innerHTML);
-  let success = false;
-  let targetUrl;
-
-  if (action === 'smile') {
-    count++;
-    targetUrl = '/ajax/create_comment_smile';
-  }
-  else if (action === 'unsmile') {
-    count--;
-    targetUrl = '/ajax/destroy_comment_smile';
-  }
-
-  button.disabled = true;
-
-  post(targetUrl, {
-    body: {
-      id: id
-    },
-    contentType: 'application/json'
-  })
-    .then(async response => {
-      const data = await response.json;
-
-      success = data.success;
-      if (success) {
-        document.querySelector(`#ab-comment-smile-count-${id}`).innerHTML = String(count);
-      }
-
-      showNotification(data.message, data.success);
-    })
-    .catch(err => {
-      console.log(err);
-      showErrorNotification(I18n.translate('frontend.error.message'));
-    })
-    .finally(() => {
-      button.disabled = false;
-
-      if (success) {
-        switch(action) {
-          case 'smile':
-            button.dataset.action = 'unsmile';
-            break;
-          case 'unsmile':
-            button.dataset.action = 'smile';
-            break;
-        }
-      }
-    });
-}
\ No newline at end of file
diff --git a/app/javascript/retrospring/features/answerbox/index.ts b/app/javascript/retrospring/features/answerbox/index.ts
index cf088f8b..423d9ef4 100644
--- a/app/javascript/retrospring/features/answerbox/index.ts
+++ b/app/javascript/retrospring/features/answerbox/index.ts
@@ -2,13 +2,11 @@ import registerEvents from 'utilities/registerEvents';
 import registerAnswerboxCommentEvents from './comment';
 import { answerboxDestroyHandler } from './destroy';
 import { answerboxReportHandler } from './report';
-import { answerboxSmileHandler } from './smile';
 
 export default (): void => {
   registerEvents([
     { type: 'click', target: '[data-action=ab-report]', handler: answerboxReportHandler, global: true },
     { type: 'click', target: '[data-action=ab-destroy]', handler: answerboxDestroyHandler, global: true },
-    { type: 'click', target: '[name=ab-smile]', handler: answerboxSmileHandler, global: true }
   ]);
 
   registerAnswerboxCommentEvents();
diff --git a/app/javascript/retrospring/features/answerbox/smile.ts b/app/javascript/retrospring/features/answerbox/smile.ts
deleted file mode 100644
index fc154b0d..00000000
--- a/app/javascript/retrospring/features/answerbox/smile.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { post } from '@rails/request.js';
-
-import I18n from 'retrospring/i18n';
-import { showNotification, showErrorNotification } from 'utilities/notifications';
-
-export function answerboxSmileHandler(event: Event): void {
-  const button = event.target as HTMLButtonElement;
-  const id = button.dataset.aId;
-  const action = button.dataset.action;
-  let count = Number(document.querySelector(`#ab-smile-count-${id}`).innerHTML);
-  let success = false;
-  let targetUrl;
-
-  if (action === 'smile') {
-    count++;
-    targetUrl = '/ajax/create_smile';
-  }
-  else if (action === 'unsmile') {
-    count--;
-    targetUrl = '/ajax/destroy_smile';
-  }
-
-  button.disabled = true;
-
-  post(targetUrl, {
-    body: {
-      id: id
-    },
-    contentType: 'application/json'
-  })
-    .then(async response => {
-      const data = await response.json;
-
-      success = data.success;
-      if (success) {
-        document.querySelector(`#ab-smile-count-${id}`).innerHTML = String(count);
-      }
-
-      showNotification(data.message, data.success);
-    })
-    .catch(err => {
-      console.log(err);
-      showErrorNotification(I18n.translate('frontend.error.message'));
-    })
-    .finally(() => {
-      button.disabled = false;
-
-      if (success) {
-        switch(action) {
-          case 'smile':
-            button.dataset.action = 'unsmile';
-            break;
-          case 'unsmile':
-            button.dataset.action = 'smile';
-            break;
-        }
-      }
-    });
-}
\ No newline at end of file

From a00d268f56ffd00839a98cd3177ce9ce0deec083 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 5 Nov 2023 11:16:11 +0100
Subject: [PATCH 259/590] Move target class code into a private method

---
 app/controllers/reactions_controller.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/controllers/reactions_controller.rb b/app/controllers/reactions_controller.rb
index 350df903..5e0384e7 100644
--- a/app/controllers/reactions_controller.rb
+++ b/app/controllers/reactions_controller.rb
@@ -15,9 +15,8 @@ class ReactionsController < ApplicationController
 
   def create
     params.require :id
-    params.require :type
 
-    target = params[:type].constantize.find_by!(id: params[:id])
+    target = target_class.find_by!(id: params[:id])
 
     UseCase::Reaction::Create.call(
       source_user: current_user,
@@ -40,9 +39,8 @@ class ReactionsController < ApplicationController
 
   def destroy
     params.require :id
-    params.require :type
 
-    target = params[:type].constantize.find_by!(id: params[:id])
+    target = target_class.find_by!(id: params[:id])
 
     UseCase::Reaction::Destroy.call(
       source_user: current_user,
@@ -62,4 +60,16 @@ class ReactionsController < ApplicationController
       format.html { redirect_back(fallback_location: root_path) }
     end
   end
+
+  private
+
+  ALLOWED_TYPES = %w[Answer Comment].freeze
+  private_constant :ALLOWED_TYPES
+
+  def target_class
+    params.require :type
+    raise NameError unless ALLOWED_TYPES.include?(params[:type])
+
+    params[:type].constantize
+  end
 end

From 9ce68bffb227023ecb8ff324eb48f4bba1ebd30d Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 5 Nov 2023 11:16:28 +0100
Subject: [PATCH 260/590] Fix answerbox comments view specs

---
 spec/views/answerbox/_comments.html.haml_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/views/answerbox/_comments.html.haml_spec.rb b/spec/views/answerbox/_comments.html.haml_spec.rb
index 3af138d6..cdf2d46f 100644
--- a/spec/views/answerbox/_comments.html.haml_spec.rb
+++ b/spec/views/answerbox/_comments.html.haml_spec.rb
@@ -78,7 +78,7 @@ describe "answerbox/_comments.html.haml", type: :view do
 
     it "shows the correct number of smiles" do
       html = Nokogiri::HTML.parse(rendered)
-      selector = %(li.comment[data-comment-id="#{comment.id}"] button[data-action="smile"]>span)
+      selector = %(li.comment[data-comment-id="#{comment.id}"] button.smile>span)
       expect(html.css(selector).text).to eq("5")
     end
   end
@@ -94,7 +94,7 @@ describe "answerbox/_comments.html.haml", type: :view do
 
     it "displays the comment as smiled" do
       html = Nokogiri::HTML.parse(rendered)
-      selector = %(li.comment[data-comment-id="#{comment.id}"] button[data-action="unsmile"])
+      selector = %(li.comment[data-comment-id="#{comment.id}"] button.unsmile)
       expect(html.css(selector)).to_not be_empty
     end
   end

From 8ddfcef25966aacf47a93c1dc346589b5dc170fb Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 5 Nov 2023 11:45:51 +0100
Subject: [PATCH 261/590] Fix rubocop nits

---
 app/controllers/reactions_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/reactions_controller.rb b/app/controllers/reactions_controller.rb
index 5e0384e7..215adf27 100644
--- a/app/controllers/reactions_controller.rb
+++ b/app/controllers/reactions_controller.rb
@@ -16,11 +16,11 @@ class ReactionsController < ApplicationController
   def create
     params.require :id
 
-    target = target_class.find_by!(id: params[:id])
+    target = target_class.find(params[:id])
 
     UseCase::Reaction::Create.call(
       source_user: current_user,
-      target:
+      target:,
     )
 
     target.reload
@@ -40,11 +40,11 @@ class ReactionsController < ApplicationController
   def destroy
     params.require :id
 
-    target = target_class.find_by!(id: params[:id])
+    target = target_class.find(params[:id])
 
     UseCase::Reaction::Destroy.call(
       source_user: current_user,
-      target:
+      target:,
     )
 
     target.reload

From 93958cb9fd4fc2806792cb256515f7bf0e7692c4 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 5 Nov 2023 13:10:21 +0100
Subject: [PATCH 262/590] Throw error when unsmile target reaction doesn't
 exist

---
 app/models/user/reaction_methods.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user/reaction_methods.rb b/app/models/user/reaction_methods.rb
index e721b34c..381dc000 100644
--- a/app/models/user/reaction_methods.rb
+++ b/app/models/user/reaction_methods.rb
@@ -13,7 +13,7 @@ module User::ReactionMethods
   # unsmile an answer or comment
   # @param item [ApplicationRecord] the answer/comment to unsmile
   def unsmile(item)
-    Reaction.find_by(user: self, parent: item).destroy
+    Reaction.find_by!(user: self, parent: item).destroy
   end
 
   def smiled?(item)

From 796a84811027799da9b4840d272b86e31f41044c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 5 Nov 2023 13:10:39 +0100
Subject: [PATCH 263/590] Add specs for reaction controller create/destroy
 methods

---
 spec/controllers/reactions_controller_spec.rb | 177 ++++++++++++++++++
 1 file changed, 177 insertions(+)

diff --git a/spec/controllers/reactions_controller_spec.rb b/spec/controllers/reactions_controller_spec.rb
index e5e7ede5..1f391e40 100644
--- a/spec/controllers/reactions_controller_spec.rb
+++ b/spec/controllers/reactions_controller_spec.rb
@@ -3,6 +3,8 @@
 require "rails_helper"
 
 describe ReactionsController, type: :controller do
+  render_views
+
   describe "#index" do
     shared_examples_for "succeeds" do
       it "returns the correct response" do
@@ -29,6 +31,181 @@ describe ReactionsController, type: :controller do
         include_examples "succeeds"
       end
     end
+  end
 
+  describe "#create" do
+    let(:user) { FactoryBot.create(:user) }
+
+    context "target type is Answer" do
+      let(:params) do
+        {
+          username: user.screen_name,
+          id:       answer_id,
+          type:     "Answer",
+        }.compact
+      end
+      let(:answer) { FactoryBot.create(:answer, user:) }
+
+      subject { post(:create, params:, format: :turbo_stream) }
+
+      context "when user is signed in" do
+        before(:each) { sign_in(user) }
+
+        context "when answer exists" do
+          let(:answer_id) { answer.id }
+
+          it "creates a reaction to the answer" do
+            expect { subject }.to(change { Reaction.count }.by(1))
+            expect(answer.reload.smiles.ids).to include(Reaction.last.id)
+          end
+        end
+
+        context "when answer does not exist" do
+          let(:answer_id) { "nein!" }
+
+          it "does not create a reaction" do
+            expect { subject }.not_to(change { Reaction.count })
+          end
+        end
+      end
+
+      context "when blocked by the answer's author" do
+        let(:other_user) { FactoryBot.create(:user) }
+        let(:answer) { FactoryBot.create(:answer, user: other_user) }
+        let(:answer_id) { answer.id }
+
+        before do
+          other_user.block(user)
+        end
+
+        it "does not create a reaction" do
+          expect { subject }.not_to(change { Reaction.count })
+        end
+      end
+
+      context "when blocking the answer's author" do
+        let(:other_user) { FactoryBot.create(:user) }
+        let(:answer) { FactoryBot.create(:answer, user:) }
+        let(:answer_id) { answer.id }
+
+        before do
+          user.block(other_user)
+        end
+
+        it "does not create a reaction" do
+          expect { subject }.not_to(change { Reaction.count })
+        end
+      end
+    end
+
+    context "target type is Comment" do
+      let(:params) do
+        {
+          username: user.screen_name,
+          id:       comment_id,
+          type:     "Comment",
+        }.compact
+      end
+      let(:answer) { FactoryBot.create(:answer, user:) }
+      let(:comment) { FactoryBot.create(:comment, user:, answer:) }
+
+      subject { post(:create, params:, format: :turbo_stream) }
+
+      context "when user is signed in" do
+        before(:each) { sign_in(user) }
+
+        context "when comment exists" do
+          let(:comment_id) { comment.id }
+
+          it "creates a smile to the comment" do
+            expect { subject }.to(change { Reaction.count }.by(1))
+            expect(comment.reload.smiles.ids).to include(Reaction.last.id)
+          end
+        end
+
+        context "when comment does not exist" do
+          let(:comment_id) { "nein!" }
+
+          it "does not create a smile" do
+            expect { subject }.not_to(change { Reaction.count })
+          end
+        end
+      end
+    end
+  end
+
+  describe "#destroy" do
+    let(:user) { FactoryBot.create(:user) }
+
+    context "target type is Answer" do
+      let(:answer) { FactoryBot.create(:answer, user:) }
+      let(:smile) { FactoryBot.create(:smile, user:, parent: answer) }
+      let(:answer_id) { answer.id }
+
+      let(:params) do
+        {
+          username: user.screen_name,
+          id:       answer_id,
+          type:     "Answer",
+        }
+      end
+
+      subject { delete(:destroy, params:, format: :turbo_stream) }
+
+      context "when user is signed in" do
+        before(:each) { sign_in(user) }
+
+        context "when the smile exists" do
+          # ensure we already have it in the db
+          before(:each) { smile }
+
+          it "deletes the reaction" do
+            expect { subject }.to(change { Reaction.count }.by(-1))
+          end
+        end
+
+        context "when the reaction does not exist" do
+          let(:answer_id) { "sonic_the_hedgehog" }
+
+          include_examples "turbo does not succeed", "Record not found"
+        end
+      end
+    end
+
+    context "target type is Comment" do
+      let(:answer) { FactoryBot.create(:answer, user:) }
+      let(:comment) { FactoryBot.create(:comment, user:, answer:) }
+      let(:comment_smile) { FactoryBot.create(:comment_smile, user:, parent: comment) }
+      let(:comment_id) { comment.id }
+
+      let(:params) do
+        {
+          username: user.screen_name,
+          id:       comment_id,
+          type:     "Comment",
+        }
+      end
+
+      subject { delete(:destroy, params:, format: :turbo_stream) }
+
+      context "when user is signed in" do
+        before(:each) { sign_in(user) }
+
+        context "when the reaction exists" do
+          # ensure we already have it in the db
+          before(:each) { comment_smile }
+
+          it "deletes the reaction" do
+            expect { subject }.to(change { Reaction.count }.by(-1))
+          end
+        end
+
+        context "when the reaction does not exist" do
+          let(:answer_id) { "sonic_the_hedgehog" }
+
+          include_examples "turbo does not succeed", "Record not found"
+        end
+      end
+    end
   end
 end

From 7f86fb25006eaaa01fbcb7980b34f308e874e59c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 9 Dec 2023 00:40:46 +0100
Subject: [PATCH 264/590] Add locales for reactions controller actions

---
 config/locales/controllers.en.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/config/locales/controllers.en.yml b/config/locales/controllers.en.yml
index 684b7f19..a47878c0 100644
--- a/config/locales/controllers.en.yml
+++ b/config/locales/controllers.en.yml
@@ -107,19 +107,6 @@ en:
         unknown: "You can't report this entity."
         notfound: "Could not find %{parameter}"
         success: "%{parameter} reported.  A moderator will decide what happens with the %{parameter}."
-    smile:
-      create:
-        success: "Successfully smiled answer."
-        error: "You have already smiled that answer."
-      create_comment:
-        success: "Successfully smiled comment."
-        error: "You have already smiled that comment."
-      destroy:
-        success: "Successfully unsmiled answer."
-        error: "You have not smiled that answer."
-      destroy_comment:
-        success: "Successfully unsmiled comment."
-        error: "You have not smiled that comment."
     web_push:
       subscription_count:
         zero: "You are not currently subscribed to push notifications on any devices."
@@ -195,6 +182,21 @@ en:
     registrations:
       destroy:
         export_pending: "You may not delete your account while account data is currently being exported."
+  reactions:
+    create:
+      answer:
+        success: "Successfully smiled answer."
+        error: "You have already smiled that answer."
+      comment:
+        success: "Successfully smiled comment."
+        error: "You have already smiled that comment."
+    destroy:
+      answer:
+        success: "Successfully unsmiled answer."
+        error: "You have not smiled that answer."
+      comment:
+        success: "Successfully unsmiled comment."
+        error: "You have not smiled that comment."
   relationships:
     create:
       block:

From b421f1d14962d49b33866f24b93f610d640f3650 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 9 Dec 2023 01:14:53 +0100
Subject: [PATCH 265/590] Bump version to 2023.1209.0

---
 lib/retrospring/version.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index b14021c0..3bff2a80 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -15,11 +15,11 @@ module Retrospring
 
     def year = 2023
 
-    def month = 10
+    def month = 12
 
-    def day = 28
+    def day = 9
 
-    def patch = 1
+    def patch = 0
 
     def suffix = ""
 

From df1832dc5a603fb3f0725b7ab51e9500424e9440 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 9 Dec 2023 14:05:42 +0100
Subject: [PATCH 266/590] Fix NameError in Discover

---
 app/controllers/discover_controller.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/discover_controller.rb b/app/controllers/discover_controller.rb
index 05779d99..dfa8eaa7 100644
--- a/app/controllers/discover_controller.rb
+++ b/app/controllers/discover_controller.rb
@@ -6,17 +6,18 @@ class DiscoverController < ApplicationController
       return redirect_to root_path
     end
 
-    top_x = 10  # only display the top X items
+    top_x = 10 # only display the top X items
+    week_ago = Time.now.utc.ago(1.week)
 
-    @popular_answers = Answer.for_user(current_user).where("created_at > ?", Time.now.utc.ago(1.week)).order(:smile_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
-    @most_discussed = Answer.for_user(current_user).where("created_at > ?", Time.now.utc.ago(1.week)).order(:comment_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
-    @popular_questions = Question.where("created_at > ?", Time.now.ago(1.week)).order(:answer_count).reverse_order.limit(top_x).includes(:user)
+    @popular_answers = Answer.for_user(current_user).where("created_at > ?", week_ago).order(:smile_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
+    @most_discussed = Answer.for_user(current_user).where("created_at > ?", week_ago).order(:comment_count).reverse_order.limit(top_x).includes(:question, :user, :comments)
+    @popular_questions = Question.where("created_at > ?", week_ago).order(:answer_count).reverse_order.limit(top_x).includes(:user)
     @new_users = User.where("asked_count > 0").order(:id).reverse_order.limit(top_x).includes(:profile)
 
     # .user = the user
     # .question_count = how many questions did the user ask
     @users_with_most_questions = Question.select('user_id, COUNT(*) AS question_count').
-        where("created_at > ?", Time.now.ago(1.week)).
+        where("created_at > ?", week_ago).
         where(author_is_anonymous: false).
         group(:user_id).
         order('question_count').

From 8589ebf2d713004a0a657dbafe35b145c911032b Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 9 Dec 2023 14:05:59 +0100
Subject: [PATCH 267/590] Reformat `DiscoverController`

---
 app/controllers/discover_controller.rb | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/controllers/discover_controller.rb b/app/controllers/discover_controller.rb
index dfa8eaa7..5898875d 100644
--- a/app/controllers/discover_controller.rb
+++ b/app/controllers/discover_controller.rb
@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 class DiscoverController < ApplicationController
   before_action :authenticate_user!
 
   def index
-    unless APP_CONFIG.dig(:features, :discover, :enabled) || current_user.mod?
-      return redirect_to root_path
-    end
+    return redirect_to root_path unless APP_CONFIG.dig(:features, :discover, :enabled) || current_user.mod?
 
     top_x = 10 # only display the top X items
     week_ago = Time.now.utc.ago(1.week)
@@ -16,19 +16,19 @@ class DiscoverController < ApplicationController
 
     # .user = the user
     # .question_count = how many questions did the user ask
-    @users_with_most_questions = Question.select('user_id, COUNT(*) AS question_count').
-        where("created_at > ?", week_ago).
-        where(author_is_anonymous: false).
-        group(:user_id).
-        order('question_count').
-        reverse_order.limit(top_x)
+    @users_with_most_questions = Question.select("user_id, COUNT(*) AS question_count")
+                                         .where("created_at > ?", week_ago)
+                                         .where(author_is_anonymous: false)
+                                         .group(:user_id)
+                                         .order("question_count")
+                                         .reverse_order.limit(top_x)
 
     # .user = the user
     # .answer_count = how many questions did the user answer
-    @users_with_most_answers = Answer.select('user_id, COUNT(*) AS answer_count').
-        where("created_at > ?", week_ago).
-        group(:user_id).
-        order('answer_count').
-        reverse_order.limit(top_x)
+    @users_with_most_answers = Answer.select("user_id, COUNT(*) AS answer_count")
+                                     .where("created_at > ?", week_ago)
+                                     .group(:user_id)
+                                     .order("answer_count")
+                                     .reverse_order.limit(top_x)
   end
 end

From 13d69cfd432335e0679a5eabbdaa7311d54e0caf Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 9 Dec 2023 18:05:50 +0100
Subject: [PATCH 268/590] Fix render error on answer create

---
 app/controllers/ajax/answer_controller.rb | 6 ++++--
 app/models/answer.rb                      | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/ajax/answer_controller.rb b/app/controllers/ajax/answer_controller.rb
index 65f8f29d..95651568 100644
--- a/app/controllers/ajax/answer_controller.rb
+++ b/app/controllers/ajax/answer_controller.rb
@@ -44,9 +44,11 @@ class Ajax::AnswerController < AjaxController
 
     return if inbox
 
-    # this assign is needed because shared/_answerbox relies on it, I think
+    # these assigns are needed because shared/_answerbox rely on them
+    answer.has_reacted = false
+    answer.is_subscribed = false
     @question = 1
-    @response[:render] = render_to_string(partial: "answerbox", locals: { a: answer, show_question: false, subscribed_answer_ids: [answer.id] })
+    @response[:render] = render_to_string(partial: "answerbox", locals: { a: answer, show_question: false })
   end
 
   def destroy
diff --git a/app/models/answer.rb b/app/models/answer.rb
index e115e9a1..f13880f9 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -1,6 +1,8 @@
 class Answer < ApplicationRecord
   extend Answer::TimelineMethods
 
+  attr_accessor :has_reacted, :is_subscribed
+
   belongs_to :user, counter_cache: :answered_count
   belongs_to :question, counter_cache: :answer_count
   has_many :comments, dependent: :destroy

From a27e995179ab228f31bd3e556dde8e307b0448e7 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 9 Dec 2023 18:25:01 +0100
Subject: [PATCH 269/590] Add spacing to sharing buttons

---
 app/views/inbox/_entry.html.haml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 68a55601..b58e7a8f 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -21,22 +21,22 @@
         .align-self-center
           %p.fs-3.fw-bold= t(".sharing.heading")
           %p
-            %a.btn.btn-primary{ href: "https://twitter.com/intent/tweet?text=", data: { inbox_sharing_target: "twitter" }, target: "_blank" }
+            %a.btn.btn-primary.mb-1{ href: "https://twitter.com/intent/tweet?text=", data: { inbox_sharing_target: "twitter" }, target: "_blank" }
               %i.fab.fa-twitter.fa-fw
               Twitter
-            %a.btn.btn-primary{ href: "#", data: { inbox_sharing_target: "tumblr" }, target: "_blank" }
+            %a.btn.btn-primary.mb-1{ href: "#", data: { inbox_sharing_target: "tumblr" }, target: "_blank" }
               %i.fab.fa-tumblr.fa-fw
               Tumblr
-            %a.btn.btn-primary{ href: "#", data: { inbox_sharing_target: "telegram" }, target: "_blank" }
+            %a.btn.btn-primary.mb-1{ href: "#", data: { inbox_sharing_target: "telegram" }, target: "_blank" }
               %i.fab.fa-telegram.fa-fw
               Telegram
             %a.btn.btn-primary{ data: { controller: :clipboard, action: "clipboard#copy", inbox_sharing_target: "clipboard" } }
               %i.fa.fa-fw.fa-solid.fa-copy
               = t("actions.share.copy")
-            %button.btn.btn-primary{ data: { controller: "share", action: "share#share", inbox_sharing_target: "other" } }
+            %button.btn.btn-primary.mb-1{ data: { controller: "share", action: "share#share", inbox_sharing_target: "other" } }
               %i.fa.fa-fw.fa-share-alt
               = t("actions.share.other")
             - if current_user.sharing_custom_url.present?
-              %a.btn.btn-primary{ href: current_user.sharing_custom_url, data: { inbox_sharing_target: "custom" }, target: "_blank" }
+              %a.btn.btn-primary.mb-1{ href: current_user.sharing_custom_url, data: { inbox_sharing_target: "custom" }, target: "_blank" }
                 = current_user.display_sharing_custom_url
           %p.text-muted= t(".sharing.hint_html", settings: link_to(t(".sharing.settings"), settings_sharing_path))

From ed500da939275d151cc1476d137581926af2135d Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 9 Dec 2023 18:25:23 +0100
Subject: [PATCH 270/590] Make copy-to-clipboard a button instead of a link

---
 app/views/inbox/_entry.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index b58e7a8f..85610e65 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -30,7 +30,7 @@
             %a.btn.btn-primary.mb-1{ href: "#", data: { inbox_sharing_target: "telegram" }, target: "_blank" }
               %i.fab.fa-telegram.fa-fw
               Telegram
-            %a.btn.btn-primary{ data: { controller: :clipboard, action: "clipboard#copy", inbox_sharing_target: "clipboard" } }
+            %button.btn.btn-primary.mb-1{ data: { controller: :clipboard, action: "clipboard#copy", inbox_sharing_target: "clipboard" } }
               %i.fa.fa-fw.fa-solid.fa-copy
               = t("actions.share.copy")
             %button.btn.btn-primary.mb-1{ data: { controller: "share", action: "share#share", inbox_sharing_target: "other" } }

From 11535a17a3d6b885bd1481d0cd2f2463de16d62b Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 9 Dec 2023 18:53:52 +0100
Subject: [PATCH 271/590] Adjust inbox entry view spec

---
 spec/views/inbox/_entry.html.haml_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/views/inbox/_entry.html.haml_spec.rb b/spec/views/inbox/_entry.html.haml_spec.rb
index 02dd3559..c525284f 100644
--- a/spec/views/inbox/_entry.html.haml_spec.rb
+++ b/spec/views/inbox/_entry.html.haml_spec.rb
@@ -96,7 +96,7 @@ describe "inbox/_entry.html.haml", type: :view do
 
   it "has a link-button to copy to clipboard" do
     expected_attribute_selectors = %([data-controller="clipboard"][data-action="clipboard#copy"][data-inbox-sharing-target="clipboard"])
-    expect(rendered).to have_css(%(.inbox-entry__sharing a.btn#{expected_attribute_selectors}))
+    expect(rendered).to have_css(%(.inbox-entry__sharing button.btn#{expected_attribute_selectors}))
   end
 
   it "does not have a link-button to share to a custom site" do

From 68ffa36f7a49ce546bc0fca7e300a5bd341b68b8 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 9 Dec 2023 22:27:20 +0100
Subject: [PATCH 272/590] Add index for `user_bans.user_id`

---
 .../20231209212629_add_index_on_user_bans_user_id.rb       | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 db/migrate/20231209212629_add_index_on_user_bans_user_id.rb

diff --git a/db/migrate/20231209212629_add_index_on_user_bans_user_id.rb b/db/migrate/20231209212629_add_index_on_user_bans_user_id.rb
new file mode 100644
index 00000000..cb6101d9
--- /dev/null
+++ b/db/migrate/20231209212629_add_index_on_user_bans_user_id.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIndexOnUserBansUserId < ActiveRecord::Migration[7.0]
+  def change
+    add_index :user_bans, :user_id
+  end
+end

From fda397777e2c8049ea0e5d7b45f8bd47066eaa7f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 9 Dec 2023 22:50:46 +0100
Subject: [PATCH 273/590] Fix layout of "Show all questions from this user"
 page

---
 app/views/moderation/questions/_header.html.haml | 2 +-
 app/views/moderation/questions/show.html.haml    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/moderation/questions/_header.html.haml b/app/views/moderation/questions/_header.html.haml
index c8984458..e42f6a4e 100644
--- a/app/views/moderation/questions/_header.html.haml
+++ b/app/views/moderation/questions/_header.html.haml
@@ -1,4 +1,4 @@
-.card.question--fixed{ class: hidden ? 'question--hidden' : '', tabindex: hidden ? -1 : '', aria: { hidden: hidden } }
+.card.question--sticky
   .container
     .card-body
       .d-flex
diff --git a/app/views/moderation/questions/show.html.haml b/app/views/moderation/questions/show.html.haml
index 48617bf2..934ada11 100644
--- a/app/views/moderation/questions/show.html.haml
+++ b/app/views/moderation/questions/show.html.haml
@@ -1,8 +1,7 @@
 - provide(:title, generate_title(t(".title", author_identifier: params[:author_identifier].truncate(32))))
 
-= render "header", author_identifier: params[:author_identifier], hidden: false
-= render "header", author_identifier: params[:author_identifier], hidden: true
+= render "header", author_identifier: params[:author_identifier]
 
-.container-lg.container--main
+.container-lg.question-page
   - @questions.each do |q|
     = render "shared/question", q:, type: "moderation"

From a67668bbd39b617a2e7da59bc490e84ce2bb3d83 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 9 Dec 2023 22:52:27 +0100
Subject: [PATCH 274/590] Add z-index to sticky question header

---
 app/assets/stylesheets/components/_question.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/components/_question.scss b/app/assets/stylesheets/components/_question.scss
index 1a32ded7..491aa3d8 100644
--- a/app/assets/stylesheets/components/_question.scss
+++ b/app/assets/stylesheets/components/_question.scss
@@ -21,6 +21,7 @@
     @include media-breakpoint-up('sm') {
       position: sticky;
       top: $navbar-height;
+      z-index: 1;
     }
   }
 }

From 49d49e4aa4c17f85611860389d31c83d088eda27 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sat, 9 Dec 2023 22:42:44 +0100
Subject: [PATCH 275/590] Update schema.rb

---
 db/schema.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 9578bac6..0bc10764 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_11_07_200845) do
+ActiveRecord::Schema[7.0].define(version: 2023_12_09_212629) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -28,11 +28,11 @@ ActiveRecord::Schema[7.0].define(version: 2023_11_07_200845) do
   end
 
   create_table "anonymous_blocks", force: :cascade do |t|
-    t.bigint "user_id"
     t.string "identifier"
-    t.bigint "question_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "question_id"
+    t.bigint "user_id"
     t.bigint "target_user_id"
     t.index ["identifier"], name: "index_anonymous_blocks_on_identifier"
     t.index ["question_id"], name: "index_anonymous_blocks_on_question_id"
@@ -95,10 +95,10 @@ ActiveRecord::Schema[7.0].define(version: 2023_11_07_200845) do
   end
 
   create_table "mute_rules", id: :bigint, default: -> { "gen_timestamp_id('mute_rules'::text)" }, force: :cascade do |t|
-    t.bigint "user_id"
     t.string "muted_phrase"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.bigint "user_id"
     t.index ["user_id"], name: "index_mute_rules_on_user_id"
   end
 
@@ -183,7 +183,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_11_07_200845) do
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
-    t.index ["resource_type", "resource_id"], name: "index_roles_on_resource_type_and_resource_id"
+    t.index ["resource_type", "resource_id"], name: "index_roles_on_resource"
   end
 
   create_table "rpush_apps", force: :cascade do |t|
@@ -308,6 +308,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_11_07_200845) do
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.index ["expires_at"], name: "index_user_bans_on_expires_at", order: :desc
+    t.index ["user_id"], name: "index_user_bans_on_user_id"
   end
 
   create_table "users", id: :bigint, default: -> { "gen_timestamp_id('users'::text)" }, force: :cascade do |t|

From eb56ab87be9ca8eca989d47c3fc073a027c9b140 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Dec 2023 21:51:26 +0100
Subject: [PATCH 276/590] Add empty hint shared template

---
 app/views/shared/_empty.html.haml | 34 +++++++++++++++++++++++++++++++
 config/locales/views.en.yml       |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 app/views/shared/_empty.html.haml

diff --git a/app/views/shared/_empty.html.haml b/app/views/shared/_empty.html.haml
new file mode 100644
index 00000000..eaf5a353
--- /dev/null
+++ b/app/views/shared/_empty.html.haml
@@ -0,0 +1,34 @@
+- type ||= nil
+.card{ class: type == "inbox" ? "empty" : nil }
+  .card-body.py-5.text-center
+    - if type == "timeline"
+      %p.mb-3
+        %i.fa-regular.fa-comments.icon--showcase.text-muted
+      %h3= t(".timeline.heading")
+      %p= t(".timeline.text")
+      %p
+        %a.btn.btn-primary{ href: inbox_path }= t(".timeline.actions.inbox")
+        %a.btn.btn-default{ href: public_timeline_path }= t(".timeline.actions.public")
+    - elsif type == "inbox"
+      %p.mb-3
+        %i.fa.fa-inbox.icon--showcase.text-muted
+      %h3= t(".inbox.heading")
+      %p= t(".inbox.text")
+      .d-block.d-sm-flex.justify-content-center
+        = button_to inbox_create_path, class: "btn btn-info me-auto" do
+          = t("inbox.actions.questions.button")
+        .button-group.ms-1
+          %button.btn.btn-default{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
+            %i.fa.fa-fw.fa-share-alt
+            %span= t("inbox.actions.share.heading")
+          .dropdown-menu.dropdown-menu-end{ role: :menu }
+            %a.dropdown-item{ href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{user_url(current_user)}", target: "_blank" }
+              %i.fa.fa-fw.fa-twitter
+              = t("inbox.actions.share.button", service: "Twitter")
+            %a.dropdown-item{ href: "https://www.tumblr.com/share/link?url=#{user_url(current_user)}&name=Ask%20me%20anything%21", target: "_blank" }
+              %i.fa.fa-fw.fa-tumblr
+              = t("inbox.actions.share.button", service: "Tumblr")
+    - else
+      %p.mb-3
+        %i.icon--showcase.text-muted{ class: icon }
+      %p= t(translation_key)
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 0b495cfc..deddd4fb 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -572,6 +572,7 @@ en:
       question:
         show: "Show full question"
         hide: "Hide full question"
+    empty:
     formatting:
       body_html: |
         <p>%{app_name} uses <b>Markdown</b> for formatting</p>

From 499b525a0e0055fb0b00a92d6736abf2cf133167 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Dec 2023 21:53:12 +0100
Subject: [PATCH 277/590] Add empty hints for user pages

---
 app/views/user/questions.html.haml   | 3 +++
 app/views/user/show.html.haml        | 3 +++
 app/views/user/show_follow.html.haml | 3 +++
 config/locales/views.en.yml          | 5 +++++
 4 files changed, 14 insertions(+)

diff --git a/app/views/user/questions.html.haml b/app/views/user/questions.html.haml
index aa410ffd..9b94eb34 100644
--- a/app/views/user/questions.html.haml
+++ b/app/views/user/questions.html.haml
@@ -1,4 +1,7 @@
 #questions
+  - if @questions.empty?
+    = render "shared/empty", icon: "fa-regular fa-comment", translation_key: ".user.questions"
+
   - @questions.each do |q|
     = render 'shared/question', q: q, type: nil
 
diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index 98f36de8..40beee3d 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -7,6 +7,9 @@
         = render "answerbox", a:
 
     #answers
+      - if @answers.empty?
+        = render "shared/empty", icon: "fa-regular fa-comments", translation_key: ".user.answers"
+
       - @answers.each do |a|
         = render "answerbox", a:
 
diff --git a/app/views/user/show_follow.html.haml b/app/views/user/show_follow.html.haml
index ca284ab8..1497f1bb 100644
--- a/app/views/user/show_follow.html.haml
+++ b/app/views/user/show_follow.html.haml
@@ -1,3 +1,6 @@
+- if @users.empty?
+  = render "shared/empty", icon: "fa-regular fa-user", translation_key: ".user.#{type}"
+
 .row.row-cols-1.row-cols-sm-2.row-cols-md-3#users
   - @users.each do |user|
     .col.pb-3
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index deddd4fb..dcf921ff 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -573,6 +573,11 @@ en:
         show: "Show full question"
         hide: "Hide full question"
     empty:
+      user:
+        answers: "This user hasn't answered any questions yet."
+        questions: "This user hasn't asked any questions yet."
+        follower: "This user has no followers."
+        friend: "This user is not following anyone."
     formatting:
       body_html: |
         <p>%{app_name} uses <b>Markdown</b> for formatting</p>

From 21ac519120da9fc00fdba62053dfe2551098b29c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Dec 2023 21:53:44 +0100
Subject: [PATCH 278/590] Fix moderation inbox view

---
 app/views/moderation/inbox/_header.html.haml | 2 +-
 app/views/moderation/inbox/index.html.haml   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/moderation/inbox/_header.html.haml b/app/views/moderation/inbox/_header.html.haml
index 14d9f868..830583cb 100644
--- a/app/views/moderation/inbox/_header.html.haml
+++ b/app/views/moderation/inbox/_header.html.haml
@@ -1,4 +1,4 @@
-.card.question--fixed{ class: hidden ? 'question--hidden' : '', tabindex: hidden ? -1 : '', aria: { hidden: hidden } }
+.card.question--sticky
   .container
     .card-body
       .d-flex
diff --git a/app/views/moderation/inbox/index.html.haml b/app/views/moderation/inbox/index.html.haml
index 7e400437..82ebf9d4 100644
--- a/app/views/moderation/inbox/index.html.haml
+++ b/app/views/moderation/inbox/index.html.haml
@@ -1,7 +1,6 @@
 - provide(:title, generate_title(t(".title", user: @user.screen_name)))
 
-= render "header", user: @user, hidden: false
-= render "header", user: @user, hidden: true
+= render "header", user: @user
 
 .container-lg.container--main
   #entries

From 0ef69eac695f1cd3b26a7dfc160234103a6db82e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Dec 2023 21:55:46 +0100
Subject: [PATCH 279/590] Add empty hints for moderation views

---
 app/views/moderation/inbox/index.html.haml   | 5 ++++-
 app/views/moderation/reports/index.html.haml | 3 +++
 config/locales/views.en.yml                  | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/views/moderation/inbox/index.html.haml b/app/views/moderation/inbox/index.html.haml
index 82ebf9d4..3cae722c 100644
--- a/app/views/moderation/inbox/index.html.haml
+++ b/app/views/moderation/inbox/index.html.haml
@@ -2,8 +2,11 @@
 
 = render "header", user: @user
 
-.container-lg.container--main
+.container-lg.question-page
   #entries
+    - if @inboxes.empty?
+      = render "shared/empty", icon: "fa fa-inbox", translation_key: ".moderation.inbox"
+
     - @inboxes.each do |i|
       = render "inbox/entry", i: i
 
diff --git a/app/views/moderation/reports/index.html.haml b/app/views/moderation/reports/index.html.haml
index bf92cdf7..1df8ae9d 100644
--- a/app/views/moderation/reports/index.html.haml
+++ b/app/views/moderation/reports/index.html.haml
@@ -1,4 +1,7 @@
 #reports
+  - if @reports.empty?
+    = render "shared/empty", icon: "fa-regular fa-smile-beam", translation_key: ".moderation.reports"
+
   - @reports.each do |r|
     = render "moderation/moderationbox", report: r
 
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index dcf921ff..493483d0 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -578,6 +578,9 @@ en:
         questions: "This user hasn't asked any questions yet."
         follower: "This user has no followers."
         friend: "This user is not following anyone."
+      moderation:
+        reports: "There are no open reports right now!"
+        inbox: "This users inbox is empty."
     formatting:
       body_html: |
         <p>%{app_name} uses <b>Markdown</b> for formatting</p>

From b2220cf38ba32b3fa53127c5d74a638394be5fc0 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Dec 2023 21:56:23 +0100
Subject: [PATCH 280/590] Add empty hint for inbox

---
 app/views/inbox/show.html.haml | 2 +-
 config/locales/views.en.yml    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml
index 802127ee..8299b6ce 100644
--- a/app/views/inbox/show.html.haml
+++ b/app/views/inbox/show.html.haml
@@ -3,7 +3,7 @@
     = render "inbox/entry", i:
 
   - if @inbox.empty?
-    %p.empty= t(".empty")
+    = render "shared/empty", type: "inbox"
 
 - if @more_data_available
   .d-flex.justify-content-center#paginator
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 493483d0..09224e69 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -581,6 +581,9 @@ en:
       moderation:
         reports: "There are no open reports right now!"
         inbox: "This users inbox is empty."
+      inbox:
+        heading: "Your inbox is empty!"
+        text: "To start answering, generate a question or share your profile on other sites to get questions."
     formatting:
       body_html: |
         <p>%{app_name} uses <b>Markdown</b> for formatting</p>

From 3c3b9a7719d8332235b1bc45576454616ecde640 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Dec 2023 21:56:48 +0100
Subject: [PATCH 281/590] Add empty hint for home timelines

---
 app/views/timeline/timeline.html.haml | 3 +++
 config/locales/views.en.yml           | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/app/views/timeline/timeline.html.haml b/app/views/timeline/timeline.html.haml
index 2b3089b8..10754661 100644
--- a/app/views/timeline/timeline.html.haml
+++ b/app/views/timeline/timeline.html.haml
@@ -1,6 +1,9 @@
 #timeline{ data: { controller: "navigation" } }
   %button.d-none{ data: { hotkey: "j", action: "navigation#down" } }
   %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
+  - if @timeline.empty?
+    = render "shared/empty", type: "timeline"
+
   - @timeline.each do |answer|
     = render "answerbox", a: answer
 
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 09224e69..e8668906 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -581,6 +581,12 @@ en:
       moderation:
         reports: "There are no open reports right now!"
         inbox: "This users inbox is empty."
+      timeline:
+        heading: "Your feed is empty!"
+        text: "Start answering questions or follow some people to fill your feed with answers."
+        actions:
+          inbox: "Go to your inbox"
+          public: "Go to the public timeline"
       inbox:
         heading: "Your inbox is empty!"
         text: "To start answering, generate a question or share your profile on other sites to get questions."

From 32456a0f3050cdc165adce8b13ae682554ee4fda Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Dec 2023 21:57:05 +0100
Subject: [PATCH 282/590] Add empty hint for questions

---
 app/views/question/show.html.haml | 3 +++
 config/locales/views.en.yml       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index cb24fbd1..542b7726 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -7,6 +7,9 @@
   #answers{ data: { controller: "navigation" } }
     %button.d-none{ data: { hotkey: "j", action: "navigation#down" } }
     %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
+    - if @answers.empty?
+      = render "shared/empty", icon: "fa-regular fa-comments", translation_key: ".question"
+
     - @answers.each do |a|
       = render "answerbox", a:, show_question: false
 
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index e8668906..d9afbd66 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -581,6 +581,7 @@ en:
       moderation:
         reports: "There are no open reports right now!"
         inbox: "This users inbox is empty."
+      question: "No one answered this question yet."
       timeline:
         heading: "Your feed is empty!"
         text: "Start answering questions or follow some people to fill your feed with answers."

From c42e36af12f7eb8f21d427b5c9712b327bc6244a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Dec 2023 22:09:21 +0100
Subject: [PATCH 283/590] Fix inbox view spec

---
 spec/views/inbox/show.html.haml_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/views/inbox/show.html.haml_spec.rb b/spec/views/inbox/show.html.haml_spec.rb
index fc157874..19a3a13e 100644
--- a/spec/views/inbox/show.html.haml_spec.rb
+++ b/spec/views/inbox/show.html.haml_spec.rb
@@ -18,9 +18,9 @@ describe "inbox/show.html.haml", type: :view do
 
     it "displays an 'inbox is empty' message" do
       html = Nokogiri::HTML.parse(rendered)
-      selector = "p.empty"
+      selector = "div.card.empty"
       expect(rendered).to have_css(selector)
-      expect(html.css(selector).text.strip).to eq "Nothing to see here."
+      expect(html.css(selector).text.strip).to include "Your inbox is empty!"
     end
   end
 

From e428d1e0c84710b029b2dc9732660be435f0e070 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 11 Dec 2023 00:02:04 +0100
Subject: [PATCH 284/590] Add note to follower asking modal if on a user
 profile

---
 .../controllers/questionbox_focus_controller.ts      | 12 ++++++++++++
 app/javascript/retrospring/initializers/stimulus.ts  |  2 ++
 app/views/application/_questionbox.html.haml         |  2 +-
 app/views/modal/_ask.html.haml                       |  2 ++
 config/locales/views.en.yml                          |  5 +++++
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/retrospring/controllers/questionbox_focus_controller.ts

diff --git a/app/javascript/retrospring/controllers/questionbox_focus_controller.ts b/app/javascript/retrospring/controllers/questionbox_focus_controller.ts
new file mode 100644
index 00000000..0453c2bb
--- /dev/null
+++ b/app/javascript/retrospring/controllers/questionbox_focus_controller.ts
@@ -0,0 +1,12 @@
+import { Controller } from '@hotwired/stimulus';
+import { Modal } from 'bootstrap';
+
+export default class extends Controller {
+  click(): void {
+    const modal = Modal.getInstance(this.element.closest('.modal'));
+    const questionbox = document.querySelector((this.element as HTMLAnchorElement).href);
+
+    modal.hide();
+    questionbox.scrollIntoView();
+  }
+}
diff --git a/app/javascript/retrospring/initializers/stimulus.ts b/app/javascript/retrospring/initializers/stimulus.ts
index 44f3b7e6..737fe785 100644
--- a/app/javascript/retrospring/initializers/stimulus.ts
+++ b/app/javascript/retrospring/initializers/stimulus.ts
@@ -15,6 +15,7 @@ import PwaBadgeController from "retrospring/controllers/pwa_badge_controller";
 import NavigationController from "retrospring/controllers/navigation_controller";
 import ShareController from "retrospring/controllers/share_controller";
 import ClipboardController from "retrospring/controllers/clipboard_controller";
+import QuestionboxFocusController from "retrospring/controllers/questionbox_focus_controller";
 
 /**
  * This module sets up Stimulus and our controllers
@@ -41,4 +42,5 @@ export default function (): void {
   window['Stimulus'].register('toast', ToastController);
   window['Stimulus'].register('share', ShareController);
   window['Stimulus'].register('clipboard', ClipboardController);
+  window['Stimulus'].register('questionbox-focus', QuestionboxFocusController);
 }
diff --git a/app/views/application/_questionbox.html.haml b/app/views/application/_questionbox.html.haml
index d56fefda..c6bfee72 100644
--- a/app/views/application/_questionbox.html.haml
+++ b/app/views/application/_questionbox.html.haml
@@ -1,4 +1,4 @@
-.card
+.card#question-card
   .card-header
     - if user.profile.motivation_header.blank?
       = t(".title")
diff --git a/app/views/modal/_ask.html.haml b/app/views/modal/_ask.html.haml
index 00192b61..647b52c5 100644
--- a/app/views/modal/_ask.html.haml
+++ b/app/views/modal/_ask.html.haml
@@ -6,6 +6,8 @@
         %button.btn-close{ data: { bs_dismiss: :modal }, type: :button }
           %span.visually-hidden= t("voc.close")
       .modal-body
+        - if @user
+          .alert.alert-info.d-sm-none= t(".user_note_html", user: @user.profile.safe_name)
         .form-group.has-feedback
           %textarea.form-control{ name: "qb-all-question", placeholder: t(".placeholder"), data: { "character-count-warning-target": "input" } }
           .alert.alert-warning.mt-3.d-none{ data: { "character-count-warning-target": "warning" } }= t('.long_question_warning')
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index d9afbd66..d7961168 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -262,6 +262,11 @@ en:
       confirm: "I understand the risk, proceed!"
   modal:
     ask:
+      user_note_html: |
+        <strong>Do you want to ask %{user} a question?</strong>
+        This dialog asks a question to all your followers.
+        <a href="#question-card" data-controller="questionbox-focus" data-action="click">Click here</a>
+        to ask them a question directly!
       title: "Ask your followers"
       placeholder: "Type your question here…"
       action: "Ask"

From 0d22f26cead71ed8ade154d6ccf683688014c0a4 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 11 Dec 2023 00:42:26 +0100
Subject: [PATCH 285/590] Add note to question modal if current user has no
 followers

---
 app/views/modal/_ask.html.haml | 2 ++
 config/locales/views.en.yml    | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/app/views/modal/_ask.html.haml b/app/views/modal/_ask.html.haml
index 647b52c5..f95582ad 100644
--- a/app/views/modal/_ask.html.haml
+++ b/app/views/modal/_ask.html.haml
@@ -8,6 +8,8 @@
       .modal-body
         - if @user
           .alert.alert-info.d-sm-none= t(".user_note_html", user: @user.profile.safe_name)
+        - if current_user.followers.count.zero?
+          .alert.alert-warning= t(".follower_note_html")
         .form-group.has-feedback
           %textarea.form-control{ name: "qb-all-question", placeholder: t(".placeholder"), data: { "character-count-warning-target": "input" } }
           .alert.alert-warning.mt-3.d-none{ data: { "character-count-warning-target": "warning" } }= t('.long_question_warning')
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index d7961168..78c24665 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -267,6 +267,9 @@ en:
         This dialog asks a question to all your followers.
         <a href="#question-card" data-controller="questionbox-focus" data-action="click">Click here</a>
         to ask them a question directly!
+      follower_note_html: |
+        <strong>You don't have any followers!</strong>
+        Questions asked through this dialog now will not be answered by anyone.
       title: "Ask your followers"
       placeholder: "Type your question here…"
       action: "Ask"

From 4156ba3728042d8e1e7c21a9f593481cabe820f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:32:25 +0000
Subject: [PATCH 286/590] Bump haml from 6.2.3 to 6.3.0

Bumps [haml](https://github.com/haml/haml) from 6.2.3 to 6.3.0.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v6.2.3...v6.3.0)

---
updated-dependencies:
- dependency-name: haml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9d3bcfde..c3babcfe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ gem "devise-i18n"
 gem "fog-aws"
 gem "fog-core"
 gem "fog-local"
-gem "haml", "~> 6.2"
+gem "haml", "~> 6.3"
 gem "hcaptcha", git: "https://github.com/raccube/hcaptcha", ref: "fix/flash-in-turbo-streams"
 gem "mini_magick"
 gem "oj"
diff --git a/Gemfile.lock b/Gemfile.lock
index 86d520c5..c42bb562 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,7 +196,7 @@ GEM
     glob (0.4.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    haml (6.2.3)
+    haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -532,7 +532,7 @@ DEPENDENCIES
   fog-aws
   fog-core
   fog-local
-  haml (~> 6.2)
+  haml (~> 6.3)
   haml_lint
   hcaptcha!
   httparty

From 4dd7c9f0770bb4be86183f43a10ae0e4f57eea0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:33:03 +0000
Subject: [PATCH 287/590] Bump oj from 3.16.1 to 3.16.2

Bumps [oj](https://github.com/ohler55/oj) from 3.16.1 to 3.16.2.
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.16.1...v3.16.2)

---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 86d520c5..84f8c836 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,6 +97,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
+    bigdecimal (3.1.4)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.17.0)
@@ -286,7 +287,8 @@ GEM
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.1)
+    oj (3.16.2)
+      bigdecimal (~> 3.1)
     openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.23.0)

From 1a1cd63907c1d7e2438369d869b43537195bfdda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:35:06 +0000
Subject: [PATCH 288/590] Bump sentry-ruby, sentry-rails and sentry-sidekiq

Bumps [sentry-ruby](https://github.com/getsentry/sentry-ruby), [sentry-rails](https://github.com/getsentry/sentry-ruby) and [sentry-sidekiq](https://github.com/getsentry/sentry-ruby). These dependencies needed to be updated together.

Updates `sentry-ruby` from 5.14.0 to 5.15.0
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.14.0...5.15.0)

Updates `sentry-rails` from 5.14.0 to 5.15.0
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.14.0...5.15.0)

Updates `sentry-sidekiq` from 5.14.0 to 5.15.0
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.14.0...5.15.0)

---
updated-dependencies:
- dependency-name: sentry-ruby
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 86d520c5..07cfec4f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -434,13 +434,13 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-rails (5.14.0)
+    sentry-rails (5.15.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.14.0)
-    sentry-ruby (5.14.0)
+      sentry-ruby (~> 5.15.0)
+    sentry-ruby (5.15.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.14.0)
-      sentry-ruby (~> 5.14.0)
+    sentry-sidekiq (5.15.0)
+      sentry-ruby (~> 5.15.0)
       sidekiq (>= 3.0)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)

From 630c617be604966e22d8a5359965fc7c92e8be8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:57:50 +0000
Subject: [PATCH 289/590] Bump @typescript-eslint/parser from 6.13.1 to 6.13.2

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.13.1 to 6.13.2.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.13.2/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 50 ++++++++------------------------------------------
 2 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index 9c244791..461ab617 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.2",
     "esbuild": "^0.17.0",
     "eslint": "^8.55.0",
     "eslint-plugin-import": "^2.29.0",
diff --git a/yarn.lock b/yarn.lock
index 33af63e9..a74fe16d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,25 +325,17 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.13.1":
-  version "6.13.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.13.1.tgz#29d6d4e5fab4669e58bc15f6904b67da65567487"
-  integrity sha512-fs2XOhWCzRhqMmQf0eicLa/CWSaYss2feXsy7xBD/pLyWke/jCIVc2s1ikEAtSW7ina1HNhv7kONoEfVNEcdDQ==
+"@typescript-eslint/parser@^6.13.2":
+  version "6.13.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.13.2.tgz#390b79cc9a57a5f904d197a201cc4b6bc4f9afb9"
+  integrity sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.13.1"
-    "@typescript-eslint/types" "6.13.1"
-    "@typescript-eslint/typescript-estree" "6.13.1"
-    "@typescript-eslint/visitor-keys" "6.13.1"
+    "@typescript-eslint/scope-manager" "6.13.2"
+    "@typescript-eslint/types" "6.13.2"
+    "@typescript-eslint/typescript-estree" "6.13.2"
+    "@typescript-eslint/visitor-keys" "6.13.2"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.13.1":
-  version "6.13.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz#58c7c37c6a957d3d9f59bc4f64c2888e0cac1d70"
-  integrity sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==
-  dependencies:
-    "@typescript-eslint/types" "6.13.1"
-    "@typescript-eslint/visitor-keys" "6.13.1"
-
 "@typescript-eslint/scope-manager@6.13.2":
   version "6.13.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz#5fa4e4adace028dafac212c770640b94e7b61052"
@@ -362,29 +354,11 @@
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.13.1":
-  version "6.13.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.1.tgz#b56f26130e7eb8fa1e429c75fb969cae6ad7bb5c"
-  integrity sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==
-
 "@typescript-eslint/types@6.13.2":
   version "6.13.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.2.tgz#c044aac24c2f6cefb8e921e397acad5417dd0ae6"
   integrity sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==
 
-"@typescript-eslint/typescript-estree@6.13.1":
-  version "6.13.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz#d01dda78d2487434d1c503853fa00291c566efa4"
-  integrity sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==
-  dependencies:
-    "@typescript-eslint/types" "6.13.1"
-    "@typescript-eslint/visitor-keys" "6.13.1"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
 "@typescript-eslint/typescript-estree@6.13.2":
   version "6.13.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz#ae556ee154c1acf025b48d37c3ef95a1d55da258"
@@ -411,14 +385,6 @@
     "@typescript-eslint/typescript-estree" "6.13.2"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.13.1":
-  version "6.13.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz#c4b692dcc23a4fc60685b718f10fde789d65a540"
-  integrity sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==
-  dependencies:
-    "@typescript-eslint/types" "6.13.1"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.13.2":
   version "6.13.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz#e0a4a80cf842bb08e6127b903284166ac4a5594c"

From b9915ef4bb781ac575988555c132f15cdef85995 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:58:17 +0000
Subject: [PATCH 290/590] Bump @github/hotkey from 2.3.0 to 2.3.1

Bumps [@github/hotkey](https://github.com/github/hotkey) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/github/hotkey/releases)
- [Commits](https://github.com/github/hotkey/compare/v2.3.0...v2.3.1)

---
updated-dependencies:
- dependency-name: "@github/hotkey"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9c244791..8d3c6131 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@fontsource/lexend": "^4.5.15",
     "@fortawesome/fontawesome-free": "^6.5.1",
-    "@github/hotkey": "^2.3.0",
+    "@github/hotkey": "^2.3.1",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^7.3.0",
     "@melloware/coloris": "^0.22.0",
diff --git a/yarn.lock b/yarn.lock
index 33af63e9..bb0e0e2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -200,10 +200,10 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258"
   integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==
 
-"@github/hotkey@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-2.3.0.tgz#788037cac92c7281f86228578b42861d08fc87a7"
-  integrity sha512-XVvFrubecf1VPofEiVJMZ60fye+EegbB/+ZSuieFihZ3xMTD0NYNrd3n+RHAA9W1gUNl2Yuyj1alrAp+2tmISw==
+"@github/hotkey@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-2.3.1.tgz#366011806be0fe5742c13f28eb6790da4422b997"
+  integrity sha512-+aEUEKAsJnnZElLKW5vdXJ9o7g0PXDGN9w54kDm4BorHyQiUVXRLcaDbBS41T62iyO+tqlCO1NuQrYbrbS8Z2Q==
 
 "@hotwired/stimulus@^3.2.2":
   version "3.2.2"

From eba6cf7ba5e8e4d97bc3fcbaed122f1c285c6668 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:58:31 +0000
Subject: [PATCH 291/590] Bump stylelint-scss from 5.3.1 to 5.3.2

Bumps [stylelint-scss](https://github.com/stylelint-scss/stylelint-scss) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/stylelint-scss/stylelint-scss/releases)
- [Changelog](https://github.com/stylelint-scss/stylelint-scss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint-scss/stylelint-scss/compare/v5.3.1...v5.3.2)

---
updated-dependencies:
- dependency-name: stylelint-scss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9c244791..2e7ed13d 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,6 @@
     "eslint-plugin-import": "^2.29.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.1.0",
-    "stylelint-scss": "^5.3.1"
+    "stylelint-scss": "^5.3.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 33af63e9..17f97dd8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2451,10 +2451,10 @@ stylelint-config-standard@^34.0.0:
   dependencies:
     stylelint-config-recommended "^13.0.0"
 
-stylelint-scss@^5.3.0, stylelint-scss@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.3.1.tgz#7f0f5f06d0a2a3c515aa71d3a8de3548045e03e1"
-  integrity sha512-5I9ZDIm77BZrjOccma5WyW2nJEKjXDd4Ca8Kk+oBapSO4pewSlno3n+OyimcyVJJujQZkBN2D+xuMkIamSc6hA==
+stylelint-scss@^5.3.0, stylelint-scss@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.3.2.tgz#c54564dfbd98de0c08742b9c43025cda91acf940"
+  integrity sha512-4LzLaayFhFyneJwLo0IUa8knuIvj+zF0vBFueQs4e3tEaAMIQX8q5th8ziKkgOavr6y/y9yoBe+RXN/edwLzsQ==
   dependencies:
     known-css-properties "^0.29.0"
     postcss-media-query-parser "^0.2.3"

From aaee04b5ed9553a52e05de10470f7f2d6c5996f9 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Mon, 11 Dec 2023 19:54:56 +0100
Subject: [PATCH 292/590] Restore `QuestionWorker` for compatibility during
 upgrade

Co-authored-by: Georg Gadinger <nilsding@nilsding.org>
---
 app/workers/question_worker.rb            |  30 ++++---
 app/workers/send_to_inbox_job.rb          |  36 ++++++++
 lib/use_case/question/create_followers.rb |   2 +-
 spec/workers/question_worker_spec.rb      |  65 ++++++++------
 spec/workers/send_to_inbox_job_spec.rb    | 101 ++++++++++++++++++++++
 5 files changed, 192 insertions(+), 42 deletions(-)
 create mode 100644 app/workers/send_to_inbox_job.rb
 create mode 100644 spec/workers/send_to_inbox_job_spec.rb

diff --git a/app/workers/question_worker.rb b/app/workers/question_worker.rb
index d0c9eb98..69ee8091 100644
--- a/app/workers/question_worker.rb
+++ b/app/workers/question_worker.rb
@@ -1,38 +1,40 @@
 # frozen_string_literal: true
 
+# @deprecated This is to be replaced by SendToInboxJob. Remaining here so that remaining QuestionWorker jobs can finish.
 class QuestionWorker
   include Sidekiq::Worker
 
   sidekiq_options queue: :question, retry: false
 
-  # @param follower_id [Integer] user id passed from Devise
+  # @param user_id [Integer] user id passed from Devise
   # @param question_id [Integer] newly created question id
-  def perform(follower_id, question_id)
-    follower = User.includes(:web_push_subscriptions, :mute_rules, :muted_users).find(follower_id)
-    question = Question.includes(:user).find(question_id)
+  def perform(user_id, question_id)
+    user = User.find(user_id)
+    question = Question.find(question_id)
     webpush_app = Rpush::App.find_by(name: "webpush")
 
-    return if skip_inbox?(follower, question)
+    user.followers.each do |f|
+      next if skip_inbox?(f, question, user)
 
-    inbox = Inbox.create(user_id: follower.id, question_id:, new: true)
-    follower.push_notification(webpush_app, inbox) if webpush_app
+      inbox = Inbox.create(user_id: f.id, question_id:, new: true)
+      f.push_notification(webpush_app, inbox) if webpush_app
+    end
+  rescue StandardError => e
+    logger.info "failed to ask question: #{e.message}"
+    Sentry.capture_exception(e)
   end
 
   private
 
-  def skip_inbox?(follower, question)
+  def skip_inbox?(follower, question, user)
     return true if follower.inbox_locked?
     return true if follower.banned?
     return true if muted?(follower, question)
-    return true if follower.muting?(question.user)
+    return true if user.muting?(question.user)
     return true if question.long? && !follower.profile.allow_long_questions
 
     false
   end
 
-  # @param [User] user
-  # @param [Question] question
-  def muted?(user, question)
-    user.mute_rules.any? { |rule| rule.applies_to? question }
-  end
+  def muted?(user, question) = MuteRule.where(user:).any? { |rule| rule.applies_to? question }
 end
diff --git a/app/workers/send_to_inbox_job.rb b/app/workers/send_to_inbox_job.rb
new file mode 100644
index 00000000..ef1f30b5
--- /dev/null
+++ b/app/workers/send_to_inbox_job.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class SendToInboxJob
+  include Sidekiq::Worker
+
+  sidekiq_options queue: :question, retry: false
+
+  # @param follower_id [Integer] user id passed from Devise
+  # @param question_id [Integer] newly created question id
+  def perform(follower_id, question_id)
+    follower = User.includes(:web_push_subscriptions, :mute_rules, :muted_users).find(follower_id)
+    question = Question.includes(:user).find(question_id)
+    webpush_app = Rpush::App.find_by(name: "webpush")
+
+    return if skip_inbox?(follower, question)
+
+    inbox = Inbox.create(user_id: follower.id, question_id:, new: true)
+    follower.push_notification(webpush_app, inbox) if webpush_app
+  end
+
+  private
+
+  def skip_inbox?(follower, question)
+    return true if follower.inbox_locked?
+    return true if follower.banned?
+    return true if muted?(follower, question)
+    return true if follower.muting?(question.user)
+    return true if question.long? && !follower.profile.allow_long_questions
+
+    false
+  end
+
+  # @param [User] user
+  # @param [Question] question
+  def muted?(user, question) = user.mute_rules.any? { |rule| rule.applies_to? question }
+end
diff --git a/lib/use_case/question/create_followers.rb b/lib/use_case/question/create_followers.rb
index fd4a73de..52277b2b 100644
--- a/lib/use_case/question/create_followers.rb
+++ b/lib/use_case/question/create_followers.rb
@@ -20,7 +20,7 @@ module UseCase
         increment_metric
 
         args = source_user.followers.map { |f| [f.id, question.id] }
-        QuestionWorker.perform_bulk(args)
+        SendToInboxJob.perform_bulk(args)
 
         {
           status:   201,
diff --git a/spec/workers/question_worker_spec.rb b/spec/workers/question_worker_spec.rb
index 5ced7465..0795e55b 100644
--- a/spec/workers/question_worker_spec.rb
+++ b/spec/workers/question_worker_spec.rb
@@ -9,21 +9,22 @@ describe QuestionWorker do
     let(:content) { Faker::Lorem.sentence }
     let(:question) { FactoryBot.create(:question, content:, user:) }
     let(:question_id) { question.id }
-    let(:follower) { FactoryBot.create(:user) }
-    let(:follower_id) { follower.id }
 
     before do
-      follower.follow(user)
+      5.times do
+        other_user = FactoryBot.create(:user)
+        other_user.follow(user)
+      end
     end
 
-    subject { described_class.new.perform(follower_id, question_id) }
+    subject { described_class.new.perform(user_id, question_id) }
 
     it "places the question in the inbox of the user's followers" do
       expect { subject }
         .to(
-          change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
+          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
             .from(0)
-            .to(1),
+            .to(5)
         )
     end
 
@@ -31,41 +32,56 @@ describe QuestionWorker do
       question.content = "Some spicy question text"
       question.save
 
-      MuteRule.create(user_id: follower_id, muted_phrase: "spicy")
+      MuteRule.create(user_id: user.followers.first.id, muted_phrase: "spicy")
 
-      subject
-      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+      expect { subject }
+        .to(
+          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+            .from(0)
+            .to(4)
+        )
     end
 
     it "respects inbox locks" do
-      follower.update(privacy_lock_inbox: true)
+      user.followers.first.update(privacy_lock_inbox: true)
 
-      subject
-      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+      expect { subject }
+        .to(
+          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+            .from(0)
+            .to(4)
+        )
     end
 
     it "does not send questions to banned users" do
-      follower.ban
+      user.followers.first.ban
 
-      subject
-      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+      expect { subject }
+        .to(
+          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+            .from(0)
+            .to(4)
+        )
     end
 
     context "receiver has push notifications enabled" do
+      let(:receiver) { FactoryBot.create(:user) }
+
       before do
         Rpush::Webpush::App.create(
           name:        "webpush",
           certificate: { public_key: "AAAA", private_key: "AAAA", subject: "" }.to_json,
-          connections: 1,
+          connections: 1
         )
 
         WebPushSubscription.create!(
-          user:         follower,
+          user:         receiver,
           subscription: {
             endpoint: "This will not be used",
             keys:     {},
-          },
+          }
         )
+        receiver.follow(user)
       end
 
       it "sends notifications" do
@@ -73,7 +89,7 @@ describe QuestionWorker do
           .to(
             change { Rpush::Webpush::Notification.count }
               .from(0)
-              .to(1),
+              .to(1)
           )
       end
     end
@@ -82,20 +98,15 @@ describe QuestionWorker do
       let(:content) { "x" * 1000 }
 
       it "sends to recipients who allow long questions" do
-        follower.profile.update(allow_long_questions: true)
+        user.followers.first.profile.update(allow_long_questions: true)
 
         expect { subject }
           .to(
-            change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
+            change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
               .from(0)
-              .to(1),
+              .to(1)
           )
       end
-
-      it "does not send to recipients who do not allow long questions" do
-        subject
-        expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
-      end
     end
   end
 end
diff --git a/spec/workers/send_to_inbox_job_spec.rb b/spec/workers/send_to_inbox_job_spec.rb
new file mode 100644
index 00000000..237ca75d
--- /dev/null
+++ b/spec/workers/send_to_inbox_job_spec.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe SendToInboxJob do
+  describe "#perform" do
+    let(:user) { FactoryBot.create(:user) }
+    let(:user_id) { user.id }
+    let(:content) { Faker::Lorem.sentence }
+    let(:question) { FactoryBot.create(:question, content:, user:) }
+    let(:question_id) { question.id }
+    let(:follower) { FactoryBot.create(:user) }
+    let(:follower_id) { follower.id }
+
+    before do
+      follower.follow(user)
+    end
+
+    subject { described_class.new.perform(follower_id, question_id) }
+
+    it "places the question in the inbox of the user's followers" do
+      expect { subject }
+        .to(
+          change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
+            .from(0)
+            .to(1),
+        )
+    end
+
+    it "respects mute rules" do
+      question.content = "Some spicy question text"
+      question.save
+
+      MuteRule.create(user_id: follower_id, muted_phrase: "spicy")
+
+      subject
+      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+    end
+
+    it "respects inbox locks" do
+      follower.update(privacy_lock_inbox: true)
+
+      subject
+      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+    end
+
+    it "does not send questions to banned users" do
+      follower.ban
+
+      subject
+      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+    end
+
+    context "receiver has push notifications enabled" do
+      before do
+        Rpush::Webpush::App.create(
+          name:        "webpush",
+          certificate: { public_key: "AAAA", private_key: "AAAA", subject: "" }.to_json,
+          connections: 1,
+        )
+
+        WebPushSubscription.create!(
+          user:         follower,
+          subscription: {
+            endpoint: "This will not be used",
+            keys:     {},
+          },
+        )
+      end
+
+      it "sends notifications" do
+        expect { subject }
+          .to(
+            change { Rpush::Webpush::Notification.count }
+              .from(0)
+              .to(1),
+          )
+      end
+    end
+
+    context "long question" do
+      let(:content) { "x" * 1000 }
+
+      it "sends to recipients who allow long questions" do
+        follower.profile.update(allow_long_questions: true)
+
+        expect { subject }
+          .to(
+            change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
+              .from(0)
+              .to(1),
+          )
+      end
+
+      it "does not send to recipients who do not allow long questions" do
+        subject
+        expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+      end
+    end
+  end
+end

From 64ac18843e8eed2ba49443a1a9b3150ee965ee6a Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Mon, 11 Dec 2023 19:56:50 +0100
Subject: [PATCH 293/590] Replace usages of `QuestionWorker`

---
 app/controllers/ajax/question_controller.rb   | 33 ++++++++++---------
 .../ajax/question_controller_spec.rb          | 26 +++++++--------
 .../question/create_followers_spec.rb         |  2 +-
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/app/controllers/ajax/question_controller.rb b/app/controllers/ajax/question_controller.rb
index f3bef810..4cf425b5 100644
--- a/app/controllers/ajax/question_controller.rb
+++ b/app/controllers/ajax/question_controller.rb
@@ -1,19 +1,6 @@
 # frozen_string_literal: true
 
 class Ajax::QuestionController < AjaxController
-  def destroy
-    params.require :question
-
-    UseCase::Question::Destroy.call(
-      question_id:  params[:question],
-      current_user: current_user
-    )
-
-    @response[:status] = :okay
-    @response[:message] = t(".success")
-    @response[:success] = true
-  end
-
   def create
     params.require :question
     params.require :anonymousQuestion
@@ -24,14 +11,14 @@ class Ajax::QuestionController < AjaxController
     @response = {
       success: true,
       message: t(".success"),
-      status:  :okay
+      status:  :okay,
     }
 
     if user_signed_in? && params[:rcpt] == "followers"
       UseCase::Question::CreateFollowers.call(
         source_user_id:    current_user.id,
         content:           params[:question],
-        author_identifier: AnonymousBlock.get_identifier(request.remote_ip)
+        author_identifier: AnonymousBlock.get_identifier(request.remote_ip),
       )
       return
     end
@@ -41,7 +28,21 @@ class Ajax::QuestionController < AjaxController
       target_user_id:    params[:rcpt],
       content:           params[:question],
       anonymous:         params[:anonymousQuestion],
-      author_identifier: AnonymousBlock.get_identifier(request.remote_ip)
+      author_identifier: AnonymousBlock.get_identifier(request.remote_ip),
     )
   end
+
+  def destroy
+    params.require :question
+
+    UseCase::Question::Destroy.call(
+      question_id:  params[:question],
+      current_user: current_user,
+    )
+
+    @response[:status] = :okay
+    @response[:message] = t(".success")
+    @response[:success] = true
+  end
+
 end
diff --git a/spec/controllers/ajax/question_controller_spec.rb b/spec/controllers/ajax/question_controller_spec.rb
index 0fc8922b..eaa37774 100644
--- a/spec/controllers/ajax/question_controller_spec.rb
+++ b/spec/controllers/ajax/question_controller_spec.rb
@@ -48,25 +48,25 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
       include_examples "returns the expected response"
     end
 
-    shared_examples "enqueues QuestionWorker jobs" do
-      it "enqueues a QuestionWorker job" do
-        allow(QuestionWorker).to receive(:perform_bulk)
+    shared_examples "enqueues SendToInboxJob jobs" do
+      it "enqueues a SendToInboxJob job" do
+        allow(SendToInboxJob).to receive(:perform_bulk)
         subject
         question_id = Question.last.id
         bulk_args = followers.map { |f| [f.id, question_id] }
-        expect(QuestionWorker).to have_received(:perform_bulk).with(bulk_args)
+        expect(SendToInboxJob).to have_received(:perform_bulk).with(bulk_args)
       end
 
       include_examples "returns the expected response"
     end
 
-    shared_examples "does not enqueue a QuestionWorker job" do
-      it "does not enqueue a QuestionWorker job" do
-        allow(QuestionWorker).to receive(:perform_async)
-        allow(QuestionWorker).to receive(:perform_bulk)
+    shared_examples "does not enqueue a SendToInboxJob job" do
+      it "does not enqueue a SendToInboxJob job" do
+        allow(SendToInboxJob).to receive(:perform_async)
+        allow(SendToInboxJob).to receive(:perform_bulk)
         subject
-        expect(QuestionWorker).not_to have_received(:perform_async)
-        expect(QuestionWorker).not_to have_received(:perform_bulk)
+        expect(SendToInboxJob).not_to have_received(:perform_async)
+        expect(SendToInboxJob).not_to have_received(:perform_bulk)
       end
 
       include_examples "returns the expected response"
@@ -209,7 +209,7 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
           let(:expected_question_anonymous) { false }
 
           include_examples "creates the question", false
-          include_examples "enqueues QuestionWorker jobs"
+          include_examples "enqueues SendToInboxJob jobs"
         end
 
         context "when anonymousQuestion is false" do
@@ -217,7 +217,7 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
           let(:expected_question_anonymous) { false }
 
           include_examples "creates the question", false
-          include_examples "enqueues QuestionWorker jobs"
+          include_examples "enqueues SendToInboxJob jobs"
         end
       end
 
@@ -384,7 +384,7 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
           }
         end
 
-        include_examples "does not enqueue a QuestionWorker job"
+        include_examples "does not enqueue a SendToInboxJob job"
       end
 
       context "when rcpt is an invalid value" do
diff --git a/spec/lib/use_case/question/create_followers_spec.rb b/spec/lib/use_case/question/create_followers_spec.rb
index 3f048370..b5511459 100644
--- a/spec/lib/use_case/question/create_followers_spec.rb
+++ b/spec/lib/use_case/question/create_followers_spec.rb
@@ -29,7 +29,7 @@ describe UseCase::Question::CreateFollowers do
 
     it "enqueues a QuestionWorker job" do
       followers.each do |target_user|
-        expect(QuestionWorker).to have_enqueued_sidekiq_job(target_user.id, subject[:resource].id)
+        expect(SendToInboxJob).to have_enqueued_sidekiq_job(target_user.id, subject[:resource].id)
       end
     end
 

From b2b98260712ec211b6dca47878af88c86c155655 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Mon, 11 Dec 2023 19:59:07 +0100
Subject: [PATCH 294/590] Fix lint errors

---
 app/controllers/ajax/question_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/ajax/question_controller.rb b/app/controllers/ajax/question_controller.rb
index 4cf425b5..e8b516d8 100644
--- a/app/controllers/ajax/question_controller.rb
+++ b/app/controllers/ajax/question_controller.rb
@@ -37,12 +37,11 @@ class Ajax::QuestionController < AjaxController
 
     UseCase::Question::Destroy.call(
       question_id:  params[:question],
-      current_user: current_user,
+      current_user:,
     )
 
     @response[:status] = :okay
     @response[:message] = t(".success")
     @response[:success] = true
   end
-
 end

From e481721ea927c9c9859ad9133a71287c397c3307 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Mon, 11 Dec 2023 20:02:30 +0100
Subject: [PATCH 295/590] Use `Sidekiq::Job`

---
 app/workers/send_to_inbox_job.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/workers/send_to_inbox_job.rb b/app/workers/send_to_inbox_job.rb
index ef1f30b5..6b8eec8a 100644
--- a/app/workers/send_to_inbox_job.rb
+++ b/app/workers/send_to_inbox_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class SendToInboxJob
-  include Sidekiq::Worker
+  include Sidekiq::Job
 
   sidekiq_options queue: :question, retry: false
 

From 2a0b163bf1f7d5adb1e5eb3f31a1537c36a81c46 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
Date: Mon, 11 Dec 2023 20:05:53 +0100
Subject: [PATCH 296/590] Apply review suggestion from @raccube

Co-authored-by: Karina J. Kwiatek <6197148+raccube@users.noreply.github.com>
---
 config/locales/views.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 78c24665..74e5a2f9 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -269,7 +269,7 @@ en:
         to ask them a question directly!
       follower_note_html: |
         <strong>You don't have any followers!</strong>
-        Questions asked through this dialog now will not be answered by anyone.
+        Questions asked through this dialog will not arrive in anyone's inbox.
       title: "Ask your followers"
       placeholder: "Type your question here…"
       action: "Ask"

From b02375985aaa0fee00f01eb2937725e2775bdc60 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Mon, 11 Dec 2023 23:14:58 +0100
Subject: [PATCH 297/590] Add option to send question to own inbox

---
 app/controllers/ajax/question_controller.rb   |  1 +
 .../retrospring/features/questionbox/all.ts   |  3 +-
 app/views/modal/_ask.html.haml                |  3 ++
 config/locales/views.en.yml                   |  1 +
 lib/use_case/question/create_followers.rb     |  2 +
 .../ajax/question_controller_spec.rb          | 37 ++++++++++++++++++-
 6 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/app/controllers/ajax/question_controller.rb b/app/controllers/ajax/question_controller.rb
index e8b516d8..e2094fda 100644
--- a/app/controllers/ajax/question_controller.rb
+++ b/app/controllers/ajax/question_controller.rb
@@ -19,6 +19,7 @@ class Ajax::QuestionController < AjaxController
         source_user_id:    current_user.id,
         content:           params[:question],
         author_identifier: AnonymousBlock.get_identifier(request.remote_ip),
+        send_to_own_inbox: params[:sendToOwnInbox],
       )
       return
     end
diff --git a/app/javascript/retrospring/features/questionbox/all.ts b/app/javascript/retrospring/features/questionbox/all.ts
index 4a1373f4..5f38684a 100644
--- a/app/javascript/retrospring/features/questionbox/all.ts
+++ b/app/javascript/retrospring/features/questionbox/all.ts
@@ -13,7 +13,8 @@ export function questionboxAllHandler(event: Event): void {
     body: {
       rcpt: 'followers',
       question: document.querySelector<HTMLInputElement>('textarea[name=qb-all-question]').value,
-      anonymousQuestion: 'false'
+      anonymousQuestion: 'false',
+      sendToOwnInbox: (document.getElementById('qb-send-to-own-inbox') as HTMLInputElement).checked,
     },
     contentType: 'application/json'
   })
diff --git a/app/views/modal/_ask.html.haml b/app/views/modal/_ask.html.haml
index 647b52c5..b6ec7025 100644
--- a/app/views/modal/_ask.html.haml
+++ b/app/views/modal/_ask.html.haml
@@ -12,5 +12,8 @@
           %textarea.form-control{ name: "qb-all-question", placeholder: t(".placeholder"), data: { "character-count-warning-target": "input" } }
           .alert.alert-warning.mt-3.d-none{ data: { "character-count-warning-target": "warning" } }= t('.long_question_warning')
       .modal-footer
+        .float-start.flex-grow-1
+          %input.form-check-input#qb-send-to-own-inbox{ type: :checkbox }
+          %label.form-check-label{ for: 'qb-send-to-own-inbox' }= t('.send_to_own_inbox')
         %button.btn.btn-default{ type: :button, data: { bs_dismiss: :modal } }= t("voc.cancel")
         %button.btn.btn-primary{ name: "qb-all-ask", type: :button, data: { loading_text: t(".loading") } }= t(".action")
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index d7961168..c850747c 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -272,6 +272,7 @@ en:
       action: "Ask"
       loading: "Asking…"
       long_question_warning: "This question will only be sent to those who allow long questions in their profile settings."
+      send_to_own_inbox: "Send copy to my inbox"
     list:
       title: "Manage list memberships"
       tab:
diff --git a/lib/use_case/question/create_followers.rb b/lib/use_case/question/create_followers.rb
index 52277b2b..3f993dc0 100644
--- a/lib/use_case/question/create_followers.rb
+++ b/lib/use_case/question/create_followers.rb
@@ -6,6 +6,7 @@ module UseCase
       option :source_user_id, type: Types::Coercible::Integer
       option :content, type: Types::Coercible::String
       option :author_identifier, type: Types::Coercible::String | Types::Nil
+      option :send_to_own_inbox, type: Types::Params::Bool, default: proc { false }
 
       def call
         question = ::Question.create!(
@@ -20,6 +21,7 @@ module UseCase
         increment_metric
 
         args = source_user.followers.map { |f| [f.id, question.id] }
+        SendToInboxJob.perform_async(source_user_id, question.id) if send_to_own_inbox
         SendToInboxJob.perform_bulk(args)
 
         {
diff --git a/spec/controllers/ajax/question_controller_spec.rb b/spec/controllers/ajax/question_controller_spec.rb
index eaa37774..9575576f 100644
--- a/spec/controllers/ajax/question_controller_spec.rb
+++ b/spec/controllers/ajax/question_controller_spec.rb
@@ -77,9 +77,11 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
       {
         question:          question_content,
         anonymousQuestion: anonymous_question,
-        rcpt:              rcpt
+        rcpt:,
+        sendToOwnInbox:    send_to_own_inbox,
       }
     end
+    let(:send_to_own_inbox) { "false" }
 
     subject { post(:create, params: params) }
 
@@ -98,6 +100,7 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
 
       context "when rcpt is a valid user" do
         let(:rcpt) { target_user.id }
+        let(:send_to_own_inbox) { false }
 
         context "when user allows anonymous questions" do
           let(:user_allows_anonymous_questions) { true }
@@ -219,10 +222,41 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
           include_examples "creates the question", false
           include_examples "enqueues SendToInboxJob jobs"
         end
+
+        context "when sendToOwnInbox is true" do
+          let(:anonymous_question) { "false" }
+          let(:expected_question_anonymous) { false }
+          let(:user_allows_anonymous_questions) { false }
+          let(:send_to_own_inbox) { "true" }
+
+          include_examples "creates the question", false
+
+          it "sends question to the current user" do
+            allow(SendToInboxJob).to receive(:perform_async)
+            subject
+            expect(SendToInboxJob).to have_received(:perform_async).with(user.id, Question.last.id)
+          end
+        end
+
+        context "when sendToOwnInbox is false" do
+          let(:anonymous_question) { "false" }
+          let(:expected_question_anonymous) { false }
+          let(:user_allows_anonymous_questions) { false }
+          let(:send_to_own_inbox) { "false" }
+
+          include_examples "creates the question", false
+
+          it "sends question to the current user" do
+            allow(SendToInboxJob).to receive(:perform_async)
+            subject
+            expect(SendToInboxJob).not_to have_received(:perform_async).with(user.id, Question.last.id)
+          end
+        end
       end
 
       context "when rcpt is an invalid value" do
         let(:rcpt) { "tripmeister_eder" }
+        let(:send_to_own_inbox) { false }
         let(:anonymous_question) { "false" }
         let(:expected_response) do
           {
@@ -239,6 +273,7 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
 
       context "when rcpt is a non-existent user" do
         let(:rcpt) { "-1" }
+        let(:send_to_own_inbox) { false }
         let(:anonymous_question) { "false" }
         let(:expected_response) do
           {

From 66878544bf5debdf744d1c98d2a771fc5dc7542f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 11 Dec 2023 01:20:02 +0100
Subject: [PATCH 298/590] Disclose permanent ban duration in login notice

---
 app/controllers/application_controller.rb | 7 +++++--
 config/locales/controllers.en.yml         | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 64ed88c7..a461e1c1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -30,10 +30,13 @@ class ApplicationController < ActionController::Base
       # obligatory '2001: A Space Odyssey' reference
       flash[:notice] = t("user.sessions.create.banned", name:)
       current_ban = current_user.bans.current.first
-      unless current_ban&.reason.nil?
+      unless current_ban&.reason.empty?
         flash[:notice] += "\n#{t('user.sessions.create.reason', reason: current_ban.reason)}"
       end
-      unless current_ban&.permanent?
+
+      if current_ban&.permanent?
+        flash[:notice] += "\n#{t('user.sessions.create.permanent')}"
+      else
         # TODO format banned_until
         flash[:notice] += "\n#{t('user.sessions.create.until', time: current_ban.expires_at)}"
       end
diff --git a/config/locales/controllers.en.yml b/config/locales/controllers.en.yml
index a47878c0..3287e6fe 100644
--- a/config/locales/controllers.en.yml
+++ b/config/locales/controllers.en.yml
@@ -173,6 +173,7 @@ en:
     sessions:
       create:
         banned: "I'm sorry, %{name}, I'm afraid I can't do that."
+        permanent: "You are banned permanently."
         reason: "Ban reason: %{reason}"
         until: "Banned until: %{time}"
       info:

From 9352f8481be5e635b9e155f311eedd8760ca4341 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 11 Dec 2023 01:27:43 +0100
Subject: [PATCH 299/590] Fix User/SessionsController spec

---
 spec/controllers/user/sessions_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/user/sessions_controller_spec.rb b/spec/controllers/user/sessions_controller_spec.rb
index 66d6bdf0..a4a616f6 100644
--- a/spec/controllers/user/sessions_controller_spec.rb
+++ b/spec/controllers/user/sessions_controller_spec.rb
@@ -82,7 +82,7 @@ describe User::SessionsController do
 
       it "redirects to the sign in page" do
         expect(subject).to redirect_to :new_user_session
-        expect(flash[:notice]).to eq "#{I18n.t('user.sessions.create.banned', name: user.screen_name)}\n#{I18n.t('user.sessions.create.reason', reason: 'Do not feed the animals')}"
+        expect(flash[:notice]).to eq "#{I18n.t('user.sessions.create.banned', name: user.screen_name)}\n#{I18n.t('user.sessions.create.reason', reason: 'Do not feed the animals')}\n#{I18n.t('user.sessions.create.permanent')}"
       end
     end
 

From acf9595d711e2667ab0e8eb28360660cd759ae17 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 11 Dec 2023 01:33:27 +0100
Subject: [PATCH 300/590] Fix rubocop nits

---
 app/controllers/application_controller.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a461e1c1..35eda9f9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -30,16 +30,15 @@ class ApplicationController < ActionController::Base
       # obligatory '2001: A Space Odyssey' reference
       flash[:notice] = t("user.sessions.create.banned", name:)
       current_ban = current_user.bans.current.first
-      unless current_ban&.reason.empty?
-        flash[:notice] += "\n#{t('user.sessions.create.reason', reason: current_ban.reason)}"
-      end
+      flash[:notice] += "\n#{t('user.sessions.create.reason', reason: current_ban.reason)}" unless current_ban&.reason&.empty?
+
+      flash[:notice] += if current_ban&.permanent?
+                          "\n#{t('user.sessions.create.permanent')}"
+                        else
+                          # TODO: format banned_until
+                          "\n#{t('user.sessions.create.until', time: current_ban.expires_at)}"
+                        end
 
-      if current_ban&.permanent?
-        flash[:notice] += "\n#{t('user.sessions.create.permanent')}"
-      else
-        # TODO format banned_until
-        flash[:notice] += "\n#{t('user.sessions.create.until', time: current_ban.expires_at)}"
-      end
       sign_out current_user
       redirect_to new_user_session_path
     end

From a70b967919e37311a69f267a49519976244f7c55 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 12 Dec 2023 00:20:27 +0100
Subject: [PATCH 301/590] Set constraints for images in uploader

---
 app/uploaders/base_uploader.rb            | 8 +++++---
 app/views/settings/profile/edit.html.haml | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/uploaders/base_uploader.rb b/app/uploaders/base_uploader.rb
index fea89216..5478042c 100644
--- a/app/uploaders/base_uploader.rb
+++ b/app/uploaders/base_uploader.rb
@@ -11,9 +11,11 @@ class BaseUploader < CarrierWave::Uploader::Base
   # Process cropping on upload
   process :cropping
 
-  def store_dir
-    "/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-  end
+  def content_type_whitelist = %w[image/jpeg image/gif image/png]
+
+  def store_dir = "/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+
+  def size_range = (1.byte)..(2.megabytes)
 
   def paperclip_path
     return "/users/:attachment/:id_partition/:style/:basename.:extension" if APP_CONFIG["fog"].blank?
diff --git a/app/views/settings/profile/edit.html.haml b/app/views/settings/profile/edit.html.haml
index d2311e51..262ddfaf 100644
--- a/app/views/settings/profile/edit.html.haml
+++ b/app/views/settings/profile/edit.html.haml
@@ -7,7 +7,7 @@
           .flex-shrink-0
             = render AvatarComponent.new(user: current_user, size: "lg", classes: ["me-3"])
           .flex-grow-1
-            = f.file_field :profile_picture, accept: APP_CONFIG[:accepted_image_formats].join(","), data: { cropper_target: "input", action: "cropper#change" }
+            = f.file_field :profile_picture, accept: current_user.profile_picture.content_type_whitelist.join(','), data: { cropper_target: "input", action: "cropper#change" }
 
         .row.d-none{ data: { cropper_target: "controls" } }
           .col-sm-10.col-md-8
@@ -22,7 +22,7 @@
           .col-xs-12.col-md-6
             %img.mw-100.me-3{ src: current_user.profile_header.url(:mobile) }
           .col-xs-12.col-md-6.mt-3.mt-sm-0.ps-3.pe-3
-            = f.file_field :profile_header, accept: APP_CONFIG[:accepted_image_formats].join(","), data: { cropper_target: "input", action: "cropper#change" }
+            = f.file_field :profile_header, accept: current_user.profile_header.content_type_whitelist.join(','), data: { cropper_target: "input", action: "cropper#change" }
 
         .row.d-none{ data: { cropper_target: "controls" } }
           .col-sm-10.col-md-8

From 77a801d6ad746ce4b6b126f70e0cb4b5c2aa25bf Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 12 Dec 2023 00:20:40 +0100
Subject: [PATCH 302/590] Remove animation for image uploads

---
 app/uploaders/base_uploader.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/uploaders/base_uploader.rb b/app/uploaders/base_uploader.rb
index 5478042c..c93fbffa 100644
--- a/app/uploaders/base_uploader.rb
+++ b/app/uploaders/base_uploader.rb
@@ -8,7 +8,7 @@ class BaseUploader < CarrierWave::Uploader::Base
   # Store original size
   version :original
 
-  # Process cropping on upload
+  process :remove_animation
   process :cropping
 
   def content_type_whitelist = %w[image/jpeg image/gif image/png]
@@ -33,4 +33,10 @@ class BaseUploader < CarrierWave::Uploader::Base
       image.crop "#{w}x#{h}+#{x}+#{y}"
     end
   end
+
+  def remove_animation
+    return unless content_type == "image/gif"
+
+    manipulate!(&:collapse!)
+  end
 end

From 2721e050c67f87c96861968c7d759f786806be51 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 12 Dec 2023 00:22:36 +0100
Subject: [PATCH 303/590] Remove accepted_image_formats from
 justask.yml.example

---
 config/justask.yml.example | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/config/justask.yml.example b/config/justask.yml.example
index 97616e4c..22f309a4 100644
--- a/config/justask.yml.example
+++ b/config/justask.yml.example
@@ -81,19 +81,6 @@ hcaptcha:
 # TOTP Drift period in seconds
 otp_drift_period: 30
 
-# This list controls the "accept" attribute on file upload fields
-# This ensures mobile users get an appropriate file picker (one for only images)
-# as well as preventing the upload of videos or formats we don't support
-# including making iOS automatically convert HEIC files to JPEG
-accepted_image_formats:
-  - image/jpeg
-  - .jpg
-  - .jpeg
-  - image/png
-  - .png
-  - image/gif
-  - .gif
-
 # This list controls which hosts are excempt from the linkfilter
 # Note: `hostname` is always included by default
 allowed_hosts_in_markdown:

From e119f29680562c58a9df6e7539c40648b7ae59d3 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 17 Dec 2023 22:33:54 +0100
Subject: [PATCH 304/590] Group inputs in ask modal

Co-authored-by: Andreas Nedbal <git@pixelde.su>
---
 app/views/modal/_ask.html.haml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/modal/_ask.html.haml b/app/views/modal/_ask.html.haml
index b6ec7025..403e6a84 100644
--- a/app/views/modal/_ask.html.haml
+++ b/app/views/modal/_ask.html.haml
@@ -12,8 +12,9 @@
           %textarea.form-control{ name: "qb-all-question", placeholder: t(".placeholder"), data: { "character-count-warning-target": "input" } }
           .alert.alert-warning.mt-3.d-none{ data: { "character-count-warning-target": "warning" } }= t('.long_question_warning')
       .modal-footer
-        .float-start.flex-grow-1
+        .flex-grow-1
           %input.form-check-input#qb-send-to-own-inbox{ type: :checkbox }
           %label.form-check-label{ for: 'qb-send-to-own-inbox' }= t('.send_to_own_inbox')
-        %button.btn.btn-default{ type: :button, data: { bs_dismiss: :modal } }= t("voc.cancel")
-        %button.btn.btn-primary{ name: "qb-all-ask", type: :button, data: { loading_text: t(".loading") } }= t(".action")
+        .flex-grow-1.d-flex
+          %button.btn.btn-default.ms-auto{ type: :button, data: { bs_dismiss: :modal } }= t("voc.cancel")
+          %button.btn.btn-primary{ name: "qb-all-ask", type: :button, data: { loading_text: t(".loading") } }= t(".action")

From 4df74d6ff52edd3d809ee8a8c5eb6629374faa6e Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 17 Dec 2023 22:58:25 +0100
Subject: [PATCH 305/590] Ensure errors display when updating profile images

---
 app/controllers/settings/profile_picture_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/settings/profile_picture_controller.rb b/app/controllers/settings/profile_picture_controller.rb
index c44e1200..68359fe7 100644
--- a/app/controllers/settings/profile_picture_controller.rb
+++ b/app/controllers/settings/profile_picture_controller.rb
@@ -12,9 +12,10 @@ class Settings::ProfilePictureController < ApplicationController
       text += t(".notice.profile_header") if user_attributes[:profile_header]
       flash[:success] = text
     else
-      flash[:error] = t(".error")
+      # CarrierWave resets the image to the default upon an error
+      current_user.reload
     end
 
-    redirect_to settings_profile_path
+    render "settings/profile/edit"
   end
 end

From 6d9ef9ee6463752482799a6e551333107fb2ad3e Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 17 Dec 2023 23:04:16 +0100
Subject: [PATCH 306/590] Update test for profile picture controller to render
 form instead of redirecting

---
 spec/controllers/settings/profile_picture_controller_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/controllers/settings/profile_picture_controller_spec.rb b/spec/controllers/settings/profile_picture_controller_spec.rb
index 727e8f61..bb3f464d 100644
--- a/spec/controllers/settings/profile_picture_controller_spec.rb
+++ b/spec/controllers/settings/profile_picture_controller_spec.rb
@@ -32,7 +32,8 @@ describe Settings::ProfilePictureController, type: :controller do
 
       it "redirects to the edit_user_profile page" do
         subject
-        expect(response).to redirect_to(:settings_profile)
+        expect(response).to have_http_status(:ok)
+        expect(response).to have_rendered(:edit)
       end
     end
   end

From 401498eccbaae83929b7e5c77415e41a76aef475 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 17 Dec 2023 23:09:35 +0100
Subject: [PATCH 307/590] Bump upload max filesize

---
 app/uploaders/base_uploader.rb           | 2 +-
 app/uploaders/profile_header_uploader.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/uploaders/base_uploader.rb b/app/uploaders/base_uploader.rb
index c93fbffa..ddf5152c 100644
--- a/app/uploaders/base_uploader.rb
+++ b/app/uploaders/base_uploader.rb
@@ -15,7 +15,7 @@ class BaseUploader < CarrierWave::Uploader::Base
 
   def store_dir = "/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
 
-  def size_range = (1.byte)..(2.megabytes)
+  def size_range = (1.byte)..(5.megabytes)
 
   def paperclip_path
     return "/users/:attachment/:id_partition/:style/:basename.:extension" if APP_CONFIG["fog"].blank?
diff --git a/app/uploaders/profile_header_uploader.rb b/app/uploaders/profile_header_uploader.rb
index 23a47588..649ab10e 100644
--- a/app/uploaders/profile_header_uploader.rb
+++ b/app/uploaders/profile_header_uploader.rb
@@ -1,7 +1,7 @@
 class ProfileHeaderUploader < BaseUploader
-  def default_url(*args)
-    "/images/header/#{[version_name || args.first, 'no_header.jpg'].compact.join('/')}"
-  end
+  def default_url(*args) = "/images/header/#{[version_name || args.first, 'no_header.jpg'].compact.join('/')}"
+
+  def size_range = (1.byte)..(10.megabytes)
 
   version :web do
     process resize_to_fit: [1500, 350]

From 4c6f2807553e6f6947d26db52c0a641f1a786c91 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 17 Dec 2023 23:16:12 +0100
Subject: [PATCH 308/590] Bump version to 2023.1217.0

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index 3bff2a80..a537f1e2 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -17,7 +17,7 @@ module Retrospring
 
     def month = 12
 
-    def day = 9
+    def day = 17
 
     def patch = 0
 

From d5c6d7a867395fd2d76873f31bdb8fcdaf1805ad Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Sun, 17 Dec 2023 23:51:01 +0100
Subject: [PATCH 309/590] Fix missing translation on post comment button

---
 config/locales/views.en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 361315fc..6caf0494 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -129,6 +129,7 @@ en:
       hide: "Answered by"
       pinned: "Pinned"
       comments:
+        action: "Post comment"
         placeholder: "Comment…"
     questionbox:
       title: "Ask something!"

From ddf427feb62123cd4e6647e4dc581a9764dafe24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:02:56 +0000
Subject: [PATCH 310/590] Bump rubocop-rails from 2.22.2 to 2.23.0

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.22.2 to 2.23.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.22.2...v2.23.0)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9d3bcfde..c4638f97 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ group :development, :test do
   gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 4.1", require: false
   gem "rubocop", "~> 1.58"
-  gem "rubocop-rails", "~> 2.22"
+  gem "rubocop-rails", "~> 2.23"
   gem "shoulda-matchers", "~> 5.3"
   gem "simplecov", require: false
   gem "simplecov-cobertura", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 86f3ef14..6fb5c72f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -291,7 +291,7 @@ GEM
       bigdecimal (~> 3.1)
     openssl (3.2.0)
     orm_adapter (0.5.0)
-    parallel (1.23.0)
+    parallel (1.24.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
@@ -416,7 +416,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.22.2)
+    rubocop-rails (2.23.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -572,7 +572,7 @@ DEPENDENCIES
   rspec-rails (~> 6.1)
   rspec-sidekiq (~> 4.1)
   rubocop (~> 1.58)
-  rubocop-rails (~> 2.22)
+  rubocop-rails (~> 2.23)
   rubyzip (~> 2.3)
   sanitize
   sassc-rails

From 81df80f879e44787aa9d4b589647e748113eb0ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:04:31 +0000
Subject: [PATCH 311/590] Bump net-imap from 0.4.7 to 0.4.8

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.7 to 0.4.8.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.7...v0.4.8)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 86f3ef14..b7cebe21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.7)
+    net-imap (0.4.8)
       date
       net-protocol
     net-pop (0.1.2)

From 5ff5c3793f7bb406820c9bcabfa37df64dcaac41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:05:45 +0000
Subject: [PATCH 312/590] Bump eslint from 8.55.0 to 8.56.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.55.0 to 8.56.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.55.0...v8.56.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index b0fc5986..fb1c509a 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "@typescript-eslint/eslint-plugin": "^6.13.2",
     "@typescript-eslint/parser": "^6.13.2",
     "esbuild": "^0.17.0",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.1.0",
diff --git a/yarn.lock b/yarn.lock
index 129237e2..651408ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -185,10 +185,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.55.0":
-  version "8.55.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.55.0.tgz#b721d52060f369aa259cf97392403cb9ce892ec6"
-  integrity sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==
+"@eslint/js@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
+  integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
 
 "@fontsource/lexend@^4.5.15":
   version "4.5.15"
@@ -1008,15 +1008,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.55.0:
-  version "8.55.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.55.0.tgz#078cb7b847d66f2c254ea1794fa395bf8e7e03f8"
-  integrity sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==
+eslint@^8.56.0:
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15"
+  integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.55.0"
+    "@eslint/js" "8.56.0"
     "@humanwhocodes/config-array" "^0.11.13"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"

From ac0ce22001313bd6714dea7ea50752a945cf17ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:06:29 +0000
Subject: [PATCH 313/590] Bump @github/hotkey from 2.3.1 to 3.1.0

Bumps [@github/hotkey](https://github.com/github/hotkey) from 2.3.1 to 3.1.0.
- [Release notes](https://github.com/github/hotkey/releases)
- [Commits](https://github.com/github/hotkey/compare/v2.3.1...v3.1.0)

---
updated-dependencies:
- dependency-name: "@github/hotkey"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b0fc5986..782f9ea3 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@fontsource/lexend": "^4.5.15",
     "@fortawesome/fontawesome-free": "^6.5.1",
-    "@github/hotkey": "^2.3.1",
+    "@github/hotkey": "^3.1.0",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^7.3.0",
     "@melloware/coloris": "^0.22.0",
diff --git a/yarn.lock b/yarn.lock
index 129237e2..680da1e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -200,10 +200,10 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258"
   integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==
 
-"@github/hotkey@^2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-2.3.1.tgz#366011806be0fe5742c13f28eb6790da4422b997"
-  integrity sha512-+aEUEKAsJnnZElLKW5vdXJ9o7g0PXDGN9w54kDm4BorHyQiUVXRLcaDbBS41T62iyO+tqlCO1NuQrYbrbS8Z2Q==
+"@github/hotkey@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-3.1.0.tgz#d8fd55ef4779ecd64f3142be2dd08357fb22d604"
+  integrity sha512-Lj9QjYa+b+Nk5U1nZtlXLdx3HI8/EeM6ZNwBjpYcGVYqpwHdM2ScRH0p7+5zh28JG6SPbTM9+Rb1dFd742qMTw==
 
 "@hotwired/stimulus@^3.2.2":
   version "3.2.2"

From 13db1215832ae27a2af979d3c0638e1f99cab379 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:48:09 +0000
Subject: [PATCH 314/590] Bump github/codeql-action from 2 to 3

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cfe3e67d..87e0af14 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,7 +37,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -48,7 +48,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -62,4 +62,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

From 90f6fc2213cef5560dbc70fad30693cfaea1661a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 21:57:16 +0000
Subject: [PATCH 315/590] Bump rubocop from 1.58.0 to 1.59.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.58.0 to 1.59.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.58.0...v1.59.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a1f731b3..dd509db3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -92,7 +92,7 @@ group :development, :test do
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 4.1", require: false
-  gem "rubocop", "~> 1.58"
+  gem "rubocop", "~> 1.59"
   gem "rubocop-rails", "~> 2.23"
   gem "shoulda-matchers", "~> 5.3"
   gem "simplecov", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 1cc0259f..0dc74f23 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -403,7 +403,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.58.0)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -571,7 +571,7 @@ DEPENDENCIES
   rspec-mocks
   rspec-rails (~> 6.1)
   rspec-sidekiq (~> 4.1)
-  rubocop (~> 1.58)
+  rubocop (~> 1.59)
   rubocop-rails (~> 2.23)
   rubyzip (~> 2.3)
   sanitize

From 79ea1cd103320f0e074d9c1e849da020841fdfe2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 21:58:51 +0000
Subject: [PATCH 316/590] Bump haml_lint from 0.51.0 to 0.52.0

Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.51.0 to 0.52.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.51.0...v0.52.0)

---
updated-dependencies:
- dependency-name: haml_lint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0d3e3f57..b9bf730c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -201,7 +201,7 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    haml_lint (0.51.0)
+    haml_lint (0.52.0)
       haml (>= 4.0)
       parallel (~> 1.10)
       rainbow

From 92b2098ed8e8c2bb15de9f5829d4695a4fe22d74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 22:09:04 +0000
Subject: [PATCH 317/590] Bump oj from 3.16.2 to 3.16.3

Bumps [oj](https://github.com/ohler55/oj) from 3.16.2 to 3.16.3.
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.16.2...v3.16.3)

---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0d3e3f57..00464d4f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.4)
+    bigdecimal (3.1.5)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.17.0)
@@ -287,8 +287,8 @@ GEM
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.2)
-      bigdecimal (~> 3.1)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
     openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.24.0)

From 539868173cb0a63b9edcda5db1a053c23fcde0cc Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Mon, 18 Dec 2023 18:28:19 +0100
Subject: [PATCH 318/590] Fix `has_reacted` and `is_subscribed` not being set

---
 app/controllers/ajax/answer_controller.rb | 3 ---
 app/models/answer.rb                      | 2 +-
 app/models/user.rb                        | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/controllers/ajax/answer_controller.rb b/app/controllers/ajax/answer_controller.rb
index 95651568..ba0f8f7d 100644
--- a/app/controllers/ajax/answer_controller.rb
+++ b/app/controllers/ajax/answer_controller.rb
@@ -44,9 +44,6 @@ class Ajax::AnswerController < AjaxController
 
     return if inbox
 
-    # these assigns are needed because shared/_answerbox rely on them
-    answer.has_reacted = false
-    answer.is_subscribed = false
     @question = 1
     @response[:render] = render_to_string(partial: "answerbox", locals: { a: answer, show_question: false })
   end
diff --git a/app/models/answer.rb b/app/models/answer.rb
index f13880f9..07a261e1 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -1,7 +1,7 @@
 class Answer < ApplicationRecord
   extend Answer::TimelineMethods
 
-  attr_accessor :has_reacted, :is_subscribed
+  attr_writer :has_reacted, :is_subscribed
 
   belongs_to :user, counter_cache: :answered_count
   belongs_to :question, counter_cache: :answer_count
diff --git a/app/models/user.rb b/app/models/user.rb
index 1c4b0762..eb401fcd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -122,7 +122,7 @@ class User < ApplicationRecord
 
     Retrospring::Metrics::QUESTIONS_ANSWERED.increment
 
-    Answer.create!(content:, user: self, question:)
+    Answer.create!(content:, user: self, question:, has_reacted: false, is_subscribed: true)
   end
 
   # has the user answered +question+ yet?

From dd2d861c2bf09136d7a36f9d52ed0bf939925295 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 23:08:11 +0000
Subject: [PATCH 319/590] Bump eslint-plugin-import from 2.29.0 to 2.29.1

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.29.0 to 2.29.1.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.29.0...v2.29.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index fb1c509a..265d5a52 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "@typescript-eslint/parser": "^6.13.2",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-import": "^2.29.1",
     "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.1.0",
     "stylelint-scss": "^5.3.2"
diff --git a/yarn.lock b/yarn.lock
index 651408ff..a8368bb4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -972,10 +972,10 @@ eslint-module-utils@^2.8.0:
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-import@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
-  integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
+eslint-plugin-import@^2.29.1:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
+  integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
   dependencies:
     array-includes "^3.1.7"
     array.prototype.findlastindex "^1.2.3"
@@ -993,7 +993,7 @@ eslint-plugin-import@^2.29.0:
     object.groupby "^1.0.1"
     object.values "^1.1.7"
     semver "^6.3.1"
-    tsconfig-paths "^3.14.2"
+    tsconfig-paths "^3.15.0"
 
 eslint-scope@^7.2.2:
   version "7.2.2"
@@ -2549,10 +2549,10 @@ ts-api-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
   integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
 
-tsconfig-paths@^3.14.2:
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
-  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.2"

From c664c72af16305759f6684506dea67adc61f5a72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 23:12:10 +0000
Subject: [PATCH 320/590] Bump @typescript-eslint/parser from 6.13.2 to 6.15.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.13.2 to 6.15.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.15.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 265d5a52..2040faf8 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.13.2",
+    "@typescript-eslint/parser": "^6.15.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
diff --git a/yarn.lock b/yarn.lock
index a8368bb4..6004c7a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,15 +325,15 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.13.2":
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.13.2.tgz#390b79cc9a57a5f904d197a201cc4b6bc4f9afb9"
-  integrity sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==
+"@typescript-eslint/parser@^6.15.0":
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.15.0.tgz#1af69741cfa314a13c1434d0bdd5a0c3096699d7"
+  integrity sha512-MkgKNnsjC6QwcMdlNAel24jjkEO/0hQaMDLqP4S9zq5HBAUJNQB6y+3DwLjX7b3l2b37eNAxMPLwb3/kh8VKdA==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.13.2"
-    "@typescript-eslint/types" "6.13.2"
-    "@typescript-eslint/typescript-estree" "6.13.2"
-    "@typescript-eslint/visitor-keys" "6.13.2"
+    "@typescript-eslint/scope-manager" "6.15.0"
+    "@typescript-eslint/types" "6.15.0"
+    "@typescript-eslint/typescript-estree" "6.15.0"
+    "@typescript-eslint/visitor-keys" "6.15.0"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@6.13.2":
@@ -344,6 +344,14 @@
     "@typescript-eslint/types" "6.13.2"
     "@typescript-eslint/visitor-keys" "6.13.2"
 
+"@typescript-eslint/scope-manager@6.15.0":
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.15.0.tgz#40e5214a3e9e048aca55ce33381bc61b6b51c32a"
+  integrity sha512-+BdvxYBltqrmgCNu4Li+fGDIkW9n//NrruzG9X1vBzaNK+ExVXPoGB71kneaVw/Jp+4rH/vaMAGC6JfMbHstVg==
+  dependencies:
+    "@typescript-eslint/types" "6.15.0"
+    "@typescript-eslint/visitor-keys" "6.15.0"
+
 "@typescript-eslint/type-utils@6.13.2":
   version "6.13.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz#ebec2da14a6bb7122e0fd31eea72a382c39c6102"
@@ -359,6 +367,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.2.tgz#c044aac24c2f6cefb8e921e397acad5417dd0ae6"
   integrity sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==
 
+"@typescript-eslint/types@6.15.0":
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.15.0.tgz#a9f7b006aee52b0948be6e03f521814bf435ddd5"
+  integrity sha512-yXjbt//E4T/ee8Ia1b5mGlbNj9fB9lJP4jqLbZualwpP2BCQ5is6BcWwxpIsY4XKAhmdv3hrW92GdtJbatC6dQ==
+
 "@typescript-eslint/typescript-estree@6.13.2":
   version "6.13.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz#ae556ee154c1acf025b48d37c3ef95a1d55da258"
@@ -372,6 +385,19 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/typescript-estree@6.15.0":
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.15.0.tgz#2f8a513df1ce5e6e1ba8e5c6aa52f392ae023fc5"
+  integrity sha512-7mVZJN7Hd15OmGuWrp2T9UvqR2Ecg+1j/Bp1jXUEY2GZKV6FXlOIoqVDmLpBiEiq3katvj/2n2mR0SDwtloCew==
+  dependencies:
+    "@typescript-eslint/types" "6.15.0"
+    "@typescript-eslint/visitor-keys" "6.15.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
 "@typescript-eslint/utils@6.13.2":
   version "6.13.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.13.2.tgz#8eb89e53adc6d703a879b131e528807245486f89"
@@ -393,6 +419,14 @@
     "@typescript-eslint/types" "6.13.2"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.15.0":
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.15.0.tgz#5baf97a7bfeec6f4894d400437055155a46b2330"
+  integrity sha512-1zvtdC1a9h5Tb5jU9x3ADNXO9yjP8rXlaoChu0DQX40vf5ACVpYIVIZhIMZ6d5sDXH7vq4dsZBT1fEGj8D2n2w==
+  dependencies:
+    "@typescript-eslint/types" "6.15.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"

From 8eaf6f158426576667aef78dab35f5c5ab22a661 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Dec 2023 00:27:21 +0000
Subject: [PATCH 321/590] Bump @typescript-eslint/eslint-plugin from 6.13.2 to
 6.15.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.13.2 to 6.15.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.15.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 76 +++++++++++++++-------------------------------------
 2 files changed, 22 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index 2040faf8..ad3caeb1 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "typescript": "^5.3.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "@typescript-eslint/eslint-plugin": "^6.15.0",
     "@typescript-eslint/parser": "^6.15.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
diff --git a/yarn.lock b/yarn.lock
index 6004c7a6..02770269 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -308,16 +308,16 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
   integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
-"@typescript-eslint/eslint-plugin@^6.13.2":
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz#2e03506c5362a65e43cb132c37c9ce2d3cb51470"
-  integrity sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==
+"@typescript-eslint/eslint-plugin@^6.15.0":
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.15.0.tgz#b0b3e15fa8c3e67ed4386b765cc0ba98ad3a303b"
+  integrity sha512-j5qoikQqPccq9QoBAupOP+CBu8BaJ8BLjaXSioDISeTZkVO3ig7oSIKh3H+rEpee7xCXtWwSB4KIL5l6hWZzpg==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.13.2"
-    "@typescript-eslint/type-utils" "6.13.2"
-    "@typescript-eslint/utils" "6.13.2"
-    "@typescript-eslint/visitor-keys" "6.13.2"
+    "@typescript-eslint/scope-manager" "6.15.0"
+    "@typescript-eslint/type-utils" "6.15.0"
+    "@typescript-eslint/utils" "6.15.0"
+    "@typescript-eslint/visitor-keys" "6.15.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -336,14 +336,6 @@
     "@typescript-eslint/visitor-keys" "6.15.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.13.2":
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz#5fa4e4adace028dafac212c770640b94e7b61052"
-  integrity sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==
-  dependencies:
-    "@typescript-eslint/types" "6.13.2"
-    "@typescript-eslint/visitor-keys" "6.13.2"
-
 "@typescript-eslint/scope-manager@6.15.0":
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.15.0.tgz#40e5214a3e9e048aca55ce33381bc61b6b51c32a"
@@ -352,39 +344,21 @@
     "@typescript-eslint/types" "6.15.0"
     "@typescript-eslint/visitor-keys" "6.15.0"
 
-"@typescript-eslint/type-utils@6.13.2":
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz#ebec2da14a6bb7122e0fd31eea72a382c39c6102"
-  integrity sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==
+"@typescript-eslint/type-utils@6.15.0":
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.15.0.tgz#c22261bd00566821a300d08f4632533a8f9bed01"
+  integrity sha512-CnmHKTfX6450Bo49hPg2OkIm/D/TVYV7jO1MCfPYGwf6x3GO0VU8YMO5AYMn+u3X05lRRxA4fWCz87GFQV6yVQ==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.13.2"
-    "@typescript-eslint/utils" "6.13.2"
+    "@typescript-eslint/typescript-estree" "6.15.0"
+    "@typescript-eslint/utils" "6.15.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.13.2":
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.13.2.tgz#c044aac24c2f6cefb8e921e397acad5417dd0ae6"
-  integrity sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==
-
 "@typescript-eslint/types@6.15.0":
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.15.0.tgz#a9f7b006aee52b0948be6e03f521814bf435ddd5"
   integrity sha512-yXjbt//E4T/ee8Ia1b5mGlbNj9fB9lJP4jqLbZualwpP2BCQ5is6BcWwxpIsY4XKAhmdv3hrW92GdtJbatC6dQ==
 
-"@typescript-eslint/typescript-estree@6.13.2":
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz#ae556ee154c1acf025b48d37c3ef95a1d55da258"
-  integrity sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==
-  dependencies:
-    "@typescript-eslint/types" "6.13.2"
-    "@typescript-eslint/visitor-keys" "6.13.2"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
 "@typescript-eslint/typescript-estree@6.15.0":
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.15.0.tgz#2f8a513df1ce5e6e1ba8e5c6aa52f392ae023fc5"
@@ -398,27 +372,19 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.13.2":
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.13.2.tgz#8eb89e53adc6d703a879b131e528807245486f89"
-  integrity sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==
+"@typescript-eslint/utils@6.15.0":
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.15.0.tgz#f80dbb79f3b0f569077a8711dd44186a8933fa4c"
+  integrity sha512-eF82p0Wrrlt8fQSRL0bGXzK5nWPRV2dYQZdajcfzOD9+cQz9O7ugifrJxclB+xVOvWvagXfqS4Es7vpLP4augw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.13.2"
-    "@typescript-eslint/types" "6.13.2"
-    "@typescript-eslint/typescript-estree" "6.13.2"
+    "@typescript-eslint/scope-manager" "6.15.0"
+    "@typescript-eslint/types" "6.15.0"
+    "@typescript-eslint/typescript-estree" "6.15.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.13.2":
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz#e0a4a80cf842bb08e6127b903284166ac4a5594c"
-  integrity sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==
-  dependencies:
-    "@typescript-eslint/types" "6.13.2"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.15.0":
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.15.0.tgz#5baf97a7bfeec6f4894d400437055155a46b2330"

From 563926895fc695203920e05b07d9507b3faf9189 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Wed, 20 Dec 2023 10:28:49 +0000
Subject: [PATCH 322/590] Remove duplicate reactions

---
 ...231220100445_remove_duplicate_reactions.rb | 20 +++++++++++++++++++
 db/schema.rb                                  |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20231220100445_remove_duplicate_reactions.rb

diff --git a/db/migrate/20231220100445_remove_duplicate_reactions.rb b/db/migrate/20231220100445_remove_duplicate_reactions.rb
new file mode 100644
index 00000000..d949e40c
--- /dev/null
+++ b/db/migrate/20231220100445_remove_duplicate_reactions.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class RemoveDuplicateReactions < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQUIRREL
+      DELETE FROM reactions
+      WHERE id IN (
+        SELECT id FROM (
+            SELECT id, row_number() over (PARTITION BY parent_type, parent_id, user_id ORDER BY id) AS row_number FROM reactions
+        )s WHERE row_number >= 2
+      )
+    SQUIRREL
+
+    add_index :reactions, %i[parent_type parent_id user_id], unique: true
+  end
+
+  def down
+    remove_index :reactions, %i[parent_type parent_id user_id]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0bc10764..e4990d1f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_12_09_212629) do
+ActiveRecord::Schema[7.0].define(version: 2023_12_20_100445) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -149,6 +149,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_12_09_212629) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["parent_id", "parent_type"], name: "index_reactions_on_parent_id_and_parent_type"
+    t.index ["parent_type", "parent_id", "user_id"], name: "index_reactions_on_parent_type_and_parent_id_and_user_id", unique: true
     t.index ["user_id", "created_at"], name: "index_reactions_on_user_id_and_created_at"
   end
 

From 950443bbb801013cda35eeb83e3cbda8451b8026 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 20 Dec 2023 23:53:22 +0100
Subject: [PATCH 323/590] add ReactionController to disable button during
 submits

---
 .../controllers/reaction_controller.ts            | 15 +++++++++++++++
 .../retrospring/initializers/stimulus.ts          |  2 ++
 app/views/reactions/_create.html.haml             | 14 ++++++++++----
 app/views/reactions/_destroy.html.haml            | 14 ++++++++++----
 4 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 app/javascript/retrospring/controllers/reaction_controller.ts

diff --git a/app/javascript/retrospring/controllers/reaction_controller.ts b/app/javascript/retrospring/controllers/reaction_controller.ts
new file mode 100644
index 00000000..f35fd8ae
--- /dev/null
+++ b/app/javascript/retrospring/controllers/reaction_controller.ts
@@ -0,0 +1,15 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class extends Controller {
+  static targets = ['button'];
+
+  declare readonly buttonTarget: HTMLButtonElement;
+
+  enable(): void {
+    this.buttonTarget.disabled = false;
+  }
+
+  disable(): void {
+    this.buttonTarget.disabled = true;
+  }
+}
diff --git a/app/javascript/retrospring/initializers/stimulus.ts b/app/javascript/retrospring/initializers/stimulus.ts
index 737fe785..505d23ad 100644
--- a/app/javascript/retrospring/initializers/stimulus.ts
+++ b/app/javascript/retrospring/initializers/stimulus.ts
@@ -16,6 +16,7 @@ import NavigationController from "retrospring/controllers/navigation_controller"
 import ShareController from "retrospring/controllers/share_controller";
 import ClipboardController from "retrospring/controllers/clipboard_controller";
 import QuestionboxFocusController from "retrospring/controllers/questionbox_focus_controller";
+import ReactionController from "retrospring/controllers/reaction_controller";
 
 /**
  * This module sets up Stimulus and our controllers
@@ -43,4 +44,5 @@ export default function (): void {
   window['Stimulus'].register('share', ShareController);
   window['Stimulus'].register('clipboard', ClipboardController);
   window['Stimulus'].register('questionbox-focus', QuestionboxFocusController);
+  window['Stimulus'].register('reaction', ReactionController);
 }
diff --git a/app/views/reactions/_create.html.haml b/app/views/reactions/_create.html.haml
index a82c1d60..d756ea89 100644
--- a/app/views/reactions/_create.html.haml
+++ b/app/views/reactions/_create.html.haml
@@ -1,13 +1,19 @@
 - if type == "Answer"
   = button_to create_reactions_path(id: target.id, username: target.user.screen_name),
-              form: { class: "d-inline-block", id: "reaction-#{type}-#{target.id}" },
-              class: "btn btn-link answerbox__action smile" do
+              form: { class: "d-inline-block",
+                      id: "reaction-#{type}-#{target.id}",
+                      data: { controller: :reaction, action: "turbo:submit-start->reaction#disable turbo:submit-end->reaction#enable" } },
+              class: "btn btn-link answerbox__action smile",
+              data: { reaction_target: :button } do
     %i.fa.fa-fw.fa-smile-o
     %span= target.smile_count
 
 - if type == "Comment"
   = button_to create_comment_reactions_path(id: target.id, username: target.user.screen_name),
-              form: { class: "d-inline-block", id: "reaction-#{type}-#{target.id}" },
-              class: "btn btn-link answerbox__action smile" do
+              form: { class: "d-inline-block",
+                      id: "reaction-#{type}-#{target.id}",
+                      data: { controller: :reaction, action: "turbo:submit-start->reaction#disable turbo:submit-end->reaction#enable" } },
+              class: "btn btn-link answerbox__action smile",
+              data: { reaction_target: :button } do
     %i.fa.fa-fw.fa-smile-o
     %span= target.smile_count
diff --git a/app/views/reactions/_destroy.html.haml b/app/views/reactions/_destroy.html.haml
index 23dffdaf..6516f1ef 100644
--- a/app/views/reactions/_destroy.html.haml
+++ b/app/views/reactions/_destroy.html.haml
@@ -1,15 +1,21 @@
 - if type == "Answer"
   = button_to destroy_reactions_path(id: target.id, username: target.user.screen_name),
               method: :delete,
-              form: { class: "d-inline-block", id: "reaction-#{type}-#{target.id}" },
-              class: "btn btn-link answerbox__action unsmile" do
+              form: { class: "d-inline-block",
+                      id: "reaction-#{type}-#{target.id}",
+                      data: { controller: :reaction, action: "turbo:submit-start->reaction#disable turbo:submit-end->reaction#enable" } },
+              class: "btn btn-link answerbox__action unsmile",
+              data: { reaction_target: :button } do
     %i.fa.fa-fw.fa-smile-o
     %span= target.smile_count
 
 - if type == "Comment"
   = button_to destroy_comment_reactions_path(id: target.id, username: target.user.screen_name),
               method: :delete,
-              form: { class: "d-inline-block", id: "reaction-#{type}-#{target.id}" },
-              class: "btn btn-link answerbox__action unsmile" do
+              form: { class: "d-inline-block",
+                      id: "reaction-#{type}-#{target.id}",
+                      data: { controller: :reaction, action: "turbo:submit-start->reaction#disable turbo:submit-end->reaction#enable" } },
+              class: "btn btn-link answerbox__action unsmile",
+              data: { reaction_target: :button } do
     %i.fa.fa-fw.fa-smile-o
     %span= target.smile_count

From d1ac420303bfc4326a0ce0cab29f7d629eee8f3f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 21 Dec 2023 00:06:54 +0100
Subject: [PATCH 324/590] use `question_markdown` helper for questions in
 notifications

---
 app/views/notifications/type/_answer.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/notifications/type/_answer.html.haml b/app/views/notifications/type/_answer.html.haml
index a85836eb..78cdd37d 100644
--- a/app/views/notifications/type/_answer.html.haml
+++ b/app/views/notifications/type/_answer.html.haml
@@ -11,7 +11,7 @@
     .list-group
       .list-group-item
         %h6.notification__list-heading= t("activerecord.models.question.one")
-        = markdown notification.target.question.content[0..60] + (notification.target.question.content.length > 60 ? "[…]" : "")
+        = question_markdown notification.target.question.content[0..60] + (notification.target.question.content.length > 60 ? "[…]" : "")
       .list-group-item
         %h6.notification__list-heading= t("activerecord.models.answer.one")
         = markdown notification.target.content[0..60] + (notification.target.content.length > 60 ? "[…]" : "")

From 97c0494416b9ab87cc31fb043f7bcff69b29aeb3 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Thu, 21 Dec 2023 15:29:38 +0000
Subject: [PATCH 325/590] Bump version to 2023.1221.0

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index a537f1e2..4f9c33d6 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -17,7 +17,7 @@ module Retrospring
 
     def month = 12
 
-    def day = 17
+    def day = 21
 
     def patch = 0
 

From a6b4769a5d5c30599e5c000a1c229a316059b58c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 22 Dec 2023 21:14:35 +0100
Subject: [PATCH 326/590] Switch to supported Nodesource installation method

---
 .docker/ruby/Dockerfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.docker/ruby/Dockerfile b/.docker/ruby/Dockerfile
index 5cba21a9..0b652131 100644
--- a/.docker/ruby/Dockerfile
+++ b/.docker/ruby/Dockerfile
@@ -4,11 +4,17 @@ USER root
 
 ARG UID=1000
 ARG GID=1000
+ARG NODE_MAJOR=16
 
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+RUN apt-get update -qq \
+    && apt-get install -y ca-certificates curl gnupg \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
 RUN apt-get update -qq \
     && apt-get install -y --no-install-recommends build-essential \

From cc3ba3971b6b6ba769b7e0696c3587fb7fa205ea Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 22 Dec 2023 21:28:53 +0100
Subject: [PATCH 327/590] Fix "Content missing" when clicking users in answer
 smile list

---
 app/views/answerbox/_smiles.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/answerbox/_smiles.html.haml b/app/views/answerbox/_smiles.html.haml
index 89e90539..c25626a1 100644
--- a/app/views/answerbox/_smiles.html.haml
+++ b/app/views/answerbox/_smiles.html.haml
@@ -8,5 +8,5 @@
       - a.smiles.all.each do |smile|
         %a{ href: user_path(smile.user),
           title: user_screen_name(smile.user, url: false),
-          data: { bs_toggle: :tooltip, bs_placement: :top, smile_id: smile.id } }
+          data: { bs_toggle: :tooltip, bs_placement: :top, smile_id: smile.id, turbo: :false } }
           = render AvatarComponent.new(user: smile.user, size: "xs")

From 5f4020f1f7b67b70701841849f51b48332a16209 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:23:02 +0000
Subject: [PATCH 328/590] Bump net-imap from 0.4.8 to 0.4.9

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.8 to 0.4.9.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.8...v0.4.9)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e012d931..bebc27c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.8)
+    net-imap (0.4.9)
       date
       net-protocol
     net-pop (0.1.2)

From b47b487a76e59e257bd9261efda4fd8a0af2bb1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:23:22 +0000
Subject: [PATCH 329/590] Bump shoulda-matchers from 5.3.0 to 6.0.0

Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 5.3.0 to 6.0.0.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases)
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v5.3.0...v6.0.0)

---
updated-dependencies:
- dependency-name: shoulda-matchers
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index dd509db3..0d11cc7b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ group :development, :test do
   gem "rspec-sidekiq", "~> 4.1", require: false
   gem "rubocop", "~> 1.59"
   gem "rubocop-rails", "~> 2.23"
-  gem "shoulda-matchers", "~> 5.3"
+  gem "shoulda-matchers", "~> 6.0"
   gem "simplecov", require: false
   gem "simplecov-cobertura", require: false
   gem "simplecov-json", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index e012d931..37b0f4ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -444,7 +444,7 @@ GEM
     sentry-sidekiq (5.15.0)
       sentry-ruby (~> 5.15.0)
       sidekiq (>= 3.0)
-    shoulda-matchers (5.3.0)
+    shoulda-matchers (6.0.0)
       activesupport (>= 5.2.0)
     sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)
@@ -579,7 +579,7 @@ DEPENDENCIES
   sentry-rails
   sentry-ruby
   sentry-sidekiq
-  shoulda-matchers (~> 5.3)
+  shoulda-matchers (~> 6.0)
   sidekiq (< 7)
   simplecov
   simplecov-cobertura

From 3ac6bec8102a6e7523d5833738884ce6dde4d42b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:23:43 +0000
Subject: [PATCH 330/590] Bump rubocop-rails from 2.23.0 to 2.23.1

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.23.0 to 2.23.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.23.0...v2.23.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e012d931..1562bde9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -416,7 +416,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.23.0)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

From b37d1280f296f5fbeac6e7e55eb7370eb5079c90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:25:39 +0000
Subject: [PATCH 331/590] Bump sentry-ruby from 5.15.0 to 5.15.2

Bumps [sentry-ruby](https://github.com/getsentry/sentry-ruby) from 5.15.0 to 5.15.2.
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.15.0...5.15.2)

---
updated-dependencies:
- dependency-name: sentry-ruby
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e012d931..889a8739 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -439,7 +439,7 @@ GEM
     sentry-rails (5.15.0)
       railties (>= 5.0)
       sentry-ruby (~> 5.15.0)
-    sentry-ruby (5.15.0)
+    sentry-ruby (5.15.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
     sentry-sidekiq (5.15.0)
       sentry-ruby (~> 5.15.0)

From 8d648d904ef4b884a6ae76141aef1bf243c81bd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 09:55:14 +0000
Subject: [PATCH 332/590] Bump tj-actions/changed-files from 40 to 41

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/changed-files/compare/v40...v41)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4ff41c67..b4e62114 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v40
+        uses: tj-actions/changed-files@v41
         with:
           files: "**/*.rb"
       - name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v40
+        uses: tj-actions/changed-files@v41
         with:
           files: "**/*.ts"
       - name: Set up Node 16
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v40
+        uses: tj-actions/changed-files@v41
         with:
           files: "**/*.haml"
       - name: Install dependencies
@@ -89,7 +89,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v40
+        uses: tj-actions/changed-files@v41
         with:
           files: "**/*.scss"
       - name: Set up Node 16

From 6c7def0820798291263f6d1e63e11c9fff2d104a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 09:06:15 +0000
Subject: [PATCH 333/590] Bump sentry-sidekiq from 5.15.0 to 5.15.2

Bumps [sentry-sidekiq](https://github.com/getsentry/sentry-ruby) from 5.15.0 to 5.15.2.
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.15.0...5.15.2)

---
updated-dependencies:
- dependency-name: sentry-sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 19140e18..77261baa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -441,8 +441,8 @@ GEM
       sentry-ruby (~> 5.15.0)
     sentry-ruby (5.15.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.15.0)
-      sentry-ruby (~> 5.15.0)
+    sentry-sidekiq (5.15.2)
+      sentry-ruby (~> 5.15.2)
       sidekiq (>= 3.0)
     shoulda-matchers (6.0.0)
       activesupport (>= 5.2.0)

From 1a57c87a4cf2475a31fa1e3b72cdafce27f7e727 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 09:06:36 +0000
Subject: [PATCH 334/590] Bump sentry-rails from 5.15.0 to 5.15.2

Bumps [sentry-rails](https://github.com/getsentry/sentry-ruby) from 5.15.0 to 5.15.2.
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.15.0...5.15.2)

---
updated-dependencies:
- dependency-name: sentry-rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 19140e18..0895a094 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -284,7 +284,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.5)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)
@@ -436,9 +436,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-rails (5.15.0)
+    sentry-rails (5.15.2)
       railties (>= 5.0)
-      sentry-ruby (~> 5.15.0)
+      sentry-ruby (~> 5.15.2)
     sentry-ruby (5.15.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
     sentry-sidekiq (5.15.0)

From 60025df5cf68911ff4a1f115cda994f09b7818ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 09:06:56 +0000
Subject: [PATCH 335/590] Bump factory_bot_rails from 6.4.2 to 6.4.3

Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 6.4.2 to 6.4.3.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/main/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.4.2...v6.4.3)

---
updated-dependencies:
- dependency-name: factory_bot_rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 19140e18..dc25ae24 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,9 +165,9 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     excon (0.104.0)
-    factory_bot (6.4.2)
+    factory_bot (6.4.5)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.2)
+    factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     fake_email_validator (1.0.11)
@@ -284,7 +284,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.5)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)

From bd263d4e72449ffccd827b390d815d8390bb20fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 09:39:15 +0000
Subject: [PATCH 336/590] Bump @typescript-eslint/eslint-plugin from 6.15.0 to
 6.16.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.15.0 to 6.16.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.16.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 91 ++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 099cf126..4aae04e0 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "typescript": "^5.3.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.15.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
diff --git a/yarn.lock b/yarn.lock
index 75e4db78..50b155c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -308,16 +308,16 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
   integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
-"@typescript-eslint/eslint-plugin@^6.15.0":
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.15.0.tgz#b0b3e15fa8c3e67ed4386b765cc0ba98ad3a303b"
-  integrity sha512-j5qoikQqPccq9QoBAupOP+CBu8BaJ8BLjaXSioDISeTZkVO3ig7oSIKh3H+rEpee7xCXtWwSB4KIL5l6hWZzpg==
+"@typescript-eslint/eslint-plugin@^6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.16.0.tgz#cc29fbd208ea976de3db7feb07755bba0ce8d8bc"
+  integrity sha512-O5f7Kv5o4dLWQtPX4ywPPa+v9G+1q1x8mz0Kr0pXUtKsevo+gIJHLkGc8RxaZWtP8RrhwhSNIWThnW42K9/0rQ==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.15.0"
-    "@typescript-eslint/type-utils" "6.15.0"
-    "@typescript-eslint/utils" "6.15.0"
-    "@typescript-eslint/visitor-keys" "6.15.0"
+    "@typescript-eslint/scope-manager" "6.16.0"
+    "@typescript-eslint/type-utils" "6.16.0"
+    "@typescript-eslint/utils" "6.16.0"
+    "@typescript-eslint/visitor-keys" "6.16.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -344,13 +344,21 @@
     "@typescript-eslint/types" "6.15.0"
     "@typescript-eslint/visitor-keys" "6.15.0"
 
-"@typescript-eslint/type-utils@6.15.0":
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.15.0.tgz#c22261bd00566821a300d08f4632533a8f9bed01"
-  integrity sha512-CnmHKTfX6450Bo49hPg2OkIm/D/TVYV7jO1MCfPYGwf6x3GO0VU8YMO5AYMn+u3X05lRRxA4fWCz87GFQV6yVQ==
+"@typescript-eslint/scope-manager@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.16.0.tgz#f3e9a00fbc1d0701356359cd56489c54d9e37168"
+  integrity sha512-0N7Y9DSPdaBQ3sqSCwlrm9zJwkpOuc6HYm7LpzLAPqBL7dmzAUimr4M29dMkOP/tEwvOCC/Cxo//yOfJD3HUiw==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.15.0"
-    "@typescript-eslint/utils" "6.15.0"
+    "@typescript-eslint/types" "6.16.0"
+    "@typescript-eslint/visitor-keys" "6.16.0"
+
+"@typescript-eslint/type-utils@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.16.0.tgz#5f21c3e49e540ad132dc87fc99af463c184d5ed1"
+  integrity sha512-ThmrEOcARmOnoyQfYkHw/DX2SEYBalVECmoldVuH6qagKROp/jMnfXpAU/pAIWub9c4YTxga+XwgAkoA0pxfmg==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.16.0"
+    "@typescript-eslint/utils" "6.16.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
@@ -359,6 +367,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.15.0.tgz#a9f7b006aee52b0948be6e03f521814bf435ddd5"
   integrity sha512-yXjbt//E4T/ee8Ia1b5mGlbNj9fB9lJP4jqLbZualwpP2BCQ5is6BcWwxpIsY4XKAhmdv3hrW92GdtJbatC6dQ==
 
+"@typescript-eslint/types@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.16.0.tgz#a3abe0045737d44d8234708d5ed8fef5d59dc91e"
+  integrity sha512-hvDFpLEvTJoHutVl87+MG/c5C8I6LOgEx05zExTSJDEVU7hhR3jhV8M5zuggbdFCw98+HhZWPHZeKS97kS3JoQ==
+
 "@typescript-eslint/typescript-estree@6.15.0":
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.15.0.tgz#2f8a513df1ce5e6e1ba8e5c6aa52f392ae023fc5"
@@ -372,17 +385,31 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.15.0":
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.15.0.tgz#f80dbb79f3b0f569077a8711dd44186a8933fa4c"
-  integrity sha512-eF82p0Wrrlt8fQSRL0bGXzK5nWPRV2dYQZdajcfzOD9+cQz9O7ugifrJxclB+xVOvWvagXfqS4Es7vpLP4augw==
+"@typescript-eslint/typescript-estree@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.16.0.tgz#d6e0578e4f593045f0df06c4b3a22bd6f13f2d03"
+  integrity sha512-VTWZuixh/vr7nih6CfrdpmFNLEnoVBF1skfjdyGnNwXOH1SLeHItGdZDHhhAIzd3ACazyY2Fg76zuzOVTaknGA==
+  dependencies:
+    "@typescript-eslint/types" "6.16.0"
+    "@typescript-eslint/visitor-keys" "6.16.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.16.0.tgz#1c291492d34670f9210d2b7fcf6b402bea3134ae"
+  integrity sha512-T83QPKrBm6n//q9mv7oiSvy/Xq/7Hyw9SzSEhMHJwznEmQayfBM87+oAlkNAMEO7/MjIwKyOHgBJbxB0s7gx2A==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.15.0"
-    "@typescript-eslint/types" "6.15.0"
-    "@typescript-eslint/typescript-estree" "6.15.0"
+    "@typescript-eslint/scope-manager" "6.16.0"
+    "@typescript-eslint/types" "6.16.0"
+    "@typescript-eslint/typescript-estree" "6.16.0"
     semver "^7.5.4"
 
 "@typescript-eslint/visitor-keys@6.15.0":
@@ -393,6 +420,14 @@
     "@typescript-eslint/types" "6.15.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.16.0":
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.16.0.tgz#d50da18a05d91318ed3e7e8889bda0edc35f3a10"
+  integrity sha512-QSFQLruk7fhs91a/Ep/LqRdbJCZ1Rq03rqBdKT5Ky17Sz8zRLUksqIe9DW0pKtg/Z35/ztbLQ6qpOCN6rOC11A==
+  dependencies:
+    "@typescript-eslint/types" "6.16.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
@@ -581,6 +616,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -1851,6 +1893,13 @@ min-indent@^1.0.1:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+minimatch@9.0.3:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"

From 695cf984e5bb3490848012658e5f0ba1ef4a9d58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jan 2024 09:39:25 +0000
Subject: [PATCH 337/590] Bump sass from 1.69.5 to 1.69.6

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.5 to 1.69.6.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.5...1.69.6)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 099cf126..78404151 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.69.5",
+    "sass": "^1.69.6",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.3.3"
diff --git a/yarn.lock b/yarn.lock
index 75e4db78..e5e6e197 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2212,10 +2212,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.69.5:
-  version "1.69.5"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde"
-  integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==
+sass@^1.69.6:
+  version "1.69.6"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.6.tgz#88ae1f93facc46d2da9b0bdd652d65068bcfa397"
+  integrity sha512-qbRr3k9JGHWXCvZU77SD2OTwUlC+gNT+61JOLcmLm+XqH4h/5D+p4IIsxvpkB89S9AwJOyb5+rWNpIucaFxSFQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 4ec85df4f777ea0cd9e1254bb601a49fdf4d3164 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 22:05:05 +0000
Subject: [PATCH 338/590] Bump view_component from 3.8.0 to 3.9.0

Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.8.0 to 3.9.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.8.0...v3.9.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 19140e18..823f9815 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -491,7 +491,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    view_component (3.8.0)
+    view_component (3.9.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

From 3a16498b98d9aed74b62b9e5ceedfda1127638e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 7 Jan 2024 00:18:02 +0000
Subject: [PATCH 339/590] Bump @typescript-eslint/parser from 6.15.0 to 6.18.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.15.0 to 6.18.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.18.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 83 ++++++++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index d56c5bb8..067e3f85 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.15.0",
+    "@typescript-eslint/parser": "^6.18.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
diff --git a/yarn.lock b/yarn.lock
index 6d49ffd8..d5d6947f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,25 +325,17 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.15.0":
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.15.0.tgz#1af69741cfa314a13c1434d0bdd5a0c3096699d7"
-  integrity sha512-MkgKNnsjC6QwcMdlNAel24jjkEO/0hQaMDLqP4S9zq5HBAUJNQB6y+3DwLjX7b3l2b37eNAxMPLwb3/kh8VKdA==
+"@typescript-eslint/parser@^6.18.0":
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.18.0.tgz#d494161d64832e869f0a6acc6000a2cdff858383"
+  integrity sha512-v6uR68SFvqhNQT41frCMCQpsP+5vySy6IdgjlzUWoo7ALCnpaWYcz/Ij2k4L8cEsL0wkvOviCMpjmtRtHNOKzA==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.15.0"
-    "@typescript-eslint/types" "6.15.0"
-    "@typescript-eslint/typescript-estree" "6.15.0"
-    "@typescript-eslint/visitor-keys" "6.15.0"
+    "@typescript-eslint/scope-manager" "6.18.0"
+    "@typescript-eslint/types" "6.18.0"
+    "@typescript-eslint/typescript-estree" "6.18.0"
+    "@typescript-eslint/visitor-keys" "6.18.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.15.0":
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.15.0.tgz#40e5214a3e9e048aca55ce33381bc61b6b51c32a"
-  integrity sha512-+BdvxYBltqrmgCNu4Li+fGDIkW9n//NrruzG9X1vBzaNK+ExVXPoGB71kneaVw/Jp+4rH/vaMAGC6JfMbHstVg==
-  dependencies:
-    "@typescript-eslint/types" "6.15.0"
-    "@typescript-eslint/visitor-keys" "6.15.0"
-
 "@typescript-eslint/scope-manager@6.16.0":
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.16.0.tgz#f3e9a00fbc1d0701356359cd56489c54d9e37168"
@@ -352,6 +344,14 @@
     "@typescript-eslint/types" "6.16.0"
     "@typescript-eslint/visitor-keys" "6.16.0"
 
+"@typescript-eslint/scope-manager@6.18.0":
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.0.tgz#24ca6fc1f4a2afa71122dcfca9282878687d9997"
+  integrity sha512-o/UoDT2NgOJ2VfHpfr+KBY2ErWvCySNUIX/X7O9g8Zzt/tXdpfEU43qbNk8LVuWUT2E0ptzTWXh79i74PP0twA==
+  dependencies:
+    "@typescript-eslint/types" "6.18.0"
+    "@typescript-eslint/visitor-keys" "6.18.0"
+
 "@typescript-eslint/type-utils@6.16.0":
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.16.0.tgz#5f21c3e49e540ad132dc87fc99af463c184d5ed1"
@@ -362,28 +362,15 @@
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.15.0":
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.15.0.tgz#a9f7b006aee52b0948be6e03f521814bf435ddd5"
-  integrity sha512-yXjbt//E4T/ee8Ia1b5mGlbNj9fB9lJP4jqLbZualwpP2BCQ5is6BcWwxpIsY4XKAhmdv3hrW92GdtJbatC6dQ==
-
 "@typescript-eslint/types@6.16.0":
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.16.0.tgz#a3abe0045737d44d8234708d5ed8fef5d59dc91e"
   integrity sha512-hvDFpLEvTJoHutVl87+MG/c5C8I6LOgEx05zExTSJDEVU7hhR3jhV8M5zuggbdFCw98+HhZWPHZeKS97kS3JoQ==
 
-"@typescript-eslint/typescript-estree@6.15.0":
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.15.0.tgz#2f8a513df1ce5e6e1ba8e5c6aa52f392ae023fc5"
-  integrity sha512-7mVZJN7Hd15OmGuWrp2T9UvqR2Ecg+1j/Bp1jXUEY2GZKV6FXlOIoqVDmLpBiEiq3katvj/2n2mR0SDwtloCew==
-  dependencies:
-    "@typescript-eslint/types" "6.15.0"
-    "@typescript-eslint/visitor-keys" "6.15.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+"@typescript-eslint/types@6.18.0":
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.0.tgz#ffce610a1540c17cf7d8ecf2bb34b8b0e2e77101"
+  integrity sha512-/RFVIccwkwSdW/1zeMx3hADShWbgBxBnV/qSrex6607isYjj05t36P6LyONgqdUrNLl5TYU8NIKdHUYpFvExkA==
 
 "@typescript-eslint/typescript-estree@6.16.0":
   version "6.16.0"
@@ -399,6 +386,20 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/typescript-estree@6.18.0":
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.0.tgz#1c357c3ca435c3cfa2af6b9daf45ca0bc2bb059a"
+  integrity sha512-klNvl+Ql4NsBNGB4W9TZ2Od03lm7aGvTbs0wYaFYsplVPhr+oeXjlPZCDI4U9jgJIDK38W1FKhacCFzCC+nbIg==
+  dependencies:
+    "@typescript-eslint/types" "6.18.0"
+    "@typescript-eslint/visitor-keys" "6.18.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
 "@typescript-eslint/utils@6.16.0":
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.16.0.tgz#1c291492d34670f9210d2b7fcf6b402bea3134ae"
@@ -412,14 +413,6 @@
     "@typescript-eslint/typescript-estree" "6.16.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.15.0":
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.15.0.tgz#5baf97a7bfeec6f4894d400437055155a46b2330"
-  integrity sha512-1zvtdC1a9h5Tb5jU9x3ADNXO9yjP8rXlaoChu0DQX40vf5ACVpYIVIZhIMZ6d5sDXH7vq4dsZBT1fEGj8D2n2w==
-  dependencies:
-    "@typescript-eslint/types" "6.15.0"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.16.0":
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.16.0.tgz#d50da18a05d91318ed3e7e8889bda0edc35f3a10"
@@ -428,6 +421,14 @@
     "@typescript-eslint/types" "6.16.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.18.0":
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.0.tgz#3c8733737786fa6c78a347b4fa306ae7155b560f"
+  integrity sha512-1wetAlSZpewRDb2h9p/Q8kRjdGuqdTAQbkJIOUMLug2LBLG+QOjiWoSj6/3B/hA9/tVTFFdtiKvAYoYnSRW/RA==
+  dependencies:
+    "@typescript-eslint/types" "6.18.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"

From ba01f4adb57802037eda17aab9c8f81697827feb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:10:31 +0000
Subject: [PATCH 340/590] Bump sass from 1.69.6 to 1.69.7

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.6 to 1.69.7.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.6...1.69.7)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 067e3f85..f9743628 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.69.6",
+    "sass": "^1.69.7",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.3.3"
diff --git a/yarn.lock b/yarn.lock
index d5d6947f..ee041945 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2262,10 +2262,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.69.6:
-  version "1.69.6"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.6.tgz#88ae1f93facc46d2da9b0bdd652d65068bcfa397"
-  integrity sha512-qbRr3k9JGHWXCvZU77SD2OTwUlC+gNT+61JOLcmLm+XqH4h/5D+p4IIsxvpkB89S9AwJOyb5+rWNpIucaFxSFQ==
+sass@^1.69.7:
+  version "1.69.7"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.7.tgz#6e7e1c8f51e8162faec3e9619babc7da780af3b7"
+  integrity sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From b2c5a59f5799779357084b03214bde8d3419a6fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:11:15 +0000
Subject: [PATCH 341/590] Bump @typescript-eslint/eslint-plugin from 6.16.0 to
 6.18.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.16.0 to 6.18.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.18.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 77 ++++++++++++++--------------------------------------
 2 files changed, 22 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index 067e3f85..11574040 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "typescript": "^5.3.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
     "@typescript-eslint/parser": "^6.18.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
diff --git a/yarn.lock b/yarn.lock
index d5d6947f..9d2c73f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -308,16 +308,16 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
   integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
-"@typescript-eslint/eslint-plugin@^6.16.0":
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.16.0.tgz#cc29fbd208ea976de3db7feb07755bba0ce8d8bc"
-  integrity sha512-O5f7Kv5o4dLWQtPX4ywPPa+v9G+1q1x8mz0Kr0pXUtKsevo+gIJHLkGc8RxaZWtP8RrhwhSNIWThnW42K9/0rQ==
+"@typescript-eslint/eslint-plugin@^6.18.0":
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.18.0.tgz#94b86f3c25b468c714a04bd490017ecec2fd3746"
+  integrity sha512-3lqEvQUdCozi6d1mddWqd+kf8KxmGq2Plzx36BlkjuQe3rSTm/O98cLf0A4uDO+a5N1KD2SeEEl6fW97YHY+6w==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.16.0"
-    "@typescript-eslint/type-utils" "6.16.0"
-    "@typescript-eslint/utils" "6.16.0"
-    "@typescript-eslint/visitor-keys" "6.16.0"
+    "@typescript-eslint/scope-manager" "6.18.0"
+    "@typescript-eslint/type-utils" "6.18.0"
+    "@typescript-eslint/utils" "6.18.0"
+    "@typescript-eslint/visitor-keys" "6.18.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -336,14 +336,6 @@
     "@typescript-eslint/visitor-keys" "6.18.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.16.0":
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.16.0.tgz#f3e9a00fbc1d0701356359cd56489c54d9e37168"
-  integrity sha512-0N7Y9DSPdaBQ3sqSCwlrm9zJwkpOuc6HYm7LpzLAPqBL7dmzAUimr4M29dMkOP/tEwvOCC/Cxo//yOfJD3HUiw==
-  dependencies:
-    "@typescript-eslint/types" "6.16.0"
-    "@typescript-eslint/visitor-keys" "6.16.0"
-
 "@typescript-eslint/scope-manager@6.18.0":
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.0.tgz#24ca6fc1f4a2afa71122dcfca9282878687d9997"
@@ -352,40 +344,21 @@
     "@typescript-eslint/types" "6.18.0"
     "@typescript-eslint/visitor-keys" "6.18.0"
 
-"@typescript-eslint/type-utils@6.16.0":
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.16.0.tgz#5f21c3e49e540ad132dc87fc99af463c184d5ed1"
-  integrity sha512-ThmrEOcARmOnoyQfYkHw/DX2SEYBalVECmoldVuH6qagKROp/jMnfXpAU/pAIWub9c4YTxga+XwgAkoA0pxfmg==
+"@typescript-eslint/type-utils@6.18.0":
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.18.0.tgz#a492da599da5c38c70aa9ff9bfb473961b8ae663"
+  integrity sha512-ZeMtrXnGmTcHciJN1+u2CigWEEXgy1ufoxtWcHORt5kGvpjjIlK9MUhzHm4RM8iVy6dqSaZA/6PVkX6+r+ChjQ==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.16.0"
-    "@typescript-eslint/utils" "6.16.0"
+    "@typescript-eslint/typescript-estree" "6.18.0"
+    "@typescript-eslint/utils" "6.18.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.16.0":
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.16.0.tgz#a3abe0045737d44d8234708d5ed8fef5d59dc91e"
-  integrity sha512-hvDFpLEvTJoHutVl87+MG/c5C8I6LOgEx05zExTSJDEVU7hhR3jhV8M5zuggbdFCw98+HhZWPHZeKS97kS3JoQ==
-
 "@typescript-eslint/types@6.18.0":
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.0.tgz#ffce610a1540c17cf7d8ecf2bb34b8b0e2e77101"
   integrity sha512-/RFVIccwkwSdW/1zeMx3hADShWbgBxBnV/qSrex6607isYjj05t36P6LyONgqdUrNLl5TYU8NIKdHUYpFvExkA==
 
-"@typescript-eslint/typescript-estree@6.16.0":
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.16.0.tgz#d6e0578e4f593045f0df06c4b3a22bd6f13f2d03"
-  integrity sha512-VTWZuixh/vr7nih6CfrdpmFNLEnoVBF1skfjdyGnNwXOH1SLeHItGdZDHhhAIzd3ACazyY2Fg76zuzOVTaknGA==
-  dependencies:
-    "@typescript-eslint/types" "6.16.0"
-    "@typescript-eslint/visitor-keys" "6.16.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
 "@typescript-eslint/typescript-estree@6.18.0":
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.0.tgz#1c357c3ca435c3cfa2af6b9daf45ca0bc2bb059a"
@@ -400,27 +373,19 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.16.0":
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.16.0.tgz#1c291492d34670f9210d2b7fcf6b402bea3134ae"
-  integrity sha512-T83QPKrBm6n//q9mv7oiSvy/Xq/7Hyw9SzSEhMHJwznEmQayfBM87+oAlkNAMEO7/MjIwKyOHgBJbxB0s7gx2A==
+"@typescript-eslint/utils@6.18.0":
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.18.0.tgz#4d07c9c08f84b9939a1aca7aef98c8f378936142"
+  integrity sha512-wiKKCbUeDPGaYEYQh1S580dGxJ/V9HI7K5sbGAVklyf+o5g3O+adnS4UNJajplF4e7z2q0uVBaTdT/yLb4XAVA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.16.0"
-    "@typescript-eslint/types" "6.16.0"
-    "@typescript-eslint/typescript-estree" "6.16.0"
+    "@typescript-eslint/scope-manager" "6.18.0"
+    "@typescript-eslint/types" "6.18.0"
+    "@typescript-eslint/typescript-estree" "6.18.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.16.0":
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.16.0.tgz#d50da18a05d91318ed3e7e8889bda0edc35f3a10"
-  integrity sha512-QSFQLruk7fhs91a/Ep/LqRdbJCZ1Rq03rqBdKT5Ky17Sz8zRLUksqIe9DW0pKtg/Z35/ztbLQ6qpOCN6rOC11A==
-  dependencies:
-    "@typescript-eslint/types" "6.16.0"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.18.0":
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.0.tgz#3c8733737786fa6c78a347b4fa306ae7155b560f"

From 1609fb9d5a99c801bd971a2fd9a74f460690be6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:21:30 +0000
Subject: [PATCH 342/590] Bump bullet from 7.1.4 to 7.1.5

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.4 to 7.1.5.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.4...7.1.5)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70ce5670..9273402c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,7 +106,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.2.4)
-    bullet (7.1.4)
+    bullet (7.1.5)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     carrierwave (2.1.0)

From ac4cf082b325292791bce398faa64752e564fc2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:22:21 +0000
Subject: [PATCH 343/590] Bump jsbundling-rails from 1.2.1 to 1.2.2

Bumps [jsbundling-rails](https://github.com/rails/jsbundling-rails) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/rails/jsbundling-rails/releases)
- [Commits](https://github.com/rails/jsbundling-rails/compare/v1.2.1...v1.2.2)

---
updated-dependencies:
- dependency-name: jsbundling-rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70ce5670..5f4d497a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -221,7 +221,7 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    jsbundling-rails (1.2.1)
+    jsbundling-rails (1.2.2)
       railties (>= 6.0.0)
     json (2.7.1)
     json-schema (4.1.1)

From a500de4da5c34e6914be460965a47d3226b8668b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:23:00 +0000
Subject: [PATCH 344/590] Bump puma from 6.4.0 to 6.4.2

Bumps [puma](https://github.com/puma/puma) from 6.4.0 to 6.4.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.4.0...v6.4.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70ce5670..cadc3f55 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -283,7 +283,7 @@ GEM
       timeout
     net-smtp (0.4.0)
       net-protocol
-    nio4r (2.5.9)
+    nio4r (2.7.0)
     nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -300,7 +300,7 @@ GEM
       activerecord (>= 6)
     prometheus-client (4.2.2)
     public_suffix (5.0.3)
-    puma (6.4.0)
+    puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.1)
       activesupport (>= 3.0.0)

From 2ea90791b17c52a06e9f2e5a7755c8f496df909c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:23:40 +0000
Subject: [PATCH 345/590] Bump fog-core from 2.3.0 to 2.4.0

Bumps [fog-core](https://github.com/fog/fog-core) from 2.3.0 to 2.4.0.
- [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md)
- [Commits](https://github.com/fog/fog-core/compare/v2.3.0...v2.4.0)

---
updated-dependencies:
- dependency-name: fog-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70ce5670..e81aa5d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -164,7 +164,7 @@ GEM
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
     erubi (1.12.0)
-    excon (0.104.0)
+    excon (0.109.0)
     factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
@@ -180,7 +180,7 @@ GEM
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
-    fog-core (2.3.0)
+    fog-core (2.4.0)
       builder
       excon (~> 0.71)
       formatador (>= 0.2, < 2.0)
@@ -256,9 +256,9 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (1.0.2)
     method_source (1.0.0)
-    mime-types (3.5.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1003)
+    mime-types-data (3.2023.1205)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake

From 3a15af0f23d51b2fbb53d3cbe190b6a42ef9e073 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:24:29 +0000
Subject: [PATCH 346/590] Bump dry-types from 1.7.1 to 1.7.2

Bumps [dry-types](https://github.com/dry-rb/dry-types) from 1.7.1 to 1.7.2.
- [Release notes](https://github.com/dry-rb/dry-types/releases)
- [Changelog](https://github.com/dry-rb/dry-types/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dry-rb/dry-types/compare/v1.7.1...v1.7.2)

---
updated-dependencies:
- dependency-name: dry-types
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70ce5670..8bb67110 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,7 +157,8 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-types (1.7.1)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)

From 98847bf9e3ddaaadb351813f289530d7ac328f7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:25:01 +0000
Subject: [PATCH 347/590] Bump net-smtp from 0.4.0 to 0.4.0.1

Bumps [net-smtp](https://github.com/ruby/net-smtp) from 0.4.0 to 0.4.0.1.
- [Release notes](https://github.com/ruby/net-smtp/releases)
- [Changelog](https://github.com/ruby/net-smtp/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/net-smtp/compare/v0.4.0...v0.4.0.1)

---
updated-dependencies:
- dependency-name: net-smtp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70ce5670..ee45c008 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -281,7 +281,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.16.0)

From dd9e1d573bddc354a68427661686664e5455af57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 09:26:33 +0000
Subject: [PATCH 348/590] Bump net-imap from 0.4.9 to 0.4.9.1

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.9 to 0.4.9.1.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.9...v0.4.9.1)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 70ce5670..1aa4126f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.9)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-pop (0.1.2)

From c7542e005c737a07e12da7d814f8506556a81199 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 14 Jan 2024 15:13:37 +0100
Subject: [PATCH 349/590] Fix button rounding in mute settings

---
 app/assets/stylesheets/overrides/_inputs.scss | 6 ++++++
 app/views/settings/mutes/_form.html.haml      | 3 +--
 app/views/settings/mutes/_rule.html.haml      | 5 ++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/overrides/_inputs.scss b/app/assets/stylesheets/overrides/_inputs.scss
index aa89b202..2e29a938 100644
--- a/app/assets/stylesheets/overrides/_inputs.scss
+++ b/app/assets/stylesheets/overrides/_inputs.scss
@@ -29,3 +29,9 @@
 .form-check-input:focus {
   box-shadow: rgba(var(--primary-rgb), 0.25) 0 0 0 0.25rem;
 }
+
+.input-group .button_to .btn {
+  margin-left: -1px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
diff --git a/app/views/settings/mutes/_form.html.haml b/app/views/settings/mutes/_form.html.haml
index ba13cd14..06c1e610 100644
--- a/app/views/settings/mutes/_form.html.haml
+++ b/app/views/settings/mutes/_form.html.haml
@@ -2,5 +2,4 @@
   %form{ action: settings_muted_path, method: "post" }
     .input-group
       %input.form-control#muted-phrase{ name: :muted_phrase, placeholder: t(".placeholder"), required: true, minlength: 1, data: { controller: :autofocus } }
-      .input-group-append
-        %button.btn.btn-primary{ type: "submit" }= t("voc.add")
+      %button.btn.btn-primary{ type: "submit" }= t("voc.add")
diff --git a/app/views/settings/mutes/_rule.html.haml b/app/views/settings/mutes/_rule.html.haml
index 0bee6d13..a6322acc 100644
--- a/app/views/settings/mutes/_rule.html.haml
+++ b/app/views/settings/mutes/_rule.html.haml
@@ -1,6 +1,5 @@
 .form-group.mb-3{ id: "rule_#{rule.id}" }
   .input-group
     %input.form-control{ disabled: true, value: rule.muted_phrase }
-    .input-group-append
-      = button_to settings_muted_destroy_path(rule.id), method: :delete, class: "btn btn-danger" do
-        = t("voc.remove")
+    = button_to settings_muted_destroy_path(rule.id), method: :delete, class: "btn btn-danger" do
+      = t("voc.remove")

From de9c84085def208602dd7d4f680427f3380e8df0 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 14 Jan 2024 15:21:23 +0100
Subject: [PATCH 350/590] Fix stylelint nits

---
 app/assets/stylesheets/overrides/_inputs.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/overrides/_inputs.scss b/app/assets/stylesheets/overrides/_inputs.scss
index 2e29a938..650d7542 100644
--- a/app/assets/stylesheets/overrides/_inputs.scss
+++ b/app/assets/stylesheets/overrides/_inputs.scss
@@ -32,6 +32,6 @@
 
 .input-group .button_to .btn {
   margin-left: -1px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }

From 8b55b2fe81509117d72e1833d3db4de2e33c6bf2 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 14 Jan 2024 13:14:04 +0100
Subject: [PATCH 351/590] Fix anonymous block model associations

---
 app/models/question.rb | 1 +
 app/models/user.rb     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/question.rb b/app/models/question.rb
index 0a6adec0..84f5faf6 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -2,6 +2,7 @@ class Question < ApplicationRecord
   include Question::AnswerMethods
 
   belongs_to :user, optional: true
+  has_many :anonymous_blocks, dependent: :nullify
   has_many :answers, dependent: :destroy
   has_many :inboxes, dependent: :destroy
 
diff --git a/app/models/user.rb b/app/models/user.rb
index eb401fcd..e91aeeb9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -40,7 +40,6 @@ class User < ApplicationRecord
   has_many :lists, dependent: :destroy_async
   has_many :list_memberships, class_name: "ListMember", dependent: :destroy_async
   has_many :mute_rules, dependent: :destroy_async
-  has_many :anonymous_blocks, dependent: :destroy_async
 
   has_many :subscriptions, dependent: :destroy_async
   has_many :totp_recovery_codes, dependent: :destroy_async
@@ -54,6 +53,11 @@ class User < ApplicationRecord
                           foreign_key: "banned_by_id",
                           dependent:   :nullify
 
+  has_many :anonymous_blocks, dependent: :destroy_async
+  has_many :passive_anonymous_blocks, class_name: "AnonymousBlock",
+                                      foreign_key: "target_user_id",
+                                      dependent: :nullify
+
   SCREEN_NAME_REGEX = /\A[a-zA-Z0-9_]+\z/
   WEBSITE_REGEX = /https?:\/\/([A-Za-z.-]+)\/?(?:.*)/i
 

From 9f823b3dd473ed7d4b705b6c3f9b44e000f9027d Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 14 Jan 2024 13:36:52 +0100
Subject: [PATCH 352/590] Fix rubocop nits

---
 app/models/user.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index e91aeeb9..c6faa98c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -54,9 +54,9 @@ class User < ApplicationRecord
                           dependent:   :nullify
 
   has_many :anonymous_blocks, dependent: :destroy_async
-  has_many :passive_anonymous_blocks, class_name: "AnonymousBlock",
+  has_many :passive_anonymous_blocks, class_name:  "AnonymousBlock",
                                       foreign_key: "target_user_id",
-                                      dependent: :nullify
+                                      dependent:   :nullify
 
   SCREEN_NAME_REGEX = /\A[a-zA-Z0-9_]+\z/
   WEBSITE_REGEX = /https?:\/\/([A-Za-z.-]+)\/?(?:.*)/i

From ae41cd03fce426f1eab2bfa095bd4ff529a02b79 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 14 Jan 2024 14:27:12 +0100
Subject: [PATCH 353/590] Fix missing anonymous hint translation

---
 app/components/question_component/question_component.en.yml | 1 +
 config/locales/views.en.yml                                 | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/components/question_component/question_component.en.yml b/app/components/question_component/question_component.en.yml
index 3978ea98..0d215401 100644
--- a/app/components/question_component/question_component.en.yml
+++ b/app/components/question_component/question_component.en.yml
@@ -1,4 +1,5 @@
 en:
+  anon_hint: "This question was asked anonymously"
   answers:
     zero: "0 answers"
     one: "1 answer"
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 6caf0494..bebdefa8 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -109,7 +109,6 @@ en:
         dead: "Dead"
   answerbox:
     header:
-      anon_hint: :inbox.entry.anon_hint
       answers:
         zero: "0 answers"
         one: "1 answer"
@@ -220,7 +219,6 @@ en:
   inbox:
     entry:
       asked_html: "%{user} asked %{time} ago"
-      anon_hint: "This question was asked anonymously."
       answers:
         one: "1 answer"
         other: "%{count} answers"

From 88040cebe7771f700093c490beba995f560879ea Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 14 Jan 2024 16:02:46 +0100
Subject: [PATCH 354/590] Remove superfluous locales

---
 config/locales/views.en.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index bebdefa8..a5afc27c 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -108,12 +108,6 @@ en:
         retries: "Retries"
         dead: "Dead"
   answerbox:
-    header:
-      answers:
-        zero: "0 answers"
-        one: "1 answer"
-        other: "%{count} answers"
-      asked_html: "%{user} asked %{time} ago"
     actions:
       share:
         title: "Share"
@@ -218,10 +212,6 @@ en:
       title: "Feature Requests – Feedback"
   inbox:
     entry:
-      asked_html: "%{user} asked %{time} ago"
-      answers:
-        one: "1 answer"
-        other: "%{count} answers"
       options: "Sharing Options"
       placeholder: "Write your answer here…"
       sharing:

From 6c9aba4222babfda242346d073d50ba13ac0ace6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:22:33 +0000
Subject: [PATCH 355/590] Bump sentry-rails, sentry-ruby and sentry-sidekiq

Bumps [sentry-rails](https://github.com/getsentry/sentry-ruby), [sentry-ruby](https://github.com/getsentry/sentry-ruby) and [sentry-sidekiq](https://github.com/getsentry/sentry-ruby). These dependencies needed to be updated together.

Updates `sentry-rails` from 5.15.2 to 5.16.1
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.15.2...5.16.1)

Updates `sentry-ruby` from 5.15.2 to 5.16.1
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.15.2...5.16.1)

Updates `sentry-sidekiq` from 5.15.2 to 5.16.1
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.15.2...5.16.1)

---
updated-dependencies:
- dependency-name: sentry-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-ruby
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 49bb5b01..10ce790a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,7 +266,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -437,13 +437,13 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-rails (5.15.2)
+    sentry-rails (5.16.1)
       railties (>= 5.0)
-      sentry-ruby (~> 5.15.2)
-    sentry-ruby (5.15.2)
+      sentry-ruby (~> 5.16.1)
+    sentry-ruby (5.16.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.15.2)
-      sentry-ruby (~> 5.15.2)
+    sentry-sidekiq (5.16.1)
+      sentry-ruby (~> 5.16.1)
       sidekiq (>= 3.0)
     shoulda-matchers (6.0.0)
       activesupport (>= 5.2.0)

From 95f1188ae579f35dcaa6fee62154fde68b4e5e22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:24:20 +0000
Subject: [PATCH 356/590] Bump bootsnap from 1.17.0 to 1.17.1

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.17.0 to 1.17.1.
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.17.0...v1.17.1)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 49bb5b01..9be374a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,7 +100,7 @@ GEM
     bigdecimal (3.1.5)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.17.0)
+    bootsnap (1.17.1)
       msgpack (~> 1.2)
     bootstrap_form (5.3.2)
       actionpack (>= 6.1)

From 2e20e455fb826607966bfe5ece1c2045d835f8a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:24:57 +0000
Subject: [PATCH 357/590] Bump view_component from 3.9.0 to 3.10.0

Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.9.0...v3.10.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 49bb5b01..cdc94235 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,7 +266,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -492,7 +492,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    view_component (3.9.0)
+    view_component (3.10.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

From e74a5c6e1bb27d584e6e7344002c78e62a90e546 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:25:37 +0000
Subject: [PATCH 358/590] Bump rubocop from 1.59.0 to 1.60.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.59.0 to 1.60.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.59.0...v1.60.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0d11cc7b..82712721 100644
--- a/Gemfile
+++ b/Gemfile
@@ -92,7 +92,7 @@ group :development, :test do
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 4.1", require: false
-  gem "rubocop", "~> 1.59"
+  gem "rubocop", "~> 1.60"
   gem "rubocop-rails", "~> 2.23"
   gem "shoulda-matchers", "~> 6.0"
   gem "simplecov", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 49bb5b01..5c994494 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -293,7 +293,7 @@ GEM
     openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.3)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
@@ -355,7 +355,7 @@ GEM
     rake (13.1.0)
     redcarpet (3.6.0)
     redis (4.8.1)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.1)
@@ -404,11 +404,11 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.59.0)
+    rubocop (1.60.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -572,7 +572,7 @@ DEPENDENCIES
   rspec-mocks
   rspec-rails (~> 6.1)
   rspec-sidekiq (~> 4.1)
-  rubocop (~> 1.59)
+  rubocop (~> 1.60)
   rubocop-rails (~> 2.23)
   rubyzip (~> 2.3)
   sanitize

From a4128247fd6a8bf9d6e45b77a485e092998c9e7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:26:18 +0000
Subject: [PATCH 359/590] Bump haml_lint from 0.52.0 to 0.53.0

Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.52.0 to 0.53.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.52.0...v0.53.0)

---
updated-dependencies:
- dependency-name: haml_lint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 49bb5b01..0f5a14a2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -202,8 +202,8 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    haml_lint (0.52.0)
-      haml (>= 4.0)
+    haml_lint (0.53.0)
+      haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
       rubocop (>= 1.0)
@@ -293,7 +293,7 @@ GEM
     openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.3)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
@@ -355,7 +355,7 @@ GEM
     rake (13.1.0)
     redcarpet (3.6.0)
     redis (4.8.1)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.1)

From 90fc28e4ee996a2b20c5b36921056cdef66c20d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:27:09 +0000
Subject: [PATCH 360/590] Bump faker from 3.2.2 to 3.2.3

Bumps [faker](https://github.com/faker-ruby/faker) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: faker
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 49bb5b01..1453a72d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -174,7 +174,7 @@ GEM
     fake_email_validator (1.0.11)
       activemodel
       mail
-    faker (3.2.2)
+    faker (3.2.3)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
     fog-aws (3.21.0)

From d3b6c30fa2c374a146522d07e54ddf571a189eef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:52:59 +0000
Subject: [PATCH 361/590] Bump @typescript-eslint/parser from 6.18.0 to 6.18.1

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.18.0 to 6.18.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.18.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 51 +++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index c2b3fe2f..0dbb6ee9 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.18.0",
-    "@typescript-eslint/parser": "^6.18.0",
+    "@typescript-eslint/parser": "^6.18.1",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
diff --git a/yarn.lock b/yarn.lock
index f82df552..5fe9e96f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,15 +325,15 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.18.0":
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.18.0.tgz#d494161d64832e869f0a6acc6000a2cdff858383"
-  integrity sha512-v6uR68SFvqhNQT41frCMCQpsP+5vySy6IdgjlzUWoo7ALCnpaWYcz/Ij2k4L8cEsL0wkvOviCMpjmtRtHNOKzA==
+"@typescript-eslint/parser@^6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.18.1.tgz#3c3987e186b38c77b30b6bfa5edf7c98ae2ec9d3"
+  integrity sha512-zct/MdJnVaRRNy9e84XnVtRv9Vf91/qqe+hZJtKanjojud4wAVy/7lXxJmMyX6X6J+xc6c//YEWvpeif8cAhWA==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.18.0"
-    "@typescript-eslint/types" "6.18.0"
-    "@typescript-eslint/typescript-estree" "6.18.0"
-    "@typescript-eslint/visitor-keys" "6.18.0"
+    "@typescript-eslint/scope-manager" "6.18.1"
+    "@typescript-eslint/types" "6.18.1"
+    "@typescript-eslint/typescript-estree" "6.18.1"
+    "@typescript-eslint/visitor-keys" "6.18.1"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@6.18.0":
@@ -344,6 +344,14 @@
     "@typescript-eslint/types" "6.18.0"
     "@typescript-eslint/visitor-keys" "6.18.0"
 
+"@typescript-eslint/scope-manager@6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.1.tgz#28c31c60f6e5827996aa3560a538693cb4bd3848"
+  integrity sha512-BgdBwXPFmZzaZUuw6wKiHKIovms97a7eTImjkXCZE04TGHysG+0hDQPmygyvgtkoB/aOQwSM/nWv3LzrOIQOBw==
+  dependencies:
+    "@typescript-eslint/types" "6.18.1"
+    "@typescript-eslint/visitor-keys" "6.18.1"
+
 "@typescript-eslint/type-utils@6.18.0":
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.18.0.tgz#a492da599da5c38c70aa9ff9bfb473961b8ae663"
@@ -359,6 +367,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.0.tgz#ffce610a1540c17cf7d8ecf2bb34b8b0e2e77101"
   integrity sha512-/RFVIccwkwSdW/1zeMx3hADShWbgBxBnV/qSrex6607isYjj05t36P6LyONgqdUrNLl5TYU8NIKdHUYpFvExkA==
 
+"@typescript-eslint/types@6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.1.tgz#91617d8080bcd99ac355d9157079970d1d49fefc"
+  integrity sha512-4TuMAe+tc5oA7wwfqMtB0Y5OrREPF1GeJBAjqwgZh1lEMH5PJQgWgHGfYufVB51LtjD+peZylmeyxUXPfENLCw==
+
 "@typescript-eslint/typescript-estree@6.18.0":
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.0.tgz#1c357c3ca435c3cfa2af6b9daf45ca0bc2bb059a"
@@ -373,6 +386,20 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/typescript-estree@6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.1.tgz#a12b6440175b4cbc9d09ab3c4966c6b245215ab4"
+  integrity sha512-fv9B94UAhywPRhUeeV/v+3SBDvcPiLxRZJw/xZeeGgRLQZ6rLMG+8krrJUyIf6s1ecWTzlsbp0rlw7n9sjufHA==
+  dependencies:
+    "@typescript-eslint/types" "6.18.1"
+    "@typescript-eslint/visitor-keys" "6.18.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
 "@typescript-eslint/utils@6.18.0":
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.18.0.tgz#4d07c9c08f84b9939a1aca7aef98c8f378936142"
@@ -394,6 +421,14 @@
     "@typescript-eslint/types" "6.18.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.1.tgz#704d789bda2565a15475e7d22f145b8fe77443f4"
+  integrity sha512-/kvt0C5lRqGoCfsbmm7/CwMqoSkY3zzHLIjdhHZQW3VFrnz7ATecOHR7nb7V+xn4286MBxfnQfQhAmCI0u+bJA==
+  dependencies:
+    "@typescript-eslint/types" "6.18.1"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"

From 1f58e0958ae121124d7a807edcda0cfc2bd1bcfa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 09:04:46 +0000
Subject: [PATCH 362/590] Bump @typescript-eslint/eslint-plugin from 6.18.0 to
 6.19.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.18.0 to 6.19.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.19.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 110 +++++++++++++++++++++++++--------------------------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index 0dbb6ee9..bd05e236 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "typescript": "^5.3.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.18.0",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
     "@typescript-eslint/parser": "^6.18.1",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
diff --git a/yarn.lock b/yarn.lock
index 5fe9e96f..924ea17b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -308,16 +308,16 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
   integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
-"@typescript-eslint/eslint-plugin@^6.18.0":
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.18.0.tgz#94b86f3c25b468c714a04bd490017ecec2fd3746"
-  integrity sha512-3lqEvQUdCozi6d1mddWqd+kf8KxmGq2Plzx36BlkjuQe3rSTm/O98cLf0A4uDO+a5N1KD2SeEEl6fW97YHY+6w==
+"@typescript-eslint/eslint-plugin@^6.19.0":
+  version "6.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.0.tgz#db03f3313b57a30fbbdad2e6929e88fc7feaf9ba"
+  integrity sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.18.0"
-    "@typescript-eslint/type-utils" "6.18.0"
-    "@typescript-eslint/utils" "6.18.0"
-    "@typescript-eslint/visitor-keys" "6.18.0"
+    "@typescript-eslint/scope-manager" "6.19.0"
+    "@typescript-eslint/type-utils" "6.19.0"
+    "@typescript-eslint/utils" "6.19.0"
+    "@typescript-eslint/visitor-keys" "6.19.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -336,14 +336,6 @@
     "@typescript-eslint/visitor-keys" "6.18.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.18.0":
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.0.tgz#24ca6fc1f4a2afa71122dcfca9282878687d9997"
-  integrity sha512-o/UoDT2NgOJ2VfHpfr+KBY2ErWvCySNUIX/X7O9g8Zzt/tXdpfEU43qbNk8LVuWUT2E0ptzTWXh79i74PP0twA==
-  dependencies:
-    "@typescript-eslint/types" "6.18.0"
-    "@typescript-eslint/visitor-keys" "6.18.0"
-
 "@typescript-eslint/scope-manager@6.18.1":
   version "6.18.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.1.tgz#28c31c60f6e5827996aa3560a538693cb4bd3848"
@@ -352,39 +344,33 @@
     "@typescript-eslint/types" "6.18.1"
     "@typescript-eslint/visitor-keys" "6.18.1"
 
-"@typescript-eslint/type-utils@6.18.0":
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.18.0.tgz#a492da599da5c38c70aa9ff9bfb473961b8ae663"
-  integrity sha512-ZeMtrXnGmTcHciJN1+u2CigWEEXgy1ufoxtWcHORt5kGvpjjIlK9MUhzHm4RM8iVy6dqSaZA/6PVkX6+r+ChjQ==
+"@typescript-eslint/scope-manager@6.19.0":
+  version "6.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz#b6d2abb825b29ab70cb542d220e40c61c1678116"
+  integrity sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.18.0"
-    "@typescript-eslint/utils" "6.18.0"
+    "@typescript-eslint/types" "6.19.0"
+    "@typescript-eslint/visitor-keys" "6.19.0"
+
+"@typescript-eslint/type-utils@6.19.0":
+  version "6.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz#522a494ef0d3e9fdc5e23a7c22c9331bbade0101"
+  integrity sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.19.0"
+    "@typescript-eslint/utils" "6.19.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.18.0":
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.0.tgz#ffce610a1540c17cf7d8ecf2bb34b8b0e2e77101"
-  integrity sha512-/RFVIccwkwSdW/1zeMx3hADShWbgBxBnV/qSrex6607isYjj05t36P6LyONgqdUrNLl5TYU8NIKdHUYpFvExkA==
-
 "@typescript-eslint/types@6.18.1":
   version "6.18.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.1.tgz#91617d8080bcd99ac355d9157079970d1d49fefc"
   integrity sha512-4TuMAe+tc5oA7wwfqMtB0Y5OrREPF1GeJBAjqwgZh1lEMH5PJQgWgHGfYufVB51LtjD+peZylmeyxUXPfENLCw==
 
-"@typescript-eslint/typescript-estree@6.18.0":
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.0.tgz#1c357c3ca435c3cfa2af6b9daf45ca0bc2bb059a"
-  integrity sha512-klNvl+Ql4NsBNGB4W9TZ2Od03lm7aGvTbs0wYaFYsplVPhr+oeXjlPZCDI4U9jgJIDK38W1FKhacCFzCC+nbIg==
-  dependencies:
-    "@typescript-eslint/types" "6.18.0"
-    "@typescript-eslint/visitor-keys" "6.18.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+"@typescript-eslint/types@6.19.0":
+  version "6.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.0.tgz#689b0498c436272a6a2059b09f44bcbd90de294a"
+  integrity sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==
 
 "@typescript-eslint/typescript-estree@6.18.1":
   version "6.18.1"
@@ -400,27 +386,33 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.18.0":
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.18.0.tgz#4d07c9c08f84b9939a1aca7aef98c8f378936142"
-  integrity sha512-wiKKCbUeDPGaYEYQh1S580dGxJ/V9HI7K5sbGAVklyf+o5g3O+adnS4UNJajplF4e7z2q0uVBaTdT/yLb4XAVA==
+"@typescript-eslint/typescript-estree@6.19.0":
+  version "6.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz#0813ba364a409afb4d62348aec0202600cb468fa"
+  integrity sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==
+  dependencies:
+    "@typescript-eslint/types" "6.19.0"
+    "@typescript-eslint/visitor-keys" "6.19.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.19.0":
+  version "6.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.19.0.tgz#557b72c3eeb4f73bef8037c85dae57b21beb1a4b"
+  integrity sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.18.0"
-    "@typescript-eslint/types" "6.18.0"
-    "@typescript-eslint/typescript-estree" "6.18.0"
+    "@typescript-eslint/scope-manager" "6.19.0"
+    "@typescript-eslint/types" "6.19.0"
+    "@typescript-eslint/typescript-estree" "6.19.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.18.0":
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.0.tgz#3c8733737786fa6c78a347b4fa306ae7155b560f"
-  integrity sha512-1wetAlSZpewRDb2h9p/Q8kRjdGuqdTAQbkJIOUMLug2LBLG+QOjiWoSj6/3B/hA9/tVTFFdtiKvAYoYnSRW/RA==
-  dependencies:
-    "@typescript-eslint/types" "6.18.0"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.18.1":
   version "6.18.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.1.tgz#704d789bda2565a15475e7d22f145b8fe77443f4"
@@ -429,6 +421,14 @@
     "@typescript-eslint/types" "6.18.1"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.19.0":
+  version "6.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz#4565e0ecd63ca1f81b96f1dd76e49f746c6b2b49"
+  integrity sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==
+  dependencies:
+    "@typescript-eslint/types" "6.19.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"

From d303b5b18e58da700ec88cf257a03d9b0898c24c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 19 Jan 2024 21:14:32 +0100
Subject: [PATCH 363/590] Use `attr_accessor` for `Answer` object properties

---
 app/models/answer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 07a261e1..f13880f9 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -1,7 +1,7 @@
 class Answer < ApplicationRecord
   extend Answer::TimelineMethods
 
-  attr_writer :has_reacted, :is_subscribed
+  attr_accessor :has_reacted, :is_subscribed
 
   belongs_to :user, counter_cache: :answered_count
   belongs_to :question, counter_cache: :answer_count

From 9ddcf65928e1829681c3cf5e297a94478e3653bf Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 21 Jan 2024 10:45:58 +0100
Subject: [PATCH 364/590] Disallow anonymously blocking yourself

---
 app/views/actions/_question.html.haml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/actions/_question.html.haml b/app/views/actions/_question.html.haml
index c96e99a9..504e3e2c 100644
--- a/app/views/actions/_question.html.haml
+++ b/app/views/actions/_question.html.haml
@@ -8,9 +8,10 @@
       %i.fa.fa-fw.fa-exclamation-triangle
       = t("voc.report")
   - if question.anonymous? && !question.generated?
-    = button_to anonymous_block_path, method: :post, params: { question: question.id }, class: "dropdown-item" do
-      %i.fa.fa-fw.fa-minus-circle
-      = t("voc.block")
+    - unless question.user == current_user
+      = button_to anonymous_block_path, method: :post, params: { question: question.id }, class: "dropdown-item" do
+        %i.fa.fa-fw.fa-minus-circle
+        = t("voc.block")
     - if current_user.mod?
       = button_to anonymous_block_path, method: :post, params: { question: question.id, global: true }, class: "dropdown-item" do
         %i.fas.fa-fw.fa-user-slash

From 78e62ed709862175f8af7d0d44bf00e54ab10513 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:24:34 +0000
Subject: [PATCH 365/590] Bump shoulda-matchers from 6.0.0 to 6.1.0

Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases)
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v6.0.0...v6.1.0)

---
updated-dependencies:
- dependency-name: shoulda-matchers
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 82712721..477c2865 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ group :development, :test do
   gem "rspec-sidekiq", "~> 4.1", require: false
   gem "rubocop", "~> 1.60"
   gem "rubocop-rails", "~> 2.23"
-  gem "shoulda-matchers", "~> 6.0"
+  gem "shoulda-matchers", "~> 6.1"
   gem "simplecov", require: false
   gem "simplecov-cobertura", require: false
   gem "simplecov-json", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 082c20af..a0c84f47 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,7 +118,7 @@ GEM
       mini_mime (>= 0.1.3)
     chunky_png (1.4.0)
     colorize (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     cssbundling-rails (1.3.3)
@@ -266,7 +266,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.1)
+    minitest (5.21.2)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -445,7 +445,7 @@ GEM
     sentry-sidekiq (5.16.1)
       sentry-ruby (~> 5.16.1)
       sidekiq (>= 3.0)
-    shoulda-matchers (6.0.0)
+    shoulda-matchers (6.1.0)
       activesupport (>= 5.2.0)
     sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)
@@ -580,7 +580,7 @@ DEPENDENCIES
   sentry-rails
   sentry-ruby
   sentry-sidekiq
-  shoulda-matchers (~> 6.0)
+  shoulda-matchers (~> 6.1)
   sidekiq (< 7)
   simplecov
   simplecov-cobertura

From 30a3a44bd65ed916c30577f8d1b3aa9b29abd443 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:25:04 +0000
Subject: [PATCH 366/590] Bump jsbundling-rails from 1.2.2 to 1.3.0

Bumps [jsbundling-rails](https://github.com/rails/jsbundling-rails) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/rails/jsbundling-rails/releases)
- [Commits](https://github.com/rails/jsbundling-rails/compare/v1.2.2...v1.3.0)

---
updated-dependencies:
- dependency-name: jsbundling-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 82712721..4c5f153f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem "rails", "~> 7.0.8"
 gem "rails-i18n", "~> 7.0"
 
 gem "cssbundling-rails", "~> 1.3"
-gem "jsbundling-rails", "~> 1.2"
+gem "jsbundling-rails", "~> 1.3"
 gem "sassc-rails"
 gem "sprockets", "~> 4.2"
 gem "sprockets-rails", require: "sprockets/railtie"
diff --git a/Gemfile.lock b/Gemfile.lock
index 082c20af..33ffd74d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,7 +118,7 @@ GEM
       mini_mime (>= 0.1.3)
     chunky_png (1.4.0)
     colorize (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     cssbundling-rails (1.3.3)
@@ -222,7 +222,7 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    jsbundling-rails (1.2.2)
+    jsbundling-rails (1.3.0)
       railties (>= 6.0.0)
     json (2.7.1)
     json-schema (4.1.1)
@@ -266,7 +266,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.1)
+    minitest (5.21.2)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -540,7 +540,7 @@ DEPENDENCIES
   hcaptcha!
   httparty
   i18n-js (= 4.0)
-  jsbundling-rails (~> 1.2)
+  jsbundling-rails (~> 1.3)
   json-schema
   jwt (~> 2.7)
   letter_opener

From 583fe6ffa746a7971103dce8d124ffa09885cf36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:25:21 +0000
Subject: [PATCH 367/590] Bump rubocop from 1.60.0 to 1.60.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.0 to 1.60.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.60.0...v1.60.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 082c20af..1634b179 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -293,7 +293,7 @@ GEM
     openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.24.0)
-    parser (3.3.0.3)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
@@ -404,7 +404,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.60.0)
+    rubocop (1.60.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From dc3c533aed61c00e0392f3887bed88f218d36365 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:26:07 +0000
Subject: [PATCH 368/590] Bump bullet from 7.1.5 to 7.1.6

Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.5 to 7.1.6.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.5...7.1.6)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 082c20af..02836732 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,7 +106,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.2.4)
-    bullet (7.1.5)
+    bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     carrierwave (2.1.0)
@@ -118,7 +118,7 @@ GEM
       mini_mime (>= 0.1.3)
     chunky_png (1.4.0)
     colorize (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     cssbundling-rails (1.3.3)
@@ -266,7 +266,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.1)
+    minitest (5.21.2)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)

From 638795649bf30e6d958337976cb5d8d4d7afbeb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:35:34 +0000
Subject: [PATCH 369/590] Bump tj-actions/changed-files from 41 to 42

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 41 to 42.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/changed-files/compare/v41...v42)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b4e62114..438cd81f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v42
         with:
           files: "**/*.rb"
       - name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v42
         with:
           files: "**/*.ts"
       - name: Set up Node 16
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v42
         with:
           files: "**/*.haml"
       - name: Install dependencies
@@ -89,7 +89,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v42
         with:
           files: "**/*.scss"
       - name: Set up Node 16

From e31aed988fa73c0ee935c08faa69922e72be32dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:45:25 +0000
Subject: [PATCH 370/590] Bump sass from 1.69.7 to 1.70.0

Bumps [sass](https://github.com/sass/dart-sass) from 1.69.7 to 1.70.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.69.7...1.70.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index bd05e236..0cd45d1c 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.69.7",
+    "sass": "^1.70.0",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.3.3"
diff --git a/yarn.lock b/yarn.lock
index 924ea17b..133f774a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2262,10 +2262,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.69.7:
-  version "1.69.7"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.7.tgz#6e7e1c8f51e8162faec3e9619babc7da780af3b7"
-  integrity sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==
+sass@^1.70.0:
+  version "1.70.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.70.0.tgz#761197419d97b5358cb25f9dd38c176a8a270a75"
+  integrity sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From f8942bfde7b90af00fa4f54bad6647cc1ad85fae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:46:04 +0000
Subject: [PATCH 371/590] Bump @typescript-eslint/parser from 6.18.1 to 6.19.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.18.1 to 6.19.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.19.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 51 ++++++++-------------------------------------------
 2 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/package.json b/package.json
index bd05e236..6f0685e0 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "@typescript-eslint/parser": "^6.18.1",
+    "@typescript-eslint/parser": "^6.19.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
diff --git a/yarn.lock b/yarn.lock
index 924ea17b..9828b0a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,25 +325,17 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.18.1":
-  version "6.18.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.18.1.tgz#3c3987e186b38c77b30b6bfa5edf7c98ae2ec9d3"
-  integrity sha512-zct/MdJnVaRRNy9e84XnVtRv9Vf91/qqe+hZJtKanjojud4wAVy/7lXxJmMyX6X6J+xc6c//YEWvpeif8cAhWA==
+"@typescript-eslint/parser@^6.19.0":
+  version "6.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.19.0.tgz#80344086f362181890ade7e94fc35fe0480bfdf5"
+  integrity sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.18.1"
-    "@typescript-eslint/types" "6.18.1"
-    "@typescript-eslint/typescript-estree" "6.18.1"
-    "@typescript-eslint/visitor-keys" "6.18.1"
+    "@typescript-eslint/scope-manager" "6.19.0"
+    "@typescript-eslint/types" "6.19.0"
+    "@typescript-eslint/typescript-estree" "6.19.0"
+    "@typescript-eslint/visitor-keys" "6.19.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.18.1":
-  version "6.18.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.18.1.tgz#28c31c60f6e5827996aa3560a538693cb4bd3848"
-  integrity sha512-BgdBwXPFmZzaZUuw6wKiHKIovms97a7eTImjkXCZE04TGHysG+0hDQPmygyvgtkoB/aOQwSM/nWv3LzrOIQOBw==
-  dependencies:
-    "@typescript-eslint/types" "6.18.1"
-    "@typescript-eslint/visitor-keys" "6.18.1"
-
 "@typescript-eslint/scope-manager@6.19.0":
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz#b6d2abb825b29ab70cb542d220e40c61c1678116"
@@ -362,30 +354,11 @@
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.18.1":
-  version "6.18.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.18.1.tgz#91617d8080bcd99ac355d9157079970d1d49fefc"
-  integrity sha512-4TuMAe+tc5oA7wwfqMtB0Y5OrREPF1GeJBAjqwgZh1lEMH5PJQgWgHGfYufVB51LtjD+peZylmeyxUXPfENLCw==
-
 "@typescript-eslint/types@6.19.0":
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.0.tgz#689b0498c436272a6a2059b09f44bcbd90de294a"
   integrity sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==
 
-"@typescript-eslint/typescript-estree@6.18.1":
-  version "6.18.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.1.tgz#a12b6440175b4cbc9d09ab3c4966c6b245215ab4"
-  integrity sha512-fv9B94UAhywPRhUeeV/v+3SBDvcPiLxRZJw/xZeeGgRLQZ6rLMG+8krrJUyIf6s1ecWTzlsbp0rlw7n9sjufHA==
-  dependencies:
-    "@typescript-eslint/types" "6.18.1"
-    "@typescript-eslint/visitor-keys" "6.18.1"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
 "@typescript-eslint/typescript-estree@6.19.0":
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz#0813ba364a409afb4d62348aec0202600cb468fa"
@@ -413,14 +386,6 @@
     "@typescript-eslint/typescript-estree" "6.19.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.18.1":
-  version "6.18.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.1.tgz#704d789bda2565a15475e7d22f145b8fe77443f4"
-  integrity sha512-/kvt0C5lRqGoCfsbmm7/CwMqoSkY3zzHLIjdhHZQW3VFrnz7ATecOHR7nb7V+xn4286MBxfnQfQhAmCI0u+bJA==
-  dependencies:
-    "@typescript-eslint/types" "6.18.1"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.19.0":
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz#4565e0ecd63ca1f81b96f1dd76e49f746c6b2b49"

From 1c8911b859a1eb9221ad984ce589ee5a3f2dd428 Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Mon, 22 Jan 2024 16:33:20 +0100
Subject: [PATCH 372/590] update Ruby/Bundler/ruby-install

---
 .ruby-version | 2 +-
 Containerfile | 6 +++---
 Gemfile.lock  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index be94e6f5..b347b11e 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.2.3
diff --git a/Containerfile b/Containerfile
index 73044568..5abee3f1 100644
--- a/Containerfile
+++ b/Containerfile
@@ -8,9 +8,9 @@ LABEL org.opencontainers.image.vendor="The Retrospring team"
 LABEL org.opencontainers.image.url="https://github.com/Retrospring/retrospring"
 
 ARG RETROSPRING_VERSION=2023.0131.1
-ARG RUBY_VERSION=3.2.2
-ARG RUBY_INSTALL_VERSION=0.9.2
-ARG BUNDLER_VERSION=2.3.18
+ARG RUBY_VERSION=3.2.3
+ARG RUBY_INSTALL_VERSION=0.9.3
+ARG BUNDLER_VERSION=2.5.5
 
 ENV RAILS_ENV=production
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ab8575d..0244b3f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -593,4 +593,4 @@ DEPENDENCIES
   view_component
 
 BUNDLED WITH
-   2.4.21
+   2.5.5

From 3b395857af38fdb69191ce102c4424494d765069 Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Mon, 22 Jan 2024 15:42:08 +0100
Subject: [PATCH 373/590] build ruby with jemalloc

---
 Containerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index 5abee3f1..ca5903b3 100644
--- a/Containerfile
+++ b/Containerfile
@@ -26,6 +26,7 @@ RUN zypper addrepo https://download.opensuse.org/repositories/devel:languages:no
       libffi-devel     \
       libopenssl-devel \
       libyaml-devel    \
+      jemalloc-devel   \
       make             \
       ncurses-devel    \
       readline-devel   \
@@ -52,7 +53,7 @@ RUN curl -Lo ruby-install-${RUBY_INSTALL_VERSION}.tar.gz https://github.com/post
  && tar xvf ruby-install-${RUBY_INSTALL_VERSION}.tar.gz \
  && (cd ruby-install-${RUBY_INSTALL_VERSION} && make install) \
  && rm -rf ruby-install-${RUBY_INSTALL_VERSION} ruby-install-${RUBY_INSTALL_VERSION}.tar.gz \
- && ruby-install --no-install-deps --cleanup --system --jobs=$(nproc) ruby ${RUBY_VERSION} -- --disable-install-rdoc \
+ && ruby-install --no-install-deps --cleanup --system --jobs=$(nproc) ruby ${RUBY_VERSION} -- --disable-install-rdoc --with-jemalloc \
  && gem install bundler:${BUNDLER_VERSION}
 
 # create user and dirs to run retrospring in

From c9a32ee532080568965b638751f410b35b649ed7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 17:26:09 +0000
Subject: [PATCH 374/590] Bump cssbundling-rails from 1.3.3 to 1.4.0

Bumps [cssbundling-rails](https://github.com/rails/cssbundling-rails) from 1.3.3 to 1.4.0.
- [Release notes](https://github.com/rails/cssbundling-rails/releases)
- [Commits](https://github.com/rails/cssbundling-rails/compare/v1.3.3...v1.4.0)

---
updated-dependencies:
- dependency-name: cssbundling-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8f806ebc..357a2dd7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem "i18n-js", "4.0"
 gem "rails", "~> 7.0.8"
 gem "rails-i18n", "~> 7.0"
 
-gem "cssbundling-rails", "~> 1.3"
+gem "cssbundling-rails", "~> 1.4"
 gem "jsbundling-rails", "~> 1.3"
 gem "sassc-rails"
 gem "sprockets", "~> 4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index b1d3a425..dc85d7f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,7 +121,7 @@ GEM
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
-    cssbundling-rails (1.3.3)
+    cssbundling-rails (1.4.0)
       railties (>= 6.0.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
@@ -521,7 +521,7 @@ DEPENDENCIES
   carrierwave_backgrounder!
   colorize
   connection_pool
-  cssbundling-rails (~> 1.3)
+  cssbundling-rails (~> 1.4)
   database_cleaner
   devise (~> 4.9)
   devise-async

From 1ac767902bddca120c3511265423db139ef75344 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 14 Jan 2024 21:13:30 +0100
Subject: [PATCH 375/590] Add more generic implementation of inbox filtering

---
 app/controllers/inbox_controller.rb       | 34 +++---------
 app/models/inbox_filter.rb                | 45 +++++++++++++++
 spec/controllers/inbox_controller_spec.rb | 67 +++++++++++------------
 3 files changed, 83 insertions(+), 63 deletions(-)
 create mode 100644 app/models/inbox_filter.rb

diff --git a/app/controllers/inbox_controller.rb b/app/controllers/inbox_controller.rb
index 56b01f5a..e551b0bc 100644
--- a/app/controllers/inbox_controller.rb
+++ b/app/controllers/inbox_controller.rb
@@ -4,16 +4,8 @@ class InboxController < ApplicationController
   before_action :authenticate_user!
 
   def show
-    find_author
     find_inbox_entries
 
-    if @author_user && @inbox_count.zero?
-      # rubocop disabled because of a false positive
-      flash[:info] = t(".author.info", author: @author) # rubocop:disable Rails/ActionControllerFlashBeforeRender
-      redirect_to inbox_path(last_id: params[:last_id])
-      return
-    end
-
     @delete_id = find_delete_id
     @disabled = true if @inbox.empty?
 
@@ -47,36 +39,24 @@ class InboxController < ApplicationController
 
   private
 
-  def find_author
-    return if params[:author].blank?
-
-    @author = params[:author]
-
-    @author_user = User.where("LOWER(screen_name) = ?", @author.downcase).first
-    flash.now[:error] = t(".author.error", author: @author) unless @author_user
+  def filter_params
+    params.slice(*InboxFilter::KEYS).permit(*InboxFilter::KEYS)
   end
 
   def find_inbox_entries
-    @inbox = current_user.cursored_inbox(last_id: params[:last_id]).then(&method(:filter_author_chain))
+    filter = InboxFilter.new(current_user, filter_params)
+    @inbox = filter.cursored_results(last_id: params[:last_id])
     @inbox_last_id = @inbox.map(&:id).min
-    @more_data_available = current_user.cursored_inbox(last_id: @inbox_last_id, size: 1).then(&method(:filter_author_chain)).count.positive?
-    @inbox_count = current_user.inboxes.then(&method(:filter_author_chain)).count
+    @more_data_available = filter.cursored_results(last_id: @inbox_last_id, size: 1).count.positive?
+    @inbox_count = filter.results.count
   end
 
   def find_delete_id
-    return "ib-delete-all-author" if @author_user && @inbox_count.positive?
+    return "ib-delete-all-author" if params[:author].present? && @inbox_count.positive?
 
     "ib-delete-all"
   end
 
-  def filter_author_chain(query)
-    return query unless @author_user
-
-    query
-      .joins(:question)
-      .where(questions: { user: @author_user, author_is_anonymous: false })
-  end
-
   # rubocop:disable Rails/SkipsModelValidations
   def mark_inbox_entries_as_read
     # using .dup to not modify @inbox -- useful in tests
diff --git a/app/models/inbox_filter.rb b/app/models/inbox_filter.rb
new file mode 100644
index 00000000..2ae01974
--- /dev/null
+++ b/app/models/inbox_filter.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class InboxFilter
+  include CursorPaginatable
+
+  define_cursor_paginator :cursored_results, :results
+
+  KEYS = %i(
+    author
+    anonymous
+  ).freeze
+
+  attr_reader :params, :user
+
+  def initialize(user, params)
+    @user = user
+    @params = params
+  end
+
+  def results
+    scope = @user.inboxes
+                 .includes(:question, user: :profile)
+                 .order(:created_at)
+                 .reverse_order
+
+    params.each do |key, value|
+      scope.merge!(scope_for(key, value)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def scope_for(key, value)
+    case key.to_s
+    when "author"
+      @user.inboxes.joins(question: [:user])
+                   .where(questions: { users: { screen_name: value }, author_is_anonymous: false })
+    when "anonymous"
+      @user.inboxes.joins(:question)
+                   .where(questions: { author_is_anonymous: true })
+    end
+  end
+end
diff --git a/spec/controllers/inbox_controller_spec.rb b/spec/controllers/inbox_controller_spec.rb
index a6e5917c..73553f33 100644
--- a/spec/controllers/inbox_controller_spec.rb
+++ b/spec/controllers/inbox_controller_spec.rb
@@ -144,39 +144,10 @@ describe InboxController, type: :controller do
 
         subject { get :show, params: { author: author_param } }
 
-        context "with a nonexisting screen name" do
-          let(:author_param) { "xXx420MegaGamer2003xXx" }
-
-          it "sets the error flash" do
-            subject
-            expect(flash[:error]).to eq "No user with the name @xXx420MegaGamer2003xXx found, showing entries from all users instead!"
-          end
-
-          include_examples "sets the expected ivars" do
-            let(:expected_assigns) do
-              {
-                inbox:               [generic_inbox_entry2, generic_inbox_entry1],
-                inbox_last_id:       generic_inbox_entry1.id,
-                more_data_available: false,
-                inbox_count:         2,
-                delete_id:           "ib-delete-all",
-                disabled:            nil
-              }
-            end
-          end
-        end
-
         context "with an existing screen name" do
           let(:author_param) { other_user.screen_name }
 
           context "with no questions from the other user in the inbox" do
-            it { is_expected.to redirect_to inbox_path }
-
-            it "sets the info flash" do
-              subject
-              expect(flash[:info]).to eq "No questions from @#{other_user.screen_name} found, showing entries from all users instead!"
-            end
-
             include_examples "sets the expected ivars" do
               # these are the ivars set before the redirect happened
               let(:expected_assigns) do
@@ -202,13 +173,6 @@ describe InboxController, type: :controller do
               )
             end
 
-            it { is_expected.to redirect_to inbox_path }
-
-            it "sets the info flash" do
-              subject
-              expect(flash[:info]).to eq "No questions from @#{other_user.screen_name} found, showing entries from all users instead!"
-            end
-
             include_examples "sets the expected ivars" do
               # these are the ivars set before the redirect happened
               let(:expected_assigns) do
@@ -259,6 +223,37 @@ describe InboxController, type: :controller do
           end
         end
       end
+
+      context "when passed the anonymous param" do
+        let!(:other_user) { FactoryBot.create(:user) }
+        let!(:generic_inbox_entry) do
+          Inbox.create(
+            user:,
+            question: FactoryBot.create(
+              :question,
+              user:                other_user,
+              author_is_anonymous: false
+            )
+          )
+        end
+
+        let!(:inbox_entry_fillers) do
+          # 9 times => 1 entry less than default page size
+          9.times.map { Inbox.create(user:, question: FactoryBot.create(:question, author_is_anonymous: true)) }
+        end
+
+        subject { get :show, params: { anonymous: true } }
+
+        include_examples "sets the expected ivars" do
+          let(:expected_assigns) do
+            {
+              inbox:               [*inbox_entry_fillers.reverse],
+              more_data_available: false,
+              inbox_count:         9
+            }
+          end
+        end
+      end
     end
   end
 

From 63922efb1b4117bd38cfb64ad5f0316c8dfd6441 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 14 Jan 2024 21:24:59 +0100
Subject: [PATCH 376/590] Fix rubocop nits

---
 app/models/inbox_filter.rb                |  8 +++---
 spec/controllers/inbox_controller_spec.rb | 32 +++++++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/models/inbox_filter.rb b/app/models/inbox_filter.rb
index 2ae01974..1acd21a2 100644
--- a/app/models/inbox_filter.rb
+++ b/app/models/inbox_filter.rb
@@ -5,10 +5,10 @@ class InboxFilter
 
   define_cursor_paginator :cursored_results, :results
 
-  KEYS = %i(
+  KEYS = %i[
     author
     anonymous
-  ).freeze
+  ].freeze
 
   attr_reader :params, :user
 
@@ -36,10 +36,10 @@ class InboxFilter
     case key.to_s
     when "author"
       @user.inboxes.joins(question: [:user])
-                   .where(questions: { users: { screen_name: value }, author_is_anonymous: false })
+           .where(questions: { users: { screen_name: value }, author_is_anonymous: false })
     when "anonymous"
       @user.inboxes.joins(:question)
-                   .where(questions: { author_is_anonymous: true })
+           .where(questions: { author_is_anonymous: true })
     end
   end
 end
diff --git a/spec/controllers/inbox_controller_spec.rb b/spec/controllers/inbox_controller_spec.rb
index 73553f33..b939c9ac 100644
--- a/spec/controllers/inbox_controller_spec.rb
+++ b/spec/controllers/inbox_controller_spec.rb
@@ -103,7 +103,7 @@ describe InboxController, type: :controller do
               more_data_available: true,
               inbox_count:         16,
               delete_id:           "ib-delete-all",
-              disabled:            nil
+              disabled:            nil,
             }
           end
         end
@@ -119,7 +119,7 @@ describe InboxController, type: :controller do
                 more_data_available: false,
                 inbox_count:         16,
                 delete_id:           "ib-delete-all",
-                disabled:            nil
+                disabled:            nil,
               }
             end
           end
@@ -136,8 +136,8 @@ describe InboxController, type: :controller do
             question: FactoryBot.create(
               :question,
               user:                unrelated_user,
-              author_is_anonymous: false
-            )
+              author_is_anonymous: false,
+            ),
           )
         end
         let!(:generic_inbox_entry2) { Inbox.create(user:, question: FactoryBot.create(:question)) }
@@ -155,7 +155,7 @@ describe InboxController, type: :controller do
                   inbox:               [],
                   inbox_last_id:       nil,
                   more_data_available: false,
-                  inbox_count:         0
+                  inbox_count:         0,
                 }
               end
             end
@@ -168,8 +168,8 @@ describe InboxController, type: :controller do
                 question: FactoryBot.create(
                   :question,
                   user:                other_user,
-                  author_is_anonymous: true
-                )
+                  author_is_anonymous: true,
+                ),
               )
             end
 
@@ -180,7 +180,7 @@ describe InboxController, type: :controller do
                   inbox:               [],
                   inbox_last_id:       nil,
                   more_data_available: false,
-                  inbox_count:         0
+                  inbox_count:         0,
                 }
               end
             end
@@ -193,8 +193,8 @@ describe InboxController, type: :controller do
                 question: FactoryBot.create(
                   :question,
                   user:                other_user,
-                  author_is_anonymous: false
-                )
+                  author_is_anonymous: false,
+                ),
               )
             end
             let!(:anonymous_inbox_entry) do
@@ -203,8 +203,8 @@ describe InboxController, type: :controller do
                 question: FactoryBot.create(
                   :question,
                   user:                other_user,
-                  author_is_anonymous: true
-                )
+                  author_is_anonymous: true,
+                ),
               )
             end
 
@@ -216,7 +216,7 @@ describe InboxController, type: :controller do
                   more_data_available: false,
                   inbox_count:         1,
                   delete_id:           "ib-delete-all-author",
-                  disabled:            nil
+                  disabled:            nil,
                 }
               end
             end
@@ -232,8 +232,8 @@ describe InboxController, type: :controller do
             question: FactoryBot.create(
               :question,
               user:                other_user,
-              author_is_anonymous: false
-            )
+              author_is_anonymous: false,
+            ),
           )
         end
 
@@ -249,7 +249,7 @@ describe InboxController, type: :controller do
             {
               inbox:               [*inbox_entry_fillers.reverse],
               more_data_available: false,
-              inbox_count:         9
+              inbox_count:         9,
             }
           end
         end

From 66142f9cad4ecb5a8f0d2f17ade24577d3989dbe Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 20 Jan 2024 14:48:15 +0100
Subject: [PATCH 377/590] Install `sidekiq-scheduler` gem

---
 Gemfile      |  1 +
 Gemfile.lock | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/Gemfile b/Gemfile
index 357a2dd7..4a275031 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,7 @@ gem "sentry-ruby"
 gem "sentry-sidekiq"
 
 gem "sidekiq", "< 7" # remove version constraint once are ready to upgrade https://github.com/mperham/sidekiq/blob/main/docs/7.0-Upgrade.md
+gem "sidekiq-scheduler"
 
 gem "questiongenerator", "~> 1.1"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index dc85d7f9..c8a2c6da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,6 +165,8 @@ GEM
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
     erubi (1.12.0)
+    et-orbi (1.2.7)
+      tzinfo
     excon (0.109.0)
     factory_bot (6.4.5)
       activesupport (>= 5.0.0)
@@ -195,6 +197,9 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (1.1.0)
+    fugit (1.9.0)
+      et-orbi (~> 1, >= 1.2.7)
+      raabro (~> 1.4)
     glob (0.4.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -306,6 +311,7 @@ GEM
     pundit (2.3.1)
       activesupport (>= 3.0.0)
     questiongenerator (1.1.0)
+    raabro (1.4.0)
     racc (1.7.3)
     rack (2.2.8)
     rack-test (2.1.0)
@@ -426,6 +432,8 @@ GEM
     ruby-vips (2.2.0)
       ffi (~> 1.12)
     rubyzip (2.3.2)
+    rufus-scheduler (3.9.1)
+      fugit (~> 1.1, >= 1.1.6)
     sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -451,6 +459,10 @@ GEM
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
+    sidekiq-scheduler (5.0.3)
+      rufus-scheduler (~> 3.2)
+      sidekiq (>= 6, < 8)
+      tilt (>= 1.4.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -582,6 +594,7 @@ DEPENDENCIES
   sentry-sidekiq
   shoulda-matchers (~> 6.1)
   sidekiq (< 7)
+  sidekiq-scheduler
   simplecov
   simplecov-cobertura
   simplecov-json

From a9e4265a1a344e60686b13ebf2d8b45be3674ca3 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 20 Jan 2024 14:48:57 +0100
Subject: [PATCH 378/590] Add scheduled job to clean up orphaned inbox entries

---
 app/workers/scheduler/inbox_cleanup_scheduler.rb | 15 +++++++++++++++
 config/sidekiq.yml                               |  7 +++++++
 2 files changed, 22 insertions(+)
 create mode 100644 app/workers/scheduler/inbox_cleanup_scheduler.rb

diff --git a/app/workers/scheduler/inbox_cleanup_scheduler.rb b/app/workers/scheduler/inbox_cleanup_scheduler.rb
new file mode 100644
index 00000000..77948ab0
--- /dev/null
+++ b/app/workers/scheduler/inbox_cleanup_scheduler.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Scheduler::InboxCleanupScheduler
+  include Sidekiq::Worker
+
+  sidekiq_options retry: false
+
+  def perform
+    orphaned_entries = Inbox.where(question_id: nil).includes(:user)
+    orphaned_entries.each do |inbox|
+      logger.info "Deleting orphaned inbox entry #{inbox.id} from user #{inbox.user.id}"
+      inbox.destroy
+    end
+  end
+end
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index b9c163be..b224130a 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -13,4 +13,11 @@ production:
   - question
   - export
   - push_notification
+  - scheduler
 
+:scheduler:
+  :schedule:
+    inbox_cleanup:
+      every: 1m
+      class: Scheduler::InboxCleanupScheduler
+      queue: scheduler

From d044705ca4ed3043936a4f13f5818c1f8d155013 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 20 Jan 2024 14:49:25 +0100
Subject: [PATCH 379/590] Add spec for inbox cleanup scheduler job

---
 .../scheduler/inbox_cleanup_scheduler_spec.rb | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb

diff --git a/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb b/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb
new file mode 100644
index 00000000..81763b6c
--- /dev/null
+++ b/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe Scheduler::InboxCleanupScheduler do
+  let(:user) { FactoryBot.create(:user) }
+  let(:inbox) { FactoryBot.create(:inbox, user:) }
+
+  describe "#perform" do
+    before do
+      inbox.question_id = nil
+      inbox.save(validate: false)
+    end
+
+    subject { described_class.new.perform }
+
+    it "should delete orphaned inbox entries" do
+      expect { subject }
+        .to(
+          change { Inbox.where(question_id: nil).count }
+            .from(1)
+            .to(0),
+        )
+    end
+  end
+end

From f9f75838dad552fa8f50c5221c17eaad72498361 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 22 Jan 2024 20:37:50 +0100
Subject: [PATCH 380/590] Bump version to 2024.0122.0

---
 lib/retrospring/version.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index 4f9c33d6..6d2b7f56 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -13,11 +13,11 @@ module Retrospring
   module Version
     module_function
 
-    def year = 2023
+    def year = 2024
 
-    def month = 12
+    def month = 1
 
-    def day = 21
+    def day = 22
 
     def patch = 0
 

From 6c2314de2d9eea27850013a089f0a1f78b3a6986 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 22 Jan 2024 23:42:40 +0100
Subject: [PATCH 381/590] Install `web-push` gem

---
 Gemfile      | 1 +
 Gemfile.lock | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Gemfile b/Gemfile
index 4a275031..d2b32aa3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ gem "mini_magick"
 gem "oj"
 gem "rpush"
 gem "rqrcode"
+gem "web-push"
 
 gem "rolify", "~> 6.0"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c8a2c6da..6f335213 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -510,6 +510,9 @@ GEM
       method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
+    web-push (3.0.1)
+      jwt (~> 2.0)
+      openssl (~> 3.0)
     webpush (1.1.0)
       hkdf (~> 0.2)
       jwt (~> 2.0)
@@ -604,6 +607,7 @@ DEPENDENCIES
   turbo-rails
   twitter-text
   view_component
+  web-push
 
 BUNDLED WITH
    2.5.5

From f1a0edd06e38aa807315f34d582904bd9b00acce Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Mon, 22 Jan 2024 23:43:06 +0100
Subject: [PATCH 382/590] Replace `webpush` gem in `add_webpush_app` migration

---
 db/migrate/20220909220449_add_webpush_app.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/migrate/20220909220449_add_webpush_app.rb b/db/migrate/20220909220449_add_webpush_app.rb
index 91b1d32d..f48a688b 100644
--- a/db/migrate/20220909220449_add_webpush_app.rb
+++ b/db/migrate/20220909220449_add_webpush_app.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "webpush"
+require "web-push"
 
 class AddWebpushApp < ActiveRecord::Migration[6.1]
   def up
-    vapid_keypair = Webpush.generate_key.to_hash
+    vapid_keypair = WebPush.generate_key.to_hash
     app = Rpush::Webpush::App.new
     app.name = "webpush"
     app.certificate = vapid_keypair.merge(subject: APP_CONFIG.fetch("contact_email")).to_json

From 6e370608b38746ec9127b1801c91f51affe0aa4f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 23 Jan 2024 00:05:25 +0100
Subject: [PATCH 383/590] Update copyright year

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8b44d2aa..d9fb0ffa 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ improving Retrospring can be found in the [CONTRIBUTING.md](https://github.com/R
 
 ## Licence
 
-Copyright (C) 2014-2022 The Retrospring team and contributors
+Copyright (C) 2014-2024 The Retrospring team and contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by

From ab442db40b8f8b1ae485a6f5469df4d0a9c3b8fd Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 23 Jan 2024 19:57:26 +0100
Subject: [PATCH 384/590] Add target user to reports

---
 app/models/report.rb                          |  1 +
 ...240123182422_add_target_user_to_reports.rb | 39 +++++++++++++++++++
 db/schema.rb                                  | 10 +++--
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20240123182422_add_target_user_to_reports.rb

diff --git a/app/models/report.rb b/app/models/report.rb
index bf61c377..3cdb28a4 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -1,5 +1,6 @@
 class Report < ApplicationRecord
   belongs_to :user
+  belongs_to :target_user, class_name: "User", optional: true
   validates :type, presence: true
   validates :target_id, presence: true
   validates :user_id, presence: true
diff --git a/db/migrate/20240123182422_add_target_user_to_reports.rb b/db/migrate/20240123182422_add_target_user_to_reports.rb
new file mode 100644
index 00000000..1369940a
--- /dev/null
+++ b/db/migrate/20240123182422_add_target_user_to_reports.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class AddTargetUserToReports < ActiveRecord::Migration[7.0]
+  def up
+    add_reference :reports, :target_user, null: true, foreign_key: false
+
+    execute <<~SQL.squish
+      UPDATE reports
+      SET target_user_id = users.id
+      FROM users
+      WHERE users.id = reports.target_id AND reports.type = 'Reports::User'
+    SQL
+
+    execute <<~SQL.squish
+      UPDATE reports
+      SET target_user_id = users.id
+      FROM users, comments
+      WHERE users.id = comments.user_id AND comments.id = reports.target_id AND reports.type = 'Reports::Comment'
+    SQL
+
+    execute <<~SQL.squish
+      UPDATE reports
+      SET target_user_id = users.id
+      FROM users, answers
+      WHERE users.id = answers.user_id AND answers.id = reports.target_id AND reports.type = 'Reports::Answer'
+    SQL
+
+    execute <<~SQL.squish
+      UPDATE reports
+      SET target_user_id = users.id
+      FROM users, questions
+      WHERE users.id = questions.user_id AND questions.id = reports.target_id AND reports.type = 'Reports::Question'
+    SQL
+  end
+
+  def down
+    remove_reference :reports, :target_user, null: true, foreign_key: { to_table: :users }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e4990d1f..6429ebc6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_12_20_100445) do
+ActiveRecord::Schema[7.0].define(version: 2024_01_23_182422) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -28,11 +28,11 @@ ActiveRecord::Schema[7.0].define(version: 2023_12_20_100445) do
   end
 
   create_table "anonymous_blocks", force: :cascade do |t|
+    t.bigint "user_id"
     t.string "identifier"
+    t.bigint "question_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.bigint "question_id"
-    t.bigint "user_id"
     t.bigint "target_user_id"
     t.index ["identifier"], name: "index_anonymous_blocks_on_identifier"
     t.index ["question_id"], name: "index_anonymous_blocks_on_question_id"
@@ -95,10 +95,10 @@ ActiveRecord::Schema[7.0].define(version: 2023_12_20_100445) do
   end
 
   create_table "mute_rules", id: :bigint, default: -> { "gen_timestamp_id('mute_rules'::text)" }, force: :cascade do |t|
+    t.bigint "user_id"
     t.string "muted_phrase"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.bigint "user_id"
     t.index ["user_id"], name: "index_mute_rules_on_user_id"
   end
 
@@ -173,6 +173,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_12_20_100445) do
     t.datetime "updated_at", precision: nil
     t.boolean "deleted", default: false
     t.string "reason"
+    t.bigint "target_user_id"
+    t.index ["target_user_id"], name: "index_reports_on_target_user_id"
     t.index ["type", "target_id"], name: "index_reports_on_type_and_target_id"
     t.index ["user_id", "created_at"], name: "index_reports_on_user_id_and_created_at"
   end

From 27a57e304d189cdee37de345c0c29542c33e8dec Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 23 Jan 2024 20:32:48 +0100
Subject: [PATCH 385/590] Set target user in report action

---
 app/controllers/ajax/report_controller.rb | 8 +++++++-
 app/models/user.rb                        | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/controllers/ajax/report_controller.rb b/app/controllers/ajax/report_controller.rb
index 6451bd6d..3481f45b 100644
--- a/app/controllers/ajax/report_controller.rb
+++ b/app/controllers/ajax/report_controller.rb
@@ -36,7 +36,13 @@ class Ajax::ReportController < AjaxController
       return
     end
 
-    current_user.report object, params[:reason]
+    target_user = if object.class.to_s == "User"
+                    object
+                  elsif object.respond_to? :user
+                    object.user
+                  end
+
+    current_user.report object, target_user, params[:reason]
 
     @response[:status] = :okay
     @response[:message] = t(".success", parameter: params[:type].titleize)
diff --git a/app/models/user.rb b/app/models/user.rb
index c6faa98c..69b48cfc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -148,10 +148,10 @@ class User < ApplicationRecord
   def admin? = has_cached_role?(:administrator)
 
   # region stuff used for reporting/moderation
-  def report(object, reason = nil)
-    existing = Report.find_by(type: "Reports::#{object.class}", target_id: object.id, user_id: id, deleted: false)
+  def report(object, target_user = nil, reason = nil)
+    existing = Report.find_by(type: "Reports::#{object.class}", target_id: object.id, user_id: id, target_user_id: target_user&.id, deleted: false)
     if existing.nil?
-      Report.create(type: "Reports::#{object.class}", target_id: object.id, user_id: id, reason:)
+      Report.create(type: "Reports::#{object.class}", target_id: object.id, user_id: id, target_user_id: target_user&.id, reason:)
     elsif !reason.nil? && reason.length.positive?
       existing.append_reason(reason)
     end

From 05634ae69d0f3f7c3c1c12f6d5b575858e62ab83 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 23 Jan 2024 20:42:16 +0100
Subject: [PATCH 386/590] Move target user resolving code into `report` method

---
 app/controllers/ajax/report_controller.rb | 8 +-------
 app/models/user.rb                        | 8 +++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/ajax/report_controller.rb b/app/controllers/ajax/report_controller.rb
index 3481f45b..6451bd6d 100644
--- a/app/controllers/ajax/report_controller.rb
+++ b/app/controllers/ajax/report_controller.rb
@@ -36,13 +36,7 @@ class Ajax::ReportController < AjaxController
       return
     end
 
-    target_user = if object.class.to_s == "User"
-                    object
-                  elsif object.respond_to? :user
-                    object.user
-                  end
-
-    current_user.report object, target_user, params[:reason]
+    current_user.report object, params[:reason]
 
     @response[:status] = :okay
     @response[:message] = t(".success", parameter: params[:type].titleize)
diff --git a/app/models/user.rb b/app/models/user.rb
index 69b48cfc..358606c3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -148,7 +148,13 @@ class User < ApplicationRecord
   def admin? = has_cached_role?(:administrator)
 
   # region stuff used for reporting/moderation
-  def report(object, target_user = nil, reason = nil)
+  def report(object, reason = nil)
+    target_user = if object.class.to_s == "User"
+                    object
+                  elsif object.respond_to? :user
+                    object.user
+                  end
+
     existing = Report.find_by(type: "Reports::#{object.class}", target_id: object.id, user_id: id, target_user_id: target_user&.id, deleted: false)
     if existing.nil?
       Report.create(type: "Reports::#{object.class}", target_id: object.id, user_id: id, target_user_id: target_user&.id, reason:)

From 5a17466999bb71f5b18e3b64ee6c78d1a2f28e04 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 23 Jan 2024 20:47:38 +0100
Subject: [PATCH 387/590] Fix rubocop nits

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 358606c3..d6aa0f85 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -149,7 +149,7 @@ class User < ApplicationRecord
 
   # region stuff used for reporting/moderation
   def report(object, reason = nil)
-    target_user = if object.class.to_s == "User"
+    target_user = if object.instance_of?(::User)
                     object
                   elsif object.respond_to? :user
                     object.user

From 2a9404e285492270acc17186dec21e23be72ffdb Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 24 Jan 2024 21:05:46 +0100
Subject: [PATCH 388/590] Remove foreign-key removal in downwards migration

---
 db/migrate/20240123182422_add_target_user_to_reports.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20240123182422_add_target_user_to_reports.rb b/db/migrate/20240123182422_add_target_user_to_reports.rb
index 1369940a..a91ed9e6 100644
--- a/db/migrate/20240123182422_add_target_user_to_reports.rb
+++ b/db/migrate/20240123182422_add_target_user_to_reports.rb
@@ -34,6 +34,6 @@ class AddTargetUserToReports < ActiveRecord::Migration[7.0]
   end
 
   def down
-    remove_reference :reports, :target_user, null: true, foreign_key: { to_table: :users }
+    remove_reference :reports, :target_user, null: true, foreign_key: false
   end
 end

From 311fc0812b7e1f358826a173398b573214196661 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 24 Jan 2024 22:45:25 +0100
Subject: [PATCH 389/590] Add report filtering capabilities

---
 .../moderation/reports_controller.rb          | 10 ++--
 app/models/report_filter.rb                   | 46 +++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 app/models/report_filter.rb

diff --git a/app/controllers/moderation/reports_controller.rb b/app/controllers/moderation/reports_controller.rb
index a52977b2..758a8851 100644
--- a/app/controllers/moderation/reports_controller.rb
+++ b/app/controllers/moderation/reports_controller.rb
@@ -4,10 +4,10 @@ class Moderation::ReportsController < ApplicationController
   before_action :authenticate_user!
 
   def index
-    @type = params[:type]
-    @reports = list_reports(type: @type, last_id: params[:last_id])
+    filter = ReportFilter.new(filter_params)
+    @reports = filter.cursored_results(last_id: params[:last_id])
     @reports_last_id = @reports.map(&:id).min
-    @more_data_available = !list_reports(type: @type, last_id: @reports_last_id, size: 1).count.zero?
+    @more_data_available = filter.cursored_results(last_id: @reports_last_id, size: 1).count.positive?
 
     respond_to do |format|
       format.html
@@ -17,6 +17,10 @@ class Moderation::ReportsController < ApplicationController
 
   private
 
+  def filter_params
+    params.slice(*ReportFilter::KEYS).permit(*ReportFilter::KEYS)
+  end
+
   def list_reports(type:, last_id:, size: nil)
     cursor_params = { last_id:, size: }.compact
 
diff --git a/app/models/report_filter.rb b/app/models/report_filter.rb
new file mode 100644
index 00000000..083a5df7
--- /dev/null
+++ b/app/models/report_filter.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class ReportFilter
+  include CursorPaginatable
+
+  define_cursor_paginator :cursored_results, :results
+
+  KEYS = %i[
+    user
+    target_user
+    type
+  ].freeze
+
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def results
+    scope = Report.where(deleted: false)
+                  .order(:created_at)
+                  .reverse_order
+
+    params.each do |key, value|
+      scope.merge!(scope_for(key, value)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def scope_for(key, value)
+    case key.to_s
+    when "user"
+      Report.joins(:user)
+            .where(users: { screen_name: value })
+    when "target_user"
+      Report.joins(:target_user)
+            .where(users: { screen_name: value })
+    when "type"
+      Report.where('LOWER(type) = ?', "reports::#{value}")
+    end
+  end
+end

From 779dd245f5fde294cdb6fbf3b91924bdffc0480d Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 24 Jan 2024 22:45:54 +0100
Subject: [PATCH 390/590] Remove type parameter default value for reports
 listing

---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index dae367ea..52d1f53b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,7 +26,7 @@ Rails.application.routes.draw do
     post "/moderation/unmask", to: "moderation#toggle_unmask", as: :moderation_toggle_unmask
     get "/moderation/blocks", to: "moderation/anonymous_block#index", as: :mod_anon_block_index
     get "/moderation/inbox/:user", to: "moderation/inbox#index", as: :mod_inbox_index
-    get "/moderation/reports(/:type)", to: "moderation/reports#index", as: :moderation_reports, defaults: { type: "all" }
+    get "/moderation/reports(/:type)", to: "moderation/reports#index", as: :moderation_reports
     get "/moderation/questions/:author_identifier", to: "moderation/questions#show", as: :moderation_questions
     namespace :ajax do
       post "/mod/destroy_report", to: "moderation#destroy_report", as: :mod_destroy_report

From fa81ef2ba62ffadd24d36bdce1009b3b46f513ea Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 24 Jan 2024 22:46:50 +0100
Subject: [PATCH 391/590] Remove legacy report pagination methods

---
 app/controllers/moderation/reports_controller.rb | 10 ----------
 app/models/report.rb                             | 15 ---------------
 2 files changed, 25 deletions(-)

diff --git a/app/controllers/moderation/reports_controller.rb b/app/controllers/moderation/reports_controller.rb
index 758a8851..e4977217 100644
--- a/app/controllers/moderation/reports_controller.rb
+++ b/app/controllers/moderation/reports_controller.rb
@@ -20,14 +20,4 @@ class Moderation::ReportsController < ApplicationController
   def filter_params
     params.slice(*ReportFilter::KEYS).permit(*ReportFilter::KEYS)
   end
-
-  def list_reports(type:, last_id:, size: nil)
-    cursor_params = { last_id:, size: }.compact
-
-    if type == "all"
-      Report.cursored_reports(**cursor_params)
-    else
-      Report.cursored_reports_of_type(type, **cursor_params)
-    end
-  end
 end
diff --git a/app/models/report.rb b/app/models/report.rb
index 3cdb28a4..b437b5c9 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -16,19 +16,4 @@ class Report < ApplicationRecord
       update(reason: [reason || "", new_reason].join("\n"))
     end
   end
-
-  class << self
-    include CursorPaginatable
-
-    define_cursor_paginator :cursored_reports, :list_reports
-    define_cursor_paginator :cursored_reports_of_type, :list_reports_of_type
-
-    def list_reports(options = {})
-      self.where(options.merge!(deleted: false)).reverse_order
-    end
-
-    def list_reports_of_type(type, options = {})
-      self.where(options.merge!(deleted: false)).where('LOWER(type) = ?', "reports::#{type}").reverse_order
-    end
-  end
 end

From baa1f3f3190951e57973a575c471b1df15e2d06a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 24 Jan 2024 23:05:09 +0100
Subject: [PATCH 392/590] Fix rubocop nits

---
 app/models/report_filter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/report_filter.rb b/app/models/report_filter.rb
index 083a5df7..403d17df 100644
--- a/app/models/report_filter.rb
+++ b/app/models/report_filter.rb
@@ -40,7 +40,7 @@ class ReportFilter
       Report.joins(:target_user)
             .where(users: { screen_name: value })
     when "type"
-      Report.where('LOWER(type) = ?', "reports::#{value}")
+      Report.where("LOWER(type) = ?", "reports::#{value}")
     end
   end
 end

From c3d14c6786553c33eca72e7057d22ed116ece7b3 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 25 Jan 2024 20:43:59 +0100
Subject: [PATCH 393/590] Add specs for `Moderation::ReportsController`

---
 .../moderation/reports_controller_spec.rb     | 113 +++++++++++++++++-
 1 file changed, 107 insertions(+), 6 deletions(-)

diff --git a/spec/controllers/moderation/reports_controller_spec.rb b/spec/controllers/moderation/reports_controller_spec.rb
index 0a845606..daed0ab8 100644
--- a/spec/controllers/moderation/reports_controller_spec.rb
+++ b/spec/controllers/moderation/reports_controller_spec.rb
@@ -6,15 +6,116 @@ describe Moderation::ReportsController, type: :controller do
   let(:user) { FactoryBot.create :user, roles: ["moderator"] }
 
   describe "#index" do
-    subject { get :index }
+    shared_examples_for "sets the expected ivars" do
+      let(:expected_assigns) { {} }
 
-    before do
-      sign_in user
+      it "sets the expected ivars" do
+        subject
+
+        expected_assigns.each do |name, value|
+          expect(assigns[name]).to eq(value)
+        end
+      end
     end
 
-    it "renders the moderation/reports/index template" do
-      subject
-      expect(response).to render_template("moderation/reports/index")
+    context "template rendering" do
+      let(:other_user) { FactoryBot.create :user }
+      let(:report) { Report.create(user:, target_id: other_user.id, type: "Reports::User") }
+
+      subject { get :index }
+
+      before do
+        report
+        sign_in user
+      end
+
+      it "renders the moderation/reports/index template" do
+        subject
+        expect(response).to render_template("moderation/reports/index")
+      end
+
+      include_examples "sets the expected ivars" do
+        let(:expected_assigns) do
+          {
+            reports:         [report],
+            reports_last_id: report.id,
+          }
+        end
+      end
+    end
+
+    context "filtering for target users" do
+      let(:other_user) { FactoryBot.create :user }
+      let(:question) { FactoryBot.create :question }
+      let(:report) { Report.create(user:, target_id: other_user.id, target_user_id: other_user.id, type: "Reports::User") }
+      let(:report2) { Report.create(user:, target_id: question.id, target_user_id: nil, type: "Reports::Question") }
+
+      subject { get :index, params: { target_user: other_user.screen_name } }
+
+      before do
+        report
+        report2
+        sign_in user
+      end
+
+      include_examples "sets the expected ivars" do
+        let(:expected_assigns) do
+          {
+            reports:         [report],
+            reports_last_id: report.id,
+          }
+        end
+      end
+    end
+
+    context "filtering for users" do
+      let(:report_user) { FactoryBot.create :user }
+      let(:other_user) { FactoryBot.create :user }
+      let(:question) { FactoryBot.create :question }
+      let(:report) { Report.create(user:, target_id: other_user.id, target_user_id: other_user.id, type: "Reports::User") }
+      let(:report2) { Report.create(user: report_user, target_id: question.id, target_user_id: nil, type: "Reports::Question") }
+
+      subject { get :index, params: { user: report_user.screen_name } }
+
+      before do
+        report
+        report2
+        sign_in user
+      end
+
+      include_examples "sets the expected ivars" do
+        let(:expected_assigns) do
+          {
+            reports:         [report2],
+            reports_last_id: report2.id,
+          }
+        end
+      end
+    end
+
+    context "filtering for type" do
+      let(:report_user) { FactoryBot.create :user }
+      let(:other_user) { FactoryBot.create :user }
+      let(:question) { FactoryBot.create :question }
+      let(:report) { Report.create(user:, target_id: other_user.id, target_user_id: other_user.id, type: "Reports::User") }
+      let(:report2) { Report.create(user: report_user, target_id: question.id, target_user_id: nil, type: "Reports::Question") }
+
+      subject { get :index, params: { type: "question" } }
+
+      before do
+        report
+        report2
+        sign_in user
+      end
+
+      include_examples "sets the expected ivars" do
+        let(:expected_assigns) do
+          {
+            reports:         [report2],
+            reports_last_id: report2.id,
+          }
+        end
+      end
     end
   end
 end

From 134c575e403f7edfdfc26e197422fd07242e47d7 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 25 Jan 2024 21:15:04 +0100
Subject: [PATCH 394/590] Add missing expire times to cache keys

---
 app/models/user/ban_methods.rb          | 2 +-
 app/models/user/inbox_methods.rb        | 2 +-
 app/models/user/notification_methods.rb | 2 +-
 app/views/navigation/_desktop.html.haml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/user/ban_methods.rb b/app/models/user/ban_methods.rb
index 2fab74a3..90cb62d6 100644
--- a/app/models/user/ban_methods.rb
+++ b/app/models/user/ban_methods.rb
@@ -6,7 +6,7 @@ module User::BanMethods
   end
 
   def banned?
-    Rails.cache.fetch("#{cache_key}/banned") do
+    Rails.cache.fetch("#{cache_key}/banned", expires_in: 6.hours) do
       bans.current.count.positive?
     end
   end
diff --git a/app/models/user/inbox_methods.rb b/app/models/user/inbox_methods.rb
index 8e3b00fe..54dd89ef 100644
--- a/app/models/user/inbox_methods.rb
+++ b/app/models/user/inbox_methods.rb
@@ -14,7 +14,7 @@ module User::InboxMethods
   end
 
   def unread_inbox_count
-    Rails.cache.fetch(inbox_cache_key) do
+    Rails.cache.fetch(inbox_cache_key, expires_in: 12.hours) do
       count = Inbox.where(new: true, user_id: id).count(:id)
 
       # Returning +nil+ here in order to not display a counter
diff --git a/app/models/user/notification_methods.rb b/app/models/user/notification_methods.rb
index 41ad8a2e..10738516 100644
--- a/app/models/user/notification_methods.rb
+++ b/app/models/user/notification_methods.rb
@@ -2,7 +2,7 @@
 
 module User::NotificationMethods
   def unread_notification_count
-    Rails.cache.fetch(notification_cache_key) do
+    Rails.cache.fetch(notification_cache_key, expires_in: 12.hours) do
       count = Notification.for(self).where(new: true).count(:id)
 
       # Returning +nil+ here in order to not display a counter
diff --git a/app/views/navigation/_desktop.html.haml b/app/views/navigation/_desktop.html.haml
index 267c59ff..ceb1fd08 100644
--- a/app/views/navigation/_desktop.html.haml
+++ b/app/views/navigation/_desktop.html.haml
@@ -26,7 +26,7 @@
             = render "navigation/icons/notifications", notification_count:
         .dropdown-menu.dropdown-menu-end.notification-dropdown
           %turbo-frame#notifications-dropdown-list
-            - cache current_user.notification_dropdown_cache_key do
+            - cache current_user.notification_dropdown_cache_key, expires_in: 12.hours do
               - notifications = Notification.for(current_user).where(new: true).includes([:target]).limit(4)
               = render "navigation/dropdown/notifications", notifications:, size: "desktop"
       %li.nav-item.d-none.d-sm-block{ data: { bs_toggle: 'tooltip', bs_placement: 'bottom' }, title: t('.ask_question') }

From b96651fa702a83653e1d21c9dc1ac15fae3da0d3 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 25 Jan 2024 21:48:49 +0100
Subject: [PATCH 395/590] Disallow `author` and `anonymous` inbox filter
 combination

---
 app/models/inbox_filter.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/models/inbox_filter.rb b/app/models/inbox_filter.rb
index 1acd21a2..bf213d9d 100644
--- a/app/models/inbox_filter.rb
+++ b/app/models/inbox_filter.rb
@@ -10,6 +10,10 @@ class InboxFilter
     anonymous
   ].freeze
 
+  FORBIDDEN_PARAM_GROUPS = [
+    %i[author anonymous]
+  ].freeze
+
   attr_reader :params, :user
 
   def initialize(user, params)
@@ -18,6 +22,8 @@ class InboxFilter
   end
 
   def results
+    return Inbox.none unless valid_params?
+
     scope = @user.inboxes
                  .includes(:question, user: :profile)
                  .order(:created_at)
@@ -32,6 +38,10 @@ class InboxFilter
 
   private
 
+  def valid_params?
+    FORBIDDEN_PARAM_GROUPS.none? { |combination| combination.all? { |key| params.key?(key) } }
+  end
+
   def scope_for(key, value)
     case key.to_s
     when "author"

From 3b46c2c7e9bed3e8d8cd319422057987945f179a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 25 Jan 2024 21:49:15 +0100
Subject: [PATCH 396/590] Add spec for disallowed filter combination results

---
 spec/controllers/inbox_controller_spec.rb | 31 +++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/spec/controllers/inbox_controller_spec.rb b/spec/controllers/inbox_controller_spec.rb
index b939c9ac..5b7eae63 100644
--- a/spec/controllers/inbox_controller_spec.rb
+++ b/spec/controllers/inbox_controller_spec.rb
@@ -254,6 +254,37 @@ describe InboxController, type: :controller do
           end
         end
       end
+
+      context "when passed the anonymous and the author param" do
+        let!(:other_user) { FactoryBot.create(:user) }
+        let!(:generic_inbox_entry) do
+          Inbox.create(
+            user:,
+            question: FactoryBot.create(
+              :question,
+              user:                other_user,
+              author_is_anonymous: false,
+            ),
+          )
+        end
+
+        let!(:inbox_entry_fillers) do
+          # 9 times => 1 entry less than default page size
+          9.times.map { Inbox.create(user:, question: FactoryBot.create(:question, author_is_anonymous: true)) }
+        end
+
+        subject { get :show, params: { anonymous: true, author: "some_name" } }
+
+        include_examples "sets the expected ivars" do
+          let(:expected_assigns) do
+            {
+              inbox:               [],
+              more_data_available: false,
+              inbox_count:         0,
+            }
+          end
+        end
+      end
     end
   end
 

From 25b53b3a48f13a2b88d4c8a1353dcb0d6e1774b3 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 25 Jan 2024 22:19:20 +0100
Subject: [PATCH 397/590] Bump version to 2024.0125.0

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index 6d2b7f56..bd731d9b 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -17,7 +17,7 @@ module Retrospring
 
     def month = 1
 
-    def day = 22
+    def day = 25
 
     def patch = 0
 

From da541b0d3ee0eedcdd51ce18690156d0aa5fb382 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 11:41:12 +0100
Subject: [PATCH 398/590] Switch forks to org-owned repositories

---
 Gemfile      | 4 ++--
 Gemfile.lock | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index d2b32aa3..d1751b82 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem "active_model_otp"
 gem "bootsnap", require: false
 gem "bootstrap_form", "~> 5.0"
 gem "carrierwave", "~> 2.0"
-gem "carrierwave_backgrounder", git: "https://github.com/raccube/carrierwave_backgrounder.git"
+gem "carrierwave_backgrounder", git: "https://github.com/retrospring/carrierwave_backgrounder.git"
 gem "colorize"
 gem "devise", "~> 4.9"
 gem "devise-async"
@@ -31,7 +31,7 @@ gem "fog-aws"
 gem "fog-core"
 gem "fog-local"
 gem "haml", "~> 6.3"
-gem "hcaptcha", git: "https://github.com/raccube/hcaptcha", ref: "fix/flash-in-turbo-streams"
+gem "hcaptcha", git: "https://github.com/retrospring/hcaptcha", ref: "fix/flash-in-turbo-streams"
 gem "mini_magick"
 gem "oj"
 gem "rpush"
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f335213..12046f27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,5 @@
 GIT
-  remote: https://github.com/raccube/carrierwave_backgrounder.git
+  remote: https://github.com/retrospring/carrierwave_backgrounder.git
   revision: 41b756f7514c0e410c561bc8b5ee321cd8cce1ee
   specs:
     carrierwave_backgrounder (0.4.2)
@@ -7,7 +7,7 @@ GIT
       mime-types (>= 3.0.0)
 
 GIT
-  remote: https://github.com/raccube/hcaptcha
+  remote: https://github.com/retrospring/hcaptcha
   revision: f8de70ee2d629ac34395902dbee724c21297960c
   ref: fix/flash-in-turbo-streams
   specs:

From 078e4e4e802c834bc793e168f3a60ffe6903269a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 12:02:10 +0100
Subject: [PATCH 399/590] Install carrierwave_backgrounder version 1.0.2

---
 Gemfile      |  2 +-
 Gemfile.lock | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index d1751b82..b2165a59 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem "active_model_otp"
 gem "bootsnap", require: false
 gem "bootstrap_form", "~> 5.0"
 gem "carrierwave", "~> 2.0"
-gem "carrierwave_backgrounder", git: "https://github.com/retrospring/carrierwave_backgrounder.git"
+gem "carrierwave_backgrounder", "~> 1.0.2"
 gem "colorize"
 gem "devise", "~> 4.9"
 gem "devise-async"
diff --git a/Gemfile.lock b/Gemfile.lock
index 12046f27..28794af0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/retrospring/carrierwave_backgrounder.git
-  revision: 41b756f7514c0e410c561bc8b5ee321cd8cce1ee
-  specs:
-    carrierwave_backgrounder (0.4.2)
-      carrierwave (>= 0.5, <= 2.1)
-      mime-types (>= 3.0.0)
-
 GIT
   remote: https://github.com/retrospring/hcaptcha
   revision: f8de70ee2d629ac34395902dbee724c21297960c
@@ -116,6 +108,9 @@ GEM
       image_processing (~> 1.1)
       mimemagic (>= 0.3.0)
       mini_mime (>= 0.1.3)
+    carrierwave_backgrounder (1.0.2)
+      carrierwave (> 2.0, < 4.0)
+      rails (> 6.0, < 8.0)
     chunky_png (1.4.0)
     colorize (1.1.0)
     concurrent-ruby (1.2.3)
@@ -533,7 +528,7 @@ DEPENDENCIES
   bootstrap_form (~> 5.0)
   bullet
   carrierwave (~> 2.0)
-  carrierwave_backgrounder!
+  carrierwave_backgrounder (~> 1.0.2)
   colorize
   connection_pool
   cssbundling-rails (~> 1.4)

From e754d6f174c05dbf7fb9b85242f9b936f2de8280 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 12:56:16 +0100
Subject: [PATCH 400/590] Add migration to rename inboxes table to
 inbox_entries

---
 .../20240127112216_rename_inboxes_to_inbox_entries.rb       | 5 +++++
 db/schema.rb                                                | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20240127112216_rename_inboxes_to_inbox_entries.rb

diff --git a/db/migrate/20240127112216_rename_inboxes_to_inbox_entries.rb b/db/migrate/20240127112216_rename_inboxes_to_inbox_entries.rb
new file mode 100644
index 00000000..6c1aeff5
--- /dev/null
+++ b/db/migrate/20240127112216_rename_inboxes_to_inbox_entries.rb
@@ -0,0 +1,5 @@
+class RenameInboxesToInboxEntries < ActiveRecord::Migration[7.0]
+  def change
+    rename_table :inboxes, :inbox_entries
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6429ebc6..d2089db3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,6 +11,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema[7.0].define(version: 2024_01_23_182422) do
+ActiveRecord::Schema[7.0].define(version: 2024_01_27_112216) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -67,13 +68,14 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_23_182422) do
   end
 
   create_table "inboxes", id: :serial, force: :cascade do |t|
+  create_table "inbox_entries", id: :serial, force: :cascade do |t|
     t.bigint "user_id"
     t.bigint "question_id"
     t.boolean "new"
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
-    t.index ["question_id"], name: "index_inboxes_on_question_id"
-    t.index ["user_id"], name: "index_inboxes_on_user_id"
+    t.index ["question_id"], name: "index_inbox_entries_on_question_id"
+    t.index ["user_id"], name: "index_inbox_entries_on_user_id"
   end
 
   create_table "list_members", id: :serial, force: :cascade do |t|

From af9cbcdb11d52fada30eeb6e3a2fc2cb7e835879 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 12:57:09 +0100
Subject: [PATCH 401/590] Rename `Inbox` model to `InboxEntry`

---
 app/models/{inbox.rb => inbox_entry.rb}            | 2 +-
 spec/factories/{inbox.rb => inbox_entry.rb}        | 2 +-
 spec/models/{inbox_spec.rb => inbox_entry_spec.rb} | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename app/models/{inbox.rb => inbox_entry.rb} (97%)
 rename spec/factories/{inbox.rb => inbox_entry.rb} (82%)
 rename spec/models/{inbox_spec.rb => inbox_entry_spec.rb} (88%)

diff --git a/app/models/inbox.rb b/app/models/inbox_entry.rb
similarity index 97%
rename from app/models/inbox.rb
rename to app/models/inbox_entry.rb
index 96f3dc84..d03fa6e7 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox_entry.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Inbox < ApplicationRecord
+class InboxEntry < ApplicationRecord
   belongs_to :user, touch: :inbox_updated_at
   belongs_to :question
 
diff --git a/spec/factories/inbox.rb b/spec/factories/inbox_entry.rb
similarity index 82%
rename from spec/factories/inbox.rb
rename to spec/factories/inbox_entry.rb
index 6345fa72..182e69c2 100644
--- a/spec/factories/inbox.rb
+++ b/spec/factories/inbox_entry.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :inbox do
+  factory :inbox_entry do
     question { FactoryBot.build(:question) }
     new { true }
   end
diff --git a/spec/models/inbox_spec.rb b/spec/models/inbox_entry_spec.rb
similarity index 88%
rename from spec/models/inbox_spec.rb
rename to spec/models/inbox_entry_spec.rb
index 9a00635a..55092648 100644
--- a/spec/models/inbox_spec.rb
+++ b/spec/models/inbox_entry_spec.rb
@@ -2,7 +2,7 @@
 
 require "rails_helper"
 
-describe Inbox, type: :model do
+describe InboxEntry, type: :model do
   describe "associations" do
     it { should belong_to(:user) }
     it { should belong_to(:question) }
@@ -13,7 +13,7 @@ describe Inbox, type: :model do
     let(:question) { FactoryBot.create(:question, author_is_anonymous: true) }
 
     it "does not fail if the user wants to delete their account" do
-      Inbox.create(user:, question:)
+      InboxEntry.create(user:, question:)
 
       # this deletes the User record and enqueues the deletion of all
       # associated records in sidekiq

From 06b2421f2c572e09945b805ae22870815fbbb763 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 13:02:58 +0100
Subject: [PATCH 402/590] Rename all occurences of `Inbox` class to
 `InboxEntry`

---
 app/controllers/ajax/answer_controller.rb            |  4 ++--
 app/controllers/ajax/inbox_controller.rb             |  4 ++--
 app/controllers/inbox_controller.rb                  |  2 +-
 app/models/answer.rb                                 |  2 +-
 app/models/inbox_filter.rb                           |  2 +-
 app/models/question.rb                               |  2 +-
 app/models/user/inbox_methods.rb                     |  2 +-
 app/workers/question_worker.rb                       |  2 +-
 app/workers/scheduler/inbox_cleanup_scheduler.rb     |  2 +-
 app/workers/send_to_inbox_job.rb                     |  2 +-
 lib/use_case/question/create.rb                      |  2 +-
 spec/controllers/ajax/answer_controller_spec.rb      |  6 +++---
 spec/controllers/ajax/inbox_controller_spec.rb       |  6 +++---
 spec/controllers/anonymous_block_controller_spec.rb  |  4 ++--
 spec/controllers/inbox_controller_spec.rb            | 10 +++++-----
 spec/controllers/moderation/inbox_controller_spec.rb |  2 +-
 spec/models/answer_spec.rb                           |  2 +-
 spec/models/user/inbox_methods_spec.rb               |  2 +-
 spec/views/inbox/_entry.html.haml_spec.rb            |  2 +-
 spec/views/inbox/show.html.haml_spec.rb              |  4 ++--
 spec/views/inbox/show.turbo_stream.haml_spec.rb      |  4 ++--
 spec/workers/question_worker_spec.rb                 | 10 +++++-----
 .../scheduler/inbox_cleanup_scheduler_spec.rb        |  2 +-
 spec/workers/send_to_inbox_job_spec.rb               | 12 ++++++------
 24 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/app/controllers/ajax/answer_controller.rb b/app/controllers/ajax/answer_controller.rb
index ba0f8f7d..172c5d11 100644
--- a/app/controllers/ajax/answer_controller.rb
+++ b/app/controllers/ajax/answer_controller.rb
@@ -13,7 +13,7 @@ class Ajax::AnswerController < AjaxController
     inbox = (params[:inbox] == "true")
 
     if inbox
-      inbox_entry = Inbox.find(params[:id])
+      inbox_entry = InboxEntry.find(params[:id])
 
       unless current_user == inbox_entry.user
         @response[:status] = :fail
@@ -59,7 +59,7 @@ class Ajax::AnswerController < AjaxController
       return
     end
 
-    Inbox.create!(user: answer.user, question: answer.question, new: true, returning: true) if answer.user == current_user
+    InboxEntry.create!(user: answer.user, question: answer.question, new: true, returning: true) if answer.user == current_user
     answer.destroy
 
     @response[:status] = :okay
diff --git a/app/controllers/ajax/inbox_controller.rb b/app/controllers/ajax/inbox_controller.rb
index 66ed1766..70c4e7c2 100644
--- a/app/controllers/ajax/inbox_controller.rb
+++ b/app/controllers/ajax/inbox_controller.rb
@@ -2,7 +2,7 @@ class Ajax::InboxController < AjaxController
   def remove
     params.require :id
 
-    inbox = Inbox.find(params[:id])
+    inbox = InboxEntry.find(params[:id])
 
     unless current_user == inbox.user
       @response[:status] = :fail
@@ -28,7 +28,7 @@ class Ajax::InboxController < AjaxController
     raise unless user_signed_in?
 
     begin
-      Inbox.where(user: current_user).each { |i| i.remove }
+      InboxEntry.where(user: current_user).each { |i| i.remove }
     rescue => e
       Sentry.capture_exception(e)
       @response[:status] = :err
diff --git a/app/controllers/inbox_controller.rb b/app/controllers/inbox_controller.rb
index e551b0bc..26d4113c 100644
--- a/app/controllers/inbox_controller.rb
+++ b/app/controllers/inbox_controller.rb
@@ -23,7 +23,7 @@ class InboxController < ApplicationController
                                 author_identifier:   "justask",
                                 user:                current_user)
 
-    inbox = Inbox.create!(user: current_user, question_id: question.id, new: true)
+    inbox = InboxEntry.create!(user: current_user, question_id: question.id, new: true)
     increment_metric
 
     respond_to do |format|
diff --git a/app/models/answer.rb b/app/models/answer.rb
index f13880f9..5abd6d5a 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -36,7 +36,7 @@ class Answer < ApplicationRecord
   SHORT_ANSWER_MAX_LENGTH = 640
 
   after_create do
-    Inbox.where(user: self.user, question: self.question).destroy_all
+    InboxEntry.where(user: self.user, question: self.question).destroy_all
     user.touch :inbox_updated_at # rubocop:disable Rails/SkipsModelValidations
 
     Notification.notify self.question.user, self unless self.question.user == self.user or self.question.user.nil?
diff --git a/app/models/inbox_filter.rb b/app/models/inbox_filter.rb
index bf213d9d..ab812fa7 100644
--- a/app/models/inbox_filter.rb
+++ b/app/models/inbox_filter.rb
@@ -22,7 +22,7 @@ class InboxFilter
   end
 
   def results
-    return Inbox.none unless valid_params?
+    return InboxEntry.none unless valid_params?
 
     scope = @user.inboxes
                  .includes(:question, user: :profile)
diff --git a/app/models/question.rb b/app/models/question.rb
index 84f5faf6..85d24ad1 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -26,7 +26,7 @@ class Question < ApplicationRecord
 
   def can_be_removed?
     return false if self.answers.count > 0
-    return false if Inbox.where(question: self).count > 1
+    return false if InboxEntry.where(question: self).count > 1
     true
   end
 
diff --git a/app/models/user/inbox_methods.rb b/app/models/user/inbox_methods.rb
index 54dd89ef..e6dca73b 100644
--- a/app/models/user/inbox_methods.rb
+++ b/app/models/user/inbox_methods.rb
@@ -15,7 +15,7 @@ module User::InboxMethods
 
   def unread_inbox_count
     Rails.cache.fetch(inbox_cache_key, expires_in: 12.hours) do
-      count = Inbox.where(new: true, user_id: id).count(:id)
+      count = InboxEntry.where(new: true, user_id: id).count(:id)
 
       # Returning +nil+ here in order to not display a counter
       # at all when there isn't anything in the user's inbox
diff --git a/app/workers/question_worker.rb b/app/workers/question_worker.rb
index 69ee8091..304bd2d3 100644
--- a/app/workers/question_worker.rb
+++ b/app/workers/question_worker.rb
@@ -16,7 +16,7 @@ class QuestionWorker
     user.followers.each do |f|
       next if skip_inbox?(f, question, user)
 
-      inbox = Inbox.create(user_id: f.id, question_id:, new: true)
+      inbox = InboxEntry.create(user_id: f.id, question_id:, new: true)
       f.push_notification(webpush_app, inbox) if webpush_app
     end
   rescue StandardError => e
diff --git a/app/workers/scheduler/inbox_cleanup_scheduler.rb b/app/workers/scheduler/inbox_cleanup_scheduler.rb
index 77948ab0..6f436ecf 100644
--- a/app/workers/scheduler/inbox_cleanup_scheduler.rb
+++ b/app/workers/scheduler/inbox_cleanup_scheduler.rb
@@ -6,7 +6,7 @@ class Scheduler::InboxCleanupScheduler
   sidekiq_options retry: false
 
   def perform
-    orphaned_entries = Inbox.where(question_id: nil).includes(:user)
+    orphaned_entries = InboxEntry.where(question_id: nil).includes(:user)
     orphaned_entries.each do |inbox|
       logger.info "Deleting orphaned inbox entry #{inbox.id} from user #{inbox.user.id}"
       inbox.destroy
diff --git a/app/workers/send_to_inbox_job.rb b/app/workers/send_to_inbox_job.rb
index 6b8eec8a..aa640763 100644
--- a/app/workers/send_to_inbox_job.rb
+++ b/app/workers/send_to_inbox_job.rb
@@ -14,7 +14,7 @@ class SendToInboxJob
 
     return if skip_inbox?(follower, question)
 
-    inbox = Inbox.create(user_id: follower.id, question_id:, new: true)
+    inbox = InboxEntry.create(user_id: follower.id, question_id:, new: true)
     follower.push_notification(webpush_app, inbox) if webpush_app
   end
 
diff --git a/lib/use_case/question/create.rb b/lib/use_case/question/create.rb
index 17987a1d..0a9a2db0 100644
--- a/lib/use_case/question/create.rb
+++ b/lib/use_case/question/create.rb
@@ -20,7 +20,7 @@ module UseCase
         increment_asked_count
         increment_metric
 
-        inbox = ::Inbox.create!(user: target_user, question:, new: true)
+        inbox = ::InboxEntry.create!(user: target_user, question:, new: true)
         notify(inbox)
 
         {
diff --git a/spec/controllers/ajax/answer_controller_spec.rb b/spec/controllers/ajax/answer_controller_spec.rb
index fd6b50ca..5e0455c9 100644
--- a/spec/controllers/ajax/answer_controller_spec.rb
+++ b/spec/controllers/ajax/answer_controller_spec.rb
@@ -65,7 +65,7 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
         let(:shared_services) { %w[twitter] }
 
         context "when inbox is true" do
-          let(:id) { FactoryBot.create(:inbox, user: inbox_user, question:).id }
+          let(:id) { FactoryBot.create(:inbox_entry, user: inbox_user, question:).id }
           let(:inbox) { true }
 
           context "when the inbox entry belongs to the user" do
@@ -325,13 +325,13 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
         include_examples "deletes the answer"
 
         it "returns the question back to the user's inbox" do
-          expect { subject }.to(change { Inbox.where(question_id: answer.question.id, user_id: user.id).count }.by(1))
+          expect { subject }.to(change { InboxEntry.where(question_id: answer.question.id, user_id: user.id).count }.by(1))
         end
 
         it "returns the question back to the user's inbox when the user has anonymous questions disabled" do
           user.privacy_allow_anonymous_questions = false
           user.save
-          expect { subject }.to(change { Inbox.where(question_id: answer.question.id, user_id: user.id).count }.by(1))
+          expect { subject }.to(change { InboxEntry.where(question_id: answer.question.id, user_id: user.id).count }.by(1))
         end
 
         it "updates the inbox caching timestamp for the user who answered" do
diff --git a/spec/controllers/ajax/inbox_controller_spec.rb b/spec/controllers/ajax/inbox_controller_spec.rb
index 3b50c43d..64e669cb 100644
--- a/spec/controllers/ajax/inbox_controller_spec.rb
+++ b/spec/controllers/ajax/inbox_controller_spec.rb
@@ -17,7 +17,7 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
       before(:each) { sign_in(user) }
 
       context "when inbox entry exists" do
-        let(:inbox_entry) { FactoryBot.create(:inbox, user: inbox_user) }
+        let(:inbox_entry) { FactoryBot.create(:inbox_entry, user: inbox_user) }
         let(:inbox_entry_id) { inbox_entry.id }
 
         # ensure the inbox entry exists
@@ -35,7 +35,7 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
 
           it "removes the inbox entry" do
             expect { subject }.to(change { user.inboxes.count }.by(-1))
-            expect { Inbox.find(inbox_entry.id) }.to raise_error(ActiveRecord::RecordNotFound)
+            expect { InboxEntry.find(inbox_entry.id) }.to raise_error(ActiveRecord::RecordNotFound)
           end
 
           include_examples "returns the expected response"
@@ -112,7 +112,7 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
         end
 
         it "deletes all the entries from the user's inbox" do
-          expect { subject }.to(change { [Inbox.count, user.inboxes.count] }.from([20, 10]).to([10, 0]))
+          expect { subject }.to(change { [InboxEntry.count, user.inbox_entries.count] }.from([20, 10]).to([10, 0]))
         end
 
         include_examples "returns the expected response"
diff --git a/spec/controllers/anonymous_block_controller_spec.rb b/spec/controllers/anonymous_block_controller_spec.rb
index a1619a51..b024651c 100644
--- a/spec/controllers/anonymous_block_controller_spec.rb
+++ b/spec/controllers/anonymous_block_controller_spec.rb
@@ -15,7 +15,7 @@ describe AnonymousBlockController, type: :controller do
 
       context "when all required parameters are given" do
         let(:question) { FactoryBot.create(:question, author_identifier: "someidentifier") }
-        let!(:inbox) { FactoryBot.create(:inbox, user:, question:) }
+        let!(:inbox) { FactoryBot.create(:inbox_entry, user:, question:) }
         let(:params) do
           { question: question.id }
         end
@@ -50,7 +50,7 @@ describe AnonymousBlockController, type: :controller do
 
       context "when blocking a user globally" do
         let(:question) { FactoryBot.create(:question, author_identifier: "someidentifier") }
-        let!(:inbox) { FactoryBot.create(:inbox, user:, question:) }
+        let!(:inbox) { FactoryBot.create(:inbox_entry, user:, question:) }
         let(:params) do
           { question: question.id, global: "true" }
         end
diff --git a/spec/controllers/inbox_controller_spec.rb b/spec/controllers/inbox_controller_spec.rb
index 5b7eae63..3ebefd1b 100644
--- a/spec/controllers/inbox_controller_spec.rb
+++ b/spec/controllers/inbox_controller_spec.rb
@@ -46,7 +46,7 @@ describe InboxController, type: :controller do
       end
 
       context "when inbox has an amount of questions less than page size" do
-        let!(:inbox_entry) { Inbox.create(user:, new: true, question: FactoryBot.create(:question)) }
+        let!(:inbox_entry) { InboxEntry.create(user:, new: true, question: FactoryBot.create(:question)) }
 
         include_examples "sets the expected ivars" do
           let(:expected_assigns) do
@@ -79,13 +79,13 @@ describe InboxController, type: :controller do
       context "when inbox has an amount of questions more than page size" do
         let(:inbox_entry_fillers_page1) do
           # 9 times => 1 entry less than default page size
-          9.times.map { Inbox.create(user:, question: FactoryBot.create(:question)) }
+          9.times.map { InboxEntry.create(user:, question: FactoryBot.create(:question)) }
         end
-        let(:last_inbox_entry_page1) { Inbox.create(user:, question: FactoryBot.create(:question)) }
+        let(:last_inbox_entry_page1) { InboxEntry.create(user:, question: FactoryBot.create(:question)) }
         let(:inbox_entry_fillers_page2) do
-          5.times.map { Inbox.create(user:, question: FactoryBot.create(:question)) }
+          5.times.map { InboxEntry.create(user:, question: FactoryBot.create(:question)) }
         end
-        let(:last_inbox_entry_page2) { Inbox.create(user:, question: FactoryBot.create(:question)) }
+        let(:last_inbox_entry_page2) { InboxEntry.create(user:, question: FactoryBot.create(:question)) }
 
         before do
           # create inbox entries in reverse so pagination works as expected
diff --git a/spec/controllers/moderation/inbox_controller_spec.rb b/spec/controllers/moderation/inbox_controller_spec.rb
index 0cf89d2d..70b8f7ed 100644
--- a/spec/controllers/moderation/inbox_controller_spec.rb
+++ b/spec/controllers/moderation/inbox_controller_spec.rb
@@ -7,7 +7,7 @@ describe Moderation::InboxController do
     subject { get :index, params: params }
 
     let(:target_user) { FactoryBot.create(:user) }
-    let!(:inboxes) { FactoryBot.create_list(:inbox, 60, user: target_user) }
+    let!(:inboxes) { FactoryBot.create_list(:inbox_entry, 60, user: target_user) }
     let(:params) { { user: target_user.screen_name } }
 
     context "moderator signed in" do
diff --git a/spec/models/answer_spec.rb b/spec/models/answer_spec.rb
index bca0c829..f09759a9 100644
--- a/spec/models/answer_spec.rb
+++ b/spec/models/answer_spec.rb
@@ -23,7 +23,7 @@ describe Answer, type: :model do
 
     context "user has the question in their inbox" do
       before do
-        Inbox.create(user:, question:, new: true)
+        InboxEntry.create(user:, question:, new: true)
       end
 
       it "should remove the question from the user's inbox" do
diff --git a/spec/models/user/inbox_methods_spec.rb b/spec/models/user/inbox_methods_spec.rb
index efa7d16e..d5d4a086 100644
--- a/spec/models/user/inbox_methods_spec.rb
+++ b/spec/models/user/inbox_methods_spec.rb
@@ -18,7 +18,7 @@ describe User::InboxMethods do
       context "user has 1 question in their inbox" do
         # FactoryBot seems to have issues with setting the +new+ field on inbox entries
         # so we can create it manually instead
-        let!(:inbox) { Inbox.create(question: FactoryBot.create(:question), user:, new: true) }
+        let!(:inbox) { InboxEntry.create(question: FactoryBot.create(:question), user:, new: true) }
 
         it "should return 1" do
           expect(subject).to eq(1)
diff --git a/spec/views/inbox/_entry.html.haml_spec.rb b/spec/views/inbox/_entry.html.haml_spec.rb
index c525284f..7524173f 100644
--- a/spec/views/inbox/_entry.html.haml_spec.rb
+++ b/spec/views/inbox/_entry.html.haml_spec.rb
@@ -3,7 +3,7 @@
 require "rails_helper"
 
 describe "inbox/_entry.html.haml", type: :view do
-  let(:inbox_entry)         { Inbox.create(user: inbox_user, question:, new:) }
+  let(:inbox_entry)         { InboxEntry.create(user: inbox_user, question:, new:) }
   let(:inbox_user)          { user }
   let(:user)                { FactoryBot.create(:user, sharing_enabled:, sharing_custom_url:) }
   let(:sharing_enabled)     { true }
diff --git a/spec/views/inbox/show.html.haml_spec.rb b/spec/views/inbox/show.html.haml_spec.rb
index 19a3a13e..522b123a 100644
--- a/spec/views/inbox/show.html.haml_spec.rb
+++ b/spec/views/inbox/show.html.haml_spec.rb
@@ -25,8 +25,8 @@ describe "inbox/show.html.haml", type: :view do
   end
 
   context "with some inbox entries" do
-    let(:inbox_entry1) { Inbox.create(user:, question: FactoryBot.create(:question)) }
-    let(:inbox_entry2) { Inbox.create(user:, question: FactoryBot.create(:question)) }
+    let(:inbox_entry1) { InboxEntry.create(user:, question: FactoryBot.create(:question)) }
+    let(:inbox_entry2) { InboxEntry.create(user:, question: FactoryBot.create(:question)) }
 
     before do
       assign :inbox, [inbox_entry2, inbox_entry1]
diff --git a/spec/views/inbox/show.turbo_stream.haml_spec.rb b/spec/views/inbox/show.turbo_stream.haml_spec.rb
index f7a49245..2fd30175 100644
--- a/spec/views/inbox/show.turbo_stream.haml_spec.rb
+++ b/spec/views/inbox/show.turbo_stream.haml_spec.rb
@@ -12,8 +12,8 @@ describe "inbox/show.turbo_stream.haml", type: :view do
   subject(:rendered) { render }
 
   context "with some inbox entries" do
-    let(:inbox_entry1) { Inbox.create(user:, question: FactoryBot.create(:question)) }
-    let(:inbox_entry2) { Inbox.create(user:, question: FactoryBot.create(:question)) }
+    let(:inbox_entry1) { InboxEntry.create(user:, question: FactoryBot.create(:question)) }
+    let(:inbox_entry2) { InboxEntry.create(user:, question: FactoryBot.create(:question)) }
 
     before do
       assign :inbox, [inbox_entry2, inbox_entry1]
diff --git a/spec/workers/question_worker_spec.rb b/spec/workers/question_worker_spec.rb
index 0795e55b..7961b884 100644
--- a/spec/workers/question_worker_spec.rb
+++ b/spec/workers/question_worker_spec.rb
@@ -22,7 +22,7 @@ describe QuestionWorker do
     it "places the question in the inbox of the user's followers" do
       expect { subject }
         .to(
-          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+          change { InboxEntry.where(user_id: user.followers.ids, question_id:, new: true).count }
             .from(0)
             .to(5)
         )
@@ -36,7 +36,7 @@ describe QuestionWorker do
 
       expect { subject }
         .to(
-          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+          change { InboxEntry.where(user_id: user.followers.ids, question_id:, new: true).count }
             .from(0)
             .to(4)
         )
@@ -47,7 +47,7 @@ describe QuestionWorker do
 
       expect { subject }
         .to(
-          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+          change { InboxEntry.where(user_id: user.followers.ids, question_id:, new: true).count }
             .from(0)
             .to(4)
         )
@@ -58,7 +58,7 @@ describe QuestionWorker do
 
       expect { subject }
         .to(
-          change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+          change { InboxEntry.where(user_id: user.followers.ids, question_id:, new: true).count }
             .from(0)
             .to(4)
         )
@@ -102,7 +102,7 @@ describe QuestionWorker do
 
         expect { subject }
           .to(
-            change { Inbox.where(user_id: user.followers.ids, question_id:, new: true).count }
+            change { InboxEntry.where(user_id: user.followers.ids, question_id:, new: true).count }
               .from(0)
               .to(1)
           )
diff --git a/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb b/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb
index 81763b6c..92f335bc 100644
--- a/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb
@@ -17,7 +17,7 @@ describe Scheduler::InboxCleanupScheduler do
     it "should delete orphaned inbox entries" do
       expect { subject }
         .to(
-          change { Inbox.where(question_id: nil).count }
+          change { InboxEntry.where(question_id: nil).count }
             .from(1)
             .to(0),
         )
diff --git a/spec/workers/send_to_inbox_job_spec.rb b/spec/workers/send_to_inbox_job_spec.rb
index 237ca75d..f549b694 100644
--- a/spec/workers/send_to_inbox_job_spec.rb
+++ b/spec/workers/send_to_inbox_job_spec.rb
@@ -21,7 +21,7 @@ describe SendToInboxJob do
     it "places the question in the inbox of the user's followers" do
       expect { subject }
         .to(
-          change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
+          change { InboxEntry.where(user_id: follower_id, question_id:, new: true).count }
             .from(0)
             .to(1),
         )
@@ -34,21 +34,21 @@ describe SendToInboxJob do
       MuteRule.create(user_id: follower_id, muted_phrase: "spicy")
 
       subject
-      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+      expect(InboxEntry.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
     end
 
     it "respects inbox locks" do
       follower.update(privacy_lock_inbox: true)
 
       subject
-      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+      expect(InboxEntry.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
     end
 
     it "does not send questions to banned users" do
       follower.ban
 
       subject
-      expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+      expect(InboxEntry.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
     end
 
     context "receiver has push notifications enabled" do
@@ -86,7 +86,7 @@ describe SendToInboxJob do
 
         expect { subject }
           .to(
-            change { Inbox.where(user_id: follower_id, question_id:, new: true).count }
+            change { InboxEntry.where(user_id: follower_id, question_id:, new: true).count }
               .from(0)
               .to(1),
           )
@@ -94,7 +94,7 @@ describe SendToInboxJob do
 
       it "does not send to recipients who do not allow long questions" do
         subject
-        expect(Inbox.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
+        expect(InboxEntry.where(user_id: follower_id, question_id:, new: true).count).to eq(0)
       end
     end
   end

From ba7ba359b4862b82c02761259361e48d7dfde83d Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 13:03:45 +0100
Subject: [PATCH 403/590] Rename user/question associations to `:inbox_entries`

---
 app/models/question.rb | 2 +-
 app/models/user.rb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/question.rb b/app/models/question.rb
index 85d24ad1..2c289a88 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -4,7 +4,7 @@ class Question < ApplicationRecord
   belongs_to :user, optional: true
   has_many :anonymous_blocks, dependent: :nullify
   has_many :answers, dependent: :destroy
-  has_many :inboxes, dependent: :destroy
+  has_many :inbox_entries, dependent: :destroy
 
   validates :content, length: { minimum: 1 }
 
diff --git a/app/models/user.rb b/app/models/user.rb
index d6aa0f85..50a88d2b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -33,7 +33,7 @@ class User < ApplicationRecord
   has_many :questions, dependent: :destroy_async
   has_many :answers, dependent: :destroy_async
   has_many :comments, dependent: :destroy_async
-  has_many :inboxes, dependent: :destroy_async
+  has_many :inbox_entries, dependent: :destroy_async
   has_many :smiles, class_name: "Reaction", dependent: :destroy_async
   has_many :notifications, foreign_key: :recipient_id, dependent: :destroy_async
   has_many :reports, dependent: :destroy_async

From 658cb0442b3d067c8dd786b81c360c45fca829f3 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 13:04:29 +0100
Subject: [PATCH 404/590] Rename all occurences of associative inbox entry
 access

---
 app/controllers/ajax/inbox_controller.rb      |  4 ++--
 app/controllers/anonymous_block_controller.rb |  4 ++--
 .../moderation/inbox_controller.rb            |  2 +-
 app/models/inbox_filter.rb                    |  6 +++---
 app/models/user/inbox_methods.rb              |  4 ++--
 app/models/user/relationship/block.rb         |  4 ++--
 .../controllers/ajax/inbox_controller_spec.rb | 18 ++++++++---------
 .../ajax/question_controller_spec.rb          |  8 ++++----
 spec/controllers/inbox_controller_spec.rb     | 20 +++++++++----------
 spec/lib/use_case/question/create_spec.rb     |  4 ++--
 spec/models/answer_spec.rb                    |  2 +-
 .../scheduler/inbox_cleanup_scheduler_spec.rb |  2 +-
 12 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/app/controllers/ajax/inbox_controller.rb b/app/controllers/ajax/inbox_controller.rb
index 70c4e7c2..2a7c67a4 100644
--- a/app/controllers/ajax/inbox_controller.rb
+++ b/app/controllers/ajax/inbox_controller.rb
@@ -44,8 +44,8 @@ class Ajax::InboxController < AjaxController
   def remove_all_author
     begin
       @target_user = User.where('LOWER(screen_name) = ?', params[:author].downcase).first!
-      @inbox = current_user.inboxes.joins(:question)
-                                   .where(questions: { user_id: @target_user.id, author_is_anonymous: false })
+      @inbox = current_user.inbox_entries.joins(:question)
+                                         .where(questions: { user_id: @target_user.id, author_is_anonymous: false })
       @inbox.each { |i| i.remove }
     rescue => e
       Sentry.capture_exception(e)
diff --git a/app/controllers/anonymous_block_controller.rb b/app/controllers/anonymous_block_controller.rb
index a8c9a32f..2d0ce4fc 100644
--- a/app/controllers/anonymous_block_controller.rb
+++ b/app/controllers/anonymous_block_controller.rb
@@ -20,8 +20,8 @@ class AnonymousBlockController < ApplicationController
       target_user: question.user
     )
 
-    inbox_id = question.inboxes.first&.id
-    question.inboxes.first&.destroy
+    inbox_id = question.inbox_entries.first&.id
+    question.inbox_entries.first&.destroy
 
     respond_to do |format|
       format.turbo_stream do
diff --git a/app/controllers/moderation/inbox_controller.rb b/app/controllers/moderation/inbox_controller.rb
index 5cbb8a80..80aa94f5 100644
--- a/app/controllers/moderation/inbox_controller.rb
+++ b/app/controllers/moderation/inbox_controller.rb
@@ -8,7 +8,7 @@ class Moderation::InboxController < ApplicationController
     @inboxes = @user.cursored_inbox(last_id: params[:last_id])
     @inbox_last_id = @inboxes.map(&:id).min
     @more_data_available = !@user.cursored_inbox(last_id: @inbox_last_id, size: 1).count.zero?
-    @inbox_count = @user.inboxes.count
+    @inbox_count = @user.inbox_entries.count
 
     respond_to do |format|
       format.html
diff --git a/app/models/inbox_filter.rb b/app/models/inbox_filter.rb
index ab812fa7..f649bb3e 100644
--- a/app/models/inbox_filter.rb
+++ b/app/models/inbox_filter.rb
@@ -24,7 +24,7 @@ class InboxFilter
   def results
     return InboxEntry.none unless valid_params?
 
-    scope = @user.inboxes
+    scope = @user.inbox_entries
                  .includes(:question, user: :profile)
                  .order(:created_at)
                  .reverse_order
@@ -45,10 +45,10 @@ class InboxFilter
   def scope_for(key, value)
     case key.to_s
     when "author"
-      @user.inboxes.joins(question: [:user])
+      @user.inbox_entries.joins(question: [:user])
            .where(questions: { users: { screen_name: value }, author_is_anonymous: false })
     when "anonymous"
-      @user.inboxes.joins(:question)
+      @user.inbox_entries.joins(:question)
            .where(questions: { author_is_anonymous: true })
     end
   end
diff --git a/app/models/user/inbox_methods.rb b/app/models/user/inbox_methods.rb
index e6dca73b..b5efab58 100644
--- a/app/models/user/inbox_methods.rb
+++ b/app/models/user/inbox_methods.rb
@@ -5,9 +5,9 @@ module User::InboxMethods
 
   define_cursor_paginator :cursored_inbox, :ordered_inbox
 
-  # @return [ActiveRecord::Relation<Inbox>] the user's inbox entries
+  # @return [ActiveRecord::Relation<InboxEntry>] the user's inbox entries
   def ordered_inbox
-    inboxes
+    inbox_entries
       .includes(:question, user: :profile)
       .order(:created_at)
       .reverse_order
diff --git a/app/models/user/relationship/block.rb b/app/models/user/relationship/block.rb
index 01cd25ed..03639cf2 100644
--- a/app/models/user/relationship/block.rb
+++ b/app/models/user/relationship/block.rb
@@ -53,8 +53,8 @@ class User
       def unfollow_and_remove(target_user)
         unfollow(target_user) if following?(target_user)
         target_user.unfollow(self) if target_user.following?(self)
-        target_user.inboxes.joins(:question).where(question: { user_id: id }).destroy_all
-        inboxes.joins(:question).where(questions: { user_id: target_user.id, author_is_anonymous: false }).destroy_all
+        target_user.inbox_entries.joins(:question).where(question: { user_id: id }).destroy_all
+        inbox_entries.joins(:question).where(questions: { user_id: target_user.id, author_is_anonymous: false }).destroy_all
         ListMember.joins(:list).where(list: { user_id: target_user.id }, user_id: id).destroy_all
       end
 
diff --git a/spec/controllers/ajax/inbox_controller_spec.rb b/spec/controllers/ajax/inbox_controller_spec.rb
index 64e669cb..074a92ae 100644
--- a/spec/controllers/ajax/inbox_controller_spec.rb
+++ b/spec/controllers/ajax/inbox_controller_spec.rb
@@ -34,7 +34,7 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
           end
 
           it "removes the inbox entry" do
-            expect { subject }.to(change { user.inboxes.count }.by(-1))
+            expect { subject }.to(change { user.inbox_entries.count }.by(-1))
             expect { InboxEntry.find(inbox_entry.id) }.to raise_error(ActiveRecord::RecordNotFound)
           end
 
@@ -52,8 +52,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
           end
 
           it "does not remove the inbox entry" do
-            expect { subject }.not_to(change { Inbox.count })
-            expect { Inbox.find(inbox_entry.id) }.not_to raise_error
+            expect { subject }.not_to(change { InboxEntry.count })
+            expect { InboxEntry.find(inbox_entry.id) }.not_to raise_error
           end
 
           include_examples "returns the expected response"
@@ -107,8 +107,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
       context "when user has some inbox entries" do
         let(:some_other_user) { FactoryBot.create(:user) }
         before do
-          10.times { FactoryBot.create(:inbox, user: user) }
-          10.times { FactoryBot.create(:inbox, user: some_other_user) }
+          10.times { FactoryBot.create(:inbox_entry, user: user) }
+          10.times { FactoryBot.create(:inbox_entry, user: some_other_user) }
         end
 
         it "deletes all the entries from the user's inbox" do
@@ -162,13 +162,13 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
           normal_question = FactoryBot.create(:question, user: some_other_user, author_is_anonymous: false)
           anon_question = FactoryBot.create(:question, user: some_other_user, author_is_anonymous: true)
 
-          10.times { FactoryBot.create(:inbox, user: user) }
-          3.times { FactoryBot.create(:inbox, user: user, question: normal_question) }
-          2.times { FactoryBot.create(:inbox, user: user, question: anon_question) }
+          10.times { FactoryBot.create(:inbox_entry, user: user) }
+          3.times { FactoryBot.create(:inbox_entry, user: user, question: normal_question) }
+          2.times { FactoryBot.create(:inbox_entry, user: user, question: anon_question) }
         end
 
         it "deletes all the entries asked by some other user which are not anonymous from the user's inbox" do
-          expect { subject }.to(change { user.inboxes.count }.from(15).to(12))
+          expect { subject }.to(change { user.inbox_entries.count }.from(15).to(12))
         end
 
         include_examples "returns the expected response"
diff --git a/spec/controllers/ajax/question_controller_spec.rb b/spec/controllers/ajax/question_controller_spec.rb
index 9575576f..077ace60 100644
--- a/spec/controllers/ajax/question_controller_spec.rb
+++ b/spec/controllers/ajax/question_controller_spec.rb
@@ -14,8 +14,8 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
 
       if check_for_inbox
         it "adds the question to the target users' inbox" do
-          expect { subject }.to(change { target_user.inboxes.count }.by(1))
-          expect(target_user.inboxes.last.question.content).to eq(question_content)
+          expect { subject }.to(change { target_user.inbox_entries.count }.by(1))
+          expect(target_user.inbox_entries.last.question.content).to eq(question_content)
         end
       end
 
@@ -29,7 +29,7 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
 
       if check_for_inbox
         it "does not add the question to the target users' inbox" do
-          expect { subject }.not_to(change { target_user.inboxes.count })
+          expect { subject }.not_to(change { target_user.inbox_entries.count })
         end
       end
 
@@ -42,7 +42,7 @@ describe Ajax::QuestionController, :ajax_controller, type: :controller do
       end
 
       it "does not add the question to the target users' inbox" do
-        expect { subject }.not_to(change { target_user.inboxes.count })
+        expect { subject }.not_to(change { target_user.inbox_entries.count })
       end
 
       include_examples "returns the expected response"
diff --git a/spec/controllers/inbox_controller_spec.rb b/spec/controllers/inbox_controller_spec.rb
index 3ebefd1b..689a70ae 100644
--- a/spec/controllers/inbox_controller_spec.rb
+++ b/spec/controllers/inbox_controller_spec.rb
@@ -131,7 +131,7 @@ describe InboxController, type: :controller do
         let!(:unrelated_user) { FactoryBot.create(:user) }
 
         let!(:generic_inbox_entry1) do
-          Inbox.create(
+          InboxEntry.create(
             user:,
             question: FactoryBot.create(
               :question,
@@ -140,7 +140,7 @@ describe InboxController, type: :controller do
             ),
           )
         end
-        let!(:generic_inbox_entry2) { Inbox.create(user:, question: FactoryBot.create(:question)) }
+        let!(:generic_inbox_entry2) { InboxEntry.create(user:, question: FactoryBot.create(:question)) }
 
         subject { get :show, params: { author: author_param } }
 
@@ -163,7 +163,7 @@ describe InboxController, type: :controller do
 
           context "with no non-anonymous questions from the other user in the inbox" do
             let!(:anonymous_inbox_entry) do
-              Inbox.create(
+              InboxEntry.create(
                 user:,
                 question: FactoryBot.create(
                   :question,
@@ -188,7 +188,7 @@ describe InboxController, type: :controller do
 
           context "with both non-anonymous and anonymous questions from the other user in the inbox" do
             let!(:non_anonymous_inbox_entry) do
-              Inbox.create(
+              InboxEntry.create(
                 user:,
                 question: FactoryBot.create(
                   :question,
@@ -198,7 +198,7 @@ describe InboxController, type: :controller do
               )
             end
             let!(:anonymous_inbox_entry) do
-              Inbox.create(
+              InboxEntry.create(
                 user:,
                 question: FactoryBot.create(
                   :question,
@@ -227,7 +227,7 @@ describe InboxController, type: :controller do
       context "when passed the anonymous param" do
         let!(:other_user) { FactoryBot.create(:user) }
         let!(:generic_inbox_entry) do
-          Inbox.create(
+          InboxEntry.create(
             user:,
             question: FactoryBot.create(
               :question,
@@ -239,7 +239,7 @@ describe InboxController, type: :controller do
 
         let!(:inbox_entry_fillers) do
           # 9 times => 1 entry less than default page size
-          9.times.map { Inbox.create(user:, question: FactoryBot.create(:question, author_is_anonymous: true)) }
+          9.times.map { InboxEntry.create(user:, question: FactoryBot.create(:question, author_is_anonymous: true)) }
         end
 
         subject { get :show, params: { anonymous: true } }
@@ -258,7 +258,7 @@ describe InboxController, type: :controller do
       context "when passed the anonymous and the author param" do
         let!(:other_user) { FactoryBot.create(:user) }
         let!(:generic_inbox_entry) do
-          Inbox.create(
+          InboxEntry.create(
             user:,
             question: FactoryBot.create(
               :question,
@@ -270,7 +270,7 @@ describe InboxController, type: :controller do
 
         let!(:inbox_entry_fillers) do
           # 9 times => 1 entry less than default page size
-          9.times.map { Inbox.create(user:, question: FactoryBot.create(:question, author_is_anonymous: true)) }
+          9.times.map { InboxEntry.create(user:, question: FactoryBot.create(:question, author_is_anonymous: true)) }
         end
 
         subject { get :show, params: { anonymous: true, author: "some_name" } }
@@ -299,7 +299,7 @@ describe InboxController, type: :controller do
       before(:each) { sign_in(user) }
 
       it "creates an inbox entry" do
-        expect { subject }.to(change { user.inboxes.count }.by(1))
+        expect { subject }.to(change { user.inbox_entries.count }.by(1))
       end
 
       include_examples "touches user timestamp", :inbox_updated_at
diff --git a/spec/lib/use_case/question/create_spec.rb b/spec/lib/use_case/question/create_spec.rb
index a1831771..a31e9073 100644
--- a/spec/lib/use_case/question/create_spec.rb
+++ b/spec/lib/use_case/question/create_spec.rb
@@ -23,9 +23,9 @@ describe UseCase::Question::Create do
       expect(question.direct).to eq(true)
 
       if should_send_to_inbox
-        expect(target_user.inboxes.first.question_id).to eq(question.id)
+        expect(target_user.inbox_entries.first.question_id).to eq(question.id)
       else
-        expect(target_user.inboxes.first).to be_nil
+        expect(target_user.inbox_entries.first).to be_nil
       end
     end
   end
diff --git a/spec/models/answer_spec.rb b/spec/models/answer_spec.rb
index f09759a9..7443c54d 100644
--- a/spec/models/answer_spec.rb
+++ b/spec/models/answer_spec.rb
@@ -27,7 +27,7 @@ describe Answer, type: :model do
       end
 
       it "should remove the question from the user's inbox" do
-        expect { subject.save }.to change { user.inboxes.count }.by(-1)
+        expect { subject.save }.to change { user.inbox_entries.count }.by(-1)
       end
     end
 
diff --git a/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb b/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb
index 92f335bc..775cdba7 100644
--- a/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/inbox_cleanup_scheduler_spec.rb
@@ -4,7 +4,7 @@ require "rails_helper"
 
 describe Scheduler::InboxCleanupScheduler do
   let(:user) { FactoryBot.create(:user) }
-  let(:inbox) { FactoryBot.create(:inbox, user:) }
+  let(:inbox) { FactoryBot.create(:inbox_entry, user:) }
 
   describe "#perform" do
     before do

From 245f862bb20eb700c9ed28ee509076e0a85a143c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 13:20:04 +0100
Subject: [PATCH 405/590] Fix schema.rb

---
 db/schema.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index d2089db3..ec0a8910 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,6 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_01_23_182422) do
 ActiveRecord::Schema[7.0].define(version: 2024_01_27_112216) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -67,7 +66,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_27_112216) do
     t.index ["user_id", "created_at"], name: "index_comments_on_user_id_and_created_at"
   end
 
-  create_table "inboxes", id: :serial, force: :cascade do |t|
   create_table "inbox_entries", id: :serial, force: :cascade do |t|
     t.bigint "user_id"
     t.bigint "question_id"

From 62ba205d3e2c2725e6ab1f6cd6a53424f368afa5 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 13:31:36 +0100
Subject: [PATCH 406/590] Fix rubocop nits

---
 app/controllers/ajax/inbox_controller.rb      | 10 ++--
 app/models/question.rb                        |  7 ++-
 ...7112216_rename_inboxes_to_inbox_entries.rb |  2 +
 .../controllers/ajax/inbox_controller_spec.rb | 52 +++++++++----------
 4 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/app/controllers/ajax/inbox_controller.rb b/app/controllers/ajax/inbox_controller.rb
index 2a7c67a4..77042d62 100644
--- a/app/controllers/ajax/inbox_controller.rb
+++ b/app/controllers/ajax/inbox_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ajax::InboxController < AjaxController
   def remove
     params.require :id
@@ -28,7 +30,7 @@ class Ajax::InboxController < AjaxController
     raise unless user_signed_in?
 
     begin
-      InboxEntry.where(user: current_user).each { |i| i.remove }
+      InboxEntry.where(user: current_user).find_each(&:remove)
     rescue => e
       Sentry.capture_exception(e)
       @response[:status] = :err
@@ -43,10 +45,10 @@ class Ajax::InboxController < AjaxController
 
   def remove_all_author
     begin
-      @target_user = User.where('LOWER(screen_name) = ?', params[:author].downcase).first!
+      @target_user = User.where("LOWER(screen_name) = ?", params[:author].downcase).first!
       @inbox = current_user.inbox_entries.joins(:question)
-                                         .where(questions: { user_id: @target_user.id, author_is_anonymous: false })
-      @inbox.each { |i| i.remove }
+                           .where(questions: { user_id: @target_user.id, author_is_anonymous: false })
+      @inbox.each(&:remove)
     rescue => e
       Sentry.capture_exception(e)
       @response[:status] = :err
diff --git a/app/models/question.rb b/app/models/question.rb
index 2c289a88..2e7549af 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Question < ApplicationRecord
   include Question::AnswerMethods
 
@@ -11,7 +13,7 @@ class Question < ApplicationRecord
   SHORT_QUESTION_MAX_LENGTH = 512
 
   before_destroy do
-    rep = Report.where(target_id: self.id, type: 'Reports::Question')
+    rep = Report.where(target_id: self.id, type: "Reports::Question")
     rep.each do |r|
       unless r.nil?
         r.deleted = true
@@ -25,8 +27,9 @@ class Question < ApplicationRecord
   end
 
   def can_be_removed?
-    return false if self.answers.count > 0
+    return false if self.answers.count.positive?
     return false if InboxEntry.where(question: self).count > 1
+
     true
   end
 
diff --git a/db/migrate/20240127112216_rename_inboxes_to_inbox_entries.rb b/db/migrate/20240127112216_rename_inboxes_to_inbox_entries.rb
index 6c1aeff5..03a8f55b 100644
--- a/db/migrate/20240127112216_rename_inboxes_to_inbox_entries.rb
+++ b/db/migrate/20240127112216_rename_inboxes_to_inbox_entries.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameInboxesToInboxEntries < ActiveRecord::Migration[7.0]
   def change
     rename_table :inboxes, :inbox_entries
diff --git a/spec/controllers/ajax/inbox_controller_spec.rb b/spec/controllers/ajax/inbox_controller_spec.rb
index 074a92ae..6e48e53e 100644
--- a/spec/controllers/ajax/inbox_controller_spec.rb
+++ b/spec/controllers/ajax/inbox_controller_spec.rb
@@ -7,11 +7,11 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
   describe "#remove" do
     let(:params) do
       {
-        id: inbox_entry_id
+        id: inbox_entry_id,
       }
     end
 
-    subject { delete(:remove, params: params) }
+    subject { delete(:remove, params:) }
 
     context "when user is signed in" do
       before(:each) { sign_in(user) }
@@ -28,8 +28,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
           let(:expected_response) do
             {
               "success" => true,
-              "status" => "okay",
-              "message" => anything
+              "status"  => "okay",
+              "message" => anything,
             }
           end
 
@@ -46,8 +46,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
           let(:expected_response) do
             {
               "success" => false,
-              "status" => "fail",
-              "message" => anything
+              "status"  => "fail",
+              "message" => anything,
             }
           end
 
@@ -65,8 +65,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
         let(:expected_response) do
           {
             "success" => false,
-            "status" => "not_found",
-            "message" => anything
+            "status"  => "not_found",
+            "message" => anything,
           }
         end
 
@@ -79,8 +79,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
       let(:expected_response) do
         {
           "success" => false,
-          "status" => "not_found",
-          "message" => anything
+          "status"  => "not_found",
+          "message" => anything,
         }
       end
 
@@ -97,8 +97,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
       let(:expected_response) do
         {
           "success" => true,
-          "status" => "okay",
-          "message" => anything
+          "status"  => "okay",
+          "message" => anything,
         }
       end
 
@@ -107,7 +107,7 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
       context "when user has some inbox entries" do
         let(:some_other_user) { FactoryBot.create(:user) }
         before do
-          10.times { FactoryBot.create(:inbox_entry, user: user) }
+          10.times { FactoryBot.create(:inbox_entry, user:) }
           10.times { FactoryBot.create(:inbox_entry, user: some_other_user) }
         end
 
@@ -123,8 +123,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
       let(:expected_response) do
         {
           "success" => false,
-          "status" => "err",
-          "message" => anything
+          "status"  => "err",
+          "message" => anything,
         }
       end
 
@@ -135,11 +135,11 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
   describe "#remove_all_author" do
     let(:params) do
       {
-        author: author
+        author:,
       }
     end
 
-    subject { delete(:remove_all_author, params: params) }
+    subject { delete(:remove_all_author, params:) }
 
     context "when user is signed in" do
       before(:each) { sign_in(user) }
@@ -148,8 +148,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
       let(:expected_response) do
         {
           "success" => true,
-          "status" => "okay",
-          "message" => anything
+          "status"  => "okay",
+          "message" => anything,
         }
       end
 
@@ -162,9 +162,9 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
           normal_question = FactoryBot.create(:question, user: some_other_user, author_is_anonymous: false)
           anon_question = FactoryBot.create(:question, user: some_other_user, author_is_anonymous: true)
 
-          10.times { FactoryBot.create(:inbox_entry, user: user) }
-          3.times { FactoryBot.create(:inbox_entry, user: user, question: normal_question) }
-          2.times { FactoryBot.create(:inbox_entry, user: user, question: anon_question) }
+          10.times { FactoryBot.create(:inbox_entry, user:) }
+          3.times { FactoryBot.create(:inbox_entry, user:, question: normal_question) }
+          2.times { FactoryBot.create(:inbox_entry, user:, question: anon_question) }
         end
 
         it "deletes all the entries asked by some other user which are not anonymous from the user's inbox" do
@@ -179,8 +179,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
         let(:expected_response) do
           {
             "success" => false,
-            "status" => "err",
-            "message" => anything
+            "status"  => "err",
+            "message" => anything,
           }
         end
 
@@ -193,8 +193,8 @@ describe Ajax::InboxController, :ajax_controller, type: :controller do
       let(:expected_response) do
         {
           "success" => false,
-          "status" => "err",
-          "message" => anything
+          "status"  => "err",
+          "message" => anything,
         }
       end
 

From d12e3b020e6710fcd5bd8ef004c45ea6c69d6906 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 20:15:13 +0100
Subject: [PATCH 407/590] Use `InboxFilter` in `Moderation::InboxController`

---
 app/controllers/moderation/inbox_controller.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/controllers/moderation/inbox_controller.rb b/app/controllers/moderation/inbox_controller.rb
index 80aa94f5..b906a11c 100644
--- a/app/controllers/moderation/inbox_controller.rb
+++ b/app/controllers/moderation/inbox_controller.rb
@@ -5,9 +5,11 @@ class Moderation::InboxController < ApplicationController
 
   def index
     @user = User.find_by(screen_name: params[:user])
-    @inboxes = @user.cursored_inbox(last_id: params[:last_id])
+    filter = InboxFilter.new(@user, filter_params)
+
+    @inboxes = filter.cursored_results(last_id: params[:last_id])
     @inbox_last_id = @inboxes.map(&:id).min
-    @more_data_available = !@user.cursored_inbox(last_id: @inbox_last_id, size: 1).count.zero?
+    @more_data_available = !filter.cursored_results(last_id: @inbox_last_id, size: 1).count.zero?
     @inbox_count = @user.inbox_entries.count
 
     respond_to do |format|
@@ -15,4 +17,10 @@ class Moderation::InboxController < ApplicationController
       format.turbo_stream { render "index", layout: false, status: :see_other }
     end
   end
+
+  private
+
+  def filter_params
+    params.slice(*InboxFilter::KEYS).permit(*InboxFilter::KEYS)
+  end
 end

From 020b7db712a648ad874c6898143abcd8774c8e17 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 27 Jan 2024 20:24:29 +0100
Subject: [PATCH 408/590] Remove ordered_inbox method and related paginator

---
 app/models/user/inbox_methods.rb | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/models/user/inbox_methods.rb b/app/models/user/inbox_methods.rb
index b5efab58..50a81039 100644
--- a/app/models/user/inbox_methods.rb
+++ b/app/models/user/inbox_methods.rb
@@ -1,18 +1,6 @@
 # frozen_string_literal: true
 
 module User::InboxMethods
-  include CursorPaginatable
-
-  define_cursor_paginator :cursored_inbox, :ordered_inbox
-
-  # @return [ActiveRecord::Relation<InboxEntry>] the user's inbox entries
-  def ordered_inbox
-    inbox_entries
-      .includes(:question, user: :profile)
-      .order(:created_at)
-      .reverse_order
-  end
-
   def unread_inbox_count
     Rails.cache.fetch(inbox_cache_key, expires_in: 12.hours) do
       count = InboxEntry.where(new: true, user_id: id).count(:id)

From c309acbd9dc92e81e4acfa14661a5c3a0ccd4bfd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:05:47 +0000
Subject: [PATCH 409/590] Bump @typescript-eslint/parser from 6.19.0 to 6.19.1

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.19.0 to 6.19.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.19.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 51 +++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 129edbb2..c0419496 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "@typescript-eslint/parser": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.1",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
diff --git a/yarn.lock b/yarn.lock
index 939b2bc9..fa2b9eb8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,15 +325,15 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.19.0.tgz#80344086f362181890ade7e94fc35fe0480bfdf5"
-  integrity sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow==
+"@typescript-eslint/parser@^6.19.1":
+  version "6.19.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.19.1.tgz#68a87bb21afaf0b1689e9cdce0e6e75bc91ada78"
+  integrity sha512-WEfX22ziAh6pRE9jnbkkLGp/4RhTpffr2ZK5bJ18M8mIfA8A+k97U9ZyaXCEJRlmMHh7R9MJZWXp/r73DzINVQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.19.0"
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/typescript-estree" "6.19.0"
-    "@typescript-eslint/visitor-keys" "6.19.0"
+    "@typescript-eslint/scope-manager" "6.19.1"
+    "@typescript-eslint/types" "6.19.1"
+    "@typescript-eslint/typescript-estree" "6.19.1"
+    "@typescript-eslint/visitor-keys" "6.19.1"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@6.19.0":
@@ -344,6 +344,14 @@
     "@typescript-eslint/types" "6.19.0"
     "@typescript-eslint/visitor-keys" "6.19.0"
 
+"@typescript-eslint/scope-manager@6.19.1":
+  version "6.19.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.1.tgz#2f527ee30703a6169a52b31d42a1103d80acd51b"
+  integrity sha512-4CdXYjKf6/6aKNMSly/BP4iCSOpvMmqtDzRtqFyyAae3z5kkqEjKndR5vDHL8rSuMIIWP8u4Mw4VxLyxZW6D5w==
+  dependencies:
+    "@typescript-eslint/types" "6.19.1"
+    "@typescript-eslint/visitor-keys" "6.19.1"
+
 "@typescript-eslint/type-utils@6.19.0":
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz#522a494ef0d3e9fdc5e23a7c22c9331bbade0101"
@@ -359,6 +367,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.0.tgz#689b0498c436272a6a2059b09f44bcbd90de294a"
   integrity sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==
 
+"@typescript-eslint/types@6.19.1":
+  version "6.19.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.1.tgz#2d4c9d492a63ede15e7ba7d129bdf7714b77f771"
+  integrity sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==
+
 "@typescript-eslint/typescript-estree@6.19.0":
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz#0813ba364a409afb4d62348aec0202600cb468fa"
@@ -373,6 +386,20 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
+"@typescript-eslint/typescript-estree@6.19.1":
+  version "6.19.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.1.tgz#796d88d88882f12e85bb33d6d82d39e1aea54ed1"
+  integrity sha512-aFdAxuhzBFRWhy+H20nYu19+Km+gFfwNO4TEqyszkMcgBDYQjmPJ61erHxuT2ESJXhlhrO7I5EFIlZ+qGR8oVA==
+  dependencies:
+    "@typescript-eslint/types" "6.19.1"
+    "@typescript-eslint/visitor-keys" "6.19.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
 "@typescript-eslint/utils@6.19.0":
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.19.0.tgz#557b72c3eeb4f73bef8037c85dae57b21beb1a4b"
@@ -394,6 +421,14 @@
     "@typescript-eslint/types" "6.19.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.19.1":
+  version "6.19.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.1.tgz#2164073ed4fc34a5ff3b5e25bb5a442100454c4c"
+  integrity sha512-gkdtIO+xSO/SmI0W68DBg4u1KElmIUo3vXzgHyGPs6cxgB0sa3TlptRAAE0hUY1hM6FcDKEv7aIwiTGm76cXfQ==
+  dependencies:
+    "@typescript-eslint/types" "6.19.1"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"

From c51b95643f6479672f4b5524d0fa3977c1c91119 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:20:45 +0000
Subject: [PATCH 410/590] Bump rspec-rails from 6.1.0 to 6.1.1

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.0 to 6.1.1.
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.0...v6.1.1)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 28794af0..7ee432c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -391,7 +391,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.1.0)
+    rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)

From a6d3a5b15ca1226d6a0c165fad670c8a23407989 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:21:03 +0000
Subject: [PATCH 411/590] Bump carrierwave from 2.1.0 to 3.0.5

Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 2.1.0 to 3.0.5.
- [Release notes](https://github.com/carrierwaveuploader/carrierwave/releases)
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md)
- [Commits](https://github.com/carrierwaveuploader/carrierwave/compare/v2.1.0...v3.0.5)

---
updated-dependencies:
- dependency-name: carrierwave
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index b2165a59..e42cb8a7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem "bcrypt", "~> 3.1.20"
 gem "active_model_otp"
 gem "bootsnap", require: false
 gem "bootstrap_form", "~> 5.0"
-gem "carrierwave", "~> 2.0"
+gem "carrierwave", "~> 3.0"
 gem "carrierwave_backgrounder", "~> 1.0.2"
 gem "colorize"
 gem "devise", "~> 4.9"
diff --git a/Gemfile.lock b/Gemfile.lock
index 28794af0..d838e1f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,7 +81,7 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     bcrypt (3.1.20)
@@ -101,13 +101,13 @@ GEM
     bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    carrierwave (2.1.0)
-      activemodel (>= 5.0.0)
-      activesupport (>= 5.0.0)
+    carrierwave (3.0.5)
+      activemodel (>= 6.0.0)
+      activesupport (>= 6.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
-      mimemagic (>= 0.3.0)
-      mini_mime (>= 0.1.3)
+      marcel (~> 1.0.0)
+      ssrf_filter (~> 1.0)
     carrierwave_backgrounder (1.0.2)
       carrierwave (> 2.0, < 4.0)
       rails (> 6.0, < 8.0)
@@ -260,9 +260,6 @@ GEM
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.1205)
-    mimemagic (0.4.3)
-      nokogiri (~> 1)
-      rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
@@ -300,7 +297,7 @@ GEM
     pghero (3.4.0)
       activerecord (>= 6)
     prometheus-client (4.2.2)
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.1)
@@ -477,6 +474,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
+    ssrf_filter (1.1.2)
     sysexits (1.2.0)
     temple (0.10.3)
     thor (1.3.0)
@@ -527,7 +525,7 @@ DEPENDENCIES
   bootsnap
   bootstrap_form (~> 5.0)
   bullet
-  carrierwave (~> 2.0)
+  carrierwave (~> 3.0)
   carrierwave_backgrounder (~> 1.0.2)
   colorize
   connection_pool

From 500bba6cd5e52b26c565b4b719c22b79014a4bb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:21:38 +0000
Subject: [PATCH 412/590] Bump rubocop from 1.60.1 to 1.60.2

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.1 to 1.60.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.60.1...v1.60.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 28794af0..602151ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -405,7 +405,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.60.1)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 95aebb489ef0460fa7b06f1ba4a439e24e324606 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:21:57 +0000
Subject: [PATCH 413/590] Bump haml_lint from 0.53.0 to 0.55.0

Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.53.0 to 0.55.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.53.0...v0.55.0)

---
updated-dependencies:
- dependency-name: haml_lint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 28794af0..91444218 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -202,7 +202,7 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    haml_lint (0.53.0)
+    haml_lint (0.55.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow

From 5f1f137822881f58adf9b58ea7f4f1a291108218 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jan 2024 19:17:32 +0000
Subject: [PATCH 414/590] Bump @typescript-eslint/eslint-plugin from 6.19.0 to
 6.20.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.19.0 to 6.20.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.20.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 110 +++++++++++++++++++++++++--------------------------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index c0419496..cb24d67f 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "typescript": "^5.3.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/eslint-plugin": "^6.20.0",
     "@typescript-eslint/parser": "^6.19.1",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
diff --git a/yarn.lock b/yarn.lock
index fa2b9eb8..ed282cb0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -308,16 +308,16 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
   integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
-"@typescript-eslint/eslint-plugin@^6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.0.tgz#db03f3313b57a30fbbdad2e6929e88fc7feaf9ba"
-  integrity sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==
+"@typescript-eslint/eslint-plugin@^6.20.0":
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz#9cf31546d2d5e884602626d89b0e0d2168ac25ed"
+  integrity sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.19.0"
-    "@typescript-eslint/type-utils" "6.19.0"
-    "@typescript-eslint/utils" "6.19.0"
-    "@typescript-eslint/visitor-keys" "6.19.0"
+    "@typescript-eslint/scope-manager" "6.20.0"
+    "@typescript-eslint/type-utils" "6.20.0"
+    "@typescript-eslint/utils" "6.20.0"
+    "@typescript-eslint/visitor-keys" "6.20.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -336,14 +336,6 @@
     "@typescript-eslint/visitor-keys" "6.19.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz#b6d2abb825b29ab70cb542d220e40c61c1678116"
-  integrity sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/visitor-keys" "6.19.0"
-
 "@typescript-eslint/scope-manager@6.19.1":
   version "6.19.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.1.tgz#2f527ee30703a6169a52b31d42a1103d80acd51b"
@@ -352,39 +344,33 @@
     "@typescript-eslint/types" "6.19.1"
     "@typescript-eslint/visitor-keys" "6.19.1"
 
-"@typescript-eslint/type-utils@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz#522a494ef0d3e9fdc5e23a7c22c9331bbade0101"
-  integrity sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==
+"@typescript-eslint/scope-manager@6.20.0":
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz#8a926e60f6c47feb5bab878246dc2ae465730151"
+  integrity sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.19.0"
-    "@typescript-eslint/utils" "6.19.0"
+    "@typescript-eslint/types" "6.20.0"
+    "@typescript-eslint/visitor-keys" "6.20.0"
+
+"@typescript-eslint/type-utils@6.20.0":
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz#d395475cd0f3610dd80c7d8716fa0db767da3831"
+  integrity sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.20.0"
+    "@typescript-eslint/utils" "6.20.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.0.tgz#689b0498c436272a6a2059b09f44bcbd90de294a"
-  integrity sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==
-
 "@typescript-eslint/types@6.19.1":
   version "6.19.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.1.tgz#2d4c9d492a63ede15e7ba7d129bdf7714b77f771"
   integrity sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==
 
-"@typescript-eslint/typescript-estree@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz#0813ba364a409afb4d62348aec0202600cb468fa"
-  integrity sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/visitor-keys" "6.19.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+"@typescript-eslint/types@6.20.0":
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.20.0.tgz#5ccd74c29011ae7714ae6973e4ec0c634708b448"
+  integrity sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==
 
 "@typescript-eslint/typescript-estree@6.19.1":
   version "6.19.1"
@@ -400,27 +386,33 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.19.0.tgz#557b72c3eeb4f73bef8037c85dae57b21beb1a4b"
-  integrity sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==
+"@typescript-eslint/typescript-estree@6.20.0":
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz#5b2d0975949e6bdd8d45ee1471461ef5fadc5542"
+  integrity sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==
+  dependencies:
+    "@typescript-eslint/types" "6.20.0"
+    "@typescript-eslint/visitor-keys" "6.20.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.20.0":
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.20.0.tgz#0e52afcfaa51af5656490ba4b7437cc3aa28633d"
+  integrity sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.19.0"
-    "@typescript-eslint/types" "6.19.0"
-    "@typescript-eslint/typescript-estree" "6.19.0"
+    "@typescript-eslint/scope-manager" "6.20.0"
+    "@typescript-eslint/types" "6.20.0"
+    "@typescript-eslint/typescript-estree" "6.20.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.19.0":
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz#4565e0ecd63ca1f81b96f1dd76e49f746c6b2b49"
-  integrity sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.0"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.19.1":
   version "6.19.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.1.tgz#2164073ed4fc34a5ff3b5e25bb5a442100454c4c"
@@ -429,6 +421,14 @@
     "@typescript-eslint/types" "6.19.1"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@6.20.0":
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz#f7ada27f2803de89df0edd9fd7be22c05ce6a498"
+  integrity sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==
+  dependencies:
+    "@typescript-eslint/types" "6.20.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"

From e4fa1bd4e0279babc825545eda6d3b8736e7913e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:10:11 +0000
Subject: [PATCH 415/590] Bump reviewdog/action-stylelint from 1.18.1 to 1.20.2

Bumps [reviewdog/action-stylelint](https://github.com/reviewdog/action-stylelint) from 1.18.1 to 1.20.2.
- [Release notes](https://github.com/reviewdog/action-stylelint/releases)
- [Commits](https://github.com/reviewdog/action-stylelint/compare/v1.18.1...v1.20.2)

---
updated-dependencies:
- dependency-name: reviewdog/action-stylelint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 438cd81f..80c25a50 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -104,7 +104,7 @@ jobs:
           yarn install --frozen-lockfile
         if: steps.changed-files.outputs.any_changed == 'true'
       - name: stylelint
-        uses: reviewdog/action-stylelint@v1.18.1
+        uses: reviewdog/action-stylelint@v1.20.2
         with:
           github_token: ${{ secrets.github_token }}
           reporter: github-pr-check

From 343a17913f4a911e60707b50ed3a2f97b44ccd83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:10:15 +0000
Subject: [PATCH 416/590] Bump codecov/codecov-action from 3 to 4

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/retrospring.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index 2d21adf2..9e217ea3 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -75,7 +75,7 @@ jobs:
         env:
           POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
           REDIS_URL: "redis://localhost:${{ job.services.redis.ports[6379] }}"
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage/coverage.xml

From b4c290a1e4e98c4d64a54c40f288d09074a0f003 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:12:50 +0000
Subject: [PATCH 417/590] Bump @typescript-eslint/parser from 6.19.1 to 6.20.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.19.1 to 6.20.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.20.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 51 ++++++++-------------------------------------------
 2 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/package.json b/package.json
index cb24d67f..befdce01 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.20.0",
-    "@typescript-eslint/parser": "^6.19.1",
+    "@typescript-eslint/parser": "^6.20.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
diff --git a/yarn.lock b/yarn.lock
index ed282cb0..6a4b578d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,25 +325,17 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.19.1":
-  version "6.19.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.19.1.tgz#68a87bb21afaf0b1689e9cdce0e6e75bc91ada78"
-  integrity sha512-WEfX22ziAh6pRE9jnbkkLGp/4RhTpffr2ZK5bJ18M8mIfA8A+k97U9ZyaXCEJRlmMHh7R9MJZWXp/r73DzINVQ==
+"@typescript-eslint/parser@^6.20.0":
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.20.0.tgz#17e314177304bdf498527e3c4b112e41287b7416"
+  integrity sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.19.1"
-    "@typescript-eslint/types" "6.19.1"
-    "@typescript-eslint/typescript-estree" "6.19.1"
-    "@typescript-eslint/visitor-keys" "6.19.1"
+    "@typescript-eslint/scope-manager" "6.20.0"
+    "@typescript-eslint/types" "6.20.0"
+    "@typescript-eslint/typescript-estree" "6.20.0"
+    "@typescript-eslint/visitor-keys" "6.20.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.19.1":
-  version "6.19.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.19.1.tgz#2f527ee30703a6169a52b31d42a1103d80acd51b"
-  integrity sha512-4CdXYjKf6/6aKNMSly/BP4iCSOpvMmqtDzRtqFyyAae3z5kkqEjKndR5vDHL8rSuMIIWP8u4Mw4VxLyxZW6D5w==
-  dependencies:
-    "@typescript-eslint/types" "6.19.1"
-    "@typescript-eslint/visitor-keys" "6.19.1"
-
 "@typescript-eslint/scope-manager@6.20.0":
   version "6.20.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz#8a926e60f6c47feb5bab878246dc2ae465730151"
@@ -362,30 +354,11 @@
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.19.1":
-  version "6.19.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.19.1.tgz#2d4c9d492a63ede15e7ba7d129bdf7714b77f771"
-  integrity sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==
-
 "@typescript-eslint/types@6.20.0":
   version "6.20.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.20.0.tgz#5ccd74c29011ae7714ae6973e4ec0c634708b448"
   integrity sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==
 
-"@typescript-eslint/typescript-estree@6.19.1":
-  version "6.19.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.1.tgz#796d88d88882f12e85bb33d6d82d39e1aea54ed1"
-  integrity sha512-aFdAxuhzBFRWhy+H20nYu19+Km+gFfwNO4TEqyszkMcgBDYQjmPJ61erHxuT2ESJXhlhrO7I5EFIlZ+qGR8oVA==
-  dependencies:
-    "@typescript-eslint/types" "6.19.1"
-    "@typescript-eslint/visitor-keys" "6.19.1"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
 "@typescript-eslint/typescript-estree@6.20.0":
   version "6.20.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz#5b2d0975949e6bdd8d45ee1471461ef5fadc5542"
@@ -413,14 +386,6 @@
     "@typescript-eslint/typescript-estree" "6.20.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.19.1":
-  version "6.19.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.1.tgz#2164073ed4fc34a5ff3b5e25bb5a442100454c4c"
-  integrity sha512-gkdtIO+xSO/SmI0W68DBg4u1KElmIUo3vXzgHyGPs6cxgB0sa3TlptRAAE0hUY1hM6FcDKEv7aIwiTGm76cXfQ==
-  dependencies:
-    "@typescript-eslint/types" "6.19.1"
-    eslint-visitor-keys "^3.4.1"
-
 "@typescript-eslint/visitor-keys@6.20.0":
   version "6.20.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz#f7ada27f2803de89df0edd9fd7be22c05ce6a498"

From bce44cf34d61edaf67a3d7ae4f1f35e8c56a3c68 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:39:55 +0000
Subject: [PATCH 418/590] Bump rspec-mocks from 3.12.6 to 3.13.0

Bumps [rspec-mocks](https://github.com/rspec/rspec-mocks) from 3.12.6 to 3.13.0.
- [Release notes](https://github.com/rspec/rspec-mocks/releases)
- [Changelog](https://github.com/rspec/rspec-mocks/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-mocks/compare/v3.12.6...v3.13.0)

---
updated-dependencies:
- dependency-name: rspec-mocks
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c5191b8a..fa713389 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -137,7 +137,7 @@ GEM
       devise (>= 4.0)
     devise-i18n (1.12.0)
       devise (>= 4.9.0)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
@@ -380,17 +380,17 @@ GEM
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
@@ -404,7 +404,7 @@ GEM
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
-    rspec-support (3.12.1)
+    rspec-support (3.13.0)
     rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)

From 27a9981ba5879ccf221c06282956fc8f24545238 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:40:10 +0000
Subject: [PATCH 419/590] Bump net-imap from 0.4.9.1 to 0.4.10

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.9.1 to 0.4.10.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.9.1...v0.4.10)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c5191b8a..7b0460b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -275,7 +275,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.9.1)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)

From 172e24546fc7649f04eaab308304f07a076a293d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:40:25 +0000
Subject: [PATCH 420/590] Bump haml_lint from 0.55.0 to 0.56.0

Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.55.0 to 0.56.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.55.0...v0.56.0)

---
updated-dependencies:
- dependency-name: haml_lint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c5191b8a..2074b213 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -202,7 +202,7 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    haml_lint (0.55.0)
+    haml_lint (0.56.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow

From cf4b1eb4ba023ab53266b89d84ff657caf8404e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:40:42 +0000
Subject: [PATCH 421/590] Bump bootsnap from 1.17.1 to 1.18.3

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.17.1 to 1.18.3.
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.17.1...v1.18.3)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c5191b8a..6b44543b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,7 +92,7 @@ GEM
     bigdecimal (3.1.5)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.17.1)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
     bootstrap_form (5.3.2)
       actionpack (>= 6.1)

From 6951e3c6157a59ad7e89dd301f6e6bffeceddfc3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 03:53:11 +0000
Subject: [PATCH 422/590] Bump nokogiri from 1.16.0 to 1.16.2

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.0 to 1.16.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.0...v1.16.2)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c5191b8a..4ecbc348 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -285,7 +285,7 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)

From d6dc8301d49aead78f4e6d324a82057c1a2aeaa8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 09:21:04 +0000
Subject: [PATCH 423/590] Bump @hotwired/turbo-rails from 7.3.0 to 8.0.2

Bumps [@hotwired/turbo-rails](https://github.com/hotwired/turbo-rails) from 7.3.0 to 8.0.2.
- [Release notes](https://github.com/hotwired/turbo-rails/releases)
- [Commits](https://github.com/hotwired/turbo-rails/commits)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo-rails"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index befdce01..7b3b15b0 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "@fortawesome/fontawesome-free": "^6.5.1",
     "@github/hotkey": "^3.1.0",
     "@hotwired/stimulus": "^3.2.2",
-    "@hotwired/turbo-rails": "^7.3.0",
+    "@hotwired/turbo-rails": "^8.0.2",
     "@melloware/coloris": "^0.22.0",
     "@popperjs/core": "^2.11",
     "@rails/request.js": "^0.0.9",
diff --git a/yarn.lock b/yarn.lock
index 6a4b578d..bfbd5f0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -210,18 +210,18 @@
   resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608"
   integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A==
 
-"@hotwired/turbo-rails@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.3.0.tgz#422c21752509f3edcd6c7b2725bbe9e157815f51"
-  integrity sha512-fvhO64vp/a2UVQ3jue9WTc2JisMv9XilIC7ViZmXAREVwiQ2S4UC7Go8f9A1j4Xu7DBI6SbFdqILk5ImqVoqyA==
+"@hotwired/turbo-rails@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.2.tgz#c43d54d9346bcf14c897166556bfed92ed4c1d17"
+  integrity sha512-j+6THPc+CsaUdUXZTg6wQ+YcStO9kn6CuGzElqFxUmV/vyd1Jfm0RLZMIbaY8w9Qse7u6JBcrm4AcRxhIhYmaQ==
   dependencies:
-    "@hotwired/turbo" "^7.3.0"
+    "@hotwired/turbo" "^8.0.2"
     "@rails/actioncable" "^7.0"
 
-"@hotwired/turbo@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.3.0.tgz#2226000fff1aabda9fd9587474565c9929dbf15d"
-  integrity sha512-Dcu+NaSvHLT7EjrDrkEmH4qET2ZJZ5IcCWmNXxNQTBwlnE5tBZfN6WxZ842n5cHV52DH/AKNirbPBtcEXDLW4g==
+"@hotwired/turbo@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.2.tgz#c31cdadfe66b98983066a94073b26fc7e15835f0"
+  integrity sha512-3K6QZkwWfosAV8zuM5bY+kKF02jp1lMQGsWfSE6wXdZBRBP3ah+Vj26YNqYtkEomBwRWA0QKhZgyJP7xOQkVEg==
 
 "@humanwhocodes/config-array@^0.11.13":
   version "0.11.13"

From 591fa4f5eb6bad9ab4e3ea3f64dcd49e425e4503 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 09:25:22 +0000
Subject: [PATCH 424/590] Bump reviewdog/action-stylelint from 1.20.2 to 1.22.1

Bumps [reviewdog/action-stylelint](https://github.com/reviewdog/action-stylelint) from 1.20.2 to 1.22.1.
- [Release notes](https://github.com/reviewdog/action-stylelint/releases)
- [Commits](https://github.com/reviewdog/action-stylelint/compare/v1.20.2...v1.22.1)

---
updated-dependencies:
- dependency-name: reviewdog/action-stylelint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 80c25a50..9b5fe236 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -104,7 +104,7 @@ jobs:
           yarn install --frozen-lockfile
         if: steps.changed-files.outputs.any_changed == 'true'
       - name: stylelint
-        uses: reviewdog/action-stylelint@v1.20.2
+        uses: reviewdog/action-stylelint@v1.22.1
         with:
           github_token: ${{ secrets.github_token }}
           reporter: github-pr-check

From c8493fdb2cf9402800f80f4f2cfb9152567efb4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:35:29 +0000
Subject: [PATCH 425/590] Bump @typescript-eslint/eslint-plugin from 6.20.0 to
 7.0.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.20.0 to 7.0.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.0.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 77 ++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index befdce01..13067103 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "typescript": "^5.3.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.20.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.20.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
diff --git a/yarn.lock b/yarn.lock
index 6a4b578d..e0562bcd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -308,16 +308,16 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
   integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
 
-"@typescript-eslint/eslint-plugin@^6.20.0":
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz#9cf31546d2d5e884602626d89b0e0d2168ac25ed"
-  integrity sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==
+"@typescript-eslint/eslint-plugin@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.0.tgz#62cda0d35bbf601683c6e58cf5d04f0275caca4e"
+  integrity sha512-M72SJ0DkcQVmmsbqlzc6EJgb/3Oz2Wdm6AyESB4YkGgCxP8u5jt5jn4/OBMPK3HLOxcttZq5xbBBU7e2By4SZQ==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.20.0"
-    "@typescript-eslint/type-utils" "6.20.0"
-    "@typescript-eslint/utils" "6.20.0"
-    "@typescript-eslint/visitor-keys" "6.20.0"
+    "@typescript-eslint/scope-manager" "7.0.0"
+    "@typescript-eslint/type-utils" "7.0.0"
+    "@typescript-eslint/utils" "7.0.0"
+    "@typescript-eslint/visitor-keys" "7.0.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -344,13 +344,21 @@
     "@typescript-eslint/types" "6.20.0"
     "@typescript-eslint/visitor-keys" "6.20.0"
 
-"@typescript-eslint/type-utils@6.20.0":
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz#d395475cd0f3610dd80c7d8716fa0db767da3831"
-  integrity sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==
+"@typescript-eslint/scope-manager@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.0.0.tgz#15ea9abad2b56fc8f5c0b516775f41c86c5c8685"
+  integrity sha512-IxTStwhNDPO07CCrYuAqjuJ3Xf5MrMaNgbAZPxFXAUpAtwqFxiuItxUaVtP/SJQeCdJjwDGh9/lMOluAndkKeg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.20.0"
-    "@typescript-eslint/utils" "6.20.0"
+    "@typescript-eslint/types" "7.0.0"
+    "@typescript-eslint/visitor-keys" "7.0.0"
+
+"@typescript-eslint/type-utils@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.0.0.tgz#a4c7ae114414e09dbbd3c823b5924793f7483252"
+  integrity sha512-FIM8HPxj1P2G7qfrpiXvbHeHypgo2mFpFGoh5I73ZlqmJOsloSa1x0ZyXCer43++P1doxCgNqIOLqmZR6SOT8g==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "7.0.0"
+    "@typescript-eslint/utils" "7.0.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
@@ -359,6 +367,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.20.0.tgz#5ccd74c29011ae7714ae6973e4ec0c634708b448"
   integrity sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==
 
+"@typescript-eslint/types@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.0.0.tgz#2e5889c7fe3c873fc6dc6420aa77775f17cd5dc6"
+  integrity sha512-9ZIJDqagK1TTs4W9IyeB2sH/s1fFhN9958ycW8NRTg1vXGzzH5PQNzq6KbsbVGMT+oyyfa17DfchHDidcmf5cg==
+
 "@typescript-eslint/typescript-estree@6.20.0":
   version "6.20.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz#5b2d0975949e6bdd8d45ee1471461ef5fadc5542"
@@ -373,17 +386,31 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.20.0":
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.20.0.tgz#0e52afcfaa51af5656490ba4b7437cc3aa28633d"
-  integrity sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==
+"@typescript-eslint/typescript-estree@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.0.tgz#7ce66f2ce068517f034f73fba9029300302fdae9"
+  integrity sha512-JzsOzhJJm74aQ3c9um/aDryHgSHfaX8SHFIu9x4Gpik/+qxLvxUylhTsO9abcNu39JIdhY2LgYrFxTii3IajLA==
+  dependencies:
+    "@typescript-eslint/types" "7.0.0"
+    "@typescript-eslint/visitor-keys" "7.0.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.0.0.tgz#e43710af746c6ae08484f7afc68abc0212782c7e"
+  integrity sha512-kuPZcPAdGcDBAyqDn/JVeJVhySvpkxzfXjJq1X1BFSTYo1TTuo4iyb937u457q4K0In84p6u2VHQGaFnv7VYqg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.20.0"
-    "@typescript-eslint/types" "6.20.0"
-    "@typescript-eslint/typescript-estree" "6.20.0"
+    "@typescript-eslint/scope-manager" "7.0.0"
+    "@typescript-eslint/types" "7.0.0"
+    "@typescript-eslint/typescript-estree" "7.0.0"
     semver "^7.5.4"
 
 "@typescript-eslint/visitor-keys@6.20.0":
@@ -394,6 +421,14 @@
     "@typescript-eslint/types" "6.20.0"
     eslint-visitor-keys "^3.4.1"
 
+"@typescript-eslint/visitor-keys@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.0.tgz#83cdadd193ee735fe9ea541f6a2b4d76dfe62081"
+  integrity sha512-JZP0uw59PRHp7sHQl3aF/lFgwOW2rgNVnXUksj1d932PMita9wFBd3621vHQRDvHwPsSY9FMAAHVc8gTvLYY4w==
+  dependencies:
+    "@typescript-eslint/types" "7.0.0"
+    eslint-visitor-keys "^3.4.1"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"

From 6b218d254c30b28e19599459215517ba518fe5a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:36:10 +0000
Subject: [PATCH 426/590] Bump sass from 1.70.0 to 1.71.0

Bumps [sass](https://github.com/sass/dart-sass) from 1.70.0 to 1.71.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.70.0...1.71.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index befdce01..e2fb42b4 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.70.0",
+    "sass": "^1.71.0",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.3.3"
diff --git a/yarn.lock b/yarn.lock
index 6a4b578d..6a178825 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2227,10 +2227,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.70.0:
-  version "1.70.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.70.0.tgz#761197419d97b5358cb25f9dd38c176a8a270a75"
-  integrity sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==
+sass@^1.71.0:
+  version "1.71.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.0.tgz#b3085759b9b2ab503a977aecb7e91153bf941117"
+  integrity sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 0defbaf2b4621054cc5e40c14d63021e65090956 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:48:18 +0000
Subject: [PATCH 427/590] Bump pg from 1.5.4 to 1.5.5

Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.4 to 1.5.5.
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.5.4...v1.5.5)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bc3ccb90..89872b86 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,7 +296,7 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    pg (1.5.4)
+    pg (1.5.5)
     pghero (3.4.0)
       activerecord (>= 6)
     prometheus-client (4.2.2)

From ab98443bfe941c17658db22955792e1a2c03a8ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:50:27 +0000
Subject: [PATCH 428/590] Bump dotenv-rails from 2.8.1 to 3.0.2

Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.8.1 to 3.0.2.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/main/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.8.1...v3.0.2)

---
updated-dependencies:
- dependency-name: dotenv-rails
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index b2165a59..cb28bfc9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -82,7 +82,7 @@ group :development, :test do
   gem "better_errors"
   gem "bullet"
   gem "database_cleaner"
-  gem "dotenv-rails", "~> 2.8"
+  gem "dotenv-rails", "~> 3.0"
   gem "factory_bot_rails", require: false
   gem "faker"
   gem "haml_lint", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bc3ccb90..e5f97b23 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -139,10 +139,10 @@ GEM
       devise (>= 4.9.0)
     diff-lcs (1.5.1)
     docile (1.4.0)
-    dotenv (2.8.1)
-    dotenv-rails (2.8.1)
-      dotenv (= 2.8.1)
-      railties (>= 3.2)
+    dotenv (3.0.2)
+    dotenv-rails (3.0.2)
+      dotenv (= 3.0.2)
+      railties (>= 6.1)
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
@@ -266,7 +266,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.2)
+    minitest (5.22.2)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -514,7 +514,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby
@@ -536,7 +536,7 @@ DEPENDENCIES
   devise (~> 4.9)
   devise-async
   devise-i18n
-  dotenv-rails (~> 2.8)
+  dotenv-rails (~> 3.0)
   dry-initializer (~> 3.1)
   dry-types (~> 1.7)
   factory_bot_rails

From 698eebe5a027e52416823c6de5907e895e8a3007 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:51:13 +0000
Subject: [PATCH 429/590] Bump jwt from 2.7.1 to 2.8.0

Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.7.1...v2.8.0)

---
updated-dependencies:
- dependency-name: jwt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index b2165a59..a91317d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,7 @@ gem "tldv", "~> 0.1.0"
 
 gem "view_component"
 
-gem "jwt", "~> 2.7"
+gem "jwt", "~> 2.8"
 
 group :development do
   gem "binding_of_caller"
diff --git a/Gemfile.lock b/Gemfile.lock
index bc3ccb90..9cbfd099 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -84,6 +84,7 @@ GEM
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
+    base64 (0.2.0)
     bcrypt (3.1.20)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
@@ -227,7 +228,8 @@ GEM
     json (2.7.1)
     json-schema (4.1.1)
       addressable (>= 2.8)
-    jwt (2.7.1)
+    jwt (2.8.0)
+      base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -552,7 +554,7 @@ DEPENDENCIES
   i18n-js (= 4.0)
   jsbundling-rails (~> 1.3)
   json-schema
-  jwt (~> 2.7)
+  jwt (~> 2.8)
   letter_opener
   lograge
   mail (~> 2.7.1)

From 403bc093504c01775e31d2cc1dc1185401f7b713 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 16:32:12 +0000
Subject: [PATCH 430/590] Bump haml_lint from 0.56.0 to 0.57.0

Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.56.0 to 0.57.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.56.0...v0.57.0)

---
updated-dependencies:
- dependency-name: haml_lint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1a0e9659..28d16529 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -203,7 +203,7 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    haml_lint (0.56.0)
+    haml_lint (0.57.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow

From d7e7f6dafb4248954ce68673107fddced9f4c6ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 16:32:41 +0000
Subject: [PATCH 431/590] Bump pghero from 3.4.0 to 3.4.1

Bumps [pghero](https://github.com/ankane/pghero) from 3.4.0 to 3.4.1.
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/pghero/compare/v3.4.0...v3.4.1)

---
updated-dependencies:
- dependency-name: pghero
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1a0e9659..d4013737 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -299,7 +299,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.5)
-    pghero (3.4.0)
+    pghero (3.4.1)
       activerecord (>= 6)
     prometheus-client (4.2.2)
     public_suffix (5.0.3)

From 525879f1ff276e7f8eaab514948685bf1e865f6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 16:33:27 +0000
Subject: [PATCH 432/590] Bump letter_opener from 1.8.1 to 1.9.0

Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.8.1 to 1.9.0.
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.8.1...v1.9.0)

---
updated-dependencies:
- dependency-name: letter_opener
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1a0e9659..169a192c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,7 +81,7 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.2.0)
@@ -245,7 +245,7 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    letter_opener (1.8.1)
+    letter_opener (1.9.0)
       launchy (>= 2.2, < 3)
     lograge (0.14.0)
       actionpack (>= 4)
@@ -302,7 +302,7 @@ GEM
     pghero (3.4.0)
       activerecord (>= 6)
     prometheus-client (4.2.2)
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.1)

From 9fc8df1a278e5c753aa7588cb15b3112f3c0abbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 16:40:42 +0000
Subject: [PATCH 433/590] Bump @typescript-eslint/parser from 6.20.0 to 6.21.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.20.0 to 6.21.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.21.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 58 ++++++++++++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 61c71adf..140471d8 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^6.20.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "esbuild": "^0.17.0",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
diff --git a/yarn.lock b/yarn.lock
index a26ac322..fb5cfc9b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -325,24 +325,24 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.20.0":
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.20.0.tgz#17e314177304bdf498527e3c4b112e41287b7416"
-  integrity sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==
+"@typescript-eslint/parser@^6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
+  integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.20.0"
-    "@typescript-eslint/types" "6.20.0"
-    "@typescript-eslint/typescript-estree" "6.20.0"
-    "@typescript-eslint/visitor-keys" "6.20.0"
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.20.0":
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz#8a926e60f6c47feb5bab878246dc2ae465730151"
-  integrity sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==
+"@typescript-eslint/scope-manager@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
+  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
   dependencies:
-    "@typescript-eslint/types" "6.20.0"
-    "@typescript-eslint/visitor-keys" "6.20.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
 
 "@typescript-eslint/scope-manager@7.0.0":
   version "7.0.0"
@@ -362,23 +362,23 @@
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.20.0":
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.20.0.tgz#5ccd74c29011ae7714ae6973e4ec0c634708b448"
-  integrity sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==
+"@typescript-eslint/types@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
+  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
 "@typescript-eslint/types@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.0.0.tgz#2e5889c7fe3c873fc6dc6420aa77775f17cd5dc6"
   integrity sha512-9ZIJDqagK1TTs4W9IyeB2sH/s1fFhN9958ycW8NRTg1vXGzzH5PQNzq6KbsbVGMT+oyyfa17DfchHDidcmf5cg==
 
-"@typescript-eslint/typescript-estree@6.20.0":
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz#5b2d0975949e6bdd8d45ee1471461ef5fadc5542"
-  integrity sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==
+"@typescript-eslint/typescript-estree@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
+  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
   dependencies:
-    "@typescript-eslint/types" "6.20.0"
-    "@typescript-eslint/visitor-keys" "6.20.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -413,12 +413,12 @@
     "@typescript-eslint/typescript-estree" "7.0.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.20.0":
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz#f7ada27f2803de89df0edd9fd7be22c05ce6a498"
-  integrity sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==
+"@typescript-eslint/visitor-keys@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
+  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
   dependencies:
-    "@typescript-eslint/types" "6.20.0"
+    "@typescript-eslint/types" "6.21.0"
     eslint-visitor-keys "^3.4.1"
 
 "@typescript-eslint/visitor-keys@7.0.0":

From 0e5d624ef65c4abf4e947c0e77a0e8dd3d89e4e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 16:44:17 +0000
Subject: [PATCH 434/590] Bump esbuild from 0.17.19 to 0.20.1

Bumps [esbuild](https://github.com/evanw/esbuild) from 0.17.19 to 0.20.1.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.17.19...v0.20.1)

---
updated-dependencies:
- dependency-name: esbuild
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 234 ++++++++++++++++++++++++++-------------------------
 2 files changed, 121 insertions(+), 115 deletions(-)

diff --git a/package.json b/package.json
index 140471d8..78491f38 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "esbuild": "^0.17.0",
+    "esbuild": "^0.20.1",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
     "stylelint": "^15.11.0",
diff --git a/yarn.lock b/yarn.lock
index fb5cfc9b..5638e30d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -48,115 +48,120 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz#798622546b63847e82389e473fd67f2707d82247"
   integrity sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==
 
-"@esbuild/android-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd"
-  integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==
+"@esbuild/aix-ppc64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz#eafa8775019b3650a77e8310ba4dbd17ca7af6d5"
+  integrity sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==
 
-"@esbuild/android-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d"
-  integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==
+"@esbuild/android-arm64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz#68791afa389550736f682c15b963a4f37ec2f5f6"
+  integrity sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==
 
-"@esbuild/android-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1"
-  integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==
+"@esbuild/android-arm@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.1.tgz#38c91d8ee8d5196f7fbbdf4f0061415dde3a473a"
+  integrity sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==
 
-"@esbuild/darwin-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276"
-  integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==
+"@esbuild/android-x64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.1.tgz#93f6190ce997b313669c20edbf3645fc6c8d8f22"
+  integrity sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==
 
-"@esbuild/darwin-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb"
-  integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==
+"@esbuild/darwin-arm64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz#0d391f2e81fda833fe609182cc2fbb65e03a3c46"
+  integrity sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==
 
-"@esbuild/freebsd-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2"
-  integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==
+"@esbuild/darwin-x64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz#92504077424584684862f483a2242cfde4055ba2"
+  integrity sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==
 
-"@esbuild/freebsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4"
-  integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==
+"@esbuild/freebsd-arm64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz#a1646fa6ba87029c67ac8a102bb34384b9290774"
+  integrity sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==
 
-"@esbuild/linux-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb"
-  integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==
+"@esbuild/freebsd-x64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz#41c9243ab2b3254ea7fb512f71ffdb341562e951"
+  integrity sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==
 
-"@esbuild/linux-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a"
-  integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==
+"@esbuild/linux-arm64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz#f3c1e1269fbc9eedd9591a5bdd32bf707a883156"
+  integrity sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==
 
-"@esbuild/linux-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a"
-  integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==
+"@esbuild/linux-arm@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz#4503ca7001a8ee99589c072801ce9d7540717a21"
+  integrity sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==
 
-"@esbuild/linux-loong64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72"
-  integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==
+"@esbuild/linux-ia32@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz#98c474e3e0cbb5bcbdd8561a6e65d18f5767ce48"
+  integrity sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==
 
-"@esbuild/linux-mips64el@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289"
-  integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==
+"@esbuild/linux-loong64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz#a8097d28d14b9165c725fe58fc438f80decd2f33"
+  integrity sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==
 
-"@esbuild/linux-ppc64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7"
-  integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==
+"@esbuild/linux-mips64el@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz#c44f6f0d7d017c41ad3bb15bfdb69b690656b5ea"
+  integrity sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==
 
-"@esbuild/linux-riscv64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09"
-  integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==
+"@esbuild/linux-ppc64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz#0765a55389a99237b3c84227948c6e47eba96f0d"
+  integrity sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==
 
-"@esbuild/linux-s390x@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829"
-  integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==
+"@esbuild/linux-riscv64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz#e4153b032288e3095ddf4c8be07893781b309a7e"
+  integrity sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==
 
-"@esbuild/linux-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4"
-  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
+"@esbuild/linux-s390x@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz#b9ab8af6e4b73b26d63c1c426d7669a5d53eb5a7"
+  integrity sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==
 
-"@esbuild/netbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462"
-  integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==
+"@esbuild/linux-x64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz#0b25da17ac38c3e11cdd06ca3691d4d6bef2755f"
+  integrity sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==
 
-"@esbuild/openbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691"
-  integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==
+"@esbuild/netbsd-x64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz#3148e48406cd0d4f7ba1e0bf3f4d77d548c98407"
+  integrity sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==
 
-"@esbuild/sunos-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273"
-  integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==
+"@esbuild/openbsd-x64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz#7b73e852986a9750192626d377ac96ac2b749b76"
+  integrity sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==
 
-"@esbuild/win32-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f"
-  integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==
+"@esbuild/sunos-x64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz#402a441cdac2eee98d8be378c7bc23e00c1861c5"
+  integrity sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==
 
-"@esbuild/win32-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03"
-  integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==
+"@esbuild/win32-arm64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz#36c4e311085806a6a0c5fc54d1ac4d7b27e94d7b"
+  integrity sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==
 
-"@esbuild/win32-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
-  integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
+"@esbuild/win32-ia32@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz#0cf933be3fb9dc58b45d149559fe03e9e22b54fe"
+  integrity sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==
+
+"@esbuild/win32-x64@0.20.1":
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz#77583b6ea54cee7c1410ebbd54051b6a3fcbd8ba"
+  integrity sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
@@ -961,33 +966,34 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild@^0.17.0:
-  version "0.17.19"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
-  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
+esbuild@^0.20.1:
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.1.tgz#1e4cbb380ad1959db7609cb9573ee77257724a3e"
+  integrity sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==
   optionalDependencies:
-    "@esbuild/android-arm" "0.17.19"
-    "@esbuild/android-arm64" "0.17.19"
-    "@esbuild/android-x64" "0.17.19"
-    "@esbuild/darwin-arm64" "0.17.19"
-    "@esbuild/darwin-x64" "0.17.19"
-    "@esbuild/freebsd-arm64" "0.17.19"
-    "@esbuild/freebsd-x64" "0.17.19"
-    "@esbuild/linux-arm" "0.17.19"
-    "@esbuild/linux-arm64" "0.17.19"
-    "@esbuild/linux-ia32" "0.17.19"
-    "@esbuild/linux-loong64" "0.17.19"
-    "@esbuild/linux-mips64el" "0.17.19"
-    "@esbuild/linux-ppc64" "0.17.19"
-    "@esbuild/linux-riscv64" "0.17.19"
-    "@esbuild/linux-s390x" "0.17.19"
-    "@esbuild/linux-x64" "0.17.19"
-    "@esbuild/netbsd-x64" "0.17.19"
-    "@esbuild/openbsd-x64" "0.17.19"
-    "@esbuild/sunos-x64" "0.17.19"
-    "@esbuild/win32-arm64" "0.17.19"
-    "@esbuild/win32-ia32" "0.17.19"
-    "@esbuild/win32-x64" "0.17.19"
+    "@esbuild/aix-ppc64" "0.20.1"
+    "@esbuild/android-arm" "0.20.1"
+    "@esbuild/android-arm64" "0.20.1"
+    "@esbuild/android-x64" "0.20.1"
+    "@esbuild/darwin-arm64" "0.20.1"
+    "@esbuild/darwin-x64" "0.20.1"
+    "@esbuild/freebsd-arm64" "0.20.1"
+    "@esbuild/freebsd-x64" "0.20.1"
+    "@esbuild/linux-arm" "0.20.1"
+    "@esbuild/linux-arm64" "0.20.1"
+    "@esbuild/linux-ia32" "0.20.1"
+    "@esbuild/linux-loong64" "0.20.1"
+    "@esbuild/linux-mips64el" "0.20.1"
+    "@esbuild/linux-ppc64" "0.20.1"
+    "@esbuild/linux-riscv64" "0.20.1"
+    "@esbuild/linux-s390x" "0.20.1"
+    "@esbuild/linux-x64" "0.20.1"
+    "@esbuild/netbsd-x64" "0.20.1"
+    "@esbuild/openbsd-x64" "0.20.1"
+    "@esbuild/sunos-x64" "0.20.1"
+    "@esbuild/win32-arm64" "0.20.1"
+    "@esbuild/win32-ia32" "0.20.1"
+    "@esbuild/win32-x64" "0.20.1"
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"

From f4e9f6b7625a7687eb477201b401ee39446dabdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:07:52 +0000
Subject: [PATCH 435/590] Bump eslint from 8.56.0 to 8.57.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.56.0 to 8.57.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.56.0...v8.57.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 42 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index b79f3f94..bbd32a68 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.21.0",
     "esbuild": "^0.20.1",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
     "stylelint": "^15.11.0",
     "stylelint-config-standard-scss": "^11.1.0",
diff --git a/yarn.lock b/yarn.lock
index 5a5bebc6..7038d651 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -190,10 +190,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
-  integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
 "@fontsource/lexend@^4.5.15":
   version "4.5.15"
@@ -228,13 +228,13 @@
   resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.2.tgz#c31cdadfe66b98983066a94073b26fc7e15835f0"
   integrity sha512-3K6QZkwWfosAV8zuM5bY+kKF02jp1lMQGsWfSE6wXdZBRBP3ah+Vj26YNqYtkEomBwRWA0QKhZgyJP7xOQkVEg==
 
-"@humanwhocodes/config-array@^0.11.13":
-  version "0.11.13"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
-  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.1"
-    debug "^4.1.1"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
     minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
@@ -242,10 +242,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
-  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
+  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
 "@melloware/coloris@^0.22.0":
   version "0.22.0"
@@ -801,7 +801,7 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -1057,16 +1057,16 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.56.0:
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15"
-  integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==
+eslint@^8.57.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.56.0"
-    "@humanwhocodes/config-array" "^0.11.13"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     "@ungap/structured-clone" "^1.2.0"

From 036c493edc6627ad143aab1698dac00147cad36b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:09:12 +0000
Subject: [PATCH 436/590] Bump sass from 1.71.0 to 1.71.1

Bumps [sass](https://github.com/sass/dart-sass) from 1.71.0 to 1.71.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.71.0...1.71.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b79f3f94..fff1af4e 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.71.0",
+    "sass": "^1.71.1",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.3.3"
diff --git a/yarn.lock b/yarn.lock
index 5a5bebc6..1bb10e1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2268,10 +2268,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.71.0:
-  version "1.71.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.0.tgz#b3085759b9b2ab503a977aecb7e91153bf941117"
-  integrity sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==
+sass@^1.71.1:
+  version "1.71.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.1.tgz#dfb09c63ce63f89353777bbd4a88c0a38386ee54"
+  integrity sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From e585f9db19badc2c9337df707a8fffedeb499a3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:09:43 +0000
Subject: [PATCH 437/590] Bump @hotwired/turbo-rails from 8.0.2 to 8.0.3

Bumps [@hotwired/turbo-rails](https://github.com/hotwired/turbo-rails) from 8.0.2 to 8.0.3.
- [Release notes](https://github.com/hotwired/turbo-rails/releases)
- [Commits](https://github.com/hotwired/turbo-rails/commits)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo-rails"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index b79f3f94..d15f32b9 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "@fortawesome/fontawesome-free": "^6.5.1",
     "@github/hotkey": "^3.1.0",
     "@hotwired/stimulus": "^3.2.2",
-    "@hotwired/turbo-rails": "^8.0.2",
+    "@hotwired/turbo-rails": "^8.0.3",
     "@melloware/coloris": "^0.22.0",
     "@popperjs/core": "^2.11",
     "@rails/request.js": "^0.0.9",
diff --git a/yarn.lock b/yarn.lock
index 5a5bebc6..fc34c41d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -215,18 +215,18 @@
   resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608"
   integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A==
 
-"@hotwired/turbo-rails@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.2.tgz#c43d54d9346bcf14c897166556bfed92ed4c1d17"
-  integrity sha512-j+6THPc+CsaUdUXZTg6wQ+YcStO9kn6CuGzElqFxUmV/vyd1Jfm0RLZMIbaY8w9Qse7u6JBcrm4AcRxhIhYmaQ==
+"@hotwired/turbo-rails@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.3.tgz#e60375f4eea4b30ec0cd6d7e3fdb3d6349a2b57b"
+  integrity sha512-n5B9HdFsNiGJfXFAriCArmvFZyznIh/OriB5ZVAWz4Fsi4oLkpgmJNw5pibBAM7NMQQGN6cfKa/nhZT4LWcqbQ==
   dependencies:
-    "@hotwired/turbo" "^8.0.2"
+    "@hotwired/turbo" "^8.0.3"
     "@rails/actioncable" "^7.0"
 
-"@hotwired/turbo@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.2.tgz#c31cdadfe66b98983066a94073b26fc7e15835f0"
-  integrity sha512-3K6QZkwWfosAV8zuM5bY+kKF02jp1lMQGsWfSE6wXdZBRBP3ah+Vj26YNqYtkEomBwRWA0QKhZgyJP7xOQkVEg==
+"@hotwired/turbo@^8.0.3":
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.3.tgz#338e07278f4b3c76921328d3c92dbc4831c209d0"
+  integrity sha512-qLgp7d6JaegKjMToTJahosrFxV3odfSbiekispQ3soOzE5jnU+iEMWlRvYRe/jvy5Q+JWoywtf9j3RD4ikVjIg==
 
 "@humanwhocodes/config-array@^0.11.13":
   version "0.11.13"

From d3fa8bb3759ecf411e1b36de4ac89c6b3b0f8bce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:45:30 +0000
Subject: [PATCH 438/590] Bump view_component from 3.10.0 to 3.11.0

Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.10.0...v3.11.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index afe15eb8..9fd92565 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -499,7 +499,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    view_component (3.10.0)
+    view_component (3.11.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

From 6211747ec474fdac72feb988028af8f394a51ec0 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 27 Feb 2024 22:22:29 +0100
Subject: [PATCH 439/590] Remove report filtering navigation entries

---
 app/views/tabs/_moderation.html.haml | 9 +--------
 config/locales/views.en.yml          | 6 +-----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/views/tabs/_moderation.html.haml b/app/views/tabs/_moderation.html.haml
index bc4b481c..b24dfbbe 100644
--- a/app/views/tabs/_moderation.html.haml
+++ b/app/views/tabs/_moderation.html.haml
@@ -1,13 +1,6 @@
 .card
   .list-group
-    = list_group_item t(".all"), moderation_reports_path
-    = list_group_item t(".answers"), moderation_reports_path("answer")
-    = list_group_item t(".comments"), moderation_reports_path("comment")
-    = list_group_item t(".users"), moderation_reports_path("user")
-    = list_group_item t(".questions"), moderation_reports_path("question")
-
-.card
-  .list-group
+    = list_group_item t(".reports"), moderation_reports_path
     = list_group_item t(".site_wide_blocks"), mod_anon_block_index_path
 
 .d-none.d-sm-block= render "shared/links"
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index a5afc27c..94cdab2e 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -644,11 +644,7 @@ en:
           title: "Members"
           none: "No members yet."
     moderation:
-      all: "All reports"
-      answers: :activerecord.models.answer.other
-      comments: :activerecord.models.comment.other
-      users: :activerecord.models.user.other
-      questions: :activerecord.models.question.other
+      reports: "Reports"
       site_wide_blocks: "Site-wide anonymous blocks"
     notifications:
       all: "All notifications"

From 50126cc4c49ccf108ad9a58a9a754a9859e3188d Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 27 Feb 2024 22:23:02 +0100
Subject: [PATCH 440/590] Implement report filtering interface

---
 .../moderation/reports_controller.rb          | 19 +++++++++++++++++++
 app/views/moderation/reports/index.html.haml  | 14 ++++++++++++++
 config/locales/voc.en.yml                     |  2 ++
 3 files changed, 35 insertions(+)

diff --git a/app/controllers/moderation/reports_controller.rb b/app/controllers/moderation/reports_controller.rb
index e4977217..3bf50ef7 100644
--- a/app/controllers/moderation/reports_controller.rb
+++ b/app/controllers/moderation/reports_controller.rb
@@ -2,6 +2,8 @@
 
 class Moderation::ReportsController < ApplicationController
   before_action :authenticate_user!
+  before_action :set_filter_enabled
+  before_action :set_type_options
 
   def index
     filter = ReportFilter.new(filter_params)
@@ -20,4 +22,21 @@ class Moderation::ReportsController < ApplicationController
   def filter_params
     params.slice(*ReportFilter::KEYS).permit(*ReportFilter::KEYS)
   end
+
+  def set_filter_enabled
+    @filter_enabled = params.slice(*ReportFilter::KEYS)
+                            .reject! { |_, value| value.empty? || value.nil? }
+                            .values
+                            .any?
+  end
+
+  def set_type_options
+    @type_options = [
+      [t("voc.all"), ""],
+      [t("activerecord.models.answer.one"), :answer],
+      [t("activerecord.models.comment.one"), :comment],
+      [t("activerecord.models.question.one"), :question],
+      [t("activerecord.models.user.one"), :user]
+    ]
+  end
 end
diff --git a/app/views/moderation/reports/index.html.haml b/app/views/moderation/reports/index.html.haml
index 1df8ae9d..bac8e797 100644
--- a/app/views/moderation/reports/index.html.haml
+++ b/app/views/moderation/reports/index.html.haml
@@ -1,3 +1,17 @@
+.card
+  .card-body
+    .dropdown
+      %button.btn.dropdown-toggle{ class: @filter_enabled ? "btn-primary" : "btn-light", type: :button, data: { bs_toggle: :dropdown }, aria: { expanded: :false }}
+        %i.fa.fa-filter
+        = t("voc.filter")
+      .dropdown-menu{ style: "min-width: 300px;" }
+        = bootstrap_form_tag url: moderation_reports_path, method: :get, html: { class: "px-3 py-2" } do |f|
+          = f.select :type, options_for_select(@type_options, params[:type]), {}, { class: "form-control" }
+          = f.text_field :user, value: params[:user]
+          = f.text_field :target_user, value: params[:target_user]
+          .d-flex.flex-row-reverse
+            = f.primary t("voc.filter")
+
 #reports
   - if @reports.empty?
     = render "shared/empty", icon: "fa-regular fa-smile-beam", translation_key: ".moderation.reports"
diff --git a/config/locales/voc.en.yml b/config/locales/voc.en.yml
index 01f1ff9c..58547a03 100644
--- a/config/locales/voc.en.yml
+++ b/config/locales/voc.en.yml
@@ -1,6 +1,7 @@
 en:
   voc:
     add: "Add"
+    all: "All"
     answer: "Answer"
     block: "Block"
     block_site_wide: "Block user site-wide"
@@ -9,6 +10,7 @@ en:
     confirm: "Are you sure?"
     delete: "Delete"
     edit: "Edit"
+    filter: "Filter"
     follow: "Follow"
     format_markdown: "Styling with Markdown is supported"
     load: "Load more"

From aa66ac4500780f544327921a8a1cd588f9d571e7 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 27 Feb 2024 22:35:27 +0100
Subject: [PATCH 441/590] Fix haml-lint nits

---
 app/views/moderation/reports/index.html.haml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/moderation/reports/index.html.haml b/app/views/moderation/reports/index.html.haml
index bac8e797..c7924a3e 100644
--- a/app/views/moderation/reports/index.html.haml
+++ b/app/views/moderation/reports/index.html.haml
@@ -1,7 +1,10 @@
 .card
   .card-body
     .dropdown
-      %button.btn.dropdown-toggle{ class: @filter_enabled ? "btn-primary" : "btn-light", type: :button, data: { bs_toggle: :dropdown }, aria: { expanded: :false }}
+      %button.btn.dropdown-toggle{ class: @filter_enabled ? "btn-primary" : "btn-light",
+                                   type: :button,
+                                   data: { bs_toggle: :dropdown },
+                                   aria: { expanded: :false } }
         %i.fa.fa-filter
         = t("voc.filter")
       .dropdown-menu{ style: "min-width: 300px;" }

From d87a4adf963960ff017ccb90e793aaed1b3d64d8 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 27 Feb 2024 23:44:37 +0100
Subject: [PATCH 442/590] Add links to user actions to filter reports by/from
 users

---
 app/views/user/_actions.html.haml | 8 +++++++-
 config/locales/views.en.yml       | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/views/user/_actions.html.haml b/app/views/user/_actions.html.haml
index a70f1935..c30a482c 100644
--- a/app/views/user/_actions.html.haml
+++ b/app/views/user/_actions.html.haml
@@ -32,9 +32,15 @@
             %i.fa.fa-exclamation-triangle.fa-fw
             = t("voc.report")
           - if current_user.mod?
+            %a.dropdown-item{ href: moderation_reports_path(user: user.screen_name) }
+              %i.far.fa-flag.fa-fw
+              = t(".reports_from", user: user.screen_name)
+            %a.dropdown-item{ href: moderation_reports_path(target_user: user.screen_name) }
+              %i.fas.fa-flag.fa-fw
+              = t(".reports_of", user: user.screen_name)
             %a.dropdown-item{ href: '#', data: { bs_target: '#modal-privileges', bs_toggle: :modal } }
               %i.fa.fa-wrench.fa-fw
-              = raw t(".privilege", user: user.screen_name)
+              = t(".privilege", user: user.screen_name)
             - unless user.has_cached_role?(:administrator)
               %a.dropdown-item{ href: '#', data: { bs_target: '#modal-ban', bs_toggle: :modal } }
                 %i.fa.fa-ban.fa-fw
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 94cdab2e..e5580a21 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -703,6 +703,8 @@ en:
       ban: "Ban Control"
       title: "Actions"
       list: "Manage list memberships"
+      reports_from: "Reports from %{user}"
+      reports_of: "Reports of %{user}"
     profile:
       badge:
         admin: "Admin"

From 2db1d998b7b38427714dc96c46e6ef456e482227 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 28 Feb 2024 00:35:25 +0100
Subject: [PATCH 443/590] Fix not being able to unset administrator privileges
 in UI

---
 app/controllers/ajax/moderation_controller.rb | 4 ++--
 app/views/modal/_privileges.html.haml         | 2 +-
 app/views/modal/privileges/_item.html.haml    | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/controllers/ajax/moderation_controller.rb b/app/controllers/ajax/moderation_controller.rb
index 4fda3cc8..41df3c9d 100644
--- a/app/controllers/ajax/moderation_controller.rb
+++ b/app/controllers/ajax/moderation_controller.rb
@@ -84,7 +84,7 @@ class Ajax::ModerationController < AjaxController
     target_user = User.find_by_screen_name!(params[:user])
 
     @response[:message] = t(".error")
-    return unless %w(moderator admin).include? params[:type].downcase
+    return unless %w(moderator administrator).include? params[:type].downcase
 
     unless current_user.has_cached_role?(:administrator)
       @response[:status] = :nopriv
@@ -94,7 +94,7 @@ class Ajax::ModerationController < AjaxController
 
     @response[:checked] = status
     type = params[:type].downcase
-    target_role = {'admin' => 'administrator'}.fetch(type, type).to_sym
+    target_role = type.to_sym
 
     if status
       target_user.add_role target_role
diff --git a/app/views/modal/_privileges.html.haml b/app/views/modal/_privileges.html.haml
index 7444e664..45ad7eaf 100644
--- a/app/views/modal/_privileges.html.haml
+++ b/app/views/modal/_privileges.html.haml
@@ -9,6 +9,6 @@
       %ul.list-group
         - if current_user.has_cached_role?(:administrator)
           = render "modal/privileges/item", privilege: "moderator", description: t(".role.moderator"), user: user
-          = render "modal/privileges/item", privilege: "admin", description: t(".role.admin"), user: user
+          = render "modal/privileges/item", privilege: "administrator", description: t(".role.admin"), user: user
       .modal-footer
         %button.btn.btn-primary{ name: "checked-privileges", type: :button, data: { bs_dismiss: :modal } }= t("voc.close")
diff --git a/app/views/modal/privileges/_item.html.haml b/app/views/modal/privileges/_item.html.haml
index f87b4d3b..7585e292 100644
--- a/app/views/modal/privileges/_item.html.haml
+++ b/app/views/modal/privileges/_item.html.haml
@@ -1,12 +1,9 @@
 :ruby
   description ||= ""
-  role_mapping = { admin: "administrator" }
-  requires_role = %w[admin moderator].include?(privilege)
-  checked = requires_role ? user.has_cached_role?(role_mapping.fetch(privilege, privilege).to_sym) : user.public_send("#{privilege}?")
 %li.list-group-item{ id: "privilege-#{privilege}" }
   .d-flex
     .flex-shrink-0
-      %input{ type: :checkbox, name: "check-your-privileges", data: { type: privilege, user: user.screen_name }, checked: checked, autocomplete: :off }
+      %input{ type: :checkbox, name: "check-your-privileges", data: { type: privilege, user: user.screen_name }, checked: user.has_cached_role?(privilege.to_sym), autocomplete: :off }
     .flex-grow-1
       .list-group-item-heading= privilege.capitalize
       - unless description.blank?

From af666c7733a90352a0a2bd193e804100667aab1e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 28 Feb 2024 00:40:38 +0100
Subject: [PATCH 444/590] Fix lint nits

---
 app/controllers/ajax/moderation_controller.rb | 2 +-
 app/views/modal/privileges/_item.html.haml    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/ajax/moderation_controller.rb b/app/controllers/ajax/moderation_controller.rb
index 41df3c9d..61cb79c6 100644
--- a/app/controllers/ajax/moderation_controller.rb
+++ b/app/controllers/ajax/moderation_controller.rb
@@ -84,7 +84,7 @@ class Ajax::ModerationController < AjaxController
     target_user = User.find_by_screen_name!(params[:user])
 
     @response[:message] = t(".error")
-    return unless %w(moderator administrator).include? params[:type].downcase
+    return unless %w[moderator administrator].include? params[:type].downcase
 
     unless current_user.has_cached_role?(:administrator)
       @response[:status] = :nopriv
diff --git a/app/views/modal/privileges/_item.html.haml b/app/views/modal/privileges/_item.html.haml
index 7585e292..c9be9a30 100644
--- a/app/views/modal/privileges/_item.html.haml
+++ b/app/views/modal/privileges/_item.html.haml
@@ -3,7 +3,11 @@
 %li.list-group-item{ id: "privilege-#{privilege}" }
   .d-flex
     .flex-shrink-0
-      %input{ type: :checkbox, name: "check-your-privileges", data: { type: privilege, user: user.screen_name }, checked: user.has_cached_role?(privilege.to_sym), autocomplete: :off }
+      %input{ type: :checkbox,
+              name: "check-your-privileges",
+              data: { type: privilege, user: user.screen_name },
+              checked: user.has_cached_role?(privilege.to_sym),
+              autocomplete: :off }
     .flex-grow-1
       .list-group-item-heading= privilege.capitalize
       - unless description.blank?

From aa4894fb3d779b4fe73dbd1c7d5b521a834c3689 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 28 Feb 2024 00:45:28 +0100
Subject: [PATCH 445/590] Adjust privilege action spec for new logic

---
 spec/controllers/ajax/moderation_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/ajax/moderation_controller_spec.rb b/spec/controllers/ajax/moderation_controller_spec.rb
index 97462e81..e4709fd7 100644
--- a/spec/controllers/ajax/moderation_controller_spec.rb
+++ b/spec/controllers/ajax/moderation_controller_spec.rb
@@ -225,7 +225,7 @@ describe Ajax::ModerationController, :ajax_controller, type: :controller do
   describe "#privilege" do
     valid_role_pairs = {
       moderator: :moderator,
-      admin: :administrator
+      administrator: :administrator
     }.freeze
 
     let(:params) do

From f5db6e74f1121e50812e197d52f6af883e59c785 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 28 Feb 2024 00:50:56 +0100
Subject: [PATCH 446/590] Fix rubocop nits

---
 spec/controllers/ajax/moderation_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/ajax/moderation_controller_spec.rb b/spec/controllers/ajax/moderation_controller_spec.rb
index e4709fd7..33035467 100644
--- a/spec/controllers/ajax/moderation_controller_spec.rb
+++ b/spec/controllers/ajax/moderation_controller_spec.rb
@@ -225,7 +225,7 @@ describe Ajax::ModerationController, :ajax_controller, type: :controller do
   describe "#privilege" do
     valid_role_pairs = {
       moderator: :moderator,
-      administrator: :administrator
+      administrator: :administrator,
     }.freeze
 
     let(:params) do

From fbb6fcdf7be387ae40c57b1f732a75e8344943b9 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 28 Feb 2024 21:50:05 +0100
Subject: [PATCH 447/590] Fix text color of answerbox actions

---
 app/assets/stylesheets/components/_answerbox.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/components/_answerbox.scss b/app/assets/stylesheets/components/_answerbox.scss
index 68065498..29204b4a 100644
--- a/app/assets/stylesheets/components/_answerbox.scss
+++ b/app/assets/stylesheets/components/_answerbox.scss
@@ -37,6 +37,7 @@
   &__action {
     padding-left: 0;
     padding-right: map.get($spacers, 1);
+    color: RGBA(var(--raised-text), 0.75);
     text-decoration: none;
 
     & i {
@@ -47,6 +48,7 @@
     &:hover,
     &:focus,
     &:active {
+      color: RGBA(var(--raised-text), 1);
       text-decoration: none;
     }
 

From 50770390352057a5107d3b4aaf1243c8c6b21140 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 28 Feb 2024 21:50:31 +0100
Subject: [PATCH 448/590] Give answerbox actions proper margins and paddings

---
 app/assets/stylesheets/components/_answerbox.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/components/_answerbox.scss b/app/assets/stylesheets/components/_answerbox.scss
index 29204b4a..851693a9 100644
--- a/app/assets/stylesheets/components/_answerbox.scss
+++ b/app/assets/stylesheets/components/_answerbox.scss
@@ -35,9 +35,9 @@
   }
 
   &__action {
-    padding-left: 0;
-    padding-right: map.get($spacers, 1);
     color: RGBA(var(--raised-text), 0.75);
+    padding: var(--btn-padding-y);
+    margin-right: map.get($spacers, 1);
     text-decoration: none;
 
     & i {
@@ -67,6 +67,10 @@
         color: var(--danger);
       }
     }
+
+    &.dropdown-toggle::after {
+      margin-left: 0;
+    }
   }
 
   &__actions {

From 22886934db107f0ff843db2123e8549ac3d5695b Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 28 Feb 2024 21:51:18 +0100
Subject: [PATCH 449/590] Use `dropdown` instead of `btn-group` for dropdowns

---
 app/views/answerbox/_actions.html.haml  | 6 +++---
 app/views/answerbox/_comments.html.haml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/answerbox/_actions.html.haml b/app/views/answerbox/_actions.html.haml
index 4842362d..445a6e4c 100644
--- a/app/views/answerbox/_actions.html.haml
+++ b/app/views/answerbox/_actions.html.haml
@@ -6,12 +6,12 @@
   %button.btn.btn-link.answerbox__action{ type: :button, name: "ab-comments", data: { a_id: a.id, state: :hidden, selection_hotkey: "x" } }
     %i.fa.fa-fw.fa-comments
     %span{ id: "ab-comment-count-#{a.id}" }= a.comment_count
-.btn-group
+.dropdown.d-inline
   %button.btn.btn-link.answerbox__action{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
     %i.fa.fa-fw.fa-share-alt{ title: t(".share.title") }
   = render "actions/share", answer: a
 - if user_signed_in?
-  .btn-group
-    %button.btn.btn-default.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
+  .dropdown.d-inline
+    %button.btn.btn-link.answerbox__action.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
       %span.caret
     = render "actions/answer", answer: a
diff --git a/app/views/answerbox/_comments.html.haml b/app/views/answerbox/_comments.html.haml
index d992c946..fe013eb6 100644
--- a/app/views/answerbox/_comments.html.haml
+++ b/app/views/answerbox/_comments.html.haml
@@ -20,7 +20,7 @@
               = render "reactions/destroy", type: "Comment", target: comment
             - else
               = render "reactions/create", type: "Comment", target: comment
-            .btn-group
-              %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
+            .dropdown.d-inline
+              %button.btn.btn-link.answerbox__action.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
                 %span.caret
               = render "actions/comment", comment: comment, answer: a

From c864c1435573e3c022bc1f8eb16474e8e1fdc083 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 28 Feb 2024 22:16:54 +0100
Subject: [PATCH 450/590] Fix selectors in answerbox comments view spec

---
 spec/views/answerbox/_comments.html.haml_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/views/answerbox/_comments.html.haml_spec.rb b/spec/views/answerbox/_comments.html.haml_spec.rb
index cdf2d46f..c0daff76 100644
--- a/spec/views/answerbox/_comments.html.haml_spec.rb
+++ b/spec/views/answerbox/_comments.html.haml_spec.rb
@@ -40,7 +40,7 @@ describe "answerbox/_comments.html.haml", type: :view do
 
     it "shows the delete option" do
       html = Nokogiri::HTML.parse(rendered)
-      selector = %(li.comment[data-comment-id="#{comment.id}"] .btn-group a[data-action="ab-comment-destroy"])
+      selector = %(li.comment[data-comment-id="#{comment.id}"] .dropdown a[data-action="ab-comment-destroy"])
       element = html.css(selector)
       expect(element).to_not be_nil
       expect(element.text.strip).to eq("Delete")
@@ -57,7 +57,7 @@ describe "answerbox/_comments.html.haml", type: :view do
 
     it "does not show the delete option" do
       html = Nokogiri::HTML.parse(rendered)
-      selector = %(li.comment[data-comment-id="#{comment.id}"] .btn-group a[data-action="ab-comment-destroy"])
+      selector = %(li.comment[data-comment-id="#{comment.id}"] .dropdown a[data-action="ab-comment-destroy"])
       expect(html.css(selector)).to be_empty
     end
   end

From 1914c56b05056738a80f75d1a3e72be464b5752d Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Wed, 28 Feb 2024 23:53:22 +0100
Subject: [PATCH 451/590] Adjust what content gets hidden on banned user
 profiles

---
 app/views/layouts/user/profile.html.haml |  5 +++--
 app/views/user/_profile.html.haml        |  3 ++-
 app/views/user/show.html.haml            | 23 +++++++++++------------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/views/layouts/user/profile.html.haml b/app/views/layouts/user/profile.html.haml
index 1af75a29..ef497627 100644
--- a/app/views/layouts/user/profile.html.haml
+++ b/app/views/layouts/user/profile.html.haml
@@ -8,8 +8,9 @@
       .d-none.d-sm-block= render 'shared/links'
     .col-lg-9.col-md-8.col-xs-12.col-sm-8
       = render 'questionbox', user: @user
-      = render 'tabs/profile', user: @user
-      = yield
+      - unless @user.banned?
+        = render 'tabs/profile', user: @user
+        = yield
 - if user_signed_in?
   = render 'modal/list', user: @user
   - if current_user.mod? && @user != current_user
diff --git a/app/views/user/_profile.html.haml b/app/views/user/_profile.html.haml
index 7afb27f8..705d85a9 100644
--- a/app/views/user/_profile.html.haml
+++ b/app/views/user/_profile.html.haml
@@ -37,4 +37,5 @@
       .profile__location
         %i.fa.fa-fw.fa-location-arrow
         = user.profile.location
-    = render "user/actions", user: user, type: :follower
+    - unless user.banned?
+      = render "user/actions", user: user, type: :follower
diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index 40beee3d..baca6552 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -1,17 +1,16 @@
-- unless @user.banned?
-  %div{ data: { controller: "navigation" } }
-    %button.d-none{ data: { hotkey: "j", action: "navigation#down" } }
-    %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
-    #pinned-answers
-      - @pinned_answers.each do |a|
-        = render "answerbox", a:
+%div{ data: { controller: "navigation" } }
+  %button.d-none{ data: { hotkey: "j", action: "navigation#down" } }
+  %button.d-none{ data: { hotkey: "k", action: "navigation#up" } }
+  #pinned-answers
+    - @pinned_answers.each do |a|
+      = render "answerbox", a:
 
-    #answers
-      - if @answers.empty?
-        = render "shared/empty", icon: "fa-regular fa-comments", translation_key: ".user.answers"
+  #answers
+    - if @answers.empty?
+      = render "shared/empty", icon: "fa-regular fa-comments", translation_key: ".user.answers"
 
-      - @answers.each do |a|
-        = render "answerbox", a:
+    - @answers.each do |a|
+      = render "answerbox", a:
 
 - if @more_data_available
   .d-flex.justify-content-center.justify-content-sm-start#paginator

From 04d3e050ab091169ae806e099030e7ed4c33f738 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Thu, 29 Feb 2024 00:01:01 +0100
Subject: [PATCH 452/590] Show actions to moderators on banned profiles

---
 app/views/user/_profile.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/user/_profile.html.haml b/app/views/user/_profile.html.haml
index 705d85a9..bd40d9f4 100644
--- a/app/views/user/_profile.html.haml
+++ b/app/views/user/_profile.html.haml
@@ -37,5 +37,5 @@
       .profile__location
         %i.fa.fa-fw.fa-location-arrow
         = user.profile.location
-    - unless user.banned?
+    - unless user.banned? && !current_user&.mod?
       = render "user/actions", user: user, type: :follower

From b977bbf646c1ddae4229c74b1709ed575ab9dbea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 01:34:58 +0000
Subject: [PATCH 453/590] Bump rack from 2.2.8 to 2.2.8.1

Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 2.2.8.1.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/v2.2.8...v2.2.8.1)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9fd92565..e85854be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -307,7 +307,7 @@ GEM
     questiongenerator (1.1.0)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)

From 50097d629e9320e532723e4a0f1f07beb6d4d742 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 20:47:38 +0100
Subject: [PATCH 454/590] Add `SocialHelper::BlueskyMethods`

---
 app/helpers/social_helper.rb                 | 1 +
 app/helpers/social_helper/bluesky_methods.rb | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 app/helpers/social_helper/bluesky_methods.rb

diff --git a/app/helpers/social_helper.rb b/app/helpers/social_helper.rb
index c4d8b329..e248da85 100644
--- a/app/helpers/social_helper.rb
+++ b/app/helpers/social_helper.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module SocialHelper
+  include SocialHelper::BlueskyMethods
   include SocialHelper::TwitterMethods
   include SocialHelper::TumblrMethods
   include SocialHelper::TelegramMethods
diff --git a/app/helpers/social_helper/bluesky_methods.rb b/app/helpers/social_helper/bluesky_methods.rb
new file mode 100644
index 00000000..1565ae59
--- /dev/null
+++ b/app/helpers/social_helper/bluesky_methods.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module SocialHelper::BlueskyMethods
+  def bluesky_share_url(answer)
+    "https://bsky.app/intent/compose?text=#{CGI.escape(prepare_tweet(answer))}"
+  end
+end

From e90b4b8580da9f4d026aad64e54cb1b7c1cacc66 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 20:48:51 +0100
Subject: [PATCH 455/590] Add Bluesky link to sharing options

---
 app/controllers/ajax/answer_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/ajax/answer_controller.rb b/app/controllers/ajax/answer_controller.rb
index 172c5d11..3674e887 100644
--- a/app/controllers/ajax/answer_controller.rb
+++ b/app/controllers/ajax/answer_controller.rb
@@ -73,6 +73,7 @@ class Ajax::AnswerController < AjaxController
     url:      answer_share_url(answer),
     text:     prepare_tweet(answer, nil, true),
     twitter:  twitter_share_url(answer),
+    bluesky:  bluesky_share_url(answer),
     tumblr:   tumblr_share_url(answer),
     telegram: telegram_share_url(answer),
     custom:   CGI.escape(prepare_tweet(answer)),

From 4ed9cf5a320a5469d84253f5f84d43c6402f4ae5 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 20:49:33 +0100
Subject: [PATCH 456/590] Add Bluesky to inbox entry sharing dialog

---
 .../retrospring/controllers/inbox_sharing_controller.ts      | 5 ++++-
 app/views/inbox/_entry.html.haml                             | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/javascript/retrospring/controllers/inbox_sharing_controller.ts b/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
index fe52c0f1..24783da3 100644
--- a/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
+++ b/app/javascript/retrospring/controllers/inbox_sharing_controller.ts
@@ -1,9 +1,10 @@
 import { Controller } from '@hotwired/stimulus';
 
 export default class extends Controller {
-  static targets = ['twitter', 'tumblr', 'telegram', 'other', 'custom', 'clipboard'];
+  static targets = ['twitter', 'bluesky', 'tumblr', 'telegram', 'other', 'custom', 'clipboard'];
 
   declare readonly twitterTarget: HTMLAnchorElement;
+  declare readonly blueskyTarget: HTMLAnchorElement;
   declare readonly tumblrTarget: HTMLAnchorElement;
   declare readonly telegramTarget: HTMLAnchorElement;
   declare readonly customTarget: HTMLAnchorElement;
@@ -22,6 +23,7 @@ export default class extends Controller {
   connect(): void {
     if (this.autoCloseValue) {
       this.twitterTarget.addEventListener('click', () => this.close());
+      this.blueskyTarget.addEventListener('click', () => this.close());
       this.tumblrTarget.addEventListener('click', () => this.close());
       this.telegramTarget.addEventListener('click', () => this.close());
       this.otherTarget.addEventListener('click', () => this.closeAfterShare());
@@ -41,6 +43,7 @@ export default class extends Controller {
     this.element.classList.remove('d-none');
 
     this.twitterTarget.href = this.configValue['twitter'];
+    this.blueskyTarget.href = this.configValue['bluesky'];
     this.tumblrTarget.href = this.configValue['tumblr'];
     this.telegramTarget.href = this.configValue['telegram'];
 
diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 85610e65..411ce337 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -21,9 +21,12 @@
         .align-self-center
           %p.fs-3.fw-bold= t(".sharing.heading")
           %p
-            %a.btn.btn-primary.mb-1{ href: "https://twitter.com/intent/tweet?text=", data: { inbox_sharing_target: "twitter" }, target: "_blank" }
+            %a.btn.btn-primary.mb-1{ href: "#", data: { inbox_sharing_target: "twitter" }, target: "_blank" }
               %i.fab.fa-twitter.fa-fw
               Twitter
+            %a.btn.btn-primary.mb-1{ href: "#", data: { inbox_sharing_target: "bluesky" }, target: "_blank" }
+              %i.fas.fa-cloud.fa-fw
+              Bluesky
             %a.btn.btn-primary.mb-1{ href: "#", data: { inbox_sharing_target: "tumblr" }, target: "_blank" }
               %i.fab.fa-tumblr.fa-fw
               Tumblr

From 507c27da0665e587ef385c7f0319b8eb7ff052f7 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 20:50:08 +0100
Subject: [PATCH 457/590] Add Bluesky to answerbox sharing options

---
 app/views/actions/_share.html.haml | 3 +++
 config/locales/views.en.yml        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/views/actions/_share.html.haml b/app/views/actions/_share.html.haml
index 21dc689b..039ef411 100644
--- a/app/views/actions/_share.html.haml
+++ b/app/views/actions/_share.html.haml
@@ -2,6 +2,9 @@
   %a.dropdown-item{ href: twitter_share_url(answer), target: "_blank" }
     %i.fa.fa-fw.fa-twitter
     = t(".twitter")
+  %a.dropdown-item{ href: bluesky_share_url(answer), target: "_blank" }
+    %i.fa.fa-fw.fa-cloud
+    = t(".bluesky")
   %a.dropdown-item{ href: tumblr_share_url(answer), target: "_blank" }
     %i.fa.fa-fw.fa-tumblr
     = t(".tumblr")
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index e5580a21..5acc1662 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -79,6 +79,7 @@ en:
       pin: "Pin to Profile"
       unpin: "Unpin from Profile"
     share:
+      bluesky: "Share on Bluesky"
       copy: "Copy to Clipboard"
       twitter: "Share on Twitter"
       tumblr: "Share on Tumblr"

From 50e0a645fe294f24d3220d44154b31690ad4c3f5 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 20:54:14 +0100
Subject: [PATCH 458/590] Adjust ajax answer controller spec

---
 spec/controllers/ajax/answer_controller_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/controllers/ajax/answer_controller_spec.rb b/spec/controllers/ajax/answer_controller_spec.rb
index 5e0455c9..4695d9c8 100644
--- a/spec/controllers/ajax/answer_controller_spec.rb
+++ b/spec/controllers/ajax/answer_controller_spec.rb
@@ -94,6 +94,7 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
                     "url"      => a_string_matching("https://#{APP_CONFIG['hostname']}/"),
                     "text"     => a_string_matching("Werfen Sie nicht länger das Fenster zum Geld hinaus!"),
                     "twitter"  => a_string_matching("https://twitter.com/"),
+                    "bluesky"  => a_string_matching("https://bsky.app/"),
                     "tumblr"   => a_string_matching("https://www.tumblr.com/"),
                     "telegram" => a_string_matching("https://t.me/"),
                     "custom"   => a_string_matching(/Werfen\+Sie\+nicht\+l%C3%A4nger\+das\+Fenster\+zum\+Geld\+hinaus%21/),

From 964ec12a386eaa919b908715be0adae5683f883a Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 20:54:46 +0100
Subject: [PATCH 459/590] Add specs for `SocialHelper::BlueskyMethods`

---
 .../social_helper/bluesky_methods_spec.rb     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 spec/helpers/social_helper/bluesky_methods_spec.rb

diff --git a/spec/helpers/social_helper/bluesky_methods_spec.rb b/spec/helpers/social_helper/bluesky_methods_spec.rb
new file mode 100644
index 00000000..a00615af
--- /dev/null
+++ b/spec/helpers/social_helper/bluesky_methods_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe SocialHelper::BlueskyMethods, type: :helper do
+  let(:user) { FactoryBot.create(:user) }
+  let(:question_content) { "q" * 255 }
+  let(:answer_content) { "a" * 255 }
+  let(:answer) do
+    FactoryBot.create(:answer, user:,
+                               content:          answer_content,
+                               question_content:,)
+  end
+
+  before do
+    stub_const("APP_CONFIG", {
+                 "hostname"       => "example.com",
+                 "https"          => true,
+                 "items_per_page" => 5,
+               },)
+  end
+
+  describe "#bluesky_share_url" do
+    subject { bluesky_share_url(answer) }
+
+    it "should return a proper share link" do
+      expect(subject).to eq("https://bsky.app/intent/compose?text=#{CGI.escape(prepare_tweet(answer))}")
+    end
+  end
+end

From a59e873e750f7b38d582f5a1df9678e3cf723f1f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 21:02:34 +0100
Subject: [PATCH 460/590] Fix additional spec in Ajax/Answer

---
 spec/controllers/ajax/answer_controller_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/controllers/ajax/answer_controller_spec.rb b/spec/controllers/ajax/answer_controller_spec.rb
index 4695d9c8..68218c2a 100644
--- a/spec/controllers/ajax/answer_controller_spec.rb
+++ b/spec/controllers/ajax/answer_controller_spec.rb
@@ -176,6 +176,7 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
                     "url"      => a_string_matching("https://#{APP_CONFIG['hostname']}/"),
                     "text"     => a_string_matching("Werfen Sie nicht länger das Fenster zum Geld hinaus!"),
                     "twitter"  => a_string_matching("https://twitter.com/"),
+                    "bluesky"  => a_string_matching("https://bsky.app/"),
                     "tumblr"   => a_string_matching("https://www.tumblr.com/"),
                     "telegram" => a_string_matching("https://t.me/"),
                     "custom"   => a_string_matching(/Werfen\+Sie\+nicht\+l%C3%A4nger\+das\+Fenster\+zum\+Geld\+hinaus%21/),

From f87d5c4a439c914461eb912c73d32fa2f526fd2f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 21:09:55 +0100
Subject: [PATCH 461/590] Fix `SocialHelper::BlueskyMethods` spec

---
 spec/helpers/social_helper/bluesky_methods_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/helpers/social_helper/bluesky_methods_spec.rb b/spec/helpers/social_helper/bluesky_methods_spec.rb
index a00615af..b2457089 100644
--- a/spec/helpers/social_helper/bluesky_methods_spec.rb
+++ b/spec/helpers/social_helper/bluesky_methods_spec.rb
@@ -3,6 +3,8 @@
 require "rails_helper"
 
 describe SocialHelper::BlueskyMethods, type: :helper do
+  include SocialHelper::TwitterMethods
+
   let(:user) { FactoryBot.create(:user) }
   let(:question_content) { "q" * 255 }
   let(:answer_content) { "a" * 255 }

From 175a044fbf594f1abb93f6e57b37498fe8e6724f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 22:09:37 +0100
Subject: [PATCH 462/590] Add `last_reports_visit` field to users

---
 .../20240301203930_add_last_reports_visit_to_users.rb      | 7 +++++++
 db/schema.rb                                               | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20240301203930_add_last_reports_visit_to_users.rb

diff --git a/db/migrate/20240301203930_add_last_reports_visit_to_users.rb b/db/migrate/20240301203930_add_last_reports_visit_to_users.rb
new file mode 100644
index 00000000..90b01615
--- /dev/null
+++ b/db/migrate/20240301203930_add_last_reports_visit_to_users.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddLastReportsVisitToUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :users, :last_reports_visit, :datetime
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ec0a8910..2063e999 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_01_27_112216) do
+ActiveRecord::Schema[7.0].define(version: 2024_03_01_203930) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -369,6 +369,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_27_112216) do
     t.string "sharing_custom_url"
     t.datetime "notifications_updated_at", precision: nil
     t.datetime "inbox_updated_at", precision: nil
+    t.datetime "last_reports_visit"
     t.index "lower((screen_name)::text)", name: "index_users_on_LOWER_screen_name", unique: true
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["email"], name: "index_users_on_email", unique: true

From f3cba7b6201b6cd8a9bab7669f791c13d84b3794 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 22:10:27 +0100
Subject: [PATCH 463/590] Set `last_reports_visit` when visiting the reports
 listing

---
 app/controllers/moderation/reports_controller.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/controllers/moderation/reports_controller.rb b/app/controllers/moderation/reports_controller.rb
index 3bf50ef7..7d29d1b2 100644
--- a/app/controllers/moderation/reports_controller.rb
+++ b/app/controllers/moderation/reports_controller.rb
@@ -4,6 +4,7 @@ class Moderation::ReportsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_filter_enabled
   before_action :set_type_options
+  before_action :set_last_reports_visit
 
   def index
     filter = ReportFilter.new(filter_params)
@@ -39,4 +40,9 @@ class Moderation::ReportsController < ApplicationController
       [t("activerecord.models.user.one"), :user]
     ]
   end
+
+  def set_last_reports_visit
+    current_user.last_reports_visit = DateTime.now
+    current_user.save
+  end
 end

From 34421b34f3eba871d421e05c7c1893e57de503c4 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 22:11:18 +0100
Subject: [PATCH 464/590] Set `has_new_reports` global in ApplicationController

---
 app/controllers/application_controller.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 35eda9f9..67ee3571 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
   around_action :switch_locale
   before_action :banned?
   before_action :find_active_announcements
+  before_action :set_has_new_reports
 
   # check if user wants to read
   def switch_locale(&)
@@ -48,6 +49,18 @@ class ApplicationController < ActionController::Base
     @active_announcements ||= Announcement.find_active
   end
 
+  def set_has_new_reports
+    return unless current_user&.mod?
+
+    @has_new_reports = if current_user.last_reports_visit.nil?
+                        true
+                       else
+                        Report.where(deleted: false)
+                              .where("created_at > ?", current_user.last_reports_visit)
+                              .count > 0
+                       end
+  end
+
   include ApplicationHelper
 
   protected

From 3a801baf1a0a9b062970bbc8834d3b2dbed0ae62 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 22:12:17 +0100
Subject: [PATCH 465/590] Add highlight to moderation panel link if there are
 new reports

---
 app/views/navigation/dropdown/_profile.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/navigation/dropdown/_profile.html.haml b/app/views/navigation/dropdown/_profile.html.haml
index aef649a9..1e25574a 100644
--- a/app/views/navigation/dropdown/_profile.html.haml
+++ b/app/views/navigation/dropdown/_profile.html.haml
@@ -16,8 +16,8 @@
       = link_to moderation_toggle_unmask_path, class: "dropdown-item", data: { turbo_method: :post } do
         %i.fa.fa-toggle-off
         = t(".unmask.enable")
-    %a.dropdown-item{ href: moderation_reports_path }
-      %i.fa.fa-fw.fa-gavel
+    %a.dropdown-item{ class: @has_new_reports ? "text-primary" : nil, href: moderation_reports_path }
+      %i.fa.fa-fw.fa-gavel{ class: @has_new_reports ? "fa-fade" : nil }
       = t(".moderation")
     - if current_user.has_cached_role?(:administrator)
       %a.dropdown-item{ href: admin_dashboard_path }

From bba00ea41536def5f7582208be30fd2f5f00fde4 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 22:19:48 +0100
Subject: [PATCH 466/590] Ignore last reports visit field in user exports

---
 lib/use_case/data_export/user.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/use_case/data_export/user.rb b/lib/use_case/data_export/user.rb
index 2bd4ceb1..49094cc1 100644
--- a/lib/use_case/data_export/user.rb
+++ b/lib/use_case/data_export/user.rb
@@ -15,6 +15,7 @@ module UseCase
         reset_password_token
         inbox_updated_at
         notifications_updated_at
+        last_reports_visit
       ].freeze
 
       IGNORED_FIELDS_PROFILES = %i[

From 92c9ed011ff19bb46c265d484ffc1f9d4cacb849 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 22:23:44 +0100
Subject: [PATCH 467/590] Fix rubocop nits

---
 app/controllers/application_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 67ee3571..cfd2fcc6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -53,11 +53,11 @@ class ApplicationController < ActionController::Base
     return unless current_user&.mod?
 
     @has_new_reports = if current_user.last_reports_visit.nil?
-                        true
+                         true
                        else
-                        Report.where(deleted: false)
-                              .where("created_at > ?", current_user.last_reports_visit)
-                              .count > 0
+                         Report.where(deleted: false)
+                               .where("created_at > ?", current_user.last_reports_visit)
+                               .count.positive?
                        end
   end
 

From 99faf075ff343fe883b54e0d8bdee2623b59a1e1 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Fri, 1 Mar 2024 23:42:55 +0100
Subject: [PATCH 468/590] Add request spec for report indicator

---
 spec/rails_helper.rb              |  1 +
 spec/requests/new_reports_spec.rb | 52 +++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 spec/requests/new_reports_spec.rb

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 74cb6c76..fd019daf 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -70,6 +70,7 @@ RSpec.configure do |config|
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.include Devise::Test::ControllerHelpers, type: :helper
   config.include Devise::Test::ControllerHelpers, type: :view
+  config.include Devise::Test::IntegrationHelpers, type: :request
   config.include ViewComponent::TestHelpers, type: :component
   config.include ViewComponent::SystemTestHelpers, type: :component
 end
diff --git a/spec/requests/new_reports_spec.rb b/spec/requests/new_reports_spec.rb
new file mode 100644
index 00000000..cd7e63ba
--- /dev/null
+++ b/spec/requests/new_reports_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe "New reports indicator", type: :request do
+  let(:user) { FactoryBot.create(:user, roles: [:moderator]) }
+
+  before do
+    sign_in user
+  end
+
+  subject { get "/" }
+
+  describe "setting an assign for new reports" do
+    context "never visited the reports listing before" do
+      it "sets a assign" do
+        subject
+
+        expect(assigns["has_new_reports"]).to eq(true)
+      end
+    end
+
+    context "visited the reports listing, with no new reports" do
+      before do
+        user.last_reports_visit = DateTime.now
+        user.save
+      end
+
+      it "sets a assign" do
+        subject
+
+        expect(assigns["has_new_reports"]).to eq(false)
+      end
+    end
+
+    context "visited the reports listing, with new reports" do
+      let(:other_user) { FactoryBot.create :user }
+
+      before do
+        Report.create(user:, target_id: other_user.id, target_user_id: other_user.id, type: "Reports::User", created_at: DateTime.now)
+        user.last_reports_visit = DateTime.now - 1.day
+        user.save
+      end
+
+      it "sets a assign" do
+        subject
+
+        expect(assigns["has_new_reports"]).to eq(true)
+      end
+    end
+  end
+end

From 8b3690fcf2c23ef7730cca81d4e6eaea30113f54 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:29:47 +0100
Subject: [PATCH 469/590] Remove full-width class from reaction icons

---
 app/views/reactions/_create.html.haml  | 4 ++--
 app/views/reactions/_destroy.html.haml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/reactions/_create.html.haml b/app/views/reactions/_create.html.haml
index d756ea89..d7c1d7ec 100644
--- a/app/views/reactions/_create.html.haml
+++ b/app/views/reactions/_create.html.haml
@@ -5,7 +5,7 @@
                       data: { controller: :reaction, action: "turbo:submit-start->reaction#disable turbo:submit-end->reaction#enable" } },
               class: "btn btn-link answerbox__action smile",
               data: { reaction_target: :button } do
-    %i.fa.fa-fw.fa-smile-o
+    %i.fa.fa-smile-o
     %span= target.smile_count
 
 - if type == "Comment"
@@ -15,5 +15,5 @@
                       data: { controller: :reaction, action: "turbo:submit-start->reaction#disable turbo:submit-end->reaction#enable" } },
               class: "btn btn-link answerbox__action smile",
               data: { reaction_target: :button } do
-    %i.fa.fa-fw.fa-smile-o
+    %i.fa.fa-smile-o
     %span= target.smile_count
diff --git a/app/views/reactions/_destroy.html.haml b/app/views/reactions/_destroy.html.haml
index 6516f1ef..dff2520a 100644
--- a/app/views/reactions/_destroy.html.haml
+++ b/app/views/reactions/_destroy.html.haml
@@ -6,7 +6,7 @@
                       data: { controller: :reaction, action: "turbo:submit-start->reaction#disable turbo:submit-end->reaction#enable" } },
               class: "btn btn-link answerbox__action unsmile",
               data: { reaction_target: :button } do
-    %i.fa.fa-fw.fa-smile-o
+    %i.fa.fa-smile-o
     %span= target.smile_count
 
 - if type == "Comment"
@@ -17,5 +17,5 @@
                       data: { controller: :reaction, action: "turbo:submit-start->reaction#disable turbo:submit-end->reaction#enable" } },
               class: "btn btn-link answerbox__action unsmile",
               data: { reaction_target: :button } do
-    %i.fa.fa-fw.fa-smile-o
+    %i.fa.fa-smile-o
     %span= target.smile_count

From fb6e6458c4f802f035e7fa65cc00b29b4554bed3 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:32:01 +0100
Subject: [PATCH 470/590] Remove conditional profile layout in answerboxes

---
 app/views/application/_answerbox.html.haml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml
index bfe29e4e..abbf319d 100644
--- a/app/views/application/_answerbox.html.haml
+++ b/app/views/application/_answerbox.html.haml
@@ -9,27 +9,6 @@
         = markdown a.content
       - if a.long? && !display_all
         = render "shared/collapse", type: "answer"
-    - if @user.nil?
-      .row
-        .col-sm-6.text-start.text-muted
-          .d-flex
-            .flex-shrink-0
-              %a{ href: user_path(a.user) }
-                = render AvatarComponent.new(user: a.user, size: "sm", classes: ["answerbox__answer-user-avatar"])
-            .flex-grow-1
-              %h6.answerbox__answer-user
-                = raw t(".answered", hide: hidespan(t(".hide"), "d-none d-sm-inline"), user: user_screen_name(a.user))
-              .answerbox__answer-date
-                = link_to(raw(t("time.distance_ago", time: time_tooltip(a))), answer_path(a.user.screen_name, a.id), data: { selection_hotkey: "l" })
-        .col-md-6.d-flex.d-md-block.answerbox__actions
-          = render "answerbox/actions", a:, display_all:
-    - else
-      .row
-        .col-md-6.text-start.text-muted
-          %i.fa.fa-clock-o
-          = link_to(raw(t("time.distance_ago", time: time_tooltip(a))), answer_path(a.user.screen_name, a.id), class: "answerbox__permalink")
-          - if a.pinned_at.present?
-            %span.answerbox__pinned
               ·
               %i.fa.fa-thumbtack
               = t(".pinned")

From 9bc41e31ec9cc5638bfbd7e255d456952c191dd8 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:35:05 +0100
Subject: [PATCH 471/590] Remove human-readable "Answered by" answerbox text

---
 app/views/application/_answerbox.html.haml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml
index abbf319d..b4b1e537 100644
--- a/app/views/application/_answerbox.html.haml
+++ b/app/views/application/_answerbox.html.haml
@@ -9,11 +9,19 @@
         = markdown a.content
       - if a.long? && !display_all
         = render "shared/collapse", type: "answer"
+    .d-md-flex
+      .text-muted
+        .d-flex.align-items-center
+          .flex-shrink-0
+            %a{ href: user_path(a.user) }
+              = render AvatarComponent.new(user: a.user, size: "sm", classes: ["answerbox__answer-user-avatar"])
+          .flex-grow-1
+            %h6.answerbox__answer-user
+              = user_screen_name(a.user)
               ·
-              %i.fa.fa-thumbtack
-              = t(".pinned")
-        .col-md-6.d-md-flex.answerbox__actions
-          = render "answerbox/actions", a:, display_all:
+              = link_to(time_tooltip(a), answer_path(a.user.screen_name, a.id), data: { selection_hotkey: "l" })
+      .d-flex.d-md-block.answerbox__actions.ms-auto
+        = render "answerbox/actions", a:, display_all:
   .card-footer{ id: "ab-comments-section-#{a.id}", class: display_all.nil? ? "d-none" : nil }
     = turbo_frame_tag("ab-reactions-list-#{a.id}", src: reactions_path(a.question, a), loading: :lazy) do
       .d-flex.smiles

From e8f661f5551db608ad06c736a298c059731ac37f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:36:02 +0100
Subject: [PATCH 472/590] Remove hidespan helper method

---
 app/helpers/bootstrap_helper.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/helpers/bootstrap_helper.rb b/app/helpers/bootstrap_helper.rb
index e6ae6981..ae1b2bfb 100644
--- a/app/helpers/bootstrap_helper.rb
+++ b/app/helpers/bootstrap_helper.rb
@@ -75,9 +75,6 @@ module BootstrapHelper
   def time_tooltip(subject, placement = "bottom")
     tooltip time_ago_in_words(subject.created_at), localize(subject.created_at), placement
   end
-
-  def hidespan(body, hide)
-    content_tag(:span, body, class: hide)
   end
 
   ##

From f4095c42ec1d97a92401ce35e2aa4e5f05b07d2f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:36:29 +0100
Subject: [PATCH 473/590] Adjust `time_tooltip` method to show shorter time
 format

---
 app/helpers/bootstrap_helper.rb |  3 +--
 config/locales/voc.en.yml       | 40 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/app/helpers/bootstrap_helper.rb b/app/helpers/bootstrap_helper.rb
index ae1b2bfb..216c10ab 100644
--- a/app/helpers/bootstrap_helper.rb
+++ b/app/helpers/bootstrap_helper.rb
@@ -73,8 +73,7 @@ module BootstrapHelper
   end
 
   def time_tooltip(subject, placement = "bottom")
-    tooltip time_ago_in_words(subject.created_at), localize(subject.created_at), placement
-  end
+    tooltip time_ago_in_words(subject.created_at, scope: "datetime.distance_in_words.short"), localize(subject.created_at, format: :long), placement
   end
 
   ##
diff --git a/config/locales/voc.en.yml b/config/locales/voc.en.yml
index 58547a03..0603cf05 100644
--- a/config/locales/voc.en.yml
+++ b/config/locales/voc.en.yml
@@ -42,3 +42,43 @@ en:
     days: "days"
     weeks: "weeks"
     months: "months"
+  datetime:
+    distance_in_words:
+      short:
+        about_x_hours:
+          one: "1h"
+          other: "%{count}h"
+        about_x_months:
+          one: "1mo"
+          other: "%{count}mo"
+        about_x_years:
+          one: "1y"
+          other: "%{count}y"
+        almost_x_years:
+          one: "1y"
+          other: "%{count}y"
+        half_a_minute: 1m
+        less_than_x_seconds:
+          one: "1s"
+          other: "%{count}s"
+        less_than_x_minutes:
+          one: "1m"
+          other: "%{count}m"
+        over_x_years:
+          one: "1y"
+          other: "%{count}y"
+        x_seconds:
+          one: "1s"
+          other: "%{count}s"
+        x_minutes:
+          one: "1m"
+          other: "%{count}m"
+        x_days:
+          one: "1d"
+          other: "%{count}d"
+        x_months:
+          one: "1mo"
+          other: "%{count}mo"
+        x_years:
+          one: "1y"
+          other: "%{count}y"

From 45907c9260ed1035e9416307a54ffbaa537eb13f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:37:07 +0100
Subject: [PATCH 474/590] Use ellipsis icon for action dropdowns

---
 .../question_component.html.haml               | 18 +++++++++++-------
 app/views/answerbox/_actions.html.haml         |  4 ++--
 app/views/answerbox/_comments.html.haml        |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/components/question_component/question_component.html.haml b/app/components/question_component/question_component.html.haml
index 5716b279..ef08c7ae 100644
--- a/app/components/question_component/question_component.html.haml
+++ b/app/components/question_component/question_component.html.haml
@@ -12,19 +12,23 @@
           %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_to_you") } }
         - elsif moderation_view?
           %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_mod_mode") } }
-      = t(".asked_html", user: user_screen_name(@question.user, context_user: @context_user, author_identifier: author_identifier), time: time_tooltip(@question))
+      = user_screen_name(@question.user, context_user: @context_user, author_identifier: author_identifier)
       - if follower_question?
         ·
         %a{ href: question_path(@question.user.screen_name, @question.id), data: { selection_hotkey: "a" } }
           = t(".answers", count: @question.answer_count)
+        ·
+        = time_tooltip(@question)
+      - else
+        ·
+        = link_to(time_tooltip(@question), question_path(@question.user.screen_name, @question.id))
+      - if user_signed_in?
+        .dropdown.d-inline
+          %button.btn.btn-link.btn-sm.p-0{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
+            %i.fa.fa-fw.fa-ellipsis
+          = render "actions/question", question: @question
     .question__body{ data: { controller: @question.long? ? "collapse" : nil } }
       .question__text{ class: @question.long? && @collapse ? "collapsed" : "", data: { collapse_target: "content" } }
         = question_markdown @question.content
       - if @question.long? && @collapse
         = render "shared/collapse", type: "question"
-  - if user_signed_in?
-    .flex-shrink-0.ms-auto
-      .btn-group
-        %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
-          %span.caret
-        = render "actions/question", question: @question
diff --git a/app/views/answerbox/_actions.html.haml b/app/views/answerbox/_actions.html.haml
index 445a6e4c..961507c2 100644
--- a/app/views/answerbox/_actions.html.haml
+++ b/app/views/answerbox/_actions.html.haml
@@ -12,6 +12,6 @@
   = render "actions/share", answer: a
 - if user_signed_in?
   .dropdown.d-inline
-    %button.btn.btn-link.answerbox__action.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
-      %span.caret
+    %button.btn.btn-link.answerbox__action{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
+      %i.fa.fa-fw.fa-ellipsis
     = render "actions/answer", answer: a
diff --git a/app/views/answerbox/_comments.html.haml b/app/views/answerbox/_comments.html.haml
index fe013eb6..c1c2a2de 100644
--- a/app/views/answerbox/_comments.html.haml
+++ b/app/views/answerbox/_comments.html.haml
@@ -21,6 +21,6 @@
             - else
               = render "reactions/create", type: "Comment", target: comment
             .dropdown.d-inline
-              %button.btn.btn-link.answerbox__action.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
-                %span.caret
+              %button.btn.btn-link.answerbox__action{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
+                %i.fa.fa-fw.fa-ellipsis
               = render "actions/comment", comment: comment, answer: a

From e264a785f4b53d5f43ed96f28845da8888d19fec Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:38:20 +0100
Subject: [PATCH 475/590] Remove hidden overflow styling from question user
 heading

---
 app/assets/stylesheets/components/_question.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/components/_question.scss b/app/assets/stylesheets/components/_question.scss
index 491aa3d8..e3425bc0 100644
--- a/app/assets/stylesheets/components/_question.scss
+++ b/app/assets/stylesheets/components/_question.scss
@@ -10,10 +10,13 @@
   &__text,
   &__user {
     margin-bottom: 0;
-    overflow: hidden;
     word-break: break-word;
   }
 
+  &__text {
+    overflow: hidden;
+  }
+
   &--sticky {
     border-radius: 0;
     width: 100%;

From b3cbfc762b2e5f8ac24a30f8df90e9cf2b6f0cd5 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:38:47 +0100
Subject: [PATCH 476/590] Initialize Bootstrap dropdowns on the toggle data
 attribute

---
 app/javascript/retrospring/initializers/bootstrap.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/retrospring/initializers/bootstrap.ts b/app/javascript/retrospring/initializers/bootstrap.ts
index 277f8c15..82e7dab9 100644
--- a/app/javascript/retrospring/initializers/bootstrap.ts
+++ b/app/javascript/retrospring/initializers/bootstrap.ts
@@ -11,7 +11,7 @@ export default function (): void {
     const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]');
     [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl));
 
-    const dropdownElementList = document.querySelectorAll('.dropdown-toggle');
+    const dropdownElementList = document.querySelectorAll('[data-bs-toggle="dropdown"]');
     [...dropdownElementList].map(dropdownToggleEl => new bootstrap.Dropdown(dropdownToggleEl));
 
     // HACK/BUG?: Bootstrap disables dropdowns in navbars, here we re-enable and "kinda" fix it

From 6c38f61d5c0ac79f353c4533d8bce85f658915ee Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:48:37 +0100
Subject: [PATCH 477/590] Fix coloring of action toggle in new inbox entries

---
 app/assets/stylesheets/components/_inbox-entry.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/components/_inbox-entry.scss b/app/assets/stylesheets/components/_inbox-entry.scss
index 3583a3f3..549ee55c 100644
--- a/app/assets/stylesheets/components/_inbox-entry.scss
+++ b/app/assets/stylesheets/components/_inbox-entry.scss
@@ -23,6 +23,10 @@
       .text-muted {
         color: RGBA(var(--primary-text), 0.8) !important;
       }
+
+      .btn {
+        color: inherit;
+      }
     }
   }
 

From 54cff294b2acd1e9f78f74472f1a885615e72e43 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 21:57:39 +0100
Subject: [PATCH 478/590] Re-add pinned indicator to answerboxes

---
 app/views/application/_answerbox.html.haml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/views/application/_answerbox.html.haml b/app/views/application/_answerbox.html.haml
index b4b1e537..565447d1 100644
--- a/app/views/application/_answerbox.html.haml
+++ b/app/views/application/_answerbox.html.haml
@@ -20,6 +20,11 @@
               = user_screen_name(a.user)
               ·
               = link_to(time_tooltip(a), answer_path(a.user.screen_name, a.id), data: { selection_hotkey: "l" })
+              - if a.pinned_at.present?
+                %span.answerbox__pinned
+                  ·
+                  %i.fa.fa-thumbtack
+                  = t(".pinned")
       .d-flex.d-md-block.answerbox__actions.ms-auto
         = render "answerbox/actions", a:, display_all:
   .card-footer{ id: "ab-comments-section-#{a.id}", class: display_all.nil? ? "d-none" : nil }

From 900fc1c64620f6d47b2a1665d3836f657be4a941 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 22:34:12 +0100
Subject: [PATCH 479/590] Remove linking of (possibly) anonymous questions

I'll come back to properly linking this up later
---
 .../question_component/question_component.html.haml        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/components/question_component/question_component.html.haml b/app/components/question_component/question_component.html.haml
index ef08c7ae..4b38e4cc 100644
--- a/app/components/question_component/question_component.html.haml
+++ b/app/components/question_component/question_component.html.haml
@@ -17,11 +17,8 @@
         ·
         %a{ href: question_path(@question.user.screen_name, @question.id), data: { selection_hotkey: "a" } }
           = t(".answers", count: @question.answer_count)
-        ·
-        = time_tooltip(@question)
-      - else
-        ·
-        = link_to(time_tooltip(@question), question_path(@question.user.screen_name, @question.id))
+      ·
+      = time_tooltip(@question)
       - if user_signed_in?
         .dropdown.d-inline
           %button.btn.btn-link.btn-sm.p-0{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }

From 77d9546b8fce7405a37e9b7be4d6e426a27d3394 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 22:39:30 +0100
Subject: [PATCH 480/590] Fix `BootstrapHelper` specs

---
 spec/helpers/bootstrap_helper_spec.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/spec/helpers/bootstrap_helper_spec.rb b/spec/helpers/bootstrap_helper_spec.rb
index 2f335560..3f10d733 100644
--- a/spec/helpers/bootstrap_helper_spec.rb
+++ b/spec/helpers/bootstrap_helper_spec.rb
@@ -103,14 +103,8 @@ describe BootstrapHelper, type: :helper do
         @user = FactoryBot.create(:user)
         travel 10.minutes
 
-        expect(time_tooltip(@user)).to eq("<span title=\"Sun, 01 Jan 1984 00:00:00 +0000\" data-bs-toggle=\"tooltip\" data-bs-placement=\"bottom\">10 minutes</span>")
+        expect(time_tooltip(@user)).to eq("<span title=\"January 01, 1984 00:00\" data-bs-toggle=\"tooltip\" data-bs-placement=\"bottom\">10m</span>")
       end
     end
   end
-
-  describe "#hidespan" do
-    it "should return the proper markup" do
-      expect(hidespan("Hidden Text", "d-none")).to eq("<span class=\"d-none\">Hidden Text</span>")
-    end
-  end
 end

From 39d05d8db504e9620cc042958374d1cc344d6e31 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sat, 2 Mar 2024 22:54:35 +0100
Subject: [PATCH 481/590] Bump version to 2024.0302.0

---
 lib/retrospring/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index bd731d9b..f6007f0b 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -15,9 +15,9 @@ module Retrospring
 
     def year = 2024
 
-    def month = 1
+    def month = 3
 
-    def day = 25
+    def day = 2
 
     def patch = 0
 

From bc78a9d42d6f4917616de6e4dcec4065bd3b5221 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <andreas.nedbal@in2code.de>
Date: Sun, 3 Mar 2024 17:58:56 +0100
Subject: [PATCH 482/590] Downgrade esbuild to 0.17.0

---
 package.json |   2 +-
 yarn.lock    | 234 +++++++++++++++++++++++++--------------------------
 2 files changed, 115 insertions(+), 121 deletions(-)

diff --git a/package.json b/package.json
index 0eed7a62..b7615ef8 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "esbuild": "^0.20.1",
+    "esbuild": "^0.17.0",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
     "stylelint": "^15.11.0",
diff --git a/yarn.lock b/yarn.lock
index b5cfa2a7..5d046a46 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -48,120 +48,115 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz#798622546b63847e82389e473fd67f2707d82247"
   integrity sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==
 
-"@esbuild/aix-ppc64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz#eafa8775019b3650a77e8310ba4dbd17ca7af6d5"
-  integrity sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==
+"@esbuild/android-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd"
+  integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==
 
-"@esbuild/android-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz#68791afa389550736f682c15b963a4f37ec2f5f6"
-  integrity sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==
+"@esbuild/android-arm@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d"
+  integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==
 
-"@esbuild/android-arm@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.1.tgz#38c91d8ee8d5196f7fbbdf4f0061415dde3a473a"
-  integrity sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==
+"@esbuild/android-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1"
+  integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==
 
-"@esbuild/android-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.1.tgz#93f6190ce997b313669c20edbf3645fc6c8d8f22"
-  integrity sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==
+"@esbuild/darwin-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276"
+  integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==
 
-"@esbuild/darwin-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz#0d391f2e81fda833fe609182cc2fbb65e03a3c46"
-  integrity sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==
+"@esbuild/darwin-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb"
+  integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==
 
-"@esbuild/darwin-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz#92504077424584684862f483a2242cfde4055ba2"
-  integrity sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==
+"@esbuild/freebsd-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2"
+  integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==
 
-"@esbuild/freebsd-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz#a1646fa6ba87029c67ac8a102bb34384b9290774"
-  integrity sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==
+"@esbuild/freebsd-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4"
+  integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==
 
-"@esbuild/freebsd-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz#41c9243ab2b3254ea7fb512f71ffdb341562e951"
-  integrity sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==
+"@esbuild/linux-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb"
+  integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==
 
-"@esbuild/linux-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz#f3c1e1269fbc9eedd9591a5bdd32bf707a883156"
-  integrity sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==
+"@esbuild/linux-arm@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a"
+  integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==
 
-"@esbuild/linux-arm@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz#4503ca7001a8ee99589c072801ce9d7540717a21"
-  integrity sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==
+"@esbuild/linux-ia32@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a"
+  integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==
 
-"@esbuild/linux-ia32@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz#98c474e3e0cbb5bcbdd8561a6e65d18f5767ce48"
-  integrity sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==
+"@esbuild/linux-loong64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72"
+  integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==
 
-"@esbuild/linux-loong64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz#a8097d28d14b9165c725fe58fc438f80decd2f33"
-  integrity sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==
+"@esbuild/linux-mips64el@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289"
+  integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==
 
-"@esbuild/linux-mips64el@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz#c44f6f0d7d017c41ad3bb15bfdb69b690656b5ea"
-  integrity sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==
+"@esbuild/linux-ppc64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7"
+  integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==
 
-"@esbuild/linux-ppc64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz#0765a55389a99237b3c84227948c6e47eba96f0d"
-  integrity sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==
+"@esbuild/linux-riscv64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09"
+  integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==
 
-"@esbuild/linux-riscv64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz#e4153b032288e3095ddf4c8be07893781b309a7e"
-  integrity sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==
+"@esbuild/linux-s390x@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829"
+  integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==
 
-"@esbuild/linux-s390x@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz#b9ab8af6e4b73b26d63c1c426d7669a5d53eb5a7"
-  integrity sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==
+"@esbuild/linux-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4"
+  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
 
-"@esbuild/linux-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz#0b25da17ac38c3e11cdd06ca3691d4d6bef2755f"
-  integrity sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==
+"@esbuild/netbsd-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462"
+  integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==
 
-"@esbuild/netbsd-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz#3148e48406cd0d4f7ba1e0bf3f4d77d548c98407"
-  integrity sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==
+"@esbuild/openbsd-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691"
+  integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==
 
-"@esbuild/openbsd-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz#7b73e852986a9750192626d377ac96ac2b749b76"
-  integrity sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==
+"@esbuild/sunos-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273"
+  integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==
 
-"@esbuild/sunos-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz#402a441cdac2eee98d8be378c7bc23e00c1861c5"
-  integrity sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==
+"@esbuild/win32-arm64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f"
+  integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==
 
-"@esbuild/win32-arm64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz#36c4e311085806a6a0c5fc54d1ac4d7b27e94d7b"
-  integrity sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==
+"@esbuild/win32-ia32@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03"
+  integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==
 
-"@esbuild/win32-ia32@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz#0cf933be3fb9dc58b45d149559fe03e9e22b54fe"
-  integrity sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==
-
-"@esbuild/win32-x64@0.20.1":
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz#77583b6ea54cee7c1410ebbd54051b6a3fcbd8ba"
-  integrity sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==
+"@esbuild/win32-x64@0.17.19":
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
+  integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
@@ -966,34 +961,33 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild@^0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.1.tgz#1e4cbb380ad1959db7609cb9573ee77257724a3e"
-  integrity sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==
+esbuild@^0.17.0:
+  version "0.17.19"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
+  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.20.1"
-    "@esbuild/android-arm" "0.20.1"
-    "@esbuild/android-arm64" "0.20.1"
-    "@esbuild/android-x64" "0.20.1"
-    "@esbuild/darwin-arm64" "0.20.1"
-    "@esbuild/darwin-x64" "0.20.1"
-    "@esbuild/freebsd-arm64" "0.20.1"
-    "@esbuild/freebsd-x64" "0.20.1"
-    "@esbuild/linux-arm" "0.20.1"
-    "@esbuild/linux-arm64" "0.20.1"
-    "@esbuild/linux-ia32" "0.20.1"
-    "@esbuild/linux-loong64" "0.20.1"
-    "@esbuild/linux-mips64el" "0.20.1"
-    "@esbuild/linux-ppc64" "0.20.1"
-    "@esbuild/linux-riscv64" "0.20.1"
-    "@esbuild/linux-s390x" "0.20.1"
-    "@esbuild/linux-x64" "0.20.1"
-    "@esbuild/netbsd-x64" "0.20.1"
-    "@esbuild/openbsd-x64" "0.20.1"
-    "@esbuild/sunos-x64" "0.20.1"
-    "@esbuild/win32-arm64" "0.20.1"
-    "@esbuild/win32-ia32" "0.20.1"
-    "@esbuild/win32-x64" "0.20.1"
+    "@esbuild/android-arm" "0.17.19"
+    "@esbuild/android-arm64" "0.17.19"
+    "@esbuild/android-x64" "0.17.19"
+    "@esbuild/darwin-arm64" "0.17.19"
+    "@esbuild/darwin-x64" "0.17.19"
+    "@esbuild/freebsd-arm64" "0.17.19"
+    "@esbuild/freebsd-x64" "0.17.19"
+    "@esbuild/linux-arm" "0.17.19"
+    "@esbuild/linux-arm64" "0.17.19"
+    "@esbuild/linux-ia32" "0.17.19"
+    "@esbuild/linux-loong64" "0.17.19"
+    "@esbuild/linux-mips64el" "0.17.19"
+    "@esbuild/linux-ppc64" "0.17.19"
+    "@esbuild/linux-riscv64" "0.17.19"
+    "@esbuild/linux-s390x" "0.17.19"
+    "@esbuild/linux-x64" "0.17.19"
+    "@esbuild/netbsd-x64" "0.17.19"
+    "@esbuild/openbsd-x64" "0.17.19"
+    "@esbuild/sunos-x64" "0.17.19"
+    "@esbuild/win32-arm64" "0.17.19"
+    "@esbuild/win32-ia32" "0.17.19"
+    "@esbuild/win32-x64" "0.17.19"
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"

From f0569cc247c4e8556c697d36098900a724ca63cd Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <andreas.nedbal@in2code.de>
Date: Sun, 3 Mar 2024 18:12:45 +0100
Subject: [PATCH 483/590] Bump version to 2024.0303.0

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index f6007f0b..ab4d8b4c 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -17,7 +17,7 @@ module Retrospring
 
     def month = 3
 
-    def day = 2
+    def day = 3
 
     def patch = 0
 

From 6e06f9bc168b5087c65b9c404fa4320be470cef0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 09:06:41 +0000
Subject: [PATCH 484/590] Bump dotenv-rails from 3.0.2 to 3.1.0

Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/main/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v3.0.2...v3.1.0)

---
updated-dependencies:
- dependency-name: dotenv-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7e12e747..dcff4d04 100644
--- a/Gemfile
+++ b/Gemfile
@@ -82,7 +82,7 @@ group :development, :test do
   gem "better_errors"
   gem "bullet"
   gem "database_cleaner"
-  gem "dotenv-rails", "~> 3.0"
+  gem "dotenv-rails", "~> 3.1"
   gem "factory_bot_rails", require: false
   gem "faker"
   gem "haml_lint", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index e85854be..6852ca62 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -140,9 +140,9 @@ GEM
       devise (>= 4.9.0)
     diff-lcs (1.5.1)
     docile (1.4.0)
-    dotenv (3.0.2)
-    dotenv-rails (3.0.2)
-      dotenv (= 3.0.2)
+    dotenv (3.1.0)
+    dotenv-rails (3.1.0)
+      dotenv (= 3.1.0)
       railties (>= 6.1)
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
@@ -479,7 +479,7 @@ GEM
     ssrf_filter (1.1.2)
     sysexits (1.2.0)
     temple (0.10.3)
-    thor (1.3.0)
+    thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)
     tldv (0.1.0)
@@ -536,7 +536,7 @@ DEPENDENCIES
   devise (~> 4.9)
   devise-async
   devise-i18n
-  dotenv-rails (~> 3.0)
+  dotenv-rails (~> 3.1)
   dry-initializer (~> 3.1)
   dry-types (~> 1.7)
   factory_bot_rails

From 96f5cbd3ed09fda865deb429f4847604347806f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 09:07:18 +0000
Subject: [PATCH 485/590] Bump jwt from 2.8.0 to 2.8.1

Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.8.0...v2.8.1)

---
updated-dependencies:
- dependency-name: jwt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e85854be..5604a0cf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -228,7 +228,7 @@ GEM
     json (2.7.1)
     json-schema (4.1.1)
       addressable (>= 2.8)
-    jwt (2.8.0)
+    jwt (2.8.1)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)

From eb93e6214505fd288cff0f80d2e073b0b59fc17d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 09:07:52 +0000
Subject: [PATCH 486/590] Bump pg from 1.5.5 to 1.5.6

Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.5 to 1.5.6.
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.5.5...v1.5.6)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e85854be..f8d68c72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -295,7 +295,7 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    pg (1.5.5)
+    pg (1.5.6)
     pghero (3.4.1)
       activerecord (>= 6)
     prometheus-client (4.2.2)

From 2364a27e1448fcf269b527b8cfe726ec1377a34d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 09:08:25 +0000
Subject: [PATCH 487/590] Bump rubocop-rails from 2.23.1 to 2.24.0

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.23.1 to 2.24.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.23.1...v2.24.0)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7e12e747..305cfc99 100644
--- a/Gemfile
+++ b/Gemfile
@@ -95,7 +95,7 @@ group :development, :test do
   gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 4.1", require: false
   gem "rubocop", "~> 1.60"
-  gem "rubocop-rails", "~> 2.23"
+  gem "rubocop-rails", "~> 2.24"
   gem "shoulda-matchers", "~> 6.1"
   gem "simplecov", require: false
   gem "simplecov-cobertura", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index e85854be..53524f22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -415,13 +415,13 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-rails (2.23.1)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
+    rubocop-rails (2.24.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.0)
       ffi (~> 1.12)
@@ -583,7 +583,7 @@ DEPENDENCIES
   rspec-rails (~> 6.1)
   rspec-sidekiq (~> 4.1)
   rubocop (~> 1.60)
-  rubocop-rails (~> 2.23)
+  rubocop-rails (~> 2.24)
   rubyzip (~> 2.3)
   sanitize
   sassc-rails

From d47917cc6f7271b6f1912a5cb3ed88d1ae75010a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Mar 2024 21:52:24 +0000
Subject: [PATCH 488/590] Bump rubocop from 1.60.2 to 1.62.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.2 to 1.62.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.60.2...v1.62.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index c9835509..d3caaa75 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ group :development, :test do
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 4.1", require: false
-  gem "rubocop", "~> 1.60"
+  gem "rubocop", "~> 1.62"
   gem "rubocop-rails", "~> 2.24"
   gem "shoulda-matchers", "~> 6.1"
   gem "simplecov", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bb0169ee..0c22ddc7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -404,7 +404,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.0)
-    rubocop (1.60.2)
+    rubocop (1.62.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -412,10 +412,10 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.1)
+    rubocop-ast (1.31.2)
       parser (>= 3.3.0.4)
     rubocop-rails (2.24.0)
       activesupport (>= 4.2.0)
@@ -582,7 +582,7 @@ DEPENDENCIES
   rspec-mocks
   rspec-rails (~> 6.1)
   rspec-sidekiq (~> 4.1)
-  rubocop (~> 1.60)
+  rubocop (~> 1.62)
   rubocop-rails (~> 2.24)
   rubyzip (~> 2.3)
   sanitize

From fcfc28978cd346a7d6ff98a56c489299f52a196e Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Sat, 9 Mar 2024 14:34:07 +0100
Subject: [PATCH 489/590] annotate rendered views with file names in dev

---
 config/environments/development.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index bf96e5b2..609ec5dc 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -72,6 +72,9 @@ Rails.application.configure do
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
+  # annotate rendered view with file names, really useful in dev!
+  config.action_view.annotate_rendered_view_with_filenames = true
+
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   # config.file_watcher = ActiveSupport::EventedFileUpdateChecker

From 96794029b3a7d685809699302c851a900ca80a80 Mon Sep 17 00:00:00 2001
From: Georg Gadinger <nilsding@nilsding.org>
Date: Sat, 9 Mar 2024 14:34:24 +0100
Subject: [PATCH 490/590] use time_tooltip for comments, fixes #1650

---
 app/views/answerbox/_comments.html.haml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/answerbox/_comments.html.haml b/app/views/answerbox/_comments.html.haml
index c1c2a2de..04aa7b7f 100644
--- a/app/views/answerbox/_comments.html.haml
+++ b/app/views/answerbox/_comments.html.haml
@@ -11,8 +11,9 @@
           .flex-grow-1
             %h6.comment__user
               = user_screen_name comment.user
-              %span.text-muted{ title: comment.created_at, data: { bs_toggle: :tooltip, bs_placement: :right } }
-                = t("time.distance_ago", time: time_ago_in_words(comment.created_at))
+              %span.text-muted
+                ·
+                = time_tooltip comment
             .comment__content
               = markdown comment.content
           .flex-shrink-0.ms-auto

From 94f027f546aef4f2f043718cbd8cb81f9d2aec9c Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 15:28:24 +0100
Subject: [PATCH 491/590] Add Stimulus tooltip controller

---
 .../retrospring/controllers/tooltip_controller.ts         | 8 ++++++++
 app/javascript/retrospring/initializers/stimulus.ts       | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 app/javascript/retrospring/controllers/tooltip_controller.ts

diff --git a/app/javascript/retrospring/controllers/tooltip_controller.ts b/app/javascript/retrospring/controllers/tooltip_controller.ts
new file mode 100644
index 00000000..a6c61fa0
--- /dev/null
+++ b/app/javascript/retrospring/controllers/tooltip_controller.ts
@@ -0,0 +1,8 @@
+import { Controller } from '@hotwired/stimulus';
+import { Tooltip } from 'bootstrap';
+
+export default class extends Controller {
+  connect(): void {
+    new Tooltip(this.element);
+  }
+}
diff --git a/app/javascript/retrospring/initializers/stimulus.ts b/app/javascript/retrospring/initializers/stimulus.ts
index 505d23ad..0c775324 100644
--- a/app/javascript/retrospring/initializers/stimulus.ts
+++ b/app/javascript/retrospring/initializers/stimulus.ts
@@ -17,6 +17,7 @@ import ShareController from "retrospring/controllers/share_controller";
 import ClipboardController from "retrospring/controllers/clipboard_controller";
 import QuestionboxFocusController from "retrospring/controllers/questionbox_focus_controller";
 import ReactionController from "retrospring/controllers/reaction_controller";
+import TooltipController from "retrospring/controllers/tooltip_controller";
 
 /**
  * This module sets up Stimulus and our controllers
@@ -45,4 +46,5 @@ export default function (): void {
   window['Stimulus'].register('clipboard', ClipboardController);
   window['Stimulus'].register('questionbox-focus', QuestionboxFocusController);
   window['Stimulus'].register('reaction', ReactionController);
+  window['Stimulus'].register('tooltip', TooltipController);
 }

From 7f93fabb62c5fd24467fd26cd6d72160726778c6 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 15:28:43 +0100
Subject: [PATCH 492/590] Remove tooltip initializer from Bootstrap file

---
 app/javascript/retrospring/initializers/bootstrap.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/javascript/retrospring/initializers/bootstrap.ts b/app/javascript/retrospring/initializers/bootstrap.ts
index 82e7dab9..a2ff7dfd 100644
--- a/app/javascript/retrospring/initializers/bootstrap.ts
+++ b/app/javascript/retrospring/initializers/bootstrap.ts
@@ -8,9 +8,6 @@ import * as bootstrap from 'bootstrap';
  */
 export default function (): void {
   document.addEventListener('turbo:load', () => {
-    const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]');
-    [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl));
-
     const dropdownElementList = document.querySelectorAll('[data-bs-toggle="dropdown"]');
     [...dropdownElementList].map(dropdownToggleEl => new bootstrap.Dropdown(dropdownToggleEl));
 

From 95c79216cbe78fb186ce0845491501bd60a69990 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 15:29:10 +0100
Subject: [PATCH 493/590] Update tooltip helper to use `data-controller`
 instead

---
 app/helpers/bootstrap_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/bootstrap_helper.rb b/app/helpers/bootstrap_helper.rb
index 216c10ab..124c4ca8 100644
--- a/app/helpers/bootstrap_helper.rb
+++ b/app/helpers/bootstrap_helper.rb
@@ -69,7 +69,7 @@ module BootstrapHelper
   end
 
   def tooltip(body, tooltip_content, placement = "bottom")
-    content_tag(:span, body, { :title => tooltip_content, "data-bs-toggle" => "tooltip", "data-bs-placement" => placement })
+    content_tag(:span, body, { :title => tooltip_content, "data-controller" => "tooltip", "data-bs-placement" => placement })
   end
 
   def time_tooltip(subject, placement = "bottom")

From 04931b627ce057fd1593fcefbb5524f2aad3e209 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 15:29:31 +0100
Subject: [PATCH 494/590] Adjust manual tooltip initializations

---
 .../question_component/question_component.html.haml      | 9 ++++++---
 app/views/answerbox/_smiles.html.haml                    | 2 +-
 app/views/navigation/_desktop.html.haml                  | 4 ++--
 app/views/tabs/_feed.html.haml                           | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/components/question_component/question_component.html.haml b/app/components/question_component/question_component.html.haml
index 4b38e4cc..ea139a1c 100644
--- a/app/components/question_component/question_component.html.haml
+++ b/app/components/question_component/question_component.html.haml
@@ -6,12 +6,15 @@
   .flex-grow-1
     %h6.text-muted.question__user
       - if @question.author_is_anonymous
-        %i.fas.fa-user-secret{ title: t(".anon_hint") }
+        %span{ title: t(".anon_hint"), data: { controller: :tooltip, bs_placement: :bottom } }
+          %i.fas.fa-user-secret
       - if @profile_question && @question.direct
         - if user_signed_in? && @question.user == current_user
-          %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_to_you") } }
+          %span.d-inline-block{ title: t(".visible_to_you"), data: { controller: :tooltip, bs_placement: :bottom } }
+            %i.fa.fa-eye-slash
         - elsif moderation_view?
-          %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_mod_mode") } }
+          %span{ title: t(".visible_mod_mode"), data: { controller: :tooltip, bs_placement: :bottom } }
+            %i.fa.fa-eye-slash
       = user_screen_name(@question.user, context_user: @context_user, author_identifier: author_identifier)
       - if follower_question?
         ·
diff --git a/app/views/answerbox/_smiles.html.haml b/app/views/answerbox/_smiles.html.haml
index c25626a1..68f02e63 100644
--- a/app/views/answerbox/_smiles.html.haml
+++ b/app/views/answerbox/_smiles.html.haml
@@ -8,5 +8,5 @@
       - a.smiles.all.each do |smile|
         %a{ href: user_path(smile.user),
           title: user_screen_name(smile.user, url: false),
-          data: { bs_toggle: :tooltip, bs_placement: :top, smile_id: smile.id, turbo: :false } }
+          data: { controller: :tooltip, bs_placement: :top, smile_id: smile.id, turbo: :false } }
           = render AvatarComponent.new(user: smile.user, size: "xs")
diff --git a/app/views/navigation/_desktop.html.haml b/app/views/navigation/_desktop.html.haml
index ceb1fd08..26172183 100644
--- a/app/views/navigation/_desktop.html.haml
+++ b/app/views/navigation/_desktop.html.haml
@@ -15,7 +15,7 @@
         = nav_entry t("navigation.discover"), discover_path, icon: "compass", hotkey: "g d"
     %ul.nav.navbar-nav
       - if @user.present? && @user != current_user
-        %li.nav-item.d-none.d-sm-block{ data: { bs_toggle: 'tooltip', bs_placement: 'bottom' }, title: t(".list") }
+        %li.nav-item.d-none.d-sm-block{ data: { controller: 'tooltip', bs_placement: 'bottom' }, title: t(".list") }
           %a.nav-link{ href: '#', data: { bs_target: '#modal-list-memberships', bs_toggle: :modal } }
             %i.fa.fa-list.hidden-xs
             %span.d-none.d-sm-inline.d-md-none= t(".list")
@@ -29,7 +29,7 @@
             - cache current_user.notification_dropdown_cache_key, expires_in: 12.hours do
               - notifications = Notification.for(current_user).where(new: true).includes([:target]).limit(4)
               = render "navigation/dropdown/notifications", notifications:, size: "desktop"
-      %li.nav-item.d-none.d-sm-block{ data: { bs_toggle: 'tooltip', bs_placement: 'bottom' }, title: t('.ask_question') }
+      %li.nav-item.d-none.d-sm-block{ data: { controller: :tooltip, bs_placement: 'bottom' }, title: t('.ask_question') }
         %a.nav-link{ href: "#", name: "toggle-all-ask", data: { bs_target: "#modal-ask-followers", bs_toggle: :modal, hotkey: "n" } }
           %i.fa.fa-pencil-square-o
       %li.nav-item.dropdown.profile--image-dropdown
diff --git a/app/views/tabs/_feed.html.haml b/app/views/tabs/_feed.html.haml
index fc92d7a0..20d06717 100644
--- a/app/views/tabs/_feed.html.haml
+++ b/app/views/tabs/_feed.html.haml
@@ -17,7 +17,7 @@
         - else
           %p.px-4.pb-2
             - list.members.each do |member|
-              %a{ href: user_path(member.user), title: member.user.screen_name, data: { bs_toggle: :tooltip, bs_placement: :top } }
+              %a{ href: user_path(member.user), title: member.user.screen_name, data: { controller: :tooltip, bs_placement: :top } }
                 = render AvatarComponent.new(user: member.user, size: "xs")
       - if !list && lists.empty?
         .p-3= t(".lists.notice_html")

From 444acaf5489b16525e73ac2cc35846f5630a84e0 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 15:30:27 +0100
Subject: [PATCH 495/590] Adjust BootstrapHelper specs

---
 spec/helpers/bootstrap_helper_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/helpers/bootstrap_helper_spec.rb b/spec/helpers/bootstrap_helper_spec.rb
index 3f10d733..02e98f65 100644
--- a/spec/helpers/bootstrap_helper_spec.rb
+++ b/spec/helpers/bootstrap_helper_spec.rb
@@ -93,7 +93,7 @@ describe BootstrapHelper, type: :helper do
 
   describe "#tooltip" do
     it "should return the proper markup" do
-      expect(tooltip("Example Text", "This is in a tooltip")).to eq("<span title=\"This is in a tooltip\" data-bs-toggle=\"tooltip\" data-bs-placement=\"bottom\">Example Text</span>")
+      expect(tooltip("Example Text", "This is in a tooltip")).to eq("<span title=\"This is in a tooltip\" data-controller=\"tooltip\" data-bs-placement=\"bottom\">Example Text</span>")
     end
   end
 
@@ -103,7 +103,7 @@ describe BootstrapHelper, type: :helper do
         @user = FactoryBot.create(:user)
         travel 10.minutes
 
-        expect(time_tooltip(@user)).to eq("<span title=\"January 01, 1984 00:00\" data-bs-toggle=\"tooltip\" data-bs-placement=\"bottom\">10m</span>")
+        expect(time_tooltip(@user)).to eq("<span title=\"January 01, 1984 00:00\" data-controller=\"tooltip\" data-bs-placement=\"bottom\">10m</span>")
       end
     end
   end

From 07cafb9b30bc478012598f78b97d93375d9239c1 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 16:11:11 +0100
Subject: [PATCH 496/590] Use new date format in notifications

---
 app/views/notifications/type/_answer.html.haml   |  5 +++--
 app/views/notifications/type/_comment.html.haml  | 11 +++++------
 app/views/notifications/type/_reaction.html.haml |  8 ++++----
 config/locales/views.en.yml                      |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/notifications/type/_answer.html.haml b/app/views/notifications/type/_answer.html.haml
index 78cdd37d..184b58a6 100644
--- a/app/views/notifications/type/_answer.html.haml
+++ b/app/views/notifications/type/_answer.html.haml
@@ -6,8 +6,9 @@
       = render AvatarComponent.new(user: notification.target.user, size: "xs")
       = t(".heading_html",
           user: user_screen_name(notification.target.user),
-          question: link_to(t(".link_text"), answer_path(username: notification.target.user.screen_name, id: notification.target.id), target: "_top"),
-          time: time_tooltip(notification.target))
+          question: link_to(t(".link_text"), answer_path(username: notification.target.user.screen_name, id: notification.target.id), target: "_top"))
+      ·
+      = time_tooltip(notification.target)
     .list-group
       .list-group-item
         %h6.notification__list-heading= t("activerecord.models.question.one")
diff --git a/app/views/notifications/type/_comment.html.haml b/app/views/notifications/type/_comment.html.haml
index a3371df1..f591250b 100644
--- a/app/views/notifications/type/_comment.html.haml
+++ b/app/views/notifications/type/_comment.html.haml
@@ -10,16 +10,14 @@
               answer: link_to(t(".active.link_text"),
                               answer_path(username: notification.target.user.screen_name,
                               id: notification.target.answer.id),
-                              target: "_top"),
-              time: time_tooltip(notification.target))
+                              target: "_top"))
       - elsif notification.target.user == notification.target.answer.user
         = t(".heading_html",
               user: user_screen_name(notification.target.user),
               answer: link_to(t(".passive.link_text"),
                               answer_path(username: notification.target.user.screen_name,
                               id: notification.target.answer.id),
-                              target: "_top"),
-              time: time_tooltip(notification.target))
+                              target: "_top"))
       - else
         = t(".heading_html",
               user: user_screen_name(notification.target.user),
@@ -27,8 +25,9 @@
                                 user: user_screen_name(notification.target.answer.user, url: false)),
                                 answer_path(username: notification.target.user.screen_name,
                                 id: notification.target.answer.id),
-                                target: "_top"),
-              time: time_tooltip(notification.target))
+                                target: "_top"))
+      ·
+      = time_tooltip(notification.target)
     .list-group
       .list-group-item
         %h6.notification__list-heading= t("activerecord.models.answer.one")
diff --git a/app/views/notifications/type/_reaction.html.haml b/app/views/notifications/type/_reaction.html.haml
index 0f0e68f8..4238df29 100644
--- a/app/views/notifications/type/_reaction.html.haml
+++ b/app/views/notifications/type/_reaction.html.haml
@@ -10,16 +10,16 @@
               type: link_to(t(".#{notification.target.parent_type.downcase}.link_text"),
                               answer_path(username: notification.target.user.screen_name,
                               id: notification.target.parent.id),
-                              target: "_top"),
-              time: time_tooltip(notification.target))
+                              target: "_top"))
       - elsif notification.target.parent_type == "Comment"
         = t(".heading_html",
               user: user_screen_name(notification.target.user),
               type: link_to(t(".#{notification.target.parent_type.downcase}.link_text"),
                               answer_path(username: notification.target.user.screen_name,
                               id: notification.target.parent.answer.id),
-                              target: "_top"),
-              time: time_tooltip(notification.target))
+                              target: "_top"))
+      ·
+      = time_tooltip(notification.target)
     .list-group
       .list-group-item
         %h6.notification__list-heading= t("activerecord.models.#{notification.target.parent_type.downcase}.one")
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 5acc1662..f918d3e4 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -343,10 +343,10 @@ en:
       none: "No new notifications."
     type:
       answer:
-        heading_html: "%{user} answered %{question} %{time} ago"
+        heading_html: "%{user} answered %{question}"
         link_text: "your question"
       comment:
-        heading_html: "%{user} commented on %{answer} %{time} ago"
+        heading_html: "%{user} commented on %{answer}"
         active:
           link_text: "your answer"
         passive:
@@ -358,7 +358,7 @@ en:
         text_html: "Head over to %{settings_export} to download it."
         settings_export: "the settings page"
       reaction:
-        heading_html: "%{user} smiled %{type} %{time} ago"
+        heading_html: "%{user} smiled %{type}"
         answer:
           link_text: "your answer"
         comment:

From d6b5e2bae7e58cb90fb294b2aedfb1c024d93418 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 17:26:49 +0100
Subject: [PATCH 497/590] Downgrade CarrierWave and Backgrounder

---
 Gemfile      |  4 ++--
 Gemfile.lock | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index d3caaa75..5fbc85b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,8 +21,8 @@ gem "bcrypt", "~> 3.1.20"
 gem "active_model_otp"
 gem "bootsnap", require: false
 gem "bootstrap_form", "~> 5.0"
-gem "carrierwave", "~> 3.0"
-gem "carrierwave_backgrounder", "~> 1.0.2"
+gem "carrierwave", "~> 2.1"
+gem "carrierwave_backgrounder", "~> 0.4.2"
 gem "colorize"
 gem "devise", "~> 4.9"
 gem "devise-async"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c22ddc7..72c1bc58 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,16 +102,16 @@ GEM
     bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    carrierwave (3.0.5)
-      activemodel (>= 6.0.0)
-      activesupport (>= 6.0.0)
+    carrierwave (2.1.1)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
-      marcel (~> 1.0.0)
+      mimemagic (>= 0.3.0)
+      mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
-    carrierwave_backgrounder (1.0.2)
-      carrierwave (> 2.0, < 4.0)
-      rails (> 6.0, < 8.0)
+    carrierwave_backgrounder (0.4.3)
+      carrierwave (>= 0.5, < 2.2)
     chunky_png (1.4.0)
     colorize (1.1.0)
     concurrent-ruby (1.2.3)
@@ -262,6 +262,9 @@ GEM
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.1205)
+    mimemagic (0.4.3)
+      nokogiri (~> 1)
+      rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
@@ -423,7 +426,7 @@ GEM
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.0)
+    ruby-vips (2.2.1)
       ffi (~> 1.12)
     rubyzip (2.3.2)
     rufus-scheduler (3.9.1)
@@ -527,8 +530,8 @@ DEPENDENCIES
   bootsnap
   bootstrap_form (~> 5.0)
   bullet
-  carrierwave (~> 3.0)
-  carrierwave_backgrounder (~> 1.0.2)
+  carrierwave (~> 2.1)
+  carrierwave_backgrounder (~> 0.4.2)
   colorize
   connection_pool
   cssbundling-rails (~> 1.4)

From 597c859c2dd7d388876e937fb4120334309a4a13 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 18:02:49 +0100
Subject: [PATCH 498/590] Refactor comments into CommentComponent

---
 app/components/comment_component.html.haml | 22 +++++++++++++++++++++
 app/components/comment_component.rb        | 12 +++++++++++
 app/views/answerbox/_comments.html.haml    | 23 +---------------------
 3 files changed, 35 insertions(+), 22 deletions(-)
 create mode 100644 app/components/comment_component.html.haml
 create mode 100644 app/components/comment_component.rb

diff --git a/app/components/comment_component.html.haml b/app/components/comment_component.html.haml
new file mode 100644
index 00000000..c7a1543c
--- /dev/null
+++ b/app/components/comment_component.html.haml
@@ -0,0 +1,22 @@
+%li.comment{ data: { comment_id: @comment.id } }
+  .d-flex
+    .flex-shrink-0
+      %a{ href: user_path(@comment.user), target: :_top }
+        = render AvatarComponent.new(user: @comment.user, size: "sm", classes: ["comment__user-avatar"])
+    .flex-grow-1
+      %h6.comment__user
+        = user_screen_name @comment.user
+        %span.text-muted
+          ·
+          = time_tooltip @comment
+      .comment__content
+        = markdown @comment.content
+    .flex-shrink-0.ms-auto
+      - if current_user&.smiled?(@comment)
+        = render "reactions/destroy", type: "Comment", target: @comment
+      - else
+        = render "reactions/create", type: "Comment", target: @comment
+      .dropdown.d-inline
+        %button.btn.btn-link.answerbox__action{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
+          %i.fa.fa-fw.fa-ellipsis
+        = render "actions/comment", comment: @comment, answer: @answer
diff --git a/app/components/comment_component.rb b/app/components/comment_component.rb
new file mode 100644
index 00000000..1fe41b9a
--- /dev/null
+++ b/app/components/comment_component.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CommentComponent < ApplicationComponent
+  include ApplicationHelper
+  include BootstrapHelper
+  include UserHelper
+
+  def initialize(comment:, answer:)
+    @comment = comment
+    @answer = answer
+  end
+end
diff --git a/app/views/answerbox/_comments.html.haml b/app/views/answerbox/_comments.html.haml
index 04aa7b7f..e7d61654 100644
--- a/app/views/answerbox/_comments.html.haml
+++ b/app/views/answerbox/_comments.html.haml
@@ -3,25 +3,4 @@
 - else
   %ul.comment__container
     - comments.order(:created_at).each do |comment|
-      %li.comment{ data: { comment_id: comment.id } }
-        .d-flex
-          .flex-shrink-0
-            %a{ href: user_path(comment.user) }
-              = render AvatarComponent.new(user: comment.user, size: "sm", classes: ["comment__user-avatar"])
-          .flex-grow-1
-            %h6.comment__user
-              = user_screen_name comment.user
-              %span.text-muted
-                ·
-                = time_tooltip comment
-            .comment__content
-              = markdown comment.content
-          .flex-shrink-0.ms-auto
-            - if current_user&.smiled?(comment)
-              = render "reactions/destroy", type: "Comment", target: comment
-            - else
-              = render "reactions/create", type: "Comment", target: comment
-            .dropdown.d-inline
-              %button.btn.btn-link.answerbox__action{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
-                %i.fa.fa-fw.fa-ellipsis
-              = render "actions/comment", comment: comment, answer: a
+      = render CommentComponent.new(comment:, answer: a)

From 67015aa45258dcbd921738bc4af080d3219183c2 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 18:31:47 +0100
Subject: [PATCH 499/590] Bump version to 2024.0310.0

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index ab4d8b4c..c4a42f1c 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -17,7 +17,7 @@ module Retrospring
 
     def month = 3
 
-    def day = 3
+    def day = 10
 
     def patch = 0
 

From 9d7228d87a0294673f961907810ff637bfef72a6 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 19:12:46 +0100
Subject: [PATCH 500/590] Make inbox entries visible in Rails Admin again

---
 config/initializers/rails_admin.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb
index 1ee364a2..881a087e 100644
--- a/config/initializers/rails_admin.rb
+++ b/config/initializers/rails_admin.rb
@@ -35,7 +35,7 @@ RailsAdmin.config do |config|
     Comment
     List
     ListMember
-    Inbox
+    InboxEntry
     MuteRule
     Notification
     Profile
@@ -59,7 +59,7 @@ RailsAdmin.config do |config|
     "Answer"                => "exclamation",
     "Reaction"              => "smile",
     "Comment"               => "comment",
-    "Inbox"                 => "inbox",
+    "InboxEntry"            => "inbox",
     "List"                  => "list",
     "ListMember"            => "users",
     "MuteRule"              => "volume-mute",
@@ -86,7 +86,7 @@ RailsAdmin.config do |config|
   # set up custom parents for certain models to group them nicely together
   {
     "AnonymousBlock"      => User,
-    "Inbox"               => User,
+    "InboxEntry"          => User,
     "List"                => User,
     "MuteRule"            => User,
     "Notification"        => User,

From bb24124d6a5bebd62cb078a1e3b7992a67e28909 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 19:20:26 +0100
Subject: [PATCH 501/590] Bump version to 2024.0310.1

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index c4a42f1c..113b8a2e 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -19,7 +19,7 @@ module Retrospring
 
     def day = 10
 
-    def patch = 0
+    def patch = 1
 
     def suffix = ""
 

From b7e8187cd4ef1b21d13dafd3364751c1226d7154 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 20:30:21 +0100
Subject: [PATCH 502/590] Add max question content limit of 32,768 characters

---
 app/models/question.rb                    | 1 +
 lib/use_case/question/create.rb           | 1 +
 lib/use_case/question/create_followers.rb | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/app/models/question.rb b/app/models/question.rb
index 2e7549af..6426c640 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -11,6 +11,7 @@ class Question < ApplicationRecord
   validates :content, length: { minimum: 1 }
 
   SHORT_QUESTION_MAX_LENGTH = 512
+  LONG_QUESTION_MAX_LENGTH = 32768
 
   before_destroy do
     rep = Report.where(target_id: self.id, type: "Reports::Question")
diff --git a/lib/use_case/question/create.rb b/lib/use_case/question/create.rb
index 0a9a2db0..2f228816 100644
--- a/lib/use_case/question/create.rb
+++ b/lib/use_case/question/create.rb
@@ -65,6 +65,7 @@ module UseCase
       def check_user
         raise Errors::NotAuthorized if target_user.privacy_require_user && !source_user_id
         raise Errors::QuestionTooLong if content.length > ::Question::SHORT_QUESTION_MAX_LENGTH && !target_user.profile.allow_long_questions
+        raise Errors::QuestionTooLong if content.length > ::Question::LONG_QUESTION_MAX_LENGTH && target_user.profile.allow_long_questions
       end
 
       def create_question
diff --git a/lib/use_case/question/create_followers.rb b/lib/use_case/question/create_followers.rb
index 3f993dc0..1c88a5ff 100644
--- a/lib/use_case/question/create_followers.rb
+++ b/lib/use_case/question/create_followers.rb
@@ -9,6 +9,8 @@ module UseCase
       option :send_to_own_inbox, type: Types::Params::Bool, default: proc { false }
 
       def call
+        check_question
+
         question = ::Question.create!(
           content:,
           author_is_anonymous: false,
@@ -32,6 +34,10 @@ module UseCase
 
       private
 
+      def check_question
+        raise Errors::QuestionTooLong if content.length > ::Question::LONG_QUESTION_MAX_LENGTH
+      end
+
       def increment_asked_count
         source_user.increment(:asked_count)
         source_user.save

From 70f6e581b60340ff42508ff937d6f15979d449bc Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 20:30:47 +0100
Subject: [PATCH 503/590] Add specs to check for upper maximum question length

---
 .../question/create_followers_spec.rb         |  8 +++++++
 spec/lib/use_case/question/create_spec.rb     | 21 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/spec/lib/use_case/question/create_followers_spec.rb b/spec/lib/use_case/question/create_followers_spec.rb
index b5511459..00331cbb 100644
--- a/spec/lib/use_case/question/create_followers_spec.rb
+++ b/spec/lib/use_case/question/create_followers_spec.rb
@@ -36,5 +36,13 @@ describe UseCase::Question::CreateFollowers do
     it "increments the asked count" do
       expect { subject }.to change { source_user.reload.asked_count }.by(1)
     end
+
+    context "content is over 32768 characters long" do
+      let(:content) { "a" * 32769 }
+
+      it "raises an error" do
+        expect { subject }.to raise_error(Errors::QuestionTooLong)
+      end
+    end
   end
 end
diff --git a/spec/lib/use_case/question/create_spec.rb b/spec/lib/use_case/question/create_spec.rb
index a31e9073..a5ee2bd9 100644
--- a/spec/lib/use_case/question/create_spec.rb
+++ b/spec/lib/use_case/question/create_spec.rb
@@ -75,6 +75,27 @@ describe UseCase::Question::Create do
         it_behaves_like "creates the question"
       end
     end
+
+    context "content is over 32768 characters long" do
+      let(:content) { "a" * 32769 }
+
+      context "recipient does not allow long questions" do
+        it "raises an error" do
+          expect { subject }.to raise_error(Errors::QuestionTooLong)
+        end
+      end
+
+      context "recipient allows long questions" do
+        before do
+          target_user.profile.allow_long_questions = true
+          target_user.profile.save
+        end
+
+        it "raises an error" do
+          expect { subject }.to raise_error(Errors::QuestionTooLong)
+        end
+      end
+    end
   end
 
   shared_examples "filters questions" do

From 165fbd800cc637172a9a2514d23b0114d3df0d70 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 20:31:02 +0100
Subject: [PATCH 504/590] Add locale for `question_too_long` error

---
 config/locales/errors.en.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/errors.en.yml b/config/locales/errors.en.yml
index eae9157d..7b260eff 100644
--- a/config/locales/errors.en.yml
+++ b/config/locales/errors.en.yml
@@ -37,3 +37,5 @@ en:
     record_not_found: "Record not found"
 
     not_authorized: "You need to be logged in to perform this action"
+
+    question_too_long: "Question is too long"

From 87458f47c88d928ed138d0caa35504dec136559f Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Sun, 10 Mar 2024 21:27:49 +0100
Subject: [PATCH 505/590] Bump version to 2024.0310.2

---
 lib/retrospring/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index 113b8a2e..4adc90ee 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -19,7 +19,7 @@ module Retrospring
 
     def day = 10
 
-    def patch = 1
+    def patch = 2
 
     def suffix = ""
 

From bdbca06e3c67552a34f8b425873dd82e247e28af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:08:18 +0000
Subject: [PATCH 506/590] Bump binding_of_caller from 1.0.0 to 1.0.1

Bumps [binding_of_caller](https://github.com/banister/binding_of_caller) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/banister/binding_of_caller/releases)
- [Commits](https://github.com/banister/binding_of_caller/compare/v1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: binding_of_caller
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 72c1bc58..e69bc1b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,8 +91,8 @@ GEM
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
     bigdecimal (3.1.5)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
     bootstrap_form (5.3.2)
@@ -126,7 +126,7 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
-    debug_inspector (1.1.0)
+    debug_inspector (1.2.0)
     devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)

From 9e366a971e426ecfc999fb011c32f2f2c644ef4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:09:41 +0000
Subject: [PATCH 507/590] Bump typescript from 5.3.3 to 5.4.2

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.3.3 to 5.4.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.3...v5.4.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b7615ef8..d23908a6 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "sass": "^1.71.1",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5d046a46..69b910bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2665,10 +2665,10 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
-typescript@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
-  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
+typescript@^5.4.2:
+  version "5.4.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372"
+  integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"

From 07be8a5a00497f2b5089243783dde645bd61b3af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:10:02 +0000
Subject: [PATCH 508/590] Bump @melloware/coloris from 0.22.0 to 0.23.0

Bumps [@melloware/coloris](https://github.com/melloware/coloris-npm) from 0.22.0 to 0.23.0.
- [Release notes](https://github.com/melloware/coloris-npm/releases)
- [Commits](https://github.com/melloware/coloris-npm/compare/0.22.0...0.23.0)

---
updated-dependencies:
- dependency-name: "@melloware/coloris"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b7615ef8..87be6415 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@github/hotkey": "^3.1.0",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^8.0.3",
-    "@melloware/coloris": "^0.22.0",
+    "@melloware/coloris": "^0.23.0",
     "@popperjs/core": "^2.11",
     "@rails/request.js": "^0.0.9",
     "bootstrap": "^5.2",
diff --git a/yarn.lock b/yarn.lock
index 5d046a46..8dc6dd9d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -242,10 +242,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
   integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
-"@melloware/coloris@^0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@melloware/coloris/-/coloris-0.22.0.tgz#917fc64a38d951f10dd707996d305fdf166c5fc3"
-  integrity sha512-i06nJM0xQrgOkLFUi8d+8mrJjvFgPrU/nTM9vtRGip/T6yHUFIrNV7QgCyps3dBkKVRP/CeJzAeAIvJBSTSbFQ==
+"@melloware/coloris@^0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@melloware/coloris/-/coloris-0.23.0.tgz#b9f44ed473968e416e4bfb437a8a4b3bc0dffc55"
+  integrity sha512-VGIjI9+IQwg6BHjIE10yl0K2ARYz5bsjn6BgFEs1y1ErPAQymgdoxwVcSVL4Ai5t9OVs8xaCB7JKHqFu2N96Ow==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"

From f5b7db4ef8bbd4d8fc9c91df4c1dd6a8636911c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:56:33 +0000
Subject: [PATCH 509/590] Bump @hotwired/turbo-rails from 8.0.3 to 8.0.4

Bumps [@hotwired/turbo-rails](https://github.com/hotwired/turbo-rails) from 8.0.3 to 8.0.4.
- [Release notes](https://github.com/hotwired/turbo-rails/releases)
- [Commits](https://github.com/hotwired/turbo-rails/commits)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo-rails"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 87be6415..c6b47e9a 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "@fortawesome/fontawesome-free": "^6.5.1",
     "@github/hotkey": "^3.1.0",
     "@hotwired/stimulus": "^3.2.2",
-    "@hotwired/turbo-rails": "^8.0.3",
+    "@hotwired/turbo-rails": "^8.0.4",
     "@melloware/coloris": "^0.23.0",
     "@popperjs/core": "^2.11",
     "@rails/request.js": "^0.0.9",
diff --git a/yarn.lock b/yarn.lock
index 8dc6dd9d..0a71572f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -210,18 +210,18 @@
   resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608"
   integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A==
 
-"@hotwired/turbo-rails@^8.0.3":
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.3.tgz#e60375f4eea4b30ec0cd6d7e3fdb3d6349a2b57b"
-  integrity sha512-n5B9HdFsNiGJfXFAriCArmvFZyznIh/OriB5ZVAWz4Fsi4oLkpgmJNw5pibBAM7NMQQGN6cfKa/nhZT4LWcqbQ==
+"@hotwired/turbo-rails@^8.0.4":
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.4.tgz#d224f524a9e33fe687cec5d706054eb6fe13fa5b"
+  integrity sha512-GHCv5+B2VzYZZvMFpg/g9JLx/8pl/8chcubSB7T+Xn1zYOMqAKB6cT80vvWUzxdwfm/2KfaRysfDz+BmvtjFaw==
   dependencies:
-    "@hotwired/turbo" "^8.0.3"
+    "@hotwired/turbo" "^8.0.4"
     "@rails/actioncable" "^7.0"
 
-"@hotwired/turbo@^8.0.3":
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.3.tgz#338e07278f4b3c76921328d3c92dbc4831c209d0"
-  integrity sha512-qLgp7d6JaegKjMToTJahosrFxV3odfSbiekispQ3soOzE5jnU+iEMWlRvYRe/jvy5Q+JWoywtf9j3RD4ikVjIg==
+"@hotwired/turbo@^8.0.4":
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.4.tgz#5c5361c06a37cdf10dcba4223f1afd0ca1c75091"
+  integrity sha512-mlZEFUZrJnpfj+g/XeCWWuokvQyN68WvM78JM+0jfSFc98wegm259vCbC1zSllcspRwbgXK31ibehCy5PA78/Q==
 
 "@humanwhocodes/config-array@^0.11.14":
   version "0.11.14"

From 2e2dae889a30117d7b305ff1f2792f592d4fb182 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:05:02 +0000
Subject: [PATCH 510/590] Bump rails-i18n from 7.0.8 to 7.0.9

Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 7.0.8 to 7.0.9.
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/compare/v7.0.8...v7.0.9)

---
updated-dependencies:
- dependency-name: rails-i18n
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e69bc1b6..e7cdbc57 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -214,7 +214,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n-js (4.0.0)
       glob
@@ -268,7 +268,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -287,7 +287,7 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.2)
+    nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)
@@ -338,7 +338,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_admin (3.1.2)

From 88ea7e6317565645228ff9ae8188639e33cf7615 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:09:52 +0000
Subject: [PATCH 511/590] Bump sentry-ruby, sentry-rails and sentry-sidekiq

Bumps [sentry-ruby](https://github.com/getsentry/sentry-ruby), [sentry-rails](https://github.com/getsentry/sentry-ruby) and [sentry-sidekiq](https://github.com/getsentry/sentry-ruby). These dependencies needed to be updated together.

Updates `sentry-ruby` from 5.16.1 to 5.17.1
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.16.1...5.17.1)

Updates `sentry-rails` from 5.16.1 to 5.17.1
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.16.1...5.17.1)

Updates `sentry-sidekiq` from 5.16.1 to 5.17.1
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.16.1...5.17.1)

---
updated-dependencies:
- dependency-name: sentry-ruby
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: sentry-sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e69bc1b6..824467ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -214,7 +214,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n-js (4.0.0)
       glob
@@ -268,7 +268,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -287,7 +287,7 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.2)
+    nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)
@@ -442,13 +442,14 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-rails (5.16.1)
+    sentry-rails (5.17.1)
       railties (>= 5.0)
-      sentry-ruby (~> 5.16.1)
-    sentry-ruby (5.16.1)
+      sentry-ruby (~> 5.17.1)
+    sentry-ruby (5.17.1)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.16.1)
-      sentry-ruby (~> 5.16.1)
+    sentry-sidekiq (5.17.1)
+      sentry-ruby (~> 5.17.1)
       sidekiq (>= 3.0)
     shoulda-matchers (6.1.0)
       activesupport (>= 5.2.0)

From 262fd8d2755efc2e2921459f95a24de71ed0bec3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:12:29 +0000
Subject: [PATCH 512/590] Bump fog-aws from 3.21.0 to 3.21.1

Bumps [fog-aws](https://github.com/fog/fog-aws) from 3.21.0 to 3.21.1.
- [Changelog](https://github.com/fog/fog-aws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fog/fog-aws/compare/v3.21.0...v3.21.1)

---
updated-dependencies:
- dependency-name: fog-aws
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e69bc1b6..11729e71 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,7 +163,7 @@ GEM
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
-    excon (0.109.0)
+    excon (0.110.0)
     factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
@@ -175,7 +175,7 @@ GEM
     faker (3.2.3)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
-    fog-aws (3.21.0)
+    fog-aws (3.21.1)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -261,7 +261,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1205)
+    mime-types-data (3.2024.0305)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
@@ -287,7 +287,7 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.2)
+    nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)

From 3a59eeb9f78469fddfcf6abd0f609339e59c82b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:19:04 +0000
Subject: [PATCH 513/590] Bump rubocop from 1.62.0 to 1.62.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.62.0 to 1.62.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.62.0...v1.62.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e69bc1b6..c3118cde 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -407,7 +407,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.0)
-    rubocop (1.62.0)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From e32c05be19ff82a6c9a9254d149cce0c2cbc28a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:20:05 +0000
Subject: [PATCH 514/590] Bump json-schema from 4.1.1 to 4.2.0

Bumps [json-schema](https://github.com/voxpupuli/json-schema) from 4.1.1 to 4.2.0.
- [Changelog](https://github.com/voxpupuli/json-schema/blob/master/CHANGELOG.md)
- [Commits](https://github.com/voxpupuli/json-schema/compare/v4.1.1...v4.2.0)

---
updated-dependencies:
- dependency-name: json-schema
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e69bc1b6..04b28847 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -226,7 +226,7 @@ GEM
     jsbundling-rails (1.3.0)
       railties (>= 6.0.0)
     json (2.7.1)
-    json-schema (4.1.1)
+    json-schema (4.2.0)
       addressable (>= 2.8)
     jwt (2.8.1)
       base64

From 57176b0797dfec2947b88b092145a82a3ca96a80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:20:47 +0000
Subject: [PATCH 515/590] Bump tj-actions/changed-files from 42 to 43

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 42 to 43.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/changed-files/compare/v42...v43)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9b5fe236..fe32fb22 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v43
         with:
           files: "**/*.rb"
       - name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v43
         with:
           files: "**/*.ts"
       - name: Set up Node 16
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v43
         with:
           files: "**/*.haml"
       - name: Install dependencies
@@ -89,7 +89,7 @@ jobs:
       - uses: actions/checkout@v4.1.1
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v43
         with:
           files: "**/*.scss"
       - name: Set up Node 16

From 36b9750f514fdaab41d93ac4e958dfb6e1dba1fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:51:23 +0000
Subject: [PATCH 516/590] Bump sass from 1.71.1 to 1.72.0

Bumps [sass](https://github.com/sass/dart-sass) from 1.71.1 to 1.72.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.71.1...1.72.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ed2f12c0..fc906c8c 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.71.1",
+    "sass": "^1.72.0",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.4.2"
diff --git a/yarn.lock b/yarn.lock
index 2a97ec84..be93779c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2262,10 +2262,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.71.1:
-  version "1.71.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.1.tgz#dfb09c63ce63f89353777bbd4a88c0a38386ee54"
-  integrity sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==
+sass@^1.72.0:
+  version "1.72.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.72.0.tgz#5b9978943fcfb32b25a6a5acb102fc9dabbbf41c"
+  integrity sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From cdccc089880a88c8b10b2fb094de63541673921b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:12:22 +0000
Subject: [PATCH 517/590] Bump shoulda-matchers from 6.1.0 to 6.2.0

Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases)
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v6.1.0...v6.2.0)

---
updated-dependencies:
- dependency-name: shoulda-matchers
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5fbc85b3..bf1e00f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,7 +96,7 @@ group :development, :test do
   gem "rspec-sidekiq", "~> 4.1", require: false
   gem "rubocop", "~> 1.62"
   gem "rubocop-rails", "~> 2.24"
-  gem "shoulda-matchers", "~> 6.1"
+  gem "shoulda-matchers", "~> 6.2"
   gem "simplecov", require: false
   gem "simplecov-cobertura", require: false
   gem "simplecov-json", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index e3930c4f..c5596a7d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -451,7 +451,7 @@ GEM
     sentry-sidekiq (5.17.1)
       sentry-ruby (~> 5.17.1)
       sidekiq (>= 3.0)
-    shoulda-matchers (6.1.0)
+    shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)
     sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)
@@ -594,7 +594,7 @@ DEPENDENCIES
   sentry-rails
   sentry-ruby
   sentry-sidekiq
-  shoulda-matchers (~> 6.1)
+  shoulda-matchers (~> 6.2)
   sidekiq (< 7)
   sidekiq-scheduler
   simplecov

From 8d5a46b0e64746b41cdf1961dec21fe66a09aa15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:14:59 +0000
Subject: [PATCH 518/590] Bump actions/checkout from 4.1.1 to 4.1.2

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.1...v4.1.2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml     | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/lint.yml            | 8 ++++----
 .github/workflows/retrospring.yml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 9d1f180e..ffb225b1 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -20,7 +20,7 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.2
 
       - name: Discover build-time variables
         run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 87e0af14..2cd9ba23 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4.1.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index fe32fb22..42ada9d5 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.2
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v43
@@ -37,7 +37,7 @@ jobs:
     name: ESLint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.2
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v43
@@ -63,7 +63,7 @@ jobs:
   haml-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.2
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v43
@@ -86,7 +86,7 @@ jobs:
   stylelint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.2
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v43
diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index 9e217ea3..3bee6638 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -41,7 +41,7 @@ jobs:
       BUNDLE_WITHOUT: 'production'
 
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.2
       - name: Install dependencies
         run: sudo apt update && sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev libmagickwand-dev imagemagick libidn11-dev
       - name: Set up Ruby

From 536d50f53d7357e22dfb6ab8f3105872455e300e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 19 Mar 2024 22:03:28 +0100
Subject: [PATCH 519/590] Add uniqueness validation to Reactions

---
 app/models/reaction.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/reaction.rb b/app/models/reaction.rb
index 17bfb8c8..4a40e325 100644
--- a/app/models/reaction.rb
+++ b/app/models/reaction.rb
@@ -4,6 +4,8 @@ class Reaction < ApplicationRecord
   belongs_to :parent, polymorphic: true
   belongs_to :user
 
+  validates_uniqueness_of :parent_id, :scope => :user_id
+
   # rubocop:disable Rails/SkipsModelValidations
   after_create do
     Notification.notify parent.user, self unless parent.user == user

From 997953565f4ba5863c270f16d948b184e15275f7 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 19 Mar 2024 22:04:06 +0100
Subject: [PATCH 520/590] Localize uniqueness validation message

Otherwise it'd say "Parent already taken" instead of "Target already smiled"
---
 config/locales/activerecord.en.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index d7a879ae..30bb48f4 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -54,6 +54,8 @@ en:
         success_text: "Success text colour"
         warning_color: "Warning colour"
         warning_text: "Warning text colour"
+      reaction:
+        parent_id: "Target"
       user:
         created_at: "Account created at"
         current_password: "Current password"
@@ -107,6 +109,11 @@ en:
     errors:
       messages:
         invalid_url: "does not look like a valid URL"
+      models:
+        reaction:
+          attributes:
+            parent_id:
+              taken: "already smiled"
   helpers:
     submit:
       user:

From b4cfc95c835af8000bf0f90c414e58f26e3a14bc Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 19 Mar 2024 22:05:45 +0100
Subject: [PATCH 521/590] Adjust accessors to pull values from attributes if
 they exist

This has to be done because using multiple queries in a select statement does not automatically map into an ActiveRecord model and the values we want wait in the `self.attributes` hash.
---
 app/models/answer.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 5abd6d5a..750009cf 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -71,4 +71,8 @@ class Answer < ApplicationRecord
   def long? = content.length > SHORT_ANSWER_MAX_LENGTH
 
   def pinned? = pinned_at.present?
+
+  def has_reacted = self.attributes["has_reacted"] || false
+
+  def is_subscribed = self.attributes["is_subscribed"] || false
 end

From cc7fa787e8b12822fe4de6128731f47e863c040d Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 19 Mar 2024 22:06:57 +0100
Subject: [PATCH 522/590] Pass IDs to Reaction usecases instead of user
 instances

For some wild reason this locally sometimes causes coercion errors in the user instance check, restarting fixes it (temporarily?) so letting the UseCase resolve users is a cleaner solution here.
---
 app/controllers/reactions_controller.rb | 4 ++--
 lib/use_case/reaction/create.rb         | 8 +++++++-
 lib/use_case/reaction/destroy.rb        | 8 +++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/controllers/reactions_controller.rb b/app/controllers/reactions_controller.rb
index 215adf27..b1914e46 100644
--- a/app/controllers/reactions_controller.rb
+++ b/app/controllers/reactions_controller.rb
@@ -19,7 +19,7 @@ class ReactionsController < ApplicationController
     target = target_class.find(params[:id])
 
     UseCase::Reaction::Create.call(
-      source_user: current_user,
+      source_user_id: current_user.id,
       target:,
     )
 
@@ -43,7 +43,7 @@ class ReactionsController < ApplicationController
     target = target_class.find(params[:id])
 
     UseCase::Reaction::Destroy.call(
-      source_user: current_user,
+      source_user_id: current_user.id,
       target:,
     )
 
diff --git a/lib/use_case/reaction/create.rb b/lib/use_case/reaction/create.rb
index a126bba3..1939f9d6 100644
--- a/lib/use_case/reaction/create.rb
+++ b/lib/use_case/reaction/create.rb
@@ -3,7 +3,7 @@
 module UseCase
   module Reaction
     class Create < UseCase::Base
-      option :source_user, type: Types.Instance(::User)
+      option :source_user_id, type: Types::Coercible::Integer
       option :target, type: Types.Instance(::Answer) | Types.Instance(::Comment)
       option :content, type: Types::Coercible::String, optional: true
 
@@ -15,6 +15,12 @@ module UseCase
           resource: reaction,
         }
       end
+
+      private
+
+      def source_user
+        @source_user ||= ::User.find(source_user_id)
+      end
     end
   end
 end
diff --git a/lib/use_case/reaction/destroy.rb b/lib/use_case/reaction/destroy.rb
index 52fe3b7a..8d77219a 100644
--- a/lib/use_case/reaction/destroy.rb
+++ b/lib/use_case/reaction/destroy.rb
@@ -3,7 +3,7 @@
 module UseCase
   module Reaction
     class Destroy < UseCase::Base
-      option :source_user, type: Types.Instance(::User)
+      option :source_user_id, type: Types::Coercible::Integer
       option :target, type: Types.Instance(::Answer) | Types.Instance(::Comment)
 
       def call
@@ -14,6 +14,12 @@ module UseCase
           resource: nil,
         }
       end
+
+      private
+
+      def source_user
+        @source_user ||= ::User.find(source_user_id)
+      end
     end
   end
 end

From b2185987aca548d085fb873c84e49699af549a2e Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 19 Mar 2024 22:07:13 +0100
Subject: [PATCH 523/590] Adjust Reaction usecase specs to also use IDs

---
 spec/lib/use_case/reaction/create_spec.rb  | 2 +-
 spec/lib/use_case/reaction/destroy_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/lib/use_case/reaction/create_spec.rb b/spec/lib/use_case/reaction/create_spec.rb
index 243b227a..d33b258f 100644
--- a/spec/lib/use_case/reaction/create_spec.rb
+++ b/spec/lib/use_case/reaction/create_spec.rb
@@ -9,7 +9,7 @@ describe UseCase::Reaction::Create do
     end
   end
 
-  subject { UseCase::Reaction::Create.call(source_user: user, target:) }
+  subject { UseCase::Reaction::Create.call(source_user_id: user.id, target:) }
 
   let(:user) { FactoryBot.create(:user) }
 
diff --git a/spec/lib/use_case/reaction/destroy_spec.rb b/spec/lib/use_case/reaction/destroy_spec.rb
index f979db66..160b53b5 100644
--- a/spec/lib/use_case/reaction/destroy_spec.rb
+++ b/spec/lib/use_case/reaction/destroy_spec.rb
@@ -13,7 +13,7 @@ describe UseCase::Reaction::Destroy do
     end
   end
 
-  subject { UseCase::Reaction::Destroy.call(source_user: user, target:) }
+  subject { UseCase::Reaction::Destroy.call(source_user_id: user.id, target:) }
 
   let(:user) { FactoryBot.create(:user) }
 

From a4a2aba13df90b86e500069bbf9581fb5e04e3a8 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 19 Mar 2024 22:18:38 +0100
Subject: [PATCH 524/590] Remove old attribute accessors from Answer

---
 app/models/answer.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 750009cf..edc452cc 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -1,8 +1,6 @@
 class Answer < ApplicationRecord
   extend Answer::TimelineMethods
 
-  attr_accessor :has_reacted, :is_subscribed
-
   belongs_to :user, counter_cache: :answered_count
   belongs_to :question, counter_cache: :answer_count
   has_many :comments, dependent: :destroy

From 25cbb962ddb185126b1bba3baa3427ca12c3ed84 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 19 Mar 2024 22:18:56 +0100
Subject: [PATCH 525/590] Use newer validation syntax for uniqueness in
 Reaction

---
 app/models/reaction.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/reaction.rb b/app/models/reaction.rb
index 4a40e325..e1b54ce3 100644
--- a/app/models/reaction.rb
+++ b/app/models/reaction.rb
@@ -4,7 +4,7 @@ class Reaction < ApplicationRecord
   belongs_to :parent, polymorphic: true
   belongs_to :user
 
-  validates_uniqueness_of :parent_id, :scope => :user_id
+  validates :parent_id, uniqueness: { scope: :user_id }
 
   # rubocop:disable Rails/SkipsModelValidations
   after_create do

From b160fa21f6c500843ee99ff41926fd4f24467aa8 Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 19 Mar 2024 22:26:01 +0100
Subject: [PATCH 526/590] Re-add accessors for singular answer cases

Otherwise rendering fails
---
 app/models/answer.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index edc452cc..750009cf 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -1,6 +1,8 @@
 class Answer < ApplicationRecord
   extend Answer::TimelineMethods
 
+  attr_accessor :has_reacted, :is_subscribed
+
   belongs_to :user, counter_cache: :answered_count
   belongs_to :question, counter_cache: :answer_count
   has_many :comments, dependent: :destroy

From bbc717a4317f78631c7e22ba4291ea5db13b3bed Mon Sep 17 00:00:00 2001
From: Andreas Nedbal <git@pixelde.su>
Date: Tue, 19 Mar 2024 22:50:24 +0100
Subject: [PATCH 527/590] Bump version to 2024.0319.0

---
 lib/retrospring/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/retrospring/version.rb b/lib/retrospring/version.rb
index 4adc90ee..a104f1e7 100644
--- a/lib/retrospring/version.rb
+++ b/lib/retrospring/version.rb
@@ -17,9 +17,9 @@ module Retrospring
 
     def month = 3
 
-    def day = 10
+    def day = 19
 
-    def patch = 2
+    def patch = 0
 
     def suffix = ""
 

From e9684a4a6fbb859ffd2546d6bde8c996209eaf12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 09:13:47 +0000
Subject: [PATCH 528/590] Bump typescript from 5.4.2 to 5.4.3

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.2...v5.4.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fc906c8c..8b0716b2 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "sass": "^1.72.0",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.3"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index be93779c..e51ea9a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2665,10 +2665,10 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
-typescript@^5.4.2:
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372"
-  integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==
+typescript@^5.4.3:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff"
+  integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"

From 32fd0df9ba454bdeeaa8fbb8557642a08399634b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 09:39:24 +0000
Subject: [PATCH 529/590] Bump rubocop-rails from 2.24.0 to 2.24.1

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.24.0 to 2.24.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.24.0...v2.24.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a00d782..5ec74304 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,7 +310,7 @@ GEM
     questiongenerator (1.1.0)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8.1)
+    rack (2.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)
@@ -420,7 +420,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.2)
       parser (>= 3.3.0.4)
-    rubocop-rails (2.24.0)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

From 4fe799c4ed2c383df7b8dd132bc905049d1ca815 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 09:40:07 +0000
Subject: [PATCH 530/590] Bump rspec-rails from 6.1.1 to 6.1.2

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.1 to 6.1.2.
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.1...v6.1.2)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a00d782..ac6c363e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,7 +310,7 @@ GEM
     questiongenerator (1.1.0)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.8.1)
+    rack (2.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)
@@ -393,20 +393,20 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.1)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-sidekiq (4.1.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
-    rspec-support (3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)

From b594c0d3714ced183d6ab1af337b85f1a9516f8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 09:41:27 +0000
Subject: [PATCH 531/590] Bump fog-aws from 3.21.1 to 3.22.0

Bumps [fog-aws](https://github.com/fog/fog-aws) from 3.21.1 to 3.22.0.
- [Changelog](https://github.com/fog/fog-aws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fog/fog-aws/compare/v3.21.1...v3.22.0)

---
updated-dependencies:
- dependency-name: fog-aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a00d782..47399965 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -175,7 +175,7 @@ GEM
     faker (3.2.3)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
-    fog-aws (3.21.1)
+    fog-aws (3.22.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)

From b58b08a5e37ff120a3a229bbd4368b911f50e956 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 09:18:38 +0000
Subject: [PATCH 532/590] Bump tj-actions/changed-files from 43 to 44

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 43 to 44.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/changed-files/compare/v43...v44)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 42ada9d5..8f2c1c6f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4.1.2
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v44
         with:
           files: "**/*.rb"
       - name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4.1.2
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v44
         with:
           files: "**/*.ts"
       - name: Set up Node 16
@@ -66,7 +66,7 @@ jobs:
       - uses: actions/checkout@v4.1.2
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v44
         with:
           files: "**/*.haml"
       - name: Install dependencies
@@ -89,7 +89,7 @@ jobs:
       - uses: actions/checkout@v4.1.2
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v44
         with:
           files: "**/*.scss"
       - name: Set up Node 16

From 0ec0323036040c5092747c5aaa97f41ed2a59288 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 09:33:59 +0000
Subject: [PATCH 533/590] Bump net-smtp from 0.4.0.1 to 0.5.0

Bumps [net-smtp](https://github.com/ruby/net-smtp) from 0.4.0.1 to 0.5.0.
- [Release notes](https://github.com/ruby/net-smtp/releases)
- [Changelog](https://github.com/ruby/net-smtp/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/net-smtp/compare/v0.4.0.1...v0.5.0)

---
updated-dependencies:
- dependency-name: net-smtp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a00d782..02278877 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -284,7 +284,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.0)
     nokogiri (1.16.3)

From 194d5c26a2d2a106ccd3638b4fff4a5213d7a192 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 09:34:42 +0000
Subject: [PATCH 534/590] Bump letter_opener from 1.9.0 to 1.10.0

Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.9.0 to 1.10.0.
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.9.0...v1.10.0)

---
updated-dependencies:
- dependency-name: letter_opener
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a00d782..8e7a6deb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -112,6 +112,7 @@ GEM
       ssrf_filter (~> 1.0)
     carrierwave_backgrounder (0.4.3)
       carrierwave (>= 0.5, < 2.2)
+    childprocess (5.0.0)
     chunky_png (1.4.0)
     colorize (1.1.0)
     concurrent-ruby (1.2.3)
@@ -243,10 +244,11 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
+    launchy (3.0.0)
       addressable (~> 2.8)
-    letter_opener (1.9.0)
-      launchy (>= 2.2, < 3)
+      childprocess (~> 5.0)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)

From ff6bc4290f92913fc686b312a4f9a15ee5bf1643 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 09:34:58 +0000
Subject: [PATCH 535/590] Bump json-schema from 4.2.0 to 4.3.0

Bumps [json-schema](https://github.com/voxpupuli/json-schema) from 4.2.0 to 4.3.0.
- [Changelog](https://github.com/voxpupuli/json-schema/blob/master/CHANGELOG.md)
- [Commits](https://github.com/voxpupuli/json-schema/compare/v4.2.0...v4.3.0)

---
updated-dependencies:
- dependency-name: json-schema
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2a00d782..c1f5d993 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -226,7 +226,7 @@ GEM
     jsbundling-rails (1.3.0)
       railties (>= 6.0.0)
     json (2.7.1)
-    json-schema (4.2.0)
+    json-schema (4.3.0)
       addressable (>= 2.8)
     jwt (2.8.1)
       base64

From b0449128f43a5633dab8de4f981394f965aa6657 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:49:48 +0000
Subject: [PATCH 536/590] Bump faker from 3.2.3 to 3.3.0

Bumps [faker](https://github.com/faker-ruby/faker) from 3.2.3 to 3.3.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v3.2.3...v3.3.0)

---
updated-dependencies:
- dependency-name: faker
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0f08279e..a5dabd90 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
     fake_email_validator (1.0.11)
       activemodel
       mail
-    faker (3.2.3)
+    faker (3.3.0)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
     fog-aws (3.22.0)

From ae4ca2a04d5e47216e0da173e3116d977880440e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 09:19:00 +0000
Subject: [PATCH 537/590] Bump faker from 3.3.0 to 3.3.1

Bumps [faker](https://github.com/faker-ruby/faker) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v3.3.0...v3.3.1)

---
updated-dependencies:
- dependency-name: faker
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a5dabd90..7d8114fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
     fake_email_validator (1.0.11)
       activemodel
       mail
-    faker (3.3.0)
+    faker (3.3.1)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
     fog-aws (3.22.0)

From 034df887ba16d4a8c1b57502e7615a6986e9418e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 09:52:46 +0000
Subject: [PATCH 538/590] Bump @fortawesome/fontawesome-free from 6.5.1 to
 6.5.2

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.5.1 to 6.5.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.5.1...6.5.2)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8b0716b2..59061f4b 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@fontsource/lexend": "^4.5.15",
-    "@fortawesome/fontawesome-free": "^6.5.1",
+    "@fortawesome/fontawesome-free": "^6.5.2",
     "@github/hotkey": "^3.1.0",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^8.0.4",
diff --git a/yarn.lock b/yarn.lock
index e51ea9a7..caa8223d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -195,10 +195,10 @@
   resolved "https://registry.yarnpkg.com/@fontsource/lexend/-/lexend-4.5.15.tgz#ee033b850224d05b665d6661bf8d32c950f166bb"
   integrity sha512-6edLmDmte8pJWtQ1NIahcJq0iWlf6b0/JLwkd7WbDQ3C5tZWnxjvbP4RSklMv4MPzGjpuYuYnc+QANbjUws1oA==
 
-"@fortawesome/fontawesome-free@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258"
-  integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==
+"@fortawesome/fontawesome-free@^6.5.2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz#310fe90cb5a8dee9698833171b98e7835404293d"
+  integrity sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==
 
 "@github/hotkey@^3.1.0":
   version "3.1.0"

From fc79dec378d3b1bc48de6d82b9aad21f47e5236f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:12:54 +0000
Subject: [PATCH 539/590] Bump devise from 4.9.3 to 4.9.4

Bumps [devise](https://github.com/heartcombo/devise) from 4.9.3 to 4.9.4.
- [Release notes](https://github.com/heartcombo/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/devise/compare/v4.9.3...v4.9.4)

---
updated-dependencies:
- dependency-name: devise
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a5dabd90..59a393ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -128,7 +128,7 @@ GEM
     database_cleaner-core (2.0.1)
     date (3.3.4)
     debug_inspector (1.2.0)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -269,7 +269,7 @@ GEM
       rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -289,7 +289,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.3)
+    nokogiri (1.16.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)

From 7b27343f145378754b1b94cecb6655af55c66f11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:13:20 +0000
Subject: [PATCH 540/590] Bump sentry-ruby from 5.17.1 to 5.17.3

Bumps [sentry-ruby](https://github.com/getsentry/sentry-ruby) from 5.17.1 to 5.17.3.
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.17.1...5.17.3)

---
updated-dependencies:
- dependency-name: sentry-ruby
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a5dabd90..08b8d640 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,7 +90,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.5)
+    bigdecimal (3.1.7)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
     bootsnap (1.18.3)
@@ -447,7 +447,7 @@ GEM
     sentry-rails (5.17.1)
       railties (>= 5.0)
       sentry-ruby (~> 5.17.1)
-    sentry-ruby (5.17.1)
+    sentry-ruby (5.17.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     sentry-sidekiq (5.17.1)

From 3f5a0ba52b914d7a70c4d85206627fd018fe776c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:33:42 +0000
Subject: [PATCH 541/590] Bump actions/labeler from 5.0.0.pre.beta.1 to 5

Bumps [actions/labeler](https://github.com/actions/labeler) from 5.0.0.pre.beta.1 to 5.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v5.0.0-beta.1...v5)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 50b7f536..2dc354dd 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -10,4 +10,4 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v5.0.0-beta.1
+    - uses: actions/labeler@v5

From 07034b37d90d91e5e12f705cdefe91ea0c4c7a7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:40:43 +0000
Subject: [PATCH 542/590] Bump typescript from 5.4.3 to 5.4.5

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.3 to 5.4.5.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.3...v5.4.5)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8b0716b2..03d2903d 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "sass": "^1.72.0",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.5"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index e51ea9a7..452829fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2665,10 +2665,10 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
-typescript@^5.4.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff"
-  integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==
+typescript@^5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"

From 4dd2345d4e7d17bfb0d24188ec4cc5c1957b3b2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:41:30 +0000
Subject: [PATCH 543/590] Bump @melloware/coloris from 0.23.0 to 0.24.0

Bumps [@melloware/coloris](https://github.com/melloware/coloris-npm) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/melloware/coloris-npm/releases)
- [Commits](https://github.com/melloware/coloris-npm/compare/0.23.0...0.24.0)

---
updated-dependencies:
- dependency-name: "@melloware/coloris"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8b0716b2..8a81a074 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@github/hotkey": "^3.1.0",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^8.0.4",
-    "@melloware/coloris": "^0.23.0",
+    "@melloware/coloris": "^0.24.0",
     "@popperjs/core": "^2.11",
     "@rails/request.js": "^0.0.9",
     "bootstrap": "^5.2",
diff --git a/yarn.lock b/yarn.lock
index e51ea9a7..3d0c6755 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -242,10 +242,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
   integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
-"@melloware/coloris@^0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@melloware/coloris/-/coloris-0.23.0.tgz#b9f44ed473968e416e4bfb437a8a4b3bc0dffc55"
-  integrity sha512-VGIjI9+IQwg6BHjIE10yl0K2ARYz5bsjn6BgFEs1y1ErPAQymgdoxwVcSVL4Ai5t9OVs8xaCB7JKHqFu2N96Ow==
+"@melloware/coloris@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@melloware/coloris/-/coloris-0.24.0.tgz#7714825cf421fdec50086152dec702c0a0d68a85"
+  integrity sha512-9RGKHqZJsUSsxb/0xaBCK5OKywobiK/xRtV8f4KQDmviqmVfkMLR3kK4DRuTTLSFdSOqkV0OQ/Niitu+rlXXYw==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"

From 7584c12e8cba3ba3198d49e80d58d4669bb377fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 09:45:07 +0000
Subject: [PATCH 544/590] Bump active_model_otp from 2.3.2 to 2.3.4

Bumps [active_model_otp](https://github.com/heapsource/active_model_otp) from 2.3.2 to 2.3.4.
- [Release notes](https://github.com/heapsource/active_model_otp/releases)
- [Commits](https://github.com/heapsource/active_model_otp/compare/v2.3.2...v2.3.4)

---
updated-dependencies:
- dependency-name: active_model_otp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a5dabd90..a6575def 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,9 +54,9 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_model_otp (2.3.2)
+    active_model_otp (2.3.4)
       activemodel
-      rotp (~> 6.2.0)
+      rotp (~> 6.3.0)
     activejob (7.0.8)
       activesupport (= 7.0.8)
       globalid (>= 0.3.6)
@@ -368,7 +368,7 @@ GEM
       railties (>= 5.2)
     rexml (3.2.6)
     rolify (6.0.1)
-    rotp (6.2.2)
+    rotp (6.3.0)
     rouge (4.1.3)
     rpush (7.0.1)
       activesupport (>= 5.2)

From ca9f1e422dbbad0fa6842ad87c066de87e5ef8bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 09:45:56 +0000
Subject: [PATCH 545/590] Bump view_component from 3.11.0 to 3.12.1

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a5dabd90..c37ac28b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -260,7 +260,7 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0305)
@@ -505,7 +505,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
-    view_component (3.11.0)
+    view_component (3.12.1)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

From 9a1d207485f041ed2dc7c3567722615d0d496011 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 09:46:19 +0000
Subject: [PATCH 546/590] Bump rubocop from 1.62.1 to 1.63.2

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.62.1 to 1.63.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.62.1...v1.63.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index bf1e00f1..1e7aa929 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ group :development, :test do
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 4.1", require: false
-  gem "rubocop", "~> 1.62"
+  gem "rubocop", "~> 1.63"
   gem "rubocop-rails", "~> 2.24"
   gem "shoulda-matchers", "~> 6.2"
   gem "simplecov", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index a5dabd90..635704a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -226,7 +226,7 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     jsbundling-rails (1.3.0)
       railties (>= 6.0.0)
-    json (2.7.1)
+    json (2.7.2)
     json-schema (4.3.0)
       addressable (>= 2.8)
     jwt (2.8.1)
@@ -409,7 +409,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.62.1)
+    rubocop (1.63.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -588,7 +588,7 @@ DEPENDENCIES
   rspec-mocks
   rspec-rails (~> 6.1)
   rspec-sidekiq (~> 4.1)
-  rubocop (~> 1.62)
+  rubocop (~> 1.63)
   rubocop-rails (~> 2.24)
   rubyzip (~> 2.3)
   sanitize

From bc471673610ce691b20771c272b3c6371e4bd2b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 09:57:38 +0000
Subject: [PATCH 547/590] Bump actions/checkout from 4.1.2 to 4.1.3

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.2...v4.1.3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml     | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/lint.yml            | 8 ++++----
 .github/workflows/retrospring.yml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index ffb225b1..48ae523a 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -20,7 +20,7 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v4.1.2
+      - uses: actions/checkout@v4.1.3
 
       - name: Discover build-time variables
         run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2cd9ba23..63704bf8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.2
+      uses: actions/checkout@v4.1.3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8f2c1c6f..964df53d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.2
+      - uses: actions/checkout@v4.1.3
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -37,7 +37,7 @@ jobs:
     name: ESLint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.2
+      - uses: actions/checkout@v4.1.3
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -63,7 +63,7 @@ jobs:
   haml-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.2
+      - uses: actions/checkout@v4.1.3
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -86,7 +86,7 @@ jobs:
   stylelint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.2
+      - uses: actions/checkout@v4.1.3
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index 3bee6638..d089cb7c 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -41,7 +41,7 @@ jobs:
       BUNDLE_WITHOUT: 'production'
 
     steps:
-      - uses: actions/checkout@v4.1.2
+      - uses: actions/checkout@v4.1.3
       - name: Install dependencies
         run: sudo apt update && sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev libmagickwand-dev imagemagick libidn11-dev
       - name: Set up Ruby

From d7aa1116f7dab93cb53e677da5a88365f81d6d89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:04:20 +0000
Subject: [PATCH 548/590] Bump rake from 13.1.0 to 13.2.1

Bumps [rake](https://github.com/ruby/rake) from 13.1.0 to 13.2.1.
- [Release notes](https://github.com/ruby/rake/releases)
- [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rake/compare/v13.1.0...v13.2.1)

---
updated-dependencies:
- dependency-name: rake
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5be195af..e18eaf27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -357,7 +357,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     redcarpet (3.6.0)
     redis (4.8.1)
     regexp_parser (2.9.0)

From 1a74d37e621b94e0045fdb3f0f3f0e2035690870 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:05:49 +0000
Subject: [PATCH 549/590] Bump rspec-sidekiq from 4.1.0 to 4.2.0

Bumps [rspec-sidekiq](https://github.com/wspurgin/rspec-sidekiq) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/wspurgin/rspec-sidekiq/releases)
- [Changelog](https://github.com/wspurgin/rspec-sidekiq/blob/main/CHANGES.md)
- [Commits](https://github.com/wspurgin/rspec-sidekiq/compare/v4.1.0...v4.2.0)

---
updated-dependencies:
- dependency-name: rspec-sidekiq
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1e7aa929..1cf511fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ group :development, :test do
   gem "rspec-its", "~> 1.3"
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.1"
-  gem "rspec-sidekiq", "~> 4.1", require: false
+  gem "rspec-sidekiq", "~> 4.2", require: false
   gem "rubocop", "~> 1.63"
   gem "rubocop-rails", "~> 2.24"
   gem "shoulda-matchers", "~> 6.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 06db3f3e..3a01989d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -403,7 +403,7 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-sidekiq (4.1.0)
+    rspec-sidekiq (4.2.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
@@ -587,7 +587,7 @@ DEPENDENCIES
   rspec-its (~> 1.3)
   rspec-mocks
   rspec-rails (~> 6.1)
-  rspec-sidekiq (~> 4.1)
+  rspec-sidekiq (~> 4.2)
   rubocop (~> 1.63)
   rubocop-rails (~> 2.24)
   rubyzip (~> 2.3)

From 8bb31e5eb286d9689d4715f9c2890a76b4cc9008 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:06:14 +0000
Subject: [PATCH 550/590] Bump sass from 1.72.0 to 1.75.0

Bumps [sass](https://github.com/sass/dart-sass) from 1.72.0 to 1.75.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.72.0...1.75.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 58f1a7ab..6fa2f05a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.72.0",
+    "sass": "^1.75.0",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.4.5"
diff --git a/yarn.lock b/yarn.lock
index e82d629d..e1b23274 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2262,10 +2262,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.72.0:
-  version "1.72.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.72.0.tgz#5b9978943fcfb32b25a6a5acb102fc9dabbbf41c"
-  integrity sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==
+sass@^1.75.0:
+  version "1.75.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.75.0.tgz#91bbe87fb02dfcc34e052ddd6ab80f60d392be6c"
+  integrity sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 664f5147d8421da7ddefb187aad0e7d0f733b0eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 09:40:19 +0000
Subject: [PATCH 551/590] Bump reviewdog/action-stylelint from 1.22.1 to 1.23.0

Bumps [reviewdog/action-stylelint](https://github.com/reviewdog/action-stylelint) from 1.22.1 to 1.23.0.
- [Release notes](https://github.com/reviewdog/action-stylelint/releases)
- [Commits](https://github.com/reviewdog/action-stylelint/compare/v1.22.1...v1.23.0)

---
updated-dependencies:
- dependency-name: reviewdog/action-stylelint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 964df53d..110ee53f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -104,7 +104,7 @@ jobs:
           yarn install --frozen-lockfile
         if: steps.changed-files.outputs.any_changed == 'true'
       - name: stylelint
-        uses: reviewdog/action-stylelint@v1.22.1
+        uses: reviewdog/action-stylelint@v1.23.0
         with:
           github_token: ${{ secrets.github_token }}
           reporter: github-pr-check

From 875aa0e3849d460b7e0f229e3ee798a609615521 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 09:40:26 +0000
Subject: [PATCH 552/590] Bump actions/checkout from 4.1.3 to 4.1.4

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.3...v4.1.4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml     | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/lint.yml            | 8 ++++----
 .github/workflows/retrospring.yml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 48ae523a..93832c63 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -20,7 +20,7 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v4.1.3
+      - uses: actions/checkout@v4.1.4
 
       - name: Discover build-time variables
         run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 63704bf8..0f2c3176 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.3
+      uses: actions/checkout@v4.1.4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 964df53d..36aacd3a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.3
+      - uses: actions/checkout@v4.1.4
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -37,7 +37,7 @@ jobs:
     name: ESLint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.3
+      - uses: actions/checkout@v4.1.4
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -63,7 +63,7 @@ jobs:
   haml-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.3
+      - uses: actions/checkout@v4.1.4
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -86,7 +86,7 @@ jobs:
   stylelint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.3
+      - uses: actions/checkout@v4.1.4
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index d089cb7c..83e03466 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -41,7 +41,7 @@ jobs:
       BUNDLE_WITHOUT: 'production'
 
     steps:
-      - uses: actions/checkout@v4.1.3
+      - uses: actions/checkout@v4.1.4
       - name: Install dependencies
         run: sudo apt update && sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev libmagickwand-dev imagemagick libidn11-dev
       - name: Set up Ruby

From 84ddc2190e0a8f102f743384746bfb91dfe1ee0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 09:43:47 +0000
Subject: [PATCH 553/590] Bump sentry-rails from 5.17.1 to 5.17.3

Bumps [sentry-rails](https://github.com/getsentry/sentry-ruby) from 5.17.1 to 5.17.3.
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.17.1...5.17.3)

---
updated-dependencies:
- dependency-name: sentry-rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f68d82dc..13c39099 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -444,9 +444,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sentry-rails (5.17.1)
+    sentry-rails (5.17.3)
       railties (>= 5.0)
-      sentry-ruby (~> 5.17.1)
+      sentry-ruby (~> 5.17.3)
     sentry-ruby (5.17.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)

From 2754b54e2aedffc3ea6fb8e8b726fb597edb993f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 09:44:05 +0000
Subject: [PATCH 554/590] Bump haml_lint from 0.57.0 to 0.58.0

Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.57.0 to 0.58.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.57.0...v0.58.0)

---
updated-dependencies:
- dependency-name: haml_lint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f68d82dc..8a2869af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -204,7 +204,7 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    haml_lint (0.57.0)
+    haml_lint (0.58.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -297,7 +297,7 @@ GEM
     openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.24.0)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)

From 2f196bdc83df8967a0fa798a3692448e1c153cb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 09:44:25 +0000
Subject: [PATCH 555/590] Bump sentry-sidekiq from 5.17.1 to 5.17.3

Bumps [sentry-sidekiq](https://github.com/getsentry/sentry-ruby) from 5.17.1 to 5.17.3.
- [Release notes](https://github.com/getsentry/sentry-ruby/releases)
- [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-ruby/compare/5.17.1...5.17.3)

---
updated-dependencies:
- dependency-name: sentry-sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f68d82dc..278ddee0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -450,8 +450,8 @@ GEM
     sentry-ruby (5.17.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.17.1)
-      sentry-ruby (~> 5.17.1)
+    sentry-sidekiq (5.17.3)
+      sentry-ruby (~> 5.17.3)
       sidekiq (>= 3.0)
     shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)

From fdfbe5c55687b7c6765f73ba06025486b1191efe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 09:45:17 +0000
Subject: [PATCH 556/590] Bump rubocop from 1.63.2 to 1.63.4

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.2 to 1.63.4.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.63.2...v1.63.4)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f68d82dc..03a48e72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -297,7 +297,7 @@ GEM
     openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.24.0)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
@@ -409,7 +409,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.63.2)
+    rubocop (1.63.4)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 1ec62eda660210d015a63bbf0697f2578b501322 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:19:48 +0000
Subject: [PATCH 557/590] Bump @github/hotkey from 3.1.0 to 3.1.1

Bumps [@github/hotkey](https://github.com/github/hotkey) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/github/hotkey/releases)
- [Commits](https://github.com/github/hotkey/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: "@github/hotkey"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index df059c6e..0962cb17 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@fontsource/lexend": "^4.5.15",
     "@fortawesome/fontawesome-free": "^6.5.2",
-    "@github/hotkey": "^3.1.0",
+    "@github/hotkey": "^3.1.1",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo-rails": "^8.0.4",
     "@melloware/coloris": "^0.24.0",
diff --git a/yarn.lock b/yarn.lock
index 39f00a4a..c609ff02 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -200,10 +200,10 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz#310fe90cb5a8dee9698833171b98e7835404293d"
   integrity sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==
 
-"@github/hotkey@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-3.1.0.tgz#d8fd55ef4779ecd64f3142be2dd08357fb22d604"
-  integrity sha512-Lj9QjYa+b+Nk5U1nZtlXLdx3HI8/EeM6ZNwBjpYcGVYqpwHdM2ScRH0p7+5zh28JG6SPbTM9+Rb1dFd742qMTw==
+"@github/hotkey@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@github/hotkey/-/hotkey-3.1.1.tgz#61fdf9993378b402bd9cdd494ee8149fe3172b0c"
+  integrity sha512-H30I6XDO3gFSgLuEuHoMBRZG9c3uCKNdAcYklL1FaZDPdU1bXfgjnpzGDPcUr0U6eGQ+T3XLY9slatwZYWL1dA==
 
 "@hotwired/stimulus@^3.2.2":
   version "3.2.2"

From 11f30d67136189102eee5a45950e477dc741a8dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:20:18 +0000
Subject: [PATCH 558/590] Bump pundit from 2.3.1 to 2.3.2

Bumps [pundit](https://github.com/varvet/pundit) from 2.3.1 to 2.3.2.
- [Changelog](https://github.com/varvet/pundit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/compare/v2.3.1...v2.3.2)

---
updated-dependencies:
- dependency-name: pundit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a067fc7e..cae856e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -215,7 +215,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     i18n-js (4.0.0)
       glob
@@ -307,7 +307,7 @@ GEM
     public_suffix (5.0.4)
     puma (6.4.2)
       nio4r (~> 2.0)
-    pundit (2.3.1)
+    pundit (2.3.2)
       activesupport (>= 3.0.0)
     questiongenerator (1.1.0)
     raabro (1.4.0)

From e7cafc3478f02b6ced5054ef538e6f7be784ad7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:22:03 +0000
Subject: [PATCH 559/590] Bump dotenv-rails from 3.1.0 to 3.1.2

Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 3.1.0 to 3.1.2.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/main/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v3.1.0...v3.1.2)

---
updated-dependencies:
- dependency-name: dotenv-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a067fc7e..96fbd43b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,9 +141,9 @@ GEM
       devise (>= 4.9.0)
     diff-lcs (1.5.1)
     docile (1.4.0)
-    dotenv (3.1.0)
-    dotenv-rails (3.1.0)
-      dotenv (= 3.1.0)
+    dotenv (3.1.2)
+    dotenv-rails (3.1.2)
+      dotenv (= 3.1.2)
       railties (>= 6.1)
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
@@ -215,7 +215,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     i18n-js (4.0.0)
       glob

From 3cb4e0bc62e43a7d3637d09da431c9bf0ae84cdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:23:44 +0000
Subject: [PATCH 560/590] Bump net-imap from 0.4.10 to 0.4.11

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.10 to 0.4.11.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.10...v0.4.11)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a067fc7e..04c31e02 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -279,7 +279,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.10)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)

From 875a53890207230eaea0122d1684479d1ddf9552 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 09:25:59 +0000
Subject: [PATCH 561/590] Bump rubocop from 1.63.4 to 1.63.5

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.4 to 1.63.5.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.63.4...v1.63.5)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a067fc7e..74a37186 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -360,7 +360,7 @@ GEM
     rake (13.2.1)
     redcarpet (3.6.0)
     redis (4.8.1)
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.1)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.1)
@@ -409,7 +409,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.63.4)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -420,8 +420,8 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)

From f5610f2f8ed5723d6ccc1841e4f2a57fe75292c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 23:49:44 +0000
Subject: [PATCH 562/590] Bump nokogiri from 1.16.4 to 1.16.5

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.4 to 1.16.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.4...v1.16.5)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a067fc7e..99b61c79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -289,7 +289,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.4)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)

From d9ef394909656d3842f808de3d4194331ab88fad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 09:04:51 +0000
Subject: [PATCH 563/590] Bump actions/checkout from 4.1.4 to 4.1.6

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.4...v4.1.6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml     | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/lint.yml            | 8 ++++----
 .github/workflows/retrospring.yml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 93832c63..7e68ca11 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -20,7 +20,7 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4.1.6
 
       - name: Discover build-time variables
         run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0f2c3176..074f6157 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.4
+      uses: actions/checkout@v4.1.6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7a205575..eb73b57b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4.1.6
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -37,7 +37,7 @@ jobs:
     name: ESLint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4.1.6
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -63,7 +63,7 @@ jobs:
   haml-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4.1.6
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -86,7 +86,7 @@ jobs:
   stylelint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4.1.6
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index 83e03466..285c3224 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -41,7 +41,7 @@ jobs:
       BUNDLE_WITHOUT: 'production'
 
     steps:
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4.1.6
       - name: Install dependencies
         run: sudo apt update && sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev libmagickwand-dev imagemagick libidn11-dev
       - name: Set up Ruby

From c333171ca98b93be3416222e15c409da323412ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 09:18:36 +0000
Subject: [PATCH 564/590] Bump sass from 1.75.0 to 1.77.2

Bumps [sass](https://github.com/sass/dart-sass) from 1.75.0 to 1.77.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.75.0...1.77.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index df059c6e..d22bfd95 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.75.0",
+    "sass": "^1.77.2",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.4.5"
diff --git a/yarn.lock b/yarn.lock
index 39f00a4a..f6c7baa7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2262,10 +2262,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.75.0:
-  version "1.75.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.75.0.tgz#91bbe87fb02dfcc34e052ddd6ab80f60d392be6c"
-  integrity sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==
+sass@^1.77.2:
+  version "1.77.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.2.tgz#18d4ed2eefc260cdc8099c5439ec1303fd5863aa"
+  integrity sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From ab23ae9b9aa94dc71685e2df2ec3b45c5a41d577 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 23:34:51 +0000
Subject: [PATCH 565/590] Bump httparty from 0.21.0 to 0.22.0

Bumps [httparty](https://github.com/jnunemaker/httparty) from 0.21.0 to 0.22.0.
- [Release notes](https://github.com/jnunemaker/httparty/releases)
- [Changelog](https://github.com/jnunemaker/httparty/blob/main/Changelog.md)
- [Commits](https://github.com/jnunemaker/httparty/compare/v0.21.0...v0.22.0)

---
updated-dependencies:
- dependency-name: httparty
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2cb913b6..45e1adb1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -120,6 +120,7 @@ GEM
     crass (1.0.6)
     cssbundling-rails (1.4.0)
       railties (>= 6.0.0)
+    csv (3.3.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
@@ -212,7 +213,8 @@ GEM
       sysexits (~> 1.1)
     hkdf (0.3.0)
     http-2 (0.11.0)
-    httparty (0.21.0)
+    httparty (0.22.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     i18n (1.14.5)
@@ -273,7 +275,8 @@ GEM
     minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multi_xml (0.6.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
     nested_form (0.3.2)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)

From cf3e797aa3d9e11550494dd7b0240e4ec3bcfd37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 23:35:01 +0000
Subject: [PATCH 566/590] Bump rubocop-rails from 2.24.1 to 2.25.0

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.24.1 to 2.25.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.24.1...v2.25.0)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1cf511fa..34a52c71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -95,7 +95,7 @@ group :development, :test do
   gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 4.2", require: false
   gem "rubocop", "~> 1.63"
-  gem "rubocop-rails", "~> 2.24"
+  gem "rubocop-rails", "~> 2.25"
   gem "shoulda-matchers", "~> 6.2"
   gem "simplecov", require: false
   gem "simplecov-cobertura", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 2cb913b6..e3af547a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -270,7 +270,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.6)
-    minitest (5.22.3)
+    minitest (5.23.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -311,7 +311,7 @@ GEM
       activesupport (>= 3.0.0)
     questiongenerator (1.1.0)
     raabro (1.4.0)
-    racc (1.7.3)
+    racc (1.8.0)
     rack (2.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -360,13 +360,14 @@ GEM
     rake (13.2.1)
     redcarpet (3.6.0)
     redis (4.8.1)
-    regexp_parser (2.9.1)
+    regexp_parser (2.9.2)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rolify (6.0.1)
     rotp (6.3.0)
     rouge (4.1.3)
@@ -422,7 +423,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-rails (2.24.1)
+    rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -483,6 +484,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
+    strscan (3.1.0)
     sysexits (1.2.0)
     temple (0.10.3)
     thor (1.3.1)
@@ -589,7 +591,7 @@ DEPENDENCIES
   rspec-rails (~> 6.1)
   rspec-sidekiq (~> 4.2)
   rubocop (~> 1.63)
-  rubocop-rails (~> 2.24)
+  rubocop-rails (~> 2.25)
   rubyzip (~> 2.3)
   sanitize
   sassc-rails

From 130c54e31d3d2df13b7f0d0f5cc2e58091a8974f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 23:39:33 +0000
Subject: [PATCH 567/590] Bump rspec-sidekiq from 4.2.0 to 5.0.0

Bumps [rspec-sidekiq](https://github.com/wspurgin/rspec-sidekiq) from 4.2.0 to 5.0.0.
- [Release notes](https://github.com/wspurgin/rspec-sidekiq/releases)
- [Changelog](https://github.com/wspurgin/rspec-sidekiq/blob/main/CHANGES.md)
- [Commits](https://github.com/wspurgin/rspec-sidekiq/compare/v4.2.0...v5.0.0)

---
updated-dependencies:
- dependency-name: rspec-sidekiq
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 34a52c71..349ce52e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ group :development, :test do
   gem "rspec-its", "~> 1.3"
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.1"
-  gem "rspec-sidekiq", "~> 4.2", require: false
+  gem "rspec-sidekiq", "~> 5.0", require: false
   gem "rubocop", "~> 1.63"
   gem "rubocop-rails", "~> 2.25"
   gem "shoulda-matchers", "~> 6.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index e3af547a..8f37a1b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -404,7 +404,7 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-sidekiq (4.2.0)
+    rspec-sidekiq (5.0.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
@@ -589,7 +589,7 @@ DEPENDENCIES
   rspec-its (~> 1.3)
   rspec-mocks
   rspec-rails (~> 6.1)
-  rspec-sidekiq (~> 4.2)
+  rspec-sidekiq (~> 5.0)
   rubocop (~> 1.63)
   rubocop-rails (~> 2.25)
   rubyzip (~> 2.3)

From 8cf1aaa2643c5b5cd84d62569fbe738b4b16b6fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 00:50:32 +0000
Subject: [PATCH 568/590] Bump rspec-mocks from 3.13.0 to 3.13.1

Bumps [rspec-mocks](https://github.com/rspec/rspec-mocks) from 3.13.0 to 3.13.1.
- [Release notes](https://github.com/rspec/rspec-mocks/releases)
- [Changelog](https://github.com/rspec/rspec-mocks/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-mocks/compare/v3.13.0...v3.13.1)

---
updated-dependencies:
- dependency-name: rspec-mocks
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4128d2b9..5c7ac387 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -396,7 +396,7 @@ GEM
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (6.1.2)

From 4e8140ed12b609440763199c40b7732c2dfa5144 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 09:41:27 +0000
Subject: [PATCH 569/590] Bump pghero from 3.4.1 to 3.5.0

Bumps [pghero](https://github.com/ankane/pghero) from 3.4.1 to 3.5.0.
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/pghero/compare/v3.4.1...v3.5.0)

---
updated-dependencies:
- dependency-name: pghero
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cb410780..35044714 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -272,7 +272,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.6)
-    minitest (5.23.0)
+    minitest (5.23.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.7.1)
@@ -304,7 +304,7 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
-    pghero (3.4.1)
+    pghero (3.5.0)
       activerecord (>= 6)
     prometheus-client (4.2.2)
     public_suffix (5.0.4)

From 34c1ec6bc3c23e82715211d7d0727909d427a4ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 09:43:39 +0000
Subject: [PATCH 570/590] Bump rubocop from 1.63.5 to 1.64.0

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.5 to 1.64.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.63.5...v1.64.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 349ce52e..ecc7421d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ group :development, :test do
   gem "rspec-mocks"
   gem "rspec-rails", "~> 6.1"
   gem "rspec-sidekiq", "~> 5.0", require: false
-  gem "rubocop", "~> 1.63"
+  gem "rubocop", "~> 1.64"
   gem "rubocop-rails", "~> 2.25"
   gem "shoulda-matchers", "~> 6.2"
   gem "simplecov", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index cb410780..c535cc7a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -413,7 +413,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.63.5)
+    rubocop (1.64.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -593,7 +593,7 @@ DEPENDENCIES
   rspec-mocks
   rspec-rails (~> 6.1)
   rspec-sidekiq (~> 5.0)
-  rubocop (~> 1.63)
+  rubocop (~> 1.64)
   rubocop-rails (~> 2.25)
   rubyzip (~> 2.3)
   sanitize

From 42a3c4506400d2ae3a08f82c6748a9c37d795675 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:23:33 +0000
Subject: [PATCH 571/590] Bump rubocop from 1.64.0 to 1.64.1

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.64.0 to 1.64.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.64.0...v1.64.1)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 779b3545..1721b663 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -300,7 +300,7 @@ GEM
     openssl (3.2.0)
     orm_adapter (0.5.0)
     parallel (1.24.0)
-    parser (3.3.1.0)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
@@ -413,7 +413,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.64.0)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 86ca291d93fcf1e8d8870bccd440cc8ca6551fc6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 09:12:58 +0000
Subject: [PATCH 572/590] Bump sprockets-rails from 3.4.2 to 3.5.1

Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.4.2 to 3.5.1.
- [Release notes](https://github.com/rails/sprockets-rails/releases)
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.2...v3.5.1)

---
updated-dependencies:
- dependency-name: sprockets-rails
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 779b3545..9fa80d39 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,7 +98,7 @@ GEM
     bootstrap_form (5.3.2)
       actionpack (>= 6.1)
       activemodel (>= 6.1)
-    builder (3.2.4)
+    builder (3.3.0)
     bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
@@ -115,7 +115,7 @@ GEM
     childprocess (5.0.0)
     chunky_png (1.4.0)
     colorize (1.1.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     cssbundling-rails (1.4.0)
@@ -271,7 +271,7 @@ GEM
       rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.7)
     minitest (5.23.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -482,9 +482,9 @@ GEM
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
     strscan (3.1.0)

From 45f99c1a4403e56f5028eb3e1bae4d1925ab6d87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 16 Jun 2024 16:46:36 +0000
Subject: [PATCH 573/590] Bump braces from 3.0.2 to 3.0.3

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0a9e8eb8..b8b635e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -625,11 +625,11 @@ brace-expansion@^2.0.1:
     balanced-match "^1.0.0"
 
 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 buffer@^6.0.3:
   version "6.0.3"
@@ -1180,10 +1180,10 @@ file-entry-cache@^7.0.0:
   dependencies:
     flat-cache "^3.1.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 

From b93f71335e44374916019d23bf33a278ecdeebd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 09:24:37 +0000
Subject: [PATCH 574/590] Bump actions/checkout from 4.1.6 to 4.1.7

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.6...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml     | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/lint.yml            | 8 ++++----
 .github/workflows/retrospring.yml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 7e68ca11..83222cac 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -20,7 +20,7 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
 
       - name: Discover build-time variables
         run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 074f6157..c5d6be7d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.6
+      uses: actions/checkout@v4.1.7
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index eb73b57b..74eb1612 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -37,7 +37,7 @@ jobs:
     name: ESLint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -63,7 +63,7 @@ jobs:
   haml-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
@@ -86,7 +86,7 @@ jobs:
   stylelint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v44
diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml
index 285c3224..ac710bf1 100644
--- a/.github/workflows/retrospring.yml
+++ b/.github/workflows/retrospring.yml
@@ -41,7 +41,7 @@ jobs:
       BUNDLE_WITHOUT: 'production'
 
     steps:
-      - uses: actions/checkout@v4.1.6
+      - uses: actions/checkout@v4.1.7
       - name: Install dependencies
         run: sudo apt update && sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev libmagickwand-dev imagemagick libidn11-dev
       - name: Set up Ruby

From f2e64afb93f084f252b4dd27b15b8920d10052cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 09:24:42 +0000
Subject: [PATCH 575/590] Bump reviewdog/action-stylelint from 1.23.0 to 1.24.0

Bumps [reviewdog/action-stylelint](https://github.com/reviewdog/action-stylelint) from 1.23.0 to 1.24.0.
- [Release notes](https://github.com/reviewdog/action-stylelint/releases)
- [Commits](https://github.com/reviewdog/action-stylelint/compare/v1.23.0...v1.24.0)

---
updated-dependencies:
- dependency-name: reviewdog/action-stylelint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index eb73b57b..e0fb2bd4 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -104,7 +104,7 @@ jobs:
           yarn install --frozen-lockfile
         if: steps.changed-files.outputs.any_changed == 'true'
       - name: stylelint
-        uses: reviewdog/action-stylelint@v1.23.0
+        uses: reviewdog/action-stylelint@v1.24.0
         with:
           github_token: ${{ secrets.github_token }}
           reporter: github-pr-check

From ba7447450216a38efa71739b19aa9279406cb93d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 09:28:24 +0000
Subject: [PATCH 576/590] Bump sanitize from 6.1.0 to 6.1.1

Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.1.0...v6.1.1)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 779b3545..e3101d91 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,7 +271,7 @@ GEM
       rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.7)
     minitest (5.23.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -292,7 +292,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.5)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)
@@ -437,7 +437,7 @@ GEM
     rubyzip (2.3.2)
     rufus-scheduler (3.9.1)
       fugit (~> 1.1, >= 1.1.6)
-    sanitize (6.1.0)
+    sanitize (6.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sassc (2.4.0)

From 48973638ae4c4d0ea19580d9b5a57beff967036e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 09:32:23 +0000
Subject: [PATCH 577/590] Bump net-imap from 0.4.11 to 0.4.13

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.11 to 0.4.13.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.11...v0.4.13)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 779b3545..8caa9036 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -282,7 +282,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.11)
+    net-imap (0.4.13)
       date
       net-protocol
     net-pop (0.1.2)

From cfabda8096190f855af78cdb2f945c3574594994 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 09:43:15 +0000
Subject: [PATCH 578/590] Bump sass from 1.77.2 to 1.77.5

Bumps [sass](https://github.com/sass/dart-sass) from 1.77.2 to 1.77.5.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.77.2...1.77.5)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 26ad5c05..2302181b 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.77.2",
+    "sass": "^1.77.5",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.4.5"
diff --git a/yarn.lock b/yarn.lock
index 0a9e8eb8..f6ce41e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2262,10 +2262,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.77.2:
-  version "1.77.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.2.tgz#18d4ed2eefc260cdc8099c5439ec1303fd5863aa"
-  integrity sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==
+sass@^1.77.5:
+  version "1.77.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.5.tgz#5f9009820297521356e962c0bed13ee36710edfe"
+  integrity sha512-oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 6870c362441b659c96e769efba8e9a2503e43642 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:05:16 +0000
Subject: [PATCH 579/590] Bump activestorage from 7.0.8 to 7.0.8.4

Bumps [activestorage](https://github.com/rails/rails) from 7.0.8 to 7.0.8.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.1.3.4/activestorage/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v7.0.8...v7.0.8.4)

---
updated-dependencies:
- dependency-name: activestorage
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 118 +++++++++++++++++++++++++--------------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 779b3545..ed70f2aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,47 +9,47 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    actioncable (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailbox (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activejob (= 7.0.8.4)
+      activerecord (= 7.0.8.4)
+      activestorage (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.8)
-      actionpack (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailer (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      actionview (= 7.0.8.4)
+      activejob (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionpack (7.0.8.4)
+      actionview (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8)
-      actionpack (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    actiontext (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activerecord (= 7.0.8.4)
+      activestorage (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8)
-      activesupport (= 7.0.8)
+    actionview (7.0.8.4)
+      activesupport (= 7.0.8.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -57,26 +57,26 @@ GEM
     active_model_otp (2.3.4)
       activemodel
       rotp (~> 6.3.0)
-    activejob (7.0.8)
-      activesupport (= 7.0.8)
+    activejob (7.0.8.4)
+      activesupport (= 7.0.8.4)
       globalid (>= 0.3.6)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
+    activemodel (7.0.8.4)
+      activesupport (= 7.0.8.4)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activestorage (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activesupport (= 7.0.8)
+    activerecord (7.0.8.4)
+      activemodel (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
+    activestorage (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activejob (= 7.0.8.4)
+      activerecord (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.8)
+    activesupport (7.0.8.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -98,7 +98,7 @@ GEM
     bootstrap_form (5.3.2)
       actionpack (>= 6.1)
       activemodel (>= 6.1)
-    builder (3.2.4)
+    builder (3.3.0)
     bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
@@ -115,7 +115,7 @@ GEM
     childprocess (5.0.0)
     chunky_png (1.4.0)
     colorize (1.1.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     cssbundling-rails (1.4.0)
@@ -162,7 +162,7 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erubi (1.12.0)
+    erubi (1.13.0)
     et-orbi (1.2.7)
       tzinfo
     excon (0.110.0)
@@ -261,7 +261,7 @@ GEM
       nokogiri (>= 1.12.0)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.2)
+    marcel (1.0.4)
     method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
@@ -271,7 +271,7 @@ GEM
       rake
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.7)
     minitest (5.23.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -292,7 +292,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.5)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)
@@ -318,20 +318,20 @@ GEM
     rack (2.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.8)
-      actioncable (= 7.0.8)
-      actionmailbox (= 7.0.8)
-      actionmailer (= 7.0.8)
-      actionpack (= 7.0.8)
-      actiontext (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activemodel (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    rails (7.0.8.4)
+      actioncable (= 7.0.8.4)
+      actionmailbox (= 7.0.8.4)
+      actionmailer (= 7.0.8.4)
+      actionpack (= 7.0.8.4)
+      actiontext (= 7.0.8.4)
+      actionview (= 7.0.8.4)
+      activejob (= 7.0.8.4)
+      activemodel (= 7.0.8.4)
+      activerecord (= 7.0.8.4)
+      activestorage (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       bundler (>= 1.15.0)
-      railties (= 7.0.8)
+      railties (= 7.0.8.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -352,9 +352,9 @@ GEM
       nested_form (~> 0.3)
       rails (>= 6.0, < 8)
       turbo-rails (~> 1.0)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    railties (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)

From 42304e48875c6a538adc32d4725acfaa3f381fcf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:05:46 +0000
Subject: [PATCH 580/590] Bump mini_magick from 4.12.0 to 4.13.1

Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.12.0 to 4.13.1.
- [Release notes](https://github.com/minimagick/minimagick/releases)
- [Commits](https://github.com/minimagick/minimagick/compare/v4.12.0...v4.13.1)

---
updated-dependencies:
- dependency-name: mini_magick
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 789b49e9..ac4f7039 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -269,7 +269,7 @@ GEM
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
-    mini_magick (4.12.0)
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitest (5.23.1)

From 64764447c009a591a8d1aa8515890dc468f02f01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:05:48 +0000
Subject: [PATCH 581/590] Bump oj from 3.16.3 to 3.16.4

Bumps [oj](https://github.com/ohler55/oj) from 3.16.3 to 3.16.4.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.16.3...v3.16.4)

---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 789b49e9..c936e44b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,7 +90,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
     bootsnap (1.18.3)
@@ -295,7 +295,7 @@ GEM
     nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.3)
+    oj (3.16.4)
       bigdecimal (>= 3.0)
     openssl (3.2.0)
     orm_adapter (0.5.0)

From 331d18ae9c7ca5de681ea0a87736806a79f7e721 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:22:53 +0000
Subject: [PATCH 582/590] Bump faker from 3.3.1 to 3.4.1

Bumps [faker](https://github.com/faker-ruby/faker) from 3.3.1 to 3.4.1.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v3.3.1...v3.4.1)

---
updated-dependencies:
- dependency-name: faker
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 51a438ce..5f81e000 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -174,7 +174,7 @@ GEM
     fake_email_validator (1.0.11)
       activemodel
       mail
-    faker (3.3.1)
+    faker (3.4.1)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
     fog-aws (3.22.0)

From 830fd2dc9d43a2ccf936f60c82f61d855b3c2dd5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:23:56 +0000
Subject: [PATCH 583/590] Bump rspec-rails from 6.1.2 to 6.1.3

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.2 to 6.1.3.
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.2...v6.1.3)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 958e2b1b..cfda2548 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -272,7 +272,7 @@ GEM
     mini_magick (4.13.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.23.1)
+    minitest (5.24.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.7.1)
@@ -390,7 +390,7 @@ GEM
     rqrcode_core (1.2.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-its (1.3.0)
@@ -399,7 +399,7 @@ GEM
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.2)
+    rspec-rails (6.1.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -525,7 +525,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   ruby

From dfb9054d957d73fb76a04c94945a65f9f5fac112 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:24:12 +0000
Subject: [PATCH 584/590] Bump net-imap from 0.4.13 to 0.4.14

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.13 to 0.4.14.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](https://github.com/ruby/net-imap/compare/v0.4.13...v0.4.14)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 958e2b1b..6aaee666 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -282,7 +282,7 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.5)
       http-2 (~> 0.11)
-    net-imap (0.4.13)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)

From ea9d88f2909308d01a568613d5550a6a3cd4cab8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:24:49 +0000
Subject: [PATCH 585/590] Bump fog-aws from 3.22.0 to 3.23.0

Bumps [fog-aws](https://github.com/fog/fog-aws) from 3.22.0 to 3.23.0.
- [Changelog](https://github.com/fog/fog-aws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fog/fog-aws/compare/v3.22.0...v3.23.0)

---
updated-dependencies:
- dependency-name: fog-aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 958e2b1b..017657a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,7 +177,7 @@ GEM
     faker (3.4.1)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
-    fog-aws (3.22.0)
+    fog-aws (3.23.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -265,7 +265,7 @@ GEM
     method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
+    mime-types-data (3.2024.0604)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake

From dc43c1cbb048387a6344818b8476354883e4ea97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:25:25 +0000
Subject: [PATCH 586/590] Bump jwt from 2.8.1 to 2.8.2

Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.8.1 to 2.8.2.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.8.1...v2.8.2)

---
updated-dependencies:
- dependency-name: jwt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 958e2b1b..146806cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -231,7 +231,7 @@ GEM
     json (2.7.2)
     json-schema (4.3.0)
       addressable (>= 2.8)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)

From c82c3b1d4028331016ad94943e0c865846fb6607 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:27:49 +0000
Subject: [PATCH 587/590] Bump reviewdog/action-stylelint from 1.24.0 to 1.26.0

Bumps [reviewdog/action-stylelint](https://github.com/reviewdog/action-stylelint) from 1.24.0 to 1.26.0.
- [Release notes](https://github.com/reviewdog/action-stylelint/releases)
- [Commits](https://github.com/reviewdog/action-stylelint/compare/v1.24.0...v1.26.0)

---
updated-dependencies:
- dependency-name: reviewdog/action-stylelint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 86b81eee..0a57bc09 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -104,7 +104,7 @@ jobs:
           yarn install --frozen-lockfile
         if: steps.changed-files.outputs.any_changed == 'true'
       - name: stylelint
-        uses: reviewdog/action-stylelint@v1.24.0
+        uses: reviewdog/action-stylelint@v1.26.0
         with:
           github_token: ${{ secrets.github_token }}
           reporter: github-pr-check

From 4b9bbdd6b96785665c199bd37b48b7d4f2aaddab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:27:53 +0000
Subject: [PATCH 588/590] Bump docker/build-push-action from 5 to 6

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 83222cac..63fc5d49 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -46,7 +46,7 @@ jobs:
         if: github.event_name != 'pull_request'
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             BUNDLER_VERSION=${{ env.BUNDLER_VERSION }}

From 326b0d6a330f3b6106062f6f00dfba53ca0bb8e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:42:33 +0000
Subject: [PATCH 589/590] Bump typescript from 5.4.5 to 5.5.2

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.5 to 5.5.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.5...v5.5.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2302181b..2210e9db 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "sass": "^1.77.5",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index aa9bf7f2..4ba0c641 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2665,10 +2665,10 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
-typescript@^5.4.5:
-  version "5.4.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
-  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
+typescript@^5.5.2:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507"
+  integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"

From 21bf58d7a94aac37abc625c4522c49c0f5d33d70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 15:22:18 +0000
Subject: [PATCH 590/590] Bump sass from 1.77.5 to 1.77.6

Bumps [sass](https://github.com/sass/dart-sass) from 1.77.5 to 1.77.6.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.77.5...1.77.6)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2210e9db..80cc1712 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "croppr": "^2.3.1",
     "i18n-js": "^4.0",
     "js-cookie": "2.2.1",
-    "sass": "^1.77.5",
+    "sass": "^1.77.6",
     "sweetalert": "1.1.3",
     "toastify-js": "^1.12.0",
     "typescript": "^5.5.2"
diff --git a/yarn.lock b/yarn.lock
index 4ba0c641..375d71be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2262,10 +2262,10 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
-sass@^1.77.5:
-  version "1.77.5"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.5.tgz#5f9009820297521356e962c0bed13ee36710edfe"
-  integrity sha512-oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg==
+sass@^1.77.6:
+  version "1.77.6"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4"
+  integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"