minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 09:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed .clubapply hopefully, and removed some redundant discriminators

Browse Source
This commit is contained in:
Kwoth
2024-04-16 13:48:23 +00:00
parent d86b5b2b6c
commit eef5b3f948
8 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/NadekoBot/Db/Models/DiscordUser.cs
View File

@@ -28,5 +28,10 @@ public class DiscordUser : DbEntity
=> UserId.GetHashCode();
public override string ToString()
=> Username + "#" + Discriminator;
{
if (string.IsNullOrWhiteSpace(Discriminator) || Discriminator == "0000")
return Username;
return Username + "#" + Discriminator;
}
}

16
src/NadekoBot/Db/Models/Waifu.cs
View File

@@ -19,25 +19,25 @@ public class WaifuInfo : DbEntity
public override string ToString()
{
var claimer = "no one";
var status = string.Empty;
var waifuUsername = Waifu.Username.TrimTo(20);
var claimerUsername = Claimer?.Username.TrimTo(20);
var waifuUsername = Waifu.ToString().TrimTo(20);
var claimer = Claimer?.ToString().TrimTo(20)
?? "no one";
var affinity = Affinity?.ToString().TrimTo(20);
if (ClaimerId is not null)
claimer = $"{claimerUsername}#{Claimer.Discriminator}";
if (AffinityId is null)
status = $"... but {waifuUsername}'s heart is empty";
else if (AffinityId == ClaimerId)
status = $"... and {waifuUsername} likes {claimerUsername} too <3";
status = $"... and {waifuUsername} likes {claimer} too <3";
else
{
status =
$"... but {waifuUsername}'s heart belongs to {Affinity.Username.TrimTo(20)}#{Affinity.Discriminator}";
$"... but {waifuUsername}'s heart belongs to {affinity}";
}
return $"**{waifuUsername}#{Waifu.Discriminator}** - claimed by **{claimer}**\n\t{status}";
return $"**{waifuUsername}** - claimed by **{claimer}**\n\t{status}";
}
}