From 5fcd6b1957dcbb2c0105fbf4a2324d801d124c5b Mon Sep 17 00:00:00 2001
From: Sam Therapy <sam@samtherapy.net>
Date: Sat, 11 Jun 2022 16:47:43 +0200
Subject: [PATCH] undo the custom emoji stuff

Signed-off-by: Sam Therapy <sam@samtherapy.net>
---
 .../emoji_reactions/emoji_reactions.vue       | 24 ++-----------------
 src/components/react_button/react_button.js   |  9 ++-----
 src/components/react_button/react_button.vue  | 16 +------------
 .../settings_modal/tabs/general_tab.vue       | 20 ++++------------
 src/services/locale/locale.service.js         |  2 --
 5 files changed, 9 insertions(+), 62 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index e76560bc..b1ce50cd 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -11,23 +11,8 @@
         @click="emojiOnClick(reaction.name, $event)"
         @mouseenter="fetchEmojiReactionsByIfMissing()"
       >
-        <span
-          v-if="reaction.url !== null"
-        >
-          <img
-            :src="reaction.url"
-            :title="reaction.name"
-            class="reaction-emoji"
-            width="2.55em"
-          >
-          {{ reaction.count }}
-        </span>
-        <span v-else>
-          <span class="reaction-emoji unicode-emoji">
-            {{ reaction.name }}
-          </span>
-          <span>{{ reaction.count }}</span>
-        </span>
+        <span class="reaction-emoji">{{ reaction.name }}</span>
+        <span>{{ reaction.count }}</span>
       </button>
     </UserListPopover>
     <a
@@ -51,10 +36,6 @@
   flex-wrap: wrap;
 }
 
-.unicode-emoji {
-  font-size: 210%;
-}
-
 .emoji-reaction {
   padding: 0 0.5em;
   margin-right: 0.5em;
@@ -64,7 +45,6 @@
   justify-content: center;
   box-sizing: border-box;
   .reaction-emoji {
-    width: 2.55em !important;
     margin-right: 0.25em;
   }
   &:focus {
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 62b34828..71142540 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -63,10 +63,7 @@ const ReactButton = {
       if (this.filterWord !== '') {
         const filterWordLowercase = this.filterWord.toLowerCase()
         let orderedEmojiList = []
-        for (const emoji of [
-          ...this.$store.state.instance.emoji,
-          ...this.$store.state.instance.customEmoji
-        ]) {
+        for (const emoji of this.$store.state.instance.emoji) {
           if (emoji.replacement === this.filterWord) return [emoji]
 
           const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase)
@@ -79,9 +76,7 @@ const ReactButton = {
         }
         return orderedEmojiList.flat()
       }
-      return [
-        ...this.$store.state.instance.emoji
-      ] || []
+      return this.$store.state.instance.emoji || []
     },
     mergedConfig () {
       return this.$store.getters.mergedConfig
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 10aa0ea7..132d7a9d 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -38,17 +38,7 @@
           class="emoji-button"
           :title="emoji.displayText"
           @click="addReaction($event, emoji.replacement, close, keepReactOpen)"
-        >
-          <img
-            v-if="emoji.imageUrl !== false"
-            :src="emoji.imageUrl"
-            width="30px"
-            class="custom-reaction"
-          >
-          <span v-else>
-            {{ emoji.replacement }}
-          </span>
-        </span>
+        />
         <div class="reaction-bottom-fader" />
       </div>
     </template>
@@ -71,10 +61,6 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.custom-reaction {
-  width: 30px !important;
-}
-
 .ReactButton {
   .reaction-picker-filter {
     padding: 0.5em;
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 65d69749..6c6b3a57 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -106,22 +106,10 @@
           </ChoiceSetting>
         </li>
         <li>
-          <BooleanSetting path="minimalScopesMode">
-            {{ $t('settings.minimal_scopes_mode') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="sensitiveByDefault">
-            {{ $t('settings.sensitive_by_default') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="sensitiveIfSubject">
-            {{ $t('settings.sensitive_if_subject') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="alwaysShowNewPostButton">
+          <BooleanSetting
+            path="alwaysShowNewPostButton"
+            expert="1"
+          >
             {{ $t('settings.always_show_post_button') }}
           </BooleanSetting>
         </li>
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index 39e023ff..8cef2522 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -3,7 +3,6 @@ import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
 
 const specialLanguageCodes = {
-  'en_nyan': 'en-NYAN',
   'ja_easy': 'ja',
   'zh_Hant': 'zh-HANT',
   'zh': 'zh-Hans'
@@ -15,7 +14,6 @@ const internalToBackendLocale = code => internalToBrowserLocale(code).replace('_
 
 const getLanguageName = (code) => {
   const specialLanguageNames = {
-    'en_nyan': 'English (Nyan)',
     'ja_easy': 'やさしいにほんご',
     'zh': '简体中文',
     'zh_Hant': '繁體中文'