Skip to content

Commit d1980d5

Browse files
committed
Fix ban message edit failing due to empty embed being disallowed
1 parent 786a787 commit d1980d5

1 file changed

Lines changed: 18 additions & 6 deletions

File tree

ArmaforcesMissionBot/Helpers/BanHelper.cs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,22 @@ public static async Task<ulong> MakeBanMessage(IServiceProvider map, SocketGuild
4040
var embed = new EmbedBuilder()
4141
.WithColor(Color.Green)
4242
.WithDescription(message);
43+
44+
Embed[] embeds = string.IsNullOrEmpty(message)
45+
? []
46+
: [embed.Build()];
4347

4448
if (banMessageId != 0)
4549
{
4650
var banAnnouncemens = guild.GetTextChannel(banAnnouncementChannel);
4751
var banMessage = await banAnnouncemens.GetMessageAsync(banMessageId) as IUserMessage;
48-
await banMessage.ModifyAsync(x => x.Embed = embed.Build());
52+
await banMessage.ModifyAsync(x => x.Embeds = embeds);
4953
return banMessageId;
5054
}
5155
else
5256
{
5357
var banAnnouncemens = guild.GetTextChannel(banAnnouncementChannel);
54-
var sentMessage = await banAnnouncemens.SendMessageAsync(messageText, embed: embed.Build());
58+
var sentMessage = await banAnnouncemens.SendMessageAsync(messageText, embeds: embeds);
5559
return sentMessage.Id;
5660
}
5761
}
@@ -84,17 +88,21 @@ public static async Task MakeBanHistoryMessage(IServiceProvider map, SocketGuild
8488
.WithColor(Color.Green)
8589
.WithTitle("`osoba-liczba banów-sumaryczna liczba dni bana`")
8690
.WithDescription(message);
91+
92+
Embed[] embeds = string.IsNullOrEmpty(message)
93+
? []
94+
: [embed.Build()];
8795

8896
if (signups.SignupBansHistoryMessage != 0)
8997
{
9098
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
9199
var banMessage = await banAnnouncemens.GetMessageAsync(signups.SignupBansHistoryMessage) as IUserMessage;
92-
await banMessage.ModifyAsync(x => x.Embed = embed.Build());
100+
await banMessage.ModifyAsync(x => x.Embeds = embeds);
93101
}
94102
else
95103
{
96104
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
97-
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów na zapisy:", embed: embed.Build());
105+
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów na zapisy:", embeds: embeds);
98106
signups.SignupBansHistoryMessage = sentMessage.Id;
99107
}
100108
}
@@ -123,17 +131,21 @@ public static async Task MakeSpamBanHistoryMessage(IServiceProvider map, SocketG
123131
.WithColor(Color.Green)
124132
.WithTitle("`osoba-liczba banów-ostatni ban-typ ostatniego bana`")
125133
.WithDescription(message);
134+
135+
Embed[] embeds = string.IsNullOrEmpty(message)
136+
? []
137+
: [embed.Build()];
126138

127139
if (signups.SpamBansHistoryMessage != 0)
128140
{
129141
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
130142
var banMessage = await banAnnouncemens.GetMessageAsync(signups.SpamBansHistoryMessage) as IUserMessage;
131-
await banMessage.ModifyAsync(x => x.Embed = embed.Build());
143+
await banMessage.ModifyAsync(x => x.Embeds = embeds);
132144
}
133145
else
134146
{
135147
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
136-
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów za spam reakcjami:", embed: embed.Build());
148+
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów za spam reakcjami:", embeds: embeds);
137149
signups.SpamBansHistoryMessage = sentMessage.Id;
138150
}
139151
}

0 commit comments

Comments
 (0)