Moved to JSON format for settings

This commit is contained in:
2022-06-09 18:01:05 +03:00
82 changed files with 2778 additions and 4043 deletions

View File

@@ -1,268 +0,0 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v6.0",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
"CMD_LevelingSystem/1.0.0": {
"dependencies": {
"PluginManager": "1.0.0"
},
"runtime": {
"CMD_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": {
"CMD_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.

View File

@@ -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.

Binary file not shown.

Binary file not shown.

View File

@@ -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.

View File

@@ -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>..\DiscordBot\bin\Debug\net6.0\Data\Plugins\Commands\LevelingSystem</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>

View File

@@ -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;
}
}
}

View File

@@ -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);
}
}

View File

@@ -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]);
}

View File

@@ -0,0 +1,48 @@
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 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());
}
}

View 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; }
}

View File

@@ -1,6 +1,5 @@
using Discord.Commands; using Discord.Commands;
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Interfaces; using PluginManager.Interfaces;
internal class Echo : DBCommand internal class Echo : DBCommand
@@ -18,7 +17,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);
} }
} }

View File

@@ -1,17 +1,10 @@
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;
namespace CMD_Utils namespace CMD_Utils;
{
class FlipCoin : DBCommand internal class FlipCoin : DBCommand
{ {
public string Command => "flip"; public string Command => "flip";
@@ -27,11 +20,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");
} }
} }

View File

@@ -1,17 +1,12 @@
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";
@@ -29,16 +24,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 +40,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]);
}
} }
} }

View File

@@ -1,6 +1,5 @@
using Discord.Commands; using Discord.Commands;
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Interfaces; using PluginManager.Interfaces;
public class Random : DBCommand public class Random : DBCommand
@@ -19,19 +18,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 x = a;
a = b; a = b;
b = x; b = x;
} }
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
{ {

View File

@@ -1,16 +1,12 @@
using Discord; 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>
@@ -55,10 +51,9 @@ 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);
@@ -67,18 +62,19 @@ namespace DiscordBot.Discord.Commands
else else
context.Channel.SendMessageAsync("Unknown Command " + item); context.Channel.SendMessageAsync("Unknown Command " + item);
} }
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 + " "; else if (cmd.canUseServer) normalCommands += cmd.Command + " ";
@@ -88,15 +84,13 @@ namespace DiscordBot.Discord.Commands
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);
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);
@@ -104,4 +98,3 @@ namespace DiscordBot.Discord.Commands
return embedBuilder; return embedBuilder;
} }
} }
}

View File

@@ -1,16 +1,15 @@
using System; using System;
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>
@@ -42,6 +41,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 +51,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 +82,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;
}
} }
} }
} }

View File

@@ -1,23 +1,14 @@
using System; using System;
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>
@@ -60,10 +51,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 +70,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 +79,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 +88,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);
} }
}
} }
} }

View File

@@ -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,6 +47,13 @@ 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>
@@ -73,18 +73,6 @@ namespace PluginManager.Core
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()
@@ -107,6 +95,17 @@ namespace PluginManager.Core
{ {
Console.Title = "ONLINE"; Console.Title = "ONLINE";
isReady = true; isReady = true;
new Thread(() =>
{
while (true)
{
Config.SaveConfig();
Thread.Sleep(10000);
}
}
).Start();
return Task.CompletedTask; return Task.CompletedTask;
} }
@@ -114,7 +113,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;
} }
@@ -147,4 +147,3 @@ namespace PluginManager.Core
return Task.CompletedTask; return Task.CompletedTask;
} }
} }
}

View File

@@ -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>
@@ -53,8 +47,7 @@ namespace PluginManager.Core
{ {
try try
{ {
if (Message as SocketUserMessage == null) if (Message as SocketUserMessage == null) return;
return;
var message = Message as SocketUserMessage; var message = Message as SocketUserMessage;
@@ -62,7 +55,7 @@ namespace PluginManager.Core
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))
{ {
@@ -75,12 +68,12 @@ namespace PluginManager.Core
var context = new SocketCommandContext(client, message); var context = new SocketCommandContext(client, message);
await commandService.ExecuteAsync( await commandService.ExecuteAsync(
context: context, context,
argPos: argPos, argPos,
services: null 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)).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,19 @@ 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;
} }
return;
} }
} }
catch { } catch
{
} }
} }
} }

View File

@@ -6,6 +6,16 @@
<Nullable>disable</Nullable> <Nullable>disable</Nullable>
<ApplicationIcon /> <ApplicationIcon />
<StartupObject /> <StartupObject />
<SignAssembly>False</SignAssembly>
<IsPublishable>True</IsPublishable>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,17 +1,12 @@
using Discord; using DiscordBot.Discord.Core;
using PluginManager;
using PluginManager.Items;
using PluginManager.Others;
using System; using System;
using System.IO; using System.IO;
using System.Threading.Tasks;
using PluginManager.Core;
using PluginManager.Others;
using PluginManager.LanguageSystem;
using PluginManager.Online;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using PluginManager.Items; using System.Threading.Tasks;
using PluginManager.Online;
namespace DiscordBot namespace DiscordBot
{ {
@@ -19,71 +14,69 @@ namespace DiscordBot
{ {
private static bool loadPluginsOnStartup = false; private static bool loadPluginsOnStartup = false;
private static bool listPluginsAtStartup = false; private static bool listPluginsAtStartup = false;
private static bool listLanguagAtStartup = false;
private static bool ShowStartupMessage = true;
/// <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("token") || Config.GetValue<string>("token") == null || Config.GetValue<string>("token")?.Length != 70)
{ {
File.WriteAllText("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN=token\nBOT_PREFIX=!\n");
while (true) while (true)
{ {
Console.WriteLine("Please insert your token: "); Console.WriteLine("Please insert your token");
Console.Write("TOKEN: "); Console.Write("Token = ");
string botToken = Console.ReadLine(); string token = Console.ReadLine();
if (botToken.Length == 59 || botToken.Length == 70) if (token?.Length == 59 || token?.Length == 70)
Config.AddValueToVariables("token", token, true);
else
{ {
string prefix = Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_PREFIX", '='); Console.WriteLine("Invalid token");
if (prefix == string.Empty || prefix == null) continue;
prefix = "!"; }
File.WriteAllText("./Data/Resources/DiscordBotCore.data", $"BOT_TOKEN={botToken}\nBOT_PREFIX={prefix}\n");
Console.WriteLine("Please insert your prefix (max. 1 character long):");
Console.WriteLine("For a prefix longer then one character, the first character will be saved and the others will be ignored.\n No spaces or numbers allowed");
Console.Write("Prefix = ");
char prefix = Console.ReadLine()![0];
if (prefix == ' ' || char.IsDigit(prefix)) continue;
Config.AddValueToVariables("prefix", prefix.ToString(), false);
break; break;
} }
else Console.WriteLine("Invalid Token !");
} }
if (!Config.ContainsKey("prefix"))
{
Console.WriteLine("Please insert your prefix (max. 1 character long):");
Console.WriteLine("For a prefix longer then one character, the first character will be saved and the others will be ignored.\n No spaces or numbers allowed");
Console.Write("Prefix = ");
char prefix = Console.ReadLine()![0];
if (prefix == ' ' || char.IsDigit(prefix)) return;
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 Task NoGUI(Boot discordbooter)
{ {
Language.LoadLanguage();
ConsoleCommandsHandler consoleCommandsHandler = new ConsoleCommandsHandler(discordbooter.client); ConsoleCommandsHandler consoleCommandsHandler = new ConsoleCommandsHandler(discordbooter.client);
if (loadPluginsOnStartup) if (loadPluginsOnStartup) consoleCommandsHandler.HandleCommand("lp");
consoleCommandsHandler.HandleCommand("lp"); if (listPluginsAtStartup) consoleCommandsHandler.HandleCommand("listplugs");
if (listPluginsAtStartup) Config.SaveConfig();
consoleCommandsHandler.HandleCommand("listplugs");
if (listLanguagAtStartup)
consoleCommandsHandler.HandleCommand("listlang");
while (true) while (true)
{ {
Console.ForegroundColor = ConsoleColor.White; Console.ForegroundColor = ConsoleColor.White;
@@ -98,29 +91,29 @@ 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"); Console.WriteLine("Discord BOT for Cross Platform");
Console.WriteLine("Created by: Wizzy\nDiscord: Wizzy#9181"); Console.WriteLine("Created by: Wizzy\nDiscord: Wizzy#9181");
if (ShowStartupMessage)
try
{
Console.WriteLine("Connecting to server ...");
List<string> text = await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/StartupMessage");
foreach (var t in text) Console_Utilities.WriteColorText(t);
}
catch { Console.WriteLine("Failed to connect to server."); }
Console.ForegroundColor = ConsoleColor.White; Console.ForegroundColor = ConsoleColor.White;
Console.WriteLine("============================ Discord BOT - Cross Platform ============================"); Console.WriteLine("============================ Discord BOT - Cross Platform ============================");
string token = Functions.readCodeFromFile(Functions.dataFolder + "DiscordBotCore.data", "BOT_TOKEN", '=');
string prefix = Functions.readCodeFromFile(Functions.dataFolder + "DiscordBotCore.data", "BOT_PREFIX", '='); try
{
string token = Config.GetValue<string>("token");
string 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
@@ -145,16 +138,6 @@ 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)
{ {
if (args.Length == 0)
{
if (File.Exists("./ref/startupArguments.txt"))
{
var lines = await File.ReadAllLinesAsync("./ref/startupArguments.txt");
args = lines;
}
}
int len = args.Length; int len = args.Length;
if (len == 1 && args[0] == "--help") if (len == 1 && args[0] == "--help")
{ {
@@ -164,8 +147,13 @@ namespace DiscordBot
if (len == 1 && args[0] == "--logout") if (len == 1 && args[0] == "--logout")
{ {
File.Delete(Functions.dataFolder + "Login.dat"); File.Delete(Functions.dataFolder + "config.json");
Console.WriteLine("Logged out. Please restart the application !"); await Task.Run(async () =>
{
await Task.Delay(1000);
Environment.Exit(0x08);
}
);
return; return;
} }
@@ -177,20 +165,22 @@ namespace DiscordBot
return; return;
} }
if (len > 0 && (args.Contains("--cmd") || args.Contains("--args") || args.Contains("--nomessage"))) if (len == 3 && args[0] == "/download")
{ {
if (args.Contains("lp") || args.Contains("loadplugins")) string url = args[1];
loadPluginsOnStartup = true; string location = args[2];
if (args.Contains("listplugs"))
listPluginsAtStartup = true; await ServerCom.DownloadFileAsync(url, location);
if (args.Contains("listlang"))
listLanguagAtStartup = true; return;
if (args.Contains("--nomessage"))
ShowStartupMessage = false;
len = 0;
} }
if (len > 0 && (args.Contains("--cmd") || args.Contains("--args") || args.Contains("--nomessage")))
{
if (args.Contains("lp") || args.Contains("loadplugins")) loadPluginsOnStartup = true;
if (args.Contains("listplugs")) listPluginsAtStartup = true;
len = 0;
}
if (len == 0 || args[0] != "--exec" && args[0] != "--execute") if (len == 0 || args[0] != "--exec" && args[0] != "--execute")
@@ -200,13 +190,13 @@ namespace DiscordBot
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"
@@ -219,10 +209,6 @@ namespace DiscordBot
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;
@@ -241,7 +227,6 @@ namespace DiscordBot
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");
@@ -259,11 +244,21 @@ namespace DiscordBot
Boot booter = await StartNoGUI(); Boot booter = await StartNoGUI();
await NoGUI(booter); await NoGUI(booter);
return; 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 (string file in Directory.GetFiles("./Output/Logs/"))
File.Delete(file);
}
} }
} }

View File

@@ -1,10 +1,11 @@
using Avalonia; using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
namespace DiscordBotGUI namespace DiscordBotGUI;
{
public partial class App : Application public class App : Application
{ {
public override void Initialize() public override void Initialize()
{ {
@@ -13,15 +14,8 @@ namespace DiscordBotGUI
public override void OnFrameworkInitializationCompleted() public override void OnFrameworkInitializationCompleted()
{ {
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) desktop.MainWindow = new AppUpdater { Width = 300, Height = 50, WindowStartupLocation = WindowStartupLocation.CenterScreen };
{
desktop.MainWindow = new AppUpdater() { Width = 300, Height = 50, WindowStartupLocation = Avalonia.Controls.WindowStartupLocation.CenterScreen };
}
base.OnFrameworkInitializationCompleted(); base.OnFrameworkInitializationCompleted();
} }
} }
}

View File

@@ -7,10 +7,11 @@
Title="AppUpdater" Title="AppUpdater"
Background="Transparent" Background="Transparent"
TransparencyLevelHint="AcrylicBlur" TransparencyLevelHint="AcrylicBlur"
HasSystemDecorations="False"> SystemDecorations="BorderOnly">
<StackPanel Margin="10"> <StackPanel Margin="10">
<TextBlock x:Class="DiscordBotGUI.AppUpdater" x:Name="textBox1" Text="Checking for updates..." /> <TextBlock x:Class="DiscordBotGUI.AppUpdater" x:Name="textBox1" Text="Checking for updates..." />
<ProgressBar IsIndeterminate="True" x:Class="DiscordBotGUI.AppUpdater" x:Name="progressBar1" Foreground="Yellow" /> <ProgressBar IsIndeterminate="True" x:Class="DiscordBotGUI.AppUpdater" x:Name="progressBar1"
Foreground="Yellow" />
</StackPanel> </StackPanel>
</Window> </Window>

View File

@@ -1,62 +1,65 @@
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using PluginManager.Online; using PluginManager.Online;
using PluginManager.Others; using PluginManager.Others;
using System.Threading.Tasks; using System.Threading.Tasks;
using System; using System;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
using System.Drawing; using PluginManager;
using Avalonia.Media;
namespace DiscordBotGUI namespace DiscordBotGUI
{ {
public partial class AppUpdater : Window public partial class AppUpdater : Window
{ {
private string _version; private string _version = "";
public AppUpdater() public AppUpdater()
{ {
InitializeComponent(); InitializeComponent();
Config.LoadConfig().Wait();
if (!File.Exists("./Version.txt")) if (!File.Exists("./Version.txt"))
{ {
textBox1.Text = "Checking ...";
File.WriteAllText("./Version.txt", "DiscordBotVersion=0"); File.WriteAllText("./Version.txt", "DiscordBotVersion=0");
//DownloadDiscordBotClientNoGUIAsDLL(); DownloadDiscordBotClientNoGUIAsDLL();
} }
if (!File.Exists("./DiscordBot.exe")) DownloadDiscordBotClientNoGUIAsDLL();
Updates(); Updates();
} }
/* private async void DownloadDiscordBotClientNoGUIAsDLL() private async void DownloadDiscordBotClientNoGUIAsDLL()
{ {
//await Task.Delay(5000); //await Task.Delay(5000);
string url_bot_dll = "https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/DiscordBot.dll"; string url_bot_dll = "https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/DiscordBot.zip";
int actiontype = 0; //0 - downolad, 1- extract
IProgress<float> progress = new Progress<float>((percent) => IProgress<float> progress = new Progress<float>((percent) =>
{ {
textBox1.Text = "Downloading DiscordBot.dll ... " + (percent * 100).ToString() + "%"; if (actiontype == 0)
this.progressBar1.Value = percent * 100; textBox1.Text = "Downloading DiscordBot ... " + MathF.Round(percent, 2) + "%";
else
textBox1.Text = "Extracting package ..." + MathF.Round(percent, 2) + "%";
this.progressBar1.Value = percent;
}); });
this.progressBar1.IsIndeterminate = false; this.progressBar1.IsIndeterminate = false;
try try
{ {
await ServerCom.DownloadFileAsync(url_bot_dll, "./DiscordBot.dll", progress); await ServerCom.DownloadFileAsync(url_bot_dll, "./DiscordBot.zip", progress);
actiontype++;
await Functions.ExtractArchive("./DiscordBot.zip", "./", progress);
} }
catch catch
{ {
textBox1.Text = "Error downloading DiscordBot.dll. Server is not responding."; textBox1.Text = "Error downloading DiscordBot.dll. Server is not responding.";
await Task.Delay(1000); await Task.Delay(1000);
return;
}
//new MainWindow() { Height = 425, Width = 500 }.Show(); new MainWindow() { Height = 425, Width = 500 }.Show();
//Close(); Close();
}*/ }
}
private async void Updates() private async void Updates()
{ {
@@ -82,10 +85,7 @@ namespace DiscordBotGUI
return; return;
} }
IProgress<float> progress = new Progress<float>((percent) => IProgress<float> progress = new Progress<float>((percent) => { this.progressBar1.Value = percent; });
{
this.progressBar1.Value = percent;
});
textBox1.Text = "Extracting update files ..."; textBox1.Text = "Extracting update files ...";
await Functions.ExtractArchive(file, "./", progress); await Functions.ExtractArchive(file, "./", progress);
@@ -96,7 +96,6 @@ namespace DiscordBotGUI
await Task.Delay(5000); await Task.Delay(5000);
new MainWindow() { Height = 425, Width = 650 }.Show(); new MainWindow() { Height = 425, Width = 650 }.Show();
this.Close(); this.Close();
} }
private async Task<string> DownloadNewUpdate() private async Task<string> DownloadNewUpdate()
@@ -124,7 +123,6 @@ namespace DiscordBotGUI
string FileName = $"{urlNewUpdateZip.Split('/')[urlNewUpdateZip.Split('/').Length - 1]}"; string FileName = $"{urlNewUpdateZip.Split('/')[urlNewUpdateZip.Split('/').Length - 1]}";
try try
{ {
new Thread(new Task(() => new Thread(new Task(() =>
{ {
while (isDownloading) while (isDownloading)
@@ -142,6 +140,7 @@ namespace DiscordBotGUI
await Task.Delay(1000); await Task.Delay(1000);
return null; return null;
} }
isDownloading = false; isDownloading = false;
return FileName; return FileName;
} }
@@ -150,20 +149,20 @@ namespace DiscordBotGUI
{ {
try try
{ {
string current_version = Config.GetValue<string>("Version");
string current_version = Functions.readCodeFromFile("Version.txt", "DiscordBotVersion", '=') ?? "0"; if (current_version == null)
if (!Config.SetValue("Version", "0"))
Config.AddValueToVariables("Version", "0", false);
string latest_version = (await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/Version"))[0]; string latest_version = (await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Updates/Version"))[0];
_version = latest_version; _version = latest_version;
if (current_version != latest_version) if (current_version != latest_version) { return true; }
{
return true;
}
return false; return false;
} }
catch (Exception ex) catch (Exception ex)
{ {
textBox1.Text = "Error while checking for updates. Server is not responding."; textBox1.Text = "Error while checking for updates. Server is not responding.";
Functions.WriteErrFile(ex.Message);
return false; return false;
} }
} }

View File

@@ -15,21 +15,25 @@
<MenuItem Header="Commands" x:Class="DiscordBotGUI.MainWindow" x:Name="commandsSettingMenuItem" /> <MenuItem Header="Commands" x:Class="DiscordBotGUI.MainWindow" x:Name="commandsSettingMenuItem" />
<MenuItem Header="Events" x:Class="DiscordBotGUI.MainWindow" x:Name="eventsSettingMenuItem" /> <MenuItem Header="Events" x:Class="DiscordBotGUI.MainWindow" x:Name="eventsSettingMenuItem" />
</MenuItem> </MenuItem>
<MenuItem Header="Application Variables" x:Class="DiscordBotGUI.MainWindow"
x:Name="applicationVariablesMenuItem" />
</Menu> </Menu>
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label1" Content="Discord Token" /> <Label x:Class="DiscordBotGUI.MainWindow" x:Name="label1" Content="Discord Token" />
<TextBox x:Class="DiscordBotGUI.MainWindow" x:Name="textBox1" IsReadOnly="True" TextAlignment="Center" Text="" /> <TextBox x:Class="DiscordBotGUI.MainWindow" x:Name="textBox1" IsReadOnly="True" TextAlignment="Center" Text="" />
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label2" Content="Bot Prefix" /> <Label x:Class="DiscordBotGUI.MainWindow" x:Name="label2" Content="Bot Prefix" />
<TextBox x:Class="DiscordBotGUI.MainWindow" x:Name="textBox2" TextAlignment="Center" HorizontalAlignment="Left" IsReadOnly="True" Text=""/> <TextBox x:Class="DiscordBotGUI.MainWindow" x:Name="textBox2" TextAlignment="Center" HorizontalAlignment="Left"
IsReadOnly="True" Text="" />
<Border Background="Black" Padding="0.5" Margin="25" /> <Border Background="Black" Padding="0.5" Margin="25" />
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label3" Content="Start Arguments: " /> <Label x:Class="DiscordBotGUI.MainWindow" x:Name="label3" Content="Start Arguments: " />
<TextBox x:Class="DiscordBotGUI.MainWindow" x:Name="textBox3" Width="250" TextAlignment="Center" HorizontalAlignment="Left" IsReadOnly="False" Text=""/> <TextBox x:Class="DiscordBotGUI.MainWindow" x:Name="textBox3" Width="250" TextAlignment="Center"
HorizontalAlignment="Left" IsReadOnly="False" Text="" />
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label4" Content="" Foreground="Red" Margin="10" /> <Label x:Class="DiscordBotGUI.MainWindow" x:Name="label4" Content="" Foreground="Red" Margin="10" />
<Button x:Class="DiscordBotGUI.MainWindow" x:Name="button1" HorizontalAlignment="Center" VerticalAlignment="Bottom" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="200" Content="Start Bot" Margin="0,75,0,0" /> <Button x:Class="DiscordBotGUI.MainWindow" x:Name="button1" HorizontalAlignment="Center"
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label5" Content="" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,0,0"/> VerticalAlignment="Bottom" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
Width="200" Content="Start Bot" Margin="0,75,0,0" />
<Label x:Class="DiscordBotGUI.MainWindow" x:Name="label5" Content="" VerticalAlignment="Bottom"
HorizontalAlignment="Right" Margin="0,0,0,0" />
</StackPanel> </StackPanel>
</Window> </Window>

View File

@@ -1,16 +1,13 @@
using Avalonia.Controls;
using System.Threading.Tasks;
using PluginManager.Others;
using System.IO;
using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using Avalonia.Controls;
using DiscordBotGUI.Settings; using DiscordBotGUI.Settings;
using Avalonia.Themes.Fluent; using PluginManager;
using PluginManager.Others;
namespace DiscordBotGUI;
namespace DiscordBotGUI
{
public partial class MainWindow : Window public partial class MainWindow : Window
{ {
public MainWindow() public MainWindow()
@@ -18,23 +15,17 @@ namespace DiscordBotGUI
InitializeComponent(); InitializeComponent();
LoadElements(); LoadElements();
} }
private void LoadElements() private void LoadElements()
{ {
textBox3.Watermark = "Insert start arguments"; textBox3.Watermark = "Insert start arguments";
if (File.Exists("./Version.txt")) if (File.Exists("./Version.txt")) label5.Content = Config.GetValue<string>("Version");
label5.Content = Functions.readCodeFromFile("./Version.txt", "DiscordBotVersion", '=');
button1.Click += async (sender, e) => button1.Click += async (sender, e) =>
{ {
var token = textBox1.Text;
string token = textBox1.Text; var prefix = textBox2.Text;
string prefix = textBox2.Text; var args = "--nomessage " + textBox3.Text;
string args = "--nomessage " + textBox3.Text;
if (!((token.Length == 70 || token.Length == 59) && prefix.Length == 1)) if (!((token.Length == 70 || token.Length == 59) && prefix.Length == 1))
{ {
@@ -44,29 +35,27 @@ namespace DiscordBotGUI
return; return;
} }
Functions.WriteToSettings(Functions.dataFolder + "DiscordBotCore.data", "BOT_TOKEN", token, '='); Config.SetValue("token", token);
Functions.WriteToSettings(Functions.dataFolder + "DiscordBotCore.data", "BOT_PREFIX", prefix, '='); Config.SetValue("prefix", prefix);
RunDiscordBot(args); RunDiscordBot(args);
}; };
commandsSettingMenuItem.Click += (sender, e) => new Commands() /*{ Height = 200, Width = 550 }*/.ShowDialog(this); commandsSettingMenuItem.Click += (sender, e) => new Commands() /*{ Height = 200, Width = 550 }*/.ShowDialog(this);
eventsSettingMenuItem.Click += (sender, e) => new Events() /*{ Height = 200, Width = 550 }*/.ShowDialog(this); eventsSettingMenuItem.Click += (sender, e) => new Events() /*{ Height = 200, Width = 550 }*/.ShowDialog(this);
applicationVariablesMenuItem.Click += (sender, e) => new ApplicationVariables().ShowDialog(this);
var folder = $"{Functions.dataFolder}DiscordBotCore.data";
string folder = $"{Functions.dataFolder}DiscordBotCore.data";
Directory.CreateDirectory(Functions.dataFolder); Directory.CreateDirectory(Functions.dataFolder);
try try
{ {
string? botToken = Functions.readCodeFromFile(folder, "BOT_TOKEN", '='); var botToken = Config.GetValue<string>("token");
string? botPrefix = Functions.readCodeFromFile(folder, "BOT_PREFIX", '='); var botPrefix = Config.GetValue<string>("prefix");
if (botToken == null || botPrefix == null) if (botToken == null || botPrefix == null)
{ {
textBox1.IsReadOnly = false; textBox1.IsReadOnly = false;
textBox2.IsReadOnly = false; textBox2.IsReadOnly = false;
textBox1.Watermark = "Insert Bot Token Here"; textBox1.Watermark = "Insert Bot Token Here";
textBox2.Watermark = "Insert Bot Prefix Here"; textBox2.Watermark = "Insert Bot Prefix Here";
} }
else else
{ {
@@ -81,23 +70,17 @@ namespace DiscordBotGUI
textBox1.Watermark = "Insert Bot Token Here"; textBox1.Watermark = "Insert Bot Token Here";
textBox2.Watermark = "Insert Bot Prefix Here"; textBox2.Watermark = "Insert Bot Prefix Here";
} }
} }
private void RunDiscordBot(string args) private void RunDiscordBot(string args)
{ {
var os = Functions.GetOperatingSystem(); var os = Functions.GetOperatingSystem();
if (os == PluginManager.Others.OperatingSystem.WINDOWS) if (os == OperatingSystem.WINDOWS)
Process.Start("./DiscordBot.exe", args); Process.Start("./DiscordBot.exe", args);
else if (os == PluginManager.Others.OperatingSystem.LINUX) else if (os == OperatingSystem.LINUX)
Process.Start("./DiscordBot", args); Process.Start("./DiscordBot", args);
else if (os == PluginManager.Others.OperatingSystem.MAC_OS) else if (os == OperatingSystem.MAC_OS) Process.Start("./DiscordBot.app/Contents/MacOS/DiscordBot", args);
Process.Start("./DiscordBot.app/Contents/MacOS/DiscordBot", args);
Close(); Close();
return;
}
} }
} }

View File

@@ -1,13 +1,8 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using System; using System;
using System.IO; using Avalonia;
using System.Threading.Tasks;
namespace DiscordBotGUI;
namespace DiscordBotGUI
{
internal class Program internal class Program
{ {
// Initialization code. Don't use any Avalonia, third-party APIs or any // Initialization code. Don't use any Avalonia, third-party APIs or any
@@ -22,7 +17,8 @@ namespace DiscordBotGUI
// Avalonia configuration, don't remove; also used by visual designer. // Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>() {
return AppBuilder.Configure<App>()
.UsePlatformDetect() .UsePlatformDetect()
.LogToTrace(); .LogToTrace();
} }

View File

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

View File

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

View File

@@ -12,10 +12,13 @@
<Label Content="Installed Commands" /> <Label Content="Installed Commands" />
<TextBox x:Class="DiscordBotGUI.Settings.Commands" x:Name="textbox1" TextAlignment="Left" IsReadOnly="True" /> <TextBox x:Class="DiscordBotGUI.Settings.Commands" x:Name="textbox1" TextAlignment="Left" IsReadOnly="True" />
<Label Content="Install another command" /> <Label Content="Install another command" />
<ComboBox x:Class="DiscordBotGUI.Settings.Commands" x:Name="comboBox1" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,10" Padding="200,0" /> <ComboBox x:Class="DiscordBotGUI.Settings.Commands" x:Name="comboBox1" HorizontalAlignment="Left"
VerticalAlignment="Top" Margin="0,10" Padding="200,0" />
<Button x:Class="DiscordBotGUI.Settings.Commands" x:Name="button1" HorizontalAlignment="Left" Content="Install" /> <Button x:Class="DiscordBotGUI.Settings.Commands" x:Name="button1" HorizontalAlignment="Left" Content="Install" />
<ProgressBar x:Class="DiscordBotGUI.Settings.Commands" x:Name="progressBar1" HorizontalAlignment="Left" Margin="0,10" Foreground="Yellow" /> <ProgressBar x:Class="DiscordBotGUI.Settings.Commands" x:Name="progressBar1" HorizontalAlignment="Left"
<Label x:Class="DiscordBotGUI.Settings.Commands" x:Name="label1" Content="" HorizontalAlignment="Left" Margin="0,10" /> Margin="0,10" Foreground="Yellow" />
<Label x:Class="DiscordBotGUI.Settings.Commands" x:Name="label1" Content="" HorizontalAlignment="Left"
Margin="0,10" />
</StackPanel> </StackPanel>
</Window> </Window>

View File

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

View File

@@ -12,9 +12,12 @@
<Label Content="Installed Events" /> <Label Content="Installed Events" />
<TextBox x:Class="DiscordBotGUI.Settings.Events" x:Name="textbox1" TextAlignment="Left" IsReadOnly="True" /> <TextBox x:Class="DiscordBotGUI.Settings.Events" x:Name="textbox1" TextAlignment="Left" IsReadOnly="True" />
<Label Content="Install another Events" /> <Label Content="Install another Events" />
<ComboBox x:Class="DiscordBotGUI.Settings.Events" x:Name="comboBox1" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,10" Padding="200,0" /> <ComboBox x:Class="DiscordBotGUI.Settings.Events" x:Name="comboBox1" HorizontalAlignment="Left"
VerticalAlignment="Top" Margin="0,10" Padding="200,0" />
<Button x:Class="DiscordBotGUI.Settings.Events" x:Name="button1" HorizontalAlignment="Left" Content="Install" /> <Button x:Class="DiscordBotGUI.Settings.Events" x:Name="button1" HorizontalAlignment="Left" Content="Install" />
<ProgressBar x:Class="DiscordBotGUI.Settings.Events" x:Name="progressBar1" HorizontalAlignment="Left" Margin="0,10" Foreground="Yellow" /> <ProgressBar x:Class="DiscordBotGUI.Settings.Events" x:Name="progressBar1" HorizontalAlignment="Left"
<Label x:Class="DiscordBotGUI.Settings.Events" x:Name="label1" Content="" HorizontalAlignment="Left" Margin="0,10" /> Margin="0,10" Foreground="Yellow" />
<Label x:Class="DiscordBotGUI.Settings.Events" x:Name="label1" Content="" HorizontalAlignment="Left"
Margin="0,10" />
</StackPanel> </StackPanel>
</Window> </Window>

View File

@@ -1,33 +1,25 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using PluginManager.Others;
using System.Collections.Generic;
using System; using System;
using System.Linq; using System.Collections.Generic;
using System.Reflection.Emit;
using System.Threading.Tasks;
using static PluginManager.Others.Console_Utilities;
using System.IO; using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Avalonia.Controls;
using PluginManager.Online;
using PluginManager.Others;
using OperatingSystem = PluginManager.Others.OperatingSystem;
namespace DiscordBotGUI.Settings;
namespace DiscordBotGUI.Settings
{
public partial class Events : Window public partial class Events : Window
{ {
List<string> events = new List<string>(); private List<string> events = new();
public Events() public Events()
{ {
InitializeComponent(); InitializeComponent();
LoadData(); LoadData();
LoadComboBox(); LoadComboBox();
button1.Click += async (sender, e) => button1.Click += async (sender, e) => { await Download(); };
{
await Download();
};
} }
private void LoadData() private void LoadData()
@@ -39,37 +31,42 @@ namespace DiscordBotGUI.Settings
Directory.CreateDirectory("./Data/Plugins/Events/"); Directory.CreateDirectory("./Data/Plugins/Events/");
textbox1.IsReadOnly = false; textbox1.IsReadOnly = false;
textbox1.Text = ""; textbox1.Text = "";
var files = System.IO.Directory.EnumerateFiles("./Data/Plugins/Events/"); var files = Directory.EnumerateFiles("./Data/Plugins/Events/");
if (files == null || files.Count() < 1) return; if (files == null || files.Count() < 1) return;
foreach (var file in files) foreach (var file in files) textbox1.Text += file.Split('/')[file.Split('/').Length - 1] + "\n";
textbox1.Text += file.Split('/')[file.Split('/').Length - 1] + "\n";
} }
catch { } catch
{
} }
}
private async void LoadComboBox() private async void LoadComboBox()
{ {
comboBox1.Items = null; comboBox1.Items = null;
events = await PluginManager.Online.ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Plugins"); events = await ServerCom.ReadTextFromFile("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Plugins");
if (events == null) return; if (events == null) return;
string[] plugins = events.ToArray(); var plugins = events.ToArray();
string OS; string OS;
var OSG = Functions.GetOperatingSystem(); var OSG = Functions.GetOperatingSystem();
if (OSG == PluginManager.Others.OperatingSystem.WINDOWS) OS = "Windows"; if (OSG == OperatingSystem.WINDOWS)
else if (OSG == PluginManager.Others.OperatingSystem.LINUX) OS = "Linux"; OS = "Windows";
else OS = "MAC_OS"; else if (OSG == OperatingSystem.LINUX)
List<string> data = new List<string>(); OS = "Linux";
for (int i = 0; i < plugins.Length; i++) else
OS = "MAC_OS";
var data = new List<string>();
for (var i = 0; i < plugins.Length; i++)
{ {
if (!plugins[i].Contains(OS) || !plugins[i].Contains("Event")) if (!plugins[i].Contains(OS) || !plugins[i].Contains("Event")) continue;
continue;
string[] info = plugins[i].Split(','); var info = plugins[i].Split(',');
try try
{ {
if (System.IO.Directory.EnumerateFiles("./Data/Plugins/Events/").Any(x => x.EndsWith(info[0] + ".dll"))) if (Directory.EnumerateFiles("./Data/Plugins/Events/").Any(x => x.EndsWith(info[0] + ".dll"))) continue;
continue; }
catch
{
} }
catch { }
data.Add($"{info[0]} - {info[1]} - {info[2]}"); data.Add($"{info[0]} - {info[1]} - {info[2]}");
@@ -77,14 +74,14 @@ namespace DiscordBotGUI.Settings
comboBox1.Items = data; comboBox1.Items = data;
} }
private async Task Download() private async Task Download()
{ {
if (comboBox1 == null || comboBox1.SelectedIndex == -1 || comboBox1.SelectedItem == null) if (comboBox1 == null || comboBox1.SelectedIndex == -1 || comboBox1.SelectedItem == null) return;
return; var pluginName = comboBox1?.SelectedItem?.ToString()?.Split('-')[0].Trim();
string? pluginName = comboBox1?.SelectedItem?.ToString()?.Split('-')[0].Trim();
if (pluginName == null) return; if (pluginName == null) return;
string? URL = (from s in events var URL = (from s in events
where s.StartsWith(pluginName) where s.StartsWith(pluginName)
select s.Split(',')[3].Trim()).FirstOrDefault(); select s.Split(',')[3].Trim()).FirstOrDefault();
@@ -103,24 +100,26 @@ namespace DiscordBotGUI.Settings
await Task.Delay(5000); await Task.Delay(5000);
label1.Content = ""; label1.Content = "";
} }
progressBar1.Value = value;
});
await PluginManager.Online.ServerCom.DownloadFileAsync(URL, "./Data/Plugins/Events/" + pluginName + ".dll", progress); progressBar1.Value = value;
string? requirements = (from s in events }
);
await ServerCom.DownloadFileAsync(URL, "./Data/Plugins/Events/" + pluginName + ".dll", progress);
var requirements = (from s in events
where s.StartsWith(pluginName) && s.Split(',').Length == 6 where s.StartsWith(pluginName) && s.Split(',').Length == 6
select s.Split(',')[5].Trim()).FirstOrDefault(); select s.Split(',')[5].Trim()).FirstOrDefault();
if (requirements == null) return; if (requirements == null) return;
List<string> req = await PluginManager.Online.ServerCom.ReadTextFromFile(requirements); var req = await ServerCom.ReadTextFromFile(requirements);
if (req == null) return; if (req == null) return;
foreach (var requirement in req) foreach (var requirement in req)
{ {
string[] info = requirement.Split(','); var info = requirement.Split(',');
pluginName = info[1]; pluginName = info[1];
progress.Report(0); progress.Report(0);
await PluginManager.Online.ServerCom.DownloadFileAsync(info[0], $"./{info[1]}", progress); await ServerCom.DownloadFileAsync(info[0], $"./{info[1]}", progress);
await Task.Delay(1000); await Task.Delay(1000);
@@ -129,11 +128,8 @@ namespace DiscordBotGUI.Settings
await Functions.ExtractArchive("./" + info[1], "./", progress); await Functions.ExtractArchive("./" + info[1], "./", progress);
await Task.Delay(1000); await Task.Delay(1000);
} }
} }
label1.Content = ""; label1.Content = "";
}
} }
} }

View File

@@ -13,18 +13,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Events", "Events", "{A290C0
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commands", "Commands", "{449FA364-0B72-43FF-B3A3-806E2916200E}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commands", "Commands", "{449FA364-0B72-43FF-B3A3-806E2916200E}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMD_LevelingSystem", "CMD_LevelingSystem\CMD_LevelingSystem.csproj", "{A48E8DC6-DBA2-4B47-9D59-46F4835F82CC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EVE_LevelingSystem", "EVE_LevelingSystem\EVE_LevelingSystem.csproj", "{1C1E7F3D-E05A-4A87-9789-62D98904C200}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartupEvents", "StartupEvents\StartupEvents.csproj", "{CE9DBF06-38A0-4192-8B3E-4009210D040D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMD_Utils", "CMD_Utils\CMD_Utils.csproj", "{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CMD_Utils", "CMD_Utils\CMD_Utils.csproj", "{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicCommands", "MusicCommands\MusicCommands.csproj", "{B1B4976E-5112-4217-B57B-3A03C5207B6E}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicCommands", "MusicCommands\MusicCommands.csproj", "{B1B4976E-5112-4217-B57B-3A03C5207B6E}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordBotGUI", "DiscordBotGUI\DiscordBotGUI.csproj", "{7B5899F0-0218-4537-8C74-6210ED2D3690}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordBotGUI", "DiscordBotGUI\DiscordBotGUI.csproj", "{7B5899F0-0218-4537-8C74-6210ED2D3690}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EVE_LevelingSystem", "EVE_LevelingSystem\EVE_LevelingSystem.csproj", "{EEC445DC-0C4B-43EA-8694-606BA0390B77}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMD_LevelingSystem", "CMD_LevelingSystem\CMD_LevelingSystem.csproj", "{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -39,18 +37,6 @@ Global
{EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}.Release|Any CPU.ActiveCfg = Release|Any CPU {EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}.Release|Any CPU.Build.0 = Release|Any CPU {EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}.Release|Any CPU.Build.0 = Release|Any CPU
{A48E8DC6-DBA2-4B47-9D59-46F4835F82CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A48E8DC6-DBA2-4B47-9D59-46F4835F82CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A48E8DC6-DBA2-4B47-9D59-46F4835F82CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A48E8DC6-DBA2-4B47-9D59-46F4835F82CC}.Release|Any CPU.Build.0 = Release|Any CPU
{1C1E7F3D-E05A-4A87-9789-62D98904C200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C1E7F3D-E05A-4A87-9789-62D98904C200}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C1E7F3D-E05A-4A87-9789-62D98904C200}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C1E7F3D-E05A-4A87-9789-62D98904C200}.Release|Any CPU.Build.0 = Release|Any CPU
{CE9DBF06-38A0-4192-8B3E-4009210D040D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE9DBF06-38A0-4192-8B3E-4009210D040D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE9DBF06-38A0-4192-8B3E-4009210D040D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE9DBF06-38A0-4192-8B3E-4009210D040D}.Release|Any CPU.Build.0 = Release|Any CPU
{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {E26C87A4-3DD6-4B58-B14B-C8E086B852F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -63,6 +49,14 @@ Global
{7B5899F0-0218-4537-8C74-6210ED2D3690}.Debug|Any CPU.Build.0 = Debug|Any CPU {7B5899F0-0218-4537-8C74-6210ED2D3690}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B5899F0-0218-4537-8C74-6210ED2D3690}.Release|Any CPU.ActiveCfg = Release|Any CPU {7B5899F0-0218-4537-8C74-6210ED2D3690}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B5899F0-0218-4537-8C74-6210ED2D3690}.Release|Any CPU.Build.0 = Release|Any CPU {7B5899F0-0218-4537-8C74-6210ED2D3690}.Release|Any CPU.Build.0 = Release|Any CPU
{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEC445DC-0C4B-43EA-8694-606BA0390B77}.Release|Any CPU.Build.0 = Release|Any CPU
{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -70,11 +64,10 @@ Global
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{A290C028-77C4-4D1D-AB43-DDFE6ABD9012} = {1862ABD5-7C30-4F15-A561-45AC8A9CA10E} {A290C028-77C4-4D1D-AB43-DDFE6ABD9012} = {1862ABD5-7C30-4F15-A561-45AC8A9CA10E}
{449FA364-0B72-43FF-B3A3-806E2916200E} = {1862ABD5-7C30-4F15-A561-45AC8A9CA10E} {449FA364-0B72-43FF-B3A3-806E2916200E} = {1862ABD5-7C30-4F15-A561-45AC8A9CA10E}
{A48E8DC6-DBA2-4B47-9D59-46F4835F82CC} = {449FA364-0B72-43FF-B3A3-806E2916200E}
{1C1E7F3D-E05A-4A87-9789-62D98904C200} = {A290C028-77C4-4D1D-AB43-DDFE6ABD9012}
{CE9DBF06-38A0-4192-8B3E-4009210D040D} = {A290C028-77C4-4D1D-AB43-DDFE6ABD9012}
{E26C87A4-3DD6-4B58-B14B-C8E086B852F9} = {449FA364-0B72-43FF-B3A3-806E2916200E} {E26C87A4-3DD6-4B58-B14B-C8E086B852F9} = {449FA364-0B72-43FF-B3A3-806E2916200E}
{B1B4976E-5112-4217-B57B-3A03C5207B6E} = {449FA364-0B72-43FF-B3A3-806E2916200E} {B1B4976E-5112-4217-B57B-3A03C5207B6E} = {449FA364-0B72-43FF-B3A3-806E2916200E}
{EEC445DC-0C4B-43EA-8694-606BA0390B77} = {A290C028-77C4-4D1D-AB43-DDFE6ABD9012}
{1A4E49FF-9A0A-4C54-AF35-CFFBA64353D9} = {449FA364-0B72-43FF-B3A3-806E2916200E}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3FB3C5DE-ED21-4D2E-ABDD-3A00EE4A2FFF} SolutionGuid = {3FB3C5DE-ED21-4D2E-ABDD-3A00EE4A2FFF}

View File

@@ -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);
}
}

View File

@@ -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]);
}

View File

@@ -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>..\DiscordBot\bin\Debug\net6.0\Data\Plugins\Events\LevelingSystem</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" />

View File

@@ -0,0 +1,54 @@
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");
Config.AddValueToVariables("LevelingSystemPath", "./Data/Resources/LevelingSystem", true);
Config.AddValueToVariables("LevelingSystemSettingsFile", "./Data/Resources/LevelingSystemSettings.txt", true);
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);
}
}
}

View File

@@ -1,56 +0,0 @@
using System.Threading.Tasks;
using Discord.WebSocket;
using PluginManager.Others;
using PluginManager.Interfaces;
using PluginManager.LanguageSystem;
using PluginManager.Items;
using System;
public class LevelingSystem : DBEvent
{
public string name => "Leveling System";
public string description => "Leveling System Event";
public void Start(DiscordSocketClient client)
{
ConsoleCommandsHandler.AddCommand("lvl", "Test command", async (args) =>
{
Console.WriteLine("Leveling system command");
});
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);
}
}

View File

@@ -0,0 +1,57 @@
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(2, 12);
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());
}
);
return false;
}
}
}

View 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; }
}
}

View File

@@ -0,0 +1,13 @@
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; }
}
}

View File

@@ -1,10 +1,9 @@
using Discord; using Discord;
using Discord.Audio; using Discord.Audio;
using MusicCommands; using MusicCommands;
namespace CMD_Utils.Music namespace CMD_Utils.Music;
{
internal static class Data internal static class Data
{ {
internal static IAudioClient audioClient = null; internal static IAudioClient audioClient = null;
@@ -12,4 +11,3 @@ namespace CMD_Utils.Music
internal static MusicPlayer CurrentlyRunning = null; internal static MusicPlayer CurrentlyRunning = null;
} }
}

View File

@@ -1,17 +1,10 @@
using Discord.Commands; using Discord.Commands;
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Interfaces; using PluginManager.Interfaces;
using System; namespace CMD_Utils.Music;
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";
@@ -36,4 +29,3 @@ namespace CMD_Utils.Music
} }
} }
} }
}

View File

@@ -1,21 +1,15 @@
using CMD_Utils.Music; using System;
using PluginManager.Others;
using System;
using System.IO; using System.IO;
using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CMD_Utils.Music;
using PluginManager.Others;
namespace MusicCommands namespace MusicCommands;
internal class MusicPlayer
{ {
class MusicPlayer
{
public Stream inputStream { get; private set; } // from FFMPEG
public Stream outputStream { get; private set; } // to Voice Channel
public MusicPlayer(Stream input, Stream output) public MusicPlayer(Stream input, Stream output)
{ {
inputStream = input; inputStream = input;
@@ -28,8 +22,12 @@ namespace MusicCommands
outputStream = output; outputStream = output;
} }
public Stream inputStream { get; } // from FFMPEG
public Stream outputStream { get; } // to Voice Channel
public bool Paused { get; set; } public bool Paused { get; set; }
private bool _stop { get; set; } private bool _stop { get; set; }
public void Stop() public void Stop()
{ {
_stop = true; _stop = true;
@@ -37,7 +35,6 @@ namespace MusicCommands
public async Task StartSendAudioFromLink(string URL) public async Task StartSendAudioFromLink(string URL)
{ {
/* using (HttpClient client = new HttpClient()) /* using (HttpClient client = new HttpClient())
using (HttpResponseMessage response = await client.GetAsync(URL)) using (HttpResponseMessage response = await client.GetAsync(URL))
using (var content = response.Content) using (var content = response.Content)
@@ -47,13 +44,13 @@ namespace MusicCommands
Stream ms = new MemoryStream(); Stream ms = new MemoryStream();
int bsize = 512; var bsize = 512;
new Thread(async delegate(object o) new Thread(async delegate(object o)
{ {
var response = await new HttpClient().GetAsync(URL); var response = await new HttpClient().GetAsync(URL);
using (var stream = await response.Content.ReadAsStreamAsync()) using (var stream = await response.Content.ReadAsStreamAsync())
{ {
byte[] buffer = new byte[bsize]; var buffer = new byte[bsize];
int read; int read;
while ((read = stream.Read(buffer, 0, buffer.Length)) > 0) while ((read = stream.Read(buffer, 0, buffer.Length)) > 0)
{ {
@@ -63,7 +60,8 @@ namespace MusicCommands
ms.Position = pos; ms.Position = pos;
} }
} }
}).Start(); }
).Start();
Console.Write("Reading data: "); Console.Write("Reading data: ");
while (ms.Length < bsize * 10) while (ms.Length < bsize * 10)
{ {
@@ -71,6 +69,7 @@ namespace MusicCommands
Console.Title = "Reading data: " + ms.Length + " bytes read of " + bsize * 10; Console.Title = "Reading data: " + ms.Length + " bytes read of " + bsize * 10;
Console.Write("."); Console.Write(".");
} }
Console.WriteLine("\nDone"); Console.WriteLine("\nDone");
ms.Position = 0; ms.Position = 0;
@@ -80,14 +79,13 @@ namespace MusicCommands
while (!_stop) while (!_stop)
{ {
if (Paused) continue; if (Paused) continue;
byte[] buffer = new byte[bsize]; var buffer = new byte[bsize];
int read = await ms.ReadAsync(buffer, 0, buffer.Length); var read = await ms.ReadAsync(buffer, 0, buffer.Length);
if (read > 0) if (read > 0)
await outputStream.WriteAsync(buffer, 0, read); await outputStream.WriteAsync(buffer, 0, read);
else break; else
break;
} }
} }
public async Task StartSendAudio() public async Task StartSendAudio()
@@ -97,8 +95,8 @@ namespace MusicCommands
while (!_stop) while (!_stop)
{ {
if (Paused) continue; if (Paused) continue;
int bsize = 512; var bsize = 512;
byte[] buffer = new byte[bsize]; var buffer = new byte[bsize];
var bcount = await inputStream.ReadAsync(buffer, 0, bsize); var bcount = await inputStream.ReadAsync(buffer, 0, bsize);
if (bcount <= 0) if (bcount <= 0)
{ {
@@ -106,6 +104,7 @@ namespace MusicCommands
Data.CurrentlyRunning = null; Data.CurrentlyRunning = null;
break; break;
} }
try try
{ {
await outputStream.WriteAsync(buffer, 0, bcount); await outputStream.WriteAsync(buffer, 0, bcount);
@@ -115,8 +114,6 @@ namespace MusicCommands
await outputStream.FlushAsync(); await outputStream.FlushAsync();
Functions.WriteLogFile(ex.ToString()); Functions.WriteLogFile(ex.ToString());
} }
}
} }
} }
} }

View File

@@ -1,11 +1,10 @@
using Discord.Commands; using Discord.Commands;
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Interfaces; using PluginManager.Interfaces;
namespace CMD_Utils.Music namespace CMD_Utils.Music;
{
class Pause : DBCommand internal class Pause : DBCommand
{ {
public string Command => "pause"; public string Command => "pause";
@@ -24,4 +23,3 @@ namespace CMD_Utils.Music
Data.CurrentlyRunning.Paused = true; Data.CurrentlyRunning.Paused = true;
} }
} }
}

View File

@@ -1,20 +1,17 @@
using Discord; using System;
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 MusicCommands;
using PluginManager.Interfaces; using PluginManager.Interfaces;
using PluginManager.Others; using PluginManager.Others;
using System; namespace CMD_Utils.Music;
using System.Diagnostics;
using System.IO;
namespace CMD_Utils.Music internal class Play : DBCommand
{
class Play : DBCommand
{ {
public string Command => "fplay"; public string Command => "fplay";
@@ -30,8 +27,8 @@ 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"; var path = "./Music";
string FileName = Functions.GetArguments(message).ToArray().MergeStrings(0); var FileName = Functions.GetArguments(message).ToArray().MergeStrings(0);
path += "/" + FileName + ".mp3"; path += "/" + FileName + ".mp3";
if (!File.Exists(path)) if (!File.Exists(path))
{ {
@@ -41,7 +38,11 @@ namespace CMD_Utils.Music
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; } 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(); Data.audioClient = await Data.voiceChannel.ConnectAsync();
@@ -49,8 +50,7 @@ namespace CMD_Utils.Music
using (var output = ffmpeg.StandardOutput.BaseStream) using (var output = ffmpeg.StandardOutput.BaseStream)
using (var discord = Data.audioClient.CreatePCMStream(AudioApplication.Mixed)) using (var discord = Data.audioClient.CreatePCMStream(AudioApplication.Mixed))
{ {
if (Data.CurrentlyRunning != null) if (Data.CurrentlyRunning != null) Data.CurrentlyRunning.Stop();
Data.CurrentlyRunning.Stop();
Data.CurrentlyRunning = new MusicPlayer(output, discord); Data.CurrentlyRunning = new MusicPlayer(output, discord);
await Data.CurrentlyRunning.StartSendAudio(); await Data.CurrentlyRunning.StartSendAudio();
} }
@@ -58,13 +58,6 @@ namespace CMD_Utils.Music
private Process CreateStream(string path) private 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,
});
}
} }
} }

View File

@@ -1,19 +1,11 @@
using CMD_Utils.Music; using CMD_Utils.Music;
using Discord.Commands; 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 MusicCommands internal class Unpause : DBCommand
{
class Unpause : DBCommand
{ {
public string Command => "unpause"; public string Command => "unpause";
@@ -32,4 +24,3 @@ namespace MusicCommands
Data.CurrentlyRunning.Paused = false; Data.CurrentlyRunning.Paused = false;
} }
} }
}

View File

@@ -1,14 +1,13 @@
using CMD_Utils.Music; using CMD_Utils.Music;
using Discord;
using Discord.Audio; using Discord.Audio;
using Discord.Commands; using Discord.Commands;
using Discord.WebSocket; using Discord.WebSocket;
using Discord;
using PluginManager.Interfaces; using PluginManager.Interfaces;
namespace MusicCommands namespace MusicCommands;
{
class lplay : DBCommand internal class lplay : DBCommand
{ {
public string Command => "lplay"; public string Command => "lplay";
@@ -24,7 +23,7 @@ namespace MusicCommands
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 URL = message.Content.Split(' ')[1]; var URL = message.Content.Split(' ')[1];
if (!URL.EndsWith(".mp3") && !URL.EndsWith(".wav") && !URL.EndsWith(".flac") && !URL.EndsWith(".ogg")) if (!URL.EndsWith(".mp3") && !URL.EndsWith(".wav") && !URL.EndsWith(".flac") && !URL.EndsWith(".ogg"))
{ {
await message.Channel.SendMessageAsync("Invalid URL"); await message.Channel.SendMessageAsync("Invalid URL");
@@ -32,21 +31,20 @@ namespace MusicCommands
} }
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; } 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(); Data.audioClient = await Data.voiceChannel.ConnectAsync();
using (var discord = Data.audioClient.CreatePCMStream(AudioApplication.Mixed)) using (var discord = Data.audioClient.CreatePCMStream(AudioApplication.Mixed))
{ {
await message.Channel.SendMessageAsync("Loading..."); await message.Channel.SendMessageAsync("Loading...");
Data.CurrentlyRunning = new MusicPlayer(discord); Data.CurrentlyRunning = new MusicPlayer(discord);
await Data.CurrentlyRunning.StartSendAudioFromLink(URL); await Data.CurrentlyRunning.StartSendAudioFromLink(URL);
} }
} }
}
} }

View File

@@ -1,13 +0,0 @@
<Window
x:Class="PluginManager.BlankWindow1"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:PluginManager"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid>
</Grid>
</Window>

86
PluginManager/Config.cs Normal file
View File

@@ -0,0 +1,86 @@
using PluginManager.Others;
using System.IO;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using System.Collections.Generic;
namespace PluginManager
{
internal class AppConfig
{
public Dictionary<string, object> ApplicationVariables { get; set; }
public List<string> ProtectedKeyWords { get; set; }
}
public static class Config
{
private static AppConfig appConfig;
public static bool AddValueToVariables<T>(string key, T value, bool isProtected)
{
if (appConfig.ApplicationVariables.ContainsKey(key)) return false;
if (value == null) return false;
appConfig.ApplicationVariables.Add(key, value);
if (isProtected) appConfig.ProtectedKeyWords.Add(key);
SaveConfig();
return true;
}
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 bool SetValue<T>(string key, T value)
{
if (!appConfig.ApplicationVariables.ContainsKey(key)) return false;
if (appConfig.ProtectedKeyWords.Contains(key)) return false;
if (value == null) return false;
appConfig.ApplicationVariables[key] = JsonSerializer.SerializeToElement(value);
SaveConfig();
return true;
}
public static bool RemoveKey(string key)
{
appConfig.ApplicationVariables.Remove(key);
appConfig.ProtectedKeyWords.Remove(key);
SaveConfig();
return true;
}
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>() };
}
public static bool ContainsValue<T>(T value) => appConfig.ApplicationVariables.ContainsValue(value!);
public static bool ContainsKey(string key) => appConfig.ApplicationVariables.ContainsKey(key);
public static Dictionary<string, object> GetAllVariables() => new(appConfig.ApplicationVariables);
}
}

View File

@@ -1,5 +1,8 @@
namespace PluginManager.Interfaces using Discord.Commands;
{ using Discord.WebSocket;
namespace PluginManager.Interfaces;
public interface DBCommand public interface DBCommand
{ {
/// <summary> /// <summary>
@@ -41,9 +44,8 @@
/// <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,
Discord.WebSocket.SocketMessage message, SocketMessage message,
Discord.WebSocket.DiscordSocketClient client, DiscordSocketClient client,
bool isDM); bool isDM);
} }
}

View File

@@ -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);
} }
}

View File

@@ -1,16 +1,9 @@
using Discord.WebSocket; using System.Collections.Generic;
using Discord.WebSocket;
using PluginManager.Loaders;
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
{
internal class Command internal class Command
{ {
/// <summary> /// <summary>
@@ -18,34 +11,34 @@ namespace PluginManager.Items
/// </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) if (data.Length > 1)
this.Arguments = new List<string>(data.MergeStrings(1).Split(' ')); Arguments = new List<string>(data.MergeStrings(1).Split(' '));
else this.Arguments = new List<string>(); else
this.CommandName = data[0].Substring(1); Arguments = new List<string>();
this.PrefixUsed = data[0][0]; CommandName = data[0].Substring(1);
} PrefixUsed = data[0][0];
} }
/// <summary>
/// The list of arguments
/// </summary>
public List<string> Arguments { get; }
/// <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; }
} }

View File

@@ -1,30 +1,23 @@
using Discord.WebSocket; using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Discord.WebSocket;
using PluginManager.Loaders; using PluginManager.Loaders;
using PluginManager.Online; using PluginManager.Online;
using PluginManager.Others; using PluginManager.Others;
namespace PluginManager.Items;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading.Tasks;
using System.Threading;
using PluginManager.LanguageSystem;
using System.Linq;
using System.Reflection.Metadata.Ecma335;
namespace PluginManager.Items
{
public class ConsoleCommandsHandler public class ConsoleCommandsHandler
{ {
private static readonly PluginsManager manager = new("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Plugins");
private static PluginsManager manager = new PluginsManager("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Plugins"); public static List<Tuple<string, string, Action<string[]>>> commandList = new();
private static LanguageManager languageManager = new LanguageManager("https://sethdiscordbot.000webhostapp.com/Storage/Discord%20Bot/Languages"); private readonly DiscordSocketClient? client;
public static List<Tuple<string, string, Action<string[]>>>? commandList = new List<Tuple<string, string, Action<string[]>>>();
private DiscordSocketClient client;
public ConsoleCommandsHandler(DiscordSocketClient client) public ConsoleCommandsHandler(DiscordSocketClient client)
{ {
@@ -35,33 +28,29 @@ namespace PluginManager.Items
private void InitializeBasicCommands() private void InitializeBasicCommands()
{ {
var pluginsLoaded = false;
bool pluginsLoaded = false;
commandList.Clear(); commandList.Clear();
AddCommand("help", "Show help", (args) => AddCommand("help", "Show help", args =>
{ {
if (args.Length <= 1) if (args.Length <= 1)
{ {
Console.WriteLine("Available commands:"); Console.WriteLine("Available commands:");
foreach (var command in commandList) foreach (var command in commandList) Console.WriteLine("\t" + command.Item1 + " - " + command.Item2);
{
Console.WriteLine("\t" + command.Item1 + " - " + command.Item2);
}
} }
else else
{ {
foreach (var command in commandList) foreach (var command in commandList)
{
if (command.Item1 == args[1]) if (command.Item1 == args[1])
{ {
Console.WriteLine(command.Item2); Console.WriteLine(command.Item2);
return; return;
} }
}
Console.WriteLine("Command not found"); Console.WriteLine("Command not found");
} }
}); }
);
AddCommand("lp", "Load plugins", () => AddCommand("lp", "Load plugins", () =>
{ {
@@ -70,46 +59,31 @@ namespace PluginManager.Items
loader.onCMDLoad += (name, typeName, success, exception) => loader.onCMDLoad += (name, typeName, success, exception) =>
{ {
Console.ForegroundColor = ConsoleColor.Green; Console.ForegroundColor = ConsoleColor.Green;
if (name == null || name.Length < 2) if (name == null || name.Length < 2) name = typeName;
name = typeName;
if (success) if (success)
if (LanguageSystem.Language.ActiveLanguage == null)
Console.WriteLine("[CMD] Successfully loaded command : " + name); Console.WriteLine("[CMD] Successfully loaded command : " + name);
else Console.WriteLine(LanguageSystem.Language.ActiveLanguage.FormatText(LanguageSystem.Language.ActiveLanguage.LanguageWords["COMMAND_LOAD_SUCCESS"], name));
else else
if (LanguageSystem.Language.ActiveLanguage == null) Console.WriteLine("[CMD] Failed to load command : " + name + " because " + exception!.Message);
Console.WriteLine("[CMD] Failed to load command : " + name + " because " + exception.Message);
else
Console.WriteLine(LanguageSystem.Language.ActiveLanguage.FormatText(LanguageSystem.Language.ActiveLanguage.LanguageWords["COMMAND_LOAD_FAIL"], name, exception.Message));
Console.ForegroundColor = ConsoleColor.Red; Console.ForegroundColor = ConsoleColor.Red;
}; };
loader.onEVELoad += (name, typeName, success, exception) => loader.onEVELoad += (name, typeName, success, exception) =>
{ {
if (name == null || name.Length < 2) if (name == null || name.Length < 2) name = typeName;
name = typeName;
Console.ForegroundColor = ConsoleColor.Green; Console.ForegroundColor = ConsoleColor.Green;
if (success) if (success)
if (LanguageSystem.Language.ActiveLanguage == null)
Console.WriteLine("[EVENT] Successfully loaded event : " + name); Console.WriteLine("[EVENT] Successfully loaded event : " + name);
else else
Console.WriteLine(LanguageSystem.Language.ActiveLanguage.FormatText(LanguageSystem.Language.ActiveLanguage.LanguageWords["EVENT_LOAD_SUCCESS"], name)); Console.WriteLine("[EVENT] Failed to load event : " + name + " because " + exception!.Message);
else
if (LanguageSystem.Language.ActiveLanguage == null)
Console.WriteLine("[EVENT] Failed to load event : " + name + " because " + exception.Message);
else
Console.WriteLine(LanguageSystem.Language.ActiveLanguage.FormatText(LanguageSystem.Language.ActiveLanguage.LanguageWords["EVENT_LOAD_FAIL"], name, exception.Message));
Console.ForegroundColor = ConsoleColor.Red; Console.ForegroundColor = ConsoleColor.Red;
}; };
loader.LoadPlugins(); loader.LoadPlugins();
pluginsLoaded = true; pluginsLoaded = true;
}); }
);
AddCommand("listplugs", "list available plugins", async () => AddCommand("listplugs", "list available plugins", async () => { await manager.ListAvailablePlugins(); });
{
await manager.ListAvailablePlugins();
});
AddCommand("dwplug", "download plugin", async (args) => AddCommand("dwplug", "download plugin", async args =>
{ {
if (args.Length == 1) if (args.Length == 1)
{ {
@@ -117,27 +91,30 @@ namespace PluginManager.Items
return; return;
} }
string name = args.MergeStrings(1); var name = args.MergeStrings(1);
// info[0] = plugin type // info[0] = plugin type
// info[1] = plugin link // info[1] = plugin link
// info[2] = if others are required, or string.Empty if none // info[2] = if others are required, or string.Empty if none
string[] info = await manager.GetPluginLinkByName(name); var info = await manager.GetPluginLinkByName(name);
if (info[1] == null) // link is null if (info[1] == null) // link is null
{ {
if (name == "") if (name == "")
{ {
Console_Utilities.WriteColorText($"Name is invalid"); Console_Utilities.WriteColorText("Name is invalid");
return; return;
} }
Console_Utilities.WriteColorText($"Failed to find plugin &b{name} &c!" +
$" Use &glistplugs &ccommand to display all available plugins !");
return;
Console_Utilities.WriteColorText($"Failed to find plugin &b{name} &c!" +
" Use &glistplugs &ccommand to display all available plugins !"
);
return;
} }
string path; string path;
if (info[0] == "Command" || info[0] == "Event") if (info[0] == "Command" || info[0] == "Event")
path = "./Data/Plugins/" + info[0] + "s/" + name + ".dll"; path = "./Data/Plugins/" + info[0] + "s/" + name + ".dll";
else path = $"./{info[1].Split('/')[info[1].Split('/').Length - 1]}"; else
path = $"./{info[1].Split('/')[info[1].Split('/').Length - 1]}";
await ServerCom.DownloadFileAsync(info[1], path); await ServerCom.DownloadFileAsync(info[1], path);
Console.WriteLine("\n"); Console.WriteLine("\n");
@@ -147,47 +124,41 @@ namespace PluginManager.Items
{ {
Console.WriteLine($"Downloading requirements for plugin : {name}"); Console.WriteLine($"Downloading requirements for plugin : {name}");
List<string> lines = await ServerCom.ReadTextFromFile(info[2]); var lines = await ServerCom.ReadTextFromFile(info[2]);
foreach (var line in lines) foreach (var line in lines)
{ {
string[] split = line.Split(','); var split = line.Split(',');
Console.WriteLine($"\nDownloading item: {split[1]}"); Console.WriteLine($"\nDownloading item: {split[1]}");
await ServerCom.DownloadFileAsync(split[0], "./" + split[1]); await ServerCom.DownloadFileAsync(split[0], "./" + split[1]);
Console.WriteLine(); Console.WriteLine();
if (split[0].EndsWith(".zip")) if (split[0].EndsWith(".zip"))
{ {
Console.WriteLine($"Extracting {split[1]}"); Console.WriteLine($"Extracting {split[1]}");
double proc = 0d; var proc = 0d;
bool isExtracting = true; var isExtracting = true;
Console_Utilities.ProgressBar bar = new Console_Utilities.ProgressBar(100, ""); var bar = new Console_Utilities.ProgressBar { Max = 100, Color = ConsoleColor.Green };
IProgress<float> extractProgress = new Progress<float>(value => IProgress<float> extractProgress = new Progress<float>(value => { proc = value; });
{
proc = value;
});
new Thread(new Task(() => new Thread(new Task(() =>
{ {
while (isExtracting) while (isExtracting)
{ {
bar.Update((int)proc); bar.Update((int)proc);
if (proc >= 99.9f) if (proc >= 99.9f) break;
break;
Thread.Sleep(500); Thread.Sleep(500);
} }
}).Start).Start(); }
).Start
).Start();
await Functions.ExtractArchive("./" + split[1], "./", extractProgress); await Functions.ExtractArchive("./" + split[1], "./", extractProgress);
bar.Update(100); bar.Update(100);
isExtracting = false; isExtracting = false;
await Task.Delay(1000); await Task.Delay(1000);
bar.Update(100); bar.Update(100);
Console.WriteLine("\n"); Console.WriteLine("\n");
System.IO.File.Delete("./" + split[1]); File.Delete("./" + split[1]);
} }
if (name == "DBUI") if (name == "DBUI")
@@ -200,80 +171,87 @@ namespace PluginManager.Items
} }
} }
} }
Console.WriteLine(); Console.WriteLine();
} }
});
AddCommand("setlang", "set language", (args) =>
{
if (args.Length == 1)
{
Console.WriteLine("Please specify language");
return;
} }
Language.SetLanguage(args[0]); );
});
AddCommand("listlang", "List all available languages", async () =>
{
await languageManager.ListAllLanguages();
});
AddCommand("dwlang", "Download language", async (args) => AddCommand("value", "read value from VariableStack", args =>
{ {
if (args.Length == 1) if (args.Length != 2) return;
{ if (!Config.ContainsKey(args[1])) return;
Console.WriteLine("Please specify language");
return; var data = Config.GetValue<string>(args[1]);
Console.WriteLine($"{args[1]} => {data}");
} }
string Lname = args.MergeStrings(1); );
string[] link = await languageManager!.GetDownloadLink(Lname);
AddCommand("add", "add variable to the system variables\nadd [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 try
{ {
if (link[0] is null || link is null) if (Config.ContainsKey(key)) return;
{ if (int.TryParse(value, out var intValue))
if (Lname == "") Config.AddValueToVariables(key, intValue, isReadOnly);
{ else if (bool.TryParse(value, out var boolValue))
Console_Utilities.WriteColorText($"Name is invalid"); Config.AddValueToVariables(key, boolValue, isReadOnly);
return; else if (float.TryParse(value, out var floatValue))
Config.AddValueToVariables(key, floatValue, isReadOnly);
else if (double.TryParse(value, out var doubleValue))
Config.AddValueToVariables(key, doubleValue, isReadOnly);
else if (uint.TryParse(value, out var uintValue))
Config.AddValueToVariables(key, uintValue, isReadOnly);
else if (long.TryParse(value, out var longValue))
Config.AddValueToVariables(key, longValue, isReadOnly);
else if (byte.TryParse(value, out var byteValue))
Config.AddValueToVariables(key, byteValue, isReadOnly);
else
Config.AddValueToVariables(key, value, isReadOnly);
Console.WriteLine($"Updated config file with the following command: {args[1]} => {value}");
} }
Console_Utilities.WriteColorText("Failed to find language &b" + Lname + " &c! Use &glistlang &ccommand to display all available languages !"); catch (Exception ex)
return;
}
if (link[1].Contains("CrossPlatform") || link[1].Contains("cp"))
{ {
Console.WriteLine(ex.ToString());
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]);
return;
} }
catch );
AddCommand("remv", "remove variable from system variables", args =>
{ {
if (Lname == "") if (args.Length < 2) return;
{ Config.RemoveKey(args[1]);
Console_Utilities.WriteColorText($"Name is invalid");
return;
} }
Console_Utilities.WriteColorText("Failed to find language &b" + Lname + " &c! Use &glistlang &ccommand to display all available languages !"); );
return;
}
});
AddCommand("vars", "Display all variables", () =>
AddCommand("token", "Display the token used by the bot", () =>
{ {
if (System.IO.File.Exists("./Data/Resources/DiscordBotCore.data")) var d = Config.GetAllVariables();
Console.WriteLine("Token: " + Functions.readCodeFromFile("./Data/Resources/DiscordBotCore.data", "BOT_TOKEN", '=')); var data = new List<string[]>();
else Console.WriteLine("File could not be found. Please register token"); data.Add(new[] { "-", "-" });
}); data.Add(new[] { "Key", "Value" });
data.Add(new[] { "-", "-" });
foreach (var kvp in d) data.Add(new[] { kvp.Key, kvp.Value.ToString() });
data.Add(new[] { "-", "-" });
Console_Utilities.FormatAndAlignTable(data);
}
);
AddCommand("sd", "Shuts down the discord bot", async () =>
{
if (client is null) return;
await client.StopAsync();
await client.DisposeAsync();
Config.SaveConfig();
Environment.Exit(0);
}
);
} }
public static void AddCommand(string command, string description, Action<string[]> action) public static void AddCommand(string command, string description, Action<string[]> action)
@@ -285,9 +263,7 @@ namespace PluginManager.Items
public static void AddCommand(string command, string description, Action action) public static void AddCommand(string command, string description, Action action)
{ {
AddCommand(command, description, (args) => action()); AddCommand(command, description, args => action());
/* Console.WriteLine("Added command: " + command);*/
} }
public static void RemoveCommand(string command) public static void RemoveCommand(string command)
@@ -295,23 +271,22 @@ namespace PluginManager.Items
commandList.RemoveAll(x => x.Item1 == command); commandList.RemoveAll(x => x.Item1 == command);
} }
public static Tuple<string, string, Action<string[]>>? SearchCommand(string command) public static bool CommandExists(string command)
{
return !(GetCommand(command) is null);
}
public static Tuple<string, string, Action<string[]>>? GetCommand(string command)
{ {
return commandList.FirstOrDefault(t => t.Item1 == command); return commandList.FirstOrDefault(t => t.Item1 == command);
} }
public void HandleCommand(string command) public void HandleCommand(string command)
{ {
string[] args = command.Split(' '); var args = command.Split(' ');
foreach (var item in commandList.ToList()) foreach (var item in commandList.ToList())
{
if (item.Item1 == args[0]) if (item.Item1 == args[0])
{
item.Item3(args); item.Item3(args);
//Console.WriteLine($"Executing: {args[0]} with the following parameters: {args.MergeStrings(1)}"); //Console.WriteLine($"Executing: {args[0]} with the following parameters: {args.MergeStrings(1)}");
} }
} }
}
}
}

View File

@@ -1,8 +1,9 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using PluginManager.Others.Exceptions;
namespace PluginManager.Items;
namespace PluginManager.Items
{
public class Spinner public class Spinner
{ {
/// <summary> /// <summary>
@@ -24,18 +25,27 @@ namespace PluginManager.Items
public async void Start() public async void Start()
{ {
isSpinning = true; isSpinning = true;
int cnt = 0; var cnt = 0;
while (isSpinning) while (isSpinning)
{ {
cnt++; cnt++;
switch (cnt % 4) switch (cnt % 4)
{ {
case 0: Console.Write("/"); break; case 0:
case 1: Console.Write("-"); break; Console.Write("/");
case 2: Console.Write("\\"); break; break;
case 3: 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); Console.SetCursorPosition(Console.CursorLeft - 1, Console.CursorTop);
await Task.Delay(250); await Task.Delay(250);
} }
@@ -46,9 +56,7 @@ namespace PluginManager.Items
/// </summary> /// </summary>
public void Stop() public void Stop()
{ {
if (!isSpinning) if (!isSpinning) throw new APIException("Spinner was not spinning", GetType());
throw new Others.Exceptions.APIException("Spinner was not spinning", GetType());
isSpinning = false; isSpinning = false;
} }
} }
}

View File

@@ -1,161 +0,0 @@
using PluginManager.Others;
using System.Collections.Generic;
using System;
using System.IO;
using System.Threading.Tasks;
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 " + LanguageFileExtension);
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;
}
public 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();
}
}
}
}

View File

@@ -1,99 +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;
}
}
}

View File

@@ -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;
}
}
}

View File

@@ -0,0 +1,107 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
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 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 = file,
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;
}
internal delegate void FileLoadedEventHandler(LoaderArgs args);
internal delegate void PluginLoadedEventHandler(LoaderArgs args);
}

View File

@@ -1,44 +1,23 @@
using Discord.WebSocket; using System;
using System.Collections.Generic;
using Discord.WebSocket;
using PluginManager.Interfaces; using PluginManager.Interfaces;
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"; private const string pluginCMDExtension = "dll";
private const string pluginEVEExtension = ".dll"; private 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 +29,69 @@ 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 void LoadPlugins()
{ {
Commands = new List<DBCommand>();
Plugins = 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;
Events = EVLoader.LoadEvents();
Commands = commandsLoader.Load();
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 [{e.PluginName}] has been successfully created !");
Functions.WriteLogFile($"[EVENT] Event from file [{path}] 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 [{e.PluginName}] has been successfully loaded !");
Functions.WriteLogFile($"[CMD] Command from file [{path}] has been successfully loaded !");
} }
private void OnEventLoaded(string typename, bool success, DBEvent eve, Exception exception) private void OnEventLoaded(LoaderArgs e)
{ {
if (eve != null && success) if (e.IsLoaded) ((DBEvent)e.Plugin!).Start(_client);
eve.Start(client);
if (onEVELoad != null) if (onEVELoad != null) onEVELoad.Invoke(((DBEvent)e.Plugin!).name, e.TypeName!, e.IsLoaded, e.Exception);
onEVELoad.Invoke(eve!.name, typename, success, exception);
} }
private void OnCommandLoaded(string name, bool success, DBCommand command, Exception exception) private void OnCommandLoaded(LoaderArgs e)
{ {
if (onCMDLoad != null) if (onCMDLoad != null) onCMDLoad.Invoke(((DBCommand)e.Plugin!).Command, e.TypeName!, e.IsLoaded, e.Exception);
onCMDLoad.Invoke(command.Command, name, success, exception);
}
} }
} }

View File

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

View File

@@ -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,23 @@ namespace PluginManager.Online
{ {
try try
{ {
List<string> list = await ServerCom.ReadTextFromFile(PluginsLink); var list = await ServerCom.ReadTextFromFile(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" };
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) continue;
string[] content = lines[i].Split(','); var content = lines[i].Split(',');
string[] display = new string[4]; var display = new string[4];
if (op == Others.OperatingSystem.WINDOWS) if (op == OperatingSystem.WINDOWS)
{ {
if (content[4].Contains("Windows")) if (content[4].Contains("Windows"))
{ {
@@ -58,12 +56,12 @@ namespace PluginManager.Online
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.ReadTextFromFile(content[5])).Count + 1).ToString();
else display[3] = "1"; else
display[3] = "1";
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"))
{ {
@@ -71,21 +69,19 @@ namespace PluginManager.Online
display[1] = content[1]; display[1] = content[1];
display[2] = content[2]; display[2] = content[2];
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: listlang\nReason: " + exception.Message);
Others.Functions.WriteErrFile(exception.ToString()); Functions.WriteErrFile(exception.ToString());
} }
} }
/// <summary> /// <summary>
@@ -97,32 +93,26 @@ namespace PluginManager.Online
{ {
try try
{ {
List<string> list = await ServerCom.ReadTextFromFile(PluginsLink); var list = await ServerCom.ReadTextFromFile(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[] { contents[2], contents[3], contents[5] };
return new string[] { contents[2], contents[3], contents[5] }; if (contents.Length == 5) return new[] { contents[2], contents[3], string.Empty };
else if (contents.Length == 5) throw new Exception("Failed to download plugin. Invalid Argument Length");
return new string[] { contents[2], contents[3], string.Empty };
else 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! };
} }
}
} }

View File

@@ -1,10 +1,11 @@
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
{ {
@@ -54,34 +55,32 @@ namespace PluginManager.Online
bool isDownloading = true; bool isDownloading = true;
int c_progress = 0; int c_progress = 0;
Others.Console_Utilities.ProgressBar pbar = new Others.Console_Utilities.ProgressBar(100, ""); Console_Utilities.ProgressBar pbar = new Console_Utilities.ProgressBar { Max = 100, NoColor = true };
IProgress<float> progress = new Progress<float>(percent => IProgress<float> progress = new Progress<float>(percent =>
{ {
c_progress = (int)percent; c_progress = (int)percent;
}); });
Task updateProgressBarTask = new Task(() => Task updateProgressBarTask = new Task(() =>
{ {
while (isDownloading) while (isDownloading)
{ {
pbar.Update(c_progress); pbar.Update(c_progress);
if (c_progress == 100) if (c_progress == 100) break;
break; Thread.Sleep(500);
System.Threading.Thread.Sleep(500);
} }
}); }
);
new System.Threading.Thread(updateProgressBarTask.Start).Start(); new Thread(updateProgressBarTask.Start).Start();
await DownloadFileAsync(URL, location, progress); await DownloadFileAsync(URL, location, progress);
c_progress = 100; c_progress = 100;
pbar.Update(100); pbar.Update(100);
isDownloading = false; isDownloading = false;
}
}
} }
} }

View File

@@ -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;
} }
} }

View File

@@ -1,9 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace PluginManager.Others namespace PluginManager.Others
{ {
@@ -14,20 +10,13 @@ namespace PluginManager.Others
/// </summary> /// </summary>
public class ProgressBar public class ProgressBar
{ {
public int Progress { get; set; } public int 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(int 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,14 +28,20 @@ namespace PluginManager.Others
for (int i = 0; i < onechunk * progress; i++) for (int i = 0; i < onechunk * progress; i++)
{ {
Console.BackgroundColor = ConsoleColor.Green; if (NoColor)
Console.BackgroundColor = ConsoleColor.Black; //this.Color
else
Console.BackgroundColor = 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; if (NoColor)
Console.BackgroundColor = ConsoleColor.Black; // background of empty bar
else
Console.BackgroundColor = ConsoleColor.DarkGray;
Console.CursorLeft = position++; Console.CursorLeft = position++;
Console.Write(" "); Console.Write(" ");
} }
@@ -134,6 +129,7 @@ namespace PluginManager.Others
{ "&b", ConsoleColor.Blue }, { "&b", ConsoleColor.Blue },
{ "&r", ConsoleColor.Red }, { "&r", ConsoleColor.Red },
{ "&m", ConsoleColor.Magenta }, { "&m", ConsoleColor.Magenta },
{ "&y", ConsoleColor.Yellow },
{ "&c", fg } { "&c", fg }
}; };
foreach (string word in words) foreach (string word in words)
@@ -145,7 +141,9 @@ namespace PluginManager.Others
Console.ForegroundColor = colors[prefix]; Console.ForegroundColor = colors[prefix];
} }
string m = word.Replace("&g", "").Replace("&b", "").Replace("&r", "").Replace("&c", "").Replace("&m", ""); string m = word;
foreach (var key in colors.Keys) { m = m.Replace(key, ""); }
Console.Write(m + " "); Console.Write(m + " ");
} }
if (appendNewLine) if (appendNewLine)

View File

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

View File

@@ -1,20 +1,22 @@
namespace PluginManager.Others 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 }
}

View File

@@ -1,29 +1,13 @@
using System; using System;
namespace PluginManager.Others.Exceptions namespace PluginManager.Others.Exceptions;
{
/// <summary> /// <summary>
/// Custom Exception for PluginManager /// Custom Exception for PluginManager
/// </summary> /// </summary>
[Serializable] [Serializable]
public class APIException : Exception 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> /// <summary>
/// The APIException contructor /// The APIException contructor
/// </summary> /// </summary>
@@ -49,6 +33,7 @@ namespace PluginManager.Others.Exceptions
ErrorCode = errorCode; ErrorCode = errorCode;
Function = function; Function = function;
} }
/// <summary> /// <summary>
/// The APIException contructor /// The APIException contructor
/// </summary> /// </summary>
@@ -58,13 +43,13 @@ namespace PluginManager.Others.Exceptions
{ {
Function = function; Function = function;
} }
/// <summary> /// <summary>
/// The APIException contructor /// The APIException contructor
/// </summary> /// </summary>
/// <param name="message">The error message</param> /// <param name="message">The error message</param>
public APIException(string message) : base(message) public APIException(string message) : base(message)
{ {
} }
/// <summary> /// <summary>
@@ -77,6 +62,21 @@ namespace PluginManager.Others.Exceptions
Function = errorLocation.FullName; Function = errorLocation.FullName;
} }
/// <summary>
/// The function where the error occurred
/// </summary>
public string? Function { get; } = "not specified";
/// <summary>
/// The error code
/// </summary>
public Error? ErrorCode { get; } = Error.UNKNOWN_ERROR;
/// <summary>
/// The possible cause that determined the error
/// </summary>
public string? PossibleCause { get; } = "not specified";
/// <summary> /// <summary>
/// Method to print the error to <see cref="Console" /> /// Method to print the error to <see cref="Console" />
/// </summary> /// </summary>
@@ -84,11 +84,8 @@ namespace PluginManager.Others.Exceptions
{ {
Console.WriteLine("Message Content: " + Message); Console.WriteLine("Message Content: " + Message);
Console.WriteLine("Function: " + Function); Console.WriteLine("Function: " + Function);
Console.WriteLine("Error Code: " + ErrorCode.ToString()); Console.WriteLine("Error Code: " + ErrorCode);
Console.WriteLine("Possible cause: " + PossibleCause); Console.WriteLine("Possible cause: " + PossibleCause);
if (this.StackTrace != null) if (StackTrace != null) Functions.WriteErrFile(StackTrace);
Functions.WriteErrFile(this.StackTrace);
} }
} }
}

View File

@@ -7,6 +7,8 @@ using System.Collections.Generic;
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
{ {
@@ -40,22 +42,6 @@ namespace PluginManager.Others
/// </summary> /// </summary>
public static readonly string pakFolder = @"./Data/Resources/PAKS/"; public static readonly string pakFolder = @"./Data/Resources/PAKS/";
/// <summary>
/// The mark that the line is a comment
/// </summary>
private static readonly char commentMark = '#';
/// <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)
@@ -67,8 +53,7 @@ namespace PluginManager.Others
{ {
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; string? textValue = null;
var fs = new FileStream(archFile, FileMode.Open); var fs = new FileStream(archFile, FileMode.Open);
@@ -86,6 +71,7 @@ namespace PluginManager.Others
break; break;
} }
} }
return textValue; return textValue;
} }
@@ -96,8 +82,7 @@ namespace PluginManager.Others
public static void WriteLogFile(string LogMessage) public static void WriteLogFile(string LogMessage)
{ {
string logsPath = logFolder + "Log.txt"; string logsPath = logFolder + "Log.txt";
if (!Directory.Exists(logFolder)) if (!Directory.Exists(logFolder)) Directory.CreateDirectory(logFolder);
Directory.CreateDirectory(logFolder);
File.AppendAllText(logsPath, LogMessage + " \n"); File.AppendAllText(logsPath, LogMessage + " \n");
} }
@@ -108,36 +93,10 @@ namespace PluginManager.Others
public static void WriteErrFile(string ErrMessage) public static void WriteErrFile(string ErrMessage)
{ {
string errPath = errFolder + "Error.txt"; string errPath = errFolder + "Error.txt";
if (!Directory.Exists(errFolder)) 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>
@@ -177,30 +136,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>
@@ -215,16 +150,11 @@ namespace PluginManager.Others
/// <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;
@@ -246,10 +176,7 @@ namespace PluginManager.Others
/// <returns></returns> /// <returns></returns>
public static async Task ExtractArchive(string zip, string folder, IProgress<float> progress) public static async Task ExtractArchive(string zip, string folder, IProgress<float> progress)
{ {
if (!Directory.Exists(folder)) if (!Directory.Exists(folder)) Directory.CreateDirectory(folder);
Directory.CreateDirectory(folder);
using (ZipArchive archive = ZipFile.OpenRead(zip)) using (ZipArchive archive = ZipFile.OpenRead(zip))
@@ -259,16 +186,18 @@ namespace PluginManager.Others
foreach (ZipArchiveEntry entry in archive.Entries) foreach (ZipArchiveEntry entry in archive.Entries)
{ {
if (entry.FullName.EndsWith("/")) if (entry.FullName.EndsWith("/"))
{
currentZIPFile++;
Directory.CreateDirectory(Path.Combine(folder, entry.FullName)); Directory.CreateDirectory(Path.Combine(folder, entry.FullName));
}
else else
try
{ {
entry.ExtractToFile(Path.Combine(folder, entry.FullName), true); entry.ExtractToFile(Path.Combine(folder, entry.FullName), true);
currentZIPFile++; }
catch
{
} }
currentZIPFile++;
await Task.Delay(10); await Task.Delay(10);
progress.Report((float)currentZIPFile / totalZIPFiles * 100); progress.Report((float)currentZIPFile / totalZIPFiles * 100);
} }
@@ -276,13 +205,76 @@ namespace PluginManager.Others
} }
/// <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) public static (double, string) ConvertBytes(long bytes)
{ {
if (bytes < 1024) return (bytes, "B"); List<string> units = new List<string>()
if (bytes < 1024 * 1024) return (bytes / 1024.0, "KB"); {
if (bytes < 1024 * 1024 * 1024) return (bytes / 1024.0 / 1024.0, "MB"); "B",
return (bytes / 1024.0 / 1024.0 / 1024.0, "GB"); "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)
{
using (var s = File.OpenWrite(file)) await JsonSerializer.SerializeAsync(s, Data, typeof(T), new JsonSerializerOptions { WriteIndented = true });
}
/// <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.Open(input, FileMode.OpenOrCreate);
else
text = new MemoryStream(Encoding.ASCII.GetBytes(input));
text.Position = 0;
var obj = await JsonSerializer.DeserializeAsync<T>(text);
text.Close();
return obj;
}
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;
} }
} }
} }

View File

@@ -1,10 +1,9 @@
using Discord; using System.Linq;
using Discord;
using Discord.WebSocket; using Discord.WebSocket;
using System.Linq; namespace PluginManager.Others.Permissions;
namespace PluginManager.Others.Permissions
{
/// <summary> /// <summary>
/// A class whith all discord permissions /// A class whith all discord permissions
/// </summary> /// </summary>
@@ -16,7 +15,10 @@ namespace PluginManager.Others.Permissions
/// <param name="role">The role</param> /// <param name="role">The role</param>
/// <param name="permission">The permission</param> /// <param name="permission">The permission</param>
/// <returns></returns> /// <returns></returns>
public static bool hasPermission(this IRole role, GuildPermission permission) => role.Permissions.Has(permission); public static bool hasPermission(this IRole role, GuildPermission permission)
{
return role.Permissions.Has(permission);
}
/// <summary> /// <summary>
/// Check if user has the specified role /// Check if user has the specified role
@@ -24,7 +26,10 @@ namespace PluginManager.Others.Permissions
/// <param name="user">The user</param> /// <param name="user">The user</param>
/// <param name="role">The role</param> /// <param name="role">The role</param>
/// <returns></returns> /// <returns></returns>
public static bool hasRole(this SocketGuildUser user, IRole role) => user.Roles.Contains(role); public static bool hasRole(this SocketGuildUser user, IRole role)
{
return user.Roles.Contains(role);
}
/// <summary> /// <summary>
/// Check if user has the specified permission /// Check if user has the specified permission
@@ -33,23 +38,27 @@ namespace PluginManager.Others.Permissions
/// <param name="permission">The permission</param> /// <param name="permission">The permission</param>
/// <returns></returns> /// <returns></returns>
public static bool hasPermission(this SocketGuildUser user, GuildPermission permission) public static bool hasPermission(this SocketGuildUser user, GuildPermission permission)
=> user.Roles.Where(role => role.hasPermission(permission)).Any() || user.Guild.Owner == user; {
/// <summary> return user.Roles.Where(role => role.hasPermission(permission)).Any() || user.Guild.Owner == user;
/// Check if user is administrator of server }
/// </summary>
/// <param name="user">The user</param>
/// <returns></returns>
public static bool isAdmin(this SocketGuildUser user) => user.hasPermission(GuildPermission.Administrator);
/// <summary> /// <summary>
/// Check if user is administrator of server /// Check if user is administrator of server
/// </summary> /// </summary>
/// <param name="user">The user</param> /// <param name="user">The user</param>
/// <returns></returns> /// <returns></returns>
public static bool isAdmin(this SocketUser user) => isAdmin((SocketGuildUser)user); public static bool isAdmin(this SocketGuildUser user)
{
return user.hasPermission(GuildPermission.Administrator);
} }
/// <summary>
/// Check if user is administrator of server
/// </summary>
/// <param name="user">The user</param>
/// <returns></returns>
public static bool isAdmin(this SocketUser user)
{
return isAdmin((SocketGuildUser)user);
}
} }

View File

@@ -19,10 +19,4 @@
<PackageReference Include="Discord.Net" Version="3.6.1" /> <PackageReference Include="Discord.Net" Version="3.6.1" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Page Include="BlankWindow1.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
</Project> </Project>

View File

@@ -17,6 +17,9 @@ Plugin Types:
1. Commands 1. Commands
2. Events 2. Events
Project Structure
![Image](../../blob/gh-pages/Pictures/architecture2.png)
### How to create a plugin ### How to create a plugin

View File

@@ -1,57 +0,0 @@
using PluginManager.Others;
using PluginManager.Interfaces;
using Discord;
public class OnUserJoin : DBEvent
{
public string name => "OnPlayerJoin";
public string description => "An event that is triggered when an user joins the server";
private string UtilsPath = Functions.dataFolder + "/StartupEvents";
private string ConfigFile = Functions.dataFolder + "/StartupEvents/" + "UserJoinEvent.txt";
public async void Start(Discord.WebSocket.DiscordSocketClient client)
{
System.IO.Directory.CreateDirectory(UtilsPath);
if (!System.IO.File.Exists(ConfigFile))
{
await System.IO.File.WriteAllTextAsync(ConfigFile,
"Enabled=True\nEmbed=True\n" +
"#Available placeholders:\n" +
"#{user.Name} => Username of the user\n" +
"#{time.date} => Current Date\n" +
"#{time.time} => Current time (hh:mm::ss)\n" +
"MessageTitle = Welcome {user.Name}\n" +
"MessageDescription=Embed description\n" +
"MessageField1Title=Custom Title\n" +
"MessageFiled1Text=Custom Filed 1 text\n" +
"MessageField2Title=Custom Title\n" +
"MessageFiled2Text=Custom Filed 2 text\n" +
"MessageFooter=Today: {time.date} at {time.time}\n");
}
if (Functions.readCodeFromFile(ConfigFile, "Enabled", '=') != "True") return;
//System.Console.WriteLine("Awaiting user join event ...");
client.UserJoined += Client_UserJoined;
}
private async System.Threading.Tasks.Task Client_UserJoined(Discord.WebSocket.SocketGuildUser user)
{
Console_Utilities.WriteColorText("A new user joins: " + user.Username);
EmbedBuilder embed = new EmbedBuilder
{
Title = Functions.readCodeFromFile(ConfigFile, "MessageTitle", '='),
Description = Functions.readCodeFromFile(ConfigFile, "MessageDescription", '=')
};
embed
.AddField(Functions.readCodeFromFile(ConfigFile, "MessageField1Title", '=').Replace("{user.Name}", user.Username).Replace("{time.date}", System.DateTime.Now.ToShortDateString()).Replace("{time.time}", System.DateTime.Now.ToShortTimeString()), Functions.readCodeFromFile(ConfigFile, "MessageField1Text", '=').Replace("{user.Name}", user.Username).Replace("{time.date}", System.DateTime.Now.ToShortDateString()).Replace("{time.time}", System.DateTime.Now.ToShortTimeString()))
.AddField(Functions.readCodeFromFile(ConfigFile, "MessageField2Title", '=').Replace("{user.Name}", user.Username).Replace("{time.date}", System.DateTime.Now.ToShortDateString()).Replace("{time.time}", System.DateTime.Now.ToShortTimeString()), Functions.readCodeFromFile(ConfigFile, "MessageField2Text", '=').Replace("{user.Name}", user.Username).Replace("{time.date}", System.DateTime.Now.ToShortDateString()).Replace("{time.time}", System.DateTime.Now.ToShortTimeString()))
.WithFooter(Functions.readCodeFromFile(ConfigFile, "MessageFooter", '=').Replace("{user.Name}", user.Username).Replace("{time.date}", System.DateTime.Now.ToShortDateString()).Replace("{time.time}", System.DateTime.Now.ToShortTimeString()));
await user.Guild.DefaultChannel.SendMessageAsync(embed: embed.Build());
}
}

View File

@@ -1,48 +0,0 @@
public class SetGameOnLogin : PluginManager.Interfaces.DBEvent
{
public string name => "Set Game on Startup";
public string description => "Set Custom Game to the bot at initialization";
public async void Start(Discord.WebSocket.DiscordSocketClient client)
{
string UtilsPath = PluginManager.Others.Functions.dataFolder + "StartupEvents/";
string ConfigFile = UtilsPath + "LoginEvent.txt";
System.IO.Directory.CreateDirectory(UtilsPath);
if (!System.IO.File.Exists(ConfigFile))
{
System.Console.WriteLine($"First time setup. Open file: {ConfigFile} to change settings or use the following commands\nNote: For space ( ) use underline (_). Example: 'Hello_World' will output 'Hello World'");
System.Console.WriteLine($"set-setting StartupEvents.LoginEvent.Title [Custom_Title(s)]");
System.Console.WriteLine($"set-setting StartupEvents.LoginEvent.Dynamic_Title [True/False]");
System.Console.WriteLine($"set-setting StartupEvents.LoginEvent.Dynamic_Title_Change_Rate [interval in milliseconds]");
await System.IO.File.WriteAllTextAsync(ConfigFile, "Enabled=True\n\nDynamic Title=False\n#For dynamic title add titles like this:\n#Title=Hello,World,Test,Test2\nTitle=!help\nDynamic Title Change Rate=3500\n");
}
if (PluginManager.Others.Functions.readCodeFromFile(ConfigFile, "Enabled", '=') != "True")
return;
bool isDynamic = PluginManager.Others.Functions.readCodeFromFile(ConfigFile, "Dynamic Title", '=') == "True";
string Title = PluginManager.Others.Functions.readCodeFromFile(ConfigFile, "Title", '=');
if (Title == null || Title.Length < 2) return;
if (!isDynamic)
await client.SetGameAsync(Title, null, Discord.ActivityType.Playing);
else
{
string[] Titles = Title.Split(',');
int delayMS = 3500;
try
{
delayMS = int.Parse(PluginManager.Others.Functions.readCodeFromFile(ConfigFile, "Dynamic Title Change Rate", '='));
}
catch { }
while (true)
{
foreach (var title in Titles)
{
await client.SetGameAsync(title, null, Discord.ActivityType.Playing);
await System.Threading.Tasks.Task.Delay(delayMS);
}
}
}
}
}

View File

@@ -1,17 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\BUILDS\</OutputPath>
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\PluginManager\PluginManager.csproj" />
</ItemGroup>
</Project>