From 81c5f099196dee3c2d561b2827a583e3180bcd30 Mon Sep 17 00:00:00 2001 From: Lambda Date: Sun, 9 Feb 2025 17:55:17 +0000 Subject: [PATCH] service/sending: tiny refactors, NFC --- src/service/sending.rs | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/service/sending.rs b/src/service/sending.rs index 803c9c1c..d940f16b 100644 --- a/src/service/sending.rs +++ b/src/service/sending.rs @@ -576,12 +576,17 @@ impl Service { ) -> Result<()> { let destination = Destination::Push(user.to_owned(), pushkey); let event_type = SendingEventType::Pdu(pdu_id.to_owned()); - let keys = self.db.queue_requests(&[(&destination, &event_type)])?; + let key = self + .db + .queue_requests(&[(&destination, &event_type)])? + .into_iter() + .next() + .unwrap(); self.sender .send(RequestData { destination, event_type, - key: keys.into_iter().next().unwrap(), + key, requester_span: Span::current(), }) .unwrap(); @@ -630,12 +635,17 @@ impl Service { ) -> Result<()> { let destination = Destination::Normal(server.to_owned()); let event_type = SendingEventType::Edu(serialized); - let keys = self.db.queue_requests(&[(&destination, &event_type)])?; + let key = self + .db + .queue_requests(&[(&destination, &event_type)])? + .into_iter() + .next() + .unwrap(); self.sender .send(RequestData { destination, event_type, - key: keys.into_iter().next().unwrap(), + key, requester_span: Span::current(), }) .unwrap(); @@ -651,12 +661,17 @@ impl Service { ) -> Result<()> { let destination = Destination::Appservice(appservice_id); let event_type = SendingEventType::Pdu(pdu_id); - let keys = self.db.queue_requests(&[(&destination, &event_type)])?; + let key = self + .db + .queue_requests(&[(&destination, &event_type)])? + .into_iter() + .next() + .unwrap(); self.sender .send(RequestData { destination, event_type, - key: keys.into_iter().next().unwrap(), + key, requester_span: Span::current(), }) .unwrap();