From 3567392dd9cab9ed6554a19c67313b11709e417e Mon Sep 17 00:00:00 2001 From: Wizzy69 Date: Wed, 4 May 2022 16:00:46 +0300 Subject: [PATCH] --- BUILDS/net6.0/EVE_LevelingSystem.dll | Bin 10240 -> 10240 bytes BUILDS/net6.0/PluginManager.dll | Bin 43008 -> 43008 bytes DiscordBot/Discord/Commands/Restart.cs | 26 ++++++++++++------------- DiscordBot/Program.cs | 24 +++++++++-------------- EVE_LevelingSystem/LevelingSystem.cs | 12 +++++++++++- PluginManager/Others/Functions.cs | 6 ++---- 6 files changed, 35 insertions(+), 33 deletions(-) diff --git a/BUILDS/net6.0/EVE_LevelingSystem.dll b/BUILDS/net6.0/EVE_LevelingSystem.dll index 42de544b9088a1fa5ac88d7e1b2d30436f2e2822..4a7dd3cea5632761b62d645fb587ea4a02057318 100644 GIT binary patch delta 44 zcmV+{0Mq|~P=HX7hy*aODB7`%DhB~Qv$qG$6c8OV diff --git a/BUILDS/net6.0/PluginManager.dll b/BUILDS/net6.0/PluginManager.dll index bda798d35361e94454f11b05b005ed434ce169e6..b790e5f32037c60e9485f7913ac03c3583d7c057 100644 GIT binary patch delta 6267 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 delta 6328 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 command message /// The discord bot client /// True if the message was sent from a DM channel, false otherwise - public async void Execute(dsc.SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM) + public async void Execute(DiscordLibCommands.SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM) { - if (!DiscordPermissions.hasPermission(message.Author as SocketGuildUser, ds.GuildPermission.Administrator)) return; + if (!DiscordPermissions.hasPermission(message.Author as SocketGuildUser, DiscordLib.GuildPermission.Administrator)) return; var args = Functions.GetArguments(message); var OS = Functions.GetOperatinSystem(); if (args.Count == 0) @@ -87,15 +80,22 @@ namespace DiscordBot.Discord.Commands break; case "-cmd": case "-args": + string cmd = "--args"; + + if (args.Count > 1) + for (int i = 1; i < args.Count; i++) + cmd += $" {args[i]}"; + switch (OS) { case PluginManager.Others.OperatingSystem.WINDOWS: - Process.Start("./DiscordBot.exe", Functions.MergeStrings(args.ToArray(), 1)); + Functions.WriteLogFile("Restarting the bot with the following arguments: \"" + cmd + "\""); + Process.Start("./DiscordBot.exe", cmd); break; case PluginManager.Others.OperatingSystem.LINUX: case PluginManager.Others.OperatingSystem.MAC_OS: - Process.Start("./DiscordBot", Functions.MergeStrings(args.ToArray(), 1)); + Process.Start("./DiscordBot", cmd); break; default: return; diff --git a/DiscordBot/Program.cs b/DiscordBot/Program.cs index b276b1f..4b9fc73 100644 --- a/DiscordBot/Program.cs +++ b/DiscordBot/Program.cs @@ -36,9 +36,9 @@ namespace DiscordBot Directory.CreateDirectory("./Data/Languages"); Directory.CreateDirectory("./Data/Plugins/Commands"); Directory.CreateDirectory("./Data/Plugins/Events"); - if (!File.Exists("./Data/Resources/DiscordBotCore.data") || Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '\t')!.Length != 59) + if (!File.Exists("./Data/Resources/DiscordBotCore.data") || Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '=')!.Length != 59) { - File.WriteAllText("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN\ttoken\nBOT_PREFIX\t!\n"); + File.WriteAllText("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN=token\nBOT_PREFIX=!\n"); while (true) { Console.WriteLine("Please insert your token: "); @@ -46,11 +46,10 @@ namespace DiscordBot string botToken = Console.ReadLine(); if (botToken.Length == 59) { - string prefix = Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_PREFIX", - '\t'); + string prefix = Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_PREFIX", '='); if (prefix == string.Empty || prefix == null) prefix = "!"; - File.WriteAllText("./Data/Resources/DiscordBotCore.data", $"BOT_TOKEN\t{botToken}\nBOT_PREFIX\t{prefix}\n"); + File.WriteAllText("./Data/Resources/DiscordBotCore.data", $"BOT_TOKEN={botToken}\nBOT_PREFIX={prefix}\n"); break; } else Console.WriteLine("Invalid Token !"); @@ -239,7 +238,7 @@ namespace DiscordBot break; case "token": if (File.Exists("./Data/Resources/DiscordBotCore.data")) - Console.WriteLine("Token: " + Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '\t')); + Console.WriteLine("Token: " + Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '=')); else Console.WriteLine("File could not be found. Please register token"); break; default: @@ -359,17 +358,12 @@ namespace DiscordBot Console.Clear(); Console.ForegroundColor = ConsoleColor.DarkYellow; - Console.WriteLine("Discord BOT for Cross Platform\n\nCreated by: Wizzy\nDiscord: Wizzy#9181"); + //Console.WriteLine("Discord BOT for Cross Platform\n\nCreated by: Wizzy\nDiscord: Wizzy#9181"); Console.ForegroundColor = ConsoleColor.White; Console.WriteLine("============================ Discord BOT - Cross Platform ============================"); - string token = - Functions.readCodeFromFile((Functions.dataFolder + "DiscordBotCore.data"), "BOT_TOKEN", - '\t'); - string prefix = Functions.readCodeFromFile((Functions.dataFolder + "DiscordBotCore.data"), - "BOT_PREFIX", - '\t'); + string token = Functions.readCodeFromFile(Functions.dataFolder + "DiscordBotCore.data", "BOT_TOKEN", '='); + string prefix = Functions.readCodeFromFile(Functions.dataFolder + "DiscordBotCore.data", "BOT_PREFIX", '='); - Console.WriteLine("Detected prefix: " + prefix); var discordbooter = new Boot(token, prefix); await discordbooter.Awake(); return discordbooter; @@ -430,7 +424,7 @@ namespace DiscordBot return; } - if (len > 0 && args.Contains("--cmd")) + if (len > 0 && (args.Contains("--cmd") || args.Contains("--args"))) { if (args.Contains("lp") || args.Contains("loadplugins")) loadPluginsOnStartup = true; diff --git a/EVE_LevelingSystem/LevelingSystem.cs b/EVE_LevelingSystem/LevelingSystem.cs index 9b399b0..1edfa6b 100644 --- a/EVE_LevelingSystem/LevelingSystem.cs +++ b/EVE_LevelingSystem/LevelingSystem.cs @@ -18,7 +18,17 @@ public class LevelingSystem : DBEvent private async Task Client_MessageReceived(SocketMessage arg) { - if (arg.Author.IsBot || arg.Attachments.Count > 0 || arg.Content.StartsWith(Functions.readCodeFromFile(System.IO.Path.Combine(Functions.dataFolder, "DiscordBotCore.data"), "BOT_PREFIX", '\t'))) + if (arg.Author.IsBot || arg.Attachments.Count > 0 || + arg.Content.StartsWith + ( + Functions.readCodeFromFile + ( + fileName: System.IO.Path.Combine(Functions.dataFolder, "DiscordBotCore.data"), + Code: "BOT_PREFIX", + separator: '=' + ) + ) + ) return; if (Core.playerMessages.ContainsKey(arg.Author.Id)) diff --git a/PluginManager/Others/Functions.cs b/PluginManager/Others/Functions.cs index 02afbf5..2a09b70 100644 --- a/PluginManager/Others/Functions.cs +++ b/PluginManager/Others/Functions.cs @@ -48,7 +48,7 @@ namespace PluginManager.Others /// File name /// Setting name /// Separator between setting key code and its value - /// The value of the specified setting key code in the specified file (STRING) + /// The value of the specified setting key code in the specified file () public static string? readCodeFromFile(string fileName, string Code, char separator) => File.ReadAllLines(fileName) .Where(p => p.StartsWith(Code) && !p.StartsWith(commentMark.ToString())) @@ -65,9 +65,7 @@ namespace PluginManager.Others archFile = pakFolder + archFile; Directory.CreateDirectory(pakFolder); if (!File.Exists(archFile)) - { - throw new Exception("Failed to load file !"); - } + throw new FileNotFoundException("Failed to load file !"); string? textValue = null; var fs = new FileStream(archFile, FileMode.Open);