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

Merge branch 'master' of https://github.com/Linaith/Lieb-Website

Browse source
This commit is contained in:
t.ruspekhofer 2023-01-03 13:54:23 +01:00
commit ef1c301c05
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
DiscordBot/Messages/ExternalRoleSelectionMessage.cs
View file

@ -16,7 +16,17 @@ namespace DiscordBot.Messages
foreach(ApiRole role in roles)
{
if(role.IsSignUpAllowed)
signUpSelect.AddOption(role.Name, role.roleId.ToString(), role.Description);
{
if(!string.IsNullOrEmpty(role.Description))
{
string description = role.Description.Length <= 100 ? role.Description : role.Description.Substring(0, 100);
signUpSelect.AddOption(role.Name, role.roleId.ToString(), description);
}
else
{
signUpSelect.AddOption(role.Name, role.roleId.ToString(), role.Name);
}
}
}
var builder = new ComponentBuilder()

2
Lieb/Data/RaidRandomizerService.cs
View file

@ -110,7 +110,7 @@ namespace Lieb.Data
signUp.RaidRole = randomRole;
}
int noGroups = (int)Math.Ceiling((double)(raid.SignUps.Where(s => s.SignUpType == SignUpType.SignedUp).Count() / 5));
int noGroups = (int)Math.Ceiling(raid.SignUps.Where(s => s.SignUpType == SignUpType.SignedUp).Count() / 5.0);
HashSet<GuildWars2Account> signedUpAccounts = raid.SignUps.Where(s => s.GuildWars2Account != null && s.GuildWars2Account.EquippedBuilds.Where(b => b.GuildWars2Build.UseInRandomRaid).Count() > 0
&& s.SignUpType == SignUpType.SignedUp)