Merge branch 'master' into linux

Author: DevilXD

README.md

@@ -69,6 +69,7 @@ if they aren't already there. Doing so ensures proper markdown rendering on Gith
 • Please ensure your editor won't trim the spaces upon saving the file.
 -->
 
-@Suz1e - For the entirety of the Chinese (简体中文) translation.  
+@Suz1e - For the entirety of the Chinese (简体中文) translation and revisions.  
+@wwj010 - For the Chinese (简体中文) translation corrections and revisions.
 @nwvh - For the entirety of the Czech (Čeština) translation.  
 @ThisIsCyreX - For the entirety of the German (Deutsch) translation.

channel.py

@@ -21,6 +21,8 @@
 
 
 class Stream:
+    __slots__ = ("channel", "broadcast_id", "viewers", "drops_enabled", "game", "title")
+
     def __init__(
         self,
         channel: Channel,
@@ -76,7 +78,7 @@ def __init__(
         id: SupportsInt,
         login: str,
         display_name: str | None = None,
-        priority: bool = False,
+        acl_based: bool = False,
     ):
         self._twitch: Twitch = twitch
         self._gui_channels: ChannelList = twitch.gui.channels
@@ -87,11 +89,11 @@ def __init__(
         self.points: int | None = None
         self._stream: Stream | None = None
         self._pending_stream_up: asyncio.Task[Any] | None = None
-        # Priority channels are:
+        # ACL-based channels are:
         # • considered first when switching channels
-        # • if we're watching a non-priority channel, a priority channel going up triggers a switch
+        # • if we're watching a non-based channel, a based channel going up triggers a switch
         # • not cleaned up unless they're streaming a game we haven't selected
-        self.priority: bool = priority
+        self.acl_based: bool = acl_based
 
     @classmethod
     def from_acl(cls, twitch: Twitch, data: JsonType) -> Channel:
@@ -100,7 +102,7 @@ def from_acl(cls, twitch: Twitch, data: JsonType) -> Channel:
             id=data["id"],
             login=data["name"],
             display_name=data.get("displayName"),
-            priority=True,
+            acl_based=True,
         )
 
     @classmethod
@@ -114,9 +116,9 @@ def from_directory(cls, twitch: Twitch, data: JsonType) -> Channel:
 
     @classmethod
     async def from_name(
-        cls, twitch: Twitch, channel_login: str, *, priority: bool = False
+        cls, twitch: Twitch, channel_login: str, *, acl_based: bool = False
     ) -> Channel:
-        self = cls(twitch, id=0, login=channel_login, priority=priority)
+        self = cls(twitch, id=0, login=channel_login, acl_based=acl_based)
         # id and display name to be filled/overwritten by get_stream
         stream = await self.get_stream()
         if stream is not None:
@@ -180,7 +182,7 @@ def pending_online(self) -> bool:
 
     @property
     def game(self) -> Game | None:
-        if self._stream is not None and self._stream.game is not None:
+        if self._stream is not None:
             return self._stream.game
         return None
 

constants.py

@@ -64,9 +64,9 @@ def _resource_path(relative_path: Path | str) -> Path:
 BASE_URL = URL("https://twitch.tv")
 CLIENT_ID = "kd1unb4b3q4t58fwlpcbzcbnm76a8fp"
 # CLIENT_ID = "uo6dggojyb8d6soh92zknwmi5ej1q2"
-USER_AGENT = (
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-    "Chrome/105.0.0.0 Safari/537.36"
+ANDROID_USER_AGENT = (
+    "Dalvik/2.1.0 (Linux; U; Android 7.1.2; SM-G975N Build/N2G48C) "
+    "tv.twitch.android.app/13.4.1/1304010"
 )
 # Intervals and Delays
 PING_INTERVAL = timedelta(minutes=3)