magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Revert "prevent empty transactions from going out""

Browse source 
This reverts commit bb43351658.
This commit is contained in:
Jason Volk 2024-04-22 22:42:43 -07:00 • committed by June
parent c57601a4b8
commit d19573c7b5
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/service/sending/mod.rs
View file

@ -348,7 +348,11 @@ impl Service {
vec![(event, key)], vec![(event, key)],
&mut current_transaction_status, &mut current_transaction_status,
) { ) {
futures.push(send_events(dest, events)); if !events.is_empty() {
futures.push(send_events(dest, events));
} else {
current_transaction_status.remove(&dest);
}
} }
} }
} }
@ -596,6 +600,7 @@ pub(crate) fn select_edus_receipts(
} }
async fn send_events(dest: Destination, events: Vec<SendingEventType>) -> Result<Destination, (Destination, Error)> { async fn send_events(dest: Destination, events: Vec<SendingEventType>) -> Result<Destination, (Destination, Error)> {
debug_assert!(!events.is_empty(), "sending empty transaction");
match dest { match dest {
Destination::Normal(ref server) => send_events_dest_normal(&dest, server, events).await, Destination::Normal(ref server) => send_events_dest_normal(&dest, server, events).await,
Destination::Appservice(ref id) => send_events_dest_appservice(&dest, id, events).await, Destination::Appservice(ref id) => send_events_dest_appservice(&dest, id, events).await,
@ -636,6 +641,7 @@ async fn send_events_dest_appservice(
let permit = services().sending.maximum_requests.acquire().await; let permit = services().sending.maximum_requests.acquire().await;
debug_assert!(!pdu_jsons.is_empty(), "sending empty transaction");
let response = match appservice::send_request( let response = match appservice::send_request(
services() services()
.appservice .appservice
@ -795,6 +801,7 @@ async fn send_events_dest_normal(
let permit = services().sending.maximum_requests.acquire().await; let permit = services().sending.maximum_requests.acquire().await;
let client = &services().globals.client.sender; let client = &services().globals.client.sender;
debug_assert!(pdu_jsons.len() + edu_jsons.len() > 0, "sending empty transaction");
let response = send::send( let response = send::send(
client, client,
server_name, server_name,