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

Revert "Reverted club xp updates, and non-opt in xp system as it's causing db locking"

Browse Source 
This reverts commit 6c169e057b.
This commit is contained in:
Kwoth
2022-08-14 23:35:13 +02:00
parent 6c169e057b
commit df1a775fec
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/NadekoBot/Modules/Xp/XpService.cs
View File

@@ -188,12 +188,12 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
},
(_, n) => n);
// await ctx.Clubs
// .Where(x => x.Members.Any(m => group.Contains(m.UserId)))
// .UpdateAsync(old => new()
// {
// Xp = old.Xp + (group.Key * old.Members.Count(m => group.Contains(m.UserId)))
// });
await ctx.Clubs
.Where(x => x.Members.Any(m => group.Contains(m.UserId)))
.UpdateAsync(old => new()
{
Xp = old.Xp + (group.Key * old.Members.Count(m => group.Contains(m.UserId)))
});
dus.AddRange(items);
}
@@ -215,40 +215,40 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
gxps.AddRange(items);
// var missingUserIds = group.Where(userId => !items.Any(x => x.UserId == userId)).ToArray();
// foreach (var userId in missingUserIds)
// {
// await ctx
// .UserXpStats
// .ToLinqToDBTable()
// .InsertOrUpdateAsync(() => new UserXpStats()
// {
// UserId = userId,
// GuildId = guildId,
// Xp = group.Key,
// DateAdded = DateTime.UtcNow,
// AwardedXp = 0,
// NotifyOnLevelUp = XpNotificationLocation.None
// },
// _ => new()
// {
//
// },
// () => new()
// {
// UserId = userId
// });
// }
//
// if (missingUserIds.Length > 0)
// {
// var missingItems = await ctx.UserXpStats
// .ToLinqToDBTable()
// .Where(x => missingUserIds.Contains(x.UserId))
// .ToArrayAsyncLinqToDB();
//
// gxps.AddRange(missingItems);
// }
var missingUserIds = group.Where(userId => !items.Any(x => x.UserId == userId)).ToArray();
foreach (var userId in missingUserIds)
{
await ctx
.UserXpStats
.ToLinqToDBTable()
.InsertOrUpdateAsync(() => new UserXpStats()
{
UserId = userId,
GuildId = guildId,
Xp = group.Key,
DateAdded = DateTime.UtcNow,
AwardedXp = 0,
NotifyOnLevelUp = XpNotificationLocation.None
},
_ => new()
{
},
() => new()
{
UserId = userId
});
}
if (missingUserIds.Length > 0)
{
var missingItems = await ctx.UserXpStats
.ToLinqToDBTable()
.Where(x => missingUserIds.Contains(x.UserId))
.ToArrayAsyncLinqToDB();
gxps.AddRange(missingItems);
}
}
}
}