From d51dfa88f1af0c4b77826e34791f3f2bb739c335 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 14 May 2024 18:36:33 +0000 Subject: [PATCH] fix: Fixed .ttt and gifted strings docs: Updated changelog dev: Updated some packages --- CHANGELOG.md | 3 ++- src/NadekoBot/Modules/Gambling/Gambling.cs | 4 ++-- .../Modules/Games/TicTacToe/TicTacToeCommands.cs | 2 +- src/NadekoBot/NadekoBot.csproj | 8 ++++---- src/NadekoBot/data/strings/responses/responses.en-US.json | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc02cc789..d7f5606e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o -## [5.0.6] +## [5.0.6] - 14.05.2024 ### Changed @@ -12,6 +12,7 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except da ### Fixed - Fixed `.blackjack` response string as it contained no user name +- Fixed `.ttt` and `.gift` strings not mentioning the user ## [5.0.5] - 11.05.2024 diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs index 2793ab7b2..c70d6e141 100644 --- a/src/NadekoBot/Modules/Gambling/Gambling.cs +++ b/src/NadekoBot/Modules/Gambling/Gambling.cs @@ -466,7 +466,7 @@ public partial class Gambling : GamblingModule return; } - await Response().Confirm(strs.gifted(N(amount), Format.Bold(receiver.ToString()))).SendAsync(); + await Response().Confirm(strs.gifted(N(amount), Format.Bold(receiver.ToString()), ctx.User)).SendAsync(); } [Cmd] @@ -508,7 +508,7 @@ public partial class Gambling : GamblingModule } await _cs.AddAsync(usr.Id, amount, new("award", ctx.User.ToString()!, msg, ctx.User.Id)); - await Response().Confirm(strs.awarded(N(amount), $"<@{usrId}>")).SendAsync(); + await Response().Confirm(strs.awarded(N(amount), $"<@{usrId}>", ctx.User)).SendAsync(); } [Cmd] diff --git a/src/NadekoBot/Modules/Games/TicTacToe/TicTacToeCommands.cs b/src/NadekoBot/Modules/Games/TicTacToe/TicTacToeCommands.cs index 60fdaa122..5d002fff5 100644 --- a/src/NadekoBot/Modules/Games/TicTacToe/TicTacToeCommands.cs +++ b/src/NadekoBot/Modules/Games/TicTacToe/TicTacToeCommands.cs @@ -37,7 +37,7 @@ public partial class Games game = new(Strings, _client, channel, (IGuildUser)ctx.User, options, _sender); _service.TicTacToeGames.Add(channel.Id, game); - await Response().Confirm(strs.ttt_created).SendAsync(); + await Response().Confirm(strs.ttt_created(ctx.User)).SendAsync(); game.OnEnded += _ => { diff --git a/src/NadekoBot/NadekoBot.csproj b/src/NadekoBot/NadekoBot.csproj index 56ff48203..0090f49d1 100644 --- a/src/NadekoBot/NadekoBot.csproj +++ b/src/NadekoBot/NadekoBot.csproj @@ -31,14 +31,14 @@ - + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -68,7 +68,7 @@ - + diff --git a/src/NadekoBot/data/strings/responses/responses.en-US.json b/src/NadekoBot/data/strings/responses/responses.en-US.json index 6fb6fa074..03d7b707f 100644 --- a/src/NadekoBot/data/strings/responses/responses.en-US.json +++ b/src/NadekoBot/data/strings/responses/responses.en-US.json @@ -230,7 +230,7 @@ "user_unbanned": "User unbanned", "presence_updates": "Presence updates", "sb_user": "User soft-banned", - "awarded": "has awarded {0} to {1}", + "awarded": "{2} has awarded {0} to {1}", "better_luck": "Better luck next time ^_^", "br_win": "Congratulations! You won {0} for rolling above {1}", "deck_reshuffled": "Deck reshuffled.", @@ -241,7 +241,7 @@ "cards_left": "{0} cards left in the deck.", "cards": "Cards", "hand_value": "Hand value", - "gifted": "has gifted {0} to {1}", + "gifted": "{2} has gifted {0} to {1}", "has": "{0} has {1}", "heads": "Head", "mass_award": "Awarded {0} to {1} users from {2} role.", @@ -366,7 +366,7 @@ "ttt_against_yourself": "You can't play against yourself.", "ttt_already_running": "TicTacToe Game is already running in this channel.", "ttt_a_draw": "A draw!", - "ttt_created": "has created a game of TicTacToe.", + "ttt_created": "{0} has created a game of TicTacToe.", "ttt_has_won": "{0} has won!", "ttt_matched_three": "Matched three", "ttt_no_moves": "No moves left!",