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

Clean up voting

Browse source
This commit is contained in:
Natsu Kagami 2019-12-22 20:01:30 -05:00
parent 2a0398b2a0
commit 5f328829c5
1 changed files with 34 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
youmubot/src/commands/fun/votes.rs
View file

@ -30,11 +30,8 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
return Ok(());
}
let question = args.single::<String>()?;
let (choices, reactions) = if args.is_empty() {
(
vec!["Yes! 😍".to_owned(), "No! 🤢".to_owned()],
vec!["😍", "🤢"],
)
let choices = if args.is_empty() {
vec![("😍", "Yes! 😍".to_owned()), ("🤢", "No! 🤢".to_owned())]
} else {
let choices: Vec<_> = args.iter().map(|v| v.unwrap()).collect();
if choices.len() < 2 {
@ -57,14 +54,15 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
return Ok(());
}
let reactions = pick_n_reactions(choices.len())?;
(choices, reactions)
pick_n_reactions(choices.len())?
.into_iter()
.zip(choices.into_iter())
.collect()
};
let fields: Vec<_> = {
choices
.iter()
.zip(reactions.iter())
.map(|(choice, reaction)| {
(
MessageBuilder::new().push_bold_safe(choice).build(),
@ -92,12 +90,14 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
})?;
msg.delete(&ctx)?;
// React on all the choices
reactions.iter().try_for_each(|v| panel.react(&ctx, *v))?;
choices
.iter()
.try_for_each(|(v, _)| panel.react(&ctx, *v))?;
// Start sleeping
thread::sleep(duration.to_std()?);
let result = collect_reactions(ctx, panel, &reactions, &choices)?;
let result = collect_reactions(ctx, &panel, &choices)?;
if result.len() == 0 {
msg.reply(
&ctx,
@ -136,7 +136,7 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
})
})?;
}
msg.delete(&ctx)?;
panel.delete(&ctx)?;
Ok(())
// unimplemented!();
@ -145,17 +145,12 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
// Collect reactions and store them as a map from choice to
fn collect_reactions<'a>(
ctx: &mut Context,
msg: Message,
reaction_emojis: &[&'static str],
choices: &'a [String],
msg: &Message,
choices: &'a [(&'static str, String)],
) -> Result<Vec<(&'a str, Vec<UserId>)>, Error> {
// Get a brand new version of the Message
let reactions = msg.channel_id.message(&ctx, msg.id)?.reactions;
let reaction_to_choice: Map<_, _> = reaction_emojis
.into_iter()
.zip(choices.into_iter())
.collect();
let result: Result<Vec<_>, Error> = {
let reaction_to_choice: Map<_, _> = choices.into_iter().map(|r| (r.0, &r.1)).collect();
let mut vec: Vec<(&str, Vec<UserId>)> = Vec::new();
reactions
.into_iter()
@ -177,9 +172,6 @@ fn collect_reactions<'a>(
})?;
vec.sort_by(|(_, b): &(_, Vec<_>), (_, d)| d.len().cmp(&b.len()));
Ok(vec)
};
let result = result?;
Ok(result)
}
fn collect_reaction_users(