EllieBotDevs/elliebot
3
1
Fork 1
Code Issues Pull requests Projects Releases57 Packages3 Wiki Activity

.xprate will now work on threads properly, and apply parent channel rate if set. This is a fix as it worked with exclusions before

Browse source
This commit is contained in:
Toastie 2025-03-19 11:35:08 +13:00
parent df1f1ed3a9
commit 98fddbd9b1
Signed by: toastie_t0ast
GPG key ID: 0861BE54AD481DC7
2 changed files with 15 additions and 7 deletions
src/EllieBot/Modules/Xp
XpRate
GuildConfigXpService.cs
XpService.cs

10
src/EllieBot/Modules/Xp/XpRate/GuildConfigXpService.cs
View file

@ -161,24 +161,26 @@ public class XpRateService(DbService db, ShardData shardData, XpConfigService xc
return deleted > 0; return deleted > 0;
} }
public XpRate GetXpRate(XpRateType type, ulong guildId, ulong channelId) public (XpRate Rate, bool isItemRate) GetXpRate(XpRateType type, ulong guildId, ulong channelId)
{ {
if (_channelRates.TryGetValue(guildId, out var guildChannelRates)) if (_channelRates.TryGetValue(guildId, out var guildChannelRates))
{ {
if (guildChannelRates.TryGetValue((type, channelId), out var rate)) if (guildChannelRates.TryGetValue((type, channelId), out var rate))
return rate; return (rate, true);
} }
if (_guildRates.TryGetValue((type, guildId), out var guildRate)) if (_guildRates.TryGetValue((type, guildId), out var guildRate))
return guildRate; return (guildRate, false);
var conf = xcs.Data; var conf = xcs.Data;
return type switch var toReturn = type switch
{ {
XpRateType.Image => new XpRate(XpRateType.Image, conf.TextXpFromImage, conf.TextXpCooldown / 60.0f), XpRateType.Image => new XpRate(XpRateType.Image, conf.TextXpFromImage, conf.TextXpCooldown / 60.0f),
XpRateType.Voice => new XpRate(XpRateType.Voice, conf.VoiceXpPerMinute, 1.0f), XpRateType.Voice => new XpRate(XpRateType.Voice, conf.VoiceXpPerMinute, 1.0f),
_ => new XpRate(XpRateType.Text, conf.TextXpPerMessage, conf.TextXpCooldown / 60.0f), _ => new XpRate(XpRateType.Text, conf.TextXpPerMessage, conf.TextXpCooldown / 60.0f),
}; };
return (toReturn, false);
} }
} }

12
src/EllieBot/Modules/Xp/XpService.cs
View file

@ -147,7 +147,7 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
if (!IsVoiceChannelActive(vc)) if (!IsVoiceChannelActive(vc))
continue; continue;
var rate = _xpRateRateService.GetXpRate(XpRateType.Voice, g.Id, vc.Id); var (rate, _) = _xpRateRateService.GetXpRate(XpRateType.Voice, g.Id, vc.Id);
if (rate.IsExcluded()) if (rate.IsExcluded())
continue; continue;
@ -522,12 +522,18 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
var isImage = arg.Attachments.Any(a => a.Height >= 16 && a.Width >= 16); var isImage = arg.Attachments.Any(a => a.Height >= 16 && a.Width >= 16);
var isText = arg.Content.Contains(' ') || arg.Content.Length >= 5; var isText = arg.Content.Contains(' ') || arg.Content.Length >= 5;
var textRate = _xpRateRateService.GetXpRate(XpRateType.Text, guild.Id, gc.Id); // try to get a rate for this channel
// and if there is no specified rate, use thread rate
var (textRate, isItemRate) = _xpRateRateService.GetXpRate(XpRateType.Text, guild.Id, gc.Id);
if (!isItemRate && gc is SocketThreadChannel tc)
{
(textRate, _) = _xpRateRateService.GetXpRate(XpRateType.Text, guild.Id, tc.ParentChannel.Id);
}
XpRate rate; XpRate rate;
if (isImage) if (isImage)
{ {
var imageRate = _xpRateRateService.GetXpRate(XpRateType.Image, guild.Id, gc.Id); var (imageRate, _) = _xpRateRateService.GetXpRate(XpRateType.Image, guild.Id, gc.Id);
if (imageRate.IsExcluded()) if (imageRate.IsExcluded())
return; return;