aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2018-09-13 10:16:08 -0700
committerZeyla Hellyer <[email protected]>2018-09-13 10:17:04 -0700
commit60f84c687f7e58329f4df9722738be06e9b3bbc4 (patch)
tree5ef72acab9edd482ae0cae22684b2f3435a98456 /src/client
parentAdd tests for help (#387) (diff)
downloadserenity-60f84c687f7e58329f4df9722738be06e9b3bbc4.tar.xz
serenity-60f84c687f7e58329f4df9722738be06e9b3bbc4.zip
Revert "Old message on update (#368)"
This reverts commit 27ccf2c9c8ce785b54595eaabcebf86db07bf5bc.
Diffstat (limited to 'src/client')
-rw-r--r--src/client/dispatch.rs11
-rw-r--r--src/client/event_handler.rs17
2 files changed, 7 insertions, 21 deletions
diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs
index e201852..3e3bcfa 100644
--- a/src/client/dispatch.rs
+++ b/src/client/dispatch.rs
@@ -497,20 +497,13 @@ fn handle_event<H: EventHandler + Send + Sync + 'static>(
});
},
DispatchEvent::Model(Event::MessageUpdate(mut event)) => {
- let _before = update!(event);
+ update!(event);
let context = context(data, runner_tx, shard_id);
let event_handler = Arc::clone(event_handler);
threadpool.execute(move || {
- feature_cache! {{
- let after = CACHE.read().message(event.channel_id, event.id);
- if let Some(after) = after {
- event_handler.message_update(context, _before, after);
- }
- } else {
- event_handler.message_update(context, event);
- }}
+ event_handler.message_update(context, event);
});
},
DispatchEvent::Model(Event::PresencesReplace(mut event)) => {
diff --git a/src/client/event_handler.rs b/src/client/event_handler.rs
index 5af7314..32fdaa1 100644
--- a/src/client/event_handler.rs
+++ b/src/client/event_handler.rs
@@ -212,18 +212,6 @@ pub trait EventHandler {
/// Provides the channel's id and the deleted messages' ids.
fn message_delete_bulk(&self, _ctx: Context, _channel_id: ChannelId, _multiple_deleted_messages_ids: Vec<MessageId>) {}
- /// Dispatched when a message is updated.
- ///
- /// Provides the old message if available and the new message.
- #[cfg(feature = "cache")]
- fn message_update(&self, _ctx: Context, _old_if_available: Option<Message>, _new: Message) {}
-
- /// Dispatched when a message is updated.
- ///
- /// Provides the new data of the message.
- #[cfg(not(feature = "cache"))]
- fn message_update(&self, _ctx: Context, _new_data: MessageUpdateEvent) {}
-
/// Dispatched when a new reaction is attached to a message.
///
/// Provides the reaction's data.
@@ -239,6 +227,11 @@ pub trait EventHandler {
/// Provides the channel's id and the message's id.
fn reaction_remove_all(&self, _ctx: Context, _channel_id: ChannelId, _removed_from_message_id: MessageId) {}
+ /// Dispatched when a message is updated.
+ ///
+ /// Provides the new data of the message.
+ fn message_update(&self, _ctx: Context, _new_data: MessageUpdateEvent) {}
+
fn presence_replace(&self, _ctx: Context, _: Vec<Presence>) {}
/// Dispatched when a user's presence is updated (e.g off -> on).