Compare commits
73 Commits
v1.0.0
...
v1.0.7-pre
| Author | SHA1 | Date | |
|---|---|---|---|
| 8b36c086ef | |||
| 1f5e5d0611 | |||
| bbc1c601c9 | |||
| 5ab3195956 | |||
| 1f1983480a | |||
| 2fcd86cf12 | |||
| 2c83d00c00 | |||
|
|
ccac0ca6d0 | ||
| 4c9c7410f0 | |||
| eef13db3aa | |||
| 27bbe899ab | |||
| 79002de9a5 | |||
| 17f68a8e5e | |||
| c415fa1c0c | |||
| b8ec6f42df | |||
| 3f67d7f3f9 | |||
| 2dae8a3a63 | |||
| 47aae730c7 | |||
| aa808e950a | |||
| 7dd43b7841 | |||
| 82a3744d48 | |||
| 3839e4d838 | |||
| a66ebc43d9 | |||
| 45bbda8185 | |||
| 2db6bf2729 | |||
| 3097eb7fca | |||
| efb6ac5192 | |||
| 27fe615447 | |||
| c40fcdac9d | |||
| c674c76bd0 | |||
| 1292e0f585 | |||
| 3abb4cdda7 | |||
| c6e8976456 | |||
| 19115a837c | |||
| 0a200abec6 | |||
| c80fe33e6d | |||
|
|
edc5cb97ba | ||
| 059228ca52 | |||
| 861b83cda2 | |||
| 97888626b6 | |||
| 781bb489bd | |||
| 1712205222 | |||
| 51324f6dca | |||
| 531edcd3cc | |||
| c66ff52d94 | |||
|
|
195c082cd7 | ||
| 16005ef30d | |||
| c15f7b4874 | |||
| fd28a166f7 | |||
| 4fbea983da | |||
| 690b7fe5f1 | |||
| e88d654da1 | |||
| 0b6b57cc84 | |||
| 8fcd33e734 | |||
| 0d524cdf65 | |||
| ab6f14e74c | |||
| 3e01e75de3 | |||
| 1ae48a100e | |||
| 4855c8495d | |||
| f8de1536b2 | |||
| c1d0155867 | |||
| a9ce01e7c9 | |||
| e6692e4263 | |||
| 16c06c8319 | |||
| 363c85d0b3 | |||
| 760a840cc7 | |||
| 0160b011dd | |||
| 6e09fa9738 | |||
| c7ae9202e6 | |||
|
|
55ac4e2b52 | ||
| 96b681bbda | |||
| 9f656d5f3f | |||
| c719eaf4fd |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -362,3 +362,5 @@ MigrationBackup/
|
|||||||
|
|
||||||
# Fody - auto-generated XML schema
|
# Fody - auto-generated XML schema
|
||||||
FodyWeavers.xsd
|
FodyWeavers.xsd
|
||||||
|
|
||||||
|
*.txt
|
||||||
13
.idea/.idea.SethDiscordBot/.idea/.gitignore
generated
vendored
Normal file
13
.idea/.idea.SethDiscordBot/.idea/.gitignore
generated
vendored
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
|
# Rider ignored files
|
||||||
|
/projectSettingsUpdater.xml
|
||||||
|
/contentModel.xml
|
||||||
|
/.idea.SethDiscordBot.iml
|
||||||
|
/modules.xml
|
||||||
|
# Editor-based HTTP Client requests
|
||||||
|
/httpRequests/
|
||||||
|
# Datasource local storage ignored files
|
||||||
|
/dataSources/
|
||||||
|
/dataSources.local.xml
|
||||||
1
.idea/.idea.SethDiscordBot/.idea/.name
generated
Normal file
1
.idea/.idea.SethDiscordBot/.idea/.name
generated
Normal file
@@ -0,0 +1 @@
|
|||||||
|
SethDiscordBot
|
||||||
4
.idea/.idea.SethDiscordBot/.idea/encodings.xml
generated
Normal file
4
.idea/.idea.SethDiscordBot/.idea/encodings.xml
generated
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
||||||
|
</project>
|
||||||
8
.idea/.idea.SethDiscordBot/.idea/indexLayout.xml
generated
Normal file
8
.idea/.idea.SethDiscordBot/.idea/indexLayout.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="UserContentModel">
|
||||||
|
<attachedFolders />
|
||||||
|
<explicitIncludes />
|
||||||
|
<explicitExcludes />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
6
.idea/.idea.SethDiscordBot/.idea/vcs.xml
generated
Normal file
6
.idea/.idea.SethDiscordBot/.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
26
.vscode/launch.json
vendored
26
.vscode/launch.json
vendored
@@ -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"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
5
.vscode/solution-explorer/class.cs-template
vendored
5
.vscode/solution-explorer/class.cs-template
vendored
@@ -1,5 +0,0 @@
|
|||||||
namespace {{namespace}};
|
|
||||||
|
|
||||||
public class {{name}}
|
|
||||||
{
|
|
||||||
}
|
|
||||||
3
.vscode/solution-explorer/class.ts-template
vendored
3
.vscode/solution-explorer/class.ts-template
vendored
@@ -1,3 +0,0 @@
|
|||||||
export class {{name}} {
|
|
||||||
|
|
||||||
}
|
|
||||||
9
.vscode/solution-explorer/class.vb-template
vendored
9
.vscode/solution-explorer/class.vb-template
vendored
@@ -1,9 +0,0 @@
|
|||||||
Imports System
|
|
||||||
|
|
||||||
Namespace {{namespace}}
|
|
||||||
|
|
||||||
Public Class {{name}}
|
|
||||||
|
|
||||||
End Class
|
|
||||||
|
|
||||||
End Namespace
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export default {{name}} {
|
|
||||||
|
|
||||||
}
|
|
||||||
5
.vscode/solution-explorer/enum.cs-template
vendored
5
.vscode/solution-explorer/enum.cs-template
vendored
@@ -1,5 +0,0 @@
|
|||||||
namespace {{namespace}};
|
|
||||||
|
|
||||||
public enum {{name}}
|
|
||||||
{
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
namespace {{namespace}};
|
|
||||||
|
|
||||||
public interface {{name}}
|
|
||||||
{
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export interface {{name}} {
|
|
||||||
|
|
||||||
}
|
|
||||||
46
.vscode/solution-explorer/template-list.json
vendored
46
.vscode/solution-explorer/template-list.json
vendored
@@ -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
17
.vscode/solution-explorer/template-parameters.js
vendored
@@ -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
42
.vscode/tasks.json
vendored
@@ -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"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Binary file not shown.
@@ -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",
|
||||||
|
|||||||
Binary file not shown.
@@ -1,268 +0,0 @@
|
|||||||
{
|
|
||||||
"runtimeTarget": {
|
|
||||||
"name": ".NETCoreApp,Version=v6.0",
|
|
||||||
"signature": ""
|
|
||||||
},
|
|
||||||
"compilationOptions": {},
|
|
||||||
"targets": {
|
|
||||||
".NETCoreApp,Version=v6.0": {
|
|
||||||
"EVE_LevelingSystem/1.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"PluginManager": "1.0.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"EVE_LevelingSystem.dll": {}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Commands": "3.6.1",
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Interactions": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1",
|
|
||||||
"Discord.Net.WebSocket": "3.6.1",
|
|
||||||
"Discord.Net.Webhook": "3.6.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Commands/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Commands.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Core/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Newtonsoft.Json": "13.0.1",
|
|
||||||
"System.Collections.Immutable": "5.0.0",
|
|
||||||
"System.Interactive.Async": "5.0.0",
|
|
||||||
"System.ValueTuple": "4.5.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Core.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Interactions/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1",
|
|
||||||
"Discord.Net.WebSocket": "3.6.1",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0",
|
|
||||||
"System.Collections.Immutable": "5.0.0",
|
|
||||||
"System.Reactive": "5.0.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Interactions.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Rest/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Rest.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Webhook/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Webhook.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.WebSocket/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.WebSocket.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.20.51904"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Newtonsoft.Json/13.0.1": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/netstandard2.0/Newtonsoft.Json.dll": {
|
|
||||||
"assemblyVersion": "13.0.0.0",
|
|
||||||
"fileVersion": "13.0.1.25517"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Collections.Immutable/5.0.0": {},
|
|
||||||
"System.Interactive.Async/5.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Linq.Async": "5.0.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/netcoreapp3.1/System.Interactive.Async.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Linq.Async/5.0.0": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/netcoreapp3.1/System.Linq.Async.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Reactive/5.0.0": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/net5.0/System.Reactive.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.ValueTuple/4.5.0": {},
|
|
||||||
"PluginManager/1.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"PluginManager.dll": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"libraries": {
|
|
||||||
"EVE_LevelingSystem/1.0.0": {
|
|
||||||
"type": "project",
|
|
||||||
"serviceable": false,
|
|
||||||
"sha512": ""
|
|
||||||
},
|
|
||||||
"Discord.Net/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-TfcL/HG57fVt//WVJ2XyF2PlytY9IYkkwwkPLIhvu5FW4wf9rm7+N8RPh4qtELLfsa5ES0FK2RbgYjABRR9AjA==",
|
|
||||||
"path": "discord.net/3.6.1",
|
|
||||||
"hashPath": "discord.net.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Commands/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-kK7m571yzSzPd93o+n8Z+TfvX62BT1HtOEZIWXKwXWO8itP/sgqBNExjWK/6DOpkbD6+khc2f3rp+TA0rJD88g==",
|
|
||||||
"path": "discord.net.commands/3.6.1",
|
|
||||||
"hashPath": "discord.net.commands.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Core/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ibVjQiWzgqh0GyP/GXE2kv3TA/9ysmmNFG/WmRE7GepQQAXXGxVUO9IMJ8h14EvIXMQ0m0DktMe5DkUnilo3Ag==",
|
|
||||||
"path": "discord.net.core/3.6.1",
|
|
||||||
"hashPath": "discord.net.core.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Interactions/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-WGOxz6SMUu4WS5b/JdrhlwQletcplBIYqvjFBBDfnqE+uNJqcNGtAdyjLqIILfXGx8aSSSSYZSCeAUa7FZ8Yew==",
|
|
||||||
"path": "discord.net.interactions/3.6.1",
|
|
||||||
"hashPath": "discord.net.interactions.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Rest/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-T7RRThIS23roFEJwTL1l7aawjVyn7ZB5yH3tMge0d6TiCzzp4V4FAZ+ArTt19LHRFhPly90v8V3sWqmTMN+5Zg==",
|
|
||||||
"path": "discord.net.rest/3.6.1",
|
|
||||||
"hashPath": "discord.net.rest.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Webhook/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-xikKHIGAIMz0BzHkaTKb48DNpFjKW8mvJjLJSezJ1xQOu+laHNk/hav4qxVtyZz7HSI/vGTkmlq9hKVhWzpaUA==",
|
|
||||||
"path": "discord.net.webhook/3.6.1",
|
|
||||||
"hashPath": "discord.net.webhook.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.WebSocket/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-hF22Xy7URlVEDQZ69INOgzPvFUsIDfd+r6U+1yF9HWdBn3d4THnvAAhkv1TraSx/T/MKS7g+jvk/HZ3mh5S3aw==",
|
|
||||||
"path": "discord.net.websocket/3.6.1",
|
|
||||||
"hashPath": "discord.net.websocket.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==",
|
|
||||||
"path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0",
|
|
||||||
"hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Newtonsoft.Json/13.0.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==",
|
|
||||||
"path": "newtonsoft.json/13.0.1",
|
|
||||||
"hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Collections.Immutable/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==",
|
|
||||||
"path": "system.collections.immutable/5.0.0",
|
|
||||||
"hashPath": "system.collections.immutable.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Interactive.Async/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-QaqhQVDiULcu4vm6o89+iP329HcK44cETHOYgy/jfEjtzeFy0ZxmuM7nel9ocjnKxEM4yh1mli7hgh8Q9o+/Iw==",
|
|
||||||
"path": "system.interactive.async/5.0.0",
|
|
||||||
"hashPath": "system.interactive.async.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Linq.Async/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-cPtIuuH8TIjVHSi2ewwReWGW1PfChPE0LxPIDlfwVcLuTM9GANFTXiMB7k3aC4sk3f0cQU25LNKzx+jZMxijqw==",
|
|
||||||
"path": "system.linq.async/5.0.0",
|
|
||||||
"hashPath": "system.linq.async.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Reactive/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==",
|
|
||||||
"path": "system.reactive/5.0.0",
|
|
||||||
"hashPath": "system.reactive.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.ValueTuple/4.5.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==",
|
|
||||||
"path": "system.valuetuple/4.5.0",
|
|
||||||
"hashPath": "system.valuetuple.4.5.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"PluginManager/1.0.0": {
|
|
||||||
"type": "project",
|
|
||||||
"serviceable": false,
|
|
||||||
"sha512": ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
@@ -6,36 +6,49 @@
|
|||||||
"compilationOptions": {},
|
"compilationOptions": {},
|
||||||
"targets": {
|
"targets": {
|
||||||
".NETCoreApp,Version=v6.0": {
|
".NETCoreApp,Version=v6.0": {
|
||||||
"CMD_LevelingSystem/1.0.0": {
|
"Music Commands/1.0.0": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"PluginManager": "1.0.0"
|
"PluginManager": "1.0.0",
|
||||||
|
"YoutubeExplode": "6.2.0"
|
||||||
},
|
},
|
||||||
"runtime": {
|
"runtime": {
|
||||||
"CMD_LevelingSystem.dll": {}
|
"Music Commands.dll": {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Discord.Net/3.6.1": {
|
"AngleSharp/0.17.0": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Discord.Net.Commands": "3.6.1",
|
"System.Buffers": "4.5.1",
|
||||||
"Discord.Net.Core": "3.6.1",
|
"System.Text.Encoding.CodePages": "5.0.0"
|
||||||
"Discord.Net.Interactions": "3.6.1",
|
},
|
||||||
"Discord.Net.Rest": "3.6.1",
|
"runtime": {
|
||||||
"Discord.Net.WebSocket": "3.6.1",
|
"lib/netstandard2.0/AngleSharp.dll": {
|
||||||
"Discord.Net.Webhook": "3.6.1"
|
"assemblyVersion": "0.17.0.0",
|
||||||
|
"fileVersion": "0.17.0.0"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Discord.Net.Commands/3.6.1": {
|
"Discord.Net/3.7.2": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Discord.Net.Core": "3.6.1"
|
"Discord.Net.Commands": "3.7.2",
|
||||||
|
"Discord.Net.Core": "3.7.2",
|
||||||
|
"Discord.Net.Interactions": "3.7.2",
|
||||||
|
"Discord.Net.Rest": "3.7.2",
|
||||||
|
"Discord.Net.WebSocket": "3.7.2",
|
||||||
|
"Discord.Net.Webhook": "3.7.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Discord.Net.Commands/3.7.2": {
|
||||||
|
"dependencies": {
|
||||||
|
"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 +57,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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -108,6 +121,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"Microsoft.NETCore.Platforms/5.0.0": {},
|
||||||
"Newtonsoft.Json/13.0.1": {
|
"Newtonsoft.Json/13.0.1": {
|
||||||
"runtime": {
|
"runtime": {
|
||||||
"lib/netstandard2.0/Newtonsoft.Json.dll": {
|
"lib/netstandard2.0/Newtonsoft.Json.dll": {
|
||||||
@@ -116,6 +130,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"System.Buffers/4.5.1": {},
|
||||||
"System.Collections.Immutable/5.0.0": {},
|
"System.Collections.Immutable/5.0.0": {},
|
||||||
"System.Interactive.Async/5.0.0": {
|
"System.Interactive.Async/5.0.0": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -144,10 +159,26 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"System.Text.Encoding.CodePages/5.0.0": {
|
||||||
|
"dependencies": {
|
||||||
|
"Microsoft.NETCore.Platforms": "5.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"System.ValueTuple/4.5.0": {},
|
"System.ValueTuple/4.5.0": {},
|
||||||
|
"YoutubeExplode/6.2.0": {
|
||||||
|
"dependencies": {
|
||||||
|
"AngleSharp": "0.17.0"
|
||||||
|
},
|
||||||
|
"runtime": {
|
||||||
|
"lib/net5.0/YoutubeExplode.dll": {
|
||||||
|
"assemblyVersion": "6.2.0.0",
|
||||||
|
"fileVersion": "6.2.0.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": {}
|
||||||
@@ -156,59 +187,66 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"libraries": {
|
"libraries": {
|
||||||
"CMD_LevelingSystem/1.0.0": {
|
"Music Commands/1.0.0": {
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"serviceable": false,
|
"serviceable": false,
|
||||||
"sha512": ""
|
"sha512": ""
|
||||||
},
|
},
|
||||||
"Discord.Net/3.6.1": {
|
"AngleSharp/0.17.0": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
"sha512": "sha512-TfcL/HG57fVt//WVJ2XyF2PlytY9IYkkwwkPLIhvu5FW4wf9rm7+N8RPh4qtELLfsa5ES0FK2RbgYjABRR9AjA==",
|
"sha512": "sha512-74haoXINcj4SdMsmiNzk+9VUwIX1U9P61O6AZd5Uao8SGNnJJB8Y/r8VJRc8orn4c7Vk/oURAKSNF9XcSDxbfA==",
|
||||||
"path": "discord.net/3.6.1",
|
"path": "anglesharp/0.17.0",
|
||||||
"hashPath": "discord.net.3.6.1.nupkg.sha512"
|
"hashPath": "anglesharp.0.17.0.nupkg.sha512"
|
||||||
},
|
},
|
||||||
"Discord.Net.Commands/3.6.1": {
|
"Discord.Net/3.7.2": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
"sha512": "sha512-kK7m571yzSzPd93o+n8Z+TfvX62BT1HtOEZIWXKwXWO8itP/sgqBNExjWK/6DOpkbD6+khc2f3rp+TA0rJD88g==",
|
"sha512": "sha512-FAiCLGu5rp6+Z10FjKbbJ6LLpKjbMBGpozixkJlz5LZvuncPx8f4AWFAw7pBecKUuAh983qiZ8CZYZcNXsI4qg==",
|
||||||
"path": "discord.net.commands/3.6.1",
|
"path": "discord.net/3.7.2",
|
||||||
"hashPath": "discord.net.commands.3.6.1.nupkg.sha512"
|
"hashPath": "discord.net.3.7.2.nupkg.sha512"
|
||||||
},
|
},
|
||||||
"Discord.Net.Core/3.6.1": {
|
"Discord.Net.Commands/3.7.2": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
"sha512": "sha512-ibVjQiWzgqh0GyP/GXE2kv3TA/9ysmmNFG/WmRE7GepQQAXXGxVUO9IMJ8h14EvIXMQ0m0DktMe5DkUnilo3Ag==",
|
"sha512": "sha512-aOEGP04X64htsTr7ozKj9qHpmvOfitSw5gfR8Tw9TX0+FdswD2LNL2KfOAIaxRKZmRTm34aXQEJrVq0K8AptmQ==",
|
||||||
"path": "discord.net.core/3.6.1",
|
"path": "discord.net.commands/3.7.2",
|
||||||
"hashPath": "discord.net.core.3.6.1.nupkg.sha512"
|
"hashPath": "discord.net.commands.3.7.2.nupkg.sha512"
|
||||||
},
|
},
|
||||||
"Discord.Net.Interactions/3.6.1": {
|
"Discord.Net.Core/3.7.2": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
"sha512": "sha512-WGOxz6SMUu4WS5b/JdrhlwQletcplBIYqvjFBBDfnqE+uNJqcNGtAdyjLqIILfXGx8aSSSSYZSCeAUa7FZ8Yew==",
|
"sha512": "sha512-apwswc6LjN4dj3u27SO3Hr56Jzl91wzReahieoD7IQhV+BJQaRxhTRiEEWFTrBzHfeFHEOQ7r6vZnra3zeFhKA==",
|
||||||
"path": "discord.net.interactions/3.6.1",
|
"path": "discord.net.core/3.7.2",
|
||||||
"hashPath": "discord.net.interactions.3.6.1.nupkg.sha512"
|
"hashPath": "discord.net.core.3.7.2.nupkg.sha512"
|
||||||
},
|
},
|
||||||
"Discord.Net.Rest/3.6.1": {
|
"Discord.Net.Interactions/3.7.2": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
"sha512": "sha512-T7RRThIS23roFEJwTL1l7aawjVyn7ZB5yH3tMge0d6TiCzzp4V4FAZ+ArTt19LHRFhPly90v8V3sWqmTMN+5Zg==",
|
"sha512": "sha512-dwGhEdDB0yyo/lGtjwIDVZmsuD52di7lIZWu/sBtvvA05dMgYZq5S6ILdsBXjOyaHeXd+EV4YMlj2VS/rm619w==",
|
||||||
"path": "discord.net.rest/3.6.1",
|
"path": "discord.net.interactions/3.7.2",
|
||||||
"hashPath": "discord.net.rest.3.6.1.nupkg.sha512"
|
"hashPath": "discord.net.interactions.3.7.2.nupkg.sha512"
|
||||||
},
|
},
|
||||||
"Discord.Net.Webhook/3.6.1": {
|
"Discord.Net.Rest/3.7.2": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
"sha512": "sha512-xikKHIGAIMz0BzHkaTKb48DNpFjKW8mvJjLJSezJ1xQOu+laHNk/hav4qxVtyZz7HSI/vGTkmlq9hKVhWzpaUA==",
|
"sha512": "sha512-dyp8YaMBNJ837EH1KNz2PNGZqc2y71WFd1+pdldF+pLQJ3Gf/+V7685paAR7bQw7yFNyqEBR/QRBCNp+QIQ7Wg==",
|
||||||
"path": "discord.net.webhook/3.6.1",
|
"path": "discord.net.rest/3.7.2",
|
||||||
"hashPath": "discord.net.webhook.3.6.1.nupkg.sha512"
|
"hashPath": "discord.net.rest.3.7.2.nupkg.sha512"
|
||||||
},
|
},
|
||||||
"Discord.Net.WebSocket/3.6.1": {
|
"Discord.Net.Webhook/3.7.2": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
"sha512": "sha512-hF22Xy7URlVEDQZ69INOgzPvFUsIDfd+r6U+1yF9HWdBn3d4THnvAAhkv1TraSx/T/MKS7g+jvk/HZ3mh5S3aw==",
|
"sha512": "sha512-da3i/mTq2y7mfj3xlHH14S4PivHbflJCVr8OUikJtQrxBOxvPkqP7ZYk3Y9S28q0K8qik+TUjCcjL5gELKrh/A==",
|
||||||
"path": "discord.net.websocket/3.6.1",
|
"path": "discord.net.webhook/3.7.2",
|
||||||
"hashPath": "discord.net.websocket.3.6.1.nupkg.sha512"
|
"hashPath": "discord.net.webhook.3.7.2.nupkg.sha512"
|
||||||
|
},
|
||||||
|
"Discord.Net.WebSocket/3.7.2": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-pYCd6ET44ADaNiyEw82TaJnR7TKYHfrKCytWFWMPL5faJhoh260avZn3Hwunlf331lEQ0f4K1CujPkQbNuq7kQ==",
|
||||||
|
"path": "discord.net.websocket/3.7.2",
|
||||||
|
"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",
|
||||||
@@ -217,6 +255,13 @@
|
|||||||
"path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0",
|
"path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0",
|
||||||
"hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512"
|
"hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512"
|
||||||
},
|
},
|
||||||
|
"Microsoft.NETCore.Platforms/5.0.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==",
|
||||||
|
"path": "microsoft.netcore.platforms/5.0.0",
|
||||||
|
"hashPath": "microsoft.netcore.platforms.5.0.0.nupkg.sha512"
|
||||||
|
},
|
||||||
"Newtonsoft.Json/13.0.1": {
|
"Newtonsoft.Json/13.0.1": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
@@ -224,6 +269,13 @@
|
|||||||
"path": "newtonsoft.json/13.0.1",
|
"path": "newtonsoft.json/13.0.1",
|
||||||
"hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
|
"hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
|
||||||
},
|
},
|
||||||
|
"System.Buffers/4.5.1": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==",
|
||||||
|
"path": "system.buffers/4.5.1",
|
||||||
|
"hashPath": "system.buffers.4.5.1.nupkg.sha512"
|
||||||
|
},
|
||||||
"System.Collections.Immutable/5.0.0": {
|
"System.Collections.Immutable/5.0.0": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
@@ -252,6 +304,13 @@
|
|||||||
"path": "system.reactive/5.0.0",
|
"path": "system.reactive/5.0.0",
|
||||||
"hashPath": "system.reactive.5.0.0.nupkg.sha512"
|
"hashPath": "system.reactive.5.0.0.nupkg.sha512"
|
||||||
},
|
},
|
||||||
|
"System.Text.Encoding.CodePages/5.0.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-NyscU59xX6Uo91qvhOs2Ccho3AR2TnZPomo1Z0K6YpyztBPM/A5VbkzOO19sy3A3i1TtEnTxA7bCe3Us+r5MWg==",
|
||||||
|
"path": "system.text.encoding.codepages/5.0.0",
|
||||||
|
"hashPath": "system.text.encoding.codepages.5.0.0.nupkg.sha512"
|
||||||
|
},
|
||||||
"System.ValueTuple/4.5.0": {
|
"System.ValueTuple/4.5.0": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"serviceable": true,
|
"serviceable": true,
|
||||||
@@ -259,6 +318,13 @@
|
|||||||
"path": "system.valuetuple/4.5.0",
|
"path": "system.valuetuple/4.5.0",
|
||||||
"hashPath": "system.valuetuple.4.5.0.nupkg.sha512"
|
"hashPath": "system.valuetuple.4.5.0.nupkg.sha512"
|
||||||
},
|
},
|
||||||
|
"YoutubeExplode/6.2.0": {
|
||||||
|
"type": "package",
|
||||||
|
"serviceable": true,
|
||||||
|
"sha512": "sha512-oH5kst4w1QkUwRjJco0alF57JOmFofSGlPkr4OniODB8R6MEyRWn1xFg3JS2wFYd6scZluoXRDhM3/uyUjO9/g==",
|
||||||
|
"path": "youtubeexplode/6.2.0",
|
||||||
|
"hashPath": "youtubeexplode.6.2.0.nupkg.sha512"
|
||||||
|
},
|
||||||
"PluginManager/1.0.0": {
|
"PluginManager/1.0.0": {
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"serviceable": false,
|
"serviceable": false,
|
||||||
BIN
BUILDS/net6.0/Music Commands.dll
Normal file
BIN
BUILDS/net6.0/Music Commands.dll
Normal file
Binary file not shown.
@@ -1,268 +0,0 @@
|
|||||||
{
|
|
||||||
"runtimeTarget": {
|
|
||||||
"name": ".NETCoreApp,Version=v6.0",
|
|
||||||
"signature": ""
|
|
||||||
},
|
|
||||||
"compilationOptions": {},
|
|
||||||
"targets": {
|
|
||||||
".NETCoreApp,Version=v6.0": {
|
|
||||||
"MusicCommands/1.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"PluginManager": "1.0.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"MusicCommands.dll": {}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Commands": "3.6.1",
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Interactions": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1",
|
|
||||||
"Discord.Net.WebSocket": "3.6.1",
|
|
||||||
"Discord.Net.Webhook": "3.6.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Commands/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Commands.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Core/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Newtonsoft.Json": "13.0.1",
|
|
||||||
"System.Collections.Immutable": "5.0.0",
|
|
||||||
"System.Interactive.Async": "5.0.0",
|
|
||||||
"System.ValueTuple": "4.5.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Core.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Interactions/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1",
|
|
||||||
"Discord.Net.WebSocket": "3.6.1",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0",
|
|
||||||
"System.Collections.Immutable": "5.0.0",
|
|
||||||
"System.Reactive": "5.0.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Interactions.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Rest/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Rest.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Webhook/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Webhook.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.WebSocket/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.WebSocket.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.20.51904"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Newtonsoft.Json/13.0.1": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/netstandard2.0/Newtonsoft.Json.dll": {
|
|
||||||
"assemblyVersion": "13.0.0.0",
|
|
||||||
"fileVersion": "13.0.1.25517"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Collections.Immutable/5.0.0": {},
|
|
||||||
"System.Interactive.Async/5.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Linq.Async": "5.0.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/netcoreapp3.1/System.Interactive.Async.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Linq.Async/5.0.0": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/netcoreapp3.1/System.Linq.Async.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Reactive/5.0.0": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/net5.0/System.Reactive.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.ValueTuple/4.5.0": {},
|
|
||||||
"PluginManager/1.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"PluginManager.dll": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"libraries": {
|
|
||||||
"MusicCommands/1.0.0": {
|
|
||||||
"type": "project",
|
|
||||||
"serviceable": false,
|
|
||||||
"sha512": ""
|
|
||||||
},
|
|
||||||
"Discord.Net/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-TfcL/HG57fVt//WVJ2XyF2PlytY9IYkkwwkPLIhvu5FW4wf9rm7+N8RPh4qtELLfsa5ES0FK2RbgYjABRR9AjA==",
|
|
||||||
"path": "discord.net/3.6.1",
|
|
||||||
"hashPath": "discord.net.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Commands/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-kK7m571yzSzPd93o+n8Z+TfvX62BT1HtOEZIWXKwXWO8itP/sgqBNExjWK/6DOpkbD6+khc2f3rp+TA0rJD88g==",
|
|
||||||
"path": "discord.net.commands/3.6.1",
|
|
||||||
"hashPath": "discord.net.commands.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Core/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ibVjQiWzgqh0GyP/GXE2kv3TA/9ysmmNFG/WmRE7GepQQAXXGxVUO9IMJ8h14EvIXMQ0m0DktMe5DkUnilo3Ag==",
|
|
||||||
"path": "discord.net.core/3.6.1",
|
|
||||||
"hashPath": "discord.net.core.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Interactions/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-WGOxz6SMUu4WS5b/JdrhlwQletcplBIYqvjFBBDfnqE+uNJqcNGtAdyjLqIILfXGx8aSSSSYZSCeAUa7FZ8Yew==",
|
|
||||||
"path": "discord.net.interactions/3.6.1",
|
|
||||||
"hashPath": "discord.net.interactions.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Rest/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-T7RRThIS23roFEJwTL1l7aawjVyn7ZB5yH3tMge0d6TiCzzp4V4FAZ+ArTt19LHRFhPly90v8V3sWqmTMN+5Zg==",
|
|
||||||
"path": "discord.net.rest/3.6.1",
|
|
||||||
"hashPath": "discord.net.rest.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Webhook/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-xikKHIGAIMz0BzHkaTKb48DNpFjKW8mvJjLJSezJ1xQOu+laHNk/hav4qxVtyZz7HSI/vGTkmlq9hKVhWzpaUA==",
|
|
||||||
"path": "discord.net.webhook/3.6.1",
|
|
||||||
"hashPath": "discord.net.webhook.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.WebSocket/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-hF22Xy7URlVEDQZ69INOgzPvFUsIDfd+r6U+1yF9HWdBn3d4THnvAAhkv1TraSx/T/MKS7g+jvk/HZ3mh5S3aw==",
|
|
||||||
"path": "discord.net.websocket/3.6.1",
|
|
||||||
"hashPath": "discord.net.websocket.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==",
|
|
||||||
"path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0",
|
|
||||||
"hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Newtonsoft.Json/13.0.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==",
|
|
||||||
"path": "newtonsoft.json/13.0.1",
|
|
||||||
"hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Collections.Immutable/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==",
|
|
||||||
"path": "system.collections.immutable/5.0.0",
|
|
||||||
"hashPath": "system.collections.immutable.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Interactive.Async/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-QaqhQVDiULcu4vm6o89+iP329HcK44cETHOYgy/jfEjtzeFy0ZxmuM7nel9ocjnKxEM4yh1mli7hgh8Q9o+/Iw==",
|
|
||||||
"path": "system.interactive.async/5.0.0",
|
|
||||||
"hashPath": "system.interactive.async.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Linq.Async/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-cPtIuuH8TIjVHSi2ewwReWGW1PfChPE0LxPIDlfwVcLuTM9GANFTXiMB7k3aC4sk3f0cQU25LNKzx+jZMxijqw==",
|
|
||||||
"path": "system.linq.async/5.0.0",
|
|
||||||
"hashPath": "system.linq.async.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Reactive/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==",
|
|
||||||
"path": "system.reactive/5.0.0",
|
|
||||||
"hashPath": "system.reactive.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.ValueTuple/4.5.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==",
|
|
||||||
"path": "system.valuetuple/4.5.0",
|
|
||||||
"hashPath": "system.valuetuple.4.5.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"PluginManager/1.0.0": {
|
|
||||||
"type": "project",
|
|
||||||
"serviceable": false,
|
|
||||||
"sha512": ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
Binary file not shown.
BIN
BUILDS/net6.0/Plugins/Commands/CMD_LevelingSystem.dll
Normal file
BIN
BUILDS/net6.0/Plugins/Commands/CMD_LevelingSystem.dll
Normal file
Binary file not shown.
BIN
BUILDS/net6.0/Plugins/Commands/CMD_Utils.dll
Normal file
BIN
BUILDS/net6.0/Plugins/Commands/CMD_Utils.dll
Normal file
Binary file not shown.
BIN
BUILDS/net6.0/Plugins/Commands/Music Commands.dll
Normal file
BIN
BUILDS/net6.0/Plugins/Commands/Music Commands.dll
Normal file
Binary file not shown.
BIN
BUILDS/net6.0/Plugins/Commands/Roles.dll
Normal file
BIN
BUILDS/net6.0/Plugins/Commands/Roles.dll
Normal file
Binary file not shown.
BIN
BUILDS/net6.0/Plugins/Events/EVE_LevelingSystem.dll
Normal file
BIN
BUILDS/net6.0/Plugins/Events/EVE_LevelingSystem.dll
Normal file
Binary file not shown.
@@ -1,268 +0,0 @@
|
|||||||
{
|
|
||||||
"runtimeTarget": {
|
|
||||||
"name": ".NETCoreApp,Version=v6.0",
|
|
||||||
"signature": ""
|
|
||||||
},
|
|
||||||
"compilationOptions": {},
|
|
||||||
"targets": {
|
|
||||||
".NETCoreApp,Version=v6.0": {
|
|
||||||
"StartupEvents/1.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"PluginManager": "1.0.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"StartupEvents.dll": {}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Commands": "3.6.1",
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Interactions": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1",
|
|
||||||
"Discord.Net.WebSocket": "3.6.1",
|
|
||||||
"Discord.Net.Webhook": "3.6.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Commands/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Commands.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Core/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Newtonsoft.Json": "13.0.1",
|
|
||||||
"System.Collections.Immutable": "5.0.0",
|
|
||||||
"System.Interactive.Async": "5.0.0",
|
|
||||||
"System.ValueTuple": "4.5.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Core.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Interactions/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1",
|
|
||||||
"Discord.Net.WebSocket": "3.6.1",
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0",
|
|
||||||
"System.Collections.Immutable": "5.0.0",
|
|
||||||
"System.Reactive": "5.0.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Interactions.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Rest/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Rest.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.Webhook/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.Webhook.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Discord.Net.WebSocket/3.6.1": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net.Core": "3.6.1",
|
|
||||||
"Discord.Net.Rest": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/net6.0/Discord.Net.WebSocket.dll": {
|
|
||||||
"assemblyVersion": "3.6.1.0",
|
|
||||||
"fileVersion": "3.6.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.20.51904"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Newtonsoft.Json/13.0.1": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/netstandard2.0/Newtonsoft.Json.dll": {
|
|
||||||
"assemblyVersion": "13.0.0.0",
|
|
||||||
"fileVersion": "13.0.1.25517"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Collections.Immutable/5.0.0": {},
|
|
||||||
"System.Interactive.Async/5.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"System.Linq.Async": "5.0.0"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"lib/netcoreapp3.1/System.Interactive.Async.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Linq.Async/5.0.0": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/netcoreapp3.1/System.Linq.Async.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Reactive/5.0.0": {
|
|
||||||
"runtime": {
|
|
||||||
"lib/net5.0/System.Reactive.dll": {
|
|
||||||
"assemblyVersion": "5.0.0.0",
|
|
||||||
"fileVersion": "5.0.0.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.ValueTuple/4.5.0": {},
|
|
||||||
"PluginManager/1.0.0": {
|
|
||||||
"dependencies": {
|
|
||||||
"Discord.Net": "3.6.1"
|
|
||||||
},
|
|
||||||
"runtime": {
|
|
||||||
"PluginManager.dll": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"libraries": {
|
|
||||||
"StartupEvents/1.0.0": {
|
|
||||||
"type": "project",
|
|
||||||
"serviceable": false,
|
|
||||||
"sha512": ""
|
|
||||||
},
|
|
||||||
"Discord.Net/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-TfcL/HG57fVt//WVJ2XyF2PlytY9IYkkwwkPLIhvu5FW4wf9rm7+N8RPh4qtELLfsa5ES0FK2RbgYjABRR9AjA==",
|
|
||||||
"path": "discord.net/3.6.1",
|
|
||||||
"hashPath": "discord.net.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Commands/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-kK7m571yzSzPd93o+n8Z+TfvX62BT1HtOEZIWXKwXWO8itP/sgqBNExjWK/6DOpkbD6+khc2f3rp+TA0rJD88g==",
|
|
||||||
"path": "discord.net.commands/3.6.1",
|
|
||||||
"hashPath": "discord.net.commands.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Core/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ibVjQiWzgqh0GyP/GXE2kv3TA/9ysmmNFG/WmRE7GepQQAXXGxVUO9IMJ8h14EvIXMQ0m0DktMe5DkUnilo3Ag==",
|
|
||||||
"path": "discord.net.core/3.6.1",
|
|
||||||
"hashPath": "discord.net.core.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Interactions/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-WGOxz6SMUu4WS5b/JdrhlwQletcplBIYqvjFBBDfnqE+uNJqcNGtAdyjLqIILfXGx8aSSSSYZSCeAUa7FZ8Yew==",
|
|
||||||
"path": "discord.net.interactions/3.6.1",
|
|
||||||
"hashPath": "discord.net.interactions.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Rest/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-T7RRThIS23roFEJwTL1l7aawjVyn7ZB5yH3tMge0d6TiCzzp4V4FAZ+ArTt19LHRFhPly90v8V3sWqmTMN+5Zg==",
|
|
||||||
"path": "discord.net.rest/3.6.1",
|
|
||||||
"hashPath": "discord.net.rest.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.Webhook/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-xikKHIGAIMz0BzHkaTKb48DNpFjKW8mvJjLJSezJ1xQOu+laHNk/hav4qxVtyZz7HSI/vGTkmlq9hKVhWzpaUA==",
|
|
||||||
"path": "discord.net.webhook/3.6.1",
|
|
||||||
"hashPath": "discord.net.webhook.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Discord.Net.WebSocket/3.6.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-hF22Xy7URlVEDQZ69INOgzPvFUsIDfd+r6U+1yF9HWdBn3d4THnvAAhkv1TraSx/T/MKS7g+jvk/HZ3mh5S3aw==",
|
|
||||||
"path": "discord.net.websocket/3.6.1",
|
|
||||||
"hashPath": "discord.net.websocket.3.6.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==",
|
|
||||||
"path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0",
|
|
||||||
"hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"Newtonsoft.Json/13.0.1": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==",
|
|
||||||
"path": "newtonsoft.json/13.0.1",
|
|
||||||
"hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Collections.Immutable/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==",
|
|
||||||
"path": "system.collections.immutable/5.0.0",
|
|
||||||
"hashPath": "system.collections.immutable.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Interactive.Async/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-QaqhQVDiULcu4vm6o89+iP329HcK44cETHOYgy/jfEjtzeFy0ZxmuM7nel9ocjnKxEM4yh1mli7hgh8Q9o+/Iw==",
|
|
||||||
"path": "system.interactive.async/5.0.0",
|
|
||||||
"hashPath": "system.interactive.async.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Linq.Async/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-cPtIuuH8TIjVHSi2ewwReWGW1PfChPE0LxPIDlfwVcLuTM9GANFTXiMB7k3aC4sk3f0cQU25LNKzx+jZMxijqw==",
|
|
||||||
"path": "system.linq.async/5.0.0",
|
|
||||||
"hashPath": "system.linq.async.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.Reactive/5.0.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==",
|
|
||||||
"path": "system.reactive/5.0.0",
|
|
||||||
"hashPath": "system.reactive.5.0.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"System.ValueTuple/4.5.0": {
|
|
||||||
"type": "package",
|
|
||||||
"serviceable": true,
|
|
||||||
"sha512": "sha512-okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==",
|
|
||||||
"path": "system.valuetuple/4.5.0",
|
|
||||||
"hashPath": "system.valuetuple.4.5.0.nupkg.sha512"
|
|
||||||
},
|
|
||||||
"PluginManager/1.0.0": {
|
|
||||||
"type": "project",
|
|
||||||
"serviceable": false,
|
|
||||||
"sha512": ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
@@ -2,16 +2,9 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
</PropertyGroup>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
<BaseOutputPath>bin\</BaseOutputPath>
|
||||||
<OutputPath>..\BUILDS\</OutputPath>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<DebugType>none</DebugType>
|
|
||||||
<DebugSymbols>false</DebugSymbols>
|
|
||||||
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
|
|
||||||
<WarningsAsErrors />
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,61 +0,0 @@
|
|||||||
using Discord;
|
|
||||||
using Discord.Commands;
|
|
||||||
using Discord.WebSocket;
|
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
|
||||||
using PluginManager.LanguageSystem;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
|
|
||||||
|
|
||||||
public class level : DBCommand
|
|
||||||
{
|
|
||||||
public string Command => "rank";
|
|
||||||
|
|
||||||
public string Description => "Display your current level";
|
|
||||||
|
|
||||||
public string Usage => "rank";
|
|
||||||
|
|
||||||
public bool canUseDM => false;
|
|
||||||
|
|
||||||
public bool canUseServer => true;
|
|
||||||
|
|
||||||
public bool requireAdmin => false;
|
|
||||||
|
|
||||||
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
|
||||||
{
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int cLv = Data.GetLevel(message.Author.Id);
|
|
||||||
Int64 cEXP = Data.GetExp(message.Author.Id);
|
|
||||||
Int64 rEXP = Data.GetReqEXP(message.Author.Id);
|
|
||||||
|
|
||||||
var embed = new EmbedBuilder()
|
|
||||||
{
|
|
||||||
Title = "Leveling System",
|
|
||||||
Description = message.Author.Mention
|
|
||||||
};
|
|
||||||
Random r = new Random();
|
|
||||||
int _r = r.Next(0, 256);
|
|
||||||
int _g = r.Next(0, 256);
|
|
||||||
int _b = r.Next(0, 256);
|
|
||||||
embed.WithColor(new Color(_r, _g, _b));
|
|
||||||
embed.AddField("Level", cLv);
|
|
||||||
embed.AddField("Current EXP", cEXP);
|
|
||||||
embed.AddField("Required Exp to Level up", rEXP);
|
|
||||||
embed.WithCurrentTimestamp();
|
|
||||||
await message.Channel.SendMessageAsync(embed: embed.Build());
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
if (Language.ActiveLanguage != null)
|
|
||||||
await message.Channel.SendMessageAsync(Language.ActiveLanguage.LanguageWords["DB_COMMAND_RANK_NO_RANK"]);
|
|
||||||
else await message.Channel.SendMessageAsync("You are unranked now. Please type a message in chat that is not a command and try again this command");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
public class Core
|
|
||||||
{
|
|
||||||
|
|
||||||
public static Dictionary<ulong, string> playerMessages = new Dictionary<ulong, string>();
|
|
||||||
|
|
||||||
private static readonly string folder = @".\Data\Resources\LevelingSystem\";
|
|
||||||
|
|
||||||
public static int GetLevel(ulong id) => int.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[0].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
public static Int64 GetExp(ulong id) => Int64.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[1].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
public static Int64 GetReqEXP(ulong id) => Int64.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[2].Split('=')[1]);
|
|
||||||
public static void SaveData(ulong id, int lv, Int64 cexp, Int64 rexp)
|
|
||||||
{
|
|
||||||
Directory.CreateDirectory(folder);
|
|
||||||
File.WriteAllText(Path.Combine(folder, id.ToString() + ".data"), $"Level={lv},EXP={cexp},REXP={rexp}");
|
|
||||||
}
|
|
||||||
private static Int64 NextLevelXP(int level)
|
|
||||||
{
|
|
||||||
return (level * level) + 2 * level + 75;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static (bool, int) MessageSent(ulong id, int messageLength)
|
|
||||||
{
|
|
||||||
WaitForTimeToRemoveFromList(id, 60);
|
|
||||||
|
|
||||||
if (!File.Exists(Path.Combine(folder, id.ToString() + ".data")))
|
|
||||||
{
|
|
||||||
SaveData(id, 0, 0, 0);
|
|
||||||
}
|
|
||||||
Int64 cEXp = GetExp(id);
|
|
||||||
Int64 rExp = GetReqEXP(id);
|
|
||||||
int random = new System.Random().Next(3, 6) + messageLength;
|
|
||||||
cEXp += random;
|
|
||||||
if (cEXp >= rExp)
|
|
||||||
{
|
|
||||||
cEXp = cEXp - rExp;
|
|
||||||
int lv = GetLevel(id);
|
|
||||||
rExp = NextLevelXP(lv);
|
|
||||||
lv++;
|
|
||||||
SaveData(id, lv, cEXp, rExp);
|
|
||||||
return (true, lv);
|
|
||||||
}
|
|
||||||
|
|
||||||
SaveData(id, GetLevel(id), cEXp, rExp);
|
|
||||||
return (false, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static async void WaitForTimeToRemoveFromList(ulong id, int time_seconds)
|
|
||||||
{
|
|
||||||
await Task.Delay(time_seconds * 1000);
|
|
||||||
playerMessages.Remove(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
using Discord.WebSocket;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
public static class Data
|
|
||||||
{
|
|
||||||
private static readonly string folder = @".\Data\Resources\LevelingSystem\";
|
|
||||||
public static void registerPlayer(SocketGuildUser user)
|
|
||||||
{
|
|
||||||
ulong id = user.Id;
|
|
||||||
Directory.CreateDirectory(folder);
|
|
||||||
File.WriteAllText(Path.Combine(folder, id.ToString() + ".data"), "Level=0,EXP=0,REXP=100");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int GetLevel(ulong id) => int.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[0].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
public static Int64 GetExp(ulong id) => Int64.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[1].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
public static Int64 GetReqEXP(ulong id) => Int64.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[2].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
50
CMD_LevelingSystem/Level.cs
Normal file
50
CMD_LevelingSystem/Level.cs
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
using Discord;
|
||||||
|
using Discord.Commands;
|
||||||
|
using Discord.WebSocket;
|
||||||
|
using PluginManager;
|
||||||
|
using PluginManager.Interfaces;
|
||||||
|
using PluginManager.Others;
|
||||||
|
|
||||||
|
namespace CMD_LevelingSystem;
|
||||||
|
|
||||||
|
internal class Level : DBCommand
|
||||||
|
{
|
||||||
|
public string Command => "level";
|
||||||
|
|
||||||
|
public List<string> Aliases => new() { "lvl" };
|
||||||
|
|
||||||
|
public string Description => "Display tour current level";
|
||||||
|
|
||||||
|
public string Usage => "level";
|
||||||
|
|
||||||
|
public bool canUseDM => false;
|
||||||
|
|
||||||
|
public bool canUseServer => true;
|
||||||
|
|
||||||
|
public bool requireAdmin => false;
|
||||||
|
|
||||||
|
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
|
{
|
||||||
|
if (!File.Exists(Config.GetValue<string>("LevelingSystemPath") + $"/{message.Author.Id}.dat"))
|
||||||
|
{
|
||||||
|
await context.Channel.SendMessageAsync("You are now unranked !");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var user = await Functions.ConvertFromJson<User>(Config.GetValue<string>("LevelingSystemPath") + $"/{message.Author.Id}.dat");
|
||||||
|
if (user == null)
|
||||||
|
{
|
||||||
|
await context.Channel.SendMessageAsync("You are now unranked !");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var builder = new EmbedBuilder();
|
||||||
|
var r = new Random();
|
||||||
|
builder.WithColor(r.Next(256), r.Next(256), r.Next(256));
|
||||||
|
builder.AddField("Current Level", user.CurrentLevel, true)
|
||||||
|
.AddField("Current EXP", user.CurrentEXP, true)
|
||||||
|
.AddField("Required Exp", user.RequiredEXPToLevelUp, true);
|
||||||
|
builder.WithTimestamp(DateTimeOffset.Now);
|
||||||
|
await context.Channel.SendMessageAsync(embed: builder.Build());
|
||||||
|
}
|
||||||
|
}
|
||||||
18
CMD_LevelingSystem/User.cs
Normal file
18
CMD_LevelingSystem/User.cs
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
using Discord.WebSocket;
|
||||||
|
|
||||||
|
namespace CMD_LevelingSystem;
|
||||||
|
|
||||||
|
public class DiscordUser
|
||||||
|
{
|
||||||
|
public string Username { get; set; }
|
||||||
|
public ushort DiscordTag { get; set; }
|
||||||
|
public ulong userID { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class User
|
||||||
|
{
|
||||||
|
public DiscordUser user { get; set; }
|
||||||
|
public int CurrentLevel { get; set; }
|
||||||
|
public long CurrentEXP { get; set; }
|
||||||
|
public long RequiredEXPToLevelUp { get; set; }
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
|
<BaseOutputPath>bin\</BaseOutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
using PluginManager.Interfaces;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
internal class Echo : DBCommand
|
internal class Echo : DBCommand
|
||||||
{
|
{
|
||||||
public string Command => "echo";
|
public string Command => "echo";
|
||||||
|
|
||||||
|
public List<string> Aliases => null;
|
||||||
|
|
||||||
public string Description => "Replay with the same message";
|
public string Description => "Replay with the same message";
|
||||||
|
|
||||||
public string Usage => "echo [message]";
|
public string Usage => "echo [message]";
|
||||||
@@ -18,7 +20,7 @@ internal class Echo : DBCommand
|
|||||||
|
|
||||||
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
{
|
{
|
||||||
string m = message.Content.Substring(6);
|
var m = message.Content.Substring(6);
|
||||||
await message.Channel.SendMessageAsync(m);
|
await message.Channel.SendMessageAsync(m);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,16 @@
|
|||||||
using System;
|
using Discord.Commands;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
using Discord.Commands;
|
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
using PluginManager.Interfaces;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
namespace CMD_Utils
|
namespace CMD_Utils;
|
||||||
{
|
|
||||||
class FlipCoin : DBCommand
|
internal class FlipCoin : DBCommand
|
||||||
{
|
{
|
||||||
public string Command => "flip";
|
public string Command => "flip";
|
||||||
|
|
||||||
|
public List<string> Aliases => null;
|
||||||
|
|
||||||
public string Description => "Flip a coin";
|
public string Description => "Flip a coin";
|
||||||
|
|
||||||
public string Usage => "flip";
|
public string Usage => "flip";
|
||||||
@@ -27,11 +23,11 @@ namespace CMD_Utils
|
|||||||
|
|
||||||
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
{
|
{
|
||||||
System.Random random = new System.Random();
|
var random = new System.Random();
|
||||||
int r = random.Next(1, 3);
|
var r = random.Next(1, 3);
|
||||||
if (r == 1)
|
if (r == 1)
|
||||||
await message.Channel.SendMessageAsync("Heads");
|
await message.Channel.SendMessageAsync("Heads");
|
||||||
else await message.Channel.SendMessageAsync("Tails");
|
else
|
||||||
}
|
await message.Channel.SendMessageAsync("Tails");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,18 @@
|
|||||||
using System;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
using Discord;
|
using Discord;
|
||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
using PluginManager.Interfaces;
|
||||||
|
using PluginManager.Others;
|
||||||
|
|
||||||
|
namespace CMD_Utils;
|
||||||
|
|
||||||
namespace CMD_Utils
|
|
||||||
{
|
|
||||||
public class Poll : DBCommand
|
public class Poll : DBCommand
|
||||||
{
|
{
|
||||||
public string Command => "poll";
|
public string Command => "poll";
|
||||||
|
|
||||||
|
public List<string> Aliases => null;
|
||||||
|
|
||||||
public string Description => "Create a poll with options";
|
public string Description => "Create a poll with options";
|
||||||
|
|
||||||
public string Usage => "poll [This-is-question] [This-is-answer-1] [This-is-answer-2] ... ";
|
public string Usage => "poll [This-is-question] [This-is-answer-1] [This-is-answer-2] ... ";
|
||||||
@@ -29,16 +26,15 @@ namespace CMD_Utils
|
|||||||
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
{
|
{
|
||||||
if (isDM) return;
|
if (isDM) return;
|
||||||
string question = message.Content.Split(' ')[1].Replace('-', ' ');
|
var question = message.Content.Split(' ')[1].Replace('-', ' ');
|
||||||
string[] answers = PluginManager.Others.Functions.MergeStrings(message.Content.Split(' '), 2).Split(' ');
|
var answers = Functions.MergeStrings(message.Content.Split(' '), 2).Split(' ');
|
||||||
EmbedBuilder embedBuilder = new EmbedBuilder();
|
var embedBuilder = new EmbedBuilder();
|
||||||
embedBuilder.Title = question;
|
embedBuilder.Title = question;
|
||||||
int len = answers.Length;
|
var len = answers.Length;
|
||||||
for (int i = 0; i < len; i++)
|
for (var i = 0; i < len; i++) embedBuilder.AddField($"Answer {i + 1}", answers[i].Replace('-', ' '), true);
|
||||||
embedBuilder.AddField($"Answer {i + 1}", answers[i].Replace('-', ' '), true);
|
|
||||||
var msg = await context.Channel.SendMessageAsync(embed: embedBuilder.Build());
|
var msg = await context.Channel.SendMessageAsync(embed: embedBuilder.Build());
|
||||||
|
|
||||||
List<IEmote> emotes = new List<IEmote>();
|
var emotes = new List<IEmote>();
|
||||||
emotes.Add(Emoji.Parse(":one:"));
|
emotes.Add(Emoji.Parse(":one:"));
|
||||||
emotes.Add(Emoji.Parse(":two:"));
|
emotes.Add(Emoji.Parse(":two:"));
|
||||||
emotes.Add(Emoji.Parse(":three:"));
|
emotes.Add(Emoji.Parse(":three:"));
|
||||||
@@ -46,8 +42,6 @@ namespace CMD_Utils
|
|||||||
emotes.Add(Emoji.Parse(":five:"));
|
emotes.Add(Emoji.Parse(":five:"));
|
||||||
emotes.Add(Emoji.Parse(":six:"));
|
emotes.Add(Emoji.Parse(":six:"));
|
||||||
|
|
||||||
for (int i = 0; i < len; i++)
|
for (var i = 0; i < len; i++) await msg.AddReactionAsync(emotes[i]);
|
||||||
await msg.AddReactionAsync(emotes[i]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
using Discord.Commands;
|
using System.Collections.Generic;
|
||||||
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
using PluginManager.Interfaces;
|
||||||
|
|
||||||
public class Random : DBCommand
|
public class Random : DBCommand
|
||||||
{
|
{
|
||||||
public string Command => "random";
|
public string Command => "random";
|
||||||
|
|
||||||
|
public List<string> Aliases => new() { "rnd" };
|
||||||
|
|
||||||
public string Description => "random number between number1 and number2";
|
public string Description => "random number between number1 and number2";
|
||||||
|
|
||||||
public string Usage => "random [number1] [number2]";
|
public string Usage => "random [number1] [number2]";
|
||||||
@@ -19,19 +21,18 @@ public class Random : DBCommand
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string msg = message.Content;
|
var msg = message.Content;
|
||||||
int a = int.Parse(msg.Split(' ')[1]);
|
var a = int.Parse(msg.Split(' ')[1]);
|
||||||
int b = int.Parse(msg.Split(' ')[2]);
|
var b = int.Parse(msg.Split(' ')[2]);
|
||||||
|
|
||||||
if (a > b)
|
if (a > b)
|
||||||
{
|
{
|
||||||
int 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));
|
||||||
|
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,16 +1,14 @@
|
|||||||
using Discord;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using Discord;
|
||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|
||||||
using PluginManager.Loaders;
|
|
||||||
using PluginManager.Interfaces;
|
using PluginManager.Interfaces;
|
||||||
using PluginManager.Others.Permissions;
|
using PluginManager.Loaders;
|
||||||
using PluginManager.Others;
|
using PluginManager.Others;
|
||||||
|
|
||||||
using System.Collections.Generic;
|
namespace DiscordBot.Discord.Commands;
|
||||||
|
|
||||||
namespace DiscordBot.Discord.Commands
|
|
||||||
{
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The help command
|
/// The help command
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -21,15 +19,17 @@ namespace DiscordBot.Discord.Commands
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string Command => "help";
|
public string Command => "help";
|
||||||
|
|
||||||
|
public List<string> Aliases => null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Command Description
|
/// Command Description
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Description => "This command allows you to check all loadded commands";
|
public string Description => "This command allows you to check all loaded commands";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Command usage
|
/// Command usage
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Usage => "help";
|
public string Usage => "help <command>";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Check if the command can be used <inheritdoca DM <see cref="IChannel" />/>
|
/// Check if the command can be used <inheritdoca DM <see cref="IChannel" />/>
|
||||||
@@ -55,53 +55,55 @@ namespace DiscordBot.Discord.Commands
|
|||||||
/// <param name="isDM">True if the message was sent from a DM channel, false otherwise</param>
|
/// <param name="isDM">True if the message was sent from a DM channel, false otherwise</param>
|
||||||
public void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
public void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
{
|
{
|
||||||
List<string> args = Functions.GetArguments(message);
|
var args = Functions.GetArguments(message);
|
||||||
if (args.Count != 0)
|
if (args.Count != 0)
|
||||||
{
|
{
|
||||||
|
|
||||||
foreach (var item in args)
|
foreach (var item in args)
|
||||||
{
|
{
|
||||||
var e = GenerateHelpCommand(item);
|
var e = GenerateHelpCommand(item);
|
||||||
if (e != null)
|
if (e is null)
|
||||||
context.Channel.SendMessageAsync(embed: e.Build());
|
|
||||||
else
|
|
||||||
context.Channel.SendMessageAsync("Unknown Command " + item);
|
context.Channel.SendMessageAsync("Unknown Command " + item);
|
||||||
|
else
|
||||||
|
context.Channel.SendMessageAsync(embed: e.Build());
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
EmbedBuilder embedBuilder = new EmbedBuilder();
|
|
||||||
|
|
||||||
string adminCommands = "";
|
var embedBuilder = new EmbedBuilder();
|
||||||
string normalCommands = "";
|
|
||||||
string DMCommands = "";
|
|
||||||
|
|
||||||
foreach (var cmd in PluginLoader.Plugins!)
|
var adminCommands = "";
|
||||||
|
var normalCommands = "";
|
||||||
|
var DMCommands = "";
|
||||||
|
|
||||||
|
foreach (var cmd in PluginLoader.Commands!)
|
||||||
{
|
{
|
||||||
if (cmd.canUseDM)
|
if (cmd.canUseDM)
|
||||||
DMCommands += cmd.Command + " ";
|
DMCommands += cmd.Command + " ";
|
||||||
if (cmd.requireAdmin)
|
if (cmd.requireAdmin)
|
||||||
adminCommands += cmd.Command + " ";
|
adminCommands += cmd.Command + " ";
|
||||||
else if (cmd.canUseServer) normalCommands += cmd.Command + " ";
|
if (cmd.canUseServer)
|
||||||
|
normalCommands += cmd.Command + " ";
|
||||||
}
|
}
|
||||||
|
|
||||||
embedBuilder.AddField("Admin Commands", adminCommands);
|
embedBuilder.AddField("Admin Commands", adminCommands);
|
||||||
embedBuilder.AddField("Normal Commands", normalCommands);
|
embedBuilder.AddField("Normal Commands", normalCommands);
|
||||||
embedBuilder.AddField("DM Commands", DMCommands);
|
embedBuilder.AddField("DM Commands", DMCommands);
|
||||||
context.Channel.SendMessageAsync(embed: embedBuilder.Build());
|
context.Channel.SendMessageAsync(embed: embedBuilder.Build());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private EmbedBuilder GenerateHelpCommand(string command)
|
private EmbedBuilder GenerateHelpCommand(string command)
|
||||||
{
|
{
|
||||||
EmbedBuilder embedBuilder = new EmbedBuilder();
|
var embedBuilder = new EmbedBuilder();
|
||||||
DBCommand cmd = PluginLoader.Plugins.Find(p => p.Command == command);
|
var cmd = PluginLoader.Commands!.Find(p => p.Command == command || (p.Aliases is not null && p.Aliases.Contains(command)));
|
||||||
if (cmd == null)
|
if (cmd == null) return null;
|
||||||
return null;
|
|
||||||
|
|
||||||
embedBuilder.AddField("Usage", cmd.Usage);
|
embedBuilder.AddField("Usage", cmd.Usage);
|
||||||
embedBuilder.AddField("Description", cmd.Description);
|
embedBuilder.AddField("Description", cmd.Description);
|
||||||
|
if (cmd.Aliases is null)
|
||||||
|
return embedBuilder;
|
||||||
|
embedBuilder.AddField("Alias", cmd.Aliases.Count == 0 ? "-" : string.Join(", ", cmd.Aliases));
|
||||||
|
|
||||||
return embedBuilder;
|
return embedBuilder;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
using PluginManager.Interfaces;
|
||||||
|
using PluginManager.Others;
|
||||||
|
using PluginManager.Others.Permissions;
|
||||||
using DiscordLibCommands = Discord.Commands;
|
using DiscordLibCommands = Discord.Commands;
|
||||||
using DiscordLib = Discord;
|
using DiscordLib = Discord;
|
||||||
|
using OperatingSystem = PluginManager.Others.OperatingSystem;
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
namespace DiscordBot.Discord.Commands;
|
||||||
using PluginManager.Others.Permissions;
|
|
||||||
using PluginManager.Others;
|
|
||||||
|
|
||||||
namespace DiscordBot.Discord.Commands
|
|
||||||
{
|
|
||||||
internal class Restart : DBCommand
|
internal class Restart : DBCommand
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -18,6 +18,8 @@ namespace DiscordBot.Discord.Commands
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string Command => "restart";
|
public string Command => "restart";
|
||||||
|
|
||||||
|
public List<string> Aliases => null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Command Description
|
/// Command Description
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -42,6 +44,7 @@ namespace DiscordBot.Discord.Commands
|
|||||||
/// Check if the command require administrator to be executed
|
/// Check if the command require administrator to be executed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool requireAdmin => false;
|
public bool requireAdmin => false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The main body of the command
|
/// The main body of the command
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -51,25 +54,27 @@ namespace DiscordBot.Discord.Commands
|
|||||||
/// <param name="isDM">True if the message was sent from a DM channel, false otherwise</param>
|
/// <param name="isDM">True if the message was sent from a DM channel, false otherwise</param>
|
||||||
public async void Execute(DiscordLibCommands.SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
public async void Execute(DiscordLibCommands.SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
{
|
{
|
||||||
if (!DiscordPermissions.hasPermission(message.Author as SocketGuildUser, DiscordLib.GuildPermission.Administrator)) return;
|
if (!(message.Author as SocketGuildUser).hasPermission(DiscordLib.GuildPermission.Administrator)) return;
|
||||||
var args = Functions.GetArguments(message);
|
var args = Functions.GetArguments(message);
|
||||||
var OS = Functions.GetOperatingSystem();
|
var OS = Functions.GetOperatingSystem();
|
||||||
if (args.Count == 0)
|
if (args.Count == 0)
|
||||||
{
|
{
|
||||||
switch (OS)
|
switch (OS)
|
||||||
{
|
{
|
||||||
case PluginManager.Others.OperatingSystem.WINDOWS:
|
case OperatingSystem.WINDOWS:
|
||||||
Process.Start("./DiscordBot.exe");
|
Process.Start("./DiscordBot.exe");
|
||||||
break;
|
break;
|
||||||
case PluginManager.Others.OperatingSystem.LINUX:
|
case OperatingSystem.LINUX:
|
||||||
case PluginManager.Others.OperatingSystem.MAC_OS:
|
case OperatingSystem.MAC_OS:
|
||||||
Process.Start("./DiscordBot");
|
Process.Start("./DiscordBot");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (args[0])
|
switch (args[0])
|
||||||
{
|
{
|
||||||
case "-p":
|
case "-p":
|
||||||
@@ -80,35 +85,32 @@ namespace DiscordBot.Discord.Commands
|
|||||||
break;
|
break;
|
||||||
case "-cmd":
|
case "-cmd":
|
||||||
case "-args":
|
case "-args":
|
||||||
string cmd = "--args";
|
var cmd = "--args";
|
||||||
|
|
||||||
if (args.Count > 1)
|
if (args.Count > 1)
|
||||||
for (int i = 1; i < args.Count; i++)
|
for (var i = 1; i < args.Count; i++)
|
||||||
cmd += $" {args[i]}";
|
cmd += $" {args[i]}";
|
||||||
|
|
||||||
|
|
||||||
switch (OS)
|
switch (OS)
|
||||||
{
|
{
|
||||||
case PluginManager.Others.OperatingSystem.WINDOWS:
|
case OperatingSystem.WINDOWS:
|
||||||
Functions.WriteLogFile("Restarting the bot with the following arguments: \"" + cmd + "\"");
|
Functions.WriteLogFile("Restarting the bot with the following arguments: \"" + cmd + "\"");
|
||||||
Process.Start("./DiscordBot.exe", cmd);
|
Process.Start("./DiscordBot.exe", cmd);
|
||||||
break;
|
break;
|
||||||
case PluginManager.Others.OperatingSystem.LINUX:
|
case OperatingSystem.LINUX:
|
||||||
//case PluginManager.Others.OperatingSystem.MAC_OS: ?? - not tested
|
//case PluginManager.Others.OperatingSystem.MAC_OS: ?? - not tested
|
||||||
Process.Start("./DiscordBot", cmd);
|
Process.Start("./DiscordBot", cmd);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
await context.Channel.SendMessageAsync("Invalid argument. Use `help restart` to see the usage.");
|
await context.Channel.SendMessageAsync("Invalid argument. Use `help restart` to see the usage.");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,28 +1,22 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
using Discord;
|
using Discord;
|
||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
using PluginManager;
|
||||||
using PluginManager.Core;
|
|
||||||
using PluginManager.Interfaces;
|
using PluginManager.Interfaces;
|
||||||
using PluginManager.Others;
|
|
||||||
using PluginManager.Others.Permissions;
|
|
||||||
|
|
||||||
namespace DiscordBot.Discord.Commands
|
namespace DiscordBot.Discord.Commands;
|
||||||
{
|
|
||||||
class Settings : DBCommand
|
|
||||||
{
|
|
||||||
|
|
||||||
|
internal class Settings : DBCommand
|
||||||
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Command name
|
/// Command name
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Command => "set";
|
public string Command => "set";
|
||||||
|
|
||||||
|
public List<string> Aliases => null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Command Description
|
/// Command Description
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -60,10 +54,9 @@ namespace DiscordBot.Discord.Commands
|
|||||||
var channel = message.Channel;
|
var channel = message.Channel;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
var content = message.Content;
|
||||||
string content = message.Content;
|
var data = content.Split(' ');
|
||||||
string[] data = content.Split(' ');
|
var keyword = data[1];
|
||||||
string keyword = data[1];
|
|
||||||
if (keyword.ToLower() == "help")
|
if (keyword.ToLower() == "help")
|
||||||
{
|
{
|
||||||
await channel.SendMessageAsync("set token [new value] -- set the value of the new token (require restart)");
|
await channel.SendMessageAsync("set token [new value] -- set the value of the new token (require restart)");
|
||||||
@@ -80,7 +73,8 @@ namespace DiscordBot.Discord.Commands
|
|||||||
await channel.SendMessageAsync("Invalid token !");
|
await channel.SendMessageAsync("Invalid token !");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Functions.WriteToSettings("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", data[2], '\t');
|
|
||||||
|
Config.SetValue("token", data[2]);
|
||||||
break;
|
break;
|
||||||
case "prefix":
|
case "prefix":
|
||||||
if (data.Length != 3)
|
if (data.Length != 3)
|
||||||
@@ -88,7 +82,8 @@ namespace DiscordBot.Discord.Commands
|
|||||||
await channel.SendMessageAsync("Invalid token !");
|
await channel.SendMessageAsync("Invalid token !");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Functions.WriteToSettings("./Data/Resources/DiscordBotCore.data", "BOT_PREFIX", data[2], '\t');
|
|
||||||
|
Config.SetValue("token", data[2]);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
@@ -96,11 +91,10 @@ namespace DiscordBot.Discord.Commands
|
|||||||
|
|
||||||
await channel.SendMessageAsync("Restart required ...");
|
await channel.SendMessageAsync("Restart required ...");
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Console.WriteLine(ex.Message);
|
||||||
await channel.SendMessageAsync("Unknown usage to this command !\nUsage: " + Usage);
|
await channel.SendMessageAsync("Unknown usage to this command !\nUsage: " + Usage);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
using Discord;
|
using System;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Discord;
|
||||||
using Discord.Commands;
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
using PluginManager;
|
||||||
using System;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
using static PluginManager.Others.Functions;
|
using static PluginManager.Others.Functions;
|
||||||
|
|
||||||
namespace PluginManager.Core
|
namespace DiscordBot.Discord.Core;
|
||||||
{
|
|
||||||
internal class Boot
|
internal class Boot
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -21,13 +21,6 @@ namespace PluginManager.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public readonly string botToken;
|
public readonly string botToken;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Checks if the bot is ready
|
|
||||||
/// </summary>
|
|
||||||
/// <value> true if the bot is ready, othwerwise false </value>
|
|
||||||
public bool isReady { get; private set; } = false;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The bot client
|
/// The bot client
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -54,13 +47,22 @@ namespace PluginManager.Core
|
|||||||
this.botToken = botToken;
|
this.botToken = botToken;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Checks if the bot is ready
|
||||||
|
/// </summary>
|
||||||
|
/// <value> true if the bot is ready, othwerwise false </value>
|
||||||
|
public bool isReady { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The start method for the bot. This method is used to load the bot
|
/// The start method for the bot. This method is used to load the bot
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Task</returns>
|
/// <returns>Task</returns>
|
||||||
public async Task Awake()
|
public async Task Awake()
|
||||||
{
|
{
|
||||||
client = new DiscordSocketClient();
|
DiscordSocketConfig config = new DiscordSocketConfig { AlwaysDownloadUsers = true };
|
||||||
|
|
||||||
|
client = new DiscordSocketClient(config);
|
||||||
service = new CommandService();
|
service = new CommandService();
|
||||||
|
|
||||||
CommonTasks();
|
CommonTasks();
|
||||||
@@ -71,22 +73,8 @@ namespace PluginManager.Core
|
|||||||
commandServiceHandler = new CommandHandler(client, service, botPrefix);
|
commandServiceHandler = new CommandHandler(client, service, botPrefix);
|
||||||
await commandServiceHandler.InstallCommandsAsync();
|
await commandServiceHandler.InstallCommandsAsync();
|
||||||
|
|
||||||
//wait for isReady to become true
|
|
||||||
|
|
||||||
await Task.Delay(2000);
|
await Task.Delay(2000);
|
||||||
while (!isReady) ;
|
while (!isReady) ;
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The method that stops the bot from running
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
public async Task ShutDown()
|
|
||||||
{
|
|
||||||
if (client == null) return;
|
|
||||||
await client.LogoutAsync();
|
|
||||||
await client.StopAsync();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CommonTasks()
|
private void CommonTasks()
|
||||||
@@ -109,6 +97,7 @@ namespace PluginManager.Core
|
|||||||
{
|
{
|
||||||
Console.Title = "ONLINE";
|
Console.Title = "ONLINE";
|
||||||
isReady = true;
|
isReady = true;
|
||||||
|
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,7 +105,8 @@ namespace PluginManager.Core
|
|||||||
{
|
{
|
||||||
Console.Title = "CONNECTED";
|
Console.Title = "CONNECTED";
|
||||||
WriteLogFile("The bot has been logged in at " + DateTime.Now.ToShortDateString() + " (" +
|
WriteLogFile("The bot has been logged in at " + DateTime.Now.ToShortDateString() + " (" +
|
||||||
DateTime.Now.ToShortTimeString() + ")");
|
DateTime.Now.ToShortTimeString() + ")"
|
||||||
|
);
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -149,4 +139,3 @@ namespace PluginManager.Core
|
|||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,25 +1,19 @@
|
|||||||
using Discord.Commands;
|
using System.Linq;
|
||||||
using Discord.WebSocket;
|
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
|
||||||
|
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Discord.Commands;
|
||||||
|
using Discord.WebSocket;
|
||||||
|
using PluginManager.Loaders;
|
||||||
using PluginManager.Others;
|
using PluginManager.Others;
|
||||||
using PluginManager.Others.Permissions;
|
using PluginManager.Others.Permissions;
|
||||||
using PluginManager.Loaders;
|
|
||||||
|
|
||||||
using System.Threading.Tasks;
|
namespace DiscordBot.Discord.Core;
|
||||||
using System.Linq;
|
|
||||||
using Discord;
|
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace PluginManager.Core
|
|
||||||
{
|
|
||||||
internal class CommandHandler
|
internal class CommandHandler
|
||||||
{
|
{
|
||||||
|
private readonly string botPrefix;
|
||||||
private readonly DiscordSocketClient client;
|
private readonly DiscordSocketClient client;
|
||||||
private readonly CommandService commandService;
|
private readonly CommandService commandService;
|
||||||
private readonly string botPrefix;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Command handler constructor
|
/// Command handler constructor
|
||||||
@@ -41,7 +35,7 @@ namespace PluginManager.Core
|
|||||||
public async Task InstallCommandsAsync()
|
public async Task InstallCommandsAsync()
|
||||||
{
|
{
|
||||||
client.MessageReceived += MessageHandler;
|
client.MessageReceived += MessageHandler;
|
||||||
await commandService.AddModulesAsync(assembly: Assembly.GetEntryAssembly(), services: null);
|
await commandService.AddModulesAsync(Assembly.GetEntryAssembly(), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -58,11 +52,13 @@ namespace PluginManager.Core
|
|||||||
|
|
||||||
var message = Message as SocketUserMessage;
|
var message = Message as SocketUserMessage;
|
||||||
|
|
||||||
if (message == null) return;
|
if (message == null)
|
||||||
|
return;
|
||||||
|
|
||||||
if (!message.Content.StartsWith(botPrefix)) return;
|
if (!message.Content.StartsWith(botPrefix))
|
||||||
|
return;
|
||||||
|
|
||||||
int argPos = 0;
|
var argPos = 0;
|
||||||
|
|
||||||
if (message.HasMentionPrefix(client.CurrentUser, ref argPos))
|
if (message.HasMentionPrefix(client.CurrentUser, ref argPos))
|
||||||
{
|
{
|
||||||
@@ -70,17 +66,14 @@ namespace PluginManager.Core
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (message.Author.IsBot) return;
|
if (message.Author.IsBot)
|
||||||
|
return;
|
||||||
|
|
||||||
var context = new SocketCommandContext(client, message);
|
var context = new SocketCommandContext(client, message);
|
||||||
|
|
||||||
await commandService.ExecuteAsync(
|
await commandService.ExecuteAsync(context, argPos, null);
|
||||||
context: context,
|
|
||||||
argPos: argPos,
|
|
||||||
services: null
|
|
||||||
);
|
|
||||||
|
|
||||||
DBCommand plugin = PluginLoader.Plugins!.Where(p => p.Command == (message.Content.Split(' ')[0]).Substring(botPrefix.Length)).FirstOrDefault();
|
var plugin = PluginLoader.Commands!.Where(p => p.Command == message.Content.Split(' ')[0].Substring(botPrefix.Length) || (p.Aliases is not null && p.Aliases.Contains(message.Content.Split(' ')[0].Substring(botPrefix.Length)))).FirstOrDefault();
|
||||||
|
|
||||||
|
|
||||||
if (plugin != null)
|
if (plugin != null)
|
||||||
@@ -97,9 +90,11 @@ namespace PluginManager.Core
|
|||||||
Functions.WriteLogFile($"[{message.Author.Id}] Executed command (DM) : " + plugin.Command);
|
Functions.WriteLogFile($"[{message.Author.Id}] Executed command (DM) : " + plugin.Command);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await message.Channel.SendMessageAsync("This command is for administrators only !");
|
await message.Channel.SendMessageAsync("This command is for administrators only !");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
plugin.Execute(context, message, client, true);
|
plugin.Execute(context, message, client, true);
|
||||||
Functions.WriteLogFile($"[{message.Author.Id}] Executed command (DM) : " + plugin.Command);
|
Functions.WriteLogFile($"[{message.Author.Id}] Executed command (DM) : " + plugin.Command);
|
||||||
return;
|
return;
|
||||||
@@ -108,6 +103,7 @@ namespace PluginManager.Core
|
|||||||
await message.Channel.SendMessageAsync("This command is not for DMs");
|
await message.Channel.SendMessageAsync("This command is not for DMs");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (plugin.canUseServer)
|
if (plugin.canUseServer)
|
||||||
{
|
{
|
||||||
if (plugin.requireAdmin)
|
if (plugin.requireAdmin)
|
||||||
@@ -118,19 +114,18 @@ namespace PluginManager.Core
|
|||||||
Functions.WriteLogFile($"[{message.Author.Id}] Executed command : " + plugin.Command);
|
Functions.WriteLogFile($"[{message.Author.Id}] Executed command : " + plugin.Command);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await message.Channel.SendMessageAsync("This command is for administrators only !");
|
await message.Channel.SendMessageAsync("This command is for administrators only !");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
}
|
||||||
}
|
}
|
||||||
return;
|
}
|
||||||
|
catch
|
||||||
}
|
{
|
||||||
}
|
|
||||||
catch { }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,6 +6,17 @@
|
|||||||
<Nullable>disable</Nullable>
|
<Nullable>disable</Nullable>
|
||||||
<ApplicationIcon />
|
<ApplicationIcon />
|
||||||
<StartupObject />
|
<StartupObject />
|
||||||
|
<SignAssembly>False</SignAssembly>
|
||||||
|
<IsPublishable>True</IsPublishable>
|
||||||
|
<AssemblyVersion>1.0.0.2</AssemblyVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||||
|
<DebugType>none</DebugType>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||||
|
<DebugType>none</DebugType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -27,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>
|
||||||
|
|||||||
@@ -1,363 +1,129 @@
|
|||||||
using Discord;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
using PluginManager.Core;
|
using DiscordBot.Discord.Core;
|
||||||
using PluginManager.Others;
|
|
||||||
using PluginManager.Loaders;
|
using PluginManager;
|
||||||
using PluginManager.LanguageSystem;
|
using PluginManager.Items;
|
||||||
using PluginManager.Online;
|
using PluginManager.Online;
|
||||||
|
using PluginManager.Others;
|
||||||
|
|
||||||
|
namespace DiscordBot;
|
||||||
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
namespace DiscordBot
|
|
||||||
{
|
|
||||||
public class Program
|
public class Program
|
||||||
{
|
{
|
||||||
private static PluginsManager manager = new PluginsManager("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Plugins");
|
private static bool loadPluginsOnStartup;
|
||||||
private static LanguageManager languageManager = new LanguageManager("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Languages");
|
private static bool listPluginsAtStartup;
|
||||||
|
|
||||||
private static bool loadPluginsOnStartup = false;
|
|
||||||
private static bool listPluginsAtStartup = false;
|
|
||||||
private static bool listLanguagAtStartup = false;
|
|
||||||
|
|
||||||
private static bool PluginsLoaded = false;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The main entry point for the application.
|
/// The main entry point for the application.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[STAThread]
|
[STAThread]
|
||||||
[Obsolete]
|
[Obsolete]
|
||||||
|
|
||||||
public static void Main(string[] args)
|
public static void Main(string[] args)
|
||||||
{
|
{
|
||||||
|
|
||||||
Directory.CreateDirectory("./Data/Resources");
|
Directory.CreateDirectory("./Data/Resources");
|
||||||
Directory.CreateDirectory("./Data/Languages");
|
|
||||||
Directory.CreateDirectory("./Data/Plugins/Commands");
|
Directory.CreateDirectory("./Data/Plugins/Commands");
|
||||||
Directory.CreateDirectory("./Data/Plugins/Events");
|
Directory.CreateDirectory("./Data/Plugins/Events");
|
||||||
if (!File.Exists("./Data/Resources/DiscordBotCore.data") || (Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '=').Length != 59 && Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '=').Length != 70))
|
PreLoadComponents().Wait();
|
||||||
|
|
||||||
|
if (!Config.ContainsKey("ServerID"))
|
||||||
{
|
{
|
||||||
File.WriteAllText("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN=token\nBOT_PREFIX=!\n");
|
do
|
||||||
while (true)
|
|
||||||
{
|
{
|
||||||
Console.WriteLine("Please insert your token: ");
|
Console.Clear();
|
||||||
Console.Write("TOKEN: ");
|
Console.WriteLine("Please enter the server ID: ");
|
||||||
string botToken = Console.ReadLine();
|
Console_Utilities.WriteColorText("You can find it in the Server Settings at &r\"Widget\"&c section");
|
||||||
if (botToken.Length == 59 || botToken.Length == 70)
|
Console.WriteLine("Example: 1234567890123456789");
|
||||||
|
|
||||||
|
Console.WriteLine("This is not required, but is recommended. If you refuse to provide the ID, just press enter.\nThe server id is required to make easier for the bot to interact with the server.\nRemember: this bot is for one server ONLY.");
|
||||||
|
Console.Write("User Input > ");
|
||||||
|
ConsoleKeyInfo key = Console.ReadKey();
|
||||||
|
if (key.Key == ConsoleKey.Enter)
|
||||||
|
Config.AddValueToVariables("ServerID", "null", false);
|
||||||
|
else
|
||||||
{
|
{
|
||||||
string prefix = Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_PREFIX", '=');
|
string SID = key.KeyChar + Console.ReadLine();
|
||||||
if (prefix == string.Empty || prefix == null)
|
if (SID.Length != 18)
|
||||||
prefix = "!";
|
{
|
||||||
File.WriteAllText("./Data/Resources/DiscordBotCore.data", $"BOT_TOKEN={botToken}\nBOT_PREFIX={prefix}\n");
|
Console.WriteLine("Your server ID is not 18 characters long. Please try again.");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Config.AddValueToVariables("ServerID", SID, false);
|
||||||
|
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
} while (true);
|
||||||
|
|
||||||
}
|
}
|
||||||
else Console.WriteLine("Invalid Token !");
|
|
||||||
|
if (!Config.ContainsKey("token") || Config.GetValue<string>("token") == null || Config.GetValue<string>("token")?.Length != 70)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Please insert your token");
|
||||||
|
Console.Write("Token = ");
|
||||||
|
var token = Console.ReadLine();
|
||||||
|
if (token?.Length == 59 || token?.Length == 70)
|
||||||
|
Config.AddValueToVariables("token", token, true);
|
||||||
|
else
|
||||||
|
Console.WriteLine("Invalid token");
|
||||||
|
|
||||||
|
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 == ' ' || char.IsDigit(prefix))
|
||||||
|
return;
|
||||||
|
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Reset all settings for the bot
|
|
||||||
/// </summary>
|
|
||||||
private static Task ResetSettings()
|
|
||||||
{
|
|
||||||
string[] files = Directory.GetFiles(@"./Data/Resources");
|
|
||||||
foreach (string file in files) File.Delete(file);
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The main loop for the discord bot
|
/// The main loop for the discord bot
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <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 async Task NoGUI(Boot discordbooter)
|
private static void NoGUI(Boot discordbooter)
|
||||||
{
|
{
|
||||||
LoadLanguage();
|
var consoleCommandsHandler = new ConsoleCommandsHandler(discordbooter.client);
|
||||||
if (loadPluginsOnStartup)
|
#if DEBUG
|
||||||
LoadPlugins(discordbooter);
|
Console.WriteLine();
|
||||||
if (listPluginsAtStartup)
|
consoleCommandsHandler.HandleCommand("lp");
|
||||||
await manager.ListAvailablePlugins();
|
#else
|
||||||
if (listLanguagAtStartup)
|
if (loadPluginsOnStartup) consoleCommandsHandler.HandleCommand("lp");
|
||||||
await languageManager.ListAllLanguages();
|
if (listPluginsAtStartup) consoleCommandsHandler.HandleCommand("listplugs");
|
||||||
|
#endif
|
||||||
|
Config.SaveConfig();
|
||||||
Console_Utilities.ProgressBar pbar;
|
|
||||||
IProgress<float> progress = null;
|
|
||||||
Task t;
|
|
||||||
int prg = 0;
|
|
||||||
|
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
Console.ForegroundColor = ConsoleColor.White;
|
//Console_Utilities.WriteColorText("&rSethBot (&yDEBUG&r) &c> ", false);
|
||||||
Console_Utilities.WriteColorText("&mConsole ", false);
|
var cmd = Console.ReadLine();
|
||||||
string[] data = Console.ReadLine().Split(' ');
|
if (!consoleCommandsHandler.HandleCommand(cmd!,
|
||||||
|
#if DEBUG
|
||||||
if (data[0].Length < 2)
|
false
|
||||||
continue; // The input command is less then 2 characters long
|
#endif
|
||||||
|
) && cmd.Length > 0)
|
||||||
switch (data[0])
|
Console.WriteLine("Failed to run command " + cmd);
|
||||||
{
|
|
||||||
case "shutdown":
|
|
||||||
case "sd":
|
|
||||||
if (discordbooter.client.ConnectionState == ConnectionState.Connected)
|
|
||||||
await discordbooter.ShutDown().ContinueWith(t => { Environment.Exit(0); });
|
|
||||||
break;
|
|
||||||
case "reload":
|
|
||||||
case "rl":
|
|
||||||
if (Environment.OSVersion.Platform != PlatformID.Win32NT)
|
|
||||||
{
|
|
||||||
Console.WriteLine("This command is for windows users ONLY");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Process.Start("./DiscordBot.exe", "--cmd lp");
|
|
||||||
if (discordbooter.client.ConnectionState == ConnectionState.Connected)
|
|
||||||
await discordbooter.ShutDown();
|
|
||||||
else Environment.Exit(0);
|
|
||||||
break;
|
|
||||||
case "listplugs":
|
|
||||||
await manager.ListAvailablePlugins();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "dwplug":
|
|
||||||
string name = data.MergeStrings(1);
|
|
||||||
// info[0] = plugin type
|
|
||||||
// info[1] = plugin link
|
|
||||||
// info[2] = if others are required, or string.Empty if none
|
|
||||||
string[] info = await manager.GetPluginLinkByName(name);
|
|
||||||
if (info[1] == null) // link is null
|
|
||||||
{
|
|
||||||
if (name == "")
|
|
||||||
{
|
|
||||||
Console_Utilities.WriteColorText($"Name is invalid");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Console_Utilities.WriteColorText($"Failed to find plugin &b{name} &c! Use &glistplugs &ccommand to display all available plugins !");
|
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
|
||||||
string path = "./Data/Plugins/" + info[0] + "s/" + name + ".dll";
|
|
||||||
|
|
||||||
await ServerCom.DownloadFileAsync(info[1], path);
|
|
||||||
Console.WriteLine("\n");
|
|
||||||
|
|
||||||
// check requirements if any
|
|
||||||
|
|
||||||
if (info.Length == 3 && info[2] != string.Empty && info[2] != null)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Downloading requirements for plugin : {name}");
|
|
||||||
|
|
||||||
List<string> lines = await ServerCom.ReadTextFromFile(info[2]);
|
|
||||||
int i = 1;
|
|
||||||
|
|
||||||
foreach (var line in lines)
|
|
||||||
{
|
|
||||||
string[] split = line.Split(',');
|
|
||||||
Console.WriteLine($"\nDownloading item: {split[1]}");
|
|
||||||
|
|
||||||
|
|
||||||
await ServerCom.DownloadFileAsync(split[0], "./" + split[1]);
|
|
||||||
Console.WriteLine();
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
Console.WriteLine();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
case "setlang":
|
|
||||||
if (data.Length == 2)
|
|
||||||
SetLanguage(data[1]);
|
|
||||||
else Console.WriteLine("Invalid arguments");
|
|
||||||
break;
|
|
||||||
case "set-setting":
|
|
||||||
if (data.Length >= 3)
|
|
||||||
Functions.WriteToSettingsFast(data[1], Functions.MergeStrings(data, 2));
|
|
||||||
else Console.WriteLine("Failed to write to settings. Invalid params");
|
|
||||||
break;
|
|
||||||
case "listlang":
|
|
||||||
await languageManager.ListAllLanguages();
|
|
||||||
break;
|
|
||||||
case "dwlang":
|
|
||||||
string Lname = data.MergeStrings(1);
|
|
||||||
string[] link = await languageManager.GetDownloadLink(Lname);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (link[0] is null || link is null)
|
|
||||||
{
|
|
||||||
if (Lname == "")
|
|
||||||
{
|
|
||||||
Console_Utilities.WriteColorText($"Name is invalid");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Console_Utilities.WriteColorText("Failed to find language &b" + Lname + " &c! Use &glistlang &ccommand to display all available languages !");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (link[1].Contains("CrossPlatform") || link[1].Contains("cp"))
|
|
||||||
{
|
|
||||||
|
|
||||||
string path2 = Functions.langFolder + Lname + ".lng";
|
|
||||||
|
|
||||||
await ServerCom.DownloadFileAsync(link[0], path2);
|
|
||||||
Console.WriteLine("\n");
|
|
||||||
}
|
|
||||||
else Console_Utilities.WriteColorText("The language you are trying to download (&b" + Lname + "&c) is not compatible with the version of this bot. User &glistlang &ccommand in order to see all available languages for your current version !\n" + link[1]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
if (Lname == "")
|
|
||||||
{
|
|
||||||
Console_Utilities.WriteColorText($"Name is invalid");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Console_Utilities.WriteColorText("Failed to find language &b" + Lname + " &c! Use &glistlang &ccommand to display all available languages !");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case "loadplugins":
|
|
||||||
case "lp":
|
|
||||||
if (PluginsLoaded)
|
|
||||||
{
|
|
||||||
Console_Utilities.WriteColorText("&rPlugins are already loaded");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
LoadPlugins(discordbooter);
|
|
||||||
|
|
||||||
break;
|
|
||||||
case "help":
|
|
||||||
Console.ForegroundColor = ConsoleColor.DarkYellow;
|
|
||||||
Console.WriteLine
|
|
||||||
(
|
|
||||||
"lp | loadplugins -> load all plugins\n" +
|
|
||||||
"sd | shutdown->close connection to the server(stop bot)\n" +
|
|
||||||
"token -> display the current token\n" +
|
|
||||||
"listplugs -> list all available plugins\n" +
|
|
||||||
"dwplug [name] -> download plugin by name\n" +
|
|
||||||
"listlang -> list all available languages\n" +
|
|
||||||
"dwlang -> download language by name\n" +
|
|
||||||
"setlang [name] -> set language from the downloaded languages\n" +
|
|
||||||
"set-setting [setting.path] [value] -> set setting value"
|
|
||||||
);
|
|
||||||
Console.ForegroundColor = ConsoleColor.White;
|
|
||||||
break;
|
|
||||||
case "token":
|
|
||||||
if (File.Exists("./Data/Resources/DiscordBotCore.data"))
|
|
||||||
Console.WriteLine("Token: " + Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '='));
|
|
||||||
else Console.WriteLine("File could not be found. Please register token");
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
goto case "help";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void LoadPlugins(Boot discordbooter)
|
|
||||||
{
|
|
||||||
var loader = new PluginLoader(discordbooter.client);
|
|
||||||
loader.onCMDLoad += (name, typeName, success, exception) =>
|
|
||||||
{
|
|
||||||
Console.ForegroundColor = ConsoleColor.Green;
|
|
||||||
if (name == null || name.Length < 2)
|
|
||||||
name = typeName;
|
|
||||||
if (success)
|
|
||||||
if (Language.ActiveLanguage == null)
|
|
||||||
Console.WriteLine("[CMD] Successfully loaded command : " + name);
|
|
||||||
else Console.WriteLine(Language.ActiveLanguage.FormatText(Language.ActiveLanguage.LanguageWords["COMMAND_LOAD_SUCCESS"], name));
|
|
||||||
else
|
|
||||||
if (Language.ActiveLanguage == null)
|
|
||||||
Console.WriteLine("[CMD] Failed to load command : " + name + " because " + exception.Message);
|
|
||||||
else
|
|
||||||
Console.WriteLine(Language.ActiveLanguage.FormatText(Language.ActiveLanguage.LanguageWords["COMMAND_LOAD_FAIL"], name, exception.Message));
|
|
||||||
Console.ForegroundColor = ConsoleColor.Red;
|
|
||||||
};
|
|
||||||
loader.onEVELoad += (name, typeName, success, exception) =>
|
|
||||||
{
|
|
||||||
if (name == null || name.Length < 2)
|
|
||||||
name = typeName;
|
|
||||||
Console.ForegroundColor = ConsoleColor.Green;
|
|
||||||
if (success)
|
|
||||||
if (Language.ActiveLanguage == null)
|
|
||||||
Console.WriteLine("[EVENT] Successfully loaded event : " + name);
|
|
||||||
else
|
|
||||||
Console.WriteLine(Language.ActiveLanguage.FormatText(Language.ActiveLanguage.LanguageWords["EVENT_LOAD_SUCCESS"], name));
|
|
||||||
else
|
|
||||||
if (Language.ActiveLanguage == null)
|
|
||||||
Console.WriteLine("[EVENT] Failed to load event : " + name + " because " + exception.Message);
|
|
||||||
else
|
|
||||||
Console.WriteLine(Language.ActiveLanguage.FormatText(Language.ActiveLanguage.LanguageWords["EVENT_LOAD_FAIL"], name, exception.Message));
|
|
||||||
Console.ForegroundColor = ConsoleColor.Red;
|
|
||||||
};
|
|
||||||
loader.LoadPlugins();
|
|
||||||
|
|
||||||
PluginsLoaded = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Load the language from the specified file
|
|
||||||
/// </summary>
|
|
||||||
private static bool LoadLanguage()
|
|
||||||
{
|
|
||||||
string folder = Functions.langFolder;
|
|
||||||
string langSettings = "./Data/Resources/Language.txt";
|
|
||||||
if (!File.Exists(langSettings))
|
|
||||||
File.WriteAllText(langSettings, "Language=English");
|
|
||||||
//Load language from the specified file ...
|
|
||||||
Language.ActiveLanguage = null;
|
|
||||||
|
|
||||||
string langname = Functions.readCodeFromFile(langSettings, "Language", '=');
|
|
||||||
if (langname == "English")
|
|
||||||
{
|
|
||||||
Language.ActiveLanguage = null;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
foreach (var file in Directory.GetFiles(folder))
|
|
||||||
{
|
|
||||||
if (Functions.readCodeFromFile(file, "LANGUAGE_NAME", '=') == langname)
|
|
||||||
{
|
|
||||||
Language.ActiveLanguage = Language.CreateLanguageFromFile(file);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Language.ActiveLanguage == null)
|
|
||||||
{
|
|
||||||
File.WriteAllText(langSettings, "Language=English");
|
|
||||||
Console_Utilities.WriteColorText($"Failed to find language &r{langname} &c! Check available languages using command: &glistlang");
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void SetLanguage(string LanguageName)
|
|
||||||
{
|
|
||||||
string langSettings = Functions.dataFolder + "Language.txt";
|
|
||||||
File.WriteAllText(langSettings, "Language=" + LanguageName);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
bool success = LoadLanguage();
|
|
||||||
if (success)
|
|
||||||
{
|
|
||||||
Console_Utilities.WriteColorText($"Language has been setted to: &g{LanguageName}");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console_Utilities.WriteColorText($"Could not find language &r{LanguageName}.");
|
|
||||||
Functions.WriteErrFile(ex.ToString());
|
|
||||||
File.WriteAllText(langSettings, "Language=English");
|
|
||||||
LoadLanguage();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -367,19 +133,48 @@ namespace DiscordBot
|
|||||||
/// <returns>Returns the boot loader for the Discord Bot</returns>
|
/// <returns>Returns the boot loader for the Discord Bot</returns>
|
||||||
private static async Task<Boot> StartNoGUI()
|
private static async Task<Boot> StartNoGUI()
|
||||||
{
|
{
|
||||||
|
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
Console.ForegroundColor = ConsoleColor.DarkYellow;
|
Console.ForegroundColor = ConsoleColor.DarkYellow;
|
||||||
//Console.WriteLine("Discord BOT for Cross Platform\n\nCreated by: Wizzy\nDiscord: Wizzy#9181");
|
|
||||||
|
List<string> startupMessageList = await ServerCom.ReadTextFromURL("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_Utilities.WriteColorText("&rRemember to close the bot using the ShutDown command (&ysd&r) or some settings won't be saved\n");
|
||||||
Console.ForegroundColor = ConsoleColor.White;
|
Console.ForegroundColor = ConsoleColor.White;
|
||||||
Console.WriteLine("============================ Discord BOT - Cross Platform ============================");
|
Console.WriteLine($"============================ LOG ============================");
|
||||||
string token = Functions.readCodeFromFile(Functions.dataFolder + "DiscordBotCore.data", "BOT_TOKEN", '=');
|
|
||||||
string prefix = Functions.readCodeFromFile(Functions.dataFolder + "DiscordBotCore.data", "BOT_PREFIX", '=');
|
try
|
||||||
|
{
|
||||||
|
var token = Config.GetValue<string>("token");
|
||||||
|
#if DEBUG
|
||||||
|
Console.WriteLine("Starting in DEBUG MODE");
|
||||||
|
if (!Directory.Exists("./Data/BetaTest"))
|
||||||
|
Console.WriteLine("Failed to start in debug mode because the folder ./Data/BetaTest does not exist");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
token = File.ReadAllText("./Data/BetaTest/token.txt");
|
||||||
|
|
||||||
|
//Debug mode code...
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
var prefix = Config.GetValue<string>("prefix");
|
||||||
|
|
||||||
var discordbooter = new Boot(token, prefix);
|
var discordbooter = new Boot(token, prefix);
|
||||||
await discordbooter.Awake();
|
await discordbooter.Awake();
|
||||||
return discordbooter;
|
return discordbooter;
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine(ex);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Clear folder
|
/// Clear folder
|
||||||
@@ -387,8 +182,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]);
|
||||||
@@ -404,80 +199,45 @@ 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)
|
||||||
{
|
{
|
||||||
|
var len = args.Length;
|
||||||
|
|
||||||
if (args.Length > 0)
|
if (len == 3 && args[0] == "/download")
|
||||||
if (args[0] == "progress")
|
|
||||||
{
|
{
|
||||||
Console_Utilities.ProgressBar bar = new Console_Utilities.ProgressBar(100, "Download");
|
var url = args[1];
|
||||||
for (int i = 0; i <= 100; i++)
|
var location = args[2];
|
||||||
{
|
|
||||||
bar.Update(i);
|
await ServerCom.DownloadFileAsync(url, location);
|
||||||
await Task.Delay(10);
|
|
||||||
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (len > 0 && (args.Contains("--cmd") || args.Contains("--args") || args.Contains("--nomessage")))
|
||||||
if (args.Length == 0)
|
|
||||||
{
|
|
||||||
if (File.Exists("./ref/startupArguments.txt"))
|
|
||||||
{
|
|
||||||
var lines = await File.ReadAllLinesAsync("./ref/startupArguments.txt");
|
|
||||||
args = lines;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int 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 + "Login.dat");
|
|
||||||
Console.WriteLine("Logged out. Please restart the application !");
|
|
||||||
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 > 0 && (args.Contains("--cmd") || args.Contains("--args")))
|
|
||||||
{
|
{
|
||||||
if (args.Contains("lp") || args.Contains("loadplugins"))
|
if (args.Contains("lp") || args.Contains("loadplugins"))
|
||||||
loadPluginsOnStartup = true;
|
loadPluginsOnStartup = true;
|
||||||
if (args.Contains("listplugs"))
|
if (args.Contains("listplugs"))
|
||||||
listPluginsAtStartup = true;
|
listPluginsAtStartup = true;
|
||||||
if (args.Contains("listlang"))
|
|
||||||
listLanguagAtStartup = true;
|
|
||||||
|
|
||||||
len = 0;
|
len = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
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);
|
|
||||||
|
Thread mainThread = new Thread(() => NoGUI(b));
|
||||||
|
mainThread.Start();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Console.ForegroundColor = ConsoleColor.DarkYellow;
|
Console.ForegroundColor = ConsoleColor.DarkYellow;
|
||||||
Console.WriteLine("Execute command interface noGUI\n\n");
|
Console.WriteLine("Execute command interface noGUI\n\n");
|
||||||
Console.WriteLine(
|
Console.WriteLine(
|
||||||
"\tCommand name\t\t\t\tDescription\n" +
|
"\tCommand name\t\t\t\tDescription\n" +
|
||||||
"-- help | -help\t\t ------ \tDisplay the help message\n" +
|
"-- help | -help\t\t ------ \tDisplay the help message\n" +
|
||||||
"--reset-full\t\t ------ \tReset all files (clear files)\n" +
|
"--reset-full\t\t ------ \tReset all files (clear files)\n" +
|
||||||
"--reset-settings\t ------ \tReset only bot settings\n" +
|
|
||||||
"--reset-logs\t\t ------ \tClear up the output folder\n" +
|
"--reset-logs\t\t ------ \tClear up the output folder\n" +
|
||||||
"--start\t\t ------ \tStart the bot\n" +
|
"--start\t\t ------ \tStart the bot\n" +
|
||||||
"exit\t\t\t ------ \tClose the application"
|
"exit\t\t\t ------ \tClose the application"
|
||||||
@@ -486,33 +246,20 @@ 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])
|
||||||
{
|
{
|
||||||
case "--reset-settings":
|
|
||||||
await ResetSettings();
|
|
||||||
Console.WriteLine("Successfully reseted all settings !");
|
|
||||||
break;
|
|
||||||
case "--help":
|
case "--help":
|
||||||
case "-help":
|
case "-help":
|
||||||
Console.ForegroundColor = ConsoleColor.DarkYellow;
|
Console.ForegroundColor = ConsoleColor.DarkYellow;
|
||||||
Console.WriteLine(
|
Console.WriteLine("\tCommand name\t\t\t\tDescription\n" + "-- help | -help\t\t ------ \tDisplay the help message\n" + "--reset-full\t\t ------ \tReset all files (clear files)\n" + "--reset-settings\t ------ \tReset only bot settings\n" + "--reset-logs\t\t ------ \tClear up the output folder\n" + "--start\t\t ------ \tStart the bot\n" + "exit\t\t\t ------ \tClose the application");
|
||||||
"\tCommand name\t\t\t\tDescription\n" +
|
|
||||||
"-- help | -help\t\t ------ \tDisplay the help message\n" +
|
|
||||||
"--reset-full\t\t ------ \tReset all files (clear files)\n" +
|
|
||||||
"--reset-settings\t ------ \tReset only bot settings\n" +
|
|
||||||
"--reset-logs\t\t ------ \tClear up the output folder\n" +
|
|
||||||
"--start\t\t ------ \tStart the bot\n" +
|
|
||||||
"exit\t\t\t ------ \tClose the application"
|
|
||||||
);
|
|
||||||
break;
|
break;
|
||||||
case "--reset-full":
|
case "--reset-full":
|
||||||
await ClearFolder("./Data/Resources/");
|
await ClearFolder("./Data/Resources/");
|
||||||
await ClearFolder("./Output/Logs/");
|
await ClearFolder("./Output/Logs/");
|
||||||
await ClearFolder("./Output/Errors");
|
await ClearFolder("./Output/Errors");
|
||||||
await ClearFolder("./Data/Languages/");
|
await ClearFolder("./Data/Languages/");
|
||||||
await ClearFolder("./Data/Plugins/Addons");
|
|
||||||
await ClearFolder("./Data/Plugins/Commands");
|
await ClearFolder("./Data/Plugins/Commands");
|
||||||
await ClearFolder("./Data/Plugins/Events");
|
await ClearFolder("./Data/Plugins/Events");
|
||||||
Console.WriteLine("Successfully cleared all folders");
|
Console.WriteLine("Successfully cleared all folders");
|
||||||
@@ -520,21 +267,99 @@ namespace DiscordBot
|
|||||||
case "--reset-logs":
|
case "--reset-logs":
|
||||||
await ClearFolder("./Output/Logs");
|
await ClearFolder("./Output/Logs");
|
||||||
await ClearFolder("./Output/Errors");
|
await ClearFolder("./Output/Errors");
|
||||||
Console.WriteLine("Successfully cleard logs folder");
|
Console.WriteLine("Successfully clear logs folder");
|
||||||
break;
|
break;
|
||||||
case "--exit":
|
case "--exit":
|
||||||
case "exit":
|
case "exit":
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
break;
|
break;
|
||||||
case "--start":
|
|
||||||
Boot booter = await StartNoGUI();
|
|
||||||
await NoGUI(booter);
|
|
||||||
return;
|
|
||||||
default:
|
default:
|
||||||
Console.WriteLine("Failed to execute command " + message[0]);
|
Console.WriteLine("Failed to execute command " + message[0]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static async Task PreLoadComponents()
|
||||||
|
{
|
||||||
|
await Config.LoadConfig();
|
||||||
|
if (Config.ContainsKey("DeleteLogsAtStartup"))
|
||||||
|
if (Config.GetValue<bool>("DeleteLogsAtStartup"))
|
||||||
|
foreach (var file in Directory.GetFiles("./Output/Logs/"))
|
||||||
|
File.Delete(file);
|
||||||
|
List<string> OnlineDefaultKeys = await ServerCom.ReadTextFromURL("https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/SetupKeys");
|
||||||
|
|
||||||
|
Config.PluginConfig.Load();
|
||||||
|
|
||||||
|
if (!Config.ContainsKey("Version"))
|
||||||
|
Config.AddValueToVariables("Version", Assembly.GetExecutingAssembly().GetName().Version.ToString(), false);
|
||||||
|
else
|
||||||
|
Config.SetValue("Version", Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
||||||
|
|
||||||
|
foreach (var key in OnlineDefaultKeys)
|
||||||
|
{
|
||||||
|
if (key.Length <= 3 || !key.Contains(' ')) continue;
|
||||||
|
string[] s = key.Split(' ');
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (Config.ContainsKey(s[0])) Config.SetValue(s[0], s[1]);
|
||||||
|
else Config.GetAndAddValueToVariable(s[0], s[1], s[2].Equals("true", StringComparison.CurrentCultureIgnoreCase));
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Functions.WriteErrFile(ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
List<string> onlineSettingsList = await ServerCom.ReadTextFromURL("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 = 10; //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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Console_Utilities.Initialize();
|
||||||
|
|
||||||
|
Config.SaveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<RootNamespace>New_User</RootNamespace>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
21
DiscordBotConsoleLauncher/Program.cs
Normal file
21
DiscordBotConsoleLauncher/Program.cs
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
using PluginManager.Online.Updates;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
bool requireUpdate = await PluginUpdater.CheckForUpdates("DiscordBotConsoleLauncher");
|
||||||
|
if (requireUpdate)
|
||||||
|
{
|
||||||
|
var update = await PluginUpdater.DownloadUpdateInfo("DiscordBotConsoleLauncher");
|
||||||
|
if (update == Update.Empty)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Console.WriteLine("Found an update: ");
|
||||||
|
Console.WriteLine(update.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine("An exception was thrown. ");
|
||||||
|
Console.WriteLine(ex.Message);
|
||||||
|
Environment.Exit(-2);
|
||||||
|
}
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
public class Core
|
|
||||||
{
|
|
||||||
|
|
||||||
public static Dictionary<ulong, string> playerMessages = new Dictionary<ulong, string>();
|
|
||||||
|
|
||||||
private static readonly string folder = @".\Data\Resources\LevelingSystem\";
|
|
||||||
|
|
||||||
public static int GetLevel(ulong id) => int.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[0].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
public static Int64 GetExp(ulong id) => Int64.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[1].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
public static Int64 GetReqEXP(ulong id) => Int64.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[2].Split('=')[1]);
|
|
||||||
public static void SaveData(ulong id, int lv, Int64 cexp, Int64 rexp)
|
|
||||||
{
|
|
||||||
Directory.CreateDirectory(folder);
|
|
||||||
File.WriteAllText(Path.Combine(folder, id.ToString() + ".data"), $"Level={lv},EXP={cexp},REXP={rexp}");
|
|
||||||
}
|
|
||||||
private static Int64 NextLevelXP(int level)
|
|
||||||
{
|
|
||||||
return (level * level) + 2 * level + 75;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static (bool, int) MessageSent(ulong id, int messageLength)
|
|
||||||
{
|
|
||||||
WaitForTimeToRemoveFromList(id, 60);
|
|
||||||
|
|
||||||
if (!File.Exists(Path.Combine(folder, id.ToString() + ".data")))
|
|
||||||
{
|
|
||||||
SaveData(id, 0, 0, 0);
|
|
||||||
}
|
|
||||||
Int64 cEXp = GetExp(id);
|
|
||||||
Int64 rExp = GetReqEXP(id);
|
|
||||||
int random = new System.Random().Next(3, 6) + messageLength;
|
|
||||||
cEXp += random;
|
|
||||||
if (cEXp >= rExp)
|
|
||||||
{
|
|
||||||
cEXp = cEXp - rExp;
|
|
||||||
int lv = GetLevel(id);
|
|
||||||
rExp = NextLevelXP(lv);
|
|
||||||
lv++;
|
|
||||||
SaveData(id, lv, cEXp, rExp);
|
|
||||||
return (true, lv);
|
|
||||||
}
|
|
||||||
|
|
||||||
SaveData(id, GetLevel(id), cEXp, rExp);
|
|
||||||
return (false, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static async void WaitForTimeToRemoveFromList(ulong id, int time_seconds)
|
|
||||||
{
|
|
||||||
await Task.Delay(time_seconds * 1000);
|
|
||||||
playerMessages.Remove(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
using Discord.WebSocket;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
public static class Data
|
|
||||||
{
|
|
||||||
private static readonly string folder = @".\Data\Resources\LevelingSystem\";
|
|
||||||
public static void registerPlayer(SocketGuildUser user)
|
|
||||||
{
|
|
||||||
ulong id = user.Id;
|
|
||||||
Directory.CreateDirectory(folder);
|
|
||||||
File.WriteAllText(Path.Combine(folder, id.ToString() + ".data"), "Level=0,EXP=0,REXP=100");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int GetLevel(ulong id) => int.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[0].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
public static Int64 GetExp(ulong id) => Int64.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[1].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
public static Int64 GetReqEXP(ulong id) => Int64.Parse(File.ReadAllText(Path.Combine(folder, id.ToString() + ".data")).Split(',')[2].Split('=')[1]);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,14 +1,17 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<BaseOutputPath></BaseOutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
<ItemGroup>
|
||||||
<OutputPath>..\BUILDS\</OutputPath>
|
<Compile Remove="bin\**" />
|
||||||
<DebugType>none</DebugType>
|
<EmbeddedResource Remove="bin\**" />
|
||||||
<DebugSymbols>false</DebugSymbols>
|
<None Remove="bin\**" />
|
||||||
</PropertyGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\PluginManager\PluginManager.csproj" />
|
<ProjectReference Include="..\PluginManager\PluginManager.csproj" />
|
||||||
|
|||||||
59
EVE_LevelingSystem/Level.cs
Normal file
59
EVE_LevelingSystem/Level.cs
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
using Discord;
|
||||||
|
using Discord.WebSocket;
|
||||||
|
|
||||||
|
using EVE_LevelingSystem.LevelingSystemCore;
|
||||||
|
|
||||||
|
using PluginManager;
|
||||||
|
using PluginManager.Interfaces;
|
||||||
|
using PluginManager.Others;
|
||||||
|
|
||||||
|
namespace EVE_LevelingSystem
|
||||||
|
{
|
||||||
|
internal class Level : DBEvent
|
||||||
|
{
|
||||||
|
public string name => "Leveling System Event Handler";
|
||||||
|
public string description => "The Leveling System Event Handler";
|
||||||
|
|
||||||
|
internal static Settings globalSettings = new();
|
||||||
|
|
||||||
|
|
||||||
|
public async void Start(DiscordSocketClient client)
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory("./Data/Resources/LevelingSystem");
|
||||||
|
if (!Config.ContainsKey("LevelingSystemPath"))
|
||||||
|
Config.AddValueToVariables("LevelingSystemPath", "./Data/Resources/LevelingSystem", true);
|
||||||
|
if (!Config.ContainsKey("LevelingSystemSettingsFile"))
|
||||||
|
Config.AddValueToVariables("LevelingSystemSettingsFile", "./Data/Resources/LevelingSystemSettings.txt", true);
|
||||||
|
//PluginManager.Config.AddValueToVariables
|
||||||
|
if (!File.Exists(Config.GetValue<string>("LevelingSystemSettingsFile")))
|
||||||
|
{
|
||||||
|
globalSettings = new Settings { TimeToWaitBetweenMessages = 5 };
|
||||||
|
await Functions.SaveToJsonFile<Settings>(Config.GetValue<string>("LevelingSystemSettingsFile"), globalSettings);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
globalSettings = await Functions.ConvertFromJson<Settings>(Config.GetValue<string>("LevelingSystemSettingsFile"));
|
||||||
|
|
||||||
|
// Console.WriteLine(globalSettings.TimeToWaitBetweenMessages);
|
||||||
|
client.MessageReceived += ClientOnMessageReceived;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task ClientOnMessageReceived(SocketMessage arg)
|
||||||
|
{
|
||||||
|
if (arg.Author.IsBot || arg.IsTTS || arg.Content.StartsWith(Config.GetValue<string>("prefix"))) return;
|
||||||
|
string userID = arg.Author.Id.ToString();
|
||||||
|
User user;
|
||||||
|
if (File.Exists($"{Config.GetValue<string>("LevelingSystemPath")}/{userID}.dat"))
|
||||||
|
{
|
||||||
|
user = await Functions.ConvertFromJson<User>(Config.GetValue<string>("LevelingSystemPath")! + $"/{userID}.dat");
|
||||||
|
// Console.WriteLine(Config.GetValue("LevelingSystemPath"));
|
||||||
|
if (user.AddEXP()) await arg.Channel.SendMessageAsync($"{arg.Author.Mention} is now level {user.CurrentLevel}");
|
||||||
|
await Functions.SaveToJsonFile(Config.GetValue<string>("LevelingSystemPath") + $"/{userID}.dat", user);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
user = new User { CurrentEXP = 0, CurrentLevel = 1, RequiredEXPToLevelUp = LevelCalculator.GetNextLevelRequiredEXP(1), user = new DiscordUser { DiscordTag = arg.Author.DiscriminatorValue, userID = arg.Author.Id, Username = arg.Author.Username } };
|
||||||
|
if (user.AddEXP()) await arg.Channel.SendMessageAsync($"{arg.Author.Mention} is now level {user.CurrentLevel}");
|
||||||
|
await Functions.SaveToJsonFile<User>($"{Config.GetValue<string>("LevelingSystemPath")}/{userID}.dat", user);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
using Discord.WebSocket;
|
|
||||||
|
|
||||||
using PluginManager.Others;
|
|
||||||
using PluginManager.Interfaces;
|
|
||||||
using PluginManager.LanguageSystem;
|
|
||||||
public class LevelingSystem : DBEvent
|
|
||||||
{
|
|
||||||
public string name => "Leveling System";
|
|
||||||
|
|
||||||
public string description => "Leveling System Event";
|
|
||||||
|
|
||||||
public void Start(DiscordSocketClient client)
|
|
||||||
{
|
|
||||||
client.MessageReceived += Client_MessageReceived;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task Client_MessageReceived(SocketMessage arg)
|
|
||||||
{
|
|
||||||
if (arg.Author.IsBot || arg.Attachments.Count > 0 ||
|
|
||||||
arg.Content.StartsWith
|
|
||||||
(
|
|
||||||
Functions.readCodeFromFile
|
|
||||||
(
|
|
||||||
fileName: System.IO.Path.Combine(Functions.dataFolder, "DiscordBotCore.data"),
|
|
||||||
Code: "BOT_PREFIX",
|
|
||||||
separator: '='
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return;
|
|
||||||
//Console_Utilities.WriteColorText("Message from : " + arg.Author.Username);
|
|
||||||
if (Core.playerMessages.ContainsKey(arg.Author.Id))
|
|
||||||
return;
|
|
||||||
|
|
||||||
(bool x, int lv) = Core.MessageSent(arg.Author.Id, arg.Content.Length);
|
|
||||||
Core.playerMessages.Add(arg.Author.Id, arg.Content);
|
|
||||||
if (x)
|
|
||||||
if (Language.ActiveLanguage != null)
|
|
||||||
await arg.Channel.SendMessageAsync(Language.ActiveLanguage.LanguageWords["DB_EVENT_LEVEL_SYSTEM_LEVEL_UP"].Replace("{0}", lv.ToString()));
|
|
||||||
else await arg.Channel.SendMessageAsync("You've successfully leveled up to level " + lv);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
58
EVE_LevelingSystem/LevelingSystemCore/LevelCalculator.cs
Normal file
58
EVE_LevelingSystem/LevelingSystemCore/LevelCalculator.cs
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
using PluginManager;
|
||||||
|
|
||||||
|
namespace EVE_LevelingSystem.LevelingSystemCore
|
||||||
|
{
|
||||||
|
internal static class LevelCalculator
|
||||||
|
{
|
||||||
|
internal static List<string> OnWaitingList = new();
|
||||||
|
|
||||||
|
internal static Int64 GetNextLevelRequiredEXP(int currentLevel)
|
||||||
|
{
|
||||||
|
return currentLevel * 8 + 24;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static void LevelUp(this User user)
|
||||||
|
{
|
||||||
|
user.CurrentEXP = 0;
|
||||||
|
user.RequiredEXPToLevelUp = GetNextLevelRequiredEXP(user.CurrentLevel);
|
||||||
|
user.CurrentLevel++;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static bool AddEXP(this User user)
|
||||||
|
{
|
||||||
|
if (OnWaitingList.Contains(user.user.userID.ToString())) return false;
|
||||||
|
Random r = new Random();
|
||||||
|
int exp = r.Next(Level.globalSettings.MinEXP, Level.globalSettings.MaxEXP + 1);
|
||||||
|
Int64 userXP = user.CurrentEXP;
|
||||||
|
Int64 reqEXP = user.RequiredEXPToLevelUp;
|
||||||
|
if (userXP + exp >= reqEXP)
|
||||||
|
{
|
||||||
|
user.LevelUp();
|
||||||
|
user.CurrentEXP = exp - (reqEXP - userXP);
|
||||||
|
//Console.WriteLine("Level up");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
user.CurrentEXP += exp;
|
||||||
|
|
||||||
|
OnWaitingList.Add(user.user.userID.ToString());
|
||||||
|
|
||||||
|
|
||||||
|
new Thread(() =>
|
||||||
|
{
|
||||||
|
int minutesToWait = Level.globalSettings.TimeToWaitBetweenMessages;
|
||||||
|
Thread.Sleep(60000 * minutesToWait);
|
||||||
|
OnWaitingList.Remove(user.user.userID.ToString());
|
||||||
|
}
|
||||||
|
).Start();
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
20
EVE_LevelingSystem/LevelingSystemCore/User.cs
Normal file
20
EVE_LevelingSystem/LevelingSystemCore/User.cs
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
using Discord;
|
||||||
|
using Discord.WebSocket;
|
||||||
|
|
||||||
|
namespace EVE_LevelingSystem.LevelingSystemCore
|
||||||
|
{
|
||||||
|
public class DiscordUser
|
||||||
|
{
|
||||||
|
public string Username { get; set; }
|
||||||
|
public ushort DiscordTag { get; set; }
|
||||||
|
public ulong userID { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class User
|
||||||
|
{
|
||||||
|
public DiscordUser user { get; set; }
|
||||||
|
public int CurrentLevel { get; set; }
|
||||||
|
public long CurrentEXP { get; set; }
|
||||||
|
public long RequiredEXPToLevelUp { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
15
EVE_LevelingSystem/Settings.cs
Normal file
15
EVE_LevelingSystem/Settings.cs
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace EVE_LevelingSystem
|
||||||
|
{
|
||||||
|
public class Settings
|
||||||
|
{
|
||||||
|
public int TimeToWaitBetweenMessages { get; set; }
|
||||||
|
public int MinEXP { get; set; }
|
||||||
|
public int MaxEXP { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
using Discord.WebSocket;
|
|
||||||
using Discord;
|
|
||||||
using PluginManager.Interfaces;
|
|
||||||
namespace Holiday_events
|
|
||||||
{
|
|
||||||
public class Holiday : DBEvent
|
|
||||||
{
|
|
||||||
public string name => "Holiday Events";
|
|
||||||
|
|
||||||
public string description => "Happy Holiday";
|
|
||||||
|
|
||||||
public async void Start(DiscordSocketClient client)
|
|
||||||
{
|
|
||||||
while(true)
|
|
||||||
{
|
|
||||||
if (DateTime.Today.Hour == 0 && DateTime.Today.Minute == 0)
|
|
||||||
await VerificareData(client);
|
|
||||||
await Task.Delay(1000 * 60-1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task VerificareData(DiscordSocketClient client)
|
|
||||||
{
|
|
||||||
string day = DateTime.Now.Day.ToString();
|
|
||||||
string month = DateTime.Now.Month.ToString();
|
|
||||||
|
|
||||||
if (day == "1" && month == "1")
|
|
||||||
{
|
|
||||||
EmbedBuilder builder = new EmbedBuilder();
|
|
||||||
builder.Title = "Happy New Year!";
|
|
||||||
builder.Description = $"Make way for {DateTime.Now.Year}!\nNew adventures are around the corner.";
|
|
||||||
builder.ImageUrl = "https://i.imgur.com/AWhxExZ.jpg";
|
|
||||||
builder.Color = Color.Gold;
|
|
||||||
await client.GetGuild(client.Guilds.First().Id).DefaultChannel.SendMessageAsync(embed: builder.Build());
|
|
||||||
|
|
||||||
}
|
|
||||||
else if (day == "1" && month == "5")
|
|
||||||
{
|
|
||||||
EmbedBuilder builder = new EmbedBuilder();
|
|
||||||
builder.Title = "Happy May Day!";
|
|
||||||
builder.Description = " You have worked very hard throughout the year to meet all your goals. Now it is a day to relax and rejoice.\nSending you warm wishes on International Worker’s Day.";
|
|
||||||
builder.ImageUrl = "https://i.imgur.com/SIIwelU.jpeg";
|
|
||||||
builder.Color = Color.LightOrange;
|
|
||||||
await client.GetGuild(client.Guilds.First().Id).DefaultChannel.SendMessageAsync(embed: builder.Build());
|
|
||||||
}
|
|
||||||
else if (day == "25" && month == "12")
|
|
||||||
{
|
|
||||||
EmbedBuilder builder = new EmbedBuilder();
|
|
||||||
builder.Title = "Happy May Day!";
|
|
||||||
builder.Description = "Wishing you and your family health, happiness, peace and prosperity this Christmas and in the coming New Year.";
|
|
||||||
builder.ImageUrl = "https://i.imgur.com/qsDOI4t.jpg";
|
|
||||||
builder.Color = Color.Red;
|
|
||||||
await client.GetGuild(client.Guilds.First().Id).DefaultChannel.SendMessageAsync(embed: builder.Build());
|
|
||||||
|
|
||||||
}
|
|
||||||
else if (day =="1" && month == "12")
|
|
||||||
{
|
|
||||||
EmbedBuilder builder = new EmbedBuilder();
|
|
||||||
builder.Title = "Romania National Day";
|
|
||||||
builder.Description = "I wish the people of Romania a happy national day and peace and prosperity in the year ahead.";
|
|
||||||
builder.ImageUrl = "https://i.imgur.com/vHQnFHp.jpg";
|
|
||||||
builder.Color = Color.Blue;
|
|
||||||
await client.GetGuild(client.Guilds.First().Id).DefaultChannel.SendMessageAsync(embed: builder.Build());
|
|
||||||
}
|
|
||||||
|
|
||||||
else if (day == "8" && month == "3")
|
|
||||||
{
|
|
||||||
EmbedBuilder builder = new EmbedBuilder();
|
|
||||||
builder.Title = "National Womens Day";
|
|
||||||
builder.Description = "Today we celebrate every woman on the planet. You bring so much love and beauty into our world just by being in it, and it makes everyone a little bit happier. The Sun shines brighter when you smile, ladies, so keep smiling! Happy Woman’s Day!";
|
|
||||||
builder.ImageUrl = "https://i.imgur.com/dVzQ3rp.jpg";
|
|
||||||
builder.Color = Color.Red;
|
|
||||||
await client.GetGuild(client.Guilds.First().Id).DefaultChannel.SendMessageAsync(embed: builder.Build());
|
|
||||||
}
|
|
||||||
|
|
||||||
else if (day == "31" && month == "10")
|
|
||||||
{
|
|
||||||
EmbedBuilder builder = new EmbedBuilder();
|
|
||||||
builder.Title = "Happy Halloween";
|
|
||||||
builder.Description = "This October, may your treats be many and your tricks be few. Hope you have a sweet Halloween.";
|
|
||||||
builder.ImageUrl = "https://i.imgur.com/cJf6EgI.jpg";
|
|
||||||
builder.Color = Color.Orange;
|
|
||||||
await client.GetGuild(client.Guilds.First().Id).DefaultChannel.SendMessageAsync(embed: builder.Build());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
34
MusicCommands/AudioFile.cs
Normal file
34
MusicCommands/AudioFile.cs
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
using AngleSharp.Dom;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MusicCommands
|
||||||
|
{
|
||||||
|
internal class AudioFile
|
||||||
|
{
|
||||||
|
internal string Name { get; set; }
|
||||||
|
internal string Url { get; set; }
|
||||||
|
|
||||||
|
internal AudioFile(string name, string url)
|
||||||
|
{
|
||||||
|
Name = name;
|
||||||
|
Url = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal async Task DownloadAudioFile()
|
||||||
|
{
|
||||||
|
Process proc = new Process();
|
||||||
|
proc.StartInfo.FileName = "MusicDownloader.exe";
|
||||||
|
proc.StartInfo.Arguments = $"{Url},{Name}";
|
||||||
|
proc.StartInfo.UseShellExecute = false;
|
||||||
|
proc.StartInfo.RedirectStandardOutput = true;
|
||||||
|
|
||||||
|
proc.Start();
|
||||||
|
await proc.WaitForExitAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,15 +1,13 @@
|
|||||||
using Discord;
|
using Discord;
|
||||||
using Discord.Audio;
|
using Discord.Audio;
|
||||||
|
|
||||||
using MusicCommands;
|
namespace MusicCommands;
|
||||||
|
|
||||||
namespace CMD_Utils.Music
|
|
||||||
{
|
|
||||||
internal static class Data
|
internal static class Data
|
||||||
{
|
{
|
||||||
internal static IAudioClient audioClient = null;
|
internal static IAudioClient audioClient = null;
|
||||||
internal static IVoiceChannel voiceChannel = null;
|
internal static IVoiceChannel voiceChannel = null;
|
||||||
|
|
||||||
internal static MusicPlayer CurrentlyRunning = null;
|
internal static MusicPlayer MusicPlayer = null;
|
||||||
}
|
internal static MusicPlaylist Playlist = new();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,16 @@
|
|||||||
using Discord.Commands;
|
using System.Collections.Generic;
|
||||||
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
using PluginManager.Interfaces;
|
||||||
|
|
||||||
using System;
|
namespace MusicCommands;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace CMD_Utils.Music
|
internal class Leave : DBCommand
|
||||||
{
|
|
||||||
class Leave : DBCommand
|
|
||||||
{
|
{
|
||||||
public string Command => "leave";
|
public string Command => "leave";
|
||||||
|
|
||||||
|
public List<string> Aliases => null;
|
||||||
|
|
||||||
public string Description => "Leave the voice channel";
|
public string Description => "Leave the voice channel";
|
||||||
|
|
||||||
public string Usage => "leave";
|
public string Usage => "leave";
|
||||||
@@ -29,11 +25,20 @@ namespace CMD_Utils.Music
|
|||||||
{
|
{
|
||||||
if (Data.audioClient is not null && Data.voiceChannel is not null)
|
if (Data.audioClient is not null && Data.voiceChannel is not null)
|
||||||
{
|
{
|
||||||
Data.CurrentlyRunning.Stop();
|
|
||||||
Data.CurrentlyRunning = null;
|
|
||||||
await Data.audioClient.StopAsync();
|
await Data.audioClient.StopAsync();
|
||||||
await Data.voiceChannel.DisconnectAsync();
|
await Data.voiceChannel.DisconnectAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Data.Playlist is not null)
|
||||||
|
{
|
||||||
|
Data.Playlist.ClearQueue();
|
||||||
|
Data.Playlist = new();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Data.MusicPlayer is not null)
|
||||||
|
{
|
||||||
|
Data.MusicPlayer.Stop();
|
||||||
|
Data.MusicPlayer = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<Nullable>warnings</Nullable>
|
<Nullable>warnings</Nullable>
|
||||||
|
<BaseOutputPath>bin\</BaseOutputPath>
|
||||||
|
<AssemblyName>Music Commands</AssemblyName>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||||
@@ -16,4 +18,8 @@
|
|||||||
<ProjectReference Include="..\PluginManager\PluginManager.csproj" />
|
<ProjectReference Include="..\PluginManager\PluginManager.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="YoutubeExplode" Version="6.2.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,127 +1,53 @@
|
|||||||
using CMD_Utils.Music;
|
using System.IO;
|
||||||
|
|
||||||
using PluginManager.Others;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
using System.Net;
|
|
||||||
using System.Net.Http;
|
|
||||||
using System.Net.Http.Headers;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace MusicCommands
|
namespace MusicCommands;
|
||||||
|
|
||||||
|
internal class MusicPlayer
|
||||||
{
|
{
|
||||||
class MusicPlayer
|
private Stream outputStream { get; }
|
||||||
|
internal AudioFile NowPlaying = null;
|
||||||
|
|
||||||
|
internal bool isPlaying, isPaused;
|
||||||
|
|
||||||
|
public MusicPlayer(Stream outputChannel)
|
||||||
{
|
{
|
||||||
public Stream inputStream { get; private set; } // from FFMPEG
|
outputStream = outputChannel;
|
||||||
public Stream outputStream { get; private set; } // to Voice Channel
|
|
||||||
public MusicPlayer(Stream input, Stream output)
|
|
||||||
{
|
|
||||||
inputStream = input;
|
|
||||||
outputStream = output;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public MusicPlayer(Stream output)
|
public async Task Play(Stream source, int byteSize, AudioFile songPlaying)
|
||||||
{
|
{
|
||||||
inputStream = null;
|
isPlaying = true;
|
||||||
outputStream = output;
|
NowPlaying = songPlaying;
|
||||||
}
|
while (isPlaying)
|
||||||
|
{
|
||||||
|
if (isPaused)
|
||||||
|
continue;
|
||||||
|
|
||||||
public bool Paused { get; set; }
|
var bits = new byte[byteSize];
|
||||||
private bool _stop { get; set; }
|
var read = await source.ReadAsync(bits, 0, byteSize);
|
||||||
public void Stop()
|
if (read == 0)
|
||||||
{
|
|
||||||
_stop = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task StartSendAudioFromLink(string URL)
|
|
||||||
{
|
|
||||||
|
|
||||||
/* using (HttpClient client = new HttpClient())
|
|
||||||
using (HttpResponseMessage response = await client.GetAsync(URL))
|
|
||||||
using (var content = response.Content)
|
|
||||||
{
|
|
||||||
await (await content.ReadAsStreamAsync()).CopyToAsync(outputStream);
|
|
||||||
}*/
|
|
||||||
|
|
||||||
|
|
||||||
Stream ms = new MemoryStream();
|
|
||||||
int bsize = 512;
|
|
||||||
new Thread(async delegate (object o)
|
|
||||||
{
|
|
||||||
var response = await new HttpClient().GetAsync(URL);
|
|
||||||
using (var stream = await response.Content.ReadAsStreamAsync())
|
|
||||||
{
|
|
||||||
byte[] buffer = new byte[bsize];
|
|
||||||
int read;
|
|
||||||
while ((read = stream.Read(buffer, 0, buffer.Length)) > 0)
|
|
||||||
{
|
|
||||||
var pos = ms.Position;
|
|
||||||
ms.Position = ms.Length;
|
|
||||||
ms.Write(buffer, 0, read);
|
|
||||||
ms.Position = pos;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).Start();
|
|
||||||
Console.Write("Reading data: ");
|
|
||||||
while (ms.Length < bsize * 10)
|
|
||||||
{
|
|
||||||
await Task.Delay(1000);
|
|
||||||
Console.Title = "Reading data: " + ms.Length + " bytes read of " + bsize * 10;
|
|
||||||
Console.Write(".");
|
|
||||||
}
|
|
||||||
Console.WriteLine("\nDone");
|
|
||||||
ms.Position = 0;
|
|
||||||
|
|
||||||
_stop = false;
|
|
||||||
Paused = false;
|
|
||||||
|
|
||||||
while (!_stop)
|
|
||||||
{
|
|
||||||
if (Paused) continue;
|
|
||||||
byte[] buffer = new byte[bsize];
|
|
||||||
int read = await ms.ReadAsync(buffer, 0, buffer.Length);
|
|
||||||
if (read > 0)
|
|
||||||
{
|
|
||||||
await outputStream.WriteAsync(buffer, 0, read);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task StartSendAudio()
|
|
||||||
{
|
|
||||||
Paused = false;
|
|
||||||
_stop = false;
|
|
||||||
while (!_stop)
|
|
||||||
{
|
|
||||||
if (Paused) continue;
|
|
||||||
int bsize = 512;
|
|
||||||
byte[] buffer = new byte[bsize];
|
|
||||||
var bcount = await inputStream.ReadAsync(buffer, 0, bsize);
|
|
||||||
if (bcount <= 0)
|
|
||||||
{
|
|
||||||
Stop();
|
|
||||||
Data.CurrentlyRunning = null;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await outputStream.WriteAsync(buffer, 0, bcount);
|
await outputStream.WriteAsync(bits, 0, read);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch
|
||||||
{
|
{
|
||||||
await outputStream.FlushAsync();
|
break;
|
||||||
Functions.WriteLogFile(ex.ToString());
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
await source.FlushAsync();
|
||||||
|
await source.DisposeAsync();
|
||||||
|
source.Close();
|
||||||
|
await outputStream.FlushAsync();
|
||||||
|
isPlaying = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Stop()
|
||||||
|
{
|
||||||
|
isPlaying = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
25
MusicCommands/MusicPlaylist.cs
Normal file
25
MusicCommands/MusicPlaylist.cs
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MusicCommands
|
||||||
|
{
|
||||||
|
internal class MusicPlaylist
|
||||||
|
{
|
||||||
|
internal MusicPlaylist()
|
||||||
|
{
|
||||||
|
Console.WriteLine("Initialized playlist.");
|
||||||
|
}
|
||||||
|
|
||||||
|
public Queue<AudioFile> QueueList = new();
|
||||||
|
|
||||||
|
public void Enqueue(AudioFile query) => QueueList.Enqueue(query);
|
||||||
|
public void ClearQueue() => QueueList.Clear();
|
||||||
|
|
||||||
|
public int Count => QueueList.Count;
|
||||||
|
public AudioFile GetNextSong => QueueList.Dequeue();
|
||||||
|
public AudioFile WhatIsNext => QueueList.Peek();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,15 +1,17 @@
|
|||||||
using Discord.Commands;
|
using System.Collections.Generic;
|
||||||
|
using Discord.Commands;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
using PluginManager.Interfaces;
|
||||||
|
|
||||||
namespace CMD_Utils.Music
|
namespace MusicCommands;
|
||||||
{
|
|
||||||
class Pause : DBCommand
|
internal class Pause : DBCommand
|
||||||
{
|
{
|
||||||
public string Command => "pause";
|
public string Command => "pause";
|
||||||
|
|
||||||
public string Description => "Pause the music";
|
public List<string> Aliases => null;
|
||||||
|
|
||||||
|
public string Description => "Pause/Unpause the music that is currently running";
|
||||||
|
|
||||||
public string Usage => "pause";
|
public string Usage => "pause";
|
||||||
|
|
||||||
@@ -21,7 +23,6 @@ namespace CMD_Utils.Music
|
|||||||
|
|
||||||
public void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
public void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
{
|
{
|
||||||
Data.CurrentlyRunning.Paused = true;
|
Data.MusicPlayer.isPaused = !Data.MusicPlayer.isPaused;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,26 +1,25 @@
|
|||||||
using Discord;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO;
|
||||||
|
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;
|
||||||
|
|
||||||
using System;
|
namespace MusicCommands;
|
||||||
using System.Diagnostics;
|
|
||||||
using System.IO;
|
|
||||||
|
|
||||||
namespace CMD_Utils.Music
|
internal class Play : DBCommand
|
||||||
{
|
{
|
||||||
class Play : DBCommand
|
public string Command => "play";
|
||||||
{
|
|
||||||
public string Command => "fplay";
|
public List<string> Aliases => new() { "p" };
|
||||||
|
|
||||||
public string Description => "Play music from a file";
|
public string Description => "Play music from a file";
|
||||||
|
|
||||||
public string Usage => "fplay [name]";
|
public string Usage => "play [name/url]";
|
||||||
|
|
||||||
public bool canUseDM => false;
|
public bool canUseDM => false;
|
||||||
|
|
||||||
@@ -30,41 +29,91 @@ namespace CMD_Utils.Music
|
|||||||
|
|
||||||
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
{
|
{
|
||||||
string path = "./Music";
|
Directory.CreateDirectory("Music");
|
||||||
string FileName = Functions.GetArguments(message).ToArray().MergeStrings(0);
|
var path = "./Music/";
|
||||||
path += "/" + FileName + ".mp3";
|
string[] splitted = message.Content.Split(' ');
|
||||||
if (!File.Exists(path))
|
if (splitted.Length < 2)
|
||||||
|
return;
|
||||||
|
do
|
||||||
{
|
{
|
||||||
Console.WriteLine("Unknown path " + path);
|
if (splitted.Length == 2 && splitted[1].Contains("youtube.com") || splitted[1].Contains("youtu.be"))
|
||||||
|
{
|
||||||
|
var url = splitted[1];
|
||||||
|
path += $"{Functions.CreateMD5(url)}";
|
||||||
|
if (File.Exists(path))
|
||||||
|
{
|
||||||
|
Data.Playlist.Enqueue(new AudioFile(path, null));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var file = new AudioFile(path, url);
|
||||||
|
await file.DownloadAudioFile();
|
||||||
|
Data.Playlist.Enqueue(file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var searchString = splitted.MergeStrings(1);
|
||||||
|
path += $"{Functions.CreateMD5(searchString)}";
|
||||||
|
if (File.Exists(path))
|
||||||
|
{
|
||||||
|
Data.Playlist.Enqueue(new AudioFile(path, null));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await context.Channel.SendMessageAsync("Searching for " + searchString);
|
||||||
|
var file = new AudioFile(path, searchString);
|
||||||
|
await file.DownloadAudioFile();
|
||||||
|
Data.Playlist.Enqueue(file);
|
||||||
|
if (Data.MusicPlayer is null)
|
||||||
|
await context.Channel.SendMessageAsync("Playing: " + searchString);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Data.MusicPlayer is not null)
|
||||||
|
{
|
||||||
|
await context.Channel.SendMessageAsync("Queued your request: " + splitted.MergeStrings(1));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
while (false); // run only one time !
|
||||||
|
|
||||||
|
|
||||||
Data.voiceChannel = (context.User as IGuildUser)?.VoiceChannel;
|
Data.voiceChannel = (context.User as IGuildUser)?.VoiceChannel;
|
||||||
if (Data.voiceChannel == null) { await context.Channel.SendMessageAsync("User must be in a voice channel, or a voice channel must be passed as an argument."); return; }
|
|
||||||
|
|
||||||
Data.audioClient = await Data.voiceChannel.ConnectAsync();
|
if (Data.voiceChannel == null)
|
||||||
|
|
||||||
using (var ffmpeg = CreateStream(path))
|
|
||||||
using (var output = ffmpeg.StandardOutput.BaseStream)
|
|
||||||
using (var discord = Data.audioClient.CreatePCMStream(AudioApplication.Mixed))
|
|
||||||
{
|
{
|
||||||
if (Data.CurrentlyRunning != null)
|
await context.Channel.SendMessageAsync("User must be in a voice channel, or a voice channel must be passed as an argument.");
|
||||||
Data.CurrentlyRunning.Stop();
|
return;
|
||||||
Data.CurrentlyRunning = new MusicPlayer(output, discord);
|
}
|
||||||
await Data.CurrentlyRunning.StartSendAudio();
|
|
||||||
|
if (Data.audioClient is null)
|
||||||
|
{
|
||||||
|
Data.audioClient = await Data.voiceChannel.ConnectAsync(true);
|
||||||
|
Data.MusicPlayer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
using (var discordChanneAudioOutStream = Data.audioClient.CreatePCMStream(AudioApplication.Mixed))
|
||||||
|
{
|
||||||
|
Data.MusicPlayer ??= new MusicPlayer(discordChanneAudioOutStream);
|
||||||
|
while (Data.Playlist.Count > 0)
|
||||||
|
{
|
||||||
|
var nowPlaying = Data.Playlist.GetNextSong;
|
||||||
|
using (var ffmpeg = CreateStream(nowPlaying.Name))
|
||||||
|
using (var ffmpegOutputBaseStream = ffmpeg.StandardOutput.BaseStream)
|
||||||
|
{
|
||||||
|
await Data.MusicPlayer.Play(ffmpegOutputBaseStream, 1024, nowPlaying);
|
||||||
|
Console.WriteLine("Finished playing from " + nowPlaying.Url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Process CreateStream(string path)
|
Data.MusicPlayer = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Process CreateStream(string path)
|
||||||
{
|
{
|
||||||
return Process.Start(new ProcessStartInfo
|
return Process.Start(new ProcessStartInfo { FileName = "ffmpeg", Arguments = $"-hide_banner -loglevel panic -i \"{path}\" -ac 2 -f s16le -ar 48000 pipe:1", UseShellExecute = false, RedirectStandardOutput = true });
|
||||||
{
|
|
||||||
FileName = "ffmpeg",
|
|
||||||
Arguments = $"-hide_banner -loglevel panic -i \"{path}\" -ac 2 -f s16le -ar 48000 pipe:1",
|
|
||||||
UseShellExecute = false,
|
|
||||||
RedirectStandardOutput = true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
42
MusicCommands/Skip.cs
Normal file
42
MusicCommands/Skip.cs
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Discord.Commands;
|
||||||
|
using Discord.WebSocket;
|
||||||
|
using PluginManager.Interfaces;
|
||||||
|
|
||||||
|
namespace MusicCommands
|
||||||
|
{
|
||||||
|
public class Skip : DBCommand
|
||||||
|
{
|
||||||
|
public string Command => "skip";
|
||||||
|
|
||||||
|
public List<string> Aliases => null;
|
||||||
|
|
||||||
|
public string Description => "skip the music that is currently running";
|
||||||
|
|
||||||
|
public string Usage => "skip";
|
||||||
|
|
||||||
|
public bool canUseDM => false;
|
||||||
|
|
||||||
|
public bool canUseServer => true;
|
||||||
|
|
||||||
|
public bool requireAdmin => false;
|
||||||
|
|
||||||
|
public void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
|
{
|
||||||
|
var loadedSong = Data.MusicPlayer.NowPlaying;
|
||||||
|
|
||||||
|
if (loadedSong is null || Data.MusicPlayer.isPlaying == false)
|
||||||
|
{
|
||||||
|
message.Channel.SendMessageAsync("There is no music playing");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Data.MusicPlayer.isPlaying = false;
|
||||||
|
message.Channel.SendMessageAsync($"You have skipped {loadedSong.Name}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
using CMD_Utils.Music;
|
|
||||||
|
|
||||||
using Discord.Commands;
|
|
||||||
using Discord.WebSocket;
|
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace MusicCommands
|
|
||||||
{
|
|
||||||
class Unpause : DBCommand
|
|
||||||
{
|
|
||||||
public string Command => "unpause";
|
|
||||||
|
|
||||||
public string Description => "Unpause the music";
|
|
||||||
|
|
||||||
public string Usage => "unpause";
|
|
||||||
|
|
||||||
public bool canUseDM => false;
|
|
||||||
|
|
||||||
public bool canUseServer => true;
|
|
||||||
|
|
||||||
public bool requireAdmin => false;
|
|
||||||
|
|
||||||
public void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
|
||||||
{
|
|
||||||
Data.CurrentlyRunning.Paused = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
using CMD_Utils.Music;
|
|
||||||
using Discord.Audio;
|
|
||||||
using Discord.Commands;
|
|
||||||
using Discord.WebSocket;
|
|
||||||
using Discord;
|
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
|
||||||
|
|
||||||
namespace MusicCommands
|
|
||||||
{
|
|
||||||
class lplay : DBCommand
|
|
||||||
{
|
|
||||||
public string Command => "lplay";
|
|
||||||
|
|
||||||
public string Description => "Play music from a link";
|
|
||||||
|
|
||||||
public string Usage => "lplay [url]";
|
|
||||||
|
|
||||||
public bool canUseDM => false;
|
|
||||||
|
|
||||||
public bool canUseServer => false;
|
|
||||||
|
|
||||||
public bool requireAdmin => false;
|
|
||||||
|
|
||||||
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
|
||||||
{
|
|
||||||
string URL = message.Content.Split(' ')[1];
|
|
||||||
if (!URL.EndsWith(".mp3") && !URL.EndsWith(".wav") && !URL.EndsWith(".flac") && !URL.EndsWith(".ogg"))
|
|
||||||
{
|
|
||||||
await message.Channel.SendMessageAsync("Invalid URL");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Data.voiceChannel = (context.User as IGuildUser)?.VoiceChannel;
|
|
||||||
if (Data.voiceChannel == null) { await context.Channel.SendMessageAsync("User must be in a voice channel, or a voice channel must be passed as an argument."); return; }
|
|
||||||
|
|
||||||
Data.audioClient = await Data.voiceChannel.ConnectAsync();
|
|
||||||
|
|
||||||
using (var discord = Data.audioClient.CreatePCMStream(AudioApplication.Mixed))
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
await message.Channel.SendMessageAsync("Loading...");
|
|
||||||
|
|
||||||
Data.CurrentlyRunning = new MusicPlayer(discord);
|
|
||||||
await Data.CurrentlyRunning.StartSendAudioFromLink(URL);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
32
MusicCommands/queue.cs
Normal file
32
MusicCommands/queue.cs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Discord.Commands;
|
||||||
|
using Discord.WebSocket;
|
||||||
|
using PluginManager.Interfaces;
|
||||||
|
|
||||||
|
namespace MusicCommands
|
||||||
|
{
|
||||||
|
public class queue : DBCommand
|
||||||
|
{
|
||||||
|
public string Command => "queue";
|
||||||
|
public List<string> Aliases => new() { "q" };
|
||||||
|
|
||||||
|
public string Description => "check queue";
|
||||||
|
|
||||||
|
public string Usage => "queue";
|
||||||
|
|
||||||
|
public bool canUseDM => false;
|
||||||
|
|
||||||
|
public bool canUseServer => true;
|
||||||
|
|
||||||
|
public bool requireAdmin => false;
|
||||||
|
|
||||||
|
public async void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM)
|
||||||
|
{
|
||||||
|
await context.Channel.SendMessageAsync($"You have {Data.Playlist.Count} items in queue");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
using Discord;
|
|
||||||
using Discord.WebSocket;
|
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
|
||||||
namespace New_User
|
|
||||||
{
|
|
||||||
public class Greeting : DBEvent
|
|
||||||
{
|
|
||||||
public string name =>"Greeting";
|
|
||||||
|
|
||||||
public string description => "Greets new users";
|
|
||||||
|
|
||||||
public void Start(DiscordSocketClient client)
|
|
||||||
{
|
|
||||||
client.UserJoined += async (arg) =>
|
|
||||||
{
|
|
||||||
IGuild? guild = client.Guilds.FirstOrDefault();
|
|
||||||
ITextChannel chn = await guild.GetDefaultChannelAsync();
|
|
||||||
await chn.SendMessageAsync($"A wild {arg.Username} has apperead!");
|
|
||||||
IRole? role = guild.Roles.FirstOrDefault(x => x.Name == "New User");
|
|
||||||
if (role == null)
|
|
||||||
await arg.Guild.CreateRoleAsync("New User", GuildPermissions.None, Color.DarkBlue);
|
|
||||||
await arg.AddRoleAsync(role);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
209
PluginManager/Config.cs
Normal file
209
PluginManager/Config.cs
Normal file
@@ -0,0 +1,209 @@
|
|||||||
|
using System;
|
||||||
|
using PluginManager.Others;
|
||||||
|
using System.IO;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using System.Threading;
|
||||||
|
|
||||||
|
namespace PluginManager
|
||||||
|
{
|
||||||
|
internal class AppConfig
|
||||||
|
{
|
||||||
|
public Dictionary<string, object>? ApplicationVariables { get; init; }
|
||||||
|
public List<string>? ProtectedKeyWords { get; init; }
|
||||||
|
|
||||||
|
public Dictionary<string, string> PluginVersions { get; init; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Config
|
||||||
|
{
|
||||||
|
public static class PluginConfig
|
||||||
|
{
|
||||||
|
public static readonly 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 string GetPluginVersion(string pluginName) => appConfig.PluginVersions[pluginName];
|
||||||
|
public static void SetPluginVersion(string pluginName, string newVersion)
|
||||||
|
{
|
||||||
|
if (appConfig.PluginVersions.ContainsKey(pluginName))
|
||||||
|
appConfig.PluginVersions[pluginName] = newVersion;
|
||||||
|
else appConfig.PluginVersions.Add(pluginName, newVersion);
|
||||||
|
|
||||||
|
// SaveConfig();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void RemovePluginVersion(string pluginName) => appConfig.PluginVersions.Remove(pluginName);
|
||||||
|
public static bool PluginVersionsContainsKey(string pluginName) => appConfig.PluginVersions.ContainsKey(pluginName);
|
||||||
|
|
||||||
|
public static void AddValueToVariables<T>(string key, T value, bool isProtected)
|
||||||
|
{
|
||||||
|
if (value == null)
|
||||||
|
throw new Exception("The value cannot be null");
|
||||||
|
if (appConfig!.ApplicationVariables!.ContainsKey(key))
|
||||||
|
throw new Exception($"The key ({key}) already exists in the variables. Value {GetValue<T>(key)}");
|
||||||
|
|
||||||
|
appConfig.ApplicationVariables.Add(key, value);
|
||||||
|
if (isProtected && key != "Version")
|
||||||
|
appConfig.ProtectedKeyWords!.Add(key);
|
||||||
|
|
||||||
|
SaveConfig();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Type GetVariableType(string value)
|
||||||
|
{
|
||||||
|
if (int.TryParse(value, out var intValue))
|
||||||
|
return typeof(int);
|
||||||
|
if (bool.TryParse(value, out var boolValue))
|
||||||
|
return typeof(bool);
|
||||||
|
if (float.TryParse(value, out var floatValue))
|
||||||
|
return typeof(float);
|
||||||
|
if (double.TryParse(value, out var doubleValue))
|
||||||
|
return typeof(double);
|
||||||
|
if (uint.TryParse(value, out var uintValue))
|
||||||
|
return typeof(uint);
|
||||||
|
if (long.TryParse(value, out var longValue))
|
||||||
|
return typeof(long);
|
||||||
|
if (byte.TryParse(value, out var byteValue))
|
||||||
|
return typeof(byte);
|
||||||
|
return typeof(string);
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
if (!appConfig!.ApplicationVariables!.ContainsKey(key)) return default;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
JsonElement element = (JsonElement)appConfig.ApplicationVariables[key];
|
||||||
|
return element.Deserialize<T>();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return (T)appConfig.ApplicationVariables[key];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SetValue<T>(string key, T value)
|
||||||
|
{
|
||||||
|
if (value == null)
|
||||||
|
throw new Exception("Value is null");
|
||||||
|
if (!appConfig!.ApplicationVariables!.ContainsKey(key))
|
||||||
|
throw new Exception("Key does not exist in the config file");
|
||||||
|
if (appConfig.ProtectedKeyWords!.Contains(key))
|
||||||
|
throw new Exception("Key is protected");
|
||||||
|
|
||||||
|
appConfig.ApplicationVariables[key] = JsonSerializer.SerializeToElement(value);
|
||||||
|
SaveConfig();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void RemoveKey(string key)
|
||||||
|
{
|
||||||
|
if (key == "Version" || key == "token" || key == "prefix")
|
||||||
|
throw new Exception("Key is protected");
|
||||||
|
appConfig!.ApplicationVariables!.Remove(key);
|
||||||
|
appConfig.ProtectedKeyWords!.Remove(key);
|
||||||
|
SaveConfig();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async void SaveConfig()
|
||||||
|
{
|
||||||
|
string path = Functions.dataFolder + "config.json";
|
||||||
|
await Functions.SaveToJsonFile<AppConfig>(path, appConfig!);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task LoadConfig()
|
||||||
|
{
|
||||||
|
string path = Functions.dataFolder + "config.json";
|
||||||
|
if (File.Exists(path))
|
||||||
|
{
|
||||||
|
appConfig = await Functions.ConvertFromJson<AppConfig>(path);
|
||||||
|
Functions.WriteLogFile($"Loaded {appConfig.ApplicationVariables!.Keys.Count} application variables.\nLoaded {appConfig.ProtectedKeyWords!.Count} readonly variables.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
appConfig = new() { ApplicationVariables = new Dictionary<string, object>(), ProtectedKeyWords = new List<string>(), PluginVersions = new Dictionary<string, string>() };
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool ContainsValue<T>(T value) => appConfig!.ApplicationVariables!.ContainsValue(value!);
|
||||||
|
public static bool ContainsKey(string key) => appConfig!.ApplicationVariables!.ContainsKey(key);
|
||||||
|
|
||||||
|
public static ReadOnlyDictionary<string, object> GetAllVariables() => new(appConfig!.ApplicationVariables!);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,9 @@
|
|||||||
namespace PluginManager.Interfaces
|
using System.Collections.Generic;
|
||||||
{
|
using Discord.Commands;
|
||||||
|
using Discord.WebSocket;
|
||||||
|
|
||||||
|
namespace PluginManager.Interfaces;
|
||||||
|
|
||||||
public interface DBCommand
|
public interface DBCommand
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -8,6 +12,11 @@
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
string Command { get; }
|
string Command { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Command aliases. Users may use this to execute the command
|
||||||
|
/// </summary>
|
||||||
|
List<string>? Aliases { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Command description
|
/// Command description
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -41,9 +50,5 @@
|
|||||||
/// <param name="message">The message that the user types</param>
|
/// <param name="message">The message that the user types</param>
|
||||||
/// <param name="client">The discord client of the bot</param>
|
/// <param name="client">The discord client of the bot</param>
|
||||||
/// <param name="isDM">true if the message was sent from DM, otherwise false. It is always false if canUseDM is false</param>
|
/// <param name="isDM">true if the message was sent from DM, otherwise false. It is always false if canUseDM is false</param>
|
||||||
void Execute(Discord.Commands.SocketCommandContext context,
|
void Execute(SocketCommandContext context, SocketMessage message, DiscordSocketClient client, bool isDM);
|
||||||
Discord.WebSocket.SocketMessage message,
|
|
||||||
Discord.WebSocket.DiscordSocketClient client,
|
|
||||||
bool isDM);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
|
|
||||||
namespace PluginManager.Interfaces
|
namespace PluginManager.Interfaces;
|
||||||
{
|
|
||||||
public interface DBEvent
|
public interface DBEvent
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -20,4 +20,3 @@ namespace PluginManager.Interfaces
|
|||||||
/// <param name="client">The discord bot client</param>
|
/// <param name="client">The discord bot client</param>
|
||||||
void Start(DiscordSocketClient client);
|
void Start(DiscordSocketClient client);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,69 +1,51 @@
|
|||||||
using Discord.WebSocket;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using PluginManager.Loaders;
|
using System.Threading.Tasks;
|
||||||
|
using Discord.WebSocket;
|
||||||
using PluginManager.Others;
|
using PluginManager.Others;
|
||||||
|
|
||||||
using System;
|
namespace PluginManager.Items;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace PluginManager.Items
|
public class Command
|
||||||
{
|
|
||||||
internal class Command
|
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The author of the command
|
/// The author of the command
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public SocketUser? Author;
|
public SocketUser? Author;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The list of arguments
|
|
||||||
/// </summary>
|
|
||||||
public List<string> Arguments { get; private set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The command that is executed
|
|
||||||
/// </summary>
|
|
||||||
public string CommandName { get; private set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The prefix that is used for the command
|
|
||||||
/// </summary>
|
|
||||||
public char PrefixUsed { get; private set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The Command class contructor
|
/// The Command class contructor
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="message">The message that was sent</param>
|
/// <param name="message">The message that was sent</param>
|
||||||
public Command(SocketMessage message)
|
public Command(SocketMessage message)
|
||||||
{
|
{
|
||||||
this.Author = message.Author;
|
Author = message.Author;
|
||||||
string[] data = message.Content.Split(' ');
|
var data = message.Content.Split(' ');
|
||||||
if (data.Length > 1)
|
Arguments = data.Length > 1 ? new List<string>(data.MergeStrings(1).Split(' ')) : new List<string>();
|
||||||
this.Arguments = new List<string>(data.MergeStrings(1).Split(' '));
|
CommandName = data[0].Substring(1);
|
||||||
else this.Arguments = new List<string>();
|
PrefixUsed = data[0][0];
|
||||||
this.CommandName = data[0].Substring(1);
|
|
||||||
this.PrefixUsed = data[0][0];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The Command class contructor
|
/// The list of arguments
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="message">The message string itself</param>
|
public List<string> Arguments { get; }
|
||||||
/// <param name="hasPrefix">True if the message has a prefix, false if not</param>
|
|
||||||
public Command(string message, bool hasPrefix)
|
/// <summary>
|
||||||
|
/// The command that is executed
|
||||||
|
/// </summary>
|
||||||
|
public string CommandName { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The prefix that is used for the command
|
||||||
|
/// </summary>
|
||||||
|
public char PrefixUsed { get; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ConsoleCommand
|
||||||
{
|
{
|
||||||
string[] data = message.Split(' ');
|
public string CommandName { get; init; }
|
||||||
|
public string Description { get; init; }
|
||||||
this.Author = null;
|
public string Usage { get; init; }
|
||||||
this.Arguments = new List<string>(data.MergeStrings(1).Split(' '));
|
public Action<string[]> Action { get; init; }
|
||||||
this.CommandName = data[0].Substring(1);
|
|
||||||
if (hasPrefix)
|
|
||||||
this.PrefixUsed = data[0][0];
|
|
||||||
else this.PrefixUsed = '\0'; //null
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
366
PluginManager/Items/ConsoleCommandsHandler.cs
Normal file
366
PluginManager/Items/ConsoleCommandsHandler.cs
Normal file
@@ -0,0 +1,366 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
using Discord.WebSocket;
|
||||||
|
|
||||||
|
using PluginManager.Interfaces;
|
||||||
|
using PluginManager.Loaders;
|
||||||
|
using PluginManager.Online;
|
||||||
|
using PluginManager.Online.Helpers;
|
||||||
|
using PluginManager.Online.Updates;
|
||||||
|
using PluginManager.Others;
|
||||||
|
|
||||||
|
namespace PluginManager.Items;
|
||||||
|
|
||||||
|
public class ConsoleCommandsHandler
|
||||||
|
{
|
||||||
|
private static readonly PluginsManager manager = new("https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/Plugins.txt");
|
||||||
|
private static readonly List<ConsoleCommand> commandList = new();
|
||||||
|
private readonly DiscordSocketClient? client;
|
||||||
|
|
||||||
|
|
||||||
|
private static bool isDownloading = false;
|
||||||
|
private static bool pluginsLoaded = false;
|
||||||
|
|
||||||
|
public ConsoleCommandsHandler(DiscordSocketClient client)
|
||||||
|
{
|
||||||
|
this.client = client;
|
||||||
|
InitializeBasicCommands();
|
||||||
|
//Console.WriteLine("Initialized console command handler !");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeBasicCommands()
|
||||||
|
{
|
||||||
|
|
||||||
|
commandList.Clear();
|
||||||
|
|
||||||
|
AddCommand("help", "Show help", "help <command>", args =>
|
||||||
|
{
|
||||||
|
if (args.Length <= 1)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Available commands:");
|
||||||
|
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, TableFormat.DEFAULT);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
foreach (var command in commandList)
|
||||||
|
if (command.CommandName == args[1])
|
||||||
|
{
|
||||||
|
Console.WriteLine("Command description: " + command.Description);
|
||||||
|
Console.WriteLine("Command execution format:" + command.Usage);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.WriteLine("Command not found");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
AddCommand("lp", "Load plugins", () =>
|
||||||
|
{
|
||||||
|
if (pluginsLoaded)
|
||||||
|
return;
|
||||||
|
var loader = new PluginLoader(client!);
|
||||||
|
loader.onCMDLoad += (name, typeName, success, exception) =>
|
||||||
|
{
|
||||||
|
Console.ForegroundColor = ConsoleColor.Green;
|
||||||
|
if (name == null || name.Length < 2)
|
||||||
|
name = typeName;
|
||||||
|
if (success)
|
||||||
|
Console.WriteLine("[CMD] Successfully loaded command : " + name);
|
||||||
|
else
|
||||||
|
Console.WriteLine("[CMD] Failed to load command : " + name + " because " + exception!.Message);
|
||||||
|
Console.ForegroundColor = ConsoleColor.Red;
|
||||||
|
};
|
||||||
|
loader.onEVELoad += (name, typeName, success, exception) =>
|
||||||
|
{
|
||||||
|
if (name == null || name.Length < 2)
|
||||||
|
name = typeName;
|
||||||
|
Console.ForegroundColor = ConsoleColor.Green;
|
||||||
|
if (success)
|
||||||
|
Console.WriteLine("[EVENT] Successfully loaded event : " + name);
|
||||||
|
else
|
||||||
|
Console.WriteLine("[EVENT] Failed to load event : " + name + " because " + exception!.Message);
|
||||||
|
Console.ForegroundColor = ConsoleColor.Red;
|
||||||
|
};
|
||||||
|
loader.LoadPlugins();
|
||||||
|
pluginsLoaded = true;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
AddCommand("listplugs", "list available plugins", () => { manager.ListAvailablePlugins().Wait(); });
|
||||||
|
|
||||||
|
AddCommand("dwplug", "download plugin", "dwplug [name]", async args =>
|
||||||
|
{
|
||||||
|
isDownloading = true;
|
||||||
|
if (args.Length == 1)
|
||||||
|
{
|
||||||
|
isDownloading = false;
|
||||||
|
Console.WriteLine("Please specify plugin name");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var name = args.MergeStrings(1);
|
||||||
|
// info[0] = plugin type
|
||||||
|
// info[1] = plugin link
|
||||||
|
// info[2] = if others are required, or string.Empty if none
|
||||||
|
var info = await manager.GetPluginLinkByName(name);
|
||||||
|
if (info[1] == null) // link is null
|
||||||
|
{
|
||||||
|
if (name == "")
|
||||||
|
{
|
||||||
|
isDownloading = false;
|
||||||
|
Console_Utilities.WriteColorText("Name is invalid");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
isDownloading = false;
|
||||||
|
Console_Utilities.WriteColorText($"Failed to find plugin &b{name} &c!" + " Use &glistplugs &ccommand to display all available plugins !");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
string path;
|
||||||
|
if (info[0] == "Command" || info[0] == "Event")
|
||||||
|
path = "./Data/Plugins/" + info[0] + "s/" + name + "." + (info[0] == "Command" ? PluginLoader.pluginCMDExtension : PluginLoader.pluginEVEExtension);
|
||||||
|
else
|
||||||
|
path = $"./{info[1].Split('/')[info[1].Split('/').Length - 1]}";
|
||||||
|
//Console.WriteLine("Downloading: " + path + " [" + info[1] + "]");
|
||||||
|
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");
|
||||||
|
|
||||||
|
// check requirements if any
|
||||||
|
|
||||||
|
if (info.Length == 3 && info[2] != string.Empty && info[2] != null)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Downloading requirements for plugin : {name}");
|
||||||
|
|
||||||
|
var lines = await ServerCom.ReadTextFromURL(info[2]);
|
||||||
|
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
if (!(line.Length > 0 && line.Contains(",")))
|
||||||
|
continue;
|
||||||
|
var split = line.Split(',');
|
||||||
|
Console.WriteLine($"\nDownloading item: {split[1]}");
|
||||||
|
await ServerCom.DownloadFileAsync(split[0], "./" + split[1]);
|
||||||
|
Console.WriteLine();
|
||||||
|
|
||||||
|
if (split[0].EndsWith(".zip") || split[0].EndsWith(".pak") || split[0].EndsWith(".pkg"))
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Extracting {split[1]}");
|
||||||
|
var proc = 0f;
|
||||||
|
var isExtracting = true;
|
||||||
|
var bar = new Console_Utilities.ProgressBar { Max = 100f, Color = ConsoleColor.Green };
|
||||||
|
|
||||||
|
IProgress<float> extractProgress = new Progress<float>(value => { proc = value; });
|
||||||
|
new Thread(new Task(() =>
|
||||||
|
{
|
||||||
|
while (isExtracting)
|
||||||
|
{
|
||||||
|
bar.Update(proc);
|
||||||
|
if (proc >= 99.9f)
|
||||||
|
isExtracting = false;
|
||||||
|
Thread.Sleep(500);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
).Start
|
||||||
|
).Start();
|
||||||
|
await Functions.ExtractArchive("./" + split[1], "./", extractProgress, UnzipProgressType.PercentageFromTotalSize);
|
||||||
|
bar.Update(100f);
|
||||||
|
isExtracting = false;
|
||||||
|
await Task.Delay(1000);
|
||||||
|
bar.Update(100);
|
||||||
|
Console.WriteLine("\n");
|
||||||
|
File.Delete("./" + split[1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.WriteLine();
|
||||||
|
}
|
||||||
|
VersionString? ver = await VersionString.GetVersionOfPackageFromWeb(name);
|
||||||
|
if (ver is null) throw new Exception("Incorrect version");
|
||||||
|
Config.SetPluginVersion(name, $"{ver.PackageID}.{ver.PackageMainVersion}.{ver.PackageCheckVersion}");
|
||||||
|
// Console.WriteLine();
|
||||||
|
|
||||||
|
isDownloading = false;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
AddCommand("value", "read value from VariableStack", "value [key]", args =>
|
||||||
|
{
|
||||||
|
if (args.Length != 2)
|
||||||
|
return;
|
||||||
|
if (!Config.ContainsKey(args[1]))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var data = Config.GetValue<string>(args[1]);
|
||||||
|
Console.WriteLine($"{args[1]} => {data}");
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
AddCommand("add", "add variable to the system variables", "add [key] [value] [isReadOnly=true/false]", args =>
|
||||||
|
{
|
||||||
|
if (args.Length < 4)
|
||||||
|
return;
|
||||||
|
var key = args[1];
|
||||||
|
var value = args[2];
|
||||||
|
var isReadOnly = args[3].Equals("true", StringComparison.CurrentCultureIgnoreCase);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Config.GetAndAddValueToVariable(key, value, isReadOnly);
|
||||||
|
Console.WriteLine($"Updated config file with the following command: {args[1]} => {value}");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine(ex.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
AddCommand("remv", "remove variable from system variables", "remv [key]", args =>
|
||||||
|
{
|
||||||
|
if (args.Length < 2)
|
||||||
|
return;
|
||||||
|
Config.RemoveKey(args[1]);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
AddCommand("sd", "Shuts down the discord bot", () =>
|
||||||
|
{
|
||||||
|
if (client is null)
|
||||||
|
return;
|
||||||
|
client.StopAsync();
|
||||||
|
client.DisposeAsync();
|
||||||
|
Config.SaveConfig();
|
||||||
|
Console.WriteLine("Bot is closing in 2 seconds ! Please wait to save data !");
|
||||||
|
Thread.Sleep(2000);
|
||||||
|
Environment.Exit(0);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
AddCommand("extern", "Load an external command", "extern [pluginName]", async (args) =>
|
||||||
|
{
|
||||||
|
if (args.Length <= 1) return;
|
||||||
|
string pName = Functions.MergeStrings(args, 1);
|
||||||
|
HttpClient client = new HttpClient();
|
||||||
|
string url = (await manager.GetPluginLinkByName(pName))[1];
|
||||||
|
Stream s = await client.GetStreamAsync(url);
|
||||||
|
MemoryStream str = new MemoryStream();
|
||||||
|
await s.CopyToAsync(str);
|
||||||
|
var asmb = Assembly.Load(str.ToArray());
|
||||||
|
|
||||||
|
var types = asmb.GetTypes();
|
||||||
|
foreach (var type in types)
|
||||||
|
{
|
||||||
|
if (type.IsClass && typeof(DBEvent).IsAssignableFrom(type))
|
||||||
|
{
|
||||||
|
DBEvent instance = (DBEvent)Activator.CreateInstance(type);
|
||||||
|
instance.Start(this.client);
|
||||||
|
Console.WriteLine($"Loaded external {type.FullName}!");
|
||||||
|
}
|
||||||
|
else if (type.IsClass && typeof(DBCommand).IsAssignableFrom(type))
|
||||||
|
{
|
||||||
|
Console.WriteLine("Only events can be loaded from external sources !");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
//Sort the commands by name
|
||||||
|
commandList.Sort((x, y) => x.CommandName.CompareTo(y.CommandName));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void AddCommand(string command, string description, string usage, Action<string[]> action)
|
||||||
|
{
|
||||||
|
commandList.Add(new ConsoleCommand { CommandName = command, Description = description, Action = action, Usage = usage });
|
||||||
|
Console.ForegroundColor = ConsoleColor.White;
|
||||||
|
Console_Utilities.WriteColorText($"Command &r{command} &cadded to the list of commands");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void AddCommand(string command, string description, Action action)
|
||||||
|
{
|
||||||
|
AddCommand(command, description, command, args => action());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void RemoveCommand(string command)
|
||||||
|
{
|
||||||
|
commandList.RemoveAll(x => x.CommandName == command);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool CommandExists(string command)
|
||||||
|
{
|
||||||
|
return GetCommand(command) is not null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ConsoleCommand? GetCommand(string command)
|
||||||
|
{
|
||||||
|
return commandList.FirstOrDefault(t => t.CommandName == command);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static async Task ExecuteCommad(string command)
|
||||||
|
{
|
||||||
|
var args = command.Split(' ');
|
||||||
|
foreach (var item in commandList.ToList())
|
||||||
|
if (item.CommandName == args[0])
|
||||||
|
{
|
||||||
|
item.Action.Invoke(args);
|
||||||
|
Console.WriteLine();
|
||||||
|
|
||||||
|
while (isDownloading) await Task.Delay(1000);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool HandleCommand(string command, bool removeCommandExecution = true)
|
||||||
|
{
|
||||||
|
Console.ForegroundColor = ConsoleColor.White;
|
||||||
|
var args = command.Split(' ');
|
||||||
|
foreach (var item in commandList.ToList())
|
||||||
|
if (item.CommandName == args[0])
|
||||||
|
{
|
||||||
|
if (removeCommandExecution)
|
||||||
|
{
|
||||||
|
Console.SetCursorPosition(0, Console.CursorTop - 1);
|
||||||
|
for (int i = 0; i < command.Length + 30; 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)}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
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;
|
|
||||||
int 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(500);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The method that is called to stop the spinner from spinning
|
|
||||||
/// </summary>
|
|
||||||
public void Stop()
|
|
||||||
{
|
|
||||||
if (!isSpinning)
|
|
||||||
throw new Others.Exceptions.APIException("The spinner was not running", "Stop()");
|
|
||||||
isSpinning = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
using PluginManager.Others;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
|
|
||||||
namespace PluginManager.LanguageSystem
|
|
||||||
{
|
|
||||||
public class Language
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// The active language
|
|
||||||
/// </summary>
|
|
||||||
public static Language? ActiveLanguage = null;
|
|
||||||
|
|
||||||
private static readonly string LanguageFileExtension = ".lng";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The name of the language
|
|
||||||
/// </summary>
|
|
||||||
public string LanguageName { get; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The file where the language is imported from
|
|
||||||
/// </summary>
|
|
||||||
public string fileName { get; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The dictionary of the language
|
|
||||||
/// </summary>
|
|
||||||
public Dictionary<string, string> LanguageWords { get; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The Language constructor
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="fileName">The file to import the language from</param>
|
|
||||||
/// <param name="words">The dictionary of the language</param>
|
|
||||||
/// <param name="LanguageName">The name of the language</param>
|
|
||||||
private Language(string fileName, Dictionary<string, string> words, string LanguageName)
|
|
||||||
{
|
|
||||||
this.fileName = fileName;
|
|
||||||
this.LanguageName = LanguageName;
|
|
||||||
LanguageWords = words;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Load language from file
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="LanguageFileLocation">The file path</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static Language? CreateLanguageFromFile(string LanguageFileLocation)
|
|
||||||
{
|
|
||||||
if (!LanguageFileLocation.EndsWith(LanguageFileExtension))
|
|
||||||
{
|
|
||||||
Console.WriteLine("Failed to load language from file: " + LanguageFileLocation +
|
|
||||||
"\nFile extension is not .lng");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
string[] lines = File.ReadAllLines(LanguageFileLocation);
|
|
||||||
var languageName = "Unknown";
|
|
||||||
var words = new Dictionary<string, string>();
|
|
||||||
|
|
||||||
foreach (string line in lines)
|
|
||||||
{
|
|
||||||
if (line.StartsWith("#") || line.Length < 4)
|
|
||||||
continue;
|
|
||||||
string[] sLine = line.Split('=');
|
|
||||||
|
|
||||||
if (sLine[0] == "LANGUAGE_NAME")
|
|
||||||
{
|
|
||||||
languageName = sLine[1];
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
words.Add(sLine[0], sLine[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
Functions.WriteLogFile("Successfully loaded language: " + languageName + " from file : " +
|
|
||||||
LanguageFileLocation.Replace('\\', '/'));
|
|
||||||
return new Language(LanguageFileLocation, words, languageName);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Format text by inserting parameters
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="text">The raw text</param>
|
|
||||||
/// <param name="args">The arguments</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public string FormatText(string text, params string[] args)
|
|
||||||
{
|
|
||||||
if (ActiveLanguage == null) return text;
|
|
||||||
int l = args.Length;
|
|
||||||
for (var i = 0; i < l; i++) text = text.Replace($"{i}", args[i]);
|
|
||||||
return text;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
|
||||||
|
|
||||||
namespace PluginManager.Loaders
|
|
||||||
{
|
|
||||||
internal class CommandsLoader
|
|
||||||
{
|
|
||||||
private readonly string CMDPath;
|
|
||||||
private readonly string CMDExtension;
|
|
||||||
|
|
||||||
|
|
||||||
internal delegate void onCommandLoaded(string name, bool success, DBCommand? command = null, Exception? exception = null);
|
|
||||||
internal delegate void onCommandFileLoaded(string path);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Event fired when a command is loaded
|
|
||||||
/// </summary>
|
|
||||||
internal onCommandLoaded? OnCommandLoaded;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Event fired when the file is loaded
|
|
||||||
/// </summary>
|
|
||||||
internal onCommandFileLoaded? OnCommandFileLoaded;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Command Loader contructor
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="CommandPath">The path to the commands</param>
|
|
||||||
/// <param name="CommandExtension">The extension to search for in the <paramref name="CommandPath"/></param>
|
|
||||||
internal CommandsLoader(string CommandPath, string CommandExtension)
|
|
||||||
{
|
|
||||||
CMDPath = CommandPath;
|
|
||||||
CMDExtension = CommandExtension;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The method that loads all commands
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
internal List<DBCommand>? LoadCommands()
|
|
||||||
{
|
|
||||||
if (!Directory.Exists(CMDPath))
|
|
||||||
{
|
|
||||||
Directory.CreateDirectory(CMDPath);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
string[] files = Directory.GetFiles(CMDPath, $"*{CMDExtension}", SearchOption.AllDirectories);
|
|
||||||
|
|
||||||
foreach (var file in files)
|
|
||||||
{
|
|
||||||
Assembly.LoadFile(Path.GetFullPath(file));
|
|
||||||
if (OnCommandFileLoaded != null)
|
|
||||||
OnCommandFileLoaded.Invoke(file);
|
|
||||||
}
|
|
||||||
|
|
||||||
List<DBCommand> plugins = new List<DBCommand>();
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Type interfaceType = typeof(DBCommand);
|
|
||||||
Type[] types = AppDomain.CurrentDomain.GetAssemblies()
|
|
||||||
.SelectMany(a => a.GetTypes())
|
|
||||||
.Where(p => interfaceType.IsAssignableFrom(p) && p.IsClass)
|
|
||||||
.ToArray();
|
|
||||||
foreach (Type type in types)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
DBCommand plugin = (DBCommand)Activator.CreateInstance(type)!;
|
|
||||||
plugins.Add(plugin);
|
|
||||||
|
|
||||||
if (OnCommandLoaded != null)
|
|
||||||
OnCommandLoaded.Invoke(type.FullName!, true, plugin);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
if (OnCommandLoaded != null)
|
|
||||||
OnCommandLoaded.Invoke(type.FullName!, false, null, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine(ex.Message);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return plugins;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
|
||||||
|
|
||||||
namespace PluginManager.Loaders
|
|
||||||
{
|
|
||||||
internal class EventsLoader
|
|
||||||
{
|
|
||||||
|
|
||||||
private readonly string EVPath;
|
|
||||||
private readonly string EVExtension;
|
|
||||||
|
|
||||||
internal delegate void onEventLoad(string name, bool success, DBEvent? ev = null, Exception? e = null);
|
|
||||||
internal delegate void onEventFileLoaded(string path);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// An event that is fired whenever a <see cref="DBEvent"/> event is loaded in memory
|
|
||||||
/// </summary>
|
|
||||||
internal onEventLoad? EventLoad;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// An event that is fired whenever a <see cref="DBEvent"/> event file is loaded
|
|
||||||
/// </summary>
|
|
||||||
internal onEventFileLoaded? EventFileLoaded;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The Event Loader constructor
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="path">The path to all events</param>
|
|
||||||
/// <param name="ext">The extension for events</param>
|
|
||||||
internal EventsLoader(string path, string ext)
|
|
||||||
{
|
|
||||||
EVPath = path;
|
|
||||||
EVExtension = ext;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The method that loads all events
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
internal List<DBEvent>? LoadEvents()
|
|
||||||
{
|
|
||||||
|
|
||||||
if (!Directory.Exists(EVPath))
|
|
||||||
{
|
|
||||||
Directory.CreateDirectory(EVPath);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
string[] files = Directory.GetFiles(EVPath, $"*{EVExtension}", SearchOption.AllDirectories);
|
|
||||||
|
|
||||||
foreach (var file in files)
|
|
||||||
{
|
|
||||||
Assembly.LoadFile(Path.GetFullPath(file));
|
|
||||||
if (EventFileLoaded != null)
|
|
||||||
EventFileLoaded.Invoke(file);
|
|
||||||
}
|
|
||||||
|
|
||||||
List<DBEvent> events = new List<DBEvent>();
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Type interfaceType = typeof(DBEvent);
|
|
||||||
Type[] types = AppDomain.CurrentDomain.GetAssemblies()
|
|
||||||
.SelectMany(a => a.GetTypes())
|
|
||||||
.Where(p => interfaceType.IsAssignableFrom(p) && p.IsClass)
|
|
||||||
.ToArray();
|
|
||||||
foreach (Type type in types)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
DBEvent ev = (DBEvent)Activator.CreateInstance(type)!;
|
|
||||||
events.Add(ev);
|
|
||||||
|
|
||||||
if (EventLoad != null)
|
|
||||||
EventLoad.Invoke(type.FullName!, true, ev, null);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
if (EventLoad != null)
|
|
||||||
EventLoad.Invoke(type.FullName!, false, null, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine(ex.Message);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return events;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
112
PluginManager/Loaders/Loader.cs
Normal file
112
PluginManager/Loaders/Loader.cs
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
using PluginManager.Online.Updates;
|
||||||
|
using PluginManager.Others;
|
||||||
|
|
||||||
|
namespace PluginManager.Loaders;
|
||||||
|
|
||||||
|
internal class LoaderArgs : EventArgs
|
||||||
|
{
|
||||||
|
internal string? PluginName { get; init; }
|
||||||
|
internal string? TypeName { get; init; }
|
||||||
|
internal bool IsLoaded { get; init; }
|
||||||
|
internal Exception? Exception { get; init; }
|
||||||
|
internal object? Plugin { get; init; }
|
||||||
|
}
|
||||||
|
|
||||||
|
internal class Loader<T>
|
||||||
|
{
|
||||||
|
internal Loader(string path, string extension)
|
||||||
|
{
|
||||||
|
this.path = path;
|
||||||
|
this.extension = extension;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private string path { get; }
|
||||||
|
private string extension { get; }
|
||||||
|
|
||||||
|
|
||||||
|
internal delegate void FileLoadedEventHandler(LoaderArgs args);
|
||||||
|
|
||||||
|
internal delegate void PluginLoadedEventHandler(LoaderArgs args);
|
||||||
|
|
||||||
|
internal event FileLoadedEventHandler? FileLoaded;
|
||||||
|
|
||||||
|
internal event PluginLoadedEventHandler? PluginLoaded;
|
||||||
|
|
||||||
|
internal List<T>? Load()
|
||||||
|
{
|
||||||
|
var list = new List<T>();
|
||||||
|
if (!Directory.Exists(path))
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(path);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var files = Directory.GetFiles(path, $"*.{extension}", SearchOption.AllDirectories);
|
||||||
|
foreach (var file in files)
|
||||||
|
{
|
||||||
|
|
||||||
|
Assembly.LoadFrom(file);
|
||||||
|
if (FileLoaded != null)
|
||||||
|
{
|
||||||
|
var args = new LoaderArgs
|
||||||
|
{
|
||||||
|
Exception = null,
|
||||||
|
TypeName = nameof(T),
|
||||||
|
IsLoaded = false,
|
||||||
|
PluginName = new FileInfo(file).Name.Split('.')[0],
|
||||||
|
Plugin = null
|
||||||
|
};
|
||||||
|
FileLoaded.Invoke(args);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var interfaceType = typeof(T);
|
||||||
|
var types = AppDomain.CurrentDomain.GetAssemblies()
|
||||||
|
.SelectMany(a => a.GetTypes())
|
||||||
|
.Where(p => interfaceType.IsAssignableFrom(p) && p.IsClass)
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
|
||||||
|
list.Clear();
|
||||||
|
foreach (var type in types)
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var plugin = (T)Activator.CreateInstance(type)!;
|
||||||
|
list.Add(plugin);
|
||||||
|
|
||||||
|
|
||||||
|
if (PluginLoaded != null)
|
||||||
|
PluginLoaded.Invoke(new LoaderArgs
|
||||||
|
{
|
||||||
|
Exception = null,
|
||||||
|
IsLoaded = true,
|
||||||
|
PluginName = type.FullName,
|
||||||
|
TypeName = nameof(T),
|
||||||
|
Plugin = plugin
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
if (PluginLoaded != null) PluginLoaded.Invoke(new LoaderArgs { Exception = ex, IsLoaded = false, PluginName = type.FullName, TypeName = nameof(T) });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Functions.WriteErrFile(ex.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,44 +1,31 @@
|
|||||||
using Discord.WebSocket;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
using Discord.WebSocket;
|
||||||
|
|
||||||
using PluginManager.Interfaces;
|
using PluginManager.Interfaces;
|
||||||
|
using PluginManager.Online.Helpers;
|
||||||
|
using PluginManager.Online.Updates;
|
||||||
using PluginManager.Others;
|
using PluginManager.Others;
|
||||||
|
|
||||||
using System;
|
namespace PluginManager.Loaders;
|
||||||
using System.Collections.Generic;
|
|
||||||
namespace PluginManager.Loaders
|
|
||||||
{
|
|
||||||
public class PluginLoader
|
public class PluginLoader
|
||||||
{
|
{
|
||||||
private DiscordSocketClient client;
|
public delegate void CMDLoaded(string name, string typeName, bool success, Exception? e = null);
|
||||||
|
|
||||||
/// <summary>
|
public delegate void EVELoaded(string name, string typeName, bool success, Exception? e = null);
|
||||||
/// The Plugin Loader constructor
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="discordSocketClient">The discord bot client where the plugins will pe attached to</param>
|
|
||||||
public PluginLoader(DiscordSocketClient discordSocketClient)
|
|
||||||
{
|
|
||||||
this.client = discordSocketClient;
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
||||||
/// <summary>
|
|
||||||
/// A list of <see cref="DBCommand"/> commands
|
|
||||||
/// </summary>
|
|
||||||
public static List<DBCommand>? Plugins { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// A list of <see cref="DBEvent"/> commands
|
|
||||||
/// </summary>
|
|
||||||
public static List<DBEvent>? Events { get; set; }
|
|
||||||
|
|
||||||
|
|
||||||
public delegate void CMDLoaded(string name, string typeName, bool success, Exception? e = null);
|
|
||||||
public delegate void EVELoaded(string name, string typeName, bool success, Exception? e = null);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Event that is fired when a <see cref="DBCommand" /> is successfully loaded into commands list
|
/// Event that is fired when a <see cref="DBCommand" /> is successfully loaded into commands list
|
||||||
@@ -50,62 +37,124 @@ namespace PluginManager.Loaders
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public EVELoaded? onEVELoad;
|
public EVELoaded? onEVELoad;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The Plugin Loader constructor
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="discordSocketClient">The discord bot client where the plugins will pe attached to</param>
|
||||||
|
public PluginLoader(DiscordSocketClient discordSocketClient)
|
||||||
|
{
|
||||||
|
_client = discordSocketClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A list of <see cref="DBCommand" /> commands
|
||||||
|
/// </summary>
|
||||||
|
public static List<DBCommand>? Commands { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A list of <see cref="DBEvent" /> commands
|
||||||
|
/// </summary>
|
||||||
|
public static List<DBEvent>? Events { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The main mathod that is called to load all events
|
/// The main mathod that is called to load all events
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void LoadPlugins()
|
public async void LoadPlugins()
|
||||||
{
|
{
|
||||||
|
//Check for updates in commands
|
||||||
|
foreach (var file in Directory.GetFiles("./Data/Plugins/Commands", $"*.{pluginCMDExtension}", SearchOption.AllDirectories))
|
||||||
|
{
|
||||||
|
await Task.Run(async () =>
|
||||||
|
{
|
||||||
|
string name = new FileInfo(file).Name.Split('.')[0];
|
||||||
|
if (!Config.PluginVersionsContainsKey(name))
|
||||||
|
Config.SetPluginVersion(name, (await VersionString.GetVersionOfPackageFromWeb(name))?.PackageID + ".0.0");
|
||||||
|
|
||||||
Plugins = new List<DBCommand>();
|
if (await PluginUpdater.CheckForUpdates(name))
|
||||||
|
await PluginUpdater.Download(name);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//Check for updates in events
|
||||||
|
foreach (var file in Directory.GetFiles("./Data/Plugins/Events", $"*.{pluginEVEExtension}", SearchOption.AllDirectories))
|
||||||
|
{
|
||||||
|
await Task.Run(async () =>
|
||||||
|
{
|
||||||
|
string name = new FileInfo(file).Name.Split('.')[0];
|
||||||
|
if (!Config.PluginVersionsContainsKey(name))
|
||||||
|
Config.SetPluginVersion(name, (await VersionString.GetVersionOfPackageFromWeb(name))?.PackageID + ".0.0");
|
||||||
|
|
||||||
|
if (await PluginUpdater.CheckForUpdates(name))
|
||||||
|
await PluginUpdater.Download(name);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//Save the new config file (after the updates)
|
||||||
|
Config.SaveConfig();
|
||||||
|
|
||||||
|
|
||||||
|
//Load all plugins
|
||||||
|
|
||||||
|
Commands = new List<DBCommand>();
|
||||||
Events = new List<DBEvent>();
|
Events = new List<DBEvent>();
|
||||||
|
|
||||||
Functions.WriteLogFile("Starting plugin loader ... Client: " + client.CurrentUser.Username);
|
Functions.WriteLogFile("Starting plugin loader ... Client: " + _client.CurrentUser.Username);
|
||||||
if (LanguageSystem.Language.ActiveLanguage != null)
|
Console.WriteLine("Loading plugins");
|
||||||
Console_Utilities.WriteColorText(
|
|
||||||
LanguageSystem.Language.ActiveLanguage.FormatText(
|
|
||||||
LanguageSystem.Language.ActiveLanguage.LanguageWords["PLUGIN_LOADING_START"]
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
//Load commands
|
var commandsLoader = new Loader<DBCommand>(pluginCMDFolder, pluginCMDExtension);
|
||||||
CommandsLoader CMDLoader = new CommandsLoader(pluginCMDFolder, pluginCMDExtension);
|
var eventsLoader = new Loader<DBEvent>(pluginEVEFolder, pluginEVEExtension);
|
||||||
CMDLoader.OnCommandLoaded += OnCommandLoaded!;
|
|
||||||
CMDLoader.OnCommandFileLoaded += OnCommandFileLoaded;
|
|
||||||
Plugins = CMDLoader.LoadCommands();
|
|
||||||
|
|
||||||
|
commandsLoader.FileLoaded += OnCommandFileLoaded;
|
||||||
|
commandsLoader.PluginLoaded += OnCommandLoaded;
|
||||||
|
|
||||||
//Load Events
|
eventsLoader.FileLoaded += EventFileLoaded;
|
||||||
EventsLoader EVLoader = new EventsLoader(pluginEVEFolder, pluginEVEExtension);
|
eventsLoader.PluginLoaded += OnEventLoaded;
|
||||||
EVLoader.EventLoad += OnEventLoaded!;
|
|
||||||
EVLoader.EventFileLoaded += EventFileLoaded;
|
Commands = commandsLoader.Load();
|
||||||
Events = EVLoader.LoadEvents();
|
Events = eventsLoader.Load();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void EventFileLoaded(string path)
|
private void EventFileLoaded(LoaderArgs e)
|
||||||
{
|
{
|
||||||
if (path != null)
|
if (!e.IsLoaded)
|
||||||
Functions.WriteLogFile($"[EVENT] Event from file [{path}] has been successfully created !");
|
{
|
||||||
|
Functions.WriteLogFile($"[EVENT] Event from file [{e.PluginName}] has been successfully created !");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnCommandFileLoaded(string path)
|
private void OnCommandFileLoaded(LoaderArgs e)
|
||||||
{
|
{
|
||||||
if (path != null)
|
if (!e.IsLoaded)
|
||||||
Functions.WriteLogFile($"[CMD] Command from file [{path}] has been successfully loaded !");
|
{
|
||||||
|
Functions.WriteLogFile($"[CMD] Command from file [{e.PluginName}] has been successfully loaded !");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnEventLoaded(string typename, bool success, DBEvent eve, Exception exception)
|
private void OnEventLoaded(LoaderArgs e)
|
||||||
{
|
{
|
||||||
if (eve != null && success)
|
try
|
||||||
eve.Start(client);
|
{
|
||||||
if (onEVELoad != null)
|
if (e.IsLoaded)
|
||||||
onEVELoad.Invoke(eve!.name, typename, success, exception);
|
((DBEvent)e.Plugin!).Start(_client);
|
||||||
|
|
||||||
|
onEVELoad?.Invoke(((DBEvent)e.Plugin!).name, e.TypeName!, e.IsLoaded, e.Exception);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine(ex.ToString());
|
||||||
|
Console.WriteLine("Plugin: " + e.PluginName);
|
||||||
|
Console.WriteLine("Type: " + e.TypeName);
|
||||||
|
Console.WriteLine("IsLoaded: " + e.IsLoaded);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnCommandLoaded(string name, bool success, DBCommand command, Exception exception)
|
private void OnCommandLoaded(LoaderArgs e)
|
||||||
{
|
{
|
||||||
if (onCMDLoad != null)
|
onCMDLoad?.Invoke(((DBCommand)e.Plugin!).Command, e.TypeName!, e.IsLoaded, e.Exception);
|
||||||
onCMDLoad.Invoke(command.Command, name, success, exception);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,21 +18,19 @@ namespace PluginManager.Online.Helpers
|
|||||||
/// <param name="progress">The <see cref="IProgress{T}"/> that is used to track the download progress</param>
|
/// <param name="progress">The <see cref="IProgress{T}"/> that is used to track the download progress</param>
|
||||||
/// <param name="cancellation">The cancellation token</param>
|
/// <param name="cancellation">The cancellation token</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
internal static async Task DownloadFileAsync(this HttpClient client, string url, Stream destination,
|
internal static async Task DownloadFileAsync(this HttpClient client, string url, Stream destination, IProgress<float>? progress = null, IProgress<long>? downloadedBytes = null, int bufferSize = 81920, CancellationToken cancellation = default)
|
||||||
IProgress<float> progress = null, IProgress<long> downloadedBytes = null, CancellationToken cancellation = default)
|
|
||||||
{
|
{
|
||||||
using (var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead))
|
using (var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellation))
|
||||||
{
|
{
|
||||||
var contentLength = response.Content.Headers.ContentLength;
|
var contentLength = response.Content.Headers.ContentLength;
|
||||||
|
|
||||||
using (var download = await response.Content.ReadAsStreamAsync())
|
using (var download = await response.Content.ReadAsStreamAsync(cancellation))
|
||||||
{
|
{
|
||||||
|
|
||||||
// Ignore progress reporting when no progress reporter was
|
// Ignore progress reporting when no progress reporter was
|
||||||
// passed or when the content length is unknown
|
// passed or when the content length is unknown
|
||||||
if (progress == null || !contentLength.HasValue)
|
if (progress == null || !contentLength.HasValue)
|
||||||
{
|
{
|
||||||
await download.CopyToAsync(destination);
|
await download.CopyToAsync(destination, cancellation);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,10 +38,12 @@ namespace PluginManager.Online.Helpers
|
|||||||
var relativeProgress = new Progress<long>(totalBytes =>
|
var relativeProgress = new Progress<long>(totalBytes =>
|
||||||
{
|
{
|
||||||
progress.Report((float)totalBytes / contentLength.Value * 100);
|
progress.Report((float)totalBytes / contentLength.Value * 100);
|
||||||
downloadedBytes.Report(totalBytes);
|
downloadedBytes?.Report(totalBytes);
|
||||||
});
|
}
|
||||||
|
);
|
||||||
|
|
||||||
// Use extension method to report progress while downloading
|
// Use extension method to report progress while downloading
|
||||||
await download.CopyToOtherStreamAsync(destination, 81920, relativeProgress, cancellation);
|
await download.CopyToOtherStreamAsync(destination, bufferSize, relativeProgress, cancellation);
|
||||||
progress.Report(1);
|
progress.Report(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -57,10 +57,11 @@ namespace PluginManager.Online.Helpers
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
internal static async Task<string> DownloadStringAsync(string url, CancellationToken cancellation = default)
|
internal static async Task<string> DownloadStringAsync(string url, CancellationToken cancellation = default)
|
||||||
{
|
{
|
||||||
using (var client = new HttpClient())
|
using var client = new HttpClient();
|
||||||
{
|
return await client.GetStringAsync(url, cancellation);
|
||||||
return await client.GetStringAsync(url);
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
82
PluginManager/Online/Helpers/VersionString.cs
Normal file
82
PluginManager/Online/Helpers/VersionString.cs
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
using PluginManager.Others;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
namespace PluginManager.Online.Helpers
|
||||||
|
{
|
||||||
|
public class VersionString
|
||||||
|
{
|
||||||
|
public int PackageID;
|
||||||
|
public int PackageMainVersion;
|
||||||
|
public int PackageCheckVersion;
|
||||||
|
|
||||||
|
public VersionString(string version)
|
||||||
|
{
|
||||||
|
string[] data = version.Split('.');
|
||||||
|
try
|
||||||
|
{
|
||||||
|
PackageID = int.Parse(data[0]);
|
||||||
|
PackageMainVersion = int.Parse(data[1]);
|
||||||
|
PackageCheckVersion = int.Parse(data[2]);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception("Failed to write Version", ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool operator >(VersionString s1, VersionString s2)
|
||||||
|
{
|
||||||
|
if (s1.PackageID != s2.PackageID) throw new Exception("Can not compare two different paks");
|
||||||
|
if (s1.PackageMainVersion > s2.PackageMainVersion) return true;
|
||||||
|
if (s1.PackageMainVersion == s2.PackageMainVersion && s1.PackageCheckVersion > s2.PackageCheckVersion) return true;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool operator <(VersionString s1, VersionString s2) => !(s1 > s2) && s1 != s2;
|
||||||
|
|
||||||
|
public static bool operator ==(VersionString s1, VersionString s2)
|
||||||
|
{
|
||||||
|
if (s1.PackageID == s2.PackageID && s1.PackageMainVersion == s2.PackageMainVersion && s1.PackageCheckVersion == s2.PackageCheckVersion) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool operator !=(VersionString s1, VersionString s2) => !(s1 == s2);
|
||||||
|
|
||||||
|
public static bool operator <=(VersionString s1, VersionString s2) => (s1 < s2 || s1 == s2);
|
||||||
|
public static bool operator >=(VersionString s1, VersionString s2) => (s1 > s2 || s1 == s2);
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return "{PackageID: " + PackageID + ", PackageVersion: " + PackageMainVersion + ", PackageCheckVersion: " + PackageCheckVersion + "}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public string ToShortString()
|
||||||
|
{
|
||||||
|
return $"{PackageID}.{PackageMainVersion}.{PackageCheckVersion}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public static VersionString? GetVersionOfPackage(string pakName)
|
||||||
|
{
|
||||||
|
if (!Config.PluginVersionsContainsKey(pakName))
|
||||||
|
return null;
|
||||||
|
return new VersionString(Config.GetPluginVersion(pakName));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task<VersionString?> GetVersionOfPackageFromWeb(string pakName)
|
||||||
|
{
|
||||||
|
string url = "https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/Versions";
|
||||||
|
List<string> data = await ServerCom.ReadTextFromURL(url);
|
||||||
|
string? version = (from item in data
|
||||||
|
where !item.StartsWith("#") && item.StartsWith(pakName)
|
||||||
|
select item.Split(',')[1]).FirstOrDefault();
|
||||||
|
if (version == default || version == null) return null;
|
||||||
|
return new VersionString(version);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Net;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
using PluginManager.Others;
|
|
||||||
|
|
||||||
namespace PluginManager.Online
|
|
||||||
{
|
|
||||||
public class LanguageManager
|
|
||||||
{
|
|
||||||
private 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
|
|
||||||
{
|
|
||||||
List<string> list = await ServerCom.ReadTextFromFile(link);
|
|
||||||
string[] lines = list.ToArray();
|
|
||||||
|
|
||||||
List<string[]> info = new List<string[]>();
|
|
||||||
info.Add(new string[] { "-", "-" });
|
|
||||||
info.Add(new string[] { "Language Name", "File Size" });
|
|
||||||
info.Add(new string[] { "-", "-" });
|
|
||||||
foreach (var line in lines)
|
|
||||||
{
|
|
||||||
if (line.Length <= 2) continue;
|
|
||||||
string[] d = line.Split(',');
|
|
||||||
if (d[3].Contains("cp") || d[3].Contains("CrossPlatform"))
|
|
||||||
info.Add(new string[] { d[0], d[1] });
|
|
||||||
}
|
|
||||||
info.Add(new string[] { "-", "-" });
|
|
||||||
Console_Utilities.FormatAndAlignTable(info);
|
|
||||||
}
|
|
||||||
|
|
||||||
catch (Exception exception)
|
|
||||||
{
|
|
||||||
Console.WriteLine("Failed to execute command: listlang\nReason: " + exception.Message);
|
|
||||||
Others.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
|
|
||||||
{
|
|
||||||
List<string> list = await ServerCom.ReadTextFromFile(link);
|
|
||||||
string[] lines = list.ToArray();
|
|
||||||
|
|
||||||
foreach (var line in lines)
|
|
||||||
{
|
|
||||||
if (line.Length <= 2) continue;
|
|
||||||
string[] d = line.Split(',');
|
|
||||||
if (d[0].Equals(langName) && (d[3].Contains("cp") || d[3].Contains("CrossPlatform")))
|
|
||||||
return new string[] { d[2], d[3] };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception exception)
|
|
||||||
{
|
|
||||||
Console.WriteLine("Failed to execute command: listlang\nReason: " + exception.Message);
|
|
||||||
Others.Functions.WriteErrFile(exception.ToString());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,20 +1,13 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
|
||||||
using System.Net;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using PluginManager.Others;
|
using PluginManager.Others;
|
||||||
|
using OperatingSystem = PluginManager.Others.OperatingSystem;
|
||||||
|
|
||||||
|
namespace PluginManager.Online;
|
||||||
|
|
||||||
namespace PluginManager.Online
|
|
||||||
{
|
|
||||||
public class PluginsManager
|
public class PluginsManager
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// The URL of the server
|
|
||||||
/// </summary>
|
|
||||||
public string PluginsLink { get; private set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The Plugin Manager constructor
|
/// The Plugin Manager constructor
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -24,6 +17,11 @@ namespace PluginManager.Online
|
|||||||
PluginsLink = link;
|
PluginsLink = link;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The URL of the server
|
||||||
|
/// </summary>
|
||||||
|
public string PluginsLink { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The method to load all plugins
|
/// The method to load all plugins
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -32,23 +30,24 @@ namespace PluginManager.Online
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
List<string> list = await ServerCom.ReadTextFromFile(PluginsLink);
|
var list = await ServerCom.ReadTextFromURL(PluginsLink);
|
||||||
string[] lines = list.ToArray();
|
var lines = list.ToArray();
|
||||||
|
|
||||||
List<string[]> data = new List<string[]>();
|
var data = new List<string[]>();
|
||||||
var op = Functions.GetOperatingSystem();
|
var op = Functions.GetOperatingSystem();
|
||||||
|
|
||||||
int 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 string[] { "-", "-", "-", "-" });
|
data.Add(new[] { "-", "-", "-", "-", "-" });
|
||||||
data.Add(titles);
|
data.Add(titles);
|
||||||
data.Add(new string[] { "-", "-", "-", "-" });
|
data.Add(new[] { "-", "-", "-", "-", "-" });
|
||||||
for (int i = 0; i < len; i++)
|
for (var i = 0; i < len; i++)
|
||||||
{
|
{
|
||||||
if (lines[i].Length <= 2) continue;
|
if (lines[i].Length <= 2)
|
||||||
string[] content = lines[i].Split(',');
|
continue;
|
||||||
string[] display = new string[4];
|
var content = lines[i].Split(',');
|
||||||
if (op == Others.OperatingSystem.WINDOWS)
|
var display = new string[titles.Length];
|
||||||
|
if (op == OperatingSystem.WINDOWS)
|
||||||
{
|
{
|
||||||
if (content[4].Contains("Windows"))
|
if (content[4].Contains("Windows"))
|
||||||
{
|
{
|
||||||
@@ -56,36 +55,44 @@ namespace PluginManager.Online
|
|||||||
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))
|
if (content.Length == 6 && (content[5] != null || content[5].Length > 2))
|
||||||
display[3] = ((await ServerCom.ReadTextFromFile(content[5])).Count + 1).ToString();
|
display[3] = ((await ServerCom.ReadTextFromURL(content[5])).Count + 1).ToString();
|
||||||
|
|
||||||
else display[3] = "1";
|
else
|
||||||
|
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);
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (op == Others.OperatingSystem.LINUX)
|
else if (op == OperatingSystem.LINUX)
|
||||||
{
|
{
|
||||||
if (content[4].Contains("Linux"))
|
if (content[4].Contains("Linux"))
|
||||||
{
|
{
|
||||||
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.ReadTextFromURL(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);
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
data.Add(new string[] { "-", "-", "-", "-" });
|
data.Add(new[] { "-", "-", "-", "-", "-" });
|
||||||
|
|
||||||
Console_Utilities.FormatAndAlignTable(data);
|
Console_Utilities.FormatAndAlignTable(data);
|
||||||
}
|
}
|
||||||
catch (Exception exception)
|
catch (Exception exception)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Failed to execute command: listlang\nReason: " + exception.Message);
|
Console.WriteLine("Failed to execute command: listplugs\nReason: " + exception.Message);
|
||||||
Others.Functions.WriteErrFile(exception.ToString());
|
Functions.WriteErrFile(exception.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -97,32 +104,28 @@ namespace PluginManager.Online
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
List<string> list = await ServerCom.ReadTextFromFile(PluginsLink);
|
var list = await ServerCom.ReadTextFromURL(PluginsLink);
|
||||||
string[] lines = list.ToArray();
|
var lines = list.ToArray();
|
||||||
int len = lines.Length;
|
var len = lines.Length;
|
||||||
for (int i = 0; i < len; i++)
|
for (var i = 0; i < len; i++)
|
||||||
{
|
{
|
||||||
string[] contents = lines[i].Split(',');
|
var contents = lines[i].Split(',');
|
||||||
if (contents[0] == name)
|
if (contents[0] == name)
|
||||||
{
|
{
|
||||||
if (contents.Length == 6)
|
if (contents.Length == 6)
|
||||||
return new string[] { contents[2], contents[3], contents[5] };
|
return new[] { contents[2], contents[3], contents[5] };
|
||||||
else if (contents.Length == 5)
|
if (contents.Length == 5)
|
||||||
return new string[] { contents[2], contents[3], string.Empty };
|
return new[] { contents[2], contents[3], string.Empty };
|
||||||
else throw new Exception("Failed to download plugin. Invalid Argument Length");
|
throw new Exception("Failed to download plugin. Invalid Argument Length");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception exception)
|
catch (Exception exception)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Failed to execute command: listplugs\nReason: " + exception.Message);
|
Console.WriteLine("Failed to execute command: listplugs\nReason: " + exception.Message);
|
||||||
Others.Functions.WriteErrFile(exception.ToString());
|
Functions.WriteErrFile(exception.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
return new string[] { null!, null!, null! };
|
return new string[] { null!, null!, null! };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,22 @@
|
|||||||
using PluginManager.Online.Helpers;
|
using PluginManager.Online.Helpers;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using PluginManager.Others;
|
||||||
|
|
||||||
namespace PluginManager.Online
|
namespace PluginManager.Online
|
||||||
{
|
{
|
||||||
public class ServerCom
|
public static class ServerCom
|
||||||
{
|
{
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Read all lines from a file async
|
/// Read all lines from a file async
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="link">The link of the file</param>
|
/// <param name="link">The link of the file</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task<List<string>> ReadTextFromFile(string link)
|
public static async Task<List<string>> ReadTextFromURL(string link)
|
||||||
{
|
{
|
||||||
string response = await OnlineFunctions.DownloadStringAsync(link);
|
string response = await OnlineFunctions.DownloadStringAsync(link);
|
||||||
string[] lines = response.Split('\n');
|
string[] lines = response.Split('\n');
|
||||||
@@ -30,7 +30,7 @@ namespace PluginManager.Online
|
|||||||
/// <param name="location">The location where to store the downloaded data</param>
|
/// <param name="location">The location where to store the downloaded data</param>
|
||||||
/// <param name="progress">The <see cref="IProgress{T}"/> to track the download</param>
|
/// <param name="progress">The <see cref="IProgress{T}"/> to track the download</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task DownloadFileAsync(string URL, string location, IProgress<float> progress, IProgress<long> downloadedBytes)
|
public static async Task DownloadFileAsync(string URL, string location, IProgress<float> progress, IProgress<long>? downloadedBytes = null)
|
||||||
{
|
{
|
||||||
using (var client = new System.Net.Http.HttpClient())
|
using (var client = new System.Net.Http.HttpClient())
|
||||||
{
|
{
|
||||||
@@ -52,40 +52,32 @@ namespace PluginManager.Online
|
|||||||
public static async Task DownloadFileAsync(string URL, string location)
|
public static async Task DownloadFileAsync(string URL, string location)
|
||||||
{
|
{
|
||||||
bool isDownloading = true;
|
bool isDownloading = true;
|
||||||
int c_progress = 0;
|
float c_progress = 0;
|
||||||
|
|
||||||
//long m_dwBytes = 0;
|
Console_Utilities.ProgressBar pbar = new Console_Utilities.ProgressBar { Max = 100f, NoColor = true };
|
||||||
|
|
||||||
Others.Console_Utilities.ProgressBar pbar = new Others.Console_Utilities.ProgressBar(100, "");
|
IProgress<float> progress = new Progress<float>(percent => { c_progress = percent; });
|
||||||
|
|
||||||
IProgress<float> progress = new Progress<float>(percent =>
|
|
||||||
{
|
|
||||||
c_progress = (int)percent;
|
|
||||||
});
|
|
||||||
|
|
||||||
IProgress<long> progress_downloaded = new Progress<long>(downloadedBytes =>
|
Task updateProgressBarTask = new Task(() =>
|
||||||
{
|
|
||||||
//m_dwBytes = downloadedBytes;
|
|
||||||
});
|
|
||||||
|
|
||||||
Task updateProgressBarTask = new Task(async () =>
|
|
||||||
{
|
{
|
||||||
while (isDownloading)
|
while (isDownloading)
|
||||||
{
|
{
|
||||||
pbar.Update(c_progress);
|
pbar.Update(c_progress);
|
||||||
if (c_progress == 100)
|
if (c_progress == 100f)
|
||||||
break;
|
break;
|
||||||
System.Threading.Thread.Sleep(500);
|
Thread.Sleep(500);
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
);
|
||||||
|
|
||||||
new System.Threading.Thread(updateProgressBarTask.Start).Start();
|
new Thread(updateProgressBarTask.Start).Start();
|
||||||
await DownloadFileAsync(URL, location, progress, progress_downloaded);
|
await DownloadFileAsync(URL, location, progress);
|
||||||
|
|
||||||
|
|
||||||
|
c_progress = pbar.Max;
|
||||||
|
pbar.Update(100f);
|
||||||
isDownloading = false;
|
isDownloading = false;
|
||||||
c_progress = 100;
|
|
||||||
pbar.Update(100);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
51
PluginManager/Online/Updates/PluginUpdater.cs
Normal file
51
PluginManager/Online/Updates/PluginUpdater.cs
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
using PluginManager.Items;
|
||||||
|
using PluginManager.Online.Helpers;
|
||||||
|
using PluginManager.Others;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace PluginManager.Online.Updates
|
||||||
|
{
|
||||||
|
public class PluginUpdater
|
||||||
|
{
|
||||||
|
public static async Task<bool> CheckForUpdates(string pakName)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var webV = await VersionString.GetVersionOfPackageFromWeb(pakName);
|
||||||
|
var local = VersionString.GetVersionOfPackage(pakName);
|
||||||
|
|
||||||
|
if (local is null) return true;
|
||||||
|
if (webV is null) return false;
|
||||||
|
|
||||||
|
if (webV == local) return false;
|
||||||
|
if (webV > local) return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex) { Console.WriteLine(ex.Message); }
|
||||||
|
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task<Update> DownloadUpdateInfo(string pakName)
|
||||||
|
{
|
||||||
|
string url = "https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/Versions";
|
||||||
|
List<string> info = await ServerCom.ReadTextFromURL(url);
|
||||||
|
VersionString? version = await VersionString.GetVersionOfPackageFromWeb(pakName);
|
||||||
|
|
||||||
|
if (version is null) return Update.Empty;
|
||||||
|
Update update = new Update(pakName, string.Join('\n', info), version);
|
||||||
|
return update;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task Download(string pakName)
|
||||||
|
{
|
||||||
|
Console_Utilities.WriteColorText("An update was found for &g" + pakName + "&c. Version: &r" + (await VersionString.GetVersionOfPackageFromWeb(pakName))?.ToShortString() + "&c. Current Version: &y" + VersionString.GetVersionOfPackage(pakName)?.ToShortString());
|
||||||
|
await ConsoleCommandsHandler.ExecuteCommad("dwplug " + pakName);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
36
PluginManager/Online/Updates/Update.cs
Normal file
36
PluginManager/Online/Updates/Update.cs
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
using PluginManager.Online.Helpers;
|
||||||
|
|
||||||
|
namespace PluginManager.Online.Updates
|
||||||
|
{
|
||||||
|
public class Update
|
||||||
|
{
|
||||||
|
public static Update Empty = new Update(null, null, null);
|
||||||
|
public string pakName;
|
||||||
|
public string UpdateMessage;
|
||||||
|
|
||||||
|
public VersionString newVersion;
|
||||||
|
|
||||||
|
private bool isEmpty;
|
||||||
|
|
||||||
|
public Update(string pakName, string updateMessage, VersionString newVersion)
|
||||||
|
{
|
||||||
|
this.pakName = pakName;
|
||||||
|
UpdateMessage = updateMessage;
|
||||||
|
this.newVersion = newVersion;
|
||||||
|
|
||||||
|
if (pakName is null && updateMessage is null && newVersion is null)
|
||||||
|
isEmpty = true;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
if (isEmpty)
|
||||||
|
throw new System.Exception("The update is EMPTY. Can not print information about an empty update !");
|
||||||
|
return $"Package Name: {this.pakName}\n" +
|
||||||
|
$"Update Message: {UpdateMessage}\n" +
|
||||||
|
$"Version: {newVersion.ToString()}";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
|
using System.Threading.Tasks;
|
||||||
using Discord;
|
using Discord;
|
||||||
|
|
||||||
using System.Threading.Tasks;
|
namespace PluginManager.Others;
|
||||||
|
|
||||||
namespace PluginManager.Others
|
|
||||||
{
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A class that handles the sending of messages to the user.
|
/// A class that handles the sending of messages to the user.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -14,29 +13,48 @@ namespace PluginManager.Others
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="server">The server</param>
|
/// <param name="server">The server</param>
|
||||||
/// <param name="name">The channel name</param>
|
/// <param name="name">The channel name</param>
|
||||||
/// <returns><see cref="IGuildChannel"/></returns>
|
/// <returns>
|
||||||
public static IGuildChannel GetTextChannel(this IGuild server, string name) => server.GetTextChannel(name);
|
/// <see cref="IGuildChannel" />
|
||||||
|
/// </returns>
|
||||||
|
public static IGuildChannel GetTextChannel(this IGuild server, string name)
|
||||||
|
{
|
||||||
|
return server.GetTextChannel(name);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the voice channel by name from server
|
/// Get the voice channel by name from server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="server">The server</param>
|
/// <param name="server">The server</param>
|
||||||
/// <param name="name">The channel name</param>
|
/// <param name="name">The channel name</param>
|
||||||
/// <returns><see cref="IGuildChannel"/></returns>
|
/// <returns>
|
||||||
public static IGuildChannel GetVoiceChannel(this IGuild server, string name) => server.GetVoiceChannel(name);
|
/// <see cref="IGuildChannel" />
|
||||||
|
/// </returns>
|
||||||
|
public static IGuildChannel GetVoiceChannel(this IGuild server, string name)
|
||||||
|
{
|
||||||
|
return server.GetVoiceChannel(name);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the DM channel between <see cref="Discord.WebSocket.DiscordSocketClient" /> and <see cref="IGuildUser" />
|
/// Get the DM channel between <see cref="Discord.WebSocket.DiscordSocketClient" /> and <see cref="IGuildUser" />
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="user"></param>
|
/// <param name="user"></param>
|
||||||
/// <returns><see cref="IDMChannel"/></returns>
|
/// <returns>
|
||||||
public static async Task<IDMChannel> GetDMChannel(IGuildUser user) => await user.CreateDMChannelAsync();
|
/// <see cref="IDMChannel" />
|
||||||
|
/// </returns>
|
||||||
|
public static async Task<IDMChannel> GetDMChannel(IGuildUser user)
|
||||||
|
{
|
||||||
|
return await user.CreateDMChannelAsync();
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the channel where the message was sent
|
/// Get the channel where the message was sent
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="message">The message</param>
|
/// <param name="message">The message</param>
|
||||||
/// <returns><see cref="IChannel"/></returns>
|
/// <returns>
|
||||||
public static IChannel GetChannel(IMessage message) => message.Channel;
|
/// <see cref="IChannel" />
|
||||||
|
/// </returns>
|
||||||
|
public static IChannel GetChannel(IMessage message)
|
||||||
|
{
|
||||||
|
return message.Channel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,33 +1,44 @@
|
|||||||
using System;
|
using Discord;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace PluginManager.Others
|
namespace PluginManager.Others
|
||||||
{
|
{
|
||||||
public class Console_Utilities
|
public static class Console_Utilities
|
||||||
{
|
{
|
||||||
|
public static void Initialize()
|
||||||
|
{
|
||||||
|
if (!Config.ContainsKey("TableVariables"))
|
||||||
|
Config.AddValueToVariables("TableVariables", new Dictionary<string, string> { { "DefaultSpace", "3" } }, false);
|
||||||
|
if (!Config.ContainsKey("ColorDataBase"))
|
||||||
|
Config.AddValueToVariables("ColorDataBase", new Dictionary<char, ConsoleColor>()
|
||||||
|
{
|
||||||
|
{ 'g', ConsoleColor.Green },
|
||||||
|
{ 'b', ConsoleColor.Blue },
|
||||||
|
{ 'r', ConsoleColor.Red },
|
||||||
|
{ 'm', ConsoleColor.Magenta },
|
||||||
|
{ 'y', ConsoleColor.Yellow },
|
||||||
|
}, false
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!Config.ContainsKey("ColorPrefix"))
|
||||||
|
Config.AddValueToVariables("ColorPrefix", '&', false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Progress bar object
|
/// Progress bar object
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ProgressBar
|
public class ProgressBar
|
||||||
{
|
{
|
||||||
public int Progress { get; set; }
|
public float Max { get; init; }
|
||||||
public int Max { get; set; }
|
public ConsoleColor Color { get; init; }
|
||||||
public string Message { get; set; }
|
public bool NoColor { get; init; }
|
||||||
|
|
||||||
public ProgressBar(int max, string message)
|
|
||||||
|
public void Update(float progress, double speed = -1, string? unit = null)
|
||||||
{
|
{
|
||||||
Max = max;
|
|
||||||
Message = message;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async void Update(int progress, double speed = -1, string? unit = null)
|
|
||||||
{
|
|
||||||
|
|
||||||
//progress bar
|
|
||||||
Console.CursorLeft = 0;
|
Console.CursorLeft = 0;
|
||||||
Console.Write("[");
|
Console.Write("[");
|
||||||
Console.CursorLeft = 32;
|
Console.CursorLeft = 32;
|
||||||
@@ -39,38 +50,43 @@ namespace PluginManager.Others
|
|||||||
|
|
||||||
for (int i = 0; i < onechunk * progress; i++)
|
for (int i = 0; i < onechunk * progress; i++)
|
||||||
{
|
{
|
||||||
Console.BackgroundColor = ConsoleColor.Green;
|
Console.BackgroundColor = NoColor ? ConsoleColor.Black : this.Color;
|
||||||
Console.CursorLeft = position++;
|
Console.CursorLeft = position++;
|
||||||
Console.Write(" ");
|
Console.Write("#");
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = position; i <= 31; i++)
|
for (int i = position; i <= 31; i++)
|
||||||
{
|
{
|
||||||
Console.BackgroundColor = ConsoleColor.Gray;
|
Console.BackgroundColor = NoColor ? ConsoleColor.Black : ConsoleColor.DarkGray;
|
||||||
Console.CursorLeft = position++;
|
Console.CursorLeft = position++;
|
||||||
Console.Write(" ");
|
Console.Write(" ");
|
||||||
}
|
}
|
||||||
|
|
||||||
Console.CursorLeft = 35;
|
Console.CursorLeft = 35;
|
||||||
Console.BackgroundColor = ConsoleColor.Black;
|
Console.BackgroundColor = ConsoleColor.Black;
|
||||||
if (speed == -1 || unit == null)
|
if (speed is -1 || unit == null)
|
||||||
{
|
{
|
||||||
if (progress == Max)
|
if (progress.CanAproximateTo(Max))
|
||||||
Console.Write(progress.ToString() + " % ✓");
|
Console.Write(progress + " % ✓");
|
||||||
else Console.Write(progress.ToString() + " % ");
|
else
|
||||||
|
Console.Write(MathF.Round(progress, 2) + " % ");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
Console.Write(progress.ToString() + $"{speed} {unit}/s ");
|
Console.Write(progress + $"{speed} {unit}/s ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
private static bool CanAproximateTo(this float f, float y) => (MathF.Abs(f - y) < 0.000001);
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A way to create a table based on input data
|
/// A way to create a table based on input data
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="data">The List of arrays of strings that represent the rows.</param>
|
/// <param name="data">The List of arrays of strings that represent the rows.</param>
|
||||||
public static void FormatAndAlignTable(List<string[]> data)
|
public static void FormatAndAlignTable(List<string[]> data, TableFormat format = TableFormat.CENTER_EACH_COLUMN_BASED)
|
||||||
|
{
|
||||||
|
if (format == TableFormat.CENTER_EACH_COLUMN_BASED)
|
||||||
{
|
{
|
||||||
char tableLine = '-';
|
char tableLine = '-';
|
||||||
char tableCross = '+';
|
char tableCross = '+';
|
||||||
@@ -78,17 +94,17 @@ namespace PluginManager.Others
|
|||||||
|
|
||||||
int[] len = new int[data[0].Length];
|
int[] len = new int[data[0].Length];
|
||||||
foreach (var line in data)
|
foreach (var line in data)
|
||||||
{
|
|
||||||
for (int i = 0; i < line.Length; i++)
|
for (int i = 0; i < line.Length; i++)
|
||||||
if (line[i].Length > len[i])
|
if (line[i].Length > len[i])
|
||||||
len[i] = line[i].Length;
|
len[i] = line[i].Length;
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
foreach (string[] row in data)
|
foreach (string[] row in data)
|
||||||
{
|
{
|
||||||
if (row[0][0] == tableLine) Console.Write(tableCross);
|
if (row[0][0] == tableLine)
|
||||||
else Console.Write(tableWall);
|
Console.Write(tableCross);
|
||||||
|
else
|
||||||
|
Console.Write(tableWall);
|
||||||
for (int l = 0; l < row.Length; l++)
|
for (int l = 0; l < row.Length; l++)
|
||||||
{
|
{
|
||||||
if (row[l][0] == tableLine)
|
if (row[l][0] == tableLine)
|
||||||
@@ -104,7 +120,6 @@ namespace PluginManager.Others
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
int lenHalf = row[l].Length / 2;
|
int lenHalf = row[l].Length / 2;
|
||||||
for (int i = 0; i < ((len[l] + 4) / 2 - lenHalf); ++i)
|
for (int i = 0; i < ((len[l] + 4) / 2 - lenHalf); ++i)
|
||||||
Console.Write(" ");
|
Console.Write(" ");
|
||||||
@@ -115,44 +130,132 @@ namespace PluginManager.Others
|
|||||||
Console.Write(" ");
|
Console.Write(" ");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (row[l][0] == tableLine) Console.Write(tableCross);
|
Console.Write(row[l][0] == tableLine ? tableCross : tableWall);
|
||||||
else Console.Write(tableWall);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Console.WriteLine(); //end line
|
Console.WriteLine(); //end line
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void WriteColorText(string text, bool appendNewLine = true)
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (format == TableFormat.CENTER_OVERALL_LENGTH)
|
||||||
{
|
{
|
||||||
|
int maxLen = 0;
|
||||||
|
foreach (string[] row in data)
|
||||||
|
foreach (string s in row)
|
||||||
|
if (s.Length > maxLen)
|
||||||
|
maxLen = s.Length;
|
||||||
|
|
||||||
string[] words = text.Split(' ');
|
int div = (maxLen + 4) / 2;
|
||||||
ConsoleColor fg = Console.ForegroundColor;
|
|
||||||
Dictionary<string, ConsoleColor> colors = new Dictionary<string, ConsoleColor>()
|
foreach (string[] row in data)
|
||||||
{
|
{
|
||||||
{"&g", ConsoleColor.Green },
|
Console.Write("\t");
|
||||||
{"&b", ConsoleColor.Blue },
|
if (row[0] == "-")
|
||||||
{"&r", ConsoleColor.Red },
|
Console.Write("+");
|
||||||
{"&m", ConsoleColor.Magenta },
|
else
|
||||||
{"&c", fg }
|
Console.Write("|");
|
||||||
};
|
|
||||||
foreach (string word in words)
|
foreach (string s in row)
|
||||||
{
|
{
|
||||||
if (word.Length >= 2)
|
if (s == "-")
|
||||||
{
|
{
|
||||||
string prefix = word.Substring(0, 2);
|
for (int i = 0; i < maxLen + 4; ++i)
|
||||||
if (colors.ContainsKey(prefix))
|
Console.Write("-");
|
||||||
Console.ForegroundColor = colors[prefix];
|
}
|
||||||
|
else if (s.Length == maxLen)
|
||||||
|
{
|
||||||
|
Console.Write(" ");
|
||||||
|
Console.Write(s);
|
||||||
|
Console.Write(" ");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int lenHalf = s.Length / 2;
|
||||||
|
for (int i = 0; i < div - lenHalf; ++i)
|
||||||
|
Console.Write(" ");
|
||||||
|
Console.Write(s);
|
||||||
|
for (int i = div + lenHalf + 1; i < maxLen + 4; ++i)
|
||||||
|
Console.Write(" ");
|
||||||
|
if (s.Length % 2 == 0)
|
||||||
|
Console.Write(" ");
|
||||||
}
|
}
|
||||||
|
|
||||||
string m = word.Replace("&g", "").Replace("&b", "").Replace("&r", "").Replace("&c", "").Replace("&m", "");
|
if (s == "-")
|
||||||
Console.Write(m + " ");
|
Console.Write("+");
|
||||||
}
|
else
|
||||||
if (appendNewLine)
|
Console.Write("|");
|
||||||
Console.Write('\n');
|
|
||||||
|
|
||||||
Console.ForegroundColor = fg;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Console.WriteLine(); //end line
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (format == TableFormat.DEFAULT)
|
||||||
|
{
|
||||||
|
int[] widths = new int[data[0].Length];
|
||||||
|
int space_between_columns = int.Parse(Config.GetValue<Dictionary<string, string>>("TableVariables")?["DefaultSpace"]!);
|
||||||
|
for (int i = 0; i < data.Count; i++)
|
||||||
|
{
|
||||||
|
for (int j = 0; j < data[i].Length; j++)
|
||||||
|
{
|
||||||
|
if (data[i][j].Length > widths[j])
|
||||||
|
widths[j] = data[i][j].Length;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < data.Count; i++)
|
||||||
|
{
|
||||||
|
for (int j = 0; j < data[i].Length; j++)
|
||||||
|
{
|
||||||
|
if (data[i][j] == "-")
|
||||||
|
data[i][j] = " ";
|
||||||
|
Console.Write(data[i][j]);
|
||||||
|
for (int k = 0; k < widths[j] - data[i][j].Length + 1 + space_between_columns; k++)
|
||||||
|
Console.Write(" ");
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.WriteLine();
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Exception("Unknown type of table");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void WriteColorText(string text, bool appendNewLineAtEnd = true)
|
||||||
|
{
|
||||||
|
ConsoleColor initialForeGround = Console.ForegroundColor;
|
||||||
|
char[] input = text.ToCharArray();
|
||||||
|
for (int i = 0; i < input.Length; i++)
|
||||||
|
{
|
||||||
|
if (input[i] == Config.GetValue<char>("ColorPrefix"))
|
||||||
|
{
|
||||||
|
if (i + 1 < input.Length)
|
||||||
|
{
|
||||||
|
if (Config.GetValue<Dictionary<char, ConsoleColor>>("ColorDataBase")!.ContainsKey(input[i + 1]))
|
||||||
|
{
|
||||||
|
Console.ForegroundColor = Config.GetValue<Dictionary<char, ConsoleColor>>("ColorDataBase")![input[i + 1]];
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
else if (input[i + 1] == 'c')
|
||||||
|
{
|
||||||
|
Console.ForegroundColor = initialForeGround;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
Console.Write(input[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.ForegroundColor = initialForeGround;
|
||||||
|
if (appendNewLineAtEnd)
|
||||||
|
Console.WriteLine();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,91 +0,0 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
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 System.Text.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 System.Text.StringBuilder();
|
|
||||||
|
|
||||||
var bytes = System.Text.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 System.Threading.Tasks.Task<string> CreateMD5(string text)
|
|
||||||
{
|
|
||||||
string output = "";
|
|
||||||
using (System.Security.Cryptography.MD5 md5 = System.Security.Cryptography.MD5.Create())
|
|
||||||
{
|
|
||||||
using (var s = GenerateStreamFromString(text))
|
|
||||||
{
|
|
||||||
byte[] t = await md5.ComputeHashAsync(s);
|
|
||||||
output = System.Convert.ToBase64String(t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return output;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Create SHA256 hash
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="text">The text to encrypt</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static async System.Threading.Tasks.Task<string> CreateSHA256(string text)
|
|
||||||
{
|
|
||||||
string output = "";
|
|
||||||
using (System.Security.Cryptography.SHA256 sha = System.Security.Cryptography.SHA256.Create())
|
|
||||||
{
|
|
||||||
using (var s = GenerateStreamFromString(text))
|
|
||||||
{
|
|
||||||
byte[] t = await sha.ComputeHashAsync(s);
|
|
||||||
output = System.Convert.ToBase64String(t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return output;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static System.IO.Stream GenerateStreamFromString(string s)
|
|
||||||
{
|
|
||||||
var stream = new System.IO.MemoryStream();
|
|
||||||
var writer = new System.IO.StreamWriter(stream);
|
|
||||||
writer.Write(s);
|
|
||||||
writer.Flush();
|
|
||||||
stream.Position = 0;
|
|
||||||
return stream;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,20 +1,33 @@
|
|||||||
namespace PluginManager.Others
|
using PluginManager.Interfaces;
|
||||||
{
|
|
||||||
|
namespace PluginManager.Others;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A list of operating systems
|
/// A list of operating systems
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public enum OperatingSystem
|
public enum OperatingSystem
|
||||||
{ WINDOWS, LINUX, MAC_OS, UNKNOWN }
|
{
|
||||||
|
WINDOWS, LINUX, MAC_OS, UNKNOWN
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A list with all errors
|
/// A list with all errors
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public enum Error
|
public enum Error
|
||||||
{ UNKNOWN_ERROR, GUILD_NOT_FOUND, STREAM_NOT_FOUND, INVALID_USER, INVALID_CHANNEL, INVALID_PERMISSIONS }
|
{
|
||||||
|
UNKNOWN_ERROR, GUILD_NOT_FOUND, STREAM_NOT_FOUND, INVALID_USER, INVALID_CHANNEL, INVALID_PERMISSIONS
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 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 }
|
||||||
|
|
||||||
|
public enum UnzipProgressType { PercentageFromNumberOfFiles, PercentageFromTotalSize }
|
||||||
|
|
||||||
|
public enum TableFormat { CENTER_EACH_COLUMN_BASED, CENTER_OVERALL_LENGTH, DEFAULT }
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
namespace PluginManager.Others.Exceptions
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Custom Exception for PluginManager
|
|
||||||
/// </summary>
|
|
||||||
[Serializable]
|
|
||||||
|
|
||||||
public class APIException : Exception
|
|
||||||
{
|
|
||||||
/// <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>
|
|
||||||
/// 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>
|
|
||||||
/// 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.ToString());
|
|
||||||
Console.WriteLine("Possible cause: " + PossibleCause);
|
|
||||||
if (this.StackTrace != null)
|
|
||||||
Functions.WriteErrFile(this.StackTrace);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -4,9 +4,12 @@ using System;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Security.Cryptography;
|
||||||
using Discord.WebSocket;
|
using Discord.WebSocket;
|
||||||
using PluginManager.Items;
|
using PluginManager.Items;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
namespace PluginManager.Others
|
namespace PluginManager.Others
|
||||||
{
|
{
|
||||||
@@ -30,32 +33,16 @@ 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>
|
||||||
/// The mark that the line is a comment
|
/// Beta testing folder
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static readonly char commentMark = '#';
|
public static readonly string betaFolder = @"./Data/BetaTest/";
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Read data from file
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="fileName">File name</param>
|
|
||||||
/// <param name="Code">Setting name</param>
|
|
||||||
/// <param name="separator">Separator between setting key code and its value</param>
|
|
||||||
/// <returns>The value of the specified setting key code in the specified file (<see cref="string"/>)</returns>
|
|
||||||
public static string? readCodeFromFile(string fileName, string Code, char separator)
|
|
||||||
=> File.ReadAllLines(fileName)
|
|
||||||
.Where(p => p.StartsWith(Code) && !p.StartsWith(commentMark.ToString()))
|
|
||||||
.First().Split(separator)[1] ?? null;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Read data from a file that is inside an archive (ZIP format)
|
/// Read data from a file that is inside an archive (ZIP format)
|
||||||
@@ -63,30 +50,15 @@ 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 Stream? ReadFromPakAsync(string FileName, string archFile)
|
||||||
{
|
{
|
||||||
archFile = pakFolder + archFile;
|
archFile = pakFolder + archFile;
|
||||||
Directory.CreateDirectory(pakFolder);
|
Directory.CreateDirectory(pakFolder);
|
||||||
if (!File.Exists(archFile))
|
if (!File.Exists(archFile)) throw new FileNotFoundException("Failed to load file !");
|
||||||
throw new FileNotFoundException("Failed to load file !");
|
|
||||||
|
|
||||||
string? textValue = null;
|
using ZipArchive archive = ZipFile.OpenRead(archFile);
|
||||||
var fs = new FileStream(archFile, FileMode.Open);
|
ZipArchiveEntry? entry = archive.GetEntry(FileName);
|
||||||
var zip = new ZipArchive(fs, ZipArchiveMode.Read);
|
return entry?.Open();
|
||||||
foreach (var entry in zip.Entries)
|
|
||||||
{
|
|
||||||
if (entry.Name == FileName || entry.FullName == FileName)
|
|
||||||
{
|
|
||||||
Stream s = entry.Open();
|
|
||||||
StreamReader reader = new StreamReader(s);
|
|
||||||
textValue = await reader.ReadToEndAsync();
|
|
||||||
reader.Close();
|
|
||||||
s.Close();
|
|
||||||
fs.Close();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return textValue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -95,8 +67,7 @@ namespace PluginManager.Others
|
|||||||
/// <param name="LogMessage">The message to be wrote</param>
|
/// <param name="LogMessage">The message to be wrote</param>
|
||||||
public static void WriteLogFile(string LogMessage)
|
public static void WriteLogFile(string LogMessage)
|
||||||
{
|
{
|
||||||
string logsPath = logFolder + "Log.txt";
|
string logsPath = logFolder + $"{DateTime.Today.ToShortDateString().Replace("/", "-").Replace("\\", "-")} Log.txt";
|
||||||
if (!Directory.Exists(logFolder))
|
|
||||||
Directory.CreateDirectory(logFolder);
|
Directory.CreateDirectory(logFolder);
|
||||||
File.AppendAllText(logsPath, LogMessage + " \n");
|
File.AppendAllText(logsPath, LogMessage + " \n");
|
||||||
}
|
}
|
||||||
@@ -107,36 +78,11 @@ namespace PluginManager.Others
|
|||||||
/// <param name="ErrMessage">The message to be wrote</param>
|
/// <param name="ErrMessage">The message to be wrote</param>
|
||||||
public static void WriteErrFile(string ErrMessage)
|
public static void WriteErrFile(string ErrMessage)
|
||||||
{
|
{
|
||||||
string errPath = errFolder + "Error.txt";
|
string errPath = errFolder + $"{DateTime.Today.ToShortDateString().Replace("/", "-").Replace("\\", "-")} Error.txt";
|
||||||
if (!Directory.Exists(errFolder))
|
|
||||||
Directory.CreateDirectory(errFolder);
|
Directory.CreateDirectory(errFolder);
|
||||||
File.AppendAllText(errPath, ErrMessage + " \n");
|
File.AppendAllText(errPath, ErrMessage + " \n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Write to settings file
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="file">The settings file path</param>
|
|
||||||
/// <param name="Code">The Key value of the setting</param>
|
|
||||||
/// <param name="newValue">The new value of the settings</param>
|
|
||||||
/// <param name="separator">The separator between the key and the value</param>
|
|
||||||
public static void WriteToSettings(string file, string Code, string newValue, char separator)
|
|
||||||
{
|
|
||||||
|
|
||||||
string[] lines = File.ReadAllLines(file);
|
|
||||||
File.Delete(file);
|
|
||||||
bool ok = false;
|
|
||||||
foreach (var line in lines)
|
|
||||||
if (line.StartsWith(Code))
|
|
||||||
{
|
|
||||||
File.AppendAllText(file, Code + separator + newValue + "\n"); ok = true;
|
|
||||||
}
|
|
||||||
else File.AppendAllText(file, line + "\n");
|
|
||||||
|
|
||||||
if (!ok)
|
|
||||||
File.AppendAllText(file, Code + separator + newValue + "\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Merge one array of strings into one string
|
/// Merge one array of strings into one string
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -176,30 +122,6 @@ namespace PluginManager.Others
|
|||||||
return command.Arguments;
|
return command.Arguments;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Write setting
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="SettingName">The full path to the setting</param>
|
|
||||||
/// <param name="NewValue">The new Value</param>
|
|
||||||
public static void WriteToSettingsFast(string SettingName, string NewValue)
|
|
||||||
{
|
|
||||||
|
|
||||||
string path = dataFolder; // Resources/
|
|
||||||
|
|
||||||
string[] args = SettingName.Split('.');
|
|
||||||
|
|
||||||
int len = args.Length;
|
|
||||||
if (len < 2) return;
|
|
||||||
for (int i = 0; i < len - 2; i++)
|
|
||||||
path += args[i] + "/";
|
|
||||||
path += args[len - 2] + ".txt";
|
|
||||||
|
|
||||||
|
|
||||||
WriteToSettings(path, args[len - 1].Replace('_', ' '), NewValue, '=');
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Copy one Stream to another <see langword="async"/>
|
/// Copy one Stream to another <see langword="async"/>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -212,18 +134,13 @@ namespace PluginManager.Others
|
|||||||
/// <exception cref="ArgumentOutOfRangeException">Triggered if <paramref name="bufferSize"/> is less then or equal to 0</exception>
|
/// <exception cref="ArgumentOutOfRangeException">Triggered if <paramref name="bufferSize"/> is less then or equal to 0</exception>
|
||||||
/// <exception cref="InvalidOperationException">Triggered if <paramref name="stream"/> is not readable</exception>
|
/// <exception cref="InvalidOperationException">Triggered if <paramref name="stream"/> is not readable</exception>
|
||||||
/// <exception cref="ArgumentException">Triggered in <paramref name="destination"/> is not writable</exception>
|
/// <exception cref="ArgumentException">Triggered in <paramref name="destination"/> is not writable</exception>
|
||||||
public static async Task CopyToOtherStreamAsync(this Stream stream, Stream destination, int bufferSize, IProgress<long> progress = null, CancellationToken cancellationToken = default)
|
public static async Task CopyToOtherStreamAsync(this Stream stream, Stream destination, int bufferSize, IProgress<long>? progress = null, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
if (stream == null)
|
if (stream == null) throw new ArgumentNullException(nameof(stream));
|
||||||
throw new ArgumentNullException(nameof(stream));
|
if (destination == null) throw new ArgumentNullException(nameof(destination));
|
||||||
if (destination == null)
|
if (bufferSize <= 0) throw new ArgumentOutOfRangeException(nameof(bufferSize));
|
||||||
throw new ArgumentNullException(nameof(destination));
|
if (!stream.CanRead) throw new InvalidOperationException("The stream is not readable.");
|
||||||
if (bufferSize <= 0)
|
if (!destination.CanWrite) throw new ArgumentException("Destination stream is not writable", nameof(destination));
|
||||||
throw new ArgumentOutOfRangeException(nameof(bufferSize));
|
|
||||||
if (!stream.CanRead)
|
|
||||||
throw new InvalidOperationException("The stream is not readable.");
|
|
||||||
if (!destination.CanWrite)
|
|
||||||
throw new ArgumentException("Destination stream is not writable", nameof(destination));
|
|
||||||
|
|
||||||
byte[] buffer = new byte[bufferSize];
|
byte[] buffer = new byte[bufferSize];
|
||||||
long totalBytesRead = 0;
|
long totalBytesRead = 0;
|
||||||
@@ -236,5 +153,192 @@ namespace PluginManager.Others
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Extract zip to location
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="zip">The zip location</param>
|
||||||
|
/// <param name="folder">The target location</param>
|
||||||
|
/// <param name="progress">The progress that is updated as a file is processed</param>
|
||||||
|
/// <param name="type">The type of progress</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static async Task ExtractArchive(string zip, string folder, IProgress<float> progress, UnzipProgressType type)
|
||||||
|
{
|
||||||
|
if (!Directory.Exists(folder)) Directory.CreateDirectory(folder);
|
||||||
|
|
||||||
|
|
||||||
|
using (ZipArchive archive = ZipFile.OpenRead(zip))
|
||||||
|
{
|
||||||
|
if (type == UnzipProgressType.PercentageFromNumberOfFiles)
|
||||||
|
{
|
||||||
|
int totalZIPFiles = archive.Entries.Count();
|
||||||
|
int currentZIPFile = 0;
|
||||||
|
foreach (ZipArchiveEntry entry in archive.Entries)
|
||||||
|
{
|
||||||
|
if (entry.FullName.EndsWith("/")) // it is a folder
|
||||||
|
Directory.CreateDirectory(Path.Combine(folder, entry.FullName));
|
||||||
|
|
||||||
|
else
|
||||||
|
try
|
||||||
|
{
|
||||||
|
entry.ExtractToFile(Path.Combine(folder, entry.FullName), true);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Failed to extract {entry.Name}. Exception: {ex.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
currentZIPFile++;
|
||||||
|
await Task.Delay(10);
|
||||||
|
progress.Report((float)currentZIPFile / totalZIPFiles * 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (type == UnzipProgressType.PercentageFromTotalSize)
|
||||||
|
{
|
||||||
|
ulong zipSize = 0;
|
||||||
|
|
||||||
|
foreach (ZipArchiveEntry entry in archive.Entries)
|
||||||
|
zipSize += (ulong)entry.CompressedLength;
|
||||||
|
|
||||||
|
ulong currentSize = 0;
|
||||||
|
foreach (ZipArchiveEntry entry in archive.Entries)
|
||||||
|
{
|
||||||
|
if (entry.FullName.EndsWith("/"))
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(Path.Combine(folder, entry.FullName));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
entry.ExtractToFile(Path.Combine(folder, entry.FullName), true);
|
||||||
|
currentSize += (ulong)entry.CompressedLength;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Failed to extract {entry.Name}. Exception: {ex.Message}");
|
||||||
|
}
|
||||||
|
|
||||||
|
await Task.Delay(10);
|
||||||
|
progress.Report((float)currentSize / zipSize * 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Convert Bytes to highest measurement unit possible
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="bytes">The amount of bytes</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static (double, string) ConvertBytes(long bytes)
|
||||||
|
{
|
||||||
|
List<string> units = new List<string>()
|
||||||
|
{
|
||||||
|
"B",
|
||||||
|
"KB",
|
||||||
|
"MB",
|
||||||
|
"GB",
|
||||||
|
"TB"
|
||||||
|
};
|
||||||
|
int i = 0;
|
||||||
|
while (bytes >= 1024)
|
||||||
|
{
|
||||||
|
i++;
|
||||||
|
bytes /= 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (bytes, units[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Save to JSON file
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The class type</typeparam>
|
||||||
|
/// <param name="file">The file path</param>
|
||||||
|
/// <param name="Data">The values</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static async Task SaveToJsonFile<T>(string file, T Data)
|
||||||
|
{
|
||||||
|
File.Delete(file);
|
||||||
|
var s = File.Open(file, FileMode.OpenOrCreate);
|
||||||
|
await JsonSerializer.SerializeAsync(s, Data, typeof(T), new JsonSerializerOptions { WriteIndented = true });
|
||||||
|
s.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Convert json text or file to some kind of data
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The data type</typeparam>
|
||||||
|
/// <param name="input">The file or json text</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static async Task<T> ConvertFromJson<T>(string input)
|
||||||
|
{
|
||||||
|
Stream text;
|
||||||
|
if (File.Exists(input))
|
||||||
|
text = File.OpenRead(input);
|
||||||
|
|
||||||
|
else
|
||||||
|
text = new MemoryStream(Encoding.ASCII.GetBytes(input));
|
||||||
|
text.Position = 0;
|
||||||
|
var obj = await JsonSerializer.DeserializeAsync<T>(text);
|
||||||
|
text.Close();
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
Stream text;
|
||||||
|
if (File.Exists(input))
|
||||||
|
text = File.OpenRead(input);
|
||||||
|
|
||||||
|
else
|
||||||
|
text = new MemoryStream(Encoding.ASCII.GetBytes(input));
|
||||||
|
|
||||||
|
var jsonObject = JsonDocument.Parse(text);
|
||||||
|
|
||||||
|
var data = jsonObject.RootElement.TryGetProperty(codeName, out element);
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string CreateMD5(string input)
|
||||||
|
{
|
||||||
|
using (MD5 md5 = MD5.Create())
|
||||||
|
{
|
||||||
|
byte[] inputBytes = Encoding.ASCII.GetBytes(input);
|
||||||
|
byte[] hashBytes = md5.ComputeHash(inputBytes);
|
||||||
|
return Convert.ToHexString(hashBytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user