aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAustin Hellyer <[email protected]>2017-01-09 15:02:05 -0800
committerAustin Hellyer <[email protected]>2017-01-09 15:02:05 -0800
commitc2e8b69702cf81a1cf149c420aec999124f398e2 (patch)
treed76b3334d6fba3c13a85e2ed94f580ffbbe07412 /src
parentAdd note about CurrentUser.mobile (diff)
downloadserenity-c2e8b69702cf81a1cf149c420aec999124f398e2.tar.xz
serenity-c2e8b69702cf81a1cf149c420aec999124f398e2.zip
Fix a payload decode
Resume doesn't have a heartbeat_interval, so don't try to decode it.
Diffstat (limited to 'src')
-rw-r--r--src/client/gateway/shard.rs7
-rw-r--r--src/model/event.rs2
2 files changed, 1 insertions, 8 deletions
diff --git a/src/client/gateway/shard.rs b/src/client/gateway/shard.rs
index e564538..0a71a6c 100644
--- a/src/client/gateway/shard.rs
+++ b/src/client/gateway/shard.rs
@@ -494,13 +494,8 @@ impl Shard {
let _ = self.keepalive_channel.send(GatewayStatus::SendMessage(msg));
}
+ #[allow(unused_variables)]
fn handle_dispatch(&mut self, event: &Event) {
- if let Event::Resumed(ref ev) = *event {
- let status = GatewayStatus::Interval(ev.heartbeat_interval);
-
- let _ = self.keepalive_channel.send(status);
- }
-
#[cfg(feature="voice")]
{
if let Event::VoiceStateUpdate(ref update) = *event {
diff --git a/src/model/event.rs b/src/model/event.rs
index 2831d2b..5ee36fb 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -720,7 +720,6 @@ impl RelationshipRemoveEvent {
#[derive(Clone, Debug)]
pub struct ResumedEvent {
- pub heartbeat_interval: u64,
pub trace: Vec<Option<String>>,
}
@@ -729,7 +728,6 @@ impl ResumedEvent {
#[inline]
pub fn decode(mut map: Map) -> Result<Self> {
Ok(ResumedEvent {
- heartbeat_interval: req!(remove(&mut map, "heartbeat_interval")?.as_u64()),
trace: remove(&mut map, "_trace").and_then(|v| decode_array(v, |v| Ok(into_string(v).ok())))?,
})
}