Skip to content

Commit 0dd82e7

Browse files
authored
Fix ban message edit failing due to empty embed being disallowed (#70)
* Fix ban message edit failing due to empty embed being disallowed * Fix for old library and C#
1 parent 786a787 commit 0dd82e7

1 file changed

Lines changed: 23 additions & 14 deletions

File tree

ArmaforcesMissionBot/Helpers/BanHelper.cs

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,24 @@ public static async Task<ulong> MakeBanMessage(IServiceProvider map, SocketGuild
3737
message += $"<@!{ban.Key}>-{ban.Value.ToString()}\n";
3838
}
3939

40-
var embed = new EmbedBuilder()
41-
.WithColor(Color.Green)
42-
.WithDescription(message);
43-
40+
var embed = string.IsNullOrEmpty(message)
41+
? null
42+
: new EmbedBuilder()
43+
.WithColor(Color.Green)
44+
.WithDescription(message)
45+
.Build();
46+
4447
if (banMessageId != 0)
4548
{
4649
var banAnnouncemens = guild.GetTextChannel(banAnnouncementChannel);
4750
var banMessage = await banAnnouncemens.GetMessageAsync(banMessageId) as IUserMessage;
48-
await banMessage.ModifyAsync(x => x.Embed = embed.Build());
51+
await banMessage.ModifyAsync(x => x.Embed = embed);
4952
return banMessageId;
5053
}
5154
else
5255
{
5356
var banAnnouncemens = guild.GetTextChannel(banAnnouncementChannel);
54-
var sentMessage = await banAnnouncemens.SendMessageAsync(messageText, embed: embed.Build());
57+
var sentMessage = await banAnnouncemens.SendMessageAsync(messageText, embed: embed);
5558
return sentMessage.Id;
5659
}
5760
}
@@ -80,21 +83,24 @@ public static async Task MakeBanHistoryMessage(IServiceProvider map, SocketGuild
8083
message += $"<@!{ban.Key}>-{ban.Value.Item1.ToString()}-{ban.Value.Item2.ToString()}\n";
8184
}
8285

83-
var embed = new EmbedBuilder()
86+
var embed = string.IsNullOrEmpty(message)
87+
? null
88+
: new EmbedBuilder()
8489
.WithColor(Color.Green)
8590
.WithTitle("`osoba-liczba banów-sumaryczna liczba dni bana`")
86-
.WithDescription(message);
91+
.WithDescription(message)
92+
.Build();
8793

8894
if (signups.SignupBansHistoryMessage != 0)
8995
{
9096
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
9197
var banMessage = await banAnnouncemens.GetMessageAsync(signups.SignupBansHistoryMessage) as IUserMessage;
92-
await banMessage.ModifyAsync(x => x.Embed = embed.Build());
98+
await banMessage.ModifyAsync(x => x.Embed = embed);
9399
}
94100
else
95101
{
96102
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
97-
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów na zapisy:", embed: embed.Build());
103+
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów na zapisy:", embed: embed);
98104
signups.SignupBansHistoryMessage = sentMessage.Id;
99105
}
100106
}
@@ -119,21 +125,24 @@ public static async Task MakeSpamBanHistoryMessage(IServiceProvider map, SocketG
119125
message += $"<@!{ban.Key}>-{ban.Value.Item1.ToString()}-{ban.Value.Item2.ToString()}-{ban.Value.Item3.ToString()}\n";
120126
}
121127

122-
var embed = new EmbedBuilder()
128+
var embed = string.IsNullOrEmpty(message)
129+
? null
130+
: new EmbedBuilder()
123131
.WithColor(Color.Green)
124132
.WithTitle("`osoba-liczba banów-ostatni ban-typ ostatniego bana`")
125-
.WithDescription(message);
133+
.WithDescription(message)
134+
.Build();
126135

127136
if (signups.SpamBansHistoryMessage != 0)
128137
{
129138
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
130139
var banMessage = await banAnnouncemens.GetMessageAsync(signups.SpamBansHistoryMessage) as IUserMessage;
131-
await banMessage.ModifyAsync(x => x.Embed = embed.Build());
140+
await banMessage.ModifyAsync(x => x.Embed = embed);
132141
}
133142
else
134143
{
135144
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
136-
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów za spam reakcjami:", embed: embed.Build());
145+
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów za spam reakcjami:", embed: embed);
137146
signups.SpamBansHistoryMessage = sentMessage.Id;
138147
}
139148
}

0 commit comments

Comments
 (0)