From 230e845f726e3dcd7c859c0707bf54699a7a2bd4 Mon Sep 17 00:00:00 2001
From: Mirco Wittrien <mirco.wittrien@gmail.com>
Date: Fri, 8 Jan 2021 21:25:40 +0100
Subject: [PATCH] stuff

---
 Library/_res/BDFDB.data.json              |  2 --
 Plugins/ChatAliases/ChatAliases.plugin.js | 13 +++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json
index 7525166a2b..ec1aa6a97d 100644
--- a/Library/_res/BDFDB.data.json
+++ b/Library/_res/BDFDB.data.json
@@ -26,8 +26,6 @@
 		"CategoryCollapseUtils": {"props": ["categoryCollapse", "categoryCollapseAll"]},
 		"ChannelStore": {"props": ["getChannel", "getDMFromUserId"]},
 		"ColorUtils": {"props": ["hex2int", "hex2rgb"]},
-		"CommandApplicationUtils": {"props": ["useApplicationCommandsDiscoveryState"]},
-		"CommandUtils": {"props": ["queryApplicationCommands", "setActiveCommand"]},
 		"ContextMenuUtils": {"props": ["closeContextMenu", "openContextMenu"]},
 		"CopyLinkUtils": {"props": ["SUPPORTS_COPY", "copy"]},
 		"CurrentUserStore": {"props": ["getCurrentUser"]},
diff --git a/Plugins/ChatAliases/ChatAliases.plugin.js b/Plugins/ChatAliases/ChatAliases.plugin.js
index 9c516bae66..e92e25b979 100644
--- a/Plugins/ChatAliases/ChatAliases.plugin.js
+++ b/Plugins/ChatAliases/ChatAliases.plugin.js
@@ -14,12 +14,12 @@ module.exports = (_ => {
 		"info": {
 			"name": "ChatAliases",
 			"author": "DevilBro",
-			"version": "2.2.2",
+			"version": "2.2.3",
 			"description": "Allow the user to configure their own chat-aliases which will automatically be replaced before the message is being sent"
 		},
 		"changeLog": {
 			"fixed": {
-				"File aliases with replies": "Now properly adds the reply to a file alias if the rest of the message is empty"
+				"Command List": "Fixed issue where command list and autocomplete menu could be open at the same time on top of each other"
 			}
 		}
 	};
@@ -76,15 +76,15 @@ module.exports = (_ => {
 						file: 				{value: false,		description: "Handle the replacevalue as a filepath"}
 					},
 					settings: {
-						replaceBeforeSend:	{value: true, 		inner: false,	description: "Replace words with your aliases before a message is sent"},
-						addContextMenu:		{value: true, 		inner: false,	description: "Add a contextmenu entry to faster add new aliases"},
-						addAutoComplete:	{value: true, 		inner: false,	description: "Add an autocomplete-menu for non-RegExp aliases"},
+						replaceBeforeSend:	{value: true, 		inner: false,		description: "Replace words with your aliases before a message is sent"},
+						addContextMenu:		{value: true, 		inner: false,		description: "Add a contextmenu entry to faster add new aliases"},
+						addAutoComplete:	{value: true, 		inner: false,		description: "Add an autocomplete-menu for non-RegExp aliases"},
 						triggerNormal:		{value: true, 		inner: true,		description: "Normal Message Textarea"},
 						triggerEdit:		{value: true, 		inner: true,		description: "Edit Message Textarea"},
 						triggerUpload:		{value: true, 		inner: true,		description: "Upload Message Prompt"}
 					},
 					amounts: {
-						minAliasLength:		{value: 2, 			min: 1,	description: "Minimal Character Length to open Autocomplete-Menu: "}
+						minAliasLength:		{value: 2, 			min: 1,				description: "Minimal Character Length to open Autocomplete-Menu: "}
 					}
 				};
 				
@@ -140,6 +140,7 @@ module.exports = (_ => {
 							return false;
 						},
 						queryResults: (channel, wordLowercase, config, rawValue) => {
+							if (rawValue == commandSentinel) return;
 							let currentLastWord = BDFDB.StringUtils.findMatchCaseless(wordLowercase, rawValue, true);
 							let matches = [];
 							for (let word in aliases) {