improved emote cmd to get emotes of other channels

jann-amh · Jun 23, 2021 · 0b0eac0 · 0b0eac0
1 parent e415696
commit 0b0eac0
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 6 deletions.
diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/EmoteCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/EmoteCommand.cs
@@ -10,15 +10,15 @@ public static class EmoteCommand
     {
         public static void Handle(TwitchBot twitchBot, ChatMessage chatMessage, string alias)
         {
-            if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\sffz(\s\d+)?")))
+            if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\sffz(\s((\d+)|(\w+(\s\d+)?)))?")))
             {
                 twitchBot.SendFFZEmotes(chatMessage);
             }
-            else if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\sbttv(\s\d+)?")))
+            else if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\sbttv(\s((\d+)|(\w+(\s\d+)?)))?")))
             {
                 twitchBot.SendBTTVEmotes(chatMessage);
             }
-            else if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\s7tv(\s\d+)?")))
+            else if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\s7tv(\s((\d+)|(\w+(\s\d+)?)))?")))
             {
                 twitchBot.Send7TVEmotes(chatMessage);
             }

diff --git a/OkayegTeaTimeCSharp/Twitch/Bot/BotActions.cs b/OkayegTeaTimeCSharp/Twitch/Bot/BotActions.cs
@@ -98,7 +98,29 @@ public static void Send7TVEmotes(this TwitchBot twitchBot, ChatMessage chatMessa
         {
             try
             {
-                List<HttpRequests.Emote> emotes = chatMessage.GetSplit().Length > 2 ? HttpRequest.Get7TVEmotes(chatMessage.Channel, chatMessage.GetLowerSplit()[2].ToInt()) : HttpRequest.Get7TVEmotes(chatMessage.Channel);
+                List<HttpRequests.Emote> emotes;
+                if (chatMessage.GetLowerSplit().Length >= 4)
+                {
+                    if (chatMessage.GetLowerSplit()[2].IsMatch(@"\w+"))
+                    {
+                        emotes = HttpRequest.Get7TVEmotes(chatMessage.GetLowerSplit()[2], chatMessage.GetLowerSplit()[3].ToInt());
+                    }
+                    else
+                    {
+                        emotes = HttpRequest.Get7TVEmotes(chatMessage.Channel, chatMessage.GetLowerSplit()[3].ToInt());
+                    }
+                }
+                else
+                {
+                    if (chatMessage.GetLowerSplit()[2].IsMatch(@"\w+"))
+                    {
+                        emotes = HttpRequest.Get7TVEmotes(chatMessage.GetLowerSplit()[2]);
+                    }
+                    else
+                    {
+                        emotes = HttpRequest.Get7TVEmotes(chatMessage.Channel);
+                    }
+                }
                 string emoteString = string.Empty;
                 emotes.ForEach(e =>
                 {
@@ -116,7 +138,29 @@ public static void SendBTTVEmotes(this TwitchBot twitchBot, ChatMessage chatMess
         {
             try
             {
-                List<HttpRequests.Emote> emotes = chatMessage.GetSplit().Length > 2 ? HttpRequest.GetBTTVEmotes(chatMessage.Channel, chatMessage.GetLowerSplit()[2].ToInt()) : HttpRequest.GetBTTVEmotes(chatMessage.Channel);
+                List<HttpRequests.Emote> emotes;
+                if (chatMessage.GetLowerSplit().Length >= 4)
+                {
+                    if (chatMessage.GetLowerSplit()[2].IsMatch(@"\w+"))
+                    {
+                        emotes = HttpRequest.GetBTTVEmotes(chatMessage.GetLowerSplit()[2], chatMessage.GetLowerSplit()[3].ToInt());
+                    }
+                    else
+                    {
+                        emotes = HttpRequest.GetBTTVEmotes(chatMessage.Channel, chatMessage.GetLowerSplit()[3].ToInt());
+                    }
+                }
+                else
+                {
+                    if (chatMessage.GetLowerSplit()[2].IsMatch(@"\w+"))
+                    {
+                        emotes = HttpRequest.GetBTTVEmotes(chatMessage.GetLowerSplit()[2]);
+                    }
+                    else
+                    {
+                        emotes = HttpRequest.GetBTTVEmotes(chatMessage.Channel);
+                    }
+                }
                 string emoteString = string.Empty;
                 emotes.ForEach(e =>
                 {
@@ -217,7 +261,29 @@ public static void SendFFZEmotes(this TwitchBot twitchBot, ChatMessage chatMessa
         {
             try
             {
-                List<HttpRequests.Emote> emotes = chatMessage.GetSplit().Length > 2 ? HttpRequest.GetFFZEmotes(chatMessage.Channel, chatMessage.GetLowerSplit()[2].ToInt()) : HttpRequest.GetFFZEmotes(chatMessage.Channel);
+                List<HttpRequests.Emote> emotes;
+                if (chatMessage.GetLowerSplit().Length >= 4)
+                {
+                    if (chatMessage.GetLowerSplit()[2].IsMatch(@"\w+"))
+                    {
+                        emotes = HttpRequest.GetFFZEmotes(chatMessage.GetLowerSplit()[2], chatMessage.GetLowerSplit()[3].ToInt());
+                    }
+                    else
+                    {
+                        emotes = HttpRequest.GetFFZEmotes(chatMessage.Channel, chatMessage.GetLowerSplit()[3].ToInt());
+                    }
+                }
+                else
+                {
+                    if (chatMessage.GetLowerSplit()[2].IsMatch(@"\w+"))
+                    {
+                        emotes = HttpRequest.GetFFZEmotes(chatMessage.GetLowerSplit()[2]);
+                    }
+                    else
+                    {
+                        emotes = HttpRequest.GetFFZEmotes(chatMessage.Channel);
+                    }
+                }
                 string emoteString = string.Empty;
                 emotes.ForEach(e =>
                 {