diff --git a/CHANGELOG.md b/CHANGELOG.md index 1597f368..cb6649b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Minor: Add feature to search for only zero-width emotes when prepended by `:~`. (#6362) - Minor: The follow and sub dates now show the duration in a tooltip. (#6384) - Minor: Usercards now show a live indicator if the user is currently streaming. (#6383) +- Minor: Consolidate twitch.tv URLs to start with www (#6407) - Bugfix: Commands are no longer tab-completable in the middle of messages. (#6273) - Bugfix: Automatic streamer mode detection now works from Flatpak. (#6250) - Bugfix: Don't create native messaging manifest file if browser directory doesn't exist. (#6116) diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp index 94e6e3fa..31ea1790 100644 --- a/src/messages/MessageBuilder.cpp +++ b/src/messages/MessageBuilder.cpp @@ -392,7 +392,7 @@ EmotePtr makeSharedChatBadge(const QString &sourceName, return Url{"https://link.twitch.tv/SharedChatViewer"}; } - return Url{u"https://twitch.tv/%1"_s.arg(sourceLogin)}; + return Url{u"https://www.twitch.tv/%1"_s.arg(sourceLogin)}; }(); return std::make_shared(Emote{ diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp index eb12eda0..8d507d2a 100644 --- a/src/providers/twitch/TwitchChannel.cpp +++ b/src/providers/twitch/TwitchChannel.cpp @@ -116,7 +116,7 @@ TwitchChannel::TwitchChannel(const QString &name) , ChannelChatters(*static_cast(this)) , nameOptions{name, name, name} , subscriptionUrl_("https://www.twitch.tv/subs/" + name) - , channelUrl_("https://twitch.tv/" + name) + , channelUrl_("https://www.twitch.tv/" + name) , popoutPlayerUrl_(TWITCH_PLAYER_URL.arg(name)) , localTwitchEmotes_(std::make_shared()) , bttvEmotes_(std::make_shared()) diff --git a/src/util/CustomPlayer.cpp b/src/util/CustomPlayer.cpp index ea5be1fa..e2840bc0 100644 --- a/src/util/CustomPlayer.cpp +++ b/src/util/CustomPlayer.cpp @@ -22,7 +22,7 @@ void openInCustomPlayer(QStringView channelName) } QDesktopServices::openUrl( - QUrl{scheme % u"https://twitch.tv/" % channelName}); + QUrl{scheme % u"https://www.twitch.tv/" % channelName}); } } // namespace chatterino diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp index 89b9653e..fc1692d4 100644 --- a/src/widgets/dialogs/UserInfoPopup.cpp +++ b/src/widgets/dialogs/UserInfoPopup.cpp @@ -283,8 +283,9 @@ UserInfoPopup::UserInfoPopup(bool closeAutomatically, Split *split) switch (button) { case Qt::LeftButton: { - QDesktopServices::openUrl(QUrl( - "https://twitch.tv/" + this->userName_.toLower())); + QDesktopServices::openUrl( + QUrl("https://www.twitch.tv/" + + this->userName_.toLower())); } break; diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp index 46fd5827..8a50aaf0 100644 --- a/src/widgets/splits/Split.cpp +++ b/src/widgets/splits/Split.cpp @@ -1101,7 +1101,7 @@ void Split::openInBrowser() if (auto *twitchChannel = dynamic_cast(channel.get())) { - QDesktopServices::openUrl("https://twitch.tv/" + + QDesktopServices::openUrl("https://www.twitch.tv/" + twitchChannel->getName()); } } @@ -1109,8 +1109,8 @@ void Split::openInBrowser() void Split::openWhispersInBrowser() { auto userName = getApp()->getAccounts()->twitch.getCurrent()->getUserName(); - QDesktopServices::openUrl("https://twitch.tv/popout/moderator/" + userName + - "/whispers"); + QDesktopServices::openUrl("https://www.twitch.tv/popout/moderator/" + + userName + "/whispers"); } void Split::openBrowserPlayer() @@ -1124,7 +1124,7 @@ void Split::openModViewInBrowser() if (auto *twitchChannel = dynamic_cast(channel.get())) { - QDesktopServices::openUrl("https://twitch.tv/moderator/" + + QDesktopServices::openUrl("https://www.twitch.tv/moderator/" + twitchChannel->getName()); } }