feat: use ordr preset render settings (#1076)

* feat: use ordr preset render settings

* chore: cargo clippy

Author: MaxOhn

Cargo.lock

@@ -155,7 +155,7 @@ impl_with_comma!(@INT: i16 > 1032 -> i32, i32 > 1_000_000_002 -> i64, i64, isize
 impl_with_comma!(@UINT: u16 > 1065 -> u32, u32 > 1_000_000_004 -> u64, u64, usize);
 
 pub fn last_multiple(per_page: usize, total: usize) -> usize {
-    if per_page <= total && total % per_page == 0 {
+    if per_page <= total && total.is_multiple_of(per_page) {
         total - per_page
     } else {
         total - total % per_page

bathbot-util/src/numbers.rs

@@ -48,7 +48,7 @@ rosu-v2 = { workspace = true }
 rosu-pp-older = { git = "https://github.com/MaxOhn/rosu-pp-older.git", branch = "main" }
 # rosu-pp-older = { path = "../../rosu-pp-older" }
 # rosu-render = { git = "https://github.com/MaxOhn/rosu-render", branch = "main", default-features = false, features = ["rustls-webpki-roots"] }
-rosu-render = { version = "0.4.0", default-features = false, features = ["rustls-webpki-roots"] }
+rosu-render = { version = "0.5.1", default-features = false, features = ["rustls-webpki-roots"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 smallvec = { version = "1.0" }

bathbot/Cargo.toml

@@ -253,7 +253,7 @@ impl IActiveMessage for SettingsImport {
                     Ok(mut skin_list) => {
                         let skin = skin_list.skins.swap_remove(0);
 
-                        ReplaySettings::new_with_official_skin(options, skin)
+                        ReplaySettings::new_with_official_skin(options, skin, user)
                     }
                     Err(err) => {
                         self.import_result = ImportResult::Err(
@@ -265,7 +265,7 @@ impl IActiveMessage for SettingsImport {
                 }
             }
             RenderSkinOption::Custom { ref id } => match ordr.custom_skin_info(*id).await {
-                Ok(info) => ReplaySettings::new_with_custom_skin(options, info, *id),
+                Ok(info) => ReplaySettings::new_with_custom_skin(options, info, *id, user),
                 Err(err) => {
                     self.import_result = ImportResult::Err(
                         Report::new(err).wrap_err("Failed to request custom skin"),

bathbot/src/active/impls/render/import.rs

@@ -72,7 +72,14 @@ pub struct RenderScore {
 }
 
 #[derive(CommandModel, CreateCommand)]
-#[command(name = "settings", desc = "Adjust your o!rdr render settings")]
+#[command(
+    name = "settings",
+    desc = "Adjust your o!rdr render settings",
+    help = "Adjust your o!rdr render settings.\n\
+    Note: You might want to configure your settings on the ordr website and use \
+    that as preset. If a preset on your ordr account is available for your \
+    linked discord account, it will always overwrite your settings here."
+)]
 pub enum RenderSettings {
     #[command(name = "modify")]
     Modify(RenderSettingsModify),
@@ -604,6 +611,8 @@ impl OngoingRender {
                 progress = self.receivers.progress.recv() => {
                     let now = Instant::now();
 
+                    debug!("Got progress: {progress:?}");
+
                     if last_update + INTERVAL > now {
                         continue;
                     }
@@ -614,7 +623,6 @@ impl OngoingRender {
                         return warn!("progress channel was closed");
                     };
 
-
                     self.status.set(RenderStatusInner::Rendering(progress.progress));
                     let builder = self.status.as_message();
 
@@ -825,7 +833,7 @@ async fn render_settings_default(command: &mut InteractionCommand) -> Result<()>
 
     let owner = command.user_id()?;
     let replay_manager = Context::replay();
-    let settings = ReplaySettings::default();
+    let settings = ReplaySettings::new_default(owner);
 
     if let Err(err) = replay_manager.set_settings(owner, &settings).await {
         let _ = command.error(GENERAL_ISSUE).await;

bathbot/src/commands/osu/render.rs

@@ -59,9 +59,9 @@ impl ReplayManager {
             .wrap_err("Failed to load settings")?;
 
         match options {
-            Some(options) => Ok(ReplaySettings::from(options)),
+            Some(options) => Ok(ReplaySettings::from_db(options, user)),
             None => {
-                let settings = ReplaySettings::default();
+                let settings = ReplaySettings::new_default(user);
 
                 if let Err(err) = self.set_settings(user, &settings).await {
                     warn!(?err);
@@ -105,7 +105,6 @@ impl ReplayError {
     pub const ALREADY_REQUESTED_TEXT: &str = "Failed to check whether replay was already requested";
 }
 
-#[derive(Default)]
 pub struct ReplaySettings {
     options: RenderOptions,
     official_skin: ReplaySkin,
@@ -129,7 +128,24 @@ impl Default for ReplaySkin {
 }
 
 impl ReplaySettings {
-    pub fn new_with_official_skin(options: RenderOptions, skin: Skin) -> Self {
+    pub fn new_default(discord_id: Id<UserMarker>) -> Self {
+        Self {
+            options: RenderOptions {
+                discord_user_id: Some(discord_id.get()),
+                ..Default::default()
+            },
+            official_skin: Default::default(),
+            custom_skin: Default::default(),
+        }
+    }
+
+    pub fn new_with_official_skin(
+        mut options: RenderOptions,
+        skin: Skin,
+        discord_id: Id<UserMarker>,
+    ) -> Self {
+        options.discord_user_id = Some(discord_id.get());
+
         Self {
             options,
             official_skin: ReplaySkin {
@@ -140,7 +156,14 @@ impl ReplaySettings {
         }
     }
 
-    pub fn new_with_custom_skin(options: RenderOptions, skin: SkinInfo, id: u32) -> Self {
+    pub fn new_with_custom_skin(
+        mut options: RenderOptions,
+        skin: SkinInfo,
+        id: u32,
+        discord_id: Id<UserMarker>,
+    ) -> Self {
+        options.discord_user_id = Some(discord_id.get());
+
         Self {
             options,
             official_skin: ReplaySkin::default(),
@@ -201,21 +224,8 @@ impl ReplaySettings {
 
         (self.official_skin.display_name.as_ref(), custom)
     }
-}
-
-pub struct CustomSkinName<'n> {
-    name: &'n str,
-    id: u32,
-}
-
-impl Display for CustomSkinName<'_> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
-        write!(f, "{} (ID {})", self.name, self.id)
-    }
-}
 
-impl From<DbRenderOptions> for ReplaySettings {
-    fn from(options: DbRenderOptions) -> Self {
+    fn from_db(options: DbRenderOptions, discord_id: Id<UserMarker>) -> Self {
         let settings = RenderOptions {
             resolution: RenderResolution::HD720,
             global_volume: options.global_volume as u8,
@@ -267,6 +277,7 @@ impl From<DbRenderOptions> for ReplaySettings {
             show_strain_graph: options.show_strain_graph,
             show_slider_breaks: options.show_slider_breaks,
             ignore_fail: options.ignore_fail,
+            discord_user_id: Some(discord_id.get()),
         };
 
         let official_skin = ReplaySkin {
@@ -292,6 +303,17 @@ impl From<DbRenderOptions> for ReplaySettings {
     }
 }
 
+pub struct CustomSkinName<'n> {
+    name: &'n str,
+    id: u32,
+}
+
+impl Display for CustomSkinName<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
+        write!(f, "{} (ID {})", self.name, self.id)
+    }
+}
+
 impl From<&ReplaySettings> for DbRenderOptions {
     fn from(settings: &ReplaySettings) -> Self {
         let ReplaySettings {

bathbot/src/manager/replay.rs

@@ -88,6 +88,8 @@ impl Ordr {
     }
 
     pub async fn subscribe_render_id(&self, render_id: u32) -> OrdrReceivers {
+        debug!(render_id, "Subscribing");
+
         let (done_tx, done_rx) = mpsc::channel(1);
         let (failed_tx, failed_rx) = mpsc::channel(1);
         let (progress_tx, progress_rx) = mpsc::channel(4);
@@ -110,6 +112,8 @@ impl Ordr {
     }
 
     pub async fn unsubscribe_render_id(&self, render_id: u32) {
+        debug!(render_id, "Unsubscribing");
+
         self.senders.own(RenderId(render_id)).await.remove();
     }
 }