Sarah/Lieb-Website
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

raid messages are now only sent once per account

Browse source
This commit is contained in:
Sarah Faey 2022-12-04 18:45:40 +01:00
parent ed343d813e
commit be1297708d
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
DiscordBot/CommandHandlers/SlashCommandHandler.cs
View file

@ -50,8 +50,9 @@ namespace DiscordBot.CommandHandlers
case Constants.SlashCommands.SEND_MESSAGE_COMMAND: case Constants.SlashCommands.SEND_MESSAGE_COMMAND:
int raidId = (int)(long)command.Data.Options.First().Options?.FirstOrDefault(o => o.Name == Constants.SlashCommands.OptionNames.RAID_ID).Value; int raidId = (int)(long)command.Data.Options.First().Options?.FirstOrDefault(o => o.Name == Constants.SlashCommands.OptionNames.RAID_ID).Value;
string message = (string)command.Data.Options.First().Options?.FirstOrDefault(o => o.Name == Constants.SlashCommands.OptionNames.MESSAGE).Value; string message = (string)command.Data.Options.First().Options?.FirstOrDefault(o => o.Name == Constants.SlashCommands.OptionNames.MESSAGE).Value;
await command.DeferAsync(ephemeral:true);
await SendMessages(message, raidId); await SendMessages(message, raidId);
await command.RespondAsync($"message sent", ephemeral:true); await command.ModifyOriginalResponseAsync(r => r.Content = $"message sent");
break; break;
} }
} }
@ -110,7 +111,7 @@ namespace DiscordBot.CommandHandlers
} }
else else
{ {
await SignUpExternalUser(command, raidId); await command.RespondAsync("This user has no account, please use sign up external", ephemeral: true);
} }
} }
@ -129,15 +130,20 @@ namespace DiscordBot.CommandHandlers
private async Task SendMessages(string message, int raidId) private async Task SendMessages(string message, int raidId)
{ {
ApiRaid raid = await _httpService.GetRaid(raidId); ApiRaid raid = await _httpService.GetRaid(raidId);
HashSet<ulong> users = new HashSet<ulong>();
foreach(ApiRaid.Role role in raid.Roles) foreach(ApiRaid.Role role in raid.Roles)
{ {
foreach(var user in role.Users) foreach(ulong userId in role.Users.Select(u => u.UserId).ToHashSet())
{ {
if(user.UserId > 100) users.Add(userId);
{ }
IUser discordUser = await _client.GetUserAsync(user.UserId); }
await discordUser.SendMessageAsync($"{raid.Title}: {message}"); foreach(ulong userId in users)
} {
if(userId > 100)
{
IUser discordUser = await _client.GetUserAsync(userId);
await discordUser.SendMessageAsync($"{raid.Title}: {message}");
} }
} }
} }