Breadcraft-devs/Breadcraft-Support
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Updated stuff to be the right version and fixed some commands

Browse source
This commit is contained in:
Emotion 2023-05-26 23:27:27 +12:00
parent c299c869f1
commit 04134e9fb2
No known key found for this signature in database
GPG key ID: 15EBDFF858B9A65A
26 changed files with 359 additions and 348 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Breadcraft/Breadcraft.csproj
View file

@ -27,13 +27,13 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DSharpPlus" Version="4.2.0" />
<PackageReference Include="DSharpPlus.Interactivity" Version="4.2.0" />
<PackageReference Include="DSharpPlus.SlashCommands" Version="4.2.0" />
<PackageReference Include="DSharpPlus" Version="4.4.0-nightly-01249" />
<PackageReference Include="DSharpPlus.Interactivity" Version="4.4.0-nightly-01249" />
<PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.0-nightly-01249" />
<PackageReference Include="Gress" Version="2.0.1" />
<PackageReference Include="JsonExtensions" Version="1.2.0" />
<PackageReference Include="MiniRazor.CodeGen" Version="2.2.1" />
<PackageReference Include="MySql.Data" Version="8.0.30" />
<PackageReference Include="MySqlConnector" Version="2.2.5" />
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.1" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="Superpower" Version="3.0.0" />

4
Breadcraft/Commands/AddCategoryCommand.cs
View file

@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Threading.Tasks;
using DSharpPlus.Entities;
using DSharpPlus.SlashCommands;
using DSharpPlus.SlashCommands.Attributes;
@ -51,7 +51,7 @@ public class AddCategoryCommand : ApplicationCommandModule
return;
}
if(Database.AddCategory(title, category.Id))
if (Database.AddCategory(title, category.Id))
{
await command.CreateResponseAsync(new DiscordEmbedBuilder
{

2
Breadcraft/Commands/AddMessageCommand.cs
View file

@ -33,7 +33,7 @@ public class AddMessageCommand : ApplicationCommandModule
return;
}
if(Database.AddMessage(identifier, command.Member.Id, message))
if (Database.AddMessage(identifier, command.Member.Id, message))
{
await command.CreateResponseAsync(new DiscordEmbedBuilder
{

2
Breadcraft/Commands/AddStaffCommand.cs
View file

@ -3,7 +3,7 @@ using System.Threading.Tasks;
using DSharpPlus.Entities;
using DSharpPlus.SlashCommands;
using DSharpPlus.SlashCommands.Attributes;
using MySql.Data.MySqlClient;
using MySqlConnector;
namespace Breadcraft.Commands;

4
Breadcraft/Commands/AdminCommands.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@ -28,7 +28,7 @@ public class AdminCommands : ApplicationCommandModule
// Get all channels in all guilds the bot is part of
List<DiscordChannel> allChannels = new List<DiscordChannel>();
foreach (KeyValuePair<ulong,DiscordGuild> guild in Breadcraft.discordClient.Guilds)
foreach (KeyValuePair<ulong, DiscordGuild> guild in Breadcraft.discordClient.Guilds)
{
try
{

2
Breadcraft/Commands/AssignCommand.cs
View file

@ -85,7 +85,7 @@ public class AssignCommand : ApplicationCommandModule
Description = "You have been assigned to a support ticket: " + command.Channel.Mention
});
}
catch (UnauthorizedException) {}
catch (UnauthorizedException) { }
}
// Log it if the log channel exists

6
Breadcraft/Commands/CloseCommand.cs
View file

@ -33,7 +33,7 @@ public class CloseCommand : ApplicationCommandModule
Color = DiscordColor.Cyan,
Description = "Are you sure you wish to close this ticket? You cannot re-open it again later."
})
.AddComponents(new DiscordButtonComponent(ButtonStyle.Danger, "breadcraft_closeconfirm", "Confirm"));
.AddComponents(new DiscordButtonComponent(ButtonStyle.Danger, "bcsupport_closeconfirm", "Confirm"));
await command.CreateResponseAsync(confirmation);
@ -86,7 +86,7 @@ public class CloseCommand : ApplicationCommandModule
await using FileStream file = new FileStream(Transcriber.GetPath(ticket.id), FileMode.Open, FileAccess.Read);
DiscordMessageBuilder message = new DiscordMessageBuilder();
message.WithEmbed(embed);
message.WithFiles(new Dictionary<string, Stream> { { Transcriber.GetFilename(ticket.id), file } });
message.AddFiles(new Dictionary<string, Stream> { { Transcriber.GetFilename(ticket.id), file } });
await logChannel.SendMessageAsync(message);
}
@ -107,7 +107,7 @@ public class CloseCommand : ApplicationCommandModule
DiscordMessageBuilder message = new DiscordMessageBuilder();
message.WithEmbed(embed);
message.WithFiles(new Dictionary<string, Stream> { { Transcriber.GetFilename(ticket.id), file } });
message.AddFiles(new Dictionary<string, Stream> { { Transcriber.GetFilename(ticket.id), file } });
await staffMember.SendMessageAsync(message);
}

8
Breadcraft/Commands/CreateButtonPanelCommand.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using DSharpPlus;
@ -36,7 +36,7 @@ public class CreateButtonPanelCommand : ApplicationCommandModule
for (; nrOfButtons < 5 * (nrOfButtonRows + 1) && nrOfButtons < verifiedCategories.Count; nrOfButtons++)
{
buttonRow.Add(new DiscordButtonComponent(ButtonStyle.Primary, "breadcraft_newticketbutton " + verifiedCategories[nrOfButtons].id, verifiedCategories[nrOfButtons].name));
buttonRow.Add(new DiscordButtonComponent(ButtonStyle.Primary, "bcsupport_newticketbutton " + verifiedCategories[nrOfButtons].id, verifiedCategories[nrOfButtons].name));
}
builder.AddComponents(buttonRow);
}
@ -53,9 +53,9 @@ public class CreateButtonPanelCommand : ApplicationCommandModule
{
await interaction.CreateResponseAsync(InteractionResponseType.DeferredChannelMessageWithSource, new DiscordInteractionResponseBuilder().AsEphemeral());
if (!ulong.TryParse(interaction.Data.CustomId.Replace("breadcraft_newticketbutton ", ""), out ulong categoryID) || categoryID == 0)
if (!ulong.TryParse(interaction.Data.CustomId.Replace("bcsupport_newticketbutton ", ""), out ulong categoryID) || categoryID == 0)
{
Logger.Warn("Invalid ID: " + interaction.Data.CustomId.Replace("breadcraft_newticketbutton ", ""));
Logger.Warn("Invalid ID: " + interaction.Data.CustomId.Replace("bcsupport_newticketbutton ", ""));
return;
}

4
Breadcraft/Commands/CreateSelectionBoxPanelCommand.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using DSharpPlus;
@ -43,7 +43,7 @@ public class CreateSelectionBoxPanelCommand : ApplicationCommandModule
{
categoryOptions.Add(new DiscordSelectComponentOption(verifiedCategories[selectionOptions].name, verifiedCategories[selectionOptions].id.ToString()));
}
selectionComponents.Add(new DiscordSelectComponent("breadcraft_newticketselector" + selectionBoxes, placeholder, categoryOptions, false, 0, 1));
selectionComponents.Add(new DiscordSelectComponent("bcsupport_newticketselector" + selectionBoxes, placeholder, categoryOptions, false, 0, 1));
}
return selectionComponents;

4
Breadcraft/Commands/ListCommand.cs
View file

@ -37,7 +37,7 @@ public class ListCommand : ApplicationCommandModule
// Add the titles
for (int i = 0; i < openEmbeds.Count; i++)
{
openEmbeds[i].Title = $"Open tickets ({i+1}/{openEmbeds.Count})";
openEmbeds[i].Title = $"Open tickets ({i + 1}/{openEmbeds.Count})";
}
}
@ -62,7 +62,7 @@ public class ListCommand : ApplicationCommandModule
// Add the titles
for (int i = 0; i < closedEmbeds.Count; i++)
{
closedEmbeds[i].Title = $"Closed tickets ({i+1}/{closedEmbeds.Count})";
closedEmbeds[i].Title = $"Closed tickets ({i + 1}/{closedEmbeds.Count})";
}
}

11
Breadcraft/Commands/NewCommand.cs
View file

@ -9,6 +9,7 @@ using DSharpPlus.SlashCommands;
using DSharpPlus.SlashCommands.Attributes;
namespace Breadcraft.Commands;
public class NewCommand : ApplicationCommandModule
{
[SlashRequireGuild]
@ -69,7 +70,7 @@ public class NewCommand : ApplicationCommandModule
for (; nrOfButtons < 5 * (nrOfButtonRows + 1) && nrOfButtons < verifiedCategories.Count; nrOfButtons++)
{
buttonRow.Add(new DiscordButtonComponent(ButtonStyle.Primary, "breadcraft_newcommandbutton " + verifiedCategories[nrOfButtons].id, verifiedCategories[nrOfButtons].name));
buttonRow.Add(new DiscordButtonComponent(ButtonStyle.Primary, "bcsupport_newcommandbutton " + verifiedCategories[nrOfButtons].id, verifiedCategories[nrOfButtons].name));
}
builder.AddComponents(buttonRow);
}
@ -90,7 +91,7 @@ public class NewCommand : ApplicationCommandModule
{
categoryOptions.Add(new DiscordSelectComponentOption(verifiedCategories[selectionOptions].name, verifiedCategories[selectionOptions].id.ToString()));
}
selectionComponents.Add(new DiscordSelectComponent("breadcraft_newcommandselector" + selectionBoxes, "Open new ticket...", categoryOptions, false, 0, 1));
selectionComponents.Add(new DiscordSelectComponent("bcsupport_newcommandselector" + selectionBoxes, "Open new ticket...", categoryOptions, false, 0, 1));
}
await command.CreateResponseAsync(new DiscordInteractionResponseBuilder().AddComponents(selectionComponents).AsEphemeral());
@ -102,9 +103,9 @@ public class NewCommand : ApplicationCommandModule
switch (interaction.Data.ComponentType)
{
case ComponentType.Button:
stringID = interaction.Data.CustomId.Replace("breadcraft_newcommandbutton ", "");
stringID = interaction.Data.CustomId.Replace("bcsupport_newcommandbutton ", "");
break;
case ComponentType.Select:
case ComponentType.StringSelect:
if (interaction.Data.Values == null || interaction.Data.Values.Length <= 0) return;
stringID = interaction.Data.Values[0];
break;
@ -265,7 +266,7 @@ public class NewCommand : ApplicationCommandModule
{
Color = DiscordColor.Green,
Description = "Ticket " + ticketChannel.Mention + " opened by " + member.Mention + ".\n",
Footer = new DiscordEmbedBuilder.EmbedFooter {Text = "Ticket " + ticketID}
Footer = new DiscordEmbedBuilder.EmbedFooter { Text = "Ticket " + ticketID }
};
await logChannel.SendMessageAsync(logMessage);
}

2
Breadcraft/Commands/RandomAssignCommand.cs
View file

@ -63,7 +63,7 @@ public class RandomAssignCommand : ApplicationCommandModule
Description = "You have been randomly assigned to a support ticket: " + command.Channel.Mention
});
}
catch (UnauthorizedException) {}
catch (UnauthorizedException) { }
}
// Log it if the log channel exists

2
Breadcraft/Commands/RemoveCategoryCommand.cs
View file

@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Threading.Tasks;
using DSharpPlus.Entities;
using DSharpPlus.SlashCommands;
using DSharpPlus.SlashCommands.Attributes;

2
Breadcraft/Commands/RemoveStaffCommand.cs
View file

@ -2,7 +2,7 @@
using DSharpPlus.Entities;
using DSharpPlus.SlashCommands;
using DSharpPlus.SlashCommands.Attributes;
using MySql.Data.MySqlClient;
using MySqlConnector;
namespace Breadcraft.Commands;

2
Breadcraft/Commands/SetSummaryCommand.cs
View file

@ -2,7 +2,7 @@
using DSharpPlus.Entities;
using DSharpPlus.SlashCommands;
using DSharpPlus.SlashCommands.Attributes;
using MySql.Data.MySqlClient;
using MySqlConnector;
namespace Breadcraft.Commands;

4
Breadcraft/Commands/TranscriptCommand.cs
View file

@ -90,7 +90,7 @@ public class TranscriptCommand : ApplicationCommandModule
Description = "Ticket " + ticket.id.ToString("00000") + " transcript generated by " + command.Member.Mention + ".\n",
Footer = new DiscordEmbedBuilder.EmbedFooter { Text = '#' + command.Channel.Name }
});
message.WithFiles(new Dictionary<string, Stream> { { Transcriber.GetFilename(ticket.id), file } });
message.AddFiles(new Dictionary<string, Stream> { { Transcriber.GetFilename(ticket.id), file } });
await logChannel.SendMessageAsync(message);
}
@ -106,7 +106,7 @@ public class TranscriptCommand : ApplicationCommandModule
Color = DiscordColor.Green,
Description = "Transcript generated!\n"
});
directMessage.WithFiles(new Dictionary<string, Stream> { { Transcriber.GetFilename(ticket.id), file } });
directMessage.AddFiles(new Dictionary<string, Stream> { { Transcriber.GetFilename(ticket.id), file } });
await command.Member.SendMessageAsync(directMessage);
}

2
Breadcraft/Config.cs
View file

@ -89,7 +89,7 @@ internal static class Config
hostName = json.SelectToken("database.address")?.Value<string>() ?? "";
port = json.SelectToken("database.port")?.Value<int>() ?? 3306;
database = json.SelectToken("database.name")?.Value<string>() ?? "breadcraftsupport";
username = json.SelectToken("database.user")?.Value<string>() ?? "breadcraftsupport";
username = json.SelectToken("database.user")?.Value<string>() ?? "bcstaff";
password = json.SelectToken("database.password")?.Value<string>() ?? "";
}
}

2
Breadcraft/Database.cs
View file

@ -2,7 +2,7 @@
using System.Linq;
using System.Collections.Generic;
using DSharpPlus;
using MySql.Data.MySqlClient;
using MySqlConnector;
namespace Breadcraft;

24
Breadcraft/EventHandler.cs
View file

@ -134,12 +134,22 @@ internal static class EventHandler
DiscordChannel channel = await client.GetChannelAsync(ticket.channelID);
if (channel?.GuildId == e.Guild.Id)
{
try
{
await channel.AddOverwriteAsync(e.Member, Permissions.AccessChannels);
await channel.SendMessageAsync(new DiscordEmbedBuilder
{
Color = DiscordColor.Green,
Description = "User '" + e.Member.Username + "#" + e.Member.Discriminator + "' has rejoined the server, and has been re-added to the ticket."
});
}
catch (DiscordException ex)
{
Logger.Error("Exception occurred trying to add channel permissions: " + ex);
Logger.Error("JsomMessage: " + ex.JsonMessage);
}
}
}
catch (Exception) { /* ignored */ }
}
@ -149,7 +159,7 @@ internal static class EventHandler
{
if (Database.TryGetOpenTickets(e.Member.Id, out List<Database.Ticket> ownTickets))
{
foreach(Database.Ticket ticket in ownTickets)
foreach (Database.Ticket ticket in ownTickets)
{
try
{
@ -201,13 +211,13 @@ internal static class EventHandler
case ComponentType.Button:
switch (e.Id)
{
case "breadcraft_closeconfirm":
case "bcsupport_closeconfirm":
await CloseCommand.OnConfirmed(e.Interaction);
return;
case {} when e.Id.StartsWith("breadcraft_newcommandbutton"):
case { } when e.Id.StartsWith("bcsupport_newcommandbutton"):
await NewCommand.OnCategorySelection(e.Interaction);
return;
case {} when e.Id.StartsWith("breadcraft_newticketbutton"):
case { } when e.Id.StartsWith("bcsupport_newticketbutton"):
await CreateButtonPanelCommand.OnButtonUsed(e.Interaction);
return;
case "right":
@ -224,13 +234,13 @@ internal static class EventHandler
Logger.Warn("Unknown button press received! '" + e.Id + "'");
return;
}
case ComponentType.Select:
case ComponentType.StringSelect:
switch (e.Id)
{
case {} when e.Id.StartsWith("breadcraft_newcommandselector"):
case { } when e.Id.StartsWith("bcsupport_newcommandselector"):
await NewCommand.OnCategorySelection(e.Interaction);
return;
case {} when e.Id.StartsWith("breadcraft_newticketselector"):
case { } when e.Id.StartsWith("bcsupport_newticketselector"):
await CreateSelectionBoxPanelCommand.OnSelectionMenuUsed(e.Interaction);
return;
default: