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 61627ef..9a59abc 100644 Binary files a/BUILDS/net5.0/CMD_LevelingSystem.dll and b/BUILDS/net5.0/CMD_LevelingSystem.dll differ 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 6811276..55590d8 100644 Binary files a/BUILDS/net5.0/CMD_Utils.dll and b/BUILDS/net5.0/CMD_Utils.dll differ diff --git a/BUILDS/net5.0/EVE_LevelingSystem.deps.json b/BUILDS/net5.0/EVE_LevelingSystem.deps.json index 21334b2..c6877ac 100644 --- a/BUILDS/net5.0/EVE_LevelingSystem.deps.json +++ b/BUILDS/net5.0/EVE_LevelingSystem.deps.json @@ -14,28 +14,28 @@ "EVE_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/EVE_LevelingSystem.dll b/BUILDS/net5.0/EVE_LevelingSystem.dll index 5c2caaa..4f2d33e 100644 Binary files a/BUILDS/net5.0/EVE_LevelingSystem.dll and b/BUILDS/net5.0/EVE_LevelingSystem.dll differ diff --git a/BUILDS/net5.0/MusicCommands.dll b/BUILDS/net5.0/MusicCommands.dll index bae106e..06a3e2a 100644 Binary files a/BUILDS/net5.0/MusicCommands.dll and b/BUILDS/net5.0/MusicCommands.dll differ diff --git a/BUILDS/net5.0/PluginManager.dll b/BUILDS/net5.0/PluginManager.dll index 4592f3b..ebac89d 100644 Binary files a/BUILDS/net5.0/PluginManager.dll and b/BUILDS/net5.0/PluginManager.dll differ 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 ad9fca9..c44fd01 100644 Binary files a/BUILDS/net5.0/StartupEvents.dll and b/BUILDS/net5.0/StartupEvents.dll differ diff --git a/BUILDS/net5.0/ref/CMD_LevelingSystem.dll b/BUILDS/net5.0/ref/CMD_LevelingSystem.dll index 03da7d1..9fb071f 100644 Binary files a/BUILDS/net5.0/ref/CMD_LevelingSystem.dll and b/BUILDS/net5.0/ref/CMD_LevelingSystem.dll differ diff --git a/BUILDS/net5.0/ref/CMD_Utils.dll b/BUILDS/net5.0/ref/CMD_Utils.dll index 5a716e7..2187976 100644 Binary files a/BUILDS/net5.0/ref/CMD_Utils.dll and b/BUILDS/net5.0/ref/CMD_Utils.dll differ diff --git a/BUILDS/net5.0/ref/EVE_LevelingSystem.dll b/BUILDS/net5.0/ref/EVE_LevelingSystem.dll index 1317ae7..2fdb5d9 100644 Binary files a/BUILDS/net5.0/ref/EVE_LevelingSystem.dll and b/BUILDS/net5.0/ref/EVE_LevelingSystem.dll differ diff --git a/BUILDS/net5.0/ref/StartupEvents.dll b/BUILDS/net5.0/ref/StartupEvents.dll index ce85f38..8d0fbaf 100644 Binary files a/BUILDS/net5.0/ref/StartupEvents.dll and b/BUILDS/net5.0/ref/StartupEvents.dll differ diff --git a/CMD_Utils/CMD_Utils.csproj b/CMD_Utils/CMD_Utils.csproj index 449a275..e5477b7 100644 --- a/CMD_Utils/CMD_Utils.csproj +++ b/CMD_Utils/CMD_Utils.csproj @@ -6,6 +6,9 @@ ..\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 + +