From 6c3956444ce5a94e975f60ef24e6c1a9ba7f49b8 Mon Sep 17 00:00:00 2001
From: morethanwords <thanwords24@gmail.com>
Date: Mon, 31 May 2021 22:14:39 +0300
Subject: [PATCH] Emoji settings

---
 src/components/chat/bubbles.ts                |  2 +-
 src/components/chat/input.ts                  | 15 +++++++--------
 .../sidebarLeft/tabs/generalSettings.ts       | 19 +++++++++++++++++++
 src/lang.ts                                   |  3 +++
 src/lib/appManagers/appStateManager.ts        |  8 ++++++++
 5 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/components/chat/bubbles.ts b/src/components/chat/bubbles.ts
index 1590d0eb..8ea69d26 100644
--- a/src/components/chat/bubbles.ts
+++ b/src/components/chat/bubbles.ts
@@ -2043,7 +2043,7 @@ export default class ChatBubbles {
 
     let canHaveTail = true;
     
-    if(totalEntities && !messageMedia) {
+    if(totalEntities && !messageMedia && rootScope.settings.emoji.big) {
       let emojiEntities = totalEntities.filter((e) => e._ === 'messageEntityEmoji');
       let strLength = messageMessage.length;
       let emojiStrLength = emojiEntities.reduce((acc: number, curr: any) => acc + curr.length, 0);
diff --git a/src/components/chat/input.ts b/src/components/chat/input.ts
index 157bd9c8..6beb0fcb 100644
--- a/src/components/chat/input.ts
+++ b/src/components/chat/input.ts
@@ -72,10 +72,8 @@ const POSTING_MEDIA_NOT_ALLOWED = 'Posting media content isn\'t allowed in this
 
 type ChatInputHelperType = 'edit' | 'webpage' | 'forward' | 'reply';
 
-let selId = 0;
-
 export default class ChatInput {
-  public static AUTO_COMPLETE_REG_EXP = /(\s|^)((?::|.)(?!.*:).*|(?:(?:@|\/)(?:[\S]*)))$/;
+  private static AUTO_COMPLETE_REG_EXP = /(\s|^)((?::|.)(?!.*:).*|(?:(?:@|\/)(?:[\S]*)))$/;
   public messageInput: HTMLElement;
   public messageInputField: InputField;
   private fileInput: HTMLInputElement;
@@ -132,8 +130,8 @@ export default class ChatInput {
 
   private lockRedo = false;
   private canRedoFromHTML = '';
-  readonly undoHistory: string[] = [];
-  readonly executedHistory: string[] = [];
+  private readonly undoHistory: string[] = [];
+  private readonly executedHistory: string[] = [];
   private canUndoFromHTML = '';
 
   private autocompleteHelperController: AutocompleteHelperController;
@@ -435,7 +433,8 @@ export default class ChatInput {
     }, {passive: false, capture: true}); */
 
     this.listenerSetter.add(rootScope, 'settings_updated', () => {
-      if(this.stickersHelper) {
+      if(this.stickersHelper || this.emojiHelper) {
+        this.previousQuery = undefined;
         this.checkAutocomplete();
         /* if(!rootScope.settings.stickers.suggest) {
           this.stickersHelper.checkEmoticon('');
@@ -1221,7 +1220,7 @@ export default class ChatInput {
 
     const matches = value.match(ChatInput.AUTO_COMPLETE_REG_EXP);
     if(!matches) {
-      delete this.previousQuery;
+      this.previousQuery = undefined;
       this.autocompleteHelperController.hideOtherHelpers();
       return;
     }
@@ -1289,7 +1288,7 @@ export default class ChatInput {
           // console.log('found commands', found, filtered);
         });
       }
-    } else { // emoji
+    } else if(rootScope.settings.emoji.suggest) { // emoji
       if(!value.match(/^\s*:(.+):\s*$/)) {
         foundHelper = this.emojiHelper;
         this.appEmojiManager.getBothEmojiKeywords().then(() => {
diff --git a/src/components/sidebarLeft/tabs/generalSettings.ts b/src/components/sidebarLeft/tabs/generalSettings.ts
index a7d8af19..b3b0928b 100644
--- a/src/components/sidebarLeft/tabs/generalSettings.ts
+++ b/src/components/sidebarLeft/tabs/generalSettings.ts
@@ -170,6 +170,25 @@ export default class AppGeneralSettingsTab extends SliderSuperTab {
 
       container.append(gifsCheckboxField.label, videosCheckboxField.label);
     }
+
+    {
+      const container = section('Emoji');
+
+      const suggestCheckboxField = new CheckboxField({
+        text: 'GeneralSettings.EmojiPrediction', 
+        name: 'suggest-emoji', 
+        stateKey: 'settings.emoji.suggest',
+        withRipple: true
+      });
+      const bigCheckboxField = new CheckboxField({
+        text: 'GeneralSettings.BigEmoji', 
+        name: 'emoji-big', 
+        stateKey: 'settings.emoji.big',
+        withRipple: true
+      });
+
+      container.append(suggestCheckboxField.label, bigCheckboxField.label);
+    }
     
     {
       const container = section('Telegram.InstalledStickerPacksController');
diff --git a/src/lang.ts b/src/lang.ts
index fed0c0e4..398195c1 100644
--- a/src/lang.ts
+++ b/src/lang.ts
@@ -436,6 +436,7 @@ const lang = {
   "Of": "%1$d of %2$d",
   "NoResult": "No results",
   "Updating": "Updating...",
+  "Emoji": "Emoji",
 
   // * macos
   "AccountSettings.Filters": "Chat Folders",
@@ -668,6 +669,8 @@ const lang = {
   "NewPoll.OptionsAddOption": "Add an Option",
   "NewPoll.MultipleChoice": "Multiple Answers",
   "NewPoll.Quiz": "Quiz Mode",
+  "GeneralSettings.BigEmoji": "Large Emoji",
+  "GeneralSettings.EmojiPrediction": "Suggest Emoji",
   "GroupPermission.Delete": "Delete Exception",
   "Schedule.SendToday": "Send today at %@",
   "Schedule.SendDate": "Send on %@ at %@",
diff --git a/src/lib/appManagers/appStateManager.ts b/src/lib/appManagers/appStateManager.ts
index 68f325eb..e6fc1f3f 100644
--- a/src/lib/appManagers/appStateManager.ts
+++ b/src/lib/appManagers/appStateManager.ts
@@ -74,6 +74,10 @@ export type State = {
       suggest: boolean,
       loop: boolean
     },
+    emoji: {
+      suggest: boolean,
+      big: boolean
+    },
     background?: Background, // ! DEPRECATED
     themes: Theme[],
     theme: Theme['name'],
@@ -119,6 +123,10 @@ export const STATE_INIT: State = {
       suggest: true,
       loop: true
     },
+    emoji: {
+      suggest: true,
+      big: true
+    },
     themes: [{
       name: 'day',
       background: {