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

Using pattern matching for nulls where applicable, discarded unused lambda parameters, cleaned up some classes. Unignored ServerLog commands which was mistakenly ignored due to a .gitignore rule

Browse Source
This commit is contained in:
Kwoth
2022-01-01 08:44:51 +01:00
parent f81f9fadd3
commit 9b4eb21321
91 changed files with 1591 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NadekoBot/Db/Extensions/PollExtensions.cs
View File

@@ -17,13 +17,13 @@ public static class PollExtensions
if (p is null)
return;
if (p.Votes != null)
if (p.Votes is not null)
{
ctx.RemoveRange(p.Votes);
p.Votes.Clear();
}
if (p.Answers != null)
if (p.Answers is not null)
{
ctx.RemoveRange(p.Answers);
p.Answers.Clear();

4
src/NadekoBot/Db/Extensions/QuoteExtensions.cs
View File

@@ -31,7 +31,7 @@ public static class QuoteExtensions
{
var rng = new NadekoRandom();
return (await quotes.AsQueryable().Where(q => q.GuildId == guildId && q.Keyword == keyword).ToListAsync())
.OrderBy(q => rng.Next())
.OrderBy(_ => rng.Next())
.FirstOrDefault();
}
@@ -48,7 +48,7 @@ public static class QuoteExtensions
&& EF.Functions.Like(q.Text.ToUpper(), $"%{text.ToUpper()}%")
// && q.Text.Contains(text, StringComparison.OrdinalIgnoreCase)
)
.ToListAsync()).OrderBy(q => rngk.Next())
.ToListAsync()).OrderBy(_ => rngk.Next())
.FirstOrDefault();
}

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

@@ -25,7 +25,7 @@ public class WaifuInfo : DbEntity
var waifuUsername = Waifu.Username.TrimTo(20);
var claimerUsername = Claimer?.Username.TrimTo(20);
if (ClaimerId != null) claimer = $"{claimerUsername}#{Claimer.Discriminator}";
if (ClaimerId is not null) claimer = $"{claimerUsername}#{Claimer.Discriminator}";
if (AffinityId is null)
status = $"... but {waifuUsername}'s heart is empty";
else if (AffinityId == ClaimerId)
@@ -58,7 +58,7 @@ public class WaifuLbResult
var waifuUsername = Username.TrimTo(20);
var claimerUsername = Claimer?.TrimTo(20);
if (Claimer != null) claimer = $"{claimerUsername}#{ClaimerDiscrim}";
if (Claimer is not null) claimer = $"{claimerUsername}#{ClaimerDiscrim}";
if (Affinity is null)
status = $"... but {waifuUsername}'s heart is empty";
else if (Affinity + AffinityDiscrim == Claimer + ClaimerDiscrim)