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

Update to Discord.Net 3.8.1 (API v10)

Browse Source
This commit is contained in:
Wizzy69
2022-10-22 13:55:48 +03:00
parent cad3bb5b75
commit ae7118e89a
12 changed files with 121 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscordBot/DiscordBot.csproj
View File

@@ -38,7 +38,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Discord.Net" Version="3.7.2" /> <PackageReference Include="Discord.Net" Version="3.8.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
DiscordBot/Program.cs
View File

@@ -271,7 +271,7 @@ public class Program
if (len > 0 && args[0] == "/remplug") if (len > 0 && args[0] == "/remplug")
{ {
var plugName = args.MergeStrings(1); var plugName = string.Join(' ', args, 1, args.Length - 1);
Console.WriteLine("Starting to remove " + plugName); Console.WriteLine("Starting to remove " + plugName);
await ConsoleCommandsHandler.ExecuteCommad("remplug " + plugName); await ConsoleCommandsHandler.ExecuteCommad("remplug " + plugName);
loadPluginsOnStartup = true; loadPluginsOnStartup = true;

34
PluginManager/Config.cs
View File

@@ -4,6 +4,7 @@ using System.IO;
using System.Text.Json; using System.Text.Json;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using PluginManager.Loaders; using PluginManager.Loaders;
using PluginManager.Others; using PluginManager.Others;
@@ -23,8 +24,8 @@ public static class Config
public static string UpdaterVersion public static string UpdaterVersion
{ {
get => appConfig.UpdaterVersion; get => appConfig!.UpdaterVersion!;
set => appConfig.UpdaterVersion = value; set => appConfig!.UpdaterVersion = value;
} }
public static string GetPluginVersion(string pluginName) public static string GetPluginVersion(string pluginName)
@@ -133,6 +134,25 @@ public static class Config
SaveConfig(SaveType.NORMAL); SaveConfig(SaveType.NORMAL);
} }
public static bool TrySetValue<T>(string key, T value)
{
if (Config.ContainsKey(key))
{
try
{
Config.SetValue(key, value);
return true;
}
catch
{
return false;
}
}
Config.AddValueToVariables(key, value, false);
return true;
}
public static void RemoveKey(string key) public static void RemoveKey(string key)
{ {
if (key == "Version" || key == "token" || key == "prefix") if (key == "Version" || key == "token" || key == "prefix")
@@ -205,8 +225,10 @@ public static class Config
appConfig = new AppConfig appConfig = new AppConfig
{ {
ApplicationVariables = new Dictionary<string, object>(), ProtectedKeyWords = new List<string>(), ApplicationVariables = new Dictionary<string, object>(),
PluginVersions = new Dictionary<string, string>(), UpdaterVersion = "-1" ProtectedKeyWords = new List<string>(),
PluginVersions = new Dictionary<string, string>(),
UpdaterVersion = "-1"
}; };
} }
@@ -220,9 +242,9 @@ public static class Config
return appConfig!.ApplicationVariables!.ContainsKey(key); return appConfig!.ApplicationVariables!.ContainsKey(key);
} }
public static IDictionary<string, object> GetAllVariables() public static IDictionary<string, object>? GetAllVariables()
{ {
return appConfig.ApplicationVariables; return appConfig?.ApplicationVariables;
} }
public static class PluginConfig public static class PluginConfig

1
PluginManager/Interfaces/DBCommand.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using Discord.Commands; using Discord.Commands;
namespace PluginManager.Interfaces; namespace PluginManager.Interfaces;

4
PluginManager/Items/Command.cs
View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Others;
namespace PluginManager.Items; namespace PluginManager.Items;
@@ -20,7 +20,7 @@ public class Command
{ {
Author = message.Author; Author = message.Author;
var data = message.Content.Split(' '); var data = message.Content.Split(' ');
Arguments = data.Length > 1 ? new List<string>(data.MergeStrings(1).Split(' ')) : new List<string>(); Arguments = data.Length > 1 ? new List<string>(string.Join(' ', data, 1, data.Length - 1).Split(' ')) : new List<string>();
CommandName = data[0].Substring(1); CommandName = data[0].Substring(1);
PrefixUsed = data[0][0]; PrefixUsed = data[0][0];
} }

22
PluginManager/Items/ConsoleCommandsHandler.cs
View File

@@ -1,11 +1,4 @@
using Discord.WebSocket; using System;
using PluginManager.Interfaces;
using PluginManager.Loaders;
using PluginManager.Online;
using PluginManager.Others;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
@@ -14,6 +7,13 @@ using System.Net.Http;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using Discord.WebSocket;
using PluginManager.Interfaces;
using PluginManager.Loaders;
using PluginManager.Online;
using PluginManager.Others;
using OperatingSystem = PluginManager.Others.OperatingSystem; using OperatingSystem = PluginManager.Others.OperatingSystem;
namespace PluginManager.Items; namespace PluginManager.Items;
@@ -143,7 +143,7 @@ public class ConsoleCommandsHandler
return; return;
} }
var name = args.MergeStrings(1); var name = string.Join(' ', args, 1, args.Length - 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
@@ -313,7 +313,7 @@ public class ConsoleCommandsHandler
if (args.Length <= 1) return; if (args.Length <= 1) return;
try try
{ {
var pName = args.MergeStrings(1); var pName = string.Join(' ', args, 1, args.Length - 1);
var client = new HttpClient(); var client = new HttpClient();
var url = (await manager.GetPluginLinkByName(pName))[1]; var url = (await manager.GetPluginLinkByName(pName))[1];
if (url is null) throw new Exception($"Invalid plugin name {pName}."); if (url is null) throw new Exception($"Invalid plugin name {pName}.");
@@ -347,7 +347,7 @@ public class ConsoleCommandsHandler
if (args.Length <= 1) return; if (args.Length <= 1) return;
isDownloading = true; isDownloading = true;
var plugName = args.MergeStrings(1); var plugName = string.Join(' ', args, 1, args.Length - 1);
if (pluginsLoaded) if (pluginsLoaded)
{ {
if (Functions.GetOperatingSystem() == OperatingSystem.WINDOWS) if (Functions.GetOperatingSystem() == OperatingSystem.WINDOWS)

14
PluginManager/Loaders/PluginLoader.cs
View File

@@ -2,7 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Interfaces; using PluginManager.Interfaces;
using PluginManager.Online; using PluginManager.Online;
using PluginManager.Online.Updates; using PluginManager.Online.Updates;
@@ -64,9 +66,12 @@ public class PluginLoader
await Task.Run(async () => await Task.Run(async () =>
{ {
var name = new FileInfo(file).Name.Split('.')[0]; var name = new FileInfo(file).Name.Split('.')[0];
var version = await ServerCom.GetVersionOfPackageFromWeb(name);
if (version is null)
return;
if (!Config.PluginVersionsContainsKey(name)) if (!Config.PluginVersionsContainsKey(name))
Config.SetPluginVersion( Config.SetPluginVersion(
name, (await ServerCom.GetVersionOfPackageFromWeb(name))?.PackageVersionID + ".0.0"); name, (version.PackageVersionID + ".0.0"));
if (await PluginUpdater.CheckForUpdates(name)) if (await PluginUpdater.CheckForUpdates(name))
await PluginUpdater.Download(name); await PluginUpdater.Download(name);
@@ -78,9 +83,12 @@ public class PluginLoader
await Task.Run(async () => await Task.Run(async () =>
{ {
var name = new FileInfo(file).Name.Split('.')[0]; var name = new FileInfo(file).Name.Split('.')[0];
var version = await ServerCom.GetVersionOfPackageFromWeb(name);
if (version is null)
return;
if (!Config.PluginVersionsContainsKey(name)) if (!Config.PluginVersionsContainsKey(name))
Config.SetPluginVersion( Config.SetPluginVersion(
name, (await ServerCom.GetVersionOfPackageFromWeb(name))?.PackageVersionID + ".0.0"); name, (version.PackageVersionID + ".0.0"));
if (await PluginUpdater.CheckForUpdates(name)) if (await PluginUpdater.CheckForUpdates(name))
await PluginUpdater.Download(name); await PluginUpdater.Download(name);
@@ -102,6 +110,7 @@ public class PluginLoader
var commandsLoader = new Loader<DBCommand>(pluginCMDFolder, pluginCMDExtension); var commandsLoader = new Loader<DBCommand>(pluginCMDFolder, pluginCMDExtension);
var eventsLoader = new Loader<DBEvent>(pluginEVEFolder, pluginEVEExtension); var eventsLoader = new Loader<DBEvent>(pluginEVEFolder, pluginEVEExtension);
commandsLoader.FileLoaded += OnCommandFileLoaded; commandsLoader.FileLoaded += OnCommandFileLoaded;
commandsLoader.PluginLoaded += OnCommandLoaded; commandsLoader.PluginLoaded += OnCommandLoaded;
@@ -110,6 +119,7 @@ public class PluginLoader
Commands = commandsLoader.Load(); Commands = commandsLoader.Load();
Events = eventsLoader.Load(); Events = eventsLoader.Load();
} }
private void EventFileLoaded(LoaderArgs e) private void EventFileLoaded(LoaderArgs e)

1
PluginManager/Online/Helpers/VersionString.cs
View File

@@ -19,6 +19,7 @@ public class VersionString
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine(version);
throw new Exception("Failed to write Version", ex); throw new Exception("Failed to write Version", ex);
} }
} }

23
PluginManager/Online/ServerCom.cs
View File

@@ -1,7 +1,4 @@
using PluginManager.Online.Helpers; using System;
using PluginManager.Others;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -9,6 +6,9 @@ using System.Net.Http;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using PluginManager.Online.Helpers;
using PluginManager.Others;
namespace PluginManager.Online; namespace PluginManager.Online;
public static class ServerCom public static class ServerCom
@@ -100,10 +100,15 @@ public static class ServerCom
{ {
var url = "https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/Versions"; var url = "https://raw.githubusercontent.com/Wizzy69/installer/discord-bot-files/Versions";
var data = await ReadTextFromURL(url); var data = await ReadTextFromURL(url);
var version = (from item in data foreach (var item in data)
where !item.StartsWith("#") && item.StartsWith(pakName) {
select item.Split(',')[1]).FirstOrDefault(); if (item.StartsWith("#"))
if (version == default || version == null) return null; continue;
return new VersionString(version);
string[] split = item.Split(',');
if (split[0] == pakName)
return new VersionString(split[1]);
}
return null;
} }
} }

86
PluginManager/Others/Functions.cs
View File

@@ -9,7 +9,9 @@ using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Discord.WebSocket; using Discord.WebSocket;
using PluginManager.Items; using PluginManager.Items;
namespace PluginManager.Others; namespace PluginManager.Others;
@@ -113,31 +115,6 @@ public static class Functions
WriteErrFile(ex.ToString()); WriteErrFile(ex.ToString());
} }
/// <summary>
/// Merge one array of strings into one string
/// </summary>
/// <param name="s">The array of strings</param>
/// <param name="indexToStart">The index from where the merge should start (included)</param>
/// <returns>A string built based on the array</returns>
public static string MergeStrings(this string[] s, int indexToStart)
{
return string.Join(' ', s, indexToStart, s.Length - 1);
/* string r = "";
int len = s.Length;
if (len <= indexToStart) return "";
for (int i = indexToStart; i < len - 1; ++i)
{
r += s[i] + " ";
}
r += s[len - 1];
return r;
*/
}
/// <summary> /// <summary>
/// Get the Operating system you are runnin on /// Get the Operating system you are runnin on
/// </summary> /// </summary>
@@ -182,8 +159,7 @@ public static class Functions
var buffer = new byte[bufferSize]; var buffer = new byte[bufferSize];
long totalBytesRead = 0; long totalBytesRead = 0;
int bytesRead; int bytesRead;
while ((bytesRead = while ((bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false)) != 0)
await stream.ReadAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false)) != 0)
{ {
await destination.WriteAsync(buffer, 0, bytesRead, cancellationToken).ConfigureAwait(false); await destination.WriteAsync(buffer, 0, bytesRead, cancellationToken).ConfigureAwait(false);
totalBytesRead += bytesRead; totalBytesRead += bytesRead;
@@ -264,32 +240,6 @@ public static class Functions
} }
} }
/// <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)
{
var units = new List<string>
{
"B",
"KB",
"MB",
"GB",
"TB"
};
var i = 0;
while (bytes >= 1024)
{
i++;
bytes /= 1024;
}
return (bytes, units[i]);
}
/// <summary> /// <summary>
/// Save to JSON file /// Save to JSON file
/// </summary> /// </summary>
@@ -323,36 +273,6 @@ public static class Functions
return (obj ?? default)!; return (obj ?? default)!;
} }
/// <summary>
/// Check if all words from <paramref name="str" /> are in <paramref name="baseString" /><br />
/// This function returns true if<br />
/// 1. The <paramref name="str" /> is part of <paramref name="baseString" /><br />
/// 2. The words (split by a space) of <paramref name="str" /> are located (separately) in
/// <paramref name="baseString" /> <br />
/// <example>
/// The following example will return <see langword="TRUE" /><br />
/// <c>STRContains("Hello World !", "I type word Hello and then i typed word World !")</c><br />
/// The following example will return <see langword="TRUE" /><br />
/// <c>STRContains("Hello World !", "I typed Hello World !" </c><br />
/// The following example will return <see langword="TRUE" /><br />
/// <c>STRContains("Hello World", "I type World then Hello")</c><br />
/// The following example will return <see langword="FALSE" /><br />
/// <c>STRContains("Hello World !", "I typed Hello World")</c><br />
/// </example>
/// </summary>
/// <param name="str">The string you are checking</param>
/// <param name="baseString">The main string that should contain <paramref name="str" /></param>
/// <returns></returns>
public static bool STRContains(this string str, string baseString)
{
if (baseString.Contains(str)) return true;
var array = str.Split(' ');
foreach (var s in array)
if (!baseString.Contains(s))
return false;
return true;
}
public static bool TryReadValueFromJson(string input, string codeName, out JsonElement element) public static bool TryReadValueFromJson(string input, string codeName, out JsonElement element)
{ {
Stream text; Stream text;

2
PluginManager/PluginManager.csproj
View File

@@ -16,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Discord.Net" Version="3.7.2" /> <PackageReference Include="Discord.Net" Version="3.8.1" />
<PackageReference Include="Terminal.Gui" Version="1.8.2" /> <PackageReference Include="Terminal.Gui" Version="1.8.2" />
</ItemGroup> </ItemGroup>

12
SethDiscordBot.sln
View File

@@ -7,6 +7,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordBot", "DiscordBot\Di
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginManager", "PluginManager\PluginManager.csproj", "{EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginManager", "PluginManager\PluginManager.csproj", "{EDD4D9B3-98DD-4367-A09F-D1C5ACB61132}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicLibrary", "..\DiscordBotItems\Plugins\MusicLibrary\MusicLibrary.csproj", "{878DFE01-4596-4EBC-9651-0679598CE794}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicLibraryEvent", "..\DiscordBotItems\Plugins\MusicLibraryEvent\MusicLibraryEvent.csproj", "{3EE0C8B4-5625-48A8-8246-5AD54A38A9B1}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -21,6 +25,14 @@ 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
{878DFE01-4596-4EBC-9651-0679598CE794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{878DFE01-4596-4EBC-9651-0679598CE794}.Debug|Any CPU.Build.0 = Debug|Any CPU
{878DFE01-4596-4EBC-9651-0679598CE794}.Release|Any CPU.ActiveCfg = Release|Any CPU
{878DFE01-4596-4EBC-9651-0679598CE794}.Release|Any CPU.Build.0 = Release|Any CPU
{3EE0C8B4-5625-48A8-8246-5AD54A38A9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EE0C8B4-5625-48A8-8246-5AD54A38A9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EE0C8B4-5625-48A8-8246-5AD54A38A9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EE0C8B4-5625-48A8-8246-5AD54A38A9B1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE