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

Fix the emote/choice swap

Browse source
This commit is contained in:
Natsu Kagami 2020-09-02 16:03:22 -04:00
parent d57c02ddf5
commit bfd9d1c68d
No known key found for this signature in database
GPG key ID: F17543D4B9424B94
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
youmubot-core/src/community/votes.rs
View file

@ -65,7 +65,7 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
let fields: Vec<_> = { let fields: Vec<_> = {
choices choices
.iter() .iter()
.map(|(choice, reaction)| { .map(|(reaction, choice)| {
( (
MessageBuilder::new().push_bold_safe(choice).build(), MessageBuilder::new().push_bold_safe(choice).build(),
format!("React with {}", reaction), format!("React with {}", reaction),
@ -94,7 +94,7 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
// React on all the choices // React on all the choices
choices choices
.iter() .iter()
.try_for_each(|(v, _)| panel.react(&ctx, v.clone()))?; .try_for_each(|(emote, _)| panel.react(&ctx, &emote[..]))?;
// A handler for votes. // A handler for votes.
struct VoteHandler { struct VoteHandler {
@ -112,7 +112,7 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
msg, msg,
user_reactions: choices user_reactions: choices
.iter() .iter()
.map(|(v, _)| (v.clone(), Set::new())) .map(|(emote, _)| (emote.clone(), Set::new()))
.collect(), .collect(),
panel, panel,
} }
@ -153,10 +153,11 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
move |vh| { move |vh| {
let (ctx, msg, user_reactions, panel) = let (ctx, msg, user_reactions, panel) =
(vh.ctx, vh.msg, vh.user_reactions, vh.panel); (vh.ctx, vh.msg, vh.user_reactions, vh.panel);
let choice_map = choices.into_iter().collect::<Map<_, _>>();
let result: Vec<(String, Vec<UserId>)> = user_reactions let result: Vec<(String, Vec<UserId>)> = user_reactions
.into_iter() .into_iter()
.filter(|(_, users)| !users.is_empty()) .filter(|(_, users)| !users.is_empty())
.map(|(choice, users)| (choice, users.into_iter().collect())) .map(|(emote, users)| (emote, users.into_iter().collect()))
.collect(); .collect();
if result.len() == 0 { if result.len() == 0 {
@ -180,16 +181,18 @@ pub fn vote(ctx: &mut Context, msg: &Message, mut args: Args) -> CommandResult {
.push(" previously asked ") .push(" previously asked ")
.push_bold_safe(&question) .push_bold_safe(&question)
.push(", and here are the results!"); .push(", and here are the results!");
result.iter().for_each(|(choice, votes)| { result.into_iter().for_each(|(emote, votes)| {
content content
.push("\n - ") .push("\n - ")
.push_bold(format!("{}", votes.len())) .push_bold(format!("{}", votes.len()))
.push(" voted for ") .push(" voted for ")
.push_bold_safe(choice) .push(&emote)
.push(" ")
.push_bold_safe(choice_map.get(&emote).unwrap())
.push(": ") .push(": ")
.push( .push(
votes votes
.iter() .into_iter()
.map(|v| v.mention()) .map(|v| v.mention())
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join(", "), .join(", "),