From aefd06e8eb520630a3f64d5191915c9b4bededd5 Mon Sep 17 00:00:00 2001 From: Wizzy69 Date: Fri, 22 Apr 2022 14:34:55 +0300 Subject: [PATCH] Patch --- BUILDS/net5.0/CMD_LevelingSystem.deps.json | 126 ++++++++++----------- BUILDS/net5.0/CMD_LevelingSystem.dll | Bin 10240 -> 10240 bytes BUILDS/net5.0/CMD_Utils.deps.json | 126 ++++++++++----------- BUILDS/net5.0/CMD_Utils.dll | Bin 11776 -> 11264 bytes BUILDS/net5.0/EVE_LevelingSystem.deps.json | 126 ++++++++++----------- BUILDS/net5.0/EVE_LevelingSystem.dll | Bin 9728 -> 9728 bytes BUILDS/net5.0/MusicCommands.dll | Bin 19968 -> 19968 bytes BUILDS/net5.0/PluginManager.dll | Bin 41984 -> 42496 bytes BUILDS/net5.0/StartupEvents.deps.json | 126 ++++++++++----------- BUILDS/net5.0/StartupEvents.dll | Bin 12800 -> 12800 bytes BUILDS/net5.0/ref/CMD_LevelingSystem.dll | Bin 6656 -> 6656 bytes BUILDS/net5.0/ref/CMD_Utils.dll | Bin 7168 -> 7168 bytes BUILDS/net5.0/ref/EVE_LevelingSystem.dll | Bin 6144 -> 6144 bytes BUILDS/net5.0/ref/StartupEvents.dll | Bin 6144 -> 6144 bytes CMD_Utils/CMD_Utils.csproj | 3 + DiscordBot.sln | 2 +- DiscordBot/App.config | 10 +- DiscordBot/Discord/Commands/Help.cs | 2 +- DiscordBot/Discord/Commands/Restart.cs | 65 +++++++++++ DiscordBot/Discord/Core/CommandHandler.cs | 26 +---- DiscordBot/DiscordBot.csproj | 2 + MusicCommands/MusicCommands.csproj | 2 + PluginManager/Interfaces/DBCommand.cs | 29 +++++ PluginManager/Loaders/EventsLoader.cs | 2 +- PluginManager/Online/Downloader.cs | 2 +- PluginManager/PluginManager.csproj | 6 + 26 files changed, 368 insertions(+), 287 deletions(-) create mode 100644 DiscordBot/Discord/Commands/Restart.cs diff --git a/BUILDS/net5.0/CMD_LevelingSystem.deps.json b/BUILDS/net5.0/CMD_LevelingSystem.deps.json index 85f25c7..e922af1 100644 --- a/BUILDS/net5.0/CMD_LevelingSystem.deps.json +++ b/BUILDS/net5.0/CMD_LevelingSystem.deps.json @@ -14,28 +14,28 @@ "CMD_LevelingSystem.dll": {} } }, - "Discord.Net/3.1.0": { + "Discord.Net/3.5.0": { "dependencies": { - "Discord.Net.Commands": "3.1.0", - "Discord.Net.Core": "3.1.0", - "Discord.Net.Interactions": "3.1.0", - "Discord.Net.Rest": "3.1.0", - "Discord.Net.WebSocket": "3.1.0", - "Discord.Net.Webhook": "3.1.0" + "Discord.Net.Commands": "3.5.0", + "Discord.Net.Core": "3.5.0", + "Discord.Net.Interactions": "3.5.0", + "Discord.Net.Rest": "3.5.0", + "Discord.Net.WebSocket": "3.5.0", + "Discord.Net.Webhook": "3.5.0" } }, - "Discord.Net.Commands/3.1.0": { + "Discord.Net.Commands/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0" + "Discord.Net.Core": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.Commands.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Core/3.1.0": { + "Discord.Net.Core/3.5.0": { "dependencies": { "Newtonsoft.Json": "13.0.1", "System.Collections.Immutable": "5.0.0", @@ -44,59 +44,59 @@ }, "runtime": { "lib/net5.0/Discord.Net.Core.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Interactions/3.1.0": { + "Discord.Net.Interactions/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0", - "Discord.Net.Rest": "3.1.0", - "Discord.Net.WebSocket": "3.1.0", + "Discord.Net.Core": "3.5.0", + "Discord.Net.Rest": "3.5.0", + "Discord.Net.WebSocket": "3.5.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", "System.Collections.Immutable": "5.0.0", "System.Reactive": "5.0.0" }, "runtime": { "lib/net5.0/Discord.Net.Interactions.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Rest/3.1.0": { + "Discord.Net.Rest/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0" + "Discord.Net.Core": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.Rest.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Webhook/3.1.0": { + "Discord.Net.Webhook/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0", - "Discord.Net.Rest": "3.1.0" + "Discord.Net.Core": "3.5.0", + "Discord.Net.Rest": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.Webhook.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.WebSocket/3.1.0": { + "Discord.Net.WebSocket/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0", - "Discord.Net.Rest": "3.1.0" + "Discord.Net.Core": "3.5.0", + "Discord.Net.Rest": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.WebSocket.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, @@ -147,7 +147,7 @@ "System.ValueTuple/4.5.0": {}, "PluginManager/1.0.0": { "dependencies": { - "Discord.Net": "3.1.0" + "Discord.Net": "3.5.0" }, "runtime": { "PluginManager.dll": {} @@ -161,54 +161,54 @@ "serviceable": false, "sha512": "" }, - "Discord.Net/3.1.0": { + "Discord.Net/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-GAY7d+k8UN5BsObGpysvg7ca6YwTqvesTouM8S8eBWSmwGnK38iceVkURg0QNAG70tlJ4w8S/BOjocRRvXU2MQ==", - "path": "discord.net/3.1.0", - "hashPath": "discord.net.3.1.0.nupkg.sha512" + "sha512": "sha512-IUtexpvogudb1rllKBWkIEpBVQoToMjtVo81KPkt+gNMe7KtRDcZJgcn6+72viMtyw0e95OJPXFV5VEA/n2OQQ==", + "path": "discord.net/3.5.0", + "hashPath": "discord.net.3.5.0.nupkg.sha512" }, - "Discord.Net.Commands/3.1.0": { + "Discord.Net.Commands/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-EZdtrAqj6Uspyz4CvIwFP/UQ4XUpXjIPG1b5LrfAKOo12ks4k6XO7up2h+UsHexk7mEz4sfZxkEXGrW6PSh+/Q==", - "path": "discord.net.commands/3.1.0", - "hashPath": "discord.net.commands.3.1.0.nupkg.sha512" + "sha512": "sha512-ClTv8aiTlitvS48YatRiTLvgE2f2uKgmHNPVBIuvJBHZO2u4bZCzoN1fid+pZn2sbVOkt8uftlLGzz5DSZlFIA==", + "path": "discord.net.commands/3.5.0", + "hashPath": "discord.net.commands.3.5.0.nupkg.sha512" }, - "Discord.Net.Core/3.1.0": { + "Discord.Net.Core/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-Oxz3CiWVvenSaHRYZeCKgRqzcWqdjGYmpxVVN2vPikt6bTN+xHAR4jczk8plKDDdINt7Lac37iLsRaqzUtJZpQ==", - "path": "discord.net.core/3.1.0", - "hashPath": "discord.net.core.3.1.0.nupkg.sha512" + "sha512": "sha512-rCzzaznMVQ+bLMxOpYwTyqm9V22kMy6BxlQisSxemHZDe2Jedz3Clp/a0dToACLz+Dlp3u+jYUfCBnTz7L6f4g==", + "path": "discord.net.core/3.5.0", + "hashPath": "discord.net.core.3.5.0.nupkg.sha512" }, - "Discord.Net.Interactions/3.1.0": { + "Discord.Net.Interactions/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-XzLChVRQGniUU8kdLMDYEOjifzvrcsOiAdKm/pO/PGPpZSMWSzPWlJUWaQlWMtOImrYULzRejOeoc2/3K3R30Q==", - "path": "discord.net.interactions/3.1.0", - "hashPath": "discord.net.interactions.3.1.0.nupkg.sha512" + "sha512": "sha512-wE9+V9DJ7r+1s4euOi4sGPIAt4sD7r+Tk5s9mrlbLCHVQTK4KllAvcrL25bPFI38FuFceREEzFoRlTrekSyB2Q==", + "path": "discord.net.interactions/3.5.0", + "hashPath": "discord.net.interactions.3.5.0.nupkg.sha512" }, - "Discord.Net.Rest/3.1.0": { + "Discord.Net.Rest/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-97kdAYjlNuuOnhRQW/OoGK2oBObvpzZlCSPJjIcI4DneEq6k2WIFhG00fvxK7DCVTlB5BgBMAT1BeRUk4/rUxQ==", - "path": "discord.net.rest/3.1.0", - "hashPath": "discord.net.rest.3.1.0.nupkg.sha512" + "sha512": "sha512-BnTdLFuuQsKvCv08VQrD4X1Hw2Xp+MELIRQiDiKfG01IiQlRTN+1gc3LB1zXgn5xBvC0HXjHxwV22GrMD9uKHQ==", + "path": "discord.net.rest/3.5.0", + "hashPath": "discord.net.rest.3.5.0.nupkg.sha512" }, - "Discord.Net.Webhook/3.1.0": { + "Discord.Net.Webhook/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-cZFxFf9H3GUBITlx1b7IskglgjJxSYpOIZOtyVW2WnPp7LpnxlOi1piRG22fH9fdhCC/RyDx3gZtYfN6WzacCw==", - "path": "discord.net.webhook/3.1.0", - "hashPath": "discord.net.webhook.3.1.0.nupkg.sha512" + "sha512": "sha512-vCIGZS+m88sQDuFmdbUqg+2RIXS/NJWx8ei3MX+ZEYiAvOkDgQfkIlEnU1NKpds6ivTt5GFlv6UzcWubb5VJ1w==", + "path": "discord.net.webhook/3.5.0", + "hashPath": "discord.net.webhook.3.5.0.nupkg.sha512" }, - "Discord.Net.WebSocket/3.1.0": { + "Discord.Net.WebSocket/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-6OsLNXHNKC/laDKoBD+T0Km0vzqHaCcBOaI/NA8Qsed935MtEOTy7juorF22gF6TYOeoclUgSINrHCY4zWvxpA==", - "path": "discord.net.websocket/3.1.0", - "hashPath": "discord.net.websocket.3.1.0.nupkg.sha512" + "sha512": "sha512-LjBOvcP40vJ+dhOtBDi8haEeblPAKpAIqR04NBzTM1/0RVavJZH89ovfSQIk42ygkiOaDV4E2x0Mmh6DRoIYcw==", + "path": "discord.net.websocket/3.5.0", + "hashPath": "discord.net.websocket.3.5.0.nupkg.sha512" }, "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { "type": "package", diff --git a/BUILDS/net5.0/CMD_LevelingSystem.dll b/BUILDS/net5.0/CMD_LevelingSystem.dll index 61627efcddd546102cfbe52e32e877fac016d06a..9a59abcf6b1a7e52600f7e4b1925cbd6d1a9c377 100644 GIT binary patch delta 1580 zcmZ9Mdu&ui6vn?Zd+*#!w`{xHc4=L@*|LSwNBW2qiXepA@(2MM+M-xuthE#@QMCO- z33S&QC^nd|3^ovu5E>t-n2$`2CAs77>pVs6-cxR=$XqBiIdFlp6|>z zXYTHunP^S4X6JUJ z7cdc>4ut#wDax4@uMt1FTyEs6ayd1tSO68h3<&?0WWazd5`|{P@_3ufAo8p2)+{=x zKCx=jGKpOsGk~P@JFYa-YtG)G!gc|Bmf5rElIpVa=|y$a&g9HldtU(-uvfQI?%R0s zG45WDc^O>_7WW&x^mzQW32F4u3D)5bV7d*g;~uVUe_{QzEp6JmGZlE6t>OAw-1Gq~ z5nfckq>7(Ln))`WfMzMv{W>jE``p=irS?4OK|j@59vrgjEQz(EOG?-d{pgZD9HAlg zqq~IaR7!Fn;Ya~KlmjRC`hTX_pLSA1^(L=~yiaA=ZGM=bM1wfa zb-T=unbr15<~cgWJZ7C?4&ig=*YXP@{yPVmi*cN}-r*(;alF;xPF&>J#&_($zvfeP zg)=Lpo@L{zdVXSgVHL;gLi&}iPWaW-sx_f57+P(-tLPWkZ)$L2p#Bz_NXpUv9;`IS zxn6ZbUBNh6h$htE_=jvl^E->lEp-vo^rR!pVlO`z!QjM3omlRcXQ)r z4y$Jp>M`RM`S4~!=~dG(l2CfpbOdtsyjW(g%oZ8QbJVuXAn$+-lsamZJhoQ*^R#o6 z0wTcbfTJ8|Dg1aRF{rJ6Z01vR&&r31|MY6!rGh^S;KDKGP6_k&D@l1TqWy=VOY#=t zMbDy6Ok;j&6{69}5M>w@m_YNbx$qLiTx8KCyOJ}TtwqSE<)Q{<%zDhGRrceYUuZS5 zCv2~0R#=@_Lb~!2^4VQ{pn`HY(w)kaQLI*{u87Q_BCMn;I*U29nBz|CBOIj*^aLHH zHL{6jpu=e6QDJUk?%*TRM>Tdg_0bPzjK-X~V?0Z8-J7mAs2FaPh+?Fnf*HW0%rKs0 z7NUpwAU_sbn7oR#DK?4TG2%0!ELJhdi)N#o53Nz|32hX7m z`*8&Qh>~!wi%!bZ7l5hxwiBO2A;;HD&5K5%&^{M`5PjvTx4bjWB6^rMs8MftQ7?`0 zS4!MFI&j)PQ$Jj6|F5m(Tj>9}(R(?y)R&#nOE;W@d;hFnwZ)euYpEGM6hGkmOuCmf zx3x94G%wuH*b;Bb+Dq}<4>XC?{(159edk&$U)_4^K#Hhpk8jMDLL$Mq`U5^ij@+t0_GVT(o^W)xWe^9K{ F`WNvuG8X^< delta 1559 zcmZvc4NR3)7{~w5x$oEIco9TMr368ZiRO^Gf;3u$Zc$nhE1cSFnm`tj zWX;>jGId62s~dBZT`RZdnxS)M)0#G8IYtuN$6U$W2W56&tP;AC6_A+`LfiQmQ^f(@*W0+y(I^=IaOuwQ2fE~F&2-y{WR|g`;j&v&jMC*kF40RuKAfK)~nQxbYL~7 zM(S7KCm(+rYmw^untS+p-6sc=W>A@QC-0<%^4;W|f{0aVcyN@eO%HaO)uw^RMVDc~ za%iK=@Zlhxl*7rhW~u0UoX`y1rYVNB0fcag24KK#DrJ!q-M|c?R#v6>YgFAY^=i{b zrqN9vEYg%+O5J224QCA-*=9G{80V;sH(0lE$WdZ?Hzi?!y0~tMc2@3BX=sm83EtHE z5;V{#4s)F@{WE5{^*Qr2eZh>G{mk?m z`M1`5l!jQTHPk2z!*X+KX;Bs1PlkClaoPQguDq6ncTQ8@+DVVDxUR?_QiJuQq$4R; z<-djH`WV++lJJHxMkYEE-Z*X$zk%aLaTS_K!JmoPHq$LqaeV4zl@T)_mwAHKQ-l|J zkx6Yr53%=D!h1*?B_BRWcxqNZh7z8dHGp8A8W+vXGp5Lco~&B33}j$efl_~@pa`nKqu|Q}cHwA0A%ca^8r7*B@{pCNt6^yu&KedY@MLF{p~XTe#9G zJRtI!$IK!$ISNsRRt`7aX)b`5AQm8tlB`9nw3^i@r29l2N|^Pipc?C8)+@{=&atg# zW|6rSHKZ!nkS^~}Z)z{0Vl1aBI)(YPgzaa|BZ$#CYNQygG#;TjXw%kmROlO-?Yyh| zXtC8reKe@QPS>2V*LakH0Is`s(@Z3zSj>bUrOY6||4c-%idh87ybHa|`S_H%82#=1 zSmp#)F!!ScKZ|~cLukYqF@(oh8KOp9Why)DdXd@TFc+rwBh(|)d^zp>TmESce0`|DbgOp$ zf3&-~IJn@yt%oif|J4p?lbYarz=dhN9@Fq1)}W5oKu%5)kNJ)p@l9E8Q#?JmTBN7H z-_X)qziUb7$ljadtM(mrpC$EHxX&@fBeHY1C*zfx$ac`@+ jepPljnrqX=_(-^rJyR!K;zniMoBumSXPbWkb}=g+ diff --git a/BUILDS/net5.0/CMD_Utils.deps.json b/BUILDS/net5.0/CMD_Utils.deps.json index 6dd7496..b2d6638 100644 --- a/BUILDS/net5.0/CMD_Utils.deps.json +++ b/BUILDS/net5.0/CMD_Utils.deps.json @@ -14,28 +14,28 @@ "CMD_Utils.dll": {} } }, - "Discord.Net/3.1.0": { + "Discord.Net/3.5.0": { "dependencies": { - "Discord.Net.Commands": "3.1.0", - "Discord.Net.Core": "3.1.0", - "Discord.Net.Interactions": "3.1.0", - "Discord.Net.Rest": "3.1.0", - "Discord.Net.WebSocket": "3.1.0", - "Discord.Net.Webhook": "3.1.0" + "Discord.Net.Commands": "3.5.0", + "Discord.Net.Core": "3.5.0", + "Discord.Net.Interactions": "3.5.0", + "Discord.Net.Rest": "3.5.0", + "Discord.Net.WebSocket": "3.5.0", + "Discord.Net.Webhook": "3.5.0" } }, - "Discord.Net.Commands/3.1.0": { + "Discord.Net.Commands/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0" + "Discord.Net.Core": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.Commands.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Core/3.1.0": { + "Discord.Net.Core/3.5.0": { "dependencies": { "Newtonsoft.Json": "13.0.1", "System.Collections.Immutable": "5.0.0", @@ -44,59 +44,59 @@ }, "runtime": { "lib/net5.0/Discord.Net.Core.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Interactions/3.1.0": { + "Discord.Net.Interactions/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0", - "Discord.Net.Rest": "3.1.0", - "Discord.Net.WebSocket": "3.1.0", + "Discord.Net.Core": "3.5.0", + "Discord.Net.Rest": "3.5.0", + "Discord.Net.WebSocket": "3.5.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", "System.Collections.Immutable": "5.0.0", "System.Reactive": "5.0.0" }, "runtime": { "lib/net5.0/Discord.Net.Interactions.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Rest/3.1.0": { + "Discord.Net.Rest/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0" + "Discord.Net.Core": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.Rest.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Webhook/3.1.0": { + "Discord.Net.Webhook/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0", - "Discord.Net.Rest": "3.1.0" + "Discord.Net.Core": "3.5.0", + "Discord.Net.Rest": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.Webhook.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.WebSocket/3.1.0": { + "Discord.Net.WebSocket/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0", - "Discord.Net.Rest": "3.1.0" + "Discord.Net.Core": "3.5.0", + "Discord.Net.Rest": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.WebSocket.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, @@ -147,7 +147,7 @@ "System.ValueTuple/4.5.0": {}, "PluginManager/1.0.0": { "dependencies": { - "Discord.Net": "3.1.0" + "Discord.Net": "3.5.0" }, "runtime": { "PluginManager.dll": {} @@ -161,54 +161,54 @@ "serviceable": false, "sha512": "" }, - "Discord.Net/3.1.0": { + "Discord.Net/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-GAY7d+k8UN5BsObGpysvg7ca6YwTqvesTouM8S8eBWSmwGnK38iceVkURg0QNAG70tlJ4w8S/BOjocRRvXU2MQ==", - "path": "discord.net/3.1.0", - "hashPath": "discord.net.3.1.0.nupkg.sha512" + "sha512": "sha512-IUtexpvogudb1rllKBWkIEpBVQoToMjtVo81KPkt+gNMe7KtRDcZJgcn6+72viMtyw0e95OJPXFV5VEA/n2OQQ==", + "path": "discord.net/3.5.0", + "hashPath": "discord.net.3.5.0.nupkg.sha512" }, - "Discord.Net.Commands/3.1.0": { + "Discord.Net.Commands/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-EZdtrAqj6Uspyz4CvIwFP/UQ4XUpXjIPG1b5LrfAKOo12ks4k6XO7up2h+UsHexk7mEz4sfZxkEXGrW6PSh+/Q==", - "path": "discord.net.commands/3.1.0", - "hashPath": "discord.net.commands.3.1.0.nupkg.sha512" + "sha512": "sha512-ClTv8aiTlitvS48YatRiTLvgE2f2uKgmHNPVBIuvJBHZO2u4bZCzoN1fid+pZn2sbVOkt8uftlLGzz5DSZlFIA==", + "path": "discord.net.commands/3.5.0", + "hashPath": "discord.net.commands.3.5.0.nupkg.sha512" }, - "Discord.Net.Core/3.1.0": { + "Discord.Net.Core/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-Oxz3CiWVvenSaHRYZeCKgRqzcWqdjGYmpxVVN2vPikt6bTN+xHAR4jczk8plKDDdINt7Lac37iLsRaqzUtJZpQ==", - "path": "discord.net.core/3.1.0", - "hashPath": "discord.net.core.3.1.0.nupkg.sha512" + "sha512": "sha512-rCzzaznMVQ+bLMxOpYwTyqm9V22kMy6BxlQisSxemHZDe2Jedz3Clp/a0dToACLz+Dlp3u+jYUfCBnTz7L6f4g==", + "path": "discord.net.core/3.5.0", + "hashPath": "discord.net.core.3.5.0.nupkg.sha512" }, - "Discord.Net.Interactions/3.1.0": { + "Discord.Net.Interactions/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-XzLChVRQGniUU8kdLMDYEOjifzvrcsOiAdKm/pO/PGPpZSMWSzPWlJUWaQlWMtOImrYULzRejOeoc2/3K3R30Q==", - "path": "discord.net.interactions/3.1.0", - "hashPath": "discord.net.interactions.3.1.0.nupkg.sha512" + "sha512": "sha512-wE9+V9DJ7r+1s4euOi4sGPIAt4sD7r+Tk5s9mrlbLCHVQTK4KllAvcrL25bPFI38FuFceREEzFoRlTrekSyB2Q==", + "path": "discord.net.interactions/3.5.0", + "hashPath": "discord.net.interactions.3.5.0.nupkg.sha512" }, - "Discord.Net.Rest/3.1.0": { + "Discord.Net.Rest/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-97kdAYjlNuuOnhRQW/OoGK2oBObvpzZlCSPJjIcI4DneEq6k2WIFhG00fvxK7DCVTlB5BgBMAT1BeRUk4/rUxQ==", - "path": "discord.net.rest/3.1.0", - "hashPath": "discord.net.rest.3.1.0.nupkg.sha512" + "sha512": "sha512-BnTdLFuuQsKvCv08VQrD4X1Hw2Xp+MELIRQiDiKfG01IiQlRTN+1gc3LB1zXgn5xBvC0HXjHxwV22GrMD9uKHQ==", + "path": "discord.net.rest/3.5.0", + "hashPath": "discord.net.rest.3.5.0.nupkg.sha512" }, - "Discord.Net.Webhook/3.1.0": { + "Discord.Net.Webhook/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-cZFxFf9H3GUBITlx1b7IskglgjJxSYpOIZOtyVW2WnPp7LpnxlOi1piRG22fH9fdhCC/RyDx3gZtYfN6WzacCw==", - "path": "discord.net.webhook/3.1.0", - "hashPath": "discord.net.webhook.3.1.0.nupkg.sha512" + "sha512": "sha512-vCIGZS+m88sQDuFmdbUqg+2RIXS/NJWx8ei3MX+ZEYiAvOkDgQfkIlEnU1NKpds6ivTt5GFlv6UzcWubb5VJ1w==", + "path": "discord.net.webhook/3.5.0", + "hashPath": "discord.net.webhook.3.5.0.nupkg.sha512" }, - "Discord.Net.WebSocket/3.1.0": { + "Discord.Net.WebSocket/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-6OsLNXHNKC/laDKoBD+T0Km0vzqHaCcBOaI/NA8Qsed935MtEOTy7juorF22gF6TYOeoclUgSINrHCY4zWvxpA==", - "path": "discord.net.websocket/3.1.0", - "hashPath": "discord.net.websocket.3.1.0.nupkg.sha512" + "sha512": "sha512-LjBOvcP40vJ+dhOtBDi8haEeblPAKpAIqR04NBzTM1/0RVavJZH89ovfSQIk42ygkiOaDV4E2x0Mmh6DRoIYcw==", + "path": "discord.net.websocket/3.5.0", + "hashPath": "discord.net.websocket.3.5.0.nupkg.sha512" }, "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { "type": "package", diff --git a/BUILDS/net5.0/CMD_Utils.dll b/BUILDS/net5.0/CMD_Utils.dll index 6811276d54816fc28bd8805064f995d553b176d3..55590d80cdf60ac65002d80357d86bcb39366c48 100644 GIT binary patch delta 2348 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 AcK`qY delta 1358 zcmZ9Me@s{unevyRzI}Ogx$lDw)T@ZXdPfzIrxuH1^$3OO57kAT^pzr!p$}yO zq`E>Y5>4Wy7II;y03_fOFF66tWfYr5FtSQyk!xi)0V~r~xooBD>X0nZzGFen$UHS7 zoBdUs?5YM_^KUycbe|r5PesjD>P54HE~`(>2=%Dn%p&D-9?Ae7$b-Fj66$&4Lu$ZT z7Tw2bXcsWe&mAVm%^lBf-M-~H%i7@u&hdy)ycvytfK!C(kTSV zzq(>~l}kTGA z)kk4qT)UvTQ3XGMfNm*SxQzw)SoV@1L&lWh$0!|T&nC^<_2Ph$k8D#Am2`{a zHvaGDW5VH~LEO?ZnNPEF3BT)6+Dcbtl4GY_Ma3AC&2$Ohs?R-Hv{{XMVx7ZOYxhdp zy=uAFM?BB!lC-;&APsR*f(&eC2Kcy^AcVclBAj5BVT4(UG3ILg#awIa&CGsmL&))^ z&5LNkO>q%ztkj4W6f!x!+wq0yW+~{fxDl;*8T~keaRf-?&kLBOb$njk`Z{&WTk1GY z->4aHsOUURTbs}=q}F+Q->^c5T{oxJtC%kkvCS#T;FJFU$`hKUai!Yt3u`~HJ@Kh; zuaSslPg9~M_Z)fqPfg`u`1`f*zV+kzJ<%R#qA>3;ISPVKHM}sG7+?4y1-XNDOZ;~Y l@kKbd&Z>b$0lo%LFRD{DLAI`u7={{meO87Ke% diff --git a/BUILDS/net5.0/MusicCommands.dll b/BUILDS/net5.0/MusicCommands.dll index bae106e340c6f6bc8e3ebf661748dceee1c27813..06a3e2a9e0ed2ca824f5484a6c59b55a06d3b7b5 100644 GIT binary patch delta 152 zcmZpe!`Lu~aY6^njb%#?PVA9kQj!>gJsgcp&5RkKmS@8( z2l*rNP|mu8_mr>SRo}$42k2H9xCUY?OjHyDg~c=10LIOH9>18GUYKka^m)%X(SRKQ D9?5hH diff --git a/BUILDS/net5.0/PluginManager.dll b/BUILDS/net5.0/PluginManager.dll index 4592f3bb8c10ffbeb108df92634516656ed38bb6..ebac89dd8f8c0543f5001ee9db163525928fc536 100644 GIT binary patch delta 18936 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 delta 18240 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 z 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 H-}Qe0Iz{Dz diff --git a/BUILDS/net5.0/StartupEvents.deps.json b/BUILDS/net5.0/StartupEvents.deps.json index ac69826..bcc693a 100644 --- a/BUILDS/net5.0/StartupEvents.deps.json +++ b/BUILDS/net5.0/StartupEvents.deps.json @@ -14,28 +14,28 @@ "StartupEvents.dll": {} } }, - "Discord.Net/3.1.0": { + "Discord.Net/3.5.0": { "dependencies": { - "Discord.Net.Commands": "3.1.0", - "Discord.Net.Core": "3.1.0", - "Discord.Net.Interactions": "3.1.0", - "Discord.Net.Rest": "3.1.0", - "Discord.Net.WebSocket": "3.1.0", - "Discord.Net.Webhook": "3.1.0" + "Discord.Net.Commands": "3.5.0", + "Discord.Net.Core": "3.5.0", + "Discord.Net.Interactions": "3.5.0", + "Discord.Net.Rest": "3.5.0", + "Discord.Net.WebSocket": "3.5.0", + "Discord.Net.Webhook": "3.5.0" } }, - "Discord.Net.Commands/3.1.0": { + "Discord.Net.Commands/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0" + "Discord.Net.Core": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.Commands.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Core/3.1.0": { + "Discord.Net.Core/3.5.0": { "dependencies": { "Newtonsoft.Json": "13.0.1", "System.Collections.Immutable": "5.0.0", @@ -44,59 +44,59 @@ }, "runtime": { "lib/net5.0/Discord.Net.Core.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Interactions/3.1.0": { + "Discord.Net.Interactions/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0", - "Discord.Net.Rest": "3.1.0", - "Discord.Net.WebSocket": "3.1.0", + "Discord.Net.Core": "3.5.0", + "Discord.Net.Rest": "3.5.0", + "Discord.Net.WebSocket": "3.5.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", "System.Collections.Immutable": "5.0.0", "System.Reactive": "5.0.0" }, "runtime": { "lib/net5.0/Discord.Net.Interactions.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Rest/3.1.0": { + "Discord.Net.Rest/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0" + "Discord.Net.Core": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.Rest.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.Webhook/3.1.0": { + "Discord.Net.Webhook/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0", - "Discord.Net.Rest": "3.1.0" + "Discord.Net.Core": "3.5.0", + "Discord.Net.Rest": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.Webhook.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, - "Discord.Net.WebSocket/3.1.0": { + "Discord.Net.WebSocket/3.5.0": { "dependencies": { - "Discord.Net.Core": "3.1.0", - "Discord.Net.Rest": "3.1.0" + "Discord.Net.Core": "3.5.0", + "Discord.Net.Rest": "3.5.0" }, "runtime": { "lib/net5.0/Discord.Net.WebSocket.dll": { - "assemblyVersion": "3.1.0.0", - "fileVersion": "3.1.0.0" + "assemblyVersion": "3.5.0.0", + "fileVersion": "3.5.0.0" } } }, @@ -147,7 +147,7 @@ "System.ValueTuple/4.5.0": {}, "PluginManager/1.0.0": { "dependencies": { - "Discord.Net": "3.1.0" + "Discord.Net": "3.5.0" }, "runtime": { "PluginManager.dll": {} @@ -161,54 +161,54 @@ "serviceable": false, "sha512": "" }, - "Discord.Net/3.1.0": { + "Discord.Net/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-GAY7d+k8UN5BsObGpysvg7ca6YwTqvesTouM8S8eBWSmwGnK38iceVkURg0QNAG70tlJ4w8S/BOjocRRvXU2MQ==", - "path": "discord.net/3.1.0", - "hashPath": "discord.net.3.1.0.nupkg.sha512" + "sha512": "sha512-IUtexpvogudb1rllKBWkIEpBVQoToMjtVo81KPkt+gNMe7KtRDcZJgcn6+72viMtyw0e95OJPXFV5VEA/n2OQQ==", + "path": "discord.net/3.5.0", + "hashPath": "discord.net.3.5.0.nupkg.sha512" }, - "Discord.Net.Commands/3.1.0": { + "Discord.Net.Commands/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-EZdtrAqj6Uspyz4CvIwFP/UQ4XUpXjIPG1b5LrfAKOo12ks4k6XO7up2h+UsHexk7mEz4sfZxkEXGrW6PSh+/Q==", - "path": "discord.net.commands/3.1.0", - "hashPath": "discord.net.commands.3.1.0.nupkg.sha512" + "sha512": "sha512-ClTv8aiTlitvS48YatRiTLvgE2f2uKgmHNPVBIuvJBHZO2u4bZCzoN1fid+pZn2sbVOkt8uftlLGzz5DSZlFIA==", + "path": "discord.net.commands/3.5.0", + "hashPath": "discord.net.commands.3.5.0.nupkg.sha512" }, - "Discord.Net.Core/3.1.0": { + "Discord.Net.Core/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-Oxz3CiWVvenSaHRYZeCKgRqzcWqdjGYmpxVVN2vPikt6bTN+xHAR4jczk8plKDDdINt7Lac37iLsRaqzUtJZpQ==", - "path": "discord.net.core/3.1.0", - "hashPath": "discord.net.core.3.1.0.nupkg.sha512" + "sha512": "sha512-rCzzaznMVQ+bLMxOpYwTyqm9V22kMy6BxlQisSxemHZDe2Jedz3Clp/a0dToACLz+Dlp3u+jYUfCBnTz7L6f4g==", + "path": "discord.net.core/3.5.0", + "hashPath": "discord.net.core.3.5.0.nupkg.sha512" }, - "Discord.Net.Interactions/3.1.0": { + "Discord.Net.Interactions/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-XzLChVRQGniUU8kdLMDYEOjifzvrcsOiAdKm/pO/PGPpZSMWSzPWlJUWaQlWMtOImrYULzRejOeoc2/3K3R30Q==", - "path": "discord.net.interactions/3.1.0", - "hashPath": "discord.net.interactions.3.1.0.nupkg.sha512" + "sha512": "sha512-wE9+V9DJ7r+1s4euOi4sGPIAt4sD7r+Tk5s9mrlbLCHVQTK4KllAvcrL25bPFI38FuFceREEzFoRlTrekSyB2Q==", + "path": "discord.net.interactions/3.5.0", + "hashPath": "discord.net.interactions.3.5.0.nupkg.sha512" }, - "Discord.Net.Rest/3.1.0": { + "Discord.Net.Rest/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-97kdAYjlNuuOnhRQW/OoGK2oBObvpzZlCSPJjIcI4DneEq6k2WIFhG00fvxK7DCVTlB5BgBMAT1BeRUk4/rUxQ==", - "path": "discord.net.rest/3.1.0", - "hashPath": "discord.net.rest.3.1.0.nupkg.sha512" + "sha512": "sha512-BnTdLFuuQsKvCv08VQrD4X1Hw2Xp+MELIRQiDiKfG01IiQlRTN+1gc3LB1zXgn5xBvC0HXjHxwV22GrMD9uKHQ==", + "path": "discord.net.rest/3.5.0", + "hashPath": "discord.net.rest.3.5.0.nupkg.sha512" }, - "Discord.Net.Webhook/3.1.0": { + "Discord.Net.Webhook/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-cZFxFf9H3GUBITlx1b7IskglgjJxSYpOIZOtyVW2WnPp7LpnxlOi1piRG22fH9fdhCC/RyDx3gZtYfN6WzacCw==", - "path": "discord.net.webhook/3.1.0", - "hashPath": "discord.net.webhook.3.1.0.nupkg.sha512" + "sha512": "sha512-vCIGZS+m88sQDuFmdbUqg+2RIXS/NJWx8ei3MX+ZEYiAvOkDgQfkIlEnU1NKpds6ivTt5GFlv6UzcWubb5VJ1w==", + "path": "discord.net.webhook/3.5.0", + "hashPath": "discord.net.webhook.3.5.0.nupkg.sha512" }, - "Discord.Net.WebSocket/3.1.0": { + "Discord.Net.WebSocket/3.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-6OsLNXHNKC/laDKoBD+T0Km0vzqHaCcBOaI/NA8Qsed935MtEOTy7juorF22gF6TYOeoclUgSINrHCY4zWvxpA==", - "path": "discord.net.websocket/3.1.0", - "hashPath": "discord.net.websocket.3.1.0.nupkg.sha512" + "sha512": "sha512-LjBOvcP40vJ+dhOtBDi8haEeblPAKpAIqR04NBzTM1/0RVavJZH89ovfSQIk42ygkiOaDV4E2x0Mmh6DRoIYcw==", + "path": "discord.net.websocket/3.5.0", + "hashPath": "discord.net.websocket.3.5.0.nupkg.sha512" }, "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { "type": "package", diff --git a/BUILDS/net5.0/StartupEvents.dll b/BUILDS/net5.0/StartupEvents.dll index ad9fca9d95cf901190033b2099ddbef16526da05..c44fd012d3ba3f1ddf665b1556069e1ee3cef4bb 100644 GIT binary patch delta 1277 zcmZvbe@vBC7{|ZQx$lp0FZXgUmu?0Zfe7JVE=*$vl@Jz&q&3(bbIjR5u{%qhNv&q) zC0s#+7Iz1hS%zlQ{G-A4l5DloM$13Cxm_DA%Qe`V1PK(ug&Z$4JI)8l5bH2~_ zeV+F{=e)h$z1_nD#-+LaL#d%KJ(N1NiEc=ua`RF%5SAq(COfE{TICCrq?jZTH0ufh zl53;2POG@fUgp7q04yLNp1Tz=+*V9fnsrI%t*jP7Avy1PGq5%cJ#6MUyHCr}?3(&D zyevHcyvy?sDvm$3cgOBTkFpNu07Gup+T#f41Af*@o7-EOc#iQpTbkZ-S}m)*qZ@v; z(uN!R?0{wAX^}Q8ToF-@4cDKh5B2sU$H%qOXY8?jIBhDWUMmIKA4k;6#aSAVUSCzR z-hc>Rd91D~-Lf9q7$igvx3kzL3`x$reL6YKO zW6=tsfs|(>_HaCDjZp|G&2iR4*kLQaXDW7(B`1BmlN0RkHy!3ydy4s(^&t@&aEAFT zxR>pKZh4UPLiV5Zg9beS(?9DZo>-HCz8S^XMUNycQ z-!RwVJ9#Fj%++UKmh(BQ^<3nS6#PUkY${R5_tLT(CLaJg^=ghz$Zh@z^A&%j=!9+Y zHXe;C-yF4y0(E)#bGGsoV9FW)^DWAA3Mw}TRp~dR#0qAgUCCRllng7)Or>OSz-R-} zh}n%Sx@sj5ppWcbD51;pjX+_0gsTyKOGh|+(S8TnTwxNcsEIz{ngR11vxYtD+3#^T z)rcQC{(_xZ)MH#{r=J!%F11Z+qe0=L*D)o%xurBNSLN0w`zegash{5?PJ;*|V!urp zT{olaR>OnqRE;1Ys!@O3_(_MAC%+iv%#ETuh=F8zc4rBb9d+FCLf{ddV}n>Hp7KSGxkQH^<~3$Rs0)T=(Kq5ISel%NttB4k#s z0!a1Nwm93wMyte&9|a(RfY`GFFubx})S0bg&YOANLS4;&BZvoV=w>nBe=4Q)^jh5LK1 z$gJVTh!v0$qatfaTobjd4bPvZ4^7rh*0b7q(HM|E%$u&$rkygKkD^uvagz3^LSI8- zx18tkCylI8ih1i6O3`k*yh6A5m{Z6aK6G-`)%c0BMi?U^O%gM_3yDYd=;yqG4~ksA zZrqe%w3C~82m`DS$uxzrSMz=L!`NZD%$RB7BPb0&;p!FrK7njytt(QN?%$XPU^6tWG z@FjCI7Sv}&Ri07nTXm!8ZrxY;*U>e#)xVNbYM6CODa}v(E36n_Eg_~B{Lgo%EQ!O| zCd%*)el;b2LsC>TN3A-3b*__Rr;F)2IgA;-Aeu1;kw=Si2mv}`jUYmo)Z2koF`KIq zEzm(8&02FP;0niZ7j@D{Tr*&P!K~(tJNGi~p=NQN^+`_V(Jtc`PWtIK>#$`~FYOaP zO5t4<3RciNswLQx*h@AZr%B#Nl=i`f&DWIEb#uCIBl7VxH6nyRm}Rg_O#dkaJ=f&S0}Fb zycC%{KKt1Agmb>Sk34J2^HlxXa%bz>1Ej95^9KvIxF!E?)vhj2M#5C$L~3u4>Y!rB SSO2?5w6;2drtc})Wc>wKtOC3M diff --git a/BUILDS/net5.0/ref/CMD_LevelingSystem.dll b/BUILDS/net5.0/ref/CMD_LevelingSystem.dll index 03da7d13df94ee78c28969b7276b9f36e798eac1..9fb071fdd69b7443c4e3b7422579e23c1346e97c 100644 GIT binary patch delta 71 zcmZoLX)u}4!E*PD^7D;7CCmb?3vWkBJ9oOZZ=E8u=;G3n&4MiN88`oDJ<7_+y7?%# MH!G$J1;Ga#0Cejg5&!@I delta 71 zcmZoLX)u}4!IHiA)ryThCCma2m$P#JzPs(TX5ugXve~a=HVd-6XWaas^(ZSN N-mI7^6a*h|007q0B254Q diff --git a/BUILDS/net5.0/ref/CMD_Utils.dll b/BUILDS/net5.0/ref/CMD_Utils.dll index 5a716e784397857f6b1428b82afc2027e05cbc8f..218797655303454bb03943cd72a07bc26c9a8f38 100644 GIT binary patch delta 71 zcmZp$Xt0>j!LsDyoZTCHN|*&iD-IpdVtMX1p}uDAh3Z9Gn*~|kGj9IR+Q`Aky19|h Mm<3bC5g{8+08nHdj!Sdzip;;SyN|*&A+73;uELL+^ep>H)^xwY5&4MiN88`oDZRB8N+}y}# M%z~-nh>#5@0F>z;%>V!Z diff --git a/BUILDS/net5.0/ref/EVE_LevelingSystem.dll b/BUILDS/net5.0/ref/EVE_LevelingSystem.dll index 1317ae75ced4d3b2c8f11eb356c5fbc0c37a3264..2fdb5d91063c29a01b94269f9122ade5a4ac0339 100644 GIT binary patch delta 71 zcmZoLXfT-2!7|xq+m?+zCCma9@lDSYUkJJ`>T|t!^N3;6WasGjZr0`g M%z~-HK;Qy908*VEp#T5? delta 71 zcmZoLXfT-2!NO)TbIrz{5@vzWc9Wm~6!e^C-dvbGU2eYeWasF2Zr0`g M%z~-HK;Qy90QFQHCjbBd diff --git a/BUILDS/net5.0/ref/StartupEvents.dll b/BUILDS/net5.0/ref/StartupEvents.dll index ce85f385a9bf3b0f81d0756222be4f85c3ac0dd5..8d0fbaf811905fff893015db696a99bbd3af84a4 100644 GIT binary patch delta 71 zcmZoLXfT-2!4iCb$A^tQCCmcX|2#Op=x&))qszCJGW9y<&4MiN88`oD6=Y>(-7Lt> M&Vs2zgZ~Bx0Hq=yb^rhX delta 71 zcmZoLXfT-2!4h~ue9Fe25@vxt$`-2goVY!w7-zgUNlZJvS&-#D ..\BUILDS\ + prompt + none + false diff --git a/DiscordBot.sln b/DiscordBot.sln index b69dd64..0960e41 100644 --- a/DiscordBot.sln +++ b/DiscordBot.sln @@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartupEvents", "StartupEve EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMD_Utils", "CMD_Utils\CMD_Utils.csproj", "{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicCommands", "MusicCommands\MusicCommands.csproj", "{B1B4976E-5112-4217-B57B-3A03C5207B6E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicCommands", "MusicCommands\MusicCommands.csproj", "{B1B4976E-5112-4217-B57B-3A03C5207B6E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DiscordBot/App.config b/DiscordBot/App.config index ffaf540..2a5ff10 100644 --- a/DiscordBot/App.config +++ b/DiscordBot/App.config @@ -1,6 +1,4 @@ - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/DiscordBot/Discord/Commands/Help.cs b/DiscordBot/Discord/Commands/Help.cs index 24388db..a7aa718 100644 --- a/DiscordBot/Discord/Commands/Help.cs +++ b/DiscordBot/Discord/Commands/Help.cs @@ -9,7 +9,7 @@ using PluginManager.Others; using System.Collections.Generic; -namespace PluginManager.Commands +namespace DiscordBot.Discord.Commands { internal class Help : DBCommand { diff --git a/DiscordBot/Discord/Commands/Restart.cs b/DiscordBot/Discord/Commands/Restart.cs new file mode 100644 index 0000000..aa1de2a --- /dev/null +++ b/DiscordBot/Discord/Commands/Restart.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; + +using System.Diagnostics; + +using System.Text; +using System.Threading.Tasks; + +using Discord.WebSocket; +using dsc = Discord.Commands; +using ds = Discord; + +using PluginManager.Interfaces; +using PluginManager.Others.Permissions; +using PluginManager.Online; +using PluginManager.Others; + +namespace DiscordBot.Discord.Commands +{ + class Restart : DBCommand + { + string DBCommand.Command => "restart"; + + string DBCommand.Description => "Restart the bot"; + + string DBCommand.Usage => "restart [-option]"; + + bool DBCommand.canUseDM => false; + + bool DBCommand.canUseServer => true; + + bool DBCommand.requireAdmin => true; + + void DBCommand.Execute(dsc.SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM) + { + if (!DiscordPermissions.hasPermission(message.Author as SocketGuildUser, ds.GuildPermission.Administrator)) return; + var args = Functions.GetArguments(message); + if (args.Count != 0) + { + switch (args[0]) + { + case "-p": + case "-poweroff": + case "-c": + case "-close": + Environment.Exit(0); + break; + case "-cmd": + case "-args": + Process.Start("./DiscordBot.exe", Functions.MergeStrings(args.ToArray(), 1)); + Environment.Exit(0); + break; + } + + + return; + } + + Process.Start("./DiscordBot.exe", "--execute:lp"); + Environment.Exit(0); + } + } +} diff --git a/DiscordBot/Discord/Core/CommandHandler.cs b/DiscordBot/Discord/Core/CommandHandler.cs index c0524f9..088a049 100644 --- a/DiscordBot/Discord/Core/CommandHandler.cs +++ b/DiscordBot/Discord/Core/CommandHandler.cs @@ -21,9 +21,6 @@ namespace PluginManager.Core private readonly CommandService commandService; private readonly string botPrefix; - internal static bool awaitRestartOnSetCommand = false; - internal static SocketUser RestartOnSetCommandCaster = null; - public CommandHandler(DiscordSocketClient client, CommandService commandService, string botPrefix) { this.client = client; @@ -56,28 +53,7 @@ namespace PluginManager.Core return; } - if (!(message.HasStringPrefix(botPrefix, ref argPos) || message.Author.IsBot)) - if (message.Author.IsBot) return; - else - { - if (awaitRestartOnSetCommand && RestartOnSetCommandCaster is not null) - { - if (message.Content.ToLower() == "yes") - { - if (!(((SocketGuildUser)message.Author).hasPermission(GuildPermission.Administrator))) - { - await message.Channel.SendMessageAsync("You do not have permission to use this command !"); - awaitRestartOnSetCommand = false; - RestartOnSetCommandCaster = null; - return; - } - var fileName = Assembly.GetExecutingAssembly().Location; - System.Diagnostics.Process.Start(fileName); - Environment.Exit(0); - } - } - return; - } + if (message.Author.IsBot) return; var context = new SocketCommandContext(client, message); diff --git a/DiscordBot/DiscordBot.csproj b/DiscordBot/DiscordBot.csproj index 53de360..18f322e 100644 --- a/DiscordBot/DiscordBot.csproj +++ b/DiscordBot/DiscordBot.csproj @@ -4,6 +4,8 @@ Exe net5.0 disable + + diff --git a/MusicCommands/MusicCommands.csproj b/MusicCommands/MusicCommands.csproj index a63efed..2bd38cc 100644 --- a/MusicCommands/MusicCommands.csproj +++ b/MusicCommands/MusicCommands.csproj @@ -8,6 +8,8 @@ ../BUILDS/ none + none + false diff --git a/PluginManager/Interfaces/DBCommand.cs b/PluginManager/Interfaces/DBCommand.cs index 785bce9..cd57f69 100644 --- a/PluginManager/Interfaces/DBCommand.cs +++ b/PluginManager/Interfaces/DBCommand.cs @@ -2,16 +2,45 @@ { public interface DBCommand { + /// + /// Command to be executed + /// It's CaSe SeNsItIvE + /// string Command { get; } + /// + /// Command description + /// string Description { get; } + /// + /// The usage for your command. + /// It will be displayed when users type help + /// string Usage { get; } + /// + /// true if the command can be used in a DM channel, otherwise false + /// bool canUseDM { get; } + + /// + /// true if the command can be used in a server, otherwise false + /// bool canUseServer { get; } + + /// + /// true if the command requre admin, otherwise false + /// bool requireAdmin { get; } + /// + /// The main body of the command. This is what is executed when user calls the command + /// + /// The disocrd Context + /// The message that the user types + /// The discord client of the bot + /// true if the message was sent from DM, otherwise false. It is always false if canUseDM is false void Execute(Discord.Commands.SocketCommandContext context, Discord.WebSocket.SocketMessage message, Discord.WebSocket.DiscordSocketClient client, diff --git a/PluginManager/Loaders/EventsLoader.cs b/PluginManager/Loaders/EventsLoader.cs index d7fdc74..bc1e1eb 100644 --- a/PluginManager/Loaders/EventsLoader.cs +++ b/PluginManager/Loaders/EventsLoader.cs @@ -61,7 +61,7 @@ namespace PluginManager.Loaders events.Add(ev); if (EventLoad != null) - EventLoad.Invoke(type.FullName!, true, ev); + EventLoad.Invoke(type.FullName!, true, ev, null); } catch (Exception e) { diff --git a/PluginManager/Online/Downloader.cs b/PluginManager/Online/Downloader.cs index 8c7240e..ff8190c 100644 --- a/PluginManager/Online/Downloader.cs +++ b/PluginManager/Online/Downloader.cs @@ -22,7 +22,7 @@ namespace PluginManager.Online } - public async Task DownloadFileAsync(string location = @"./Downloads/", string? pluginType = null, string customMessage = null) + public async Task DownloadFileAsync(string location = @"./Downloads/", string? pluginType = null, string? customMessage = null) { if (customMessage != null) Console.WriteLine(customMessage); diff --git a/PluginManager/PluginManager.csproj b/PluginManager/PluginManager.csproj index 2ceefd2..5974399 100644 --- a/PluginManager/PluginManager.csproj +++ b/PluginManager/PluginManager.csproj @@ -5,6 +5,12 @@ enable + + 512 + none + false + +