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

Apply cargo-clippy fixes

Browse source
This commit is contained in:
Natsu Kagami 2024-02-17 20:20:41 +01:00
parent 5bb6161b36
commit 508cf52e6f
Signed by: nki
GPG key ID: 55A032EB38B49ADB
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
youmubot-osu/src/discord/announcer.rs
View file

@ -76,7 +76,7 @@ impl youmubot_prelude::Announcer for Announcer {
Ok(v) => { Ok(v) => {
osu_user.pp = v osu_user.pp = v
.iter() .iter()
.map(|u| u.pp.clone()) .map(|u| u.pp)
.collect::<Vec<_>>() .collect::<Vec<_>>()
.try_into() .try_into()
.unwrap(); .unwrap();

2
youmubot-osu/src/discord/db.rs
View file

@ -170,7 +170,7 @@ impl From<model::OsuUser> for OsuUser {
user_id: UserId(u.user_id as u64), user_id: UserId(u.user_id as u64),
username: u username: u
.username .username
.map(|v| Cow::Owned(v)) .map(Cow::Owned)
.unwrap_or("unknown".into()), .unwrap_or("unknown".into()),
id: u.id as u64, id: u.id as u64,
last_update: u.last_update, last_update: u.last_update,

6
youmubot-osu/src/discord/mod.rs
View file

@ -199,7 +199,7 @@ pub async fn save(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult
} }
Ok(None) Ok(None)
} }
let (score, mode) = match find_score(&osu, &u).await? { let (score, mode) = match find_score(osu, &u).await? {
Some(v) => v, Some(v) => v,
None => { None => {
msg.reply( msg.reply(
@ -245,7 +245,7 @@ pub async fn save(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult
let reaction = reply.react(&ctx, '👌').await?; let reaction = reply.react(&ctx, '👌').await?;
let completed = loop { let completed = loop {
let emoji = reaction.emoji.clone(); let emoji = reaction.emoji.clone();
let user_reaction = CollectReaction::new(&ctx) let user_reaction = CollectReaction::new(ctx)
.message_id(reply.id.0) .message_id(reply.id.0)
.author_id(msg.author.id.0) .author_id(msg.author.id.0)
.filter(move |r| r.emoji == emoji) .filter(move |r| r.emoji == emoji)
@ -253,7 +253,7 @@ pub async fn save(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult
.collect_limit(1) .collect_limit(1)
.await; .await;
if let Some(ur) = user_reaction { if let Some(ur) = user_reaction {
if check(&osu, &u, score.beatmap_id).await? { if check(osu, &u, score.beatmap_id).await? {
break true; break true;
} }
if let ReactionAction::Added(ur) = &*ur { if let ReactionAction::Added(ur) = &*ur {

2
youmubot-osu/src/models/mods.rs
View file

@ -1,7 +1,7 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
const LAZER_TEXT: &'static str = "v2"; const LAZER_TEXT: &str = "v2";
bitflags::bitflags! { bitflags::bitflags! {
/// The mods available to osu! /// The mods available to osu!

2
youmubot-osu/src/models/rosu.rs
View file

@ -45,7 +45,7 @@ impl Beatmap {
beatmapset_id: set.mapset_id as u64, beatmapset_id: set.mapset_id as u64,
creator: set.creator_name.clone().into_string(), creator: set.creator_name.clone().into_string(),
creator_id: set.creator_id as u64, creator_id: set.creator_id as u64,
source: Some(set.source.clone()).filter(|s| s != "").clone(), source: Some(set.source.clone()).filter(|s| !s.is_empty()).clone(),
genre: set.genre.map(|v| v.into()).unwrap_or(Genre::Unspecified), genre: set.genre.map(|v| v.into()).unwrap_or(Genre::Unspecified),
language: set.language.map(|v| v.into()).unwrap_or(Language::Any), language: set.language.map(|v| v.into()).unwrap_or(Language::Any),
tags: set.tags.split(", ").map(|v| v.to_owned()).collect(), tags: set.tags.split(", ").map(|v| v.to_owned()).collect(),