Merge branch 'master' of https://github.com/jann-amh/OkayegTeaTimeCSharp

# Conflicts: # OkayegTeaTimeCSharp/Commands/CommandClasses/ChattersCommand.cs
jann-amh · Jun 29, 2021 · f122395 · f122395
2 parents b75fc8f + 50abaec
commit f122395
Show file tree

Hide file tree

Showing 78 changed files with 909 additions and 924 deletions.
diff --git a/OkayegTeaTimeCSharp.sln b/OkayegTeaTimeCSharp.sln
@@ -8,17 +8,29 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM32 = Debug|ARM32
+		Debug|ARM64 = Debug|ARM64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM32 = Release|ARM32
+		Release|ARM64 = Release|ARM64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Debug|ARM32.ActiveCfg = Debug|ARM32
+		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Debug|ARM32.Build.0 = Debug|ARM32
+		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Debug|ARM64.Build.0 = Debug|ARM64
 		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Debug|x86.ActiveCfg = Debug|x86
 		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Debug|x86.Build.0 = Debug|x86
 		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Release|ARM32.ActiveCfg = Release|ARM32
+		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Release|ARM32.Build.0 = Release|ARM32
+		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Release|ARM64.Build.0 = Release|ARM64
 		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Release|x86.ActiveCfg = Release|x86
 		{AE3A8884-C469-46F2-846A-AEC1B45E588C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

diff --git a/OkayegTeaTimeCSharp/Commands/AfkCommandClasses/AfkMessage.cs b/OkayegTeaTimeCSharp/Commands/AfkCommandClasses/AfkMessage.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Database.Models;
-using OkayegTeaTimeCSharp.Time;
-using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
+using Sterbehilfe.Time;
+using Sterbehilfe.Time.Enums;
 
 namespace OkayegTeaTimeCSharp.Commands.AfkCommandClasses
 {
@@ -31,7 +32,7 @@ public static AfkMessage Create(User user)
         private AfkMessage ReplaceSpaceHolder(User user)
         {
             ComingBack = ComingBack.Replace("{username}", user.Username)
-                .Replace("{time}", TimeHelper.ConvertMillisecondsToPassedTime(user.Time, "ago"))
+                .Replace("{time}", TimeHelper.ConvertMillisecondsToPassedTime(user.Time, "ago", ConversionType.YearDayHourMin))
                 .Replace("{message}", user.MessageText.Decode());
             ComingBack = string.IsNullOrEmpty(user.MessageText.Decode()) ? ComingBack.Replace(":", "").ReplaceSpaces() : ComingBack;
 

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/CSharpCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/CSharpCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/ChattersCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/ChattersCommand.cs
@@ -0,0 +1,23 @@
+using OkayegTeaTimeCSharp.Twitch;
+using OkayegTeaTimeCSharp.Twitch.Bot;
+using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
+using TwitchLib.Client.Models;
+
+namespace OkayegTeaTimeCSharp.Commands.CommandClasses
+{
+    public static class ChattersCommand
+    {
+        public static void Handle(TwitchBot twitchBot, ChatMessage chatMessage, string alias)
+        {
+            if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\s#?\w+")))
+            {
+                twitchBot.SendChattersCount(chatMessage, chatMessage.GetLowerSplit()[1]);
+            }
+            else if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel))))
+            {
+                twitchBot.SendChattersCount(chatMessage, chatMessage.Channel);
+            }
+        }
+    }
+}
diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/CheckCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/CheckCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/CountCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/CountCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/EmoteCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/EmoteCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses
@@ -9,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/Commands/CommandClasses/FillCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/FillCommand.cs
@@ -0,0 +1,19 @@
+using OkayegTeaTimeCSharp.Twitch;
+using OkayegTeaTimeCSharp.Twitch.Bot;
+using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
+using TwitchLib.Client.Models;
+
+namespace OkayegTeaTimeCSharp.Commands.CommandClasses
+{
+    public static class FillCommand
+    {
+        public static void Handle(TwitchBot twitchBot, ChatMessage chatMessage, string alias)
+        {
+            if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\s\S+")))
+            {
+                twitchBot.SendFill(chatMessage);
+            }
+        }
+    }
+}
diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/FirstCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/FirstCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/FuckCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/FuckCommand.cs
@@ -1,4 +1,7 @@
-using OkayegTeaTimeCSharp.Twitch.Bot;
+using OkayegTeaTimeCSharp.Twitch;
+using OkayegTeaTimeCSharp.Twitch.Bot;
+using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses
@@ -7,7 +10,10 @@ public static class FuckCommand
     {
         public static void Handle(TwitchBot twitchBot, ChatMessage chatMessage, string alias)
         {
-#warning needs implementation
+            if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\s\w+(\s\S+)?")))
+            {
+                twitchBot.SendFuck(chatMessage);
+            }
         }
     }
 }
diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/HelpCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/HelpCommand.cs
@@ -2,6 +2,8 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Emojis;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/JoinCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/JoinCommand.cs
@@ -2,6 +2,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/LastCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/LastCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/MasspingCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/MasspingCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/NukeCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/NukeCommand.cs
@@ -1,7 +1,8 @@
-using OkayegTeaTimeCSharp.Time;
-using OkayegTeaTimeCSharp.Twitch;
+using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
+using Sterbehilfe.Time;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/PingCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/PingCommand.cs
@@ -1,6 +1,4 @@
 using OkayegTeaTimeCSharp.Twitch.Bot;
-using System;
-using System.Diagnostics;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses
@@ -9,12 +7,7 @@ public static class PingCommand
     {
         public static void Handle(TwitchBot twitchBot, ChatMessage chatMessage, string alias)
         {
-            twitchBot.Send(chatMessage.Channel, $"Pongeg, I'm here! Uptime: {twitchBot.Runtime} || Memory usage: {GetMemoryUsage()}MB || Executed commands: {twitchBot.CommandCount}");
-        }
-
-        private static double GetMemoryUsage()
-        {
-            return Math.Truncate(Process.GetCurrentProcess().PrivateMemorySize64 / Math.Pow(10, 6) * 100) / 100;
+            twitchBot.Send(chatMessage.Channel, $"Pongeg, I'm here! {twitchBot.GetSystemInfo()}");
         }
     }
 }
diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/RandCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/RandCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/RemindCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/RemindCommand.cs
@@ -1,8 +1,9 @@
 using OkayegTeaTimeCSharp.Messages;
-using OkayegTeaTimeCSharp.Time;
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
+using Sterbehilfe.Time;
 using System.Linq;
 using TwitchLib.Client.Models;
 

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/SearchCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/SearchCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/SetCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/SetCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses
@@ -9,9 +10,13 @@ public static class SetCommand
     {
         public static void Handle(TwitchBot twitchBot, ChatMessage chatMessage, string alias)
         {
-            if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\sprefix\s\S{1,10}")))
+            if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\sprefix\s\S{1," + Config.MaxPrefixLength + "}")))
             {
-                twitchBot.SendSetPrefix(chatMessage, chatMessage.GetLowerSplit()[2][..(chatMessage.GetLowerSplit()[2].Length > 10 ? 10 : chatMessage.GetLowerSplit()[2].Length)]);
+                twitchBot.SendSetPrefix(chatMessage, chatMessage.GetLowerSplit()[2][..(chatMessage.GetLowerSplit()[2].Length > Config.MaxPrefixLength ? Config.MaxPrefixLength : chatMessage.GetLowerSplit()[2].Length)]);
+            }
+            else if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\semote\s\S{1," + Config.MaxEmoteInFrontLength + "}")))
+            {
+                twitchBot.SendSetEmoteInFront(chatMessage, chatMessage.GetSplit()[2][..(chatMessage.GetSplit()[2].Length > Config.MaxEmoteInFrontLength ? Config.MaxEmoteInFrontLength : chatMessage.GetSplit()[2].Length)]);
             }
         }
     }

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/SpotifyCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/SpotifyCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/SuggestCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/SuggestCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/TuckCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/TuckCommand.cs
@@ -1,6 +1,8 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Emojis;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/UnsetCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/UnsetCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses
@@ -17,6 +18,10 @@ public static void Handle(TwitchBot twitchBot, ChatMessage chatMessage, string a
             {
                 twitchBot.SendUnsetReminder(chatMessage);
             }
+            else if (chatMessage.GetMessage().IsMatch(PatternCreator.Create(alias, PrefixHelper.GetPrefix(chatMessage.Channel), @"\semote")))
+            {
+                twitchBot.SendUnsetEmoteInFront(chatMessage);
+            }
         }
     }
 }
diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/VanishCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/VanishCommand.cs
@@ -7,6 +7,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using TwitchLib.Client.Models;
+using TwitchLib.Client.Extensions;
 
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses
@@ -15,7 +16,7 @@ public static class VanishCommand
     {
         public static void Handle(TwitchBot twitchBot, ChatMessage chatMessage, string alias)
         {
-            twitchBot.Send(chatMessage.Channel, $"/timeout {chatMessage.Username} 1");
+            twitchBot.TwitchClient.TimeoutUser(chatMessage.Channel, chatMessage.Username, TimeSpan.FromSeconds(1));
         }
     }
 }

diff --git a/OkayegTeaTimeCSharp/Commands/CommandClasses/YourmomCommand.cs b/OkayegTeaTimeCSharp/Commands/CommandClasses/YourmomCommand.cs
@@ -1,6 +1,7 @@
 using OkayegTeaTimeCSharp.Twitch;
 using OkayegTeaTimeCSharp.Twitch.Bot;
 using OkayegTeaTimeCSharp.Utils;
+using Sterbehilfe.Strings;
 using TwitchLib.Client.Models;
 
 namespace OkayegTeaTimeCSharp.Commands.CommandClasses

diff --git a/OkayegTeaTimeCSharp/Commands/CommandEnums/CommandType.cs b/OkayegTeaTimeCSharp/Commands/CommandEnums/CommandType.cs
@@ -9,6 +9,7 @@ public enum CommandType
         Count,
         CSharp,
         Emote,
+        Fill,
         First,
         Fuck,
         Gachi,
@@ -41,7 +42,9 @@ public enum AfkCommandType
         Lurk,
         Movie,
         Nap,
+        Piss,
         Poof,
+        Poop,
         School,
         Shower,
         Study,