andreitdr/SethDiscordBot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'preview'

Browse Source
This commit is contained in:
Wizzy69
2022-07-06 13:57:02 +03:00
parent 26a74a9269 c674c76bd0
commit 208d7638c9
63 changed files with 670 additions and 2201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.vscode/launch.json vendored
View File

@@ -1,26 +0,0 @@
{
"version": "0.2.0",
"configurations": [
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/DiscordBot/bin/Debug/net5.0/DiscordBot.dll",
"args": [],
"cwd": "${workspaceFolder}/DiscordBot",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach"
}
]
}

4
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,4 @@
{
"rpc.enabled": true,
"discord.enabled": true
}

5
.vscode/solution-explorer/class.cs-template vendored
View File

@@ -1,5 +0,0 @@
namespace {{namespace}};
public class {{name}}
{
}

3
.vscode/solution-explorer/class.ts-template vendored
View File

@@ -1,3 +0,0 @@
export class {{name}} {
}

9
.vscode/solution-explorer/class.vb-template vendored
View File

@@ -1,9 +0,0 @@
Imports System
Namespace {{namespace}}
Public Class {{name}}
End Class
End Namespace

3
.vscode/solution-explorer/default.ts-template vendored
View File

@@ -1,3 +0,0 @@
export default {{name}} {
}

5
.vscode/solution-explorer/enum.cs-template vendored
View File

@@ -1,5 +0,0 @@
namespace {{namespace}};
public enum {{name}}
{
}

5
.vscode/solution-explorer/interface.cs-template vendored
View File

@@ -1,5 +0,0 @@
namespace {{namespace}};
public interface {{name}}
{
}

3
.vscode/solution-explorer/interface.ts-template vendored
View File

@@ -1,3 +0,0 @@
export interface {{name}} {
}

46
.vscode/solution-explorer/template-list.json vendored
View File

@@ -1,46 +0,0 @@
{
"templates": [
{
"name": "Class",
"extension": "cs",
"file": "./class.cs-template",
"parameters": "./template-parameters.js"
},
{
"name": "Interface",
"extension": "cs",
"file": "./interface.cs-template",
"parameters": "./template-parameters.js"
},
{
"name": "Enum",
"extension": "cs",
"file": "./enum.cs-template",
"parameters": "./template-parameters.js"
},
{
"name": "Class",
"extension": "ts",
"file": "./class.ts-template",
"parameters": "./template-parameters.js"
},
{
"name": "Interface",
"extension": "ts",
"file": "./interface.ts-template",
"parameters": "./template-parameters.js"
},
{
"name": "Default",
"extension": "ts",
"file": "./default.ts-template",
"parameters": "./template-parameters.js"
},
{
"name": "Class",
"extension": "vb",
"file": "./class.vb-template",
"parameters": "./template-parameters.js"
}
]
}

17
.vscode/solution-explorer/template-parameters.js vendored
View File

@@ -1,17 +0,0 @@
var path = require("path");
module.exports = function(filename, projectPath, folderPath) {
var namespace = "Unknown";
if (projectPath) {
namespace = path.basename(projectPath, path.extname(projectPath));
if (folderPath) {
namespace += "." + folderPath.replace(path.dirname(projectPath), "").substring(1).replace(/[\\\/]/g, ".");
}
namespace = namespace.replace(/[\\\-]/g, "_");
}
return {
namespace: namespace,
name: path.basename(filename, path.extname(filename))
}
};

42
.vscode/tasks.json vendored
View File

@@ -1,42 +0,0 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/DiscordBot/DiscordBot.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/DiscordBot/DiscordBot.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/DiscordBot/DiscordBot.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
}

126
BUILDS/net6.0/CMD_Utils.deps.json
View File

@@ -14,28 +14,28 @@
"CMD_Utils.dll": {} "CMD_Utils.dll": {}
} }
}, },
"Discord.Net/3.6.1": { "Discord.Net/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Commands": "3.6.1", "Discord.Net.Commands": "3.7.2",
"Discord.Net.Core": "3.6.1", "Discord.Net.Core": "3.7.2",
"Discord.Net.Interactions": "3.6.1", "Discord.Net.Interactions": "3.7.2",
"Discord.Net.Rest": "3.6.1", "Discord.Net.Rest": "3.7.2",
"Discord.Net.WebSocket": "3.6.1", "Discord.Net.WebSocket": "3.7.2",
"Discord.Net.Webhook": "3.6.1" "Discord.Net.Webhook": "3.7.2"
} }
}, },
"Discord.Net.Commands/3.6.1": { "Discord.Net.Commands/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1" "Discord.Net.Core": "3.7.2"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Commands.dll": { "lib/net6.0/Discord.Net.Commands.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.Core/3.6.1": { "Discord.Net.Core/3.7.2": {
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.1", "Newtonsoft.Json": "13.0.1",
"System.Collections.Immutable": "5.0.0", "System.Collections.Immutable": "5.0.0",
@@ -44,59 +44,59 @@
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Core.dll": { "lib/net6.0/Discord.Net.Core.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.Interactions/3.6.1": { "Discord.Net.Interactions/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1", "Discord.Net.Core": "3.7.2",
"Discord.Net.Rest": "3.6.1", "Discord.Net.Rest": "3.7.2",
"Discord.Net.WebSocket": "3.6.1", "Discord.Net.WebSocket": "3.7.2",
"Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0",
"System.Collections.Immutable": "5.0.0", "System.Collections.Immutable": "5.0.0",
"System.Reactive": "5.0.0" "System.Reactive": "5.0.0"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Interactions.dll": { "lib/net6.0/Discord.Net.Interactions.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.Rest/3.6.1": { "Discord.Net.Rest/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1" "Discord.Net.Core": "3.7.2"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Rest.dll": { "lib/net6.0/Discord.Net.Rest.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.Webhook/3.6.1": { "Discord.Net.Webhook/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1", "Discord.Net.Core": "3.7.2",
"Discord.Net.Rest": "3.6.1" "Discord.Net.Rest": "3.7.2"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Webhook.dll": { "lib/net6.0/Discord.Net.Webhook.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.WebSocket/3.6.1": { "Discord.Net.WebSocket/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1", "Discord.Net.Core": "3.7.2",
"Discord.Net.Rest": "3.6.1" "Discord.Net.Rest": "3.7.2"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.WebSocket.dll": { "lib/net6.0/Discord.Net.WebSocket.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
@@ -147,7 +147,7 @@
"System.ValueTuple/4.5.0": {}, "System.ValueTuple/4.5.0": {},
"PluginManager/1.0.0": { "PluginManager/1.0.0": {
"dependencies": { "dependencies": {
"Discord.Net": "3.6.1" "Discord.Net": "3.7.2"
}, },
"runtime": { "runtime": {
"PluginManager.dll": {} "PluginManager.dll": {}
@@ -161,54 +161,54 @@
"serviceable": false, "serviceable": false,
"sha512": "" "sha512": ""
}, },
"Discord.Net/3.6.1": { "Discord.Net/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-TfcL/HG57fVt//WVJ2XyF2PlytY9IYkkwwkPLIhvu5FW4wf9rm7+N8RPh4qtELLfsa5ES0FK2RbgYjABRR9AjA==", "sha512": "sha512-FAiCLGu5rp6+Z10FjKbbJ6LLpKjbMBGpozixkJlz5LZvuncPx8f4AWFAw7pBecKUuAh983qiZ8CZYZcNXsI4qg==",
"path": "discord.net/3.6.1", "path": "discord.net/3.7.2",
"hashPath": "discord.net.3.6.1.nupkg.sha512" "hashPath": "discord.net.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Commands/3.6.1": { "Discord.Net.Commands/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-kK7m571yzSzPd93o+n8Z+TfvX62BT1HtOEZIWXKwXWO8itP/sgqBNExjWK/6DOpkbD6+khc2f3rp+TA0rJD88g==", "sha512": "sha512-aOEGP04X64htsTr7ozKj9qHpmvOfitSw5gfR8Tw9TX0+FdswD2LNL2KfOAIaxRKZmRTm34aXQEJrVq0K8AptmQ==",
"path": "discord.net.commands/3.6.1", "path": "discord.net.commands/3.7.2",
"hashPath": "discord.net.commands.3.6.1.nupkg.sha512" "hashPath": "discord.net.commands.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Core/3.6.1": { "Discord.Net.Core/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-ibVjQiWzgqh0GyP/GXE2kv3TA/9ysmmNFG/WmRE7GepQQAXXGxVUO9IMJ8h14EvIXMQ0m0DktMe5DkUnilo3Ag==", "sha512": "sha512-apwswc6LjN4dj3u27SO3Hr56Jzl91wzReahieoD7IQhV+BJQaRxhTRiEEWFTrBzHfeFHEOQ7r6vZnra3zeFhKA==",
"path": "discord.net.core/3.6.1", "path": "discord.net.core/3.7.2",
"hashPath": "discord.net.core.3.6.1.nupkg.sha512" "hashPath": "discord.net.core.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Interactions/3.6.1": { "Discord.Net.Interactions/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-WGOxz6SMUu4WS5b/JdrhlwQletcplBIYqvjFBBDfnqE+uNJqcNGtAdyjLqIILfXGx8aSSSSYZSCeAUa7FZ8Yew==", "sha512": "sha512-dwGhEdDB0yyo/lGtjwIDVZmsuD52di7lIZWu/sBtvvA05dMgYZq5S6ILdsBXjOyaHeXd+EV4YMlj2VS/rm619w==",
"path": "discord.net.interactions/3.6.1", "path": "discord.net.interactions/3.7.2",
"hashPath": "discord.net.interactions.3.6.1.nupkg.sha512" "hashPath": "discord.net.interactions.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Rest/3.6.1": { "Discord.Net.Rest/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-T7RRThIS23roFEJwTL1l7aawjVyn7ZB5yH3tMge0d6TiCzzp4V4FAZ+ArTt19LHRFhPly90v8V3sWqmTMN+5Zg==", "sha512": "sha512-dyp8YaMBNJ837EH1KNz2PNGZqc2y71WFd1+pdldF+pLQJ3Gf/+V7685paAR7bQw7yFNyqEBR/QRBCNp+QIQ7Wg==",
"path": "discord.net.rest/3.6.1", "path": "discord.net.rest/3.7.2",
"hashPath": "discord.net.rest.3.6.1.nupkg.sha512" "hashPath": "discord.net.rest.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Webhook/3.6.1": { "Discord.Net.Webhook/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-xikKHIGAIMz0BzHkaTKb48DNpFjKW8mvJjLJSezJ1xQOu+laHNk/hav4qxVtyZz7HSI/vGTkmlq9hKVhWzpaUA==", "sha512": "sha512-da3i/mTq2y7mfj3xlHH14S4PivHbflJCVr8OUikJtQrxBOxvPkqP7ZYk3Y9S28q0K8qik+TUjCcjL5gELKrh/A==",
"path": "discord.net.webhook/3.6.1", "path": "discord.net.webhook/3.7.2",
"hashPath": "discord.net.webhook.3.6.1.nupkg.sha512" "hashPath": "discord.net.webhook.3.7.2.nupkg.sha512"
}, },
"Discord.Net.WebSocket/3.6.1": { "Discord.Net.WebSocket/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-hF22Xy7URlVEDQZ69INOgzPvFUsIDfd+r6U+1yF9HWdBn3d4THnvAAhkv1TraSx/T/MKS7g+jvk/HZ3mh5S3aw==", "sha512": "sha512-pYCd6ET44ADaNiyEw82TaJnR7TKYHfrKCytWFWMPL5faJhoh260avZn3Hwunlf331lEQ0f4K1CujPkQbNuq7kQ==",
"path": "discord.net.websocket/3.6.1", "path": "discord.net.websocket/3.7.2",
"hashPath": "discord.net.websocket.3.6.1.nupkg.sha512" "hashPath": "discord.net.websocket.3.7.2.nupkg.sha512"
}, },
"Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": {
"type": "package", "type": "package",

BIN
BUILDS/net6.0/CMD_Utils.dll
View File

Binary file not shown.

126
BUILDS/net6.0/MusicCommands.deps.json
View File

@@ -14,28 +14,28 @@
"MusicCommands.dll": {} "MusicCommands.dll": {}
} }
}, },
"Discord.Net/3.6.1": { "Discord.Net/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Commands": "3.6.1", "Discord.Net.Commands": "3.7.2",
"Discord.Net.Core": "3.6.1", "Discord.Net.Core": "3.7.2",
"Discord.Net.Interactions": "3.6.1", "Discord.Net.Interactions": "3.7.2",
"Discord.Net.Rest": "3.6.1", "Discord.Net.Rest": "3.7.2",
"Discord.Net.WebSocket": "3.6.1", "Discord.Net.WebSocket": "3.7.2",
"Discord.Net.Webhook": "3.6.1" "Discord.Net.Webhook": "3.7.2"
} }
}, },
"Discord.Net.Commands/3.6.1": { "Discord.Net.Commands/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1" "Discord.Net.Core": "3.7.2"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Commands.dll": { "lib/net6.0/Discord.Net.Commands.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.Core/3.6.1": { "Discord.Net.Core/3.7.2": {
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.1", "Newtonsoft.Json": "13.0.1",
"System.Collections.Immutable": "5.0.0", "System.Collections.Immutable": "5.0.0",
@@ -44,59 +44,59 @@
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Core.dll": { "lib/net6.0/Discord.Net.Core.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.Interactions/3.6.1": { "Discord.Net.Interactions/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1", "Discord.Net.Core": "3.7.2",
"Discord.Net.Rest": "3.6.1", "Discord.Net.Rest": "3.7.2",
"Discord.Net.WebSocket": "3.6.1", "Discord.Net.WebSocket": "3.7.2",
"Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0",
"System.Collections.Immutable": "5.0.0", "System.Collections.Immutable": "5.0.0",
"System.Reactive": "5.0.0" "System.Reactive": "5.0.0"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Interactions.dll": { "lib/net6.0/Discord.Net.Interactions.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.Rest/3.6.1": { "Discord.Net.Rest/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1" "Discord.Net.Core": "3.7.2"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Rest.dll": { "lib/net6.0/Discord.Net.Rest.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.Webhook/3.6.1": { "Discord.Net.Webhook/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1", "Discord.Net.Core": "3.7.2",
"Discord.Net.Rest": "3.6.1" "Discord.Net.Rest": "3.7.2"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.Webhook.dll": { "lib/net6.0/Discord.Net.Webhook.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
"Discord.Net.WebSocket/3.6.1": { "Discord.Net.WebSocket/3.7.2": {
"dependencies": { "dependencies": {
"Discord.Net.Core": "3.6.1", "Discord.Net.Core": "3.7.2",
"Discord.Net.Rest": "3.6.1" "Discord.Net.Rest": "3.7.2"
}, },
"runtime": { "runtime": {
"lib/net6.0/Discord.Net.WebSocket.dll": { "lib/net6.0/Discord.Net.WebSocket.dll": {
"assemblyVersion": "3.6.1.0", "assemblyVersion": "3.7.2.0",
"fileVersion": "3.6.1.0" "fileVersion": "3.7.2.0"
} }
} }
}, },
@@ -147,7 +147,7 @@
"System.ValueTuple/4.5.0": {}, "System.ValueTuple/4.5.0": {},
"PluginManager/1.0.0": { "PluginManager/1.0.0": {
"dependencies": { "dependencies": {
"Discord.Net": "3.6.1" "Discord.Net": "3.7.2"
}, },
"runtime": { "runtime": {
"PluginManager.dll": {} "PluginManager.dll": {}
@@ -161,54 +161,54 @@
"serviceable": false, "serviceable": false,
"sha512": "" "sha512": ""
}, },
"Discord.Net/3.6.1": { "Discord.Net/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-TfcL/HG57fVt//WVJ2XyF2PlytY9IYkkwwkPLIhvu5FW4wf9rm7+N8RPh4qtELLfsa5ES0FK2RbgYjABRR9AjA==", "sha512": "sha512-FAiCLGu5rp6+Z10FjKbbJ6LLpKjbMBGpozixkJlz5LZvuncPx8f4AWFAw7pBecKUuAh983qiZ8CZYZcNXsI4qg==",
"path": "discord.net/3.6.1", "path": "discord.net/3.7.2",
"hashPath": "discord.net.3.6.1.nupkg.sha512" "hashPath": "discord.net.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Commands/3.6.1": { "Discord.Net.Commands/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-kK7m571yzSzPd93o+n8Z+TfvX62BT1HtOEZIWXKwXWO8itP/sgqBNExjWK/6DOpkbD6+khc2f3rp+TA0rJD88g==", "sha512": "sha512-aOEGP04X64htsTr7ozKj9qHpmvOfitSw5gfR8Tw9TX0+FdswD2LNL2KfOAIaxRKZmRTm34aXQEJrVq0K8AptmQ==",
"path": "discord.net.commands/3.6.1", "path": "discord.net.commands/3.7.2",
"hashPath": "discord.net.commands.3.6.1.nupkg.sha512" "hashPath": "discord.net.commands.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Core/3.6.1": { "Discord.Net.Core/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-ibVjQiWzgqh0GyP/GXE2kv3TA/9ysmmNFG/WmRE7GepQQAXXGxVUO9IMJ8h14EvIXMQ0m0DktMe5DkUnilo3Ag==", "sha512": "sha512-apwswc6LjN4dj3u27SO3Hr56Jzl91wzReahieoD7IQhV+BJQaRxhTRiEEWFTrBzHfeFHEOQ7r6vZnra3zeFhKA==",
"path": "discord.net.core/3.6.1", "path": "discord.net.core/3.7.2",
"hashPath": "discord.net.core.3.6.1.nupkg.sha512" "hashPath": "discord.net.core.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Interactions/3.6.1": { "Discord.Net.Interactions/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-WGOxz6SMUu4WS5b/JdrhlwQletcplBIYqvjFBBDfnqE+uNJqcNGtAdyjLqIILfXGx8aSSSSYZSCeAUa7FZ8Yew==", "sha512": "sha512-dwGhEdDB0yyo/lGtjwIDVZmsuD52di7lIZWu/sBtvvA05dMgYZq5S6ILdsBXjOyaHeXd+EV4YMlj2VS/rm619w==",
"path": "discord.net.interactions/3.6.1", "path": "discord.net.interactions/3.7.2",
"hashPath": "discord.net.interactions.3.6.1.nupkg.sha512" "hashPath": "discord.net.interactions.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Rest/3.6.1": { "Discord.Net.Rest/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-T7RRThIS23roFEJwTL1l7aawjVyn7ZB5yH3tMge0d6TiCzzp4V4FAZ+ArTt19LHRFhPly90v8V3sWqmTMN+5Zg==", "sha512": "sha512-dyp8YaMBNJ837EH1KNz2PNGZqc2y71WFd1+pdldF+pLQJ3Gf/+V7685paAR7bQw7yFNyqEBR/QRBCNp+QIQ7Wg==",
"path": "discord.net.rest/3.6.1", "path": "discord.net.rest/3.7.2",
"hashPath": "discord.net.rest.3.6.1.nupkg.sha512" "hashPath": "discord.net.rest.3.7.2.nupkg.sha512"
}, },
"Discord.Net.Webhook/3.6.1": { "Discord.Net.Webhook/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-xikKHIGAIMz0BzHkaTKb48DNpFjKW8mvJjLJSezJ1xQOu+laHNk/hav4qxVtyZz7HSI/vGTkmlq9hKVhWzpaUA==", "sha512": "sha512-da3i/mTq2y7mfj3xlHH14S4PivHbflJCVr8OUikJtQrxBOxvPkqP7ZYk3Y9S28q0K8qik+TUjCcjL5gELKrh/A==",
"path": "discord.net.webhook/3.6.1", "path": "discord.net.webhook/3.7.2",
"hashPath": "discord.net.webhook.3.6.1.nupkg.sha512" "hashPath": "discord.net.webhook.3.7.2.nupkg.sha512"
}, },
"Discord.Net.WebSocket/3.6.1": { "Discord.Net.WebSocket/3.7.2": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,
"sha512": "sha512-hF22Xy7URlVEDQZ69INOgzPvFUsIDfd+r6U+1yF9HWdBn3d4THnvAAhkv1TraSx/T/MKS7g+jvk/HZ3mh5S3aw==", "sha512": "sha512-pYCd6ET44ADaNiyEw82TaJnR7TKYHfrKCytWFWMPL5faJhoh260avZn3Hwunlf331lEQ0f4K1CujPkQbNuq7kQ==",
"path": "discord.net.websocket/3.6.1", "path": "discord.net.websocket/3.7.2",
"hashPath": "discord.net.websocket.3.6.1.nupkg.sha512" "hashPath": "discord.net.websocket.3.7.2.nupkg.sha512"
}, },
"Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": {
"type": "package", "type": "package",

BIN
BUILDS/net6.0/MusicCommands.dll
View File

Binary file not shown.

BIN
BUILDS/net6.0/PluginManager.dll
View File

Binary file not shown.

BIN
BUILDS/net6.0/Plugins/Commands/CMD_LevelingSystem.dll Normal file
View File

Binary file not shown.

BIN
BUILDS/net6.0/Plugins/Commands/CMD_Utils.dll Normal file
View File

Binary file not shown.

BIN
BUILDS/net6.0/Plugins/Commands/MusicCommands.dll Normal file
View File

Binary file not shown.

BIN
BUILDS/net6.0/Plugins/Events/EVE_LevelingSystem.dll Normal file
View File

Binary file not shown.

1
CMD_Utils/CMD_Utils.csproj
View File

@@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<BaseOutputPath></BaseOutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

4
CMD_Utils/Random.cs
View File

@@ -24,9 +24,9 @@ public class Random : DBCommand
if (a > b) if (a > b)
{ {
var x = a; var temp = a;
a = b; a = b;
b = x; b = temp;
} }
await message.Channel.SendMessageAsync("Your random generated number is " + new System.Random().Next(a, b)); await message.Channel.SendMessageAsync("Your random generated number is " + new System.Random().Next(a, b));

1
DiscordBot/Discord/Core/CommandHandler.cs
View File

@@ -121,7 +121,6 @@ internal class CommandHandler
plugin.Execute(context, message, client, false); plugin.Execute(context, message, client, false);
Functions.WriteLogFile($"[{message.Author.Id}] Executed command : " + plugin.Command); Functions.WriteLogFile($"[{message.Author.Id}] Executed command : " + plugin.Command);
return;
} }
} }
} }

3
DiscordBot/DiscordBot.csproj
View File

@@ -8,6 +8,7 @@
<StartupObject /> <StartupObject />
<SignAssembly>False</SignAssembly> <SignAssembly>False</SignAssembly>
<IsPublishable>True</IsPublishable> <IsPublishable>True</IsPublishable>
<AssemblyVersion>1.0.0.1</AssemblyVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -37,7 +38,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Discord.Net" Version="3.6.1" /> <PackageReference Include="Discord.Net" Version="3.7.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

194
DiscordBot/Program.cs
View File

@@ -1,19 +1,20 @@
using DiscordBot.Discord.Core; using System;
using PluginManager; using System.Collections.Generic;
using PluginManager.Items;
using PluginManager.Others;
using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using DiscordBot.Discord.Core;
using PluginManager;
using PluginManager.Items;
using PluginManager.Online; using PluginManager.Online;
using PluginManager.Others;
namespace DiscordBot namespace DiscordBot;
public class Program
{ {
public class Program private static bool loadPluginsOnStartup;
{ private static bool listPluginsAtStartup;
private static bool loadPluginsOnStartup = false;
private static bool listPluginsAtStartup = false;
/// <summary> /// <summary>
/// The main entry point for the application. /// The main entry point for the application.
@@ -28,42 +29,35 @@ namespace DiscordBot
PreLoadComponents().Wait(); PreLoadComponents().Wait();
if (!Config.ContainsKey("token") || Config.GetValue<string>("token") == null || Config.GetValue<string>("token")?.Length != 70) if (!Config.ContainsKey("token") || Config.GetValue<string>("token") == null || Config.GetValue<string>("token")?.Length != 70)
{
while (true)
{ {
Console.WriteLine("Please insert your token"); Console.WriteLine("Please insert your token");
Console.Write("Token = "); Console.Write("Token = ");
string token = Console.ReadLine(); var token = Console.ReadLine();
if (token?.Length == 59 || token?.Length == 70) if (token?.Length == 59 || token?.Length == 70)
Config.AddValueToVariables("token", token, true); Config.AddValueToVariables("token", token, true);
else else
{
Console.WriteLine("Invalid token"); Console.WriteLine("Invalid token");
continue;
}
Console.WriteLine("Please insert your prefix (max. 1 character long):"); Console.WriteLine("Please insert your prefix (max. 1 character long):");
Console.WriteLine("For a prefix longer then one character, the first character will be saved and the others will be ignored.\n No spaces or numbers allowed"); Console.WriteLine("For a prefix longer then one character, the first character will be saved and the others will be ignored.\n No spaces or numbers allowed");
Console.Write("Prefix = "); Console.Write("Prefix = ");
char prefix = Console.ReadLine()![0]; var prefix = Console.ReadLine()![0];
if (prefix == ' ' || char.IsDigit(prefix)) continue;
Config.AddValueToVariables("prefix", prefix.ToString(), false);
break;
}
}
if (!Config.ContainsKey("prefix"))
{
Console.WriteLine("Please insert your prefix (max. 1 character long):");
Console.WriteLine("For a prefix longer then one character, the first character will be saved and the others will be ignored.\n No spaces or numbers allowed");
Console.Write("Prefix = ");
char prefix = Console.ReadLine()![0];
if (prefix == ' ' || char.IsDigit(prefix)) return; if (prefix == ' ' || char.IsDigit(prefix)) return;
Config.AddValueToVariables("prefix", prefix.ToString(), false); Config.AddValueToVariables("prefix", prefix.ToString(), false);
} }
if (!Config.ContainsKey("prefix") || Config.GetValue<string>("prefix") == default)
{
Console.WriteLine("Please insert your prefix (max. 1 character long):");
Console.WriteLine("For a prefix longer then one character, the first character will be saved and the others will be ignored.\n No spaces or numbers allowed");
Console.Write("Prefix = ");
var prefix = Console.ReadLine()![0];
if (prefix == ' ') return;
Config.AddValueToVariables("prefix", prefix.ToString(), false);
}
HandleInput(args).Wait(); HandleInput(args).Wait();
} }
@@ -73,15 +67,19 @@ namespace DiscordBot
/// <param name="discordbooter">The discord booter used to start the application</param> /// <param name="discordbooter">The discord booter used to start the application</param>
private static Task NoGUI(Boot discordbooter) private static Task NoGUI(Boot discordbooter)
{ {
ConsoleCommandsHandler consoleCommandsHandler = new ConsoleCommandsHandler(discordbooter.client); var consoleCommandsHandler = new ConsoleCommandsHandler(discordbooter.client);
if (loadPluginsOnStartup) consoleCommandsHandler.HandleCommand("lp"); if (loadPluginsOnStartup) consoleCommandsHandler.HandleCommand("lp");
if (listPluginsAtStartup) consoleCommandsHandler.HandleCommand("listplugs"); if (listPluginsAtStartup) consoleCommandsHandler.HandleCommand("listplugs");
Config.SaveConfig(); Config.SaveConfig();
while (true) while (true)
{ {
Console.ForegroundColor = ConsoleColor.White; Console.ForegroundColor = ConsoleColor.White;
string cmd = Console.ReadLine(); var cmd = Console.ReadLine();
consoleCommandsHandler.HandleCommand(cmd); if (!consoleCommandsHandler.HandleCommand(cmd))
Console.WriteLine("Failed to run command " + cmd);
} }
} }
@@ -93,16 +91,21 @@ namespace DiscordBot
{ {
Console.Clear(); Console.Clear();
Console.ForegroundColor = ConsoleColor.DarkYellow; Console.ForegroundColor = ConsoleColor.DarkYellow;
Console.WriteLine("Discord BOT for Cross Platform");
Console.WriteLine("Created by: Wizzy\nDiscord: Wizzy#9181"); List<string> startupMessageList = await ServerCom.ReadTextFromFile("https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/StartupMessage");
foreach (var message in startupMessageList) Console.WriteLine(message);
Console.WriteLine($"Running on version: {Config.GetValue<string>("Version") ?? System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()}");
Console.WriteLine($"Git URL: {Config.GetValue<string>("GitURL") ?? " Could not find Git URL"}");
Console.ForegroundColor = ConsoleColor.White; Console.ForegroundColor = ConsoleColor.White;
Console.WriteLine("============================ Discord BOT - Cross Platform ============================"); Console.WriteLine($"============================ LOG ============================");
try try
{ {
string token = Config.GetValue<string>("token"); var token = Config.GetValue<string>("token");
string prefix = Config.GetValue<string>("prefix"); var prefix = Config.GetValue<string>("prefix");
var discordbooter = new Boot(token, prefix); var discordbooter = new Boot(token, prefix);
await discordbooter.Awake(); await discordbooter.Awake();
@@ -121,8 +124,8 @@ namespace DiscordBot
/// <param name="d">Directory path</param> /// <param name="d">Directory path</param>
private static Task ClearFolder(string d) private static Task ClearFolder(string d)
{ {
string[] files = Directory.GetFiles(d); var files = Directory.GetFiles(d);
int fileNumb = files.Length; var fileNumb = files.Length;
for (var i = 0; i < fileNumb; i++) for (var i = 0; i < fileNumb; i++)
{ {
File.Delete(files[i]); File.Delete(files[i]);
@@ -138,37 +141,12 @@ namespace DiscordBot
/// <param name="args">The arguments</param> /// <param name="args">The arguments</param>
private static async Task HandleInput(string[] args) private static async Task HandleInput(string[] args)
{ {
int len = args.Length; var len = args.Length;
if (len == 1 && args[0] == "--help")
{
Console.WriteLine("Available commands:\n--exec -> start the bot with tools enabled");
return;
}
if (len == 1 && args[0] == "--logout")
{
File.Delete(Functions.dataFolder + "config.json");
await Task.Run(async () =>
{
await Task.Delay(1000);
Environment.Exit(0x08);
}
);
return;
}
if (len >= 2 && args[0] == "--encrypt")
{
string s2e = args.MergeStrings(1);
Console.WriteLine("MD5: " + await Cryptography.CreateMD5(s2e));
Console.WriteLine("SHA356: " + await Cryptography.CreateSHA256(s2e));
return;
}
if (len == 3 && args[0] == "/download") if (len == 3 && args[0] == "/download")
{ {
string url = args[1]; var url = args[1];
string location = args[2]; var location = args[2];
await ServerCom.DownloadFileAsync(url, location); await ServerCom.DownloadFileAsync(url, location);
@@ -183,9 +161,9 @@ namespace DiscordBot
} }
if (len == 0 || args[0] != "--exec" && args[0] != "--execute") if (len == 0 || (args[0] != "--exec" && args[0] != "--execute"))
{ {
Boot b = await StartNoGUI(); var b = await StartNoGUI();
await NoGUI(b); await NoGUI(b);
return; return;
} }
@@ -205,7 +183,7 @@ namespace DiscordBot
{ {
Console.ForegroundColor = ConsoleColor.White; Console.ForegroundColor = ConsoleColor.White;
Console.Write("> "); Console.Write("> ");
string[] message = Console.ReadLine().Split(' '); var message = Console.ReadLine().Split(' ');
switch (message[0]) switch (message[0])
{ {
@@ -241,7 +219,7 @@ namespace DiscordBot
Environment.Exit(0); Environment.Exit(0);
break; break;
case "--start": case "--start":
Boot booter = await StartNoGUI(); var booter = await StartNoGUI();
await NoGUI(booter); await NoGUI(booter);
return; return;
@@ -257,8 +235,78 @@ namespace DiscordBot
await Config.LoadConfig(); await Config.LoadConfig();
if (Config.ContainsKey("DeleteLogsAtStartup")) if (Config.ContainsKey("DeleteLogsAtStartup"))
if (Config.GetValue<bool>("DeleteLogsAtStartup")) if (Config.GetValue<bool>("DeleteLogsAtStartup"))
foreach (string file in Directory.GetFiles("./Output/Logs/")) foreach (var file in Directory.GetFiles("./Output/Logs/"))
File.Delete(file); File.Delete(file);
List<string> OnlineDefaultKeys = await ServerCom.ReadTextFromFile("https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/SetupKeys");
Config.PluginConfig.Load();
if (!Config.ContainsKey("Version"))
Config.AddValueToVariables("Version", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(), false);
else
Config.SetValue("Version", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
foreach (var key in OnlineDefaultKeys)
{
if (key.Length <= 3 || !key.Contains(' ')) continue;
string[] s = key.Split(' ');
try
{
Config.GetAndAddValueToVariable(s[0], s[1], s[2].Equals("true", StringComparison.CurrentCultureIgnoreCase));
} }
catch (Exception ex)
{
Functions.WriteErrFile(ex.Message);
}
}
List<string> onlineSettingsList = await ServerCom.ReadTextFromFile("https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/OnlineData");
foreach (var key in onlineSettingsList)
{
if (key.Length <= 3 || !key.Contains(' ')) continue;
string[] s = key.Split(' ');
switch (s[0])
{
case "CurrentVersion":
string newVersion = s[1];
if (!newVersion.Equals(Config.GetValue<string>("Version")))
{
Console.WriteLine("A new version has been released on github page.");
Console.WriteLine("Download the new version using the following link wrote in yellow");
Console_Utilities.WriteColorText("&y" + Config.GetValue<string>("GitURL") + "&c");
Console.WriteLine();
Console.WriteLine("Your product will work just fine on this outdated version, but an update is recommended.\n" +
"From now on, this version is no longer supported"
);
Console_Utilities.WriteColorText("&rUse at your own risk&c");
Console_Utilities.WriteColorText("&mCurrent Version: " + Config.GetValue<string>("Version") + "&c");
Console_Utilities.WriteColorText("&gNew Version: " + newVersion + "&c");
Console.WriteLine("\n\n");
await Task.Delay(1000);
int waitTime = 20; //wait time to proceed
Console.Write($"The bot will start in {waitTime} seconds");
while (waitTime > 0)
{
await Task.Delay(1000);
waitTime--;
Console.SetCursorPosition("The bot will start in ".Length, Console.CursorTop);
Console.Write(" ");
Console.SetCursorPosition("The bot will start in ".Length, Console.CursorTop);
Console.Write(waitTime + " seconds");
}
}
break;
}
}
Config.SaveConfig();
} }
} }

454
DiscordBotGUI/.gitignore vendored
View File

@@ -1,454 +0,0 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
# User-specific files
*.rsuser
*.suo
*.user
*.userosscache
*.sln.docstates
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Mono auto generated files
mono_crash.*
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/
# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# Visual Studio 2017 auto generated files
Generated\ Files/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# Benchmark Results
BenchmarkDotNet.Artifacts/
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
# Tye
.tye/
# ASP.NET Scaffolding
ScaffoldingReadMe.txt
# StyleCop
StyleCopReport.xml
# Files built by Visual Studio
*_i.c
*_p.c
*_h.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap
# Visual Studio Trace Files
*.e2e
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json
# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!?*.[Cc]ache/
# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak
# SQL Server files
*.mdf
*.ldf
*.ndf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# CodeRush personal settings
.cr/personal
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config
# Tabs Studio
*.tss
# Telerik's JustMock configuration file
*.jmconfig
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
# OpenCover UI analysis results
OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog
# NVidia Nsight GPU debugger configuration file
*.nvuser
# MFractors (Xamarin productivity tool) working folder
.mfractor/
# Local History for Visual Studio
.localhistory/
# BeatPulse healthcheck temp database
healthchecksdb
# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
# Fody - auto-generated XML schema
FodyWeavers.xsd
##
## Visual studio for Mac
##
# globs
Makefile.in
*.userprefs
*.usertasks
config.make
config.status
aclocal.m4
install-sh
autom4te.cache/
*.tar.gz
tarballs/
test-results/
# Mac bundle stuff
*.dmg
*.app
# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
# General
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db
# Dump file
*.stackdump
# Folder config file
[Dd]esktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp
# Windows shortcuts
*.lnk
# JetBrains Rider
.idea/
*.sln.iml
##
## Visual Studio Code
##
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

7
DiscordBotGUI/App.axaml
View File

@@ -1,7 +0,0 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="DiscordBotGUI.App">
<Application.Styles>
<FluentTheme Mode="Dark" />
</Application.Styles>
</Application>

21
DiscordBotGUI/App.axaml.cs
View File

@@ -1,21 +0,0 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
namespace DiscordBotGUI;
public class App : Application
{
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
}
public override void OnFrameworkInitializationCompleted()
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) desktop.MainWindow = new AppUpdater { Width = 300, Height = 50, WindowStartupLocation = WindowStartupLocation.CenterScreen };
base.OnFrameworkInitializationCompleted();
}
}

17
DiscordBotGUI/AppUpdater.axaml
View File

@@ -1,17 +0,0 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="250" d:DesignHeight="50"
x:Class="DiscordBotGUI.AppUpdater"
Title="AppUpdater"
Background="Transparent"
TransparencyLevelHint="AcrylicBlur"
SystemDecorations="BorderOnly">
<StackPanel Margin="10">
<TextBlock x:Class="DiscordBotGUI.AppUpdater" x:Name="textBox1" Text="Checking for updates..." />
<ProgressBar IsIndeterminate="True" x:Class="DiscordBotGUI.AppUpdater" x:Name="progressBar1"
Foreground="Yellow" />
</StackPanel>
</Window>

170
DiscordBotGUI/AppUpdater.axaml.cs
View File

@@ -1,170 +0,0 @@
using Avalonia.Controls;
using PluginManager.Online;
using PluginManager.Others;
using System.Threading.Tasks;
using System;
using System.IO;
using System.Threading;
using PluginManager;
namespace DiscordBotGUI
{
public partial class AppUpdater : Window
{
private string _version = "";
public AppUpdater()
{
InitializeComponent();
Config.LoadConfig().Wait();
if (!File.Exists("./Version.txt"))
{
File.WriteAllText("./Version.txt", "DiscordBotVersion=0");
DownloadDiscordBotClientNoGUIAsDLL();
}
if (!File.Exists("./DiscordBot.exe")) DownloadDiscordBotClientNoGUIAsDLL();
Updates();
}
private async void DownloadDiscordBotClientNoGUIAsDLL()
{
//await Task.Delay(5000);
string url_bot_dll = "https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/DiscordBot.zip";
int actiontype = 0; //0 - downolad, 1- extract
IProgress<float> progress = new Progress<float>((percent) =>
{
if (actiontype == 0)
textBox1.Text = "Downloading DiscordBot ... " + MathF.Round(percent, 2) + "%";
else
textBox1.Text = "Extracting package ..." + MathF.Round(percent, 2) + "%";
this.progressBar1.Value = percent;
});
this.progressBar1.IsIndeterminate = false;
try
{
await ServerCom.DownloadFileAsync(url_bot_dll, "./DiscordBot.zip", progress);
actiontype++;
await Functions.ExtractArchive("./DiscordBot.zip", "./", progress);
}
catch
{
textBox1.Text = "Error downloading DiscordBot.dll. Server is not responding.";
await Task.Delay(1000);
new MainWindow() { Height = 425, Width = 500 }.Show();
Close();
}
}
private async void Updates()
{
this.progressBar1.IsIndeterminate = true;
await Task.Delay(1000);
if (!await CheckForUpdates())
{
//await Task.Delay(5000);
textBox1.Text = $"You are running on the latest version ({_version}) !";
await Task.Delay(2000);
new MainWindow() { Height = 425, Width = 650 }.Show();
this.Close();
return;
}
string file = await DownloadNewUpdate();
if (file == null)
{
textBox1.Text = "There was an error while downloading the update !";
await Task.Delay(2000);
new MainWindow() { Height = 425, Width = 650 }.Show();
this.Close();
return;
}
IProgress<float> progress = new Progress<float>((percent) => { this.progressBar1.Value = percent; });
textBox1.Text = "Extracting update files ...";
await Functions.ExtractArchive(file, "./", progress);
progressBar1.IsIndeterminate = true;
textBox1.Text = "Setting up the new version ...";
File.Delete(file);
File.WriteAllText("./Version.txt", "DiscordBotVersion=" + _version);
await Task.Delay(5000);
new MainWindow() { Height = 425, Width = 650 }.Show();
this.Close();
}
private async Task<string> DownloadNewUpdate()
{
string urlNewUpdateZip = (await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/Version"))[1];
int secondsPast = 0;
bool isDownloading = true;
this.progressBar1.IsIndeterminate = true;
textBox1.Text = "Downloading update ...";
IProgress<long> downloaded = new Progress<long>((bytes) =>
{
(double, string) download = Functions.ConvertBytes(bytes);
textBox1.Text = $"Downloading update ... {Math.Round(download.Item1 / secondsPast, 2)} {download.Item2}/s";
});
IProgress<float> progress = new Progress<float>((percent) =>
{
progressBar1.IsIndeterminate = false;
this.progressBar1.Value = percent;
});
string FileName = $"{urlNewUpdateZip.Split('/')[urlNewUpdateZip.Split('/').Length - 1]}";
try
{
new Thread(new Task(() =>
{
while (isDownloading)
{
Thread.Sleep(1000);
secondsPast++;
}
}).Start).Start();
await ServerCom.DownloadFileAsync(urlNewUpdateZip, FileName, progress, downloaded);
}
catch
{
textBox1.Text = "Error downloading the update. Server is not responding.";
isDownloading = false;
await Task.Delay(1000);
return null;
}
isDownloading = false;
return FileName;
}
private async Task<bool> CheckForUpdates()
{
try
{
string current_version = Config.GetValue<string>("Version");
if (current_version == null)
if (!Config.SetValue("Version", "0"))
Config.AddValueToVariables("Version", "0", false);
string latest_version = (await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/Version"))[0];
_version = latest_version;
if (current_version != latest_version) { return true; }
return false;
}
catch (Exception ex)
{
textBox1.Text = "Error while checking for updates. Server is not responding.";
Functions.WriteErrFile(ex.Message);
return false;
}
}
}
}

40
DiscordBotGUI/DiscordBotGUI.csproj
View File

@@ -1,40 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
<TrimMode>copyused</TrimMode>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<BaseOutputPath>..\BUILDS\DiscordBotUI\</BaseOutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>
<ItemGroup>
<AvaloniaXaml Remove="bin\**" />
<Compile Remove="bin\**" />
<EmbeddedResource Remove="bin\**" />
<None Remove="bin\**" />
</ItemGroup>
<ItemGroup>
<None Remove=".gitignore" />
</ItemGroup>
<ItemGroup>
<!--This helps with theme dll-s trimming.
If you will publish your application in self-contained mode with p:PublishTrimmed=true and it will use Fluent theme Default theme will be trimmed from the output and vice versa.
https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
<TrimmableAssembly Include="Avalonia.Themes.Fluent" />
<TrimmableAssembly Include="Avalonia.Themes.Default" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.14" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.14" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.14" />
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PluginManager\PluginManager.csproj" />
</ItemGroup>
</Project>

39
DiscordBotGUI/MainWindow.axaml
View File

@@ -1,39 +0,0 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="425"
x:Class="DiscordBotGUI.MainWindow"
Title="DiscordBotGUI"
Background="Transparent"
TransparencyLevelHint="AcrylicBlur"
ExtendClientAreaToDecorationsHint="True">
<StackPanel Margin="20">
<Menu>
<MenuItem Header="Plugins">
<MenuItem Header="Commands" x:Class="DiscordBotGUI.MainWindow" x:Name="commandsSettingMenuItem" />
<MenuItem Header="Events" x:Class="DiscordBotGUI.MainWindow" x:Name="eventsSettingMenuItem" />
</MenuItem>
<MenuItem Header="Application Variables" x:Class="DiscordBotGUI.MainWindow"
x:Name="applicationVariablesMenuItem" />
</Menu>
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label1" Content="Discord Token" />
<TextBox x:Class="DiscordBotGUI.MainWindow" x:Name="textBox1" IsReadOnly="True" TextAlignment="Center" Text="" />
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label2" Content="Bot Prefix" />
<TextBox x:Class="DiscordBotGUI.MainWindow" x:Name="textBox2" TextAlignment="Center" HorizontalAlignment="Left"
IsReadOnly="True" Text="" />
<Border Background="Black" Padding="0.5" Margin="25" />
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label3" Content="Start Arguments: " />
<TextBox x:Class="DiscordBotGUI.MainWindow" x:Name="textBox3" Width="250" TextAlignment="Center"
HorizontalAlignment="Left" IsReadOnly="False" Text="" />
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label4" Content="" Foreground="Red" Margin="10" />
<Button x:Class="DiscordBotGUI.MainWindow" x:Name="button1" HorizontalAlignment="Center"
VerticalAlignment="Bottom" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
Width="200" Content="Start Bot" Margin="0,75,0,0" />
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label5" Content="" VerticalAlignment="Bottom"
HorizontalAlignment="Right" Margin="0,0,0,0" />
</StackPanel>
</Window>

86
DiscordBotGUI/MainWindow.axaml.cs
View File

@@ -1,86 +0,0 @@
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using Avalonia.Controls;
using DiscordBotGUI.Settings;
using PluginManager;
using PluginManager.Others;
namespace DiscordBotGUI;
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
LoadElements();
}
private void LoadElements()
{
textBox3.Watermark = "Insert start arguments";
if (File.Exists("./Version.txt")) label5.Content = Config.GetValue<string>("Version");
button1.Click += async (sender, e) =>
{
var token = textBox1.Text;
var prefix = textBox2.Text;
var args = "--nomessage " + textBox3.Text;
if (!((token.Length == 70 || token.Length == 59) && prefix.Length == 1))
{
label4.Content = "Invalid Token or Prefix.\n(Prefix must be 1 character long and token must be 59 or 79 characters long)";
await Task.Delay(5000);
label4.Content = "";
return;
}
Config.SetValue("token", token);
Config.SetValue("prefix", prefix);
RunDiscordBot(args);
};
commandsSettingMenuItem.Click += (sender, e) => new Commands() /*{ Height = 200, Width = 550 }*/.ShowDialog(this);
eventsSettingMenuItem.Click += (sender, e) => new Events() /*{ Height = 200, Width = 550 }*/.ShowDialog(this);
applicationVariablesMenuItem.Click += (sender, e) => new ApplicationVariables().ShowDialog(this);
var folder = $"{Functions.dataFolder}DiscordBotCore.data";
Directory.CreateDirectory(Functions.dataFolder);
try
{
var botToken = Config.GetValue<string>("token");
var botPrefix = Config.GetValue<string>("prefix");
if (botToken == null || botPrefix == null)
{
textBox1.IsReadOnly = false;
textBox2.IsReadOnly = false;
textBox1.Watermark = "Insert Bot Token Here";
textBox2.Watermark = "Insert Bot Prefix Here";
}
else
{
textBox1.Text = botToken;
textBox2.Text = botPrefix;
}
}
catch
{
textBox1.IsReadOnly = false;
textBox2.IsReadOnly = false;
textBox1.Watermark = "Insert Bot Token Here";
textBox2.Watermark = "Insert Bot Prefix Here";
}
}
private void RunDiscordBot(string args)
{
var os = Functions.GetOperatingSystem();
if (os == OperatingSystem.WINDOWS)
Process.Start("./DiscordBot.exe", args);
else if (os == OperatingSystem.LINUX)
Process.Start("./DiscordBot", args);
else if (os == OperatingSystem.MAC_OS) Process.Start("./DiscordBot.app/Contents/MacOS/DiscordBot", args);
Close();
}
}

25
DiscordBotGUI/Program.cs
View File

@@ -1,25 +0,0 @@
using System;
using Avalonia;
namespace DiscordBotGUI;
internal class Program
{
// Initialization code. Don't use any Avalonia, third-party APIs or any
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
// yet and stuff might break.
[STAThread]
public static void Main(string[] args)
{
BuildAvaloniaApp()
.StartWithClassicDesktopLifetime(args);
}
// Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp()
{
return AppBuilder.Configure<App>()
.UsePlatformDetect()
.LogToTrace();
}
}

23
DiscordBotGUI/Settings/ApplicationVariables.axaml
View File

@@ -1,23 +0,0 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="DiscordBotGUI.Settings.ApplicationVariables"
Title="ApplicationVariables">
<StackPanel>
<Label Content="Available commands" />
<TextBox x:Name="textBox1" x:Class="DiscordBotGUI.Settings.ApplicationVariables" />
<Label Content="Insert a new variable" />
<Border Background="White" BorderThickness="3" Margin="10" />
<Label Content="New Variable Name" />
<TextBox x:Name="textBox2" x:Class="DiscordBotGUI.Settings.ApplicationVariables" />
<Label Content="New Variable Value" />
<TextBox x:Name="textBox3" x:Class="DiscordBotGUI.Settings.ApplicationVariables" />
<Label Content="New Variable IsReadOnly" />
<CheckBox x:Class="DiscordBotGUI.Settings.ApplicationVariables" x:Name="checkBox1" />
<Button Content="Add command" x:Class="DiscordBotGUI.Settings.ApplicationVariables" x:Name="button1" />
</StackPanel>
</Window>

41
DiscordBotGUI/Settings/ApplicationVariables.axaml.cs
View File

@@ -1,41 +0,0 @@
using Avalonia.Controls;
using PluginManager;
namespace DiscordBotGUI.Settings;
public partial class ApplicationVariables : Window
{
public ApplicationVariables()
{
InitializeComponent();
Load();
}
private void Load()
{
ClearEverything();
button1.Click += (sedner, e) =>
{
var key = textBox2.Text;
if (Config.ContainsKey(key))
{
ClearEverything();
return;
}
var value = textBox3.Text;
Config.AddValueToVariables(key, value, checkBox1.IsChecked!.Value);
ClearEverything();
};
}
private void ClearEverything()
{
textBox1.Text = "";
textBox2.Text = "";
textBox3.Text = "";
checkBox1.IsChecked = false;
var allvars = Config.GetAllVariables();
foreach (var kvp in allvars) textBox1.Text += kvp.Key + " => " + kvp.Value + "\n";
}
}

24
DiscordBotGUI/Settings/Commands.axaml
View File

@@ -1,24 +0,0 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="550" d:DesignHeight="200"
x:Class="DiscordBotGUI.Settings.Commands"
Title="Commands"
Background="Transparent"
TransparencyLevelHint="AcrylicBlur"
ExtendClientAreaToDecorationsHint="True">
<StackPanel x:Class="DiscordBotGUI.Settings.Commands" x:Name="stackpanel1" Margin="10">
<Label Content="Installed Commands" />
<TextBox x:Class="DiscordBotGUI.Settings.Commands" x:Name="textbox1" TextAlignment="Left" IsReadOnly="True" />
<Label Content="Install another command" />
<ComboBox x:Class="DiscordBotGUI.Settings.Commands" x:Name="comboBox1" HorizontalAlignment="Left"
VerticalAlignment="Top" Margin="0,10" Padding="200,0" />
<Button x:Class="DiscordBotGUI.Settings.Commands" x:Name="button1" HorizontalAlignment="Left" Content="Install" />
<ProgressBar x:Class="DiscordBotGUI.Settings.Commands" x:Name="progressBar1" HorizontalAlignment="Left"
Margin="0,10" Foreground="Yellow" />
<Label x:Class="DiscordBotGUI.Settings.Commands" x:Name="label1" Content="" HorizontalAlignment="Left"
Margin="0,10" />
</StackPanel>
</Window>

136
DiscordBotGUI/Settings/Commands.axaml.cs
View File

@@ -1,136 +0,0 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Avalonia.Controls;
using PluginManager.Online;
using PluginManager.Others;
using OperatingSystem = PluginManager.Others.OperatingSystem;
namespace DiscordBotGUI.Settings;
public partial class Commands : Window
{
private List<string> commands = new();
public Commands()
{
InitializeComponent();
LoadData();
LoadComboBox();
button1.Click += async (sender, e) => { await Download(); };
}
private void LoadData()
{
try
{
textbox1.Text = "";
Directory.CreateDirectory("./Data/Plugins/Commands/");
var files = Directory.EnumerateFiles("./Data/Plugins/Commands/");
if (files == null || files.Count() < 1) return;
foreach (var file in files) textbox1.Text += file.Split('/')[file.Split('/').Length - 1] + "\n";
}
catch
{
}
}
private async void LoadComboBox()
{
comboBox1.Items = null;
commands = await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Plugins");
if (commands == null) return;
var plugins = commands.ToArray();
string OS;
var OSG = Functions.GetOperatingSystem();
if (OSG == OperatingSystem.WINDOWS)
OS = "Windows";
else if (OSG == OperatingSystem.LINUX)
OS = "Linux";
else
OS = "MAC_OS";
var data = new List<string>();
for (var i = 0; i < plugins.Length; i++)
{
if (!plugins[i].Contains(OS) || !plugins[i].Contains("Commands")) continue;
var info = plugins[i].Split(',');
try
{
if (Directory.EnumerateFiles("./Data/Plugins/Commands/").Any(x => x.EndsWith(info[0] + ".dll"))) continue;
}
catch
{
}
data.Add($"{info[0]} - {info[1]} - {info[2]}");
}
comboBox1.Items = data;
}
private async Task Download()
{
if (comboBox1 == null || comboBox1.SelectedIndex == -1 || comboBox1.SelectedItem == null) return;
var pluginName = comboBox1?.SelectedItem?.ToString()?.Split('-')[0].Trim();
if (pluginName == null) return;
var URL = (from s in commands
where s.StartsWith(pluginName)
select s.Split(',')[3].Trim()).FirstOrDefault();
if (URL == null) return;
IProgress<float> progress = new Progress<float>(async value =>
{
label1.Content = $"Downloading {pluginName} {MathF.Round(value, 2)}%";
if (value == 1f)
{
label1.Content = "Successfully Downloaded " + pluginName;
LoadData();
LoadComboBox();
await Task.Delay(5000);
label1.Content = "";
}
progressBar1.Value = value;
}
);
await ServerCom.DownloadFileAsync(URL, "./Data/Plugins/Commands/" + pluginName + ".dll", progress);
var requirements = (from s in commands
where s.StartsWith(pluginName) && s.Split(',').Length == 6
select s.Split(',')[5].Trim()).FirstOrDefault();
if (requirements == null) return;
var req = await ServerCom.ReadTextFromFile(requirements);
if (req == null) return;
foreach (var requirement in req)
{
var info = requirement.Split(',');
pluginName = info[1];
progress.Report(0);
await ServerCom.DownloadFileAsync(info[0], $"./{info[1]}", progress);
await Task.Delay(1000);
if (info[0].EndsWith(".zip"))
{
await Functions.ExtractArchive("./" + info[1], "./", progress);
await Task.Delay(1000);
}
}
progress.Report(100f);
label1.Content = "Downloaded";
progressBar1.Value = 100;
}
}

23
DiscordBotGUI/Settings/Events.axaml
View File

@@ -1,23 +0,0 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="550" d:DesignHeight="200"
x:Class="DiscordBotGUI.Settings.Events"
Title="Events"
Background="Transparent"
TransparencyLevelHint="AcrylicBlur"
ExtendClientAreaToDecorationsHint="True">
<StackPanel Margin="10">
<Label Content="Installed Events" />
<TextBox x:Class="DiscordBotGUI.Settings.Events" x:Name="textbox1" TextAlignment="Left" IsReadOnly="True" />
<Label Content="Install another Events" />
<ComboBox x:Class="DiscordBotGUI.Settings.Events" x:Name="comboBox1" HorizontalAlignment="Left"
VerticalAlignment="Top" Margin="0,10" Padding="200,0" />
<Button x:Class="DiscordBotGUI.Settings.Events" x:Name="button1" HorizontalAlignment="Left" Content="Install" />
<ProgressBar x:Class="DiscordBotGUI.Settings.Events" x:Name="progressBar1" HorizontalAlignment="Left"
Margin="0,10" Foreground="Yellow" />
<Label x:Class="DiscordBotGUI.Settings.Events" x:Name="label1" Content="" HorizontalAlignment="Left"
Margin="0,10" />
</StackPanel>
</Window>

135
DiscordBotGUI/Settings/Events.axaml.cs
View File

@@ -1,135 +0,0 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Avalonia.Controls;
using PluginManager.Online;
using PluginManager.Others;
using OperatingSystem = PluginManager.Others.OperatingSystem;
namespace DiscordBotGUI.Settings;
public partial class Events : Window
{
private List<string> events = new();
public Events()
{
InitializeComponent();
LoadData();
LoadComboBox();
button1.Click += async (sender, e) => { await Download(); };
}
private void LoadData()
{
//Read components from Commands Folder:
//textbox1 = new TextBox();
try
{
Directory.CreateDirectory("./Data/Plugins/Events/");
textbox1.IsReadOnly = false;
textbox1.Text = "";
var files = Directory.EnumerateFiles("./Data/Plugins/Events/");
if (files == null || files.Count() < 1) return;
foreach (var file in files) textbox1.Text += file.Split('/')[file.Split('/').Length - 1] + "\n";
}
catch
{
}
}
private async void LoadComboBox()
{
comboBox1.Items = null;
events = await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Plugins");
if (events == null) return;
var plugins = events.ToArray();
string OS;
var OSG = Functions.GetOperatingSystem();
if (OSG == OperatingSystem.WINDOWS)
OS = "Windows";
else if (OSG == OperatingSystem.LINUX)
OS = "Linux";
else
OS = "MAC_OS";
var data = new List<string>();
for (var i = 0; i < plugins.Length; i++)
{
if (!plugins[i].Contains(OS) || !plugins[i].Contains("Event")) continue;
var info = plugins[i].Split(',');
try
{
if (Directory.EnumerateFiles("./Data/Plugins/Events/").Any(x => x.EndsWith(info[0] + ".dll"))) continue;
}
catch
{
}
data.Add($"{info[0]} - {info[1]} - {info[2]}");
}
comboBox1.Items = data;
}
private async Task Download()
{
if (comboBox1 == null || comboBox1.SelectedIndex == -1 || comboBox1.SelectedItem == null) return;
var pluginName = comboBox1?.SelectedItem?.ToString()?.Split('-')[0].Trim();
if (pluginName == null) return;
var URL = (from s in events
where s.StartsWith(pluginName)
select s.Split(',')[3].Trim()).FirstOrDefault();
if (URL == null) return;
IProgress<float> progress = new Progress<float>(async value =>
{
label1.Content = $"Downloading {pluginName} {MathF.Round(value, 2)}%";
if (value == 1f)
{
label1.Content = "Successfully Downloaded " + pluginName;
LoadData();
LoadComboBox();
await Task.Delay(5000);
label1.Content = "";
}
progressBar1.Value = value;
}
);
await ServerCom.DownloadFileAsync(URL, "./Data/Plugins/Events/" + pluginName + ".dll", progress);
var requirements = (from s in events
where s.StartsWith(pluginName) && s.Split(',').Length == 6
select s.Split(',')[5].Trim()).FirstOrDefault();
if (requirements == null) return;
var req = await ServerCom.ReadTextFromFile(requirements);
if (req == null) return;
foreach (var requirement in req)
{
var info = requirement.Split(',');
pluginName = info[1];
progress.Report(0);
await ServerCom.DownloadFileAsync(info[0], $"./{info[1]}", progress);
await Task.Delay(1000);
if (info[0].EndsWith(".zip"))
{
await Functions.ExtractArchive("./" + info[1], "./", progress);
await Task.Delay(1000);
}
}
label1.Content = "";
}
}

10
DiscordBotWithAPI.sln
View File

@@ -17,11 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMD_Utils", "CMD_Utils\CMD_
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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 EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordBotGUI", "DiscordBotGUI\DiscordBotGUI.csproj", "{7B5899F0-0218-4537-8C74-6210ED2D3690}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EVE_LevelingSystem", "EVE_LevelingSystem\EVE_LevelingSystem.csproj", "{EEC445DC-0C4B-43EA-8694-606BA0390B77}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EVE_LevelingSystem", "EVE_LevelingSystem\EVE_LevelingSystem.csproj", "{EEC445DC-0C4B-43EA-8694-606BA0390B77}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMD_LevelingSystem", "CMD_LevelingSystem\CMD_LevelingSystem.csproj", "{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMD_LevelingSystem", "CMD_LevelingSystem\CMD_LevelingSystem.csproj", "{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,10 +43,6 @@ Global
{B1B4976E-5112-4217-B57B-3A03C5207B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU {B1B4976E-5112-4217-B57B-3A03C5207B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1B4976E-5112-4217-B57B-3A03C5207B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU {B1B4976E-5112-4217-B57B-3A03C5207B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1B4976E-5112-4217-B57B-3A03C5207B6E}.Release|Any CPU.Build.0 = Release|Any CPU {B1B4976E-5112-4217-B57B-3A03C5207B6E}.Release|Any CPU.Build.0 = Release|Any CPU
{7B5899F0-0218-4537-8C74-6210ED2D3690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B5899F0-0218-4537-8C74-6210ED2D3690}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B5899F0-0218-4537-8C74-6210ED2D3690}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B5899F0-0218-4537-8C74-6210ED2D3690}.Release|Any CPU.Build.0 = Release|Any CPU
{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EEC445DC-0C4B-43EA-8694-606BA0390B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Debug|Any CPU.Build.0 = Debug|Any CPU {EEC445DC-0C4B-43EA-8694-606BA0390B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Release|Any CPU.ActiveCfg = Release|Any CPU {EEC445DC-0C4B-43EA-8694-606BA0390B77}.Release|Any CPU.ActiveCfg = Release|Any CPU

3
MusicCommands/Data.cs
View File

@@ -1,8 +1,7 @@
using Discord; using Discord;
using Discord.Audio; using Discord.Audio;
using MusicCommands;
namespace CMD_Utils.Music; namespace MusicCommands;
internal static class Data internal static class Data
{ {

2
MusicCommands/Leave.cs
View File

@@ -2,7 +2,7 @@
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Interfaces; using PluginManager.Interfaces;
namespace CMD_Utils.Music; namespace MusicCommands;
internal class Leave : DBCommand internal class Leave : DBCommand
{ {

1
MusicCommands/MusicCommands.csproj
View File

@@ -3,6 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Nullable>warnings</Nullable> <Nullable>warnings</Nullable>
<BaseOutputPath>..\DiscordBot\bin\Debug\net6.0\Data\Plugins\Commands\MusicCommands</BaseOutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

1
MusicCommands/MusicPlayer.cs
View File

@@ -3,7 +3,6 @@ using System.IO;
using System.Net.Http; using System.Net.Http;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CMD_Utils.Music;
using PluginManager.Others; using PluginManager.Others;
namespace MusicCommands; namespace MusicCommands;

2
MusicCommands/Pause.cs
View File

@@ -2,7 +2,7 @@
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Interfaces; using PluginManager.Interfaces;
namespace CMD_Utils.Music; namespace MusicCommands;
internal class Pause : DBCommand internal class Pause : DBCommand
{ {

5
MusicCommands/Play.cs
View File

@@ -5,11 +5,10 @@ using Discord;
using Discord.Audio; using Discord.Audio;
using Discord.Commands; using Discord.Commands;
using Discord.WebSocket; using Discord.WebSocket;
using MusicCommands;
using PluginManager.Interfaces; using PluginManager.Interfaces;
using PluginManager.Others; using PluginManager.Others;
namespace CMD_Utils.Music; namespace MusicCommands;
internal class Play : DBCommand internal class Play : DBCommand
{ {
@@ -29,7 +28,7 @@ internal class Play : DBCommand
{ {
var path = "./Music"; var path = "./Music";
var FileName = Functions.GetArguments(message).ToArray().MergeStrings(0); var FileName = Functions.GetArguments(message).ToArray().MergeStrings(0);
path += "/" + FileName + ".mp3"; path += "/" + FileName + ".ogg";
if (!File.Exists(path)) if (!File.Exists(path))
{ {
Console.WriteLine("Unknown path " + path); Console.WriteLine("Unknown path " + path);

3
MusicCommands/Unpause.cs
View File

@@ -1,5 +1,4 @@
using CMD_Utils.Music; using Discord.Commands;
using Discord.Commands;
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Interfaces; using PluginManager.Interfaces;

3
MusicCommands/lplay.cs
View File

@@ -1,5 +1,4 @@
using CMD_Utils.Music; using Discord;
using Discord;
using Discord.Audio; using Discord.Audio;
using Discord.Commands; using Discord.Commands;
using Discord.WebSocket; using Discord.WebSocket;

117
PluginManager/Config.cs
View File

@@ -1,35 +1,117 @@
using PluginManager.Others; using System;
using PluginManager.Others;
using System.IO; using System.IO;
using System.Linq;
using System.Text.Json; using System.Text.Json;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading;
using Newtonsoft.Json.Linq;
namespace PluginManager namespace PluginManager
{ {
internal class AppConfig internal class AppConfig
{ {
public Dictionary<string, object> ApplicationVariables { get; set; } public Dictionary<string, object>? ApplicationVariables { get; set; }
public List<string> ProtectedKeyWords { get; set; } public List<string>? ProtectedKeyWords { get; set; }
} }
public static class Config public static class Config
{ {
private static AppConfig appConfig; public static class PluginConfig
{
public static List<Tuple<string, PluginType>> InstalledPlugins = new();
public static void Load()
{
new Thread(LoadCommands).Start();
new Thread(LoadEvents).Start();
}
private static void LoadCommands()
{
string cmd_path = "./Data/Plugins/Commands/";
string[] files = Directory.GetFiles(cmd_path, $"*.{Loaders.PluginLoader.pluginCMDExtension}", SearchOption.AllDirectories);
foreach (var file in files)
if (!file.Contains("PluginManager", StringComparison.InvariantCultureIgnoreCase))
{
string PluginName = new FileInfo(file).Name;
string name = PluginName.Substring(0, PluginName.Length - 1 - PluginManager.Loaders.PluginLoader.pluginCMDExtension.Length);
InstalledPlugins.Add(new(name, PluginType.Command));
}
}
private static void LoadEvents()
{
string eve_path = "./Data/Plugins/Events/";
string[] files = Directory.GetFiles(eve_path, $"*.{Loaders.PluginLoader.pluginEVEExtension}", SearchOption.AllDirectories);
foreach (var file in files)
if (!file.Contains("PluginManager", StringComparison.InvariantCultureIgnoreCase))
if (!file.Contains("PluginManager", StringComparison.InvariantCultureIgnoreCase))
{
string PluginName = new FileInfo(file).Name;
string name = PluginName.Substring(0, PluginName.Length - 1 - PluginManager.Loaders.PluginLoader.pluginEVEExtension.Length);
InstalledPlugins.Add(new(name, PluginType.Event));
}
}
public static bool Contains(string pluginName)
{
foreach (var tuple in InstalledPlugins)
{
if (tuple.Item1 == pluginName) return true;
}
return false;
}
public static PluginType GetPluginType(string pluginName)
{
foreach (var tuple in InstalledPlugins)
{
if (tuple.Item1 == pluginName) return tuple.Item2;
}
return PluginType.Unknown;
}
}
private static AppConfig? appConfig { get; set; }
public static bool AddValueToVariables<T>(string key, T value, bool isProtected) public static bool AddValueToVariables<T>(string key, T value, bool isProtected)
{ {
if (appConfig.ApplicationVariables.ContainsKey(key)) return false; if (appConfig!.ApplicationVariables!.ContainsKey(key)) return false;
if (value == null) return false; if (value == null) return false;
appConfig.ApplicationVariables.Add(key, value); appConfig.ApplicationVariables.Add(key, value);
if (isProtected) appConfig.ProtectedKeyWords.Add(key); if (isProtected && key != "Version") appConfig.ProtectedKeyWords!.Add(key);
SaveConfig(); SaveConfig();
return true; return true;
} }
public static void GetAndAddValueToVariable(string key, string value, bool isReadOnly)
{
if (Config.ContainsKey(key)) return;
if (int.TryParse(value, out var intValue))
Config.AddValueToVariables(key, intValue, isReadOnly);
else if (bool.TryParse(value, out var boolValue))
Config.AddValueToVariables(key, boolValue, isReadOnly);
else if (float.TryParse(value, out var floatValue))
Config.AddValueToVariables(key, floatValue, isReadOnly);
else if (double.TryParse(value, out var doubleValue))
Config.AddValueToVariables(key, doubleValue, isReadOnly);
else if (uint.TryParse(value, out var uintValue))
Config.AddValueToVariables(key, uintValue, isReadOnly);
else if (long.TryParse(value, out var longValue))
Config.AddValueToVariables(key, longValue, isReadOnly);
else if (byte.TryParse(value, out var byteValue))
Config.AddValueToVariables(key, byteValue, isReadOnly);
else
Config.AddValueToVariables(key, value, isReadOnly);
}
public static T? GetValue<T>(string key) public static T? GetValue<T>(string key)
{ {
if (!appConfig.ApplicationVariables.ContainsKey(key)) return default; if (!appConfig!.ApplicationVariables!.ContainsKey(key)) return default;
try try
{ {
JsonElement element = (JsonElement)appConfig.ApplicationVariables[key]; JsonElement element = (JsonElement)appConfig.ApplicationVariables[key];
@@ -43,8 +125,8 @@ namespace PluginManager
public static bool SetValue<T>(string key, T value) public static bool SetValue<T>(string key, T value)
{ {
if (!appConfig.ApplicationVariables.ContainsKey(key)) return false; if (!appConfig!.ApplicationVariables!.ContainsKey(key)) return false;
if (appConfig.ProtectedKeyWords.Contains(key)) return false; if (appConfig.ProtectedKeyWords!.Contains(key)) return false;
if (value == null) return false; if (value == null) return false;
appConfig.ApplicationVariables[key] = JsonSerializer.SerializeToElement(value); appConfig.ApplicationVariables[key] = JsonSerializer.SerializeToElement(value);
@@ -54,8 +136,9 @@ namespace PluginManager
public static bool RemoveKey(string key) public static bool RemoveKey(string key)
{ {
appConfig.ApplicationVariables.Remove(key); if (key == "Version" || key == "token" || key == "prefix") return false;
appConfig.ProtectedKeyWords.Remove(key); appConfig!.ApplicationVariables!.Remove(key);
appConfig.ProtectedKeyWords!.Remove(key);
SaveConfig(); SaveConfig();
return true; return true;
} }
@@ -63,7 +146,7 @@ namespace PluginManager
public static async void SaveConfig() public static async void SaveConfig()
{ {
string path = Functions.dataFolder + "config.json"; string path = Functions.dataFolder + "config.json";
await Functions.SaveToJsonFile<AppConfig>(path, appConfig); await Functions.SaveToJsonFile<AppConfig>(path, appConfig!);
} }
public static async Task LoadConfig() public static async Task LoadConfig()
@@ -72,15 +155,15 @@ namespace PluginManager
if (File.Exists(path)) if (File.Exists(path))
{ {
appConfig = await Functions.ConvertFromJson<AppConfig>(path); appConfig = await Functions.ConvertFromJson<AppConfig>(path);
Functions.WriteLogFile($"Loaded {appConfig.ApplicationVariables.Keys.Count} application variables.\nLoaded {appConfig.ProtectedKeyWords.Count} readonly variables."); Functions.WriteLogFile($"Loaded {appConfig.ApplicationVariables!.Keys.Count} application variables.\nLoaded {appConfig.ProtectedKeyWords!.Count} readonly variables.");
} }
else else
appConfig = new() { ApplicationVariables = new Dictionary<string, object>(), ProtectedKeyWords = new List<string>() }; appConfig = new() { ApplicationVariables = new Dictionary<string, object>(), ProtectedKeyWords = new List<string>() };
} }
public static bool ContainsValue<T>(T value) => appConfig.ApplicationVariables.ContainsValue(value!); public static bool ContainsValue<T>(T value) => appConfig!.ApplicationVariables!.ContainsValue(value!);
public static bool ContainsKey(string key) => appConfig.ApplicationVariables.ContainsKey(key); public static bool ContainsKey(string key) => appConfig!.ApplicationVariables!.ContainsKey(key);
public static Dictionary<string, object> GetAllVariables() => new(appConfig.ApplicationVariables); public static Dictionary<string, object> GetAllVariables() => new(appConfig!.ApplicationVariables!);
} }
} }

11
PluginManager/Items/Command.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic; using System;
using System.Collections.Generic;
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Others; using PluginManager.Others;
@@ -42,3 +43,11 @@ internal class Command
/// </summary> /// </summary>
public char PrefixUsed { get; } public char PrefixUsed { get; }
} }
public class ConsoleCommand
{
public string CommandName { get; set; }
public string Description { get; set; }
public string Usage { get; set; }
public Action<string[]> Action { get; set; }
}

118
PluginManager/Items/ConsoleCommandsHandler.cs
View File

@@ -14,16 +14,15 @@ namespace PluginManager.Items;
public class ConsoleCommandsHandler public class ConsoleCommandsHandler
{ {
private static readonly PluginsManager manager = new("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Plugins"); private static readonly PluginsManager manager = new("https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/Plugins.txt");
public static List<ConsoleCommand> commandList = new();
public static List<Tuple<string, string, Action<string[]>>> commandList = new();
private readonly DiscordSocketClient? client; private readonly DiscordSocketClient? client;
public ConsoleCommandsHandler(DiscordSocketClient client) public ConsoleCommandsHandler(DiscordSocketClient client)
{ {
this.client = client; this.client = client;
InitializeBasicCommands(); InitializeBasicCommands();
Console.WriteLine("Initalized console command handeler !"); Console.WriteLine("Initialized console command handler !");
} }
private void InitializeBasicCommands() private void InitializeBasicCommands()
@@ -31,19 +30,35 @@ public class ConsoleCommandsHandler
var pluginsLoaded = false; var pluginsLoaded = false;
commandList.Clear(); commandList.Clear();
AddCommand("help", "Show help", args => AddCommand("help", "Show help", "help <command>", args =>
{ {
if (args.Length <= 1) if (args.Length <= 1)
{ {
Console.WriteLine("Available commands:"); Console.WriteLine("Available commands:");
foreach (var command in commandList) Console.WriteLine("\t" + command.Item1 + " - " + command.Item2); List<string[]> items = new List<string[]>();
items.Add(new[] { "-", "-", "-" });
items.Add(new[] { "Command", "Description", "Usage" });
items.Add(new[] { " ", " ", "Argument type: <optional> [required]" });
items.Add(new[] { "-", "-", "-" });
foreach (var command in commandList)
{
var pa = from p in command.Action.Method.GetParameters()
where p.Name != null
select p.ParameterType.FullName;
items.Add(new[] { command.CommandName, command.Description, command.Usage });
}
items.Add(new[] { "-", "-", "-" });
Console_Utilities.FormatAndAlignTable(items);
} }
else else
{ {
foreach (var command in commandList) foreach (var command in commandList)
if (command.Item1 == args[1]) if (command.CommandName == args[1])
{ {
Console.WriteLine(command.Item2); Console.WriteLine("Command description: " + command.Description);
Console.WriteLine("Command execution format:" + command.Usage);
return; return;
} }
@@ -52,10 +67,11 @@ public class ConsoleCommandsHandler
} }
); );
AddCommand("lp", "Load plugins", () => AddCommand("lp", "Load plugins", () =>
{ {
if (pluginsLoaded) return; if (pluginsLoaded) return;
var loader = new PluginLoader(client); var loader = new PluginLoader(client!);
loader.onCMDLoad += (name, typeName, success, exception) => loader.onCMDLoad += (name, typeName, success, exception) =>
{ {
Console.ForegroundColor = ConsoleColor.Green; Console.ForegroundColor = ConsoleColor.Green;
@@ -83,7 +99,7 @@ public class ConsoleCommandsHandler
AddCommand("listplugs", "list available plugins", async () => { await manager.ListAvailablePlugins(); }); AddCommand("listplugs", "list available plugins", async () => { await manager.ListAvailablePlugins(); });
AddCommand("dwplug", "download plugin", async args => AddCommand("dwplug", "download plugin", "dwplug [name]", async args =>
{ {
if (args.Length == 1) if (args.Length == 1)
{ {
@@ -116,6 +132,12 @@ public class ConsoleCommandsHandler
else else
path = $"./{info[1].Split('/')[info[1].Split('/').Length - 1]}"; path = $"./{info[1].Split('/')[info[1].Split('/').Length - 1]}";
await ServerCom.DownloadFileAsync(info[1], path); await ServerCom.DownloadFileAsync(info[1], path);
if (info[0] == "Command" || info[0] == "Event")
if (info[0] == "Event")
Config.PluginConfig.InstalledPlugins.Add(new(name, PluginType.Event));
else if (info[0] == "Command") Config.PluginConfig.InstalledPlugins.Add(new(name, PluginType.Command));
Console.WriteLine("\n"); Console.WriteLine("\n");
// check requirements if any // check requirements if any
@@ -128,6 +150,7 @@ public class ConsoleCommandsHandler
foreach (var line in lines) foreach (var line in lines)
{ {
if (!(line.Length > 0 && line.Contains(","))) continue;
var split = line.Split(','); var split = line.Split(',');
Console.WriteLine($"\nDownloading item: {split[1]}"); Console.WriteLine($"\nDownloading item: {split[1]}");
await ServerCom.DownloadFileAsync(split[0], "./" + split[1]); await ServerCom.DownloadFileAsync(split[0], "./" + split[1]);
@@ -160,16 +183,6 @@ public class ConsoleCommandsHandler
Console.WriteLine("\n"); Console.WriteLine("\n");
File.Delete("./" + split[1]); File.Delete("./" + split[1]);
} }
if (name == "DBUI")
{
Console.WriteLine("Reload with GUI ?[y/n]");
if (Console.ReadKey().Key == ConsoleKey.Y)
{
Process.Start("./DiscordBotGUI.exe");
Environment.Exit(0);
}
}
} }
Console.WriteLine(); Console.WriteLine();
@@ -178,7 +191,7 @@ public class ConsoleCommandsHandler
); );
AddCommand("value", "read value from VariableStack", args => AddCommand("value", "read value from VariableStack", "value [key]",args =>
{ {
if (args.Length != 2) return; if (args.Length != 2) return;
if (!Config.ContainsKey(args[1])) return; if (!Config.ContainsKey(args[1])) return;
@@ -188,7 +201,7 @@ public class ConsoleCommandsHandler
} }
); );
AddCommand("add", "add variable to the system variables\nadd [key] [value] [isReadOnly=true/false]", args => AddCommand("add", "add variable to the system variables","add [key] [value] [isReadOnly=true/false]", args =>
{ {
if (args.Length < 4) return; if (args.Length < 4) return;
var key = args[1]; var key = args[1];
@@ -197,23 +210,7 @@ public class ConsoleCommandsHandler
try try
{ {
if (Config.ContainsKey(key)) return; Config.GetAndAddValueToVariable(key, value, isReadOnly);
if (int.TryParse(value, out var intValue))
Config.AddValueToVariables(key, intValue, isReadOnly);
else if (bool.TryParse(value, out var boolValue))
Config.AddValueToVariables(key, boolValue, isReadOnly);
else if (float.TryParse(value, out var floatValue))
Config.AddValueToVariables(key, floatValue, isReadOnly);
else if (double.TryParse(value, out var doubleValue))
Config.AddValueToVariables(key, doubleValue, isReadOnly);
else if (uint.TryParse(value, out var uintValue))
Config.AddValueToVariables(key, uintValue, isReadOnly);
else if (long.TryParse(value, out var longValue))
Config.AddValueToVariables(key, longValue, isReadOnly);
else if (byte.TryParse(value, out var byteValue))
Config.AddValueToVariables(key, byteValue, isReadOnly);
else
Config.AddValueToVariables(key, value, isReadOnly);
Console.WriteLine($"Updated config file with the following command: {args[1]} => {value}"); Console.WriteLine($"Updated config file with the following command: {args[1]} => {value}");
} }
catch (Exception ex) catch (Exception ex)
@@ -223,7 +220,7 @@ public class ConsoleCommandsHandler
} }
); );
AddCommand("remv", "remove variable from system variables", args => AddCommand("remv", "remove variable from system variables", "remv [key]", args =>
{ {
if (args.Length < 2) return; if (args.Length < 2) return;
Config.RemoveKey(args[1]); Config.RemoveKey(args[1]);
@@ -237,7 +234,7 @@ public class ConsoleCommandsHandler
data.Add(new[] { "-", "-" }); data.Add(new[] { "-", "-" });
data.Add(new[] { "Key", "Value" }); data.Add(new[] { "Key", "Value" });
data.Add(new[] { "-", "-" }); data.Add(new[] { "-", "-" });
foreach (var kvp in d) data.Add(new[] { kvp.Key, kvp.Value.ToString() }); foreach (var kvp in d) data.Add(new[] { kvp.Key, kvp.Value.ToString()! });
data.Add(new[] { "-", "-" }); data.Add(new[] { "-", "-" });
Console_Utilities.FormatAndAlignTable(data); Console_Utilities.FormatAndAlignTable(data);
} }
@@ -252,23 +249,31 @@ public class ConsoleCommandsHandler
Environment.Exit(0); Environment.Exit(0);
} }
); );
//Sort the commands by name
commandList.Sort((x, y) => x.CommandName.CompareTo(y.CommandName));
} }
public static void AddCommand(string command, string description, Action<string[]> action) public static void AddCommand(string command, string description, string usage, Action<string[]> action)
{ {
commandList.Add(new Tuple<string, string, Action<string[]>>(command, description, action)); commandList.Add(new ConsoleCommand
{
CommandName = command,
Description = description,
Action = action,
Usage = usage
});
Console.ForegroundColor = ConsoleColor.White; Console.ForegroundColor = ConsoleColor.White;
Console_Utilities.WriteColorText($"Command &r{command} &cadded to the list of commands"); Console_Utilities.WriteColorText($"Command &r{command} &cadded to the list of commands");
} }
public static void AddCommand(string command, string description, Action action) public static void AddCommand(string command, string description, Action action)
{ {
AddCommand(command, description, args => action()); AddCommand(command, description, command, args => action());
} }
public static void RemoveCommand(string command) public static void RemoveCommand(string command)
{ {
commandList.RemoveAll(x => x.Item1 == command); commandList.RemoveAll(x => x.CommandName == command);
} }
public static bool CommandExists(string command) public static bool CommandExists(string command)
@@ -276,17 +281,30 @@ public class ConsoleCommandsHandler
return !(GetCommand(command) is null); return !(GetCommand(command) is null);
} }
public static Tuple<string, string, Action<string[]>>? GetCommand(string command) public static ConsoleCommand? GetCommand(string command)
{ {
return commandList.FirstOrDefault(t => t.Item1 == command); return commandList.FirstOrDefault(t => t.CommandName == command);
} }
public void HandleCommand(string command) public bool HandleCommand(string command, bool removeCommandExecution = true)
{ {
var args = command.Split(' '); var args = command.Split(' ');
foreach (var item in commandList.ToList()) foreach (var item in commandList.ToList())
if (item.Item1 == args[0]) if (item.CommandName == args[0])
item.Item3(args); {
if (removeCommandExecution)
{
Console.SetCursorPosition(0, Console.CursorTop - 1);
for (int i = 0; i < command.Length; i++) Console.Write(" ");
Console.SetCursorPosition(0, Console.CursorTop);
}
Console.WriteLine();
item.Action(args);
return true;
}
return false;
//Console.WriteLine($"Executing: {args[0]} with the following parameters: {args.MergeStrings(1)}"); //Console.WriteLine($"Executing: {args[0]} with the following parameters: {args.MergeStrings(1)}");
} }
} }

62
PluginManager/Items/Spinner.cs
View File

@@ -1,62 +0,0 @@
using System;
using System.Threading.Tasks;
using PluginManager.Others.Exceptions;
namespace PluginManager.Items;
public class Spinner
{
/// <summary>
/// True if active, false otherwise
/// </summary>
public bool isSpinning;
/// <summary>
/// The Spinner constructor
/// </summary>
public Spinner()
{
isSpinning = false;
}
/// <summary>
/// The method that is called to start spinning the spinner
/// </summary>
public async void Start()
{
isSpinning = true;
var cnt = 0;
while (isSpinning)
{
cnt++;
switch (cnt % 4)
{
case 0:
Console.Write("/");
break;
case 1:
Console.Write("-");
break;
case 2:
Console.Write("\\");
break;
case 3:
Console.Write("|");
break;
}
Console.SetCursorPosition(Console.CursorLeft - 1, Console.CursorTop);
await Task.Delay(250);
}
}
/// <summary>
/// The method that is called to stop the spinner from spinning
/// </summary>
public void Stop()
{
if (!isSpinning) throw new APIException("Spinner was not spinning", GetType());
isSpinning = false;
}
}

9
PluginManager/Loaders/Loader.cs
View File

@@ -28,6 +28,11 @@ internal class Loader<T>
private string path { get; } private string path { get; }
private string extension { get; } private string extension { get; }
internal delegate void FileLoadedEventHandler(LoaderArgs args);
internal delegate void PluginLoadedEventHandler(LoaderArgs args);
internal event FileLoadedEventHandler? FileLoaded; internal event FileLoadedEventHandler? FileLoaded;
internal event PluginLoadedEventHandler? PluginLoaded; internal event PluginLoadedEventHandler? PluginLoaded;
@@ -100,8 +105,4 @@ internal class Loader<T>
return list; return list;
} }
internal delegate void FileLoadedEventHandler(LoaderArgs args);
internal delegate void PluginLoadedEventHandler(LoaderArgs args);
} }

8
PluginManager/Loaders/PluginLoader.cs
View File

@@ -15,8 +15,8 @@ public class PluginLoader
private const string pluginCMDFolder = @"./Data/Plugins/Commands/"; private const string pluginCMDFolder = @"./Data/Plugins/Commands/";
private const string pluginEVEFolder = @"./Data/Plugins/Events/"; private const string pluginEVEFolder = @"./Data/Plugins/Events/";
private const string pluginCMDExtension = "dll"; internal const string pluginCMDExtension = "dll";
private const string pluginEVEExtension = "dll"; internal const string pluginEVEExtension = "dll";
private readonly DiscordSocketClient _client; private readonly DiscordSocketClient _client;
/// <summary> /// <summary>
@@ -87,11 +87,11 @@ public class PluginLoader
{ {
if (e.IsLoaded) ((DBEvent)e.Plugin!).Start(_client); if (e.IsLoaded) ((DBEvent)e.Plugin!).Start(_client);
if (onEVELoad != null) onEVELoad.Invoke(((DBEvent)e.Plugin!).name, e.TypeName!, e.IsLoaded, e.Exception); onEVELoad?.Invoke(((DBEvent)e.Plugin!).name, e.TypeName!, e.IsLoaded, e.Exception);
} }
private void OnCommandLoaded(LoaderArgs e) private void OnCommandLoaded(LoaderArgs e)
{ {
if (onCMDLoad != null) onCMDLoad.Invoke(((DBCommand)e.Plugin!).Command, e.TypeName!, e.IsLoaded, e.Exception); onCMDLoad?.Invoke(((DBCommand)e.Plugin!).Command, e.TypeName!, e.IsLoaded, e.Exception);
} }
} }

82
PluginManager/Online/LanguageManager.cs
View File

@@ -1,82 +0,0 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using PluginManager.Others;
namespace PluginManager.Online;
public class LanguageManager
{
private readonly string link;
/// <summary>
/// The Language Manager constructor
/// </summary>
/// <param name="link">The link to where all the languages for the bot are stored</param>
public LanguageManager(string link)
{
this.link = link;
}
/// <summary>
/// The method to list all languages
/// </summary>
/// <returns></returns>
public async Task ListAllLanguages()
{
try
{
var list = await ServerCom.ReadTextFromFile(link);
var lines = list.ToArray();
var info = new List<string[]>();
info.Add(new[] { "-", "-" });
info.Add(new[] { "Language Name", "File Size" });
info.Add(new[] { "-", "-" });
foreach (var line in lines)
{
if (line.Length <= 2) continue;
var d = line.Split(',');
if (d[3].Contains("cp") || d[3].Contains("CrossPlatform")) info.Add(new[] { d[0], d[1] });
}
info.Add(new[] { "-", "-" });
Console_Utilities.FormatAndAlignTable(info);
}
catch (Exception exception)
{
Console.WriteLine("Failed to execute command: listlang\nReason: " + exception.Message);
Functions.WriteErrFile(exception.ToString());
}
}
/// <summary>
/// A function that gets the download link for specified language
/// </summary>
/// <param name="langName">The name of the language</param>
/// <returns></returns>
public async Task<string[]?> GetDownloadLink(string langName)
{
try
{
var list = await ServerCom.ReadTextFromFile(link);
var lines = list.ToArray();
foreach (var line in lines)
{
if (line.Length <= 2) continue;
var d = line.Split(',');
if (d[0].Equals(langName) && (d[3].Contains("cp") || d[3].Contains("CrossPlatform"))) return new[] { d[2], d[3] };
}
}
catch (Exception exception)
{
Console.WriteLine("Failed to execute command: listlang\nReason: " + exception.Message);
Functions.WriteErrFile(exception.ToString());
}
return null;
}
}

21
PluginManager/Online/PluginsManager.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using PluginManager.Others; using PluginManager.Others;
@@ -37,15 +37,15 @@ public class PluginsManager
var op = Functions.GetOperatingSystem(); var op = Functions.GetOperatingSystem();
var len = lines.Length; var len = lines.Length;
string[] titles = { "Name", "Description", "Plugin Type", "Libraries" }; string[] titles = { "Name", "Description", "Plugin Type", "Libraries", "Installed" };
data.Add(new[] { "-", "-", "-", "-" }); data.Add(new[] { "-", "-", "-", "-", "-" });
data.Add(titles); data.Add(titles);
data.Add(new[] { "-", "-", "-", "-" }); data.Add(new[] { "-", "-", "-", "-", "-" });
for (var i = 0; i < len; i++) for (var i = 0; i < len; i++)
{ {
if (lines[i].Length <= 2) continue; if (lines[i].Length <= 2) continue;
var content = lines[i].Split(','); var content = lines[i].Split(',');
var display = new string[4]; var display = new string[titles.Length];
if (op == OperatingSystem.WINDOWS) if (op == OperatingSystem.WINDOWS)
{ {
if (content[4].Contains("Windows")) if (content[4].Contains("Windows"))
@@ -58,6 +58,10 @@ public class PluginsManager
else else
display[3] = "1"; display[3] = "1";
if (Config.PluginConfig.Contains(content[0]) || Config.PluginConfig.Contains(content[0]))
display[4] = "✓";
else
display[4] = "X";
data.Add(display); data.Add(display);
} }
} }
@@ -68,12 +72,17 @@ public class PluginsManager
display[0] = content[0]; display[0] = content[0];
display[1] = content[1]; display[1] = content[1];
display[2] = content[2]; display[2] = content[2];
if (content.Length == 6 && (content[5] != null || content[5].Length > 2)) display[3] = ((await ServerCom.ReadTextFromFile(content[5])).Count + 1).ToString();
if (Config.PluginConfig.Contains(content[0]) || Config.PluginConfig.Contains(content[0]))
display[4] = "✓";
else
display[4] = "X";
data.Add(display); data.Add(display);
} }
} }
} }
data.Add(new[] { "-", "-", "-", "-" }); data.Add(new[] { "-", "-", "-", "-", "-" });
Console_Utilities.FormatAndAlignTable(data); Console_Utilities.FormatAndAlignTable(data);
} }

88
PluginManager/Others/Cryptography.cs
View File

@@ -1,88 +0,0 @@
using System;
using System.IO;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
namespace PluginManager.Others;
public class Cryptography
{
/// <summary>
/// Translate hex to string
/// </summary>
/// <param name="hexString">The encrypted string</param>
/// <returns></returns>
public static string FromHexToString(string hexString)
{
var bytes = new byte[hexString.Length / 2];
for (var i = 0; i < bytes.Length; i++) bytes[i] = Convert.ToByte(hexString.Substring(i * 2, 2), 16);
return Encoding.Unicode.GetString(bytes);
}
/// <summary>
/// Translate string to hex
/// </summary>
/// <param name="str">The string to encrypt</param>
/// <returns></returns>
public static string ToHexString(string str)
{
var sb = new StringBuilder();
var bytes = Encoding.Unicode.GetBytes(str);
foreach (var t in bytes) sb.Append(t.ToString("X2"));
return sb.ToString();
}
/// <summary>
/// Create MD5 hash
/// </summary>
/// <param name="text">The text to encrypt</param>
/// <returns></returns>
public static async Task<string> CreateMD5(string text)
{
var output = "";
using (var md5 = MD5.Create())
{
using (var s = GenerateStreamFromString(text))
{
var t = await md5.ComputeHashAsync(s);
output = Convert.ToBase64String(t);
}
}
return output;
}
/// <summary>
/// Create SHA256 hash
/// </summary>
/// <param name="text">The text to encrypt</param>
/// <returns></returns>
public static async Task<string> CreateSHA256(string text)
{
var output = "";
using (var sha = SHA256.Create())
{
using (var s = GenerateStreamFromString(text))
{
var t = await sha.ComputeHashAsync(s);
output = Convert.ToBase64String(t);
}
}
return output;
}
private static Stream GenerateStreamFromString(string s)
{
var stream = new MemoryStream();
var writer = new StreamWriter(stream);
writer.Write(s);
writer.Flush();
stream.Position = 0;
return stream;
}
}

9
PluginManager/Others/Enums.cs
View File

@@ -1,4 +1,6 @@
namespace PluginManager.Others; using PluginManager.Interfaces;
namespace PluginManager.Others;
/// <summary> /// <summary>
/// A list of operating systems /// A list of operating systems
@@ -20,3 +22,8 @@ public enum Error
/// The output log type /// The output log type
/// </summary> /// </summary>
public enum OutputLogLevel { NONE, INFO, WARNING, ERROR, CRITICAL } public enum OutputLogLevel { NONE, INFO, WARNING, ERROR, CRITICAL }
/// <summary>
/// Plugin Type
/// </summary>
public enum PluginType { Command, Event, Unknown }

91
PluginManager/Others/Exceptions/APIException.cs
View File

@@ -1,91 +0,0 @@
using System;
namespace PluginManager.Others.Exceptions;
/// <summary>
/// Custom Exception for PluginManager
/// </summary>
[Serializable]
public class APIException : Exception
{
/// <summary>
/// The APIException contructor
/// </summary>
/// <param name="message">The error message</param>
/// <param name="function">The function where the message was triggered</param>
/// <param name="possible_cause">The possible cause of the error</param>
/// <param name="error">The error code</param>
public APIException(string message, string? function, string possible_cause, Error error) : base(message)
{
ErrorCode = error;
Function = function;
PossibleCause = possible_cause;
}
/// <summary>
/// The APIException contructor
/// </summary>
/// <param name="message">The error message</param>
/// <param name="function">The function where the message was triggered</param>
/// <param name="errorCode">The error code</param>
public APIException(string message, string? function, Error? errorCode) : base(message)
{
ErrorCode = errorCode;
Function = function;
}
/// <summary>
/// The APIException contructor
/// </summary>
/// <param name="message">The error message</param>
/// <param name="function">The function where the message was triggered</param>
public APIException(string message, string? function) : base(message)
{
Function = function;
}
/// <summary>
/// The APIException contructor
/// </summary>
/// <param name="message">The error message</param>
public APIException(string message) : base(message)
{
}
/// <summary>
/// The APIException constructor
/// </summary>
/// <param name="message">The error message</param>
/// <param name="errorLocation">The class where the error was thrown</param>
public APIException(string message, Type errorLocation) : base(message)
{
Function = errorLocation.FullName;
}
/// <summary>
/// The function where the error occurred
/// </summary>
public string? Function { get; } = "not specified";
/// <summary>
/// The error code
/// </summary>
public Error? ErrorCode { get; } = Error.UNKNOWN_ERROR;
/// <summary>
/// The possible cause that determined the error
/// </summary>
public string? PossibleCause { get; } = "not specified";
/// <summary>
/// Method to print the error to <see cref="Console" />
/// </summary>
public void Print()
{
Console.WriteLine("Message Content: " + Message);
Console.WriteLine("Function: " + Function);
Console.WriteLine("Error Code: " + ErrorCode);
Console.WriteLine("Possible cause: " + PossibleCause);
if (StackTrace != null) Functions.WriteErrFile(StackTrace);
}
}

49
PluginManager/Others/Functions.cs
View File

@@ -32,15 +32,10 @@ namespace PluginManager.Others
/// </summary> /// </summary>
public static readonly string errFolder = @"./Output/Errors/"; public static readonly string errFolder = @"./Output/Errors/";
/// <summary>
/// The location for all languages
/// </summary>
public static readonly string langFolder = @"./Data/Languages/";
/// <summary> /// <summary>
/// Archives folder /// Archives folder
/// </summary> /// </summary>
public static readonly string pakFolder = @"./Data/Resources/PAKS/"; public static readonly string pakFolder = @"./Data/Resources/PAK/";
/// <summary> /// <summary>
@@ -49,13 +44,13 @@ namespace PluginManager.Others
/// <param name="FileName">The file name that is inside the archive or its full path</param> /// <param name="FileName">The file name that is inside the archive or its full path</param>
/// <param name="archFile">The archive location from the PAKs folder</param> /// <param name="archFile">The archive location from the PAKs folder</param>
/// <returns>A string that represents the content of the file or null if the file does not exists or it has no content</returns> /// <returns>A string that represents the content of the file or null if the file does not exists or it has no content</returns>
public static async Task<string?> ReadFromPakAsync(string FileName, string archFile) public static async Task<Stream?> ReadFromPakAsync(string FileName, string archFile)
{ {
archFile = pakFolder + archFile; archFile = pakFolder + archFile;
Directory.CreateDirectory(pakFolder); Directory.CreateDirectory(pakFolder);
if (!File.Exists(archFile)) throw new FileNotFoundException("Failed to load file !"); if (!File.Exists(archFile)) throw new FileNotFoundException("Failed to load file !");
string? textValue = null; Stream? textValue = null;
var fs = new FileStream(archFile, FileMode.Open); var fs = new FileStream(archFile, FileMode.Open);
var zip = new ZipArchive(fs, ZipArchiveMode.Read); var zip = new ZipArchive(fs, ZipArchiveMode.Read);
foreach (var entry in zip.Entries) foreach (var entry in zip.Entries)
@@ -64,7 +59,8 @@ namespace PluginManager.Others
{ {
Stream s = entry.Open(); Stream s = entry.Open();
StreamReader reader = new StreamReader(s); StreamReader reader = new StreamReader(s);
textValue = await reader.ReadToEndAsync(); textValue = reader.BaseStream;
textValue.Position = 0;
reader.Close(); reader.Close();
s.Close(); s.Close();
fs.Close(); fs.Close();
@@ -239,7 +235,9 @@ namespace PluginManager.Others
/// <returns></returns> /// <returns></returns>
public static async Task SaveToJsonFile<T>(string file, T Data) public static async Task SaveToJsonFile<T>(string file, T Data)
{ {
using (var s = File.OpenWrite(file)) await JsonSerializer.SerializeAsync(s, Data, typeof(T), new JsonSerializerOptions { WriteIndented = true }); var s = File.OpenWrite(file);
await JsonSerializer.SerializeAsync(s, Data, typeof(T), new JsonSerializerOptions { WriteIndented = true });
s.Close();
} }
/// <summary> /// <summary>
@@ -259,7 +257,36 @@ namespace PluginManager.Others
text.Position = 0; text.Position = 0;
var obj = await JsonSerializer.DeserializeAsync<T>(text); var obj = await JsonSerializer.DeserializeAsync<T>(text);
text.Close(); text.Close();
return obj; return (obj ?? default)!;
}
/// <summary>
/// Check if all words from <paramref name="str"/> are in <paramref name="baseString"/><br/>
/// This function returns true if<br/>
/// 1. The <paramref name="str"/> is part of <paramref name="baseString"/><br/>
/// 2. The words (split by a space) of <paramref name="str"/> are located (separately) in <paramref name="baseString"/> <br/>
/// <example>
/// The following example will return <see langword="TRUE"/><br/>
/// <c>STRContains("Hello World !", "I type word Hello and then i typed word World !")</c><br/>
/// The following example will return <see langword="TRUE"/><br/>
/// <c>STRContains("Hello World !", "I typed Hello World !" </c><br/>
/// The following example will return <see langword="TRUE"/><br/>
/// <c>STRContains("Hello World", "I type World then Hello")</c><br/>
/// The following example will return <see langword="FALSE"/><br/>
/// <c>STRContains("Hello World !", "I typed Hello World")</c><br/>
/// </example>
/// </summary>
/// <param name="str">The string you are checking</param>
/// <param name="baseString">The main string that should contain <paramref name="str"/></param>
/// <returns></returns>
public static bool STRContains(this string str, string baseString)
{
if (baseString.Contains(str)) return true;
string[] array = str.Split(' ');
foreach (var s in array)
if (!baseString.Contains(s))
return false;
return true;
} }
public static bool TryReadValueFromJson(string input, string codeName, out JsonElement element) public static bool TryReadValueFromJson(string input, string codeName, out JsonElement element)

2
PluginManager/PluginManager.csproj
View File

@@ -16,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Discord.Net" Version="3.6.1" /> <PackageReference Include="Discord.Net" Version="3.7.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>