From 03ea7618ad2f885a027c4c9a73eaf71510ebc622 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Tue, 19 Dec 2023 22:14:22 -0600
Subject: [PATCH] More cleanup

---
 app/javascript/flavours/glitch/locales/en.json |  3 +--
 app/javascript/mastodon/locales/en.json        |  4 ----
 app/javascript/mastodon/reducers/settings.js   |  2 --
 ...015350_fix_foreign_keys_status_reactions.rb | 18 ------------------
 4 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 db/migrate/20221218015350_fix_foreign_keys_status_reactions.rb

diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index baa6bf0983..e1d62216d5 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -160,6 +160,5 @@
   "status.local_only": "Only visible from your instance",
   "status.react": "React",
   "status.uncollapse": "Uncollapse",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "tooltips.reactions": "Reactions"
+  "suggestions.dismiss": "Dismiss suggestion"
 }
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index cb31a613c2..881ed19e0e 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -471,7 +471,6 @@
   "notification.mention": "{name} mentioned you",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
-  "notification.reaction": "{name} reacted to your post",
   "notification.reblog": "{name} boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
@@ -497,7 +496,6 @@
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.poll": "Poll results:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.reaction": "Reactions:",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
@@ -725,7 +723,6 @@
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned post",
   "status.read_more": "Read more",
-  "status.react": "React",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
@@ -765,7 +762,6 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older posts",
-  "tooltips.reactions": "Reactions",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index d14ed645c3..0e353e0d1b 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -56,7 +56,6 @@ const initialState = ImmutableMap({
       follow: true,
       follow_request: false,
       favourite: true,
-      reaction: true,
       reblog: true,
       mention: true,
       poll: true,
@@ -70,7 +69,6 @@ const initialState = ImmutableMap({
       follow: true,
       follow_request: false,
       favourite: true,
-      reaction: true,
       reblog: true,
       mention: true,
       poll: true,
diff --git a/db/migrate/20221218015350_fix_foreign_keys_status_reactions.rb b/db/migrate/20221218015350_fix_foreign_keys_status_reactions.rb
deleted file mode 100644
index 916ad10773..0000000000
--- a/db/migrate/20221218015350_fix_foreign_keys_status_reactions.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class FixForeignKeysStatusReactions < ActiveRecord::Migration[6.1]
-  disable_ddl_transaction!
-
-  def change
-    # Fixes an oversight in a previous version of the CreateStatusReactions migration
-    remove_foreign_key :status_reactions, :accounts
-    add_foreign_key :status_reactions, :accounts, on_delete: :cascade, validate: false
-    validate_foreign_key :status_reactions, :accounts
-    remove_foreign_key :status_reactions, :statuses
-    add_foreign_key :status_reactions, :statuses, on_delete: :cascade, validate: false
-    validate_foreign_key :status_reactions, :statuses
-    remove_foreign_key :status_reactions, :custom_emojis
-    add_foreign_key :status_reactions, :custom_emojis, on_delete: :cascade, validate: false
-    validate_foreign_key :status_reactions, :custom_emojis
-  end
-end