—
-
- —
- •
- —
-
+
—
+
—
Paused
diff --git a/app/assets/web/widgets/nowplaying/style.css b/app/assets/web/widgets/nowplaying/style.css
index 395a7ed..1bb37d1 100644
--- a/app/assets/web/widgets/nowplaying/style.css
+++ b/app/assets/web/widgets/nowplaying/style.css
@@ -139,7 +139,7 @@ html, body {
flex-direction: column;
justify-content: center;
min-width: 0;
- gap: 6px;
+ gap: 3px;
padding-right: clamp(8px, calc(var(--w) * 0.02), 14px);
flex: 1;
}
@@ -156,36 +156,30 @@ html, body {
text-shadow: 0 2px 10px rgba(0,0,0,.25);
}
-.sub{
+.artist{
color: var(--muted);
font-size: 15px;
- display:flex;
- gap: 8px;
- align-items: center;
- min-width: 0;
-}
-.sub span.artist{
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- flex: 0 1 auto; /* shrinking is ok, growing beyond content isn't forced */
min-width: 0;
- max-width: 60%; /* prevent it from starving the album entirely if very long */
+ max-width: 100%;
}
-.sub span.album{
+
+.album{
+ color: var(--muted);
+ font-size: 13px;
+ opacity: 0.8;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- flex: 1; /* takes remaining space */
min-width: 0;
-}
-.dot{
- opacity: .7;
- flex: 0 0 auto;
+ max-width: 100%;
+ font-style: italic;
}
.statusRow{
- margin-top: 6px;
+ margin-top: 4px;
}
.pill{
diff --git a/app/chat_models.py b/app/chat_models.py
index ef8f4dd..7c9eb99 100644
--- a/app/chat_models.py
+++ b/app/chat_models.py
@@ -26,7 +26,7 @@ class Emote:
url: str
provider: str # "twitch", "ffz", "bttv", "7tv", "youtube"
is_animated: bool = False
- scale: int = 1
+ emote_id: Optional[str] = None # For dynamic resolution selection
@dataclass
@@ -84,7 +84,7 @@ class ChatMessage:
"url": e.url,
"provider": e.provider,
"is_animated": e.is_animated,
- "scale": e.scale,
+ "emote_id": e.emote_id,
}
for e in self.emotes
],
diff --git a/app/providers/gsmtc.py b/app/providers/gsmtc.py
index fc94ada..6b9ff80 100644
--- a/app/providers/gsmtc.py
+++ b/app/providers/gsmtc.py
@@ -80,14 +80,44 @@ def _pick_best_session(sessions: Any) -> Any:
def _extract_album_from_artist(artist_raw: str) -> Tuple[str, str]:
+ """
+ Extract album info from artist string if embedded.
+
+ Supports formats:
+ - "Artist [ALBUM:Album Name]" -> ("Artist", "Album Name")
+ - "Artist — Album Name" -> ("Artist", "Album Name") (em dash)
+ - "Artist - Album Name" -> ("Artist", "Album Name") (hyphen with spaces)
+ """
if not artist_raw:
return "", ""
+
+ # First, check for [ALBUM:...] pattern
m = re.search(r"\s*\[ALBUM:(.*?)\]\s*$", artist_raw, re.IGNORECASE)
- if not m:
- return artist_raw.strip(), ""
- album_hint = m.group(1).strip()
- clean_artist = artist_raw[: m.start()].strip()
- return clean_artist, album_hint
+ if m:
+ album_hint = m.group(1).strip()
+ clean_artist = artist_raw[: m.start()].strip()
+ return clean_artist, album_hint
+
+ # Check for em dash (—) or en dash (–) separator
+ for dash in ["—", "–"]:
+ if dash in artist_raw:
+ parts = artist_raw.split(dash, 1)
+ if len(parts) == 2:
+ artist = parts[0].strip()
+ album = parts[1].strip()
+ if artist and album:
+ return artist, album
+
+ # Check for spaced hyphen " - " separator (but not "Artist-Name")
+ if " - " in artist_raw:
+ parts = artist_raw.split(" - ", 1)
+ if len(parts) == 2:
+ artist = parts[0].strip()
+ album = parts[1].strip()
+ if artist and album:
+ return artist, album
+
+ return artist_raw.strip(), ""
async def run_gsmtc_provider(state: AppState) -> None:
diff --git a/app/providers/twitch_chat.py b/app/providers/twitch_chat.py
index 64d9be2..14b58bc 100644
--- a/app/providers/twitch_chat.py
+++ b/app/providers/twitch_chat.py
@@ -378,6 +378,7 @@ class TwitchChatClient:
code=code,
url=f"https://static-cdn.jtvnw.net/emoticons/v2/{emote_id}/default/dark/1.0",
provider="twitch",
+ emote_id=emote_id,
)
)
@@ -431,11 +432,16 @@ class TwitchChatClient:
for set_id, set_data in data.get("sets", {}).items():
for emote in set_data.get("emoticons", []):
code = emote.get("name")
+ emote_id = str(emote.get("id", ""))
urls = emote.get("urls", {})
- url = urls.get("4") or urls.get("2") or urls.get("1")
+ # Use 1x as default, frontend will upgrade
+ url = urls.get("1") or urls.get("2") or urls.get("4")
if code and url:
self.global_emotes[code] = Emote(
- code=code, url=f"https:{url}" if url.startswith("//") else url, provider="ffz"
+ code=code,
+ url=f"https:{url}" if url.startswith("//") else url,
+ provider="ffz",
+ emote_id=emote_id,
)
loaded_global += 1
@@ -448,11 +454,16 @@ class TwitchChatClient:
for set_id, set_data in data.get("sets", {}).items():
for emote in set_data.get("emoticons", []):
code = emote.get("name")
+ emote_id = str(emote.get("id", ""))
urls = emote.get("urls", {})
- url = urls.get("4") or urls.get("2") or urls.get("1")
+ # Use 1x as default, frontend will upgrade
+ url = urls.get("1") or urls.get("2") or urls.get("4")
if code and url:
self.channel_emotes[code] = Emote(
- code=code, url=f"https:{url}" if url.startswith("//") else url, provider="ffz"
+ code=code,
+ url=f"https:{url}" if url.startswith("//") else url,
+ provider="ffz",
+ emote_id=emote_id,
)
loaded_channel += 1
@@ -562,6 +573,7 @@ class TwitchChatClient:
code=code,
url=f"https://cdn.betterttv.net/emote/{emote_id}/1x",
provider="bttv",
+ emote_id=emote_id,
)
loaded += 1
return loaded
@@ -589,6 +601,7 @@ class TwitchChatClient:
code=code,
url=f"https://cdn.betterttv.net/emote/{emote_id}/1x",
provider="bttv",
+ emote_id=emote_id,
)
loaded_global += 1
@@ -634,6 +647,7 @@ class TwitchChatClient:
code=code,
url=f"https://cdn.betterttv.net/emote/{emote_id}/1x",
provider="bttv",
+ emote_id=emote_id,
)
loaded_channel += 1
@@ -644,7 +658,7 @@ class TwitchChatClient:
print(f"BTTV emote load error: {e}")
def _get_7tv_emote_url(self, emote: dict) -> Optional[str]:
- """Extract the correct URL from a 7TV emote object."""
+ """Extract the correct URL from a 7TV emote object (1x for frontend scaling)."""
# Try to get from data.host structure (v3 API format)
emote_data = emote.get("data", {})
host = emote_data.get("host", {})
@@ -653,11 +667,16 @@ class TwitchChatClient:
base_url = host.get("url", "")
files = host.get("files", [])
- # Find best quality webp file
+ # Use 1x as default, frontend will upgrade based on font size
for f in files:
if f.get("name") == "1x.webp":
return f"https:{base_url}/{f.get('name')}"
+ # Fallback to 2x
+ for f in files:
+ if f.get("name") == "2x.webp":
+ return f"https:{base_url}/{f.get('name')}"
+
# Fallback to first webp file
for f in files:
if f.get("format") == "WEBP":
@@ -670,16 +689,23 @@ class TwitchChatClient:
return None
def _get_7tv_emote_url_v4(self, emote: dict) -> Optional[str]:
- """Extract the correct URL from a 7TV v4 GraphQL emote object."""
+ """Extract the correct URL from a 7TV v4 GraphQL emote object (1x for frontend scaling)."""
images = emote.get("images", [])
- # Find 1x scale image
+ # Use 1x as default, frontend will upgrade based on font size
for img in images:
if img.get("scale") == 1:
url = img.get("url")
if url:
return url if url.startswith("http") else f"https:{url}"
+ # Fallback to 2x
+ for img in images:
+ if img.get("scale") == 2:
+ url = img.get("url")
+ if url:
+ return url if url.startswith("http") else f"https:{url}"
+
# Fallback to first image
if images:
url = images[0].get("url")
@@ -804,6 +830,7 @@ class TwitchChatClient:
loaded = 0
for emote in emotes:
code = emote.get("defaultName")
+ emote_id = emote.get("id")
if code and code not in self.global_emotes:
url = self._get_7tv_emote_url_v4(emote)
if url:
@@ -815,6 +842,7 @@ class TwitchChatClient:
img.get("frameCount", 1) > 1
for img in emote.get("images", [])
),
+ emote_id=emote_id,
)
loaded += 1
return loaded
@@ -836,6 +864,7 @@ class TwitchChatClient:
data = await resp.json()
for emote in data.get("emotes", []):
code = emote.get("name")
+ emote_id = emote.get("id")
url = self._get_7tv_emote_url(emote)
if code and url:
emote_data = emote.get("data", {})
@@ -844,6 +873,7 @@ class TwitchChatClient:
url=url,
provider="7tv",
is_animated=emote_data.get("animated", False),
+ emote_id=emote_id,
)
loaded_global += 1
@@ -889,6 +919,7 @@ class TwitchChatClient:
emote_set = data.get("emote_set", {})
for emote in emote_set.get("emotes", []):
code = emote.get("name")
+ emote_id = emote.get("id")
url = self._get_7tv_emote_url(emote)
if code and url:
emote_data = emote.get("data", {})
@@ -896,6 +927,7 @@ class TwitchChatClient:
code=code,
url=url,
provider="7tv",
+ emote_id=emote_id,
is_animated=emote_data.get("animated", False),
)
loaded_channel += 1