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

Slight tweaks to xp loop

Browse Source
This commit is contained in:
Kwoth
2022-07-13 01:15:28 +02:00
parent 34955f88f6
commit 0b122e8d3f
1 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
#nullable disable #nullable disable warnings
using LinqToDB; using LinqToDB;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using NadekoBot.Common.ModuleBehaviors; using NadekoBot.Common.ModuleBehaviors;
@@ -14,7 +14,6 @@ using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing;
using System.Threading.Channels; using System.Threading.Channels;
using Nadeko.Common;
using Color = SixLabors.ImageSharp.Color; using Color = SixLabors.ImageSharp.Color;
using Image = SixLabors.ImageSharp.Image; using Image = SixLabors.ImageSharp.Image;
@@ -171,12 +170,14 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
ci.XpAmount += item.XpAmount; ci.XpAmount += item.XpAmount;
} }
await using var ctx = _db.GetDbContext(); var dus = new List<DiscordUser>(globalToAdd.Count);
var gxps = new List<UserXpStats>(globalToAdd.Count);
await using (var ctx = _db.GetDbContext())
{
await using var tran = await ctx.Database.BeginTransactionAsync(); await using var tran = await ctx.Database.BeginTransactionAsync();
// update global user xp in batches // update global user xp in batches
// group by xp amount and update the same amounts at the same time // group by xp amount and update the same amounts at the same time
var dus = new List<DiscordUser>(globalToAdd.Count);
foreach (var group in globalToAdd.GroupBy(x => x.Value.XpAmount, x => x.Key)) foreach (var group in globalToAdd.GroupBy(x => x.Value.XpAmount, x => x.Key))
{ {
var items = await ctx.DiscordUser var items = await ctx.DiscordUser
@@ -191,7 +192,6 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
} }
// update guild user xp in batches // update guild user xp in batches
var gxps = new List<UserXpStats>(globalToAdd.Count);
foreach (var (guildId, toAdd) in guildToAdd) foreach (var (guildId, toAdd) in guildToAdd)
{ {
foreach (var group in toAdd.GroupBy(x => x.Value.XpAmount, x => x.Key)) foreach (var group in toAdd.GroupBy(x => x.Value.XpAmount, x => x.Key))
@@ -211,6 +211,7 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
} }
await tran.CommitAsync(); await tran.CommitAsync();
}
foreach (var du in dus) foreach (var du in dus)
{ {
@@ -279,9 +280,13 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
private async Task HandleRewardsInternalAsync(ulong guildId, ulong userId, long oldLevel, long newLevel) private async Task HandleRewardsInternalAsync(ulong guildId, ulong userId, long oldLevel, long newLevel)
{ {
await using var ctx = _db.GetDbContext(); List<XpRoleReward> rrews;
var rrews = ctx.XpSettingsFor(guildId).RoleRewards.ToList(); List<XpCurrencyReward> crews;
var crews = ctx.XpSettingsFor(guildId).CurrencyRewards.ToList(); await using (var ctx = _db.GetDbContext())
{
rrews = ctx.XpSettingsFor(guildId).RoleRewards.ToList();
crews = ctx.XpSettingsFor(guildId).CurrencyRewards.ToList();
}
//loop through levels since last level up, so if a high amount of xp is gained, reward are still applied. //loop through levels since last level up, so if a high amount of xp is gained, reward are still applied.
for (var i = oldLevel + 1; i <= newLevel; i++) for (var i = oldLevel + 1; i <= newLevel; i++)
@@ -569,8 +574,10 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
await ScanChannelForVoiceXp(before.VoiceChannel); await ScanChannelForVoiceXp(before.VoiceChannel);
if (after.VoiceChannel is not null && after.VoiceChannel != before.VoiceChannel) if (after.VoiceChannel is not null && after.VoiceChannel != before.VoiceChannel)
{
await ScanChannelForVoiceXp(after.VoiceChannel); await ScanChannelForVoiceXp(after.VoiceChannel);
else if (after.VoiceChannel is null) }
else if (after.VoiceChannel is null && before.VoiceChannel is not null)
{ {
// In this case, the user left the channel and the previous for loops didn't catch // In this case, the user left the channel and the previous for loops didn't catch
// it because it wasn't in any new channel. So we need to get rid of it. // it because it wasn't in any new channel. So we need to get rid of it.