From 26074ae257b1b79f7bd4c6baa0130ad9d98c93a2 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 7 Sep 2020 14:12:49 -0400 Subject: [PATCH] osu: Fix cache --- youmubot-osu/src/discord/cache.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/youmubot-osu/src/discord/cache.rs b/youmubot-osu/src/discord/cache.rs index 9dc2d63..b700205 100644 --- a/youmubot-osu/src/discord/cache.rs +++ b/youmubot-osu/src/discord/cache.rs @@ -1,17 +1,14 @@ use super::db::OsuLastBeatmap; use super::BeatmapWithMode; -use serenity::{ - framework::standard::{CommandError as Error, CommandResult}, - model::id::ChannelId, - prelude::*, -}; +use serenity::model::id::ChannelId; +use youmubot_prelude::*; /// Save the beatmap into the server data storage. pub(crate) fn save_beatmap( - data: &ShareMap, + data: &TypeMap, channel_id: ChannelId, bm: &BeatmapWithMode, -) -> CommandResult { +) -> Result<()> { let db = OsuLastBeatmap::open(data); let mut db = db.borrow_mut()?; @@ -22,9 +19,9 @@ pub(crate) fn save_beatmap( /// Get the last beatmap requested from this channel. pub(crate) fn get_beatmap( - data: &ShareMap, + data: &TypeMap, channel_id: ChannelId, -) -> Result, Error> { +) -> Result> { let db = OsuLastBeatmap::open(data); let db = db.borrow()?;