diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index dd7386ece..7e727d8ea 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -126,13 +126,15 @@ public partial class Gambling : GamblingModule if (_cache.AddTimelyClaim(ctx.User.Id, period) is { } rem) { - await ReplyErrorLocalizedAsync(strs.timely_already_claimed(rem.ToString(@"dd\d\ hh\h\ mm\m\ ss\s"))); + var now = DateTime.UtcNow; + var relativeTag = TimestampTag.FromDateTime(now.Add(rem), TimestampTagStyles.Relative); + await ReplyErrorLocalizedAsync(strs.timely_already_claimed(relativeTag)); return; } var result = await _ps.TryGetFeatureLimitAsync(_timelyKey, ctx.User.Id, 0); - val = (int)(val * (1 + (result.Quota * 0.01f))); + val = (int)(val * (1 + (result.Quota! * 0.01f))); await _cs.AddAsync(ctx.User.Id, val, new("timely", "claim")); diff --git a/src/NadekoBot/Modules/Utility/Patronage/PatronageService.cs b/src/NadekoBot/Modules/Utility/Patronage/PatronageService.cs index 9a537ac1b..f1684730f 100644 --- a/src/NadekoBot/Modules/Utility/Patronage/PatronageService.cs +++ b/src/NadekoBot/Modules/Utility/Patronage/PatronageService.cs @@ -697,7 +697,7 @@ public sealed class PatronageService return new() { Name = key.PrettyName, - Quota = default, + Quota = defaultValue, IsPatronLimit = false }; diff --git a/src/NadekoBot/data/strings/responses/responses.en-US.json b/src/NadekoBot/data/strings/responses/responses.en-US.json index 0bb9bbecd..06bbf6b59 100644 --- a/src/NadekoBot/data/strings/responses/responses.en-US.json +++ b/src/NadekoBot/data/strings/responses/responses.en-US.json @@ -878,7 +878,7 @@ "autodc_enable": "I will disconnect from the voice channel when there are no more tracks to play.", "autodc_disable": "I will no longer disconnect from the voice channel when there are no more tracks to play.", "timely_none": "Bot owner didn't specify a timely reward.", - "timely_already_claimed": "You've already claimed your timely reward. You can get it again in {0}.", + "timely_already_claimed": "You've already claimed your timely reward. You can get it again {0}.", "timely": "You've claimed your {0}. You can claim again in {1}h", "timely_set": "Users will be able to claim {0} every {1}h", "timely_set_none": "Users will not be able to claim any timely currency.",