More stuff updated
This commit is contained in:
EmotionChild
parent
8365b7c5aa
commit
c9180130f9
7 changed files with 325 additions and 334 deletions
|
|
@ -1,9 +1,6 @@
|
||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SupportChild", "SupportChild\SupportChild.csproj", "{B043AACB-D763-4C61-9524-C8B7C58DA3EF}"
|
||||||
VisualStudioVersion = 17.0.32126.317
|
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SupportChild", "SupportChild\SupportChild.csproj", "{9124DF58-D261-4906-8ECA-D853DEBE07D4}"
|
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
|
@ -11,15 +8,9 @@ Global
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{9124DF58-D261-4906-8ECA-D853DEBE07D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{B043AACB-D763-4C61-9524-C8B7C58DA3EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{9124DF58-D261-4906-8ECA-D853DEBE07D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{B043AACB-D763-4C61-9524-C8B7C58DA3EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{9124DF58-D261-4906-8ECA-D853DEBE07D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{B043AACB-D763-4C61-9524-C8B7C58DA3EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{9124DF58-D261-4906-8ECA-D853DEBE07D4}.Release|Any CPU.Build.0 = Release|Any CPU
|
{B043AACB-D763-4C61-9524-C8B7C58DA3EF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
SolutionGuid = {B2CD3447-A8BA-4B02-9E08-A75CBBD2BDCB}
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
|
||||||
|
|
@ -10,134 +10,134 @@ using YamlDotNet.Serialization;
|
||||||
|
|
||||||
namespace SupportChild
|
namespace SupportChild
|
||||||
{
|
{
|
||||||
internal static class Config
|
internal static class Config
|
||||||
{
|
{
|
||||||
internal static string token = "";
|
internal static string token = "";
|
||||||
internal static string prefix = "";
|
internal static string prefix = "";
|
||||||
internal static ulong logChannel;
|
internal static ulong logChannel;
|
||||||
internal static ulong ticketCategory;
|
internal static ulong ticketCategory;
|
||||||
internal static ulong reactionMessage;
|
internal static ulong reactionMessage;
|
||||||
internal static string welcomeMessage = "";
|
internal static string welcomeMessage = "";
|
||||||
internal static string logLevel = "Information";
|
internal static string logLevel = "Information";
|
||||||
internal static string timestampFormat = "yyyy-MMM-dd HH:mm";
|
internal static string timestampFormat = "yyyy-MMM-dd HH:mm";
|
||||||
internal static bool randomAssignment = false;
|
internal static bool randomAssignment = false;
|
||||||
internal static bool randomAssignRoleOverride = false; // TODO: Implement
|
internal static bool randomAssignRoleOverride = false;
|
||||||
internal static string presenceType = "Playing";
|
internal static string presenceType = "Playing";
|
||||||
internal static string presenceText = "";
|
internal static string presenceText = "";
|
||||||
|
|
||||||
internal static bool ticketUpdatedNotifications = false;
|
internal static bool ticketUpdatedNotifications = false;
|
||||||
internal static double ticketUpdatedNotificationDelay = 0.0;
|
internal static double ticketUpdatedNotificationDelay = 0.0;
|
||||||
internal static bool assignmentNotifications = false;
|
internal static bool assignmentNotifications = false;
|
||||||
internal static bool closingNotifications = false;
|
internal static bool closingNotifications = false;
|
||||||
|
|
||||||
internal static string hostName = "127.0.0.1";
|
internal static string hostName = "127.0.0.1";
|
||||||
internal static int port = 3306;
|
internal static int port = 3306;
|
||||||
internal static string database = "supportbot";
|
internal static string database = "supportbot";
|
||||||
internal static string username = "supportbot";
|
internal static string username = "supportbot";
|
||||||
internal static string password = "";
|
internal static string password = "";
|
||||||
|
|
||||||
private static readonly Dictionary<string, ulong[]> permissions = new Dictionary<string, ulong[]>
|
private static readonly Dictionary<string, ulong[]> permissions = new Dictionary<string, ulong[]>
|
||||||
{
|
{
|
||||||
// Public commands
|
// Public commands
|
||||||
{ "close", new ulong[]{ } },
|
{ "close", new ulong[]{ } },
|
||||||
{ "list", new ulong[]{ } },
|
{ "list", new ulong[]{ } },
|
||||||
{ "new", new ulong[]{ } },
|
{ "new", new ulong[]{ } },
|
||||||
{ "say", new ulong[]{ } },
|
{ "say", new ulong[]{ } },
|
||||||
{ "status", new ulong[]{ } },
|
{ "status", new ulong[]{ } },
|
||||||
{ "summary", new ulong[]{ } },
|
{ "summary", new ulong[]{ } },
|
||||||
{ "transcript", new ulong[]{ } },
|
{ "transcript", new ulong[]{ } },
|
||||||
// Moderator commands
|
// Moderator commands
|
||||||
{ "add", new ulong[]{ } },
|
{ "add", new ulong[]{ } },
|
||||||
{ "addmessage", new ulong[]{ } },
|
{ "addmessage", new ulong[]{ } },
|
||||||
{ "assign", new ulong[]{ } },
|
{ "assign", new ulong[]{ } },
|
||||||
{ "blacklist", new ulong[]{ } },
|
{ "blacklist", new ulong[]{ } },
|
||||||
{ "listassigned", new ulong[]{ } },
|
{ "listassigned", new ulong[]{ } },
|
||||||
{ "listoldest", new ulong[]{ } },
|
{ "listoldest", new ulong[]{ } },
|
||||||
{ "listunassigned", new ulong[]{ } },
|
{ "listunassigned", new ulong[]{ } },
|
||||||
{ "move", new ulong[]{ } },
|
{ "move", new ulong[]{ } },
|
||||||
{ "rassign", new ulong[]{ } },
|
{ "rassign", new ulong[]{ } },
|
||||||
{ "removemessage", new ulong[]{ } },
|
{ "removemessage", new ulong[]{ } },
|
||||||
{ "setsummary", new ulong[]{ } },
|
{ "setsummary", new ulong[]{ } },
|
||||||
{ "toggleactive", new ulong[]{ } },
|
{ "toggleactive", new ulong[]{ } },
|
||||||
{ "unassign", new ulong[]{ } },
|
{ "unassign", new ulong[]{ } },
|
||||||
{ "unblacklist", new ulong[]{ } },
|
{ "unblacklist", new ulong[]{ } },
|
||||||
// Admin commands
|
// Admin commands
|
||||||
{ "addstaff", new ulong[]{ } },
|
{ "addstaff", new ulong[]{ } },
|
||||||
{ "reload", new ulong[]{ } },
|
{ "reload", new ulong[]{ } },
|
||||||
{ "removestaff", new ulong[]{ } },
|
{ "removestaff", new ulong[]{ } },
|
||||||
{ "setticket", new ulong[]{ } },
|
{ "setticket", new ulong[]{ } },
|
||||||
{ "unsetticket", new ulong[]{ } },
|
{ "unsetticket", new ulong[]{ } },
|
||||||
};
|
};
|
||||||
|
|
||||||
public static void LoadConfig()
|
public static void LoadConfig()
|
||||||
{
|
{
|
||||||
// Writes default config to file if it does not already exist
|
// Writes default config to file if it does not already exist
|
||||||
if (!File.Exists("./config.yml"))
|
if (!File.Exists("./config.yml"))
|
||||||
{
|
{
|
||||||
File.WriteAllText("./config.yml", Encoding.UTF8.GetString(Resources.default_config));
|
File.WriteAllText("./config.yml", Encoding.UTF8.GetString(Resources.default_config));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reads config contents into FileStream
|
// Reads config contents into FileStream
|
||||||
FileStream stream = File.OpenRead("./config.yml");
|
FileStream stream = File.OpenRead("./config.yml");
|
||||||
|
|
||||||
// Converts the FileStream into a YAML object
|
// Converts the FileStream into a YAML object
|
||||||
IDeserializer deserializer = new DeserializerBuilder().Build();
|
IDeserializer deserializer = new DeserializerBuilder().Build();
|
||||||
object yamlObject = deserializer.Deserialize(new StreamReader(stream));
|
object yamlObject = deserializer.Deserialize(new StreamReader(stream));
|
||||||
|
|
||||||
// Converts the YAML object into a JSON object as the YAML ones do not support traversal or selection of nodes by name
|
// Converts the YAML object into a JSON object as the YAML ones do not support traversal or selection of nodes by name
|
||||||
ISerializer serializer = new SerializerBuilder().JsonCompatible().Build();
|
ISerializer serializer = new SerializerBuilder().JsonCompatible().Build();
|
||||||
JObject json = JObject.Parse(serializer.Serialize(yamlObject));
|
JObject json = JObject.Parse(serializer.Serialize(yamlObject));
|
||||||
|
|
||||||
// Sets up the bot
|
// Sets up the bot
|
||||||
token = json.SelectToken("bot.token").Value<string>() ?? "";
|
token = json.SelectToken("bot.token").Value<string>() ?? "";
|
||||||
prefix = json.SelectToken("bot.prefix").Value<string>() ?? "";
|
prefix = json.SelectToken("bot.prefix").Value<string>() ?? "";
|
||||||
logChannel = json.SelectToken("bot.log-channel").Value<ulong>();
|
logChannel = json.SelectToken("bot.log-channel").Value<ulong>();
|
||||||
ticketCategory = json.SelectToken("bot.ticket-category")?.Value<ulong>() ?? 0;
|
ticketCategory = json.SelectToken("bot.ticket-category")?.Value<ulong>() ?? 0;
|
||||||
reactionMessage = json.SelectToken("bot.reaction-message")?.Value<ulong>() ?? 0;
|
reactionMessage = json.SelectToken("bot.reaction-message")?.Value<ulong>() ?? 0;
|
||||||
welcomeMessage = json.SelectToken("bot.welcome-message").Value<string>() ?? "";
|
welcomeMessage = json.SelectToken("bot.welcome-message").Value<string>() ?? "";
|
||||||
logLevel = json.SelectToken("bot.console-log-level").Value<string>() ?? "";
|
logLevel = json.SelectToken("bot.console-log-level").Value<string>() ?? "";
|
||||||
timestampFormat = json.SelectToken("bot.timestamp-format").Value<string>() ?? "yyyy-MM-dd HH:mm";
|
timestampFormat = json.SelectToken("bot.timestamp-format").Value<string>() ?? "yyyy-MM-dd HH:mm";
|
||||||
randomAssignment = json.SelectToken("bot.random-assignment")?.Value<bool>() ?? false;
|
randomAssignment = json.SelectToken("bot.random-assignment")?.Value<bool>() ?? false;
|
||||||
randomAssignRoleOverride = json.SelectToken("bot.random-assign-role-override")?.Value<bool>() ?? false;
|
randomAssignRoleOverride = json.SelectToken("bot.random-assign-role-override")?.Value<bool>() ?? false;
|
||||||
presenceType = json.SelectToken("bot.presence-type")?.Value<string>() ?? "Playing";
|
presenceType = json.SelectToken("bot.presence-type")?.Value<string>() ?? "Playing";
|
||||||
presenceText = json.SelectToken("bot.presence-text")?.Value<string>() ?? "";
|
presenceText = json.SelectToken("bot.presence-text")?.Value<string>() ?? "";
|
||||||
|
|
||||||
ticketUpdatedNotifications = json.SelectToken("notifications.ticket-updated")?.Value<bool>() ?? false;
|
ticketUpdatedNotifications = json.SelectToken("notifications.ticket-updated")?.Value<bool>() ?? false;
|
||||||
ticketUpdatedNotificationDelay = json.SelectToken("notifications.ticket-updated-delay")?.Value<double>() ?? 0.0;
|
ticketUpdatedNotificationDelay = json.SelectToken("notifications.ticket-updated-delay")?.Value<double>() ?? 0.0;
|
||||||
assignmentNotifications = json.SelectToken("notifications.assignment")?.Value<bool>() ?? false;
|
assignmentNotifications = json.SelectToken("notifications.assignment")?.Value<bool>() ?? false;
|
||||||
closingNotifications = json.SelectToken("notifications.closing")?.Value<bool>() ?? false;
|
closingNotifications = json.SelectToken("notifications.closing")?.Value<bool>() ?? false;
|
||||||
|
|
||||||
// Reads database info
|
// Reads database info
|
||||||
hostName = json.SelectToken("database.address")?.Value<string>() ?? "";
|
hostName = json.SelectToken("database.address")?.Value<string>() ?? "";
|
||||||
port = json.SelectToken("database.port")?.Value<int>() ?? 3306;
|
port = json.SelectToken("database.port")?.Value<int>() ?? 3306;
|
||||||
database = json.SelectToken("database.name")?.Value<string>() ?? "supportbot";
|
database = json.SelectToken("database.name")?.Value<string>() ?? "supportchild";
|
||||||
username = json.SelectToken("database.user")?.Value<string>() ?? "supportbot";
|
username = json.SelectToken("database.user")?.Value<string>() ?? "supportchild";
|
||||||
password = json.SelectToken("database.password")?.Value<string>() ?? "";
|
password = json.SelectToken("database.password")?.Value<string>() ?? "";
|
||||||
|
|
||||||
timestampFormat = timestampFormat.Trim();
|
timestampFormat = timestampFormat.Trim();
|
||||||
|
|
||||||
foreach (KeyValuePair<string, ulong[]> node in permissions.ToList())
|
foreach (KeyValuePair<string, ulong[]> node in permissions.ToList())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
permissions[node.Key] = json.SelectToken("permissions." + node.Key).Value<JArray>().Values<ulong>().ToArray();
|
permissions[node.Key] = json.SelectToken("permissions." + node.Key).Value<JArray>().Values<ulong>().ToArray();
|
||||||
}
|
}
|
||||||
catch (ArgumentNullException)
|
catch (ArgumentNullException)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Permission node '" + node.Key + "' was not found in the config, using default value: []");
|
Console.WriteLine("Permission node '" + node.Key + "' was not found in the config, using default value: []");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Checks whether a user has a specific permission.
|
/// Checks whether a user has a specific permission.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="member">The Discord user to check.</param>
|
/// <param name="member">The Discord user to check.</param>
|
||||||
/// <param name="permission">The permission name to check.</param>
|
/// <param name="permission">The permission name to check.</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static bool HasPermission(DiscordMember member, string permission)
|
public static bool HasPermission(DiscordMember member, string permission)
|
||||||
{
|
{
|
||||||
return member.Roles.Any(role => permissions[permission].Contains(role.Id)) || permissions[permission].Contains(member.Guild.Id);
|
return member.Roles.Any(role => permissions[permission].Contains(role.Id)) || permissions[permission].Contains(member.Guild.Id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,124 +1,124 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<root>
|
<root>
|
||||||
<!--
|
<!--
|
||||||
Microsoft ResX Schema
|
Microsoft ResX Schema
|
||||||
|
|
||||||
Version 2.0
|
Version 2.0
|
||||||
|
|
||||||
The primary goals of this format is to allow a simple XML format
|
The primary goals of this format is to allow a simple XML format
|
||||||
that is mostly human readable. The generation and parsing of the
|
that is mostly human readable. The generation and parsing of the
|
||||||
various data types are done through the TypeConverter classes
|
various data types are done through the TypeConverter classes
|
||||||
associated with the data types.
|
associated with the data types.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
... ado.net/XML headers & schema ...
|
... ado.net/XML headers & schema ...
|
||||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
<resheader name="version">2.0</resheader>
|
<resheader name="version">2.0</resheader>
|
||||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
|
<data name="default_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\default_config.yml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
|
||||||
<comment>This is a comment</comment>
|
|
||||||
</data>
|
|
||||||
|
|
||||||
There are any number of "resheader" rows that contain simple
|
|
||||||
name/value pairs.
|
|
||||||
|
|
||||||
Each data row contains a name, and value. The row also contains a
|
|
||||||
type or mimetype. Type corresponds to a .NET class that support
|
|
||||||
text/value conversion through the TypeConverter architecture.
|
|
||||||
Classes that don't support this are serialized and stored with the
|
|
||||||
mimetype set.
|
|
||||||
|
|
||||||
The mimetype is used for serialized objects, and tells the
|
|
||||||
ResXResourceReader how to depersist the object. This is currently not
|
|
||||||
extensible. For a given mimetype the value must be set accordingly:
|
|
||||||
|
|
||||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
|
||||||
that the ResXResourceWriter will generate, however the reader can
|
|
||||||
read any of the formats listed below.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.binary.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.soap.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
|
||||||
value : The object must be serialized into a byte array
|
|
||||||
: using a System.ComponentModel.TypeConverter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
-->
|
|
||||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:choice maxOccurs="unbounded">
|
|
||||||
<xsd:element name="metadata">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
|
||||||
<xsd:attribute ref="xml:space" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="assembly">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:attribute name="alias" type="xsd:string" />
|
|
||||||
<xsd:attribute name="name" type="xsd:string" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="data">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
|
||||||
<xsd:attribute ref="xml:space" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="resheader">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:choice>
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:schema>
|
|
||||||
<resheader name="resmimetype">
|
|
||||||
<value>text/microsoft-resx</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="version">
|
|
||||||
<value>2.0</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="reader">
|
|
||||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="writer">
|
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
|
||||||
<data name="default_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\default_config.yml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</data>
|
|
||||||
</root>
|
</root>
|
||||||
|
|
@ -123,7 +123,7 @@ namespace SupportChild
|
||||||
Console.WriteLine("Registering commands...");
|
Console.WriteLine("Registering commands...");
|
||||||
commands = discordClient.UseCommandsNext(new CommandsNextConfiguration
|
commands = discordClient.UseCommandsNext(new CommandsNextConfiguration
|
||||||
{
|
{
|
||||||
StringPrefixes = new[] { Config.prefix }
|
StringPrefixes = new []{ Config.prefix }
|
||||||
});
|
});
|
||||||
|
|
||||||
this.commands.RegisterCommands<AddCommand>();
|
this.commands.RegisterCommands<AddCommand>();
|
||||||
|
|
|
||||||
|
|
@ -1,70 +1,70 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<ApplicationIcon>ellie_icon.ico</ApplicationIcon>
|
<ApplicationIcon>ellie_icon.ico</ApplicationIcon>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
|
||||||
<Version>1.2.0</Version>
|
<Version>1.2.0</Version>
|
||||||
<StartupObject>SupportChild.SupportChild</StartupObject>
|
<StartupObject>SupportChild.SupportChild</StartupObject>
|
||||||
<Authors>EmotionChild</Authors>
|
<Authors>EmotionChild</Authors>
|
||||||
<Product />
|
<Product />
|
||||||
<PackageProjectUrl>https://github.com/EmotionChild/SupportChild</PackageProjectUrl>
|
<PackageProjectUrl>https://github.com/EmotionChild/SupportChild</PackageProjectUrl>
|
||||||
<RepositoryUrl>https://github.com/EmotionChild/SupportChild</RepositoryUrl>
|
<RepositoryUrl>https://github.com/EmotionChild/SupportChild</RepositoryUrl>
|
||||||
<RepositoryType>Git</RepositoryType>
|
<RepositoryType>Git</RepositoryType>
|
||||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||||
<PackageIconUrl>https://cdn.emotionchild.com/Ellie.png</PackageIconUrl>
|
<PackageIconUrl>https://cdn.emotionchild.com/Ellie.png</PackageIconUrl>
|
||||||
<Description>A Discord support bot build for the Ellie's Home Discord server</Description>
|
<Description>A Discord support bot build for the Ellie's Home Discord server</Description>
|
||||||
<AssemblyVersion>2.6.1.1</AssemblyVersion>
|
<AssemblyVersion>2.6.1.1</AssemblyVersion>
|
||||||
<FileVersion>2.6.1.1</FileVersion>
|
<FileVersion>2.6.1.1</FileVersion>
|
||||||
<NeutralLanguage>en</NeutralLanguage>
|
<NeutralLanguage>en</NeutralLanguage>
|
||||||
<PackageVersion>1.2.0</PackageVersion>
|
<PackageVersion>1.2.0</PackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="DSharpPlus" Version="4.2.0-nightly-01109" />
|
<PackageReference Include="DSharpPlus" Version="4.2.0" />
|
||||||
<PackageReference Include="DSharpPlus.CommandsNext" Version="4.2.0-nightly-01109" />
|
<PackageReference Include="DSharpPlus.CommandsNext" Version="4.2.0" />
|
||||||
<PackageReference Include="DSharpPlus.Interactivity" Version="4.2.0-nightly-01109" />
|
<PackageReference Include="DSharpPlus.Interactivity" Version="4.2.0" />
|
||||||
<PackageReference Include="JsonExtensions" Version="1.2.0" />
|
<PackageReference Include="JsonExtensions" Version="1.2.0" />
|
||||||
<PackageReference Include="MiniRazor.CodeGen" Version="2.2.1" />
|
<PackageReference Include="MiniRazor.CodeGen" Version="2.2.1" />
|
||||||
<PackageReference Include="MySql.Data" Version="8.0.28" />
|
<PackageReference Include="MySql.Data" Version="8.0.29" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||||
<PackageReference Include="Polly" Version="7.2.3" />
|
<PackageReference Include="Polly" Version="7.2.3" />
|
||||||
<PackageReference Include="Superpower" Version="3.0.0" />
|
<PackageReference Include="Superpower" Version="3.0.0" />
|
||||||
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
|
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
|
||||||
<PackageReference Include="YamlDotNet" Version="11.2.1" />
|
<PackageReference Include="YamlDotNet" Version="11.2.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Update="Properties\Resources.Designer.cs">
|
<Compile Update="Properties\Resources.Designer.cs">
|
||||||
<DesignTime>True</DesignTime>
|
<DesignTime>True</DesignTime>
|
||||||
<AutoGen>True</AutoGen>
|
<AutoGen>True</AutoGen>
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
<DependentUpon>Resources.resx</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Update="Properties\Resources.resx">
|
<EmbeddedResource Update="Properties\Resources.resx">
|
||||||
<Generator>ResXFileCodeGenerator</Generator>
|
<Generator>ResXFileCodeGenerator</Generator>
|
||||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\LICENSE">
|
<None Include="..\LICENSE">
|
||||||
<Pack>True</Pack>
|
<Pack>True</Pack>
|
||||||
<PackagePath></PackagePath>
|
<PackagePath></PackagePath>
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="lib\" />
|
<Folder Include="lib\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DiscordChatExporter.Core">
|
<Reference Include="DiscordChatExporter.Core">
|
||||||
<HintPath>lib\DiscordChatExporter.Core.dll</HintPath>
|
<HintPath>lib\DiscordChatExporter.Core.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ namespace SupportChild
|
||||||
{
|
{
|
||||||
byte[] box = new byte[1];
|
byte[] box = new byte[1];
|
||||||
do provider.GetBytes(box);
|
do provider.GetBytes(box);
|
||||||
while (!(box[0] < n * (byte.MaxValue / n)));
|
while (!(box[0] < n * (Byte.MaxValue / n)));
|
||||||
int k = box[0] % n;
|
int k = (box[0] % n);
|
||||||
n--;
|
n--;
|
||||||
T value = list[k];
|
T value = list[k];
|
||||||
list[k] = list[n];
|
list[k] = list[n];
|
||||||
|
|
@ -32,7 +32,7 @@ namespace SupportChild
|
||||||
{
|
{
|
||||||
return new string[0];
|
return new string[0];
|
||||||
}
|
}
|
||||||
return args.Trim().Replace("<@!", "").Replace("<@", "").Replace(">", "").Split();
|
return args.Trim().Replace("<@!", "").Replace("<@", "").Replace(">", "").Split();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LinkedList<string> ParseListIntoMessages(List<string> listItems)
|
public static LinkedList<string> ParseListIntoMessages(List<string> listItems)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue