chatterino2
Code Issues

chore: consolidate twitch URLs with www (#6407)

Browse Source
This commit is contained in:
cqttv
2025-08-23 06:46:34 -04:00
committed by GitHub
parent 195776d4b7
commit 41ba487ca1
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -27,6 +27,7 @@
- Minor: Add feature to search for only zero-width emotes when prepended by `:~`. (#6362) - 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: 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: 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: Commands are no longer tab-completable in the middle of messages. (#6273)
- Bugfix: Automatic streamer mode detection now works from Flatpak. (#6250) - 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) - Bugfix: Don't create native messaging manifest file if browser directory doesn't exist. (#6116)
src/messages/MessageBuilder.cpp
+1 -1
View File
@@ -392,7 +392,7 @@ EmotePtr makeSharedChatBadge(const QString &sourceName,
return Url{"https://link.twitch.tv/SharedChatViewer"}; 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>(Emote{ return std::make_shared<Emote>(Emote{
src/providers/twitch/TwitchChannel.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ TwitchChannel::TwitchChannel(const QString &name)
, ChannelChatters(*static_cast<Channel *>(this)) , ChannelChatters(*static_cast<Channel *>(this))
, nameOptions{name, name, name} , nameOptions{name, name, name}
, subscriptionUrl_("https://www.twitch.tv/subs/" + 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)) , popoutPlayerUrl_(TWITCH_PLAYER_URL.arg(name))
, localTwitchEmotes_(std::make_shared<EmoteMap>()) , localTwitchEmotes_(std::make_shared<EmoteMap>())
, bttvEmotes_(std::make_shared<EmoteMap>()) , bttvEmotes_(std::make_shared<EmoteMap>())
src/util/CustomPlayer.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ void openInCustomPlayer(QStringView channelName)
} }
QDesktopServices::openUrl( QDesktopServices::openUrl(
QUrl{scheme % u"https://twitch.tv/" % channelName}); QUrl{scheme % u"https://www.twitch.tv/" % channelName});
} }
} // namespace chatterino } // namespace chatterino
src/widgets/dialogs/UserInfoPopup.cpp
+3 -2
View File
@@ -283,8 +283,9 @@ UserInfoPopup::UserInfoPopup(bool closeAutomatically, Split *split)
switch (button) switch (button)
{ {
case Qt::LeftButton: { case Qt::LeftButton: {
QDesktopServices::openUrl(QUrl( QDesktopServices::openUrl(
"https://twitch.tv/" + this->userName_.toLower())); QUrl("https://www.twitch.tv/" +
this->userName_.toLower()));
} }
break; break;
src/widgets/splits/Split.cpp
+4 -4
View File
@@ -1101,7 +1101,7 @@ void Split::openInBrowser()
if (auto *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get())) if (auto *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get()))
{ {
QDesktopServices::openUrl("https://twitch.tv/" + QDesktopServices::openUrl("https://www.twitch.tv/" +
twitchChannel->getName()); twitchChannel->getName());
} }
} }
@@ -1109,8 +1109,8 @@ void Split::openInBrowser()
void Split::openWhispersInBrowser() void Split::openWhispersInBrowser()
{ {
auto userName = getApp()->getAccounts()->twitch.getCurrent()->getUserName(); auto userName = getApp()->getAccounts()->twitch.getCurrent()->getUserName();
QDesktopServices::openUrl("https://twitch.tv/popout/moderator/" + userName + QDesktopServices::openUrl("https://www.twitch.tv/popout/moderator/" +
"/whispers"); userName + "/whispers");
} }
void Split::openBrowserPlayer() void Split::openBrowserPlayer()
@@ -1124,7 +1124,7 @@ void Split::openModViewInBrowser()
if (auto *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get())) if (auto *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get()))
{ {
QDesktopServices::openUrl("https://twitch.tv/moderator/" + QDesktopServices::openUrl("https://www.twitch.tv/moderator/" +
twitchChannel->getName()); twitchChannel->getName());
} }
} }