diff options
| author | Maiddog <[email protected]> | 2017-08-26 17:55:43 -0500 |
|---|---|---|
| committer | alex <[email protected]> | 2017-08-27 00:55:43 +0200 |
| commit | 3e0b1032d80a1847558a752e8316d97f9ae58f04 (patch) | |
| tree | ca65390091cb3c0ab98b6497a1447ba69df3d20d /src/client/dispatch.rs | |
| parent | Use `$crate` for `Args` (diff) | |
| download | serenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.tar.xz serenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.zip | |
Add ability to play DCA and Opus files. (#148)
Diffstat (limited to 'src/client/dispatch.rs')
| -rw-r--r-- | src/client/dispatch.rs | 71 |
1 files changed, 56 insertions, 15 deletions
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs index cb45428..461fe8c 100644 --- a/src/client/dispatch.rs +++ b/src/client/dispatch.rs @@ -62,7 +62,7 @@ pub fn dispatch<H: EventHandler + 'static>(event: Event, framework: &Arc<sync::Mutex<Option<Box<Framework>>>>, data: &Arc<Mutex<ShareMap>>, event_handler: &Arc<H>, -tokio_handle: &Handle){ + tokio_handle: &Handle) { match event { Event::MessageCreate(event) => { let context = context(conn, data); @@ -92,7 +92,7 @@ pub fn dispatch<H: EventHandler + 'static>(event: Event, conn: &Arc<Mutex<Shard>>, data: &Arc<Mutex<ShareMap>>, event_handler: &Arc<H>, -tokio_handle: &Handle){ + tokio_handle: &Handle) { match event { Event::MessageCreate(event) => { let context = context(conn, data); @@ -106,7 +106,7 @@ tokio_handle: &Handle){ fn dispatch_message<H: EventHandler + 'static>(context: Context, mut message: Message, event_handler: &Arc<H>, -tokio_handle: &Handle){ + tokio_handle: &Handle) { let h = event_handler.clone(); tokio_handle.spawn_fn(move || { #[cfg(feature = "model")] @@ -125,7 +125,7 @@ fn handle_event<H: EventHandler + 'static>(event: Event, conn: &Arc<Mutex<Shard>>, data: &Arc<Mutex<ShareMap>>, event_handler: &Arc<H>, -tokio_handle: &Handle){ + tokio_handle: &Handle) { #[cfg(feature="cache")] let mut last_guild_create_time = now!(); @@ -172,7 +172,8 @@ tokio_handle: &Handle){ let context = context(conn, data); match event.channel { - Channel::Private(_) | Channel::Group(_) => {}, + Channel::Private(_) | + Channel::Group(_) => {}, Channel::Guild(channel) => { let h = event_handler.clone(); tokio_handle.spawn_fn(move || { @@ -198,7 +199,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_channel_recipient_addition(context, event.channel_id, event.user); + h.on_channel_recipient_addition( + context, + event.channel_id, + event.user, + ); Ok(()) }); }, @@ -209,7 +214,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_channel_recipient_removal(context, event.channel_id, event.user); + h.on_channel_recipient_removal( + context, + event.channel_id, + event.user, + ); Ok(()) }); }, @@ -323,7 +332,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_guild_emojis_update(context, event.guild_id, event.emojis); + h.on_guild_emojis_update( + context, + event.guild_id, + event.emojis, + ); Ok(()) }); }, @@ -343,7 +356,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_guild_member_addition(context, event.guild_id, event.member); + h.on_guild_member_addition( + context, + event.guild_id, + event.member, + ); Ok(()) }); }, @@ -397,7 +414,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_guild_members_chunk(context, event.guild_id, event.members); + h.on_guild_members_chunk( + context, + event.guild_id, + event.members, + ); Ok(()) }); }, @@ -488,7 +509,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_message_delete_bulk(context, event.channel_id, event.ids); + h.on_message_delete_bulk( + context, + event.channel_id, + event.ids, + ); Ok(()) }); }, @@ -497,7 +522,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_message_delete(context, event.channel_id, event.message_id); + h.on_message_delete( + context, + event.channel_id, + event.message_id, + ); Ok(()) }); }, @@ -553,7 +582,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_reaction_remove_all(context, event.channel_id, event.message_id); + h.on_reaction_remove_all( + context, + event.channel_id, + event.message_id, + ); Ok(()) }); }, @@ -643,7 +676,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_voice_state_update(context, event.guild_id, event.voice_state); + h.on_voice_state_update( + context, + event.guild_id, + event.voice_state, + ); Ok(()) }); }, @@ -652,7 +689,11 @@ tokio_handle: &Handle){ let h = event_handler.clone(); tokio_handle.spawn_fn(move || { - h.on_webhook_update(context, event.guild_id, event.channel_id); + h.on_webhook_update( + context, + event.guild_id, + event.channel_id, + ); Ok(()) }); }, |