Skip to content

Commit ccc819b

Browse files
committed
Fix for old library and C#
1 parent d1980d5 commit ccc819b

1 file changed

Lines changed: 22 additions & 25 deletions

File tree

ArmaforcesMissionBot/Helpers/BanHelper.cs

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +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);
40+
var embed = string.IsNullOrEmpty(message)
41+
? null
42+
: new EmbedBuilder()
43+
.WithColor(Color.Green)
44+
.WithDescription(message)
45+
.Build();
4346

44-
Embed[] embeds = string.IsNullOrEmpty(message)
45-
? []
46-
: [embed.Build()];
47-
4847
if (banMessageId != 0)
4948
{
5049
var banAnnouncemens = guild.GetTextChannel(banAnnouncementChannel);
5150
var banMessage = await banAnnouncemens.GetMessageAsync(banMessageId) as IUserMessage;
52-
await banMessage.ModifyAsync(x => x.Embeds = embeds);
51+
await banMessage.ModifyAsync(x => x.Embed = embed);
5352
return banMessageId;
5453
}
5554
else
5655
{
5756
var banAnnouncemens = guild.GetTextChannel(banAnnouncementChannel);
58-
var sentMessage = await banAnnouncemens.SendMessageAsync(messageText, embeds: embeds);
57+
var sentMessage = await banAnnouncemens.SendMessageAsync(messageText, embed: embed);
5958
return sentMessage.Id;
6059
}
6160
}
@@ -84,25 +83,24 @@ public static async Task MakeBanHistoryMessage(IServiceProvider map, SocketGuild
8483
message += $"<@!{ban.Key}>-{ban.Value.Item1.ToString()}-{ban.Value.Item2.ToString()}\n";
8584
}
8685

87-
var embed = new EmbedBuilder()
86+
var embed = string.IsNullOrEmpty(message)
87+
? null
88+
: new EmbedBuilder()
8889
.WithColor(Color.Green)
8990
.WithTitle("`osoba-liczba banów-sumaryczna liczba dni bana`")
90-
.WithDescription(message);
91-
92-
Embed[] embeds = string.IsNullOrEmpty(message)
93-
? []
94-
: [embed.Build()];
91+
.WithDescription(message)
92+
.Build();
9593

9694
if (signups.SignupBansHistoryMessage != 0)
9795
{
9896
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
9997
var banMessage = await banAnnouncemens.GetMessageAsync(signups.SignupBansHistoryMessage) as IUserMessage;
100-
await banMessage.ModifyAsync(x => x.Embeds = embeds);
98+
await banMessage.ModifyAsync(x => x.Embed = embed);
10199
}
102100
else
103101
{
104102
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
105-
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów na zapisy:", embeds: embeds);
103+
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów na zapisy:", embed: embed);
106104
signups.SignupBansHistoryMessage = sentMessage.Id;
107105
}
108106
}
@@ -127,25 +125,24 @@ public static async Task MakeSpamBanHistoryMessage(IServiceProvider map, SocketG
127125
message += $"<@!{ban.Key}>-{ban.Value.Item1.ToString()}-{ban.Value.Item2.ToString()}-{ban.Value.Item3.ToString()}\n";
128126
}
129127

130-
var embed = new EmbedBuilder()
128+
var embed = string.IsNullOrEmpty(message)
129+
? null
130+
: new EmbedBuilder()
131131
.WithColor(Color.Green)
132132
.WithTitle("`osoba-liczba banów-ostatni ban-typ ostatniego bana`")
133-
.WithDescription(message);
134-
135-
Embed[] embeds = string.IsNullOrEmpty(message)
136-
? []
137-
: [embed.Build()];
133+
.WithDescription(message)
134+
.Build();
138135

139136
if (signups.SpamBansHistoryMessage != 0)
140137
{
141138
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
142139
var banMessage = await banAnnouncemens.GetMessageAsync(signups.SpamBansHistoryMessage) as IUserMessage;
143-
await banMessage.ModifyAsync(x => x.Embeds = embeds);
140+
await banMessage.ModifyAsync(x => x.Embed = embed);
144141
}
145142
else
146143
{
147144
var banAnnouncemens = guild.GetTextChannel(config.HallOfShameChannel);
148-
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów za spam reakcjami:", embeds: embeds);
145+
var sentMessage = await banAnnouncemens.SendMessageAsync("Historia banów za spam reakcjami:", embed: embed);
149146
signups.SpamBansHistoryMessage = sentMessage.Id;
150147
}
151148
}

0 commit comments

Comments
 (0)