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

Gambling Tracker will only track successful removes

Browse Source
This commit is contained in:
Kwoth
2022-10-06 10:55:12 +02:00
parent 2f77fd57b0
commit e6b7c31a72
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/NadekoBot/Modules/Permissions/CommandCooldown/CmdCdService.cs
View File

@@ -25,13 +25,13 @@ public sealed class CmdCdService : IExecPreCommand, IReadyExecutor, INService
public Task<bool> ExecPreCommandAsync(ICommandContext context, string moduleName, CommandInfo command) public Task<bool> ExecPreCommandAsync(ICommandContext context, string moduleName, CommandInfo command)
=> TryBlock(context.Guild, context.User, command.Name.ToLowerInvariant()); => TryBlock(context.Guild, context.User, command.Name.ToLowerInvariant());
public async Task<bool> TryBlock(IGuild guild, IUser user, string commandName) public Task<bool> TryBlock(IGuild guild, IUser user, string commandName)
{ {
if (!_settings.TryGetValue(guild.Id, out var cooldownSettings)) if (!_settings.TryGetValue(guild.Id, out var cooldownSettings))
return false; return Task.FromResult(false);
if (!cooldownSettings.TryGetValue(commandName, out var cdSeconds)) if (!cooldownSettings.TryGetValue(commandName, out var cdSeconds))
return false; return Task.FromResult(false);
var cooldowns = _activeCooldowns.GetOrAdd( var cooldowns = _activeCooldowns.GetOrAdd(
(guild.Id, commandName), (guild.Id, commandName),
@@ -40,7 +40,7 @@ public sealed class CmdCdService : IExecPreCommand, IReadyExecutor, INService
// if user is not already on cooldown, add // if user is not already on cooldown, add
if (cooldowns.TryAdd(user.Id, DateTime.UtcNow)) if (cooldowns.TryAdd(user.Id, DateTime.UtcNow))
{ {
return false; return Task.FromResult(false);
} }
// if there is an entry, maybe it expired. Try to check if it expired and don't fail if it did // if there is an entry, maybe it expired. Try to check if it expired and don't fail if it did
@@ -51,11 +51,11 @@ public sealed class CmdCdService : IExecPreCommand, IReadyExecutor, INService
if (diff.Seconds > cdSeconds) if (diff.Seconds > cdSeconds)
{ {
if (cooldowns.TryUpdate(user.Id, DateTime.UtcNow, oldValue)) if (cooldowns.TryUpdate(user.Id, DateTime.UtcNow, oldValue))
return false; return Task.FromResult(false);
} }
} }
return true; return Task.FromResult(true);
} }
public async Task OnReadyAsync() public async Task OnReadyAsync()

3
src/NadekoBot/Services/Currency/CurrencyService.cs
View File

@@ -90,7 +90,8 @@ public sealed class CurrencyService : ICurrencyService, INService
{ {
var wallet = await GetWalletAsync(userId); var wallet = await GetWalletAsync(userId);
var result = await wallet.Take(amount, txData); var result = await wallet.Take(amount, txData);
await _txTracker.TrackRemove(amount, txData); if(result)
await _txTracker.TrackRemove(amount, txData);
return result; return result;
} }