Merge remote-tracking branch 'upstream/master' into chatterino7

CHANGELOG.md

@@ -2,18 +2,7 @@
 
 ## Unversioned
 
-- Minor: Added context menu action to toggle visibility of offline tabs. (#5318)
-- Minor: Report sub duration for more multi-month gift cases. (#5319)
-- Minor: Improved error reporting for the automatic streamer mode detection on Linux and macOS. (#5321)
-- Bugfix: Fixed a crash that could occur on Wayland when using the image uploader. (#5314)
-- Bugfix: Fixed split tooltip getting stuck in some cases. (#5309)
-- Bugfix: Fixed the version string not showing up as expected in Finder on macOS. (#5311)
-- Bugfix: Fixed links having `http://` added to the beginning in certain cases. (#5323)
-- Bugfix: Fixed topmost windows from losing their status after opening dialogs on Windows. (#5330)
-- Bugfix: Fixed a gap appearing when using filters on `/watching`. (#5329)
-- Dev: Changed the order of the query parameters for Twitch player URLs. (#5326)
-
-## 2.5.0-beta.1
+## 2.5.0
 
 - Major: Twitch follower emotes can now be correctly tabbed in other channels when you are subscribed to the channel the emote is from. (#4922)
 - Major: Added `/automod` split to track automod caught messages across all open channels the user moderates. (#4986, #5026)
@@ -67,6 +56,16 @@
 - Minor: Change Lua `CompletionRequested` handler to use an event table. (#5280)
 - Minor: Changed the layout of the about page. (#5287)
 - Minor: Add duration to multi-month anon sub gift messages. (#5293)
+- Minor: Added context menu action to toggle visibility of offline tabs. (#5318)
+- Minor: Report sub duration for more multi-month gift cases. (#5319)
+- Minor: Improved error reporting for the automatic streamer mode detection on Linux and macOS. (#5321)
+- Bugfix: Fixed a crash that could occur on Wayland when using the image uploader. (#5314)
+- Bugfix: Fixed split tooltip getting stuck in some cases. (#5309)
+- Bugfix: Fixed the version string not showing up as expected in Finder on macOS. (#5311)
+- Bugfix: Fixed links having `http://` added to the beginning in certain cases. (#5323)
+- Bugfix: Fixed topmost windows from losing their status after opening dialogs on Windows. (#5330)
+- Bugfix: Fixed a gap appearing when using filters on `/watching`. (#5329)
+- Bugfix: Removed the remnant "Show chatter list" menu entry for non-moderators. (#5336)
 - Bugfix: Fixed an issue where certain emojis did not send to Twitch chat correctly. (#4840)
 - Bugfix: Fixed the `/shoutout` command not working with usernames starting with @'s (e.g. `/shoutout @forsen`). (#4800)
 - Bugfix: Fixed capitalized channel names in log inclusion list not being logged. (#4848)
@@ -137,6 +136,7 @@
 - Bugfix: Fixed a data race when disconnecting from Twitch PubSub. (#4771)
 - Bugfix: Fixed messages not immediately disappearing when clearing the chat. (#5282)
 - Bugfix: Fixed highlights triggering for ignored users in announcements. (#5295)
+- Dev: Changed the order of the query parameters for Twitch player URLs. (#5326)
 - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
 - Dev: Change clang-format from v14 to v16. (#4929)
 - Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791)

resources/com.chatterino.chatterino.appdata.xml

@@ -34,7 +34,10 @@
         <binary>chatterino</binary>
     </provides>
     <releases>
-        <release version="7.5.0" date="2024-04-07">
+        <release version="7.5.0" date="2024-04-21">
+            <url>https://github.com/SevenTV/chatterino7/releases/tag/v7.5.0</url>
+        </release>
+        <release version="7.5.0~beta1" date="2024-04-07">
             <url>https://github.com/SevenTV/chatterino7/releases/tag/v7.5.0-beta.1</url>
         </release>
         <release version="7.4.6" date="2023-09-28">

src/common/Version.hpp

@@ -24,7 +24,7 @@
  *  - 2.4.0-alpha.2
  *  - 2.4.0-alpha
  **/
-#define CHATTERINO_VERSION "7.5.0-beta.1"
+#define CHATTERINO_VERSION "7.5.0"
 
 #if defined(Q_OS_WIN)
 #    define CHATTERINO_OS "win"

src/widgets/splits/SplitHeader.cpp

@@ -525,9 +525,12 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
 
     if (twitchChannel)
     {
-        moreMenu->addAction(
-            "Show chatter list", this->split_, &Split::showChatterList,
-            h->getDisplaySequence(HotkeyCategory::Split, "openViewerList"));
+        if (twitchChannel->hasModRights())
+        {
+            moreMenu->addAction(
+                "Show chatter list", this->split_, &Split::showChatterList,
+                h->getDisplaySequence(HotkeyCategory::Split, "openViewerList"));
+        }
 
         moreMenu->addAction("Subscribe", this->split_, &Split::openSubPage);