From ba440e0ccb754b022a150abba59bed951dd25c10 Mon Sep 17 00:00:00 2001 From: pajlada Date: Mon, 28 Aug 2023 19:17:03 +0200 Subject: [PATCH] Fixed `/shoutout` command not working with usernames starting with @'s (e.g. `/shoutout @forsen`) (#4800) --- CHANGELOG.md | 1 + src/controllers/commands/builtin/twitch/Shoutout.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71106eabf..200326e17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unversioned - Bugfix: Fixed a data race when disconnecting from Twitch PubSub. (#4771) +- Bugfix: Fixed `/shoutout` command not working with usernames starting with @'s (e.g. `/shoutout @forsen`). (#4800) - Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791) - Dev: Temporarily disable High DPI scaling on Qt6 builds on Windows. (#4767) - Dev: Tests now run on Ubuntu 22.04 instead of 20.04 to loosen C++ restrictions in tests. (#4774) diff --git a/src/controllers/commands/builtin/twitch/Shoutout.cpp b/src/controllers/commands/builtin/twitch/Shoutout.cpp index 4e3a7c7d6..b5077daec 100644 --- a/src/controllers/commands/builtin/twitch/Shoutout.cpp +++ b/src/controllers/commands/builtin/twitch/Shoutout.cpp @@ -7,6 +7,7 @@ #include "providers/twitch/api/Helix.hpp" #include "providers/twitch/TwitchAccount.hpp" #include "providers/twitch/TwitchChannel.hpp" +#include "util/Twitch.hpp" namespace chatterino::commands { @@ -39,7 +40,8 @@ QString sendShoutout(const CommandContext &ctx) return ""; } - const auto target = words->at(1); + auto target = words->at(1); + stripChannelName(target); using Error = HelixSendShoutoutError;