From 55fc6f48426da3acc36e723fe8a6c46f7b5bd829 Mon Sep 17 00:00:00 2001 From: Lan <50151341+Lannnnnnnnn@users.noreply.github.com> Date: Thu, 17 Jun 2021 23:11:48 +0300 Subject: [PATCH] fixed fish problem also removed some unused code --- Kehyeedra3/AIMLbot.dll | Bin 57344 -> 0 bytes Kehyeedra3/Bot.cs | 36 ++---------------- Kehyeedra3/Command handler.cs | 58 ----------------------------- Kehyeedra3/Commands/Economy.cs | 16 +++++++- Kehyeedra3/Commands/Help.cs | 2 +- Kehyeedra3/Commands/Interactive.cs | 2 +- Kehyeedra3/Commands/Stuff.cs | 3 +- Kehyeedra3/Kehyeedra3.csproj | 6 --- Kehyeedra3/RatelimitAttribute.cs | 2 +- 9 files changed, 23 insertions(+), 102 deletions(-) delete mode 100644 Kehyeedra3/AIMLbot.dll diff --git a/Kehyeedra3/AIMLbot.dll b/Kehyeedra3/AIMLbot.dll deleted file mode 100644 index ef06d82a289e9dfcfe59a8e25454d3c333648c99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57344 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 diff --git a/Kehyeedra3/Bot.cs b/Kehyeedra3/Bot.cs index c05c22f..c3aceb6 100644 --- a/Kehyeedra3/Bot.cs +++ b/Kehyeedra3/Bot.cs @@ -4,7 +4,6 @@ using Discord; using Discord.Commands; using Discord.WebSocket; using System.IO; -using AIMLbot; using Microsoft.Extensions.DependencyInjection; using System.Timers; using System.Net; @@ -21,14 +20,12 @@ namespace Kehyeedra3 /// Star Vars public static bool IsReady { get; private set; } public static DiscordSocketClient _bot; - public static System.Timers.Timer Clockboy; + //public static System.Timers.Timer Clockboy; public static AudioService AudioService; public static CommandService _cmds; public static IServiceProvider _dmap; public static CommandServiceConfig _cmdsconfig; public static Random _rnd = new Random(); - public static AIMLbot.Bot ChatService; - public static AIMLbot.User ChatUser; public static string PathToUserData; public static WebClient WeebClient; public static ReminderService RmService; @@ -38,8 +35,6 @@ namespace Kehyeedra3 // Environment.CurrentDirectory + @"Audio\cough1.wav", // Environment.CurrentDirectory + @"Audio\cough2.wav", // Environment.CurrentDirectory + @"Audio\wilhelmcough.wav", - // Environment.CurrentDirectory + @"Audio\trapcough1.wav", - // Environment.CurrentDirectory + @"Audio\trapcough2.wav", // Environment.CurrentDirectory + @"Audio\h3h3cough1.wav", // Environment.CurrentDirectory + @"Audio\h3h3cough2.wav", // Environment.CurrentDirectory + @"Audio\h3h3cough3.wav", @@ -58,7 +53,7 @@ namespace Kehyeedra3 DotEnv.Config(filePath: Path.Combine(AppContext.BaseDirectory, ".env")); var Config = Configuration.Load(); - Clockboy = new System.Timers.Timer(); + //Clockboy = new System.Timers.Timer(); WeebClient = new WebClient(); @@ -89,7 +84,6 @@ namespace Kehyeedra3 await CommandHandler.InstallCommands(); EventHandlers.InstallEventHandlers(); - InstallChatService(); //Clockboy.Elapsed += Clockboy_Elapsed; //Clockboy.Interval = SRandom.Next(3600000, 14400000); @@ -146,7 +140,7 @@ namespace Kehyeedra3 _bot.Ready += _bot_Ready; await _bot.LoginAsync(TokenType.Bot, Configuration.Load().Token); await _bot.StartAsync(); - Clockboy.Start(); + //Clockboy.Start(); //new Thread(async x => //{ // await Bot.RmService.Tick(); @@ -188,28 +182,6 @@ namespace Kehyeedra3 Environment.Exit(0); } } - public static void InstallChatService() - { - try - { - string path = Path.Combine(Environment.CurrentDirectory, "config", - "Settings.xml"); - if (File.Exists(path)) - { - ChatService = new AIMLbot.Bot(); - ChatService.loadSettings(path); - ChatService.isAcceptingUserInput = false; - ChatService.loadAIMLFromFiles(); - ChatService.isAcceptingUserInput = true; - PathToUserData = Path.Combine(Environment.CurrentDirectory, "aimlusers"); - Console.WriteLine("Loaded: Chat Service"); - } - else { } - } - catch(Exception ex) - { - Console.WriteLine (ex); - } - } + } } \ No newline at end of file diff --git a/Kehyeedra3/Command handler.cs b/Kehyeedra3/Command handler.cs index 3fe2d97..efcf9a5 100644 --- a/Kehyeedra3/Command handler.cs +++ b/Kehyeedra3/Command handler.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Discord.WebSocket; using Discord.Commands; using System.Reflection; -using AIMLbot; using System.IO; using System.Data; using Discord; @@ -16,59 +15,6 @@ namespace Kehyeedra3 //Set CommandHandler as partial class of Bot class CommandHandler : Bot { - public static async Task KizunaAi(ICommandContext Context, String Message) - { - try - { - if (Message.Contains($"{Context.Client.CurrentUser.Id}")) - { - var messagearr = Message.Split(' '); - Message = String.Join(" ", messagearr.Skip(1).ToArray()); - } - if (Message.ToLowerInvariant().Contains("what is ")) - { - string fiNum = Message.Substring(8); - string result = new DataTable().Compute(fiNum, null).ToString(); - await Context.Channel.SendMessageAsync($"{Context.User.Mention}, {fiNum} = {result}"); - } - else - { - bool triggeredphrase = false; - KeyValuePair trigger = new KeyValuePair("", ""); - foreach (var phrase in Configuration.Load().TriggerPhrases) - { - if (Message.ToLowerInvariant().Contains(phrase.Key)) - { - triggeredphrase = true; - trigger = phrase; - break; - } - } - if (!triggeredphrase) - { - ChatUser = new AIMLbot.User(Convert.ToString(Context.User.Id + ".dat"), ChatService); - if (!File.Exists(PathToUserData + "\\" + Context.User.Id + ".dat")) - ChatUser.Predicates.DictionaryAsXML.Save(PathToUserData + "\\" + Context.User.Id + ".dat"); - ChatUser = new AIMLbot.User(Convert.ToString(Context.User.Id), ChatService); - ChatUser.Predicates.loadSettings(PathToUserData + "\\" + Context.User.Id + ".dat"); - var r = new AIMLbot.Request(Message, ChatUser, ChatService); - var userresp = ChatService.Chat(r); - var response = userresp.Output; - ChatUser.Predicates.DictionaryAsXML.Save(PathToUserData + "\\" + Context.User.Id + ".dat"); - await Context.Channel.SendMessageAsync($"{Context.User.Mention}, {response}"); - } - else - { - await Context.Channel.SendMessageAsync($"{Context.User.Mention}, {trigger.Value}"); - } - } - } - catch(Exception ex) - { - Console.WriteLine(ex); - } - - } public static async Task InstallCommands() { //adds HandleCommand to handle the commands from message received @@ -108,10 +54,6 @@ namespace Kehyeedra3 int argPos = 0; - if (message.HasMentionPrefix(_bot.CurrentUser, ref argPos)) - { - await KizunaAi(Context, message.Content); - } if (message.Content.Contains("\uD83C\uDD71")) //B emoji detector { await Context.Channel.SendMessageAsync($"B emoji detected. Proceed to kill yourself, {Context.User.Mention}"); diff --git a/Kehyeedra3/Commands/Economy.cs b/Kehyeedra3/Commands/Economy.cs index 9ff40e3..550daac 100644 --- a/Kehyeedra3/Commands/Economy.cs +++ b/Kehyeedra3/Commands/Economy.cs @@ -742,7 +742,7 @@ namespace Kehyeedra3.Commands outputStream.Position = 0; - await Context.Channel.SendFileAsync(outputStream, $"fish.{outFormat}"); + await Context.Channel.SendFileAsync(outputStream, $"fish.{outFormat}", $"{Context.User.Mention}"); } else @@ -1006,6 +1006,7 @@ namespace Kehyeedra3.Commands } if (inv.Any()) { + Dictionary small = new Dictionary(); Dictionary med = new Dictionary(); Dictionary large = new Dictionary(); @@ -1062,6 +1063,12 @@ namespace Kehyeedra3.Commands foreach (var entry in inv) { + if (!fishes.Any(x => x.Id == entry.Key)) + { + inv.Remove(entry.Key); + continue; + } + fishmote = fishes.FirstOrDefault(x => x.Id == entry.Key).Emote; if (!fishmote.Contains("><")) @@ -1546,9 +1553,14 @@ namespace Kehyeedra3.Commands { inv = feeshUser.GetInventory(); } - + List fishes = Fishing.GetFishList(); foreach (var entry in inv) { + if (!fishes.Any(x => x.Id == entry.Key)) + { + inv.Remove(entry.Key); + continue; + } if (entry.Value.Count() > 0) { if (entry.Value[0] > 0) diff --git a/Kehyeedra3/Commands/Help.cs b/Kehyeedra3/Commands/Help.cs index eeceb3a..64c5b5d 100644 --- a/Kehyeedra3/Commands/Help.cs +++ b/Kehyeedra3/Commands/Help.cs @@ -39,7 +39,7 @@ namespace Kehyeedra3.Commands } embed.AddField(module.Name, coommands.ToString()); } - await ReplyAsync("Here's a list of commands search for the command to find what it be and what it do", false, embed.Build()); + await ReplyAsync("Here's a list of commands, search for a command to find what it be and what it do", false, embed.Build()); } else { diff --git a/Kehyeedra3/Commands/Interactive.cs b/Kehyeedra3/Commands/Interactive.cs index c172764..1c98687 100644 --- a/Kehyeedra3/Commands/Interactive.cs +++ b/Kehyeedra3/Commands/Interactive.cs @@ -882,7 +882,7 @@ namespace Kehyeedra3.Commands } } ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - else if (input == "bulksell") + else if (input == "bulksell" || input == "bs") { int value = 0; int count = 0; diff --git a/Kehyeedra3/Commands/Stuff.cs b/Kehyeedra3/Commands/Stuff.cs index 4833ac5..e90175f 100644 --- a/Kehyeedra3/Commands/Stuff.cs +++ b/Kehyeedra3/Commands/Stuff.cs @@ -141,7 +141,8 @@ namespace Kehyeedra3.Commands "I think so", "Mayhaps", "Yeah but you're still gay", - "No kys" + "No kys", + "Not today", }; int randomIndex = rando.Next(predictions.Length); string text = predictions[randomIndex]; diff --git a/Kehyeedra3/Kehyeedra3.csproj b/Kehyeedra3/Kehyeedra3.csproj index 9a68c46..08a6e2e 100644 --- a/Kehyeedra3/Kehyeedra3.csproj +++ b/Kehyeedra3/Kehyeedra3.csproj @@ -19,12 +19,6 @@ - - - AIMLbot.dll - - - Always diff --git a/Kehyeedra3/RatelimitAttribute.cs b/Kehyeedra3/RatelimitAttribute.cs index dcca716..c3ad353 100644 --- a/Kehyeedra3/RatelimitAttribute.cs +++ b/Kehyeedra3/RatelimitAttribute.cs @@ -97,7 +97,7 @@ namespace Kehyeedra3 } else { - return Task.FromResult(PreconditionResult.FromError("BRRROOOooooO WGHAT THE TFUCUKL YOU ARE SttuPPIIIIDDDD jas fapped in public pa po pe")); + return Task.FromResult(PreconditionResult.FromError("Ok retard calm down")); } }