From 814f7ca8b72e5b7a2b9eef5119b6cee6d058adaf Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 8 Sep 2016 23:47:08 +0200 Subject: [PATCH] Fixed bugs with currency --- src/NadekoBot/Modules/Gambling/Gambling.cs | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index 2151fdf6..fbf62369 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -31,7 +31,6 @@ namespace NadekoBot.Modules.Gambling CurrencySign = conf.CurrencySign; CurrencyPluralName = conf.CurrencyPluralName; } - } [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias] @@ -68,26 +67,18 @@ namespace NadekoBot.Modules.Gambling [LocalizedCommand, LocalizedDescription, LocalizedSummary, LocalizedAlias] [RequireContext(ContextType.Guild)] - public async Task Give(IUserMessage umsg, long amount, [Remainder] IUser receiver) + public async Task Give(IUserMessage umsg, long amount, [Remainder] IGuildUser receiver) { var channel = (ITextChannel)umsg.Channel; if (amount <= 0) return; - bool success = false; - using (var uow = DbHandler.UnitOfWork()) - { - success = uow.Currency.TryUpdateState(umsg.Author.Id, amount); - if(success) - uow.Currency.TryUpdateState(umsg.Author.Id, amount); - - await uow.CompleteAsync(); - } + var success = await CurrencyHandler.RemoveCurrencyAsync((IGuildUser)umsg.Author, $"Gift to {receiver.Username} ({receiver.Id}).", amount, true).ConfigureAwait(false); if (!success) { await channel.SendMessageAsync($"{umsg.Author.Mention} You don't have enough {Gambling.CurrencyPluralName}s.").ConfigureAwait(false); return; } - + await CurrencyHandler.AddCurrencyAsync(receiver, $"Gift from {umsg.Author.Username} ({umsg.Author.Id}).", amount, true).ConfigureAwait(false); await channel.SendMessageAsync($"{umsg.Author.Mention} successfully sent {amount} {Gambling.CurrencyPluralName}s to {receiver.Mention}!").ConfigureAwait(false); } @@ -160,7 +151,7 @@ namespace NadekoBot.Modules.Gambling var str = $"{guildUser.Mention} `You rolled {rng}.` "; if (rng < 67) { - str += "Better luck next time."; + str += "More luck next time."; } else if (rng < 90) {