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

- Fixed .antialt disable confirmation embed color

Browse Source 
- Fixed weighted warning punishment
This commit is contained in:
Kwoth
2022-02-09 22:58:28 +01:00
parent 09800cb8a3
commit f250cac8d5
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Db/Models/Warning.cs
View File

@@ -9,5 +9,5 @@ public class Warning : DbEntity
public bool Forgiven { get; set; } public bool Forgiven { get; set; }
public string ForgivenBy { get; set; } public string ForgivenBy { get; set; }
public string Moderator { get; set; } public string Moderator { get; set; }
public int Weight { get; set; } public long Weight { get; set; }
} }

2
src/NadekoBot/Modules/Administration/Protection/ProtectionCommands.cs
View File

@@ -17,7 +17,7 @@ public partial class Administration
{ {
if (await _service.TryStopAntiAlt(ctx.Guild.Id)) if (await _service.TryStopAntiAlt(ctx.Guild.Id))
{ {
await ReplyErrorLocalizedAsync(strs.prot_disable("Anti-Alt")); await ReplyConfirmLocalizedAsync(strs.prot_disable("Anti-Alt"));
return; return;
} }

18
src/NadekoBot/Modules/Administration/UserPunish/UserPunishService.cs
View File

@@ -54,7 +54,7 @@ public class UserPunishService : INService, IReadyExecutor
IGuild guild, IGuild guild,
ulong userId, ulong userId,
IUser mod, IUser mod,
int weight, long weight,
string reason) string reason)
{ {
if (weight <= 0) if (weight <= 0)
@@ -77,25 +77,29 @@ public class UserPunishService : INService, IReadyExecutor
Weight = weight Weight = weight
}; };
var warnings = 1; long previousCount;
List<WarningPunishment> ps; List<WarningPunishment> ps;
await using (var uow = _db.GetDbContext()) await using (var uow = _db.GetDbContext())
{ {
ps = uow.GuildConfigsForId(guildId, set => set.Include(x => x.WarnPunishments)).WarnPunishments; ps = uow.GuildConfigsForId(guildId, set => set.Include(x => x.WarnPunishments)).WarnPunishments;
warnings += uow.Warnings.ForId(guildId, userId) previousCount = uow.Warnings.ForId(guildId, userId)
.Where(w => !w.Forgiven && w.UserId == userId) .Where(w => !w.Forgiven && w.UserId == userId)
.Sum(x => x.Weight); .Sum(x => x.Weight);
uow.Warnings.Add(warn); uow.Warnings.Add(warn);
uow.SaveChanges(); await uow.SaveChangesAsync();
} }
var p = ps.FirstOrDefault(x => x.Count == warnings); var totalCount = previousCount + weight;
var p = ps.Where(x => x.Count > previousCount && x.Count <= totalCount)
.MaxBy(x => x.Count);
if (p is not null) if (p is not null)
{ {
// todo shouldn't this try to get through api too
var user = await guild.GetUserAsync(userId); var user = await guild.GetUserAsync(userId);
if (user is null) if (user is null)
return null; return null;