新主题

apps/server-rust/src/song_request.rs

@@ -22,6 +22,7 @@ use crate::{
     domain::{ComponentMessage, LiveEvent, LiveEventKind, LiveEventPayload, PlatformViewer},
     overlay::OverlayThemeId,
     realtime::EventHub,
+    typography::{FontFamilyId, default_font_brightness, sanitize_font_brightness},
 };
 
 pub const SONG_REQUEST_KIND: &str = "song_request";
@@ -33,6 +34,10 @@ const SNAPSHOT_PAGE_SIZE: usize = 100;
 pub struct SongRequestSettings {
     #[serde(default)]
     pub theme_id: OverlayThemeId,
+    #[serde(default)]
+    pub font_family: FontFamilyId,
+    #[serde(default = "default_font_brightness")]
+    pub font_brightness: u16,
     #[serde(default = "default_font_scale")]
     pub font_scale: u16,
     #[serde(default = "default_scroll_speed")]
@@ -54,6 +59,8 @@ impl Default for SongRequestSettings {
     fn default() -> Self {
         Self {
             theme_id: OverlayThemeId::default(),
+            font_family: FontFamilyId::default(),
+            font_brightness: default_font_brightness(),
             font_scale: default_font_scale(),
             scroll_speed_pixels_per_second: default_scroll_speed(),
             edge_pause_seconds: default_edge_pause(),
@@ -67,6 +74,7 @@ impl Default for SongRequestSettings {
 impl SongRequestSettings {
     pub fn sanitize(mut self) -> Self {
         self.font_scale = self.font_scale.clamp(50, 250);
+        self.font_brightness = sanitize_font_brightness(self.font_brightness);
         self.scroll_speed_pixels_per_second = self.scroll_speed_pixels_per_second.clamp(5, 200);
         self.edge_pause_seconds = self.edge_pause_seconds.min(15);
         self.max_queue_size = self.max_queue_size.min(10_000);
@@ -1022,6 +1030,7 @@ mod tests {
 
         let bounded = SongRequestSettings {
             font_scale: 999,
+            font_brightness: u16::MAX,
             scroll_speed_pixels_per_second: 0,
             edge_pause_seconds: 200,
             max_queue_size: u32::MAX,
@@ -1031,6 +1040,7 @@ mod tests {
         }
         .sanitize();
         assert_eq!(bounded.font_scale, 250);
+        assert_eq!(bounded.font_brightness, 180);
         assert_eq!(bounded.scroll_speed_pixels_per_second, 5);
         assert_eq!(bounded.edge_pause_seconds, 15);
         assert_eq!(bounded.max_queue_size, 10_000);