diff --git a/Cargo.lock b/Cargo.lock index e55b5ed..afc60da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1803,7 +1803,7 @@ checksum = "be9e281b71d3797817a1e6615dd8fb081dd61359b4c41d08792cc7c3c1c13b4e" [[package]] name = "rosu-v2" version = "0.8.0" -source = "git+https://github.com/natsukagami/rosu-v2?rev=6f6731cb2f0d235b006ab375dd94b446dde894ac#6f6731cb2f0d235b006ab375dd94b446dde894ac" +source = "git+https://github.com/MaxOhn/rosu-v2?rev=bab40491023b4c08f64cb1660e8d0e11db4e3c90#bab40491023b4c08f64cb1660e8d0e11db4e3c90" dependencies = [ "bytes", "dashmap", diff --git a/youmubot-osu/Cargo.toml b/youmubot-osu/Cargo.toml index adcf309..22ee8e1 100644 --- a/youmubot-osu/Cargo.toml +++ b/youmubot-osu/Cargo.toml @@ -16,7 +16,7 @@ osuparse = { git = "https://github.com/eltrufas/osuparse", rev = "ad8f6e5e7771e7 regex = "1.5.6" reqwest = "0.11.10" rosu-pp = "0.9.1" -rosu-v2 = { git = "https://github.com/natsukagami/rosu-v2", rev = "6f6731cb2f0d235b006ab375dd94b446dde894ac" } +rosu-v2 = { git = "https://github.com/MaxOhn/rosu-v2", rev = "bab40491023b4c08f64cb1660e8d0e11db4e3c90" } time = "0.3" serde = { version = "1.0.137", features = ["derive"] } serenity = "0.12" diff --git a/youmubot-osu/src/models/mod.rs b/youmubot-osu/src/models/mod.rs index 088e66d..0f76f5a 100644 --- a/youmubot-osu/src/models/mod.rs +++ b/youmubot-osu/src/models/mod.rs @@ -430,7 +430,7 @@ impl Beatmap { } #[derive(Clone, Debug)] -pub struct UserEvent(pub rosu_v2::model::recent_event::RecentEvent); +pub struct UserEvent(pub rosu_v2::model::event::Event); /// Represents a "achieved rank #x on beatmap" event. #[derive(Clone, Debug, Serialize, Deserialize)] @@ -445,7 +445,7 @@ impl UserEvent { /// Try to parse the event into a "rank" event. pub fn to_event_rank(&self) -> Option { match &self.0.event_type { - rosu_v2::model::recent_event::EventType::Rank { + rosu_v2::model::event::EventType::Rank { grade: _, rank, mode, diff --git a/youmubot-osu/src/models/rosu.rs b/youmubot-osu/src/models/rosu.rs index 1361422..a95864c 100644 --- a/youmubot-osu/src/models/rosu.rs +++ b/youmubot-osu/src/models/rosu.rs @@ -76,7 +76,7 @@ impl User { pub(crate) fn from_rosu( user: rosu::user::UserExtended, stats: rosu::user::UserStatistics, - events: Vec, + events: Vec, ) -> Self { Self { id: user.user_id as u64, @@ -105,8 +105,8 @@ impl User { } } -impl From for UserEvent { - fn from(value: rosu::recent_event::RecentEvent) -> Self { +impl From for UserEvent { + fn from(value: rosu::event::Event) -> Self { Self(value) } } diff --git a/youmubot-osu/src/request.rs b/youmubot-osu/src/request.rs index b694674..6d68cba 100644 --- a/youmubot-osu/src/request.rs +++ b/youmubot-osu/src/request.rs @@ -207,9 +207,8 @@ pub mod builders { }; let now = time::OffsetDateTime::now_utc() - time::Duration::DAY * self.event_days.unwrap_or(31); - let mut events = - handle_not_found(client.rosu.recent_events(user.user_id).limit(50).await)? - .unwrap_or(vec![]); + let mut events = handle_not_found(client.rosu.recent_activity(user.user_id).await)? + .unwrap_or(vec![]); events.retain(|e| (now <= e.created_at)); let stats = user.statistics.take().unwrap(); Ok(Some(models::User::from_rosu(user, stats, events)))