nki/youmubot
1
0
Fork 0
mirror of https://github.com/natsukagami/youmubot.git synced 2025-04-16 07:18:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-user-event' of natsukagami/youmubot into master

Browse source
This commit is contained in:
Natsu Kagami 2020-03-15 20:53:57 +00:00
commit 20a15efcc4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
youmubot-osu/src/models/mod.rs
View file

@ -181,8 +181,8 @@ impl Beatmap {
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub struct UserEvent { pub struct UserEvent {
pub display_html: String, pub display_html: String,
pub beatmap_id: u64, pub beatmap_id: Option<u64>,
pub beatmapset_id: u64, pub beatmapset_id: Option<u64>,
pub date: DateTime<Utc>, pub date: DateTime<Utc>,
pub epic_factor: u8, pub epic_factor: u8,
} }

4
youmubot-osu/src/models/parse.rs
View file

@ -152,8 +152,8 @@ impl TryFrom<raw::Beatmap> for Beatmap {
fn parse_user_event(s: raw::UserEvent) -> ParseResult<UserEvent> { fn parse_user_event(s: raw::UserEvent) -> ParseResult<UserEvent> {
Ok(UserEvent { Ok(UserEvent {
display_html: s.display_html, display_html: s.display_html,
beatmap_id: parse_from_str(&s.beatmap_id)?, beatmap_id: s.beatmap_id.map(parse_from_str).transpose()?,
beatmapset_id: parse_from_str(&s.beatmapset_id)?, beatmapset_id: s.beatmapset_id.map(parse_from_str).transpose()?,
date: parse_date(&s.date)?, date: parse_date(&s.date)?,
epic_factor: parse_from_str(&s.epicfactor)?, epic_factor: parse_from_str(&s.epicfactor)?,
}) })

4
youmubot-osu/src/models/raw.rs
View file

@ -70,8 +70,8 @@ pub(crate) struct User {
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
pub(crate) struct UserEvent { pub(crate) struct UserEvent {
pub display_html: String, pub display_html: String,
pub beatmap_id: String, pub beatmap_id: Option<String>,
pub beatmapset_id: String, pub beatmapset_id: Option<String>,
pub date: String, pub date: String,
pub epicfactor: String, pub epicfactor: String,
} }