diff options
| author | Zeyla Hellyer <[email protected]> | 2017-04-17 20:25:15 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-04-19 14:53:32 -0700 |
| commit | d1a0dbf6cc63c332694b765cecc5cb02f517a8b1 (patch) | |
| tree | fd94c7b07237d53d2642c43b9043964575f81a85 /src | |
| parent | Fix an unused use on non-cache (diff) | |
| download | serenity-d1a0dbf6cc63c332694b765cecc5cb02f517a8b1.tar.xz serenity-d1a0dbf6cc63c332694b765cecc5cb02f517a8b1.zip | |
Remove ChannelPinsAck/MessageAck events
These events are mostly only userbot events and were leftover from
userbot support.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/dispatch.rs | 7 | ||||
| -rw-r--r-- | src/client/event_store.rs | 2 | ||||
| -rw-r--r-- | src/client/mod.rs | 20 | ||||
| -rw-r--r-- | src/model/event.rs | 14 |
4 files changed, 0 insertions, 43 deletions
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs index 45ac378..cea3ed3 100644 --- a/src/client/dispatch.rs +++ b/src/client/dispatch.rs @@ -141,13 +141,6 @@ fn handle_event(event: Event, update!(update_with_channel_delete, event); } }, - Event::ChannelPinsAck(event) => { - if let Some(handler) = handler!(on_channel_pins_ack, event_store) { - let context = context(Some(event.channel_id), conn, data); - - thread::spawn(move || (handler)(context, event)); - } - }, Event::ChannelPinsUpdate(event) => { if let Some(handler) = handler!(on_channel_pins_update, event_store) { let context = context(Some(event.channel_id), conn, data); diff --git a/src/client/event_store.rs b/src/client/event_store.rs index f3767a1..6c3af57 100644 --- a/src/client/event_store.rs +++ b/src/client/event_store.rs @@ -31,7 +31,6 @@ use std::sync::RwLock; pub struct EventStore { pub on_channel_create: Option<Arc<Fn(Context, Channel) + Send + Sync + 'static>>, pub on_channel_delete: Option<Arc<Fn(Context, Channel) + Send + Sync + 'static>>, - pub on_channel_pins_ack: Option<Arc<Fn(Context, ChannelPinsAckEvent) + Send + Sync + 'static>>, pub on_channel_pins_update: Option<Arc<Fn(Context, ChannelPinsUpdateEvent) + Send + Sync + 'static>>, pub on_channel_recipient_addition: Option<Arc<Fn(Context, ChannelId, User) + Send + Sync + 'static>>, pub on_channel_recipient_removal: Option<Arc<Fn(Context, ChannelId, User) + Send + Sync + 'static>>, @@ -73,7 +72,6 @@ pub struct EventStore { #[cfg(not(feature="cache"))] pub on_guild_update: Option<Arc<Fn(Context, PartialGuild) + Send + Sync + 'static>>, pub on_message: Option<Arc<Fn(Context, Message) + Send + Sync + 'static>>, - pub on_message_ack: Option<Arc<Fn(Context, ChannelId, Option<MessageId>) + Send + Sync + 'static>>, pub on_message_delete: Option<Arc<Fn(Context, ChannelId, MessageId) + Send + Sync + 'static>>, pub on_message_delete_bulk: Option<Arc<Fn(Context, ChannelId, Vec<MessageId>) + Send + Sync + 'static>>, pub on_reaction_add: Option<Arc<Fn(Context, Reaction) + Send + Sync + 'static>>, diff --git a/src/client/mod.rs b/src/client/mod.rs index 50e0451..d40792b 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -331,16 +331,6 @@ impl Client { .on_channel_delete = Some(Arc::new(handler)); } - /// Attaches a handler for when a [`ChannelPinsAck`] is received. - /// - /// [`ChannelPinsAck`]: ../model/event/enum.Event.html#variant.ChannelPinsAck - pub fn on_channel_pins_ack<F>(&mut self, handler: F) - where F: Fn(Context, ChannelPinsAckEvent) + Send + Sync + 'static { - self.event_store.write() - .unwrap() - .on_channel_pins_ack = Some(Arc::new(handler)); - } - /// Attaches a handler for when a [`ChannelPinsUpdate`] is received. /// /// [`ChannelPinsUpdate`]: ../model/event/enum.Event.html#variant.ChannelPinsUpdate @@ -470,16 +460,6 @@ impl Client { .on_message = Some(Arc::new(handler)); } - /// Attaches a handler for when a [`MessageAck`] is received. - /// - /// [`MessageAck`]: ../model/event/enum.Event.html#variant.MessageAck - pub fn on_message_ack<F>(&mut self, handler: F) - where F: Fn(Context, ChannelId, Option<MessageId>) + Send + Sync + 'static { - self.event_store.write() - .unwrap() - .on_message_ack = Some(Arc::new(handler)); - } - /// Attaches a handler for when a [`MessageDelete`] is received. /// /// [`MessageDelete`]: ../model/event/enum.Event.html#variant.MessageDelete diff --git a/src/model/event.rs b/src/model/event.rs index db5a7c7..f206a07 100644 --- a/src/model/event.rs +++ b/src/model/event.rs @@ -48,12 +48,6 @@ impl Deserialize for ChannelDeleteEvent { } #[derive(Clone, Debug, Deserialize)] -pub struct ChannelPinsAckEvent { - pub channel_id: ChannelId, - pub timestamp: String, -} - -#[derive(Clone, Debug, Deserialize)] pub struct ChannelPinsUpdateEvent { pub channel_id: ChannelId, pub last_pin_timestamp: Option<String>, @@ -531,13 +525,6 @@ pub enum Event { /// /// [`Channel`]: ../enum.Channel.html ChannelDelete(ChannelDeleteEvent), - /// The pins for a [`Channel`] have been acked. - /// - /// Fires the [`Client::on_channel_pins_ack`] event. - /// - /// [`Channel`]: ../enum.Channel.html - /// [`Client::on_channel_pins_ack`]: ../../client/struct.Client.html#on_channel_pins_ack - ChannelPinsAck(ChannelPinsAckEvent), /// The pins for a [`Channel`] have been updated. /// /// Fires the [`Client::on_channel_pins_update`] event. @@ -641,7 +628,6 @@ impl Event { Ok(match &kind[..] { "CHANNEL_CREATE" => Event::ChannelCreate(ChannelCreateEvent::deserialize(value)?), "CHANNEL_DELETE" => Event::ChannelDelete(ChannelDeleteEvent::deserialize(value)?), - "CHANNEL_PINS_ACK" => Event::ChannelPinsAck(ChannelPinsAckEvent::deserialize(value)?), "CHANNEL_PINS_UPDATE" => Event::ChannelPinsUpdate(ChannelPinsUpdateEvent::deserialize(value)?), "CHANNEL_RECIPIENT_ADD" => Event::ChannelRecipientAdd(ChannelRecipientAddEvent::deserialize(value)?), "CHANNEL_RECIPIENT_REMOVE" => Event::ChannelRecipientRemove(ChannelRecipientRemoveEvent::deserialize(value)?), |