helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed unecessary check and made buttons for teleport request inline which looks way cleaner.

Browse source
This commit is contained in:
Milutinke 2022-10-21 02:43:43 +02:00
parent ec27ec53d7
commit 148cb34878
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
MinecraftClient/ChatBots/DiscordBridge.cs
View file

@ -31,8 +31,6 @@ namespace MinecraftClient.ChatBots
public ulong ChannelId = 1018565295654326364L; public ulong ChannelId = 1018565295654326364L;
public ulong[]? OwnerIds = new[] { 978757810781323276UL }; public ulong[]? OwnerIds = new[] { 978757810781323276UL };
public bool IgnoreMessagesSentByBots = true;
} }
public override void Initialize() public override void Initialize()
@ -98,9 +96,15 @@ namespace MinecraftClient.ChatBots
if (teleportRequest) if (teleportRequest)
{ {
var messageBuilder = new DiscordMessageBuilder() var messageBuilder = new DiscordMessageBuilder()
.WithContent(message) .WithEmbed(new DiscordEmbedBuilder
.AddComponents(new DiscordButtonComponent(ButtonStyle.Success, "accept_teleport", "Accept")) {
.AddComponents(new DiscordButtonComponent(ButtonStyle.Danger, "deny_teleport", "Deny")); Description = message,
Color = new DiscordColor(0x3399FF)
})
.AddComponents(new DiscordComponent[]{
new DiscordButtonComponent(ButtonStyle.Success, "accept_teleport", "Accept"),
new DiscordButtonComponent(ButtonStyle.Danger, "deny_teleport", "Deny")
});
_client.SendMessageAsync(_channel, messageBuilder).Wait(); _client.SendMessageAsync(_channel, messageBuilder).Wait();
return; return;
@ -159,9 +163,6 @@ namespace MinecraftClient.ChatBots
_client.MessageCreated += async (source, e) => _client.MessageCreated += async (source, e) =>
{ {
if (Config.IgnoreMessagesSentByBots && e.Author.IsBot)
return;
if (e.Guild.Id != Config.GuildId) if (e.Guild.Id != Config.GuildId)
return; return;
@ -177,9 +178,11 @@ namespace MinecraftClient.ChatBots
{ {
await e.Message.CreateReactionAsync(DiscordEmoji.FromName(_client, ":gear:")); await e.Message.CreateReactionAsync(DiscordEmoji.FromName(_client, ":gear:"));
message = message[1..]; message = message[1..];
string? result = ""; string? result = "";
PerformInternalCommand(message, ref result); PerformInternalCommand(message, ref result);
result = string.IsNullOrEmpty(result) ? "-" : result; result = string.IsNullOrEmpty(result) ? "-" : result;
await e.Message.DeleteOwnReactionAsync(DiscordEmoji.FromName(_client, ":gear:")); await e.Message.DeleteOwnReactionAsync(DiscordEmoji.FromName(_client, ":gear:"));
await e.Message.CreateReactionAsync(DiscordEmoji.FromName(_client, ":white_check_mark:")); await e.Message.CreateReactionAsync(DiscordEmoji.FromName(_client, ":white_check_mark:"));
await e.Message.RespondAsync($"The command was executed with the result:\n```{result}```"); await e.Message.RespondAsync($"The command was executed with the result:\n```{result}```");