From 0f217a6279181b0731216760219e8ff0fa01e449 Mon Sep 17 00:00:00 2001 From: Joscha Date: Sat, 8 Apr 2023 20:22:16 +0200 Subject: [PATCH] Fix euph errors always turning into `conn::Error`s --- CHANGELOG.md | 1 + src/conn.rs | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee635f7..83728c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ Procedure when bumping the version number: - **(breaking)** Deserializing empty events and replies by turning unit structs into empty structs - `phone` and `mobile` emoji - Instances getting stuck in "Connecting" state +- Euph errors always turning into `conn::Error`s ## v0.3.1 - 2023-02-26 diff --git a/src/conn.rs b/src/conn.rs index 2a5325b..92d083c 100644 --- a/src/conn.rs +++ b/src/conn.rs @@ -444,10 +444,11 @@ impl Conn { self.replies.complete(id, packet.clone()); } - match &packet.content { - Ok(data) => self.on_data(&packet.id, data).await, - Err(msg) => Err(Error::Euph(msg.clone())), + if let Ok(data) = &packet.content { + self.on_data(&packet.id, data).await?; } + + Ok(()) } async fn on_data(&mut self, id: &Option, data: &Data) -> Result<()> {