From 9c5caa3a5fa98b2f1f920d6285051ba2c9407a3a Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 28 Oct 2025 21:27:07 +0000
Subject: [PATCH] Move appservice request unit from sender to appservice.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/service/appservice/mod.rs                                | 2 ++
 src/service/{sending/appservice.rs => appservice/request.rs} | 0
 src/service/pusher/send.rs                                   | 4 ++--
 src/service/sending/mod.rs                                   | 3 +--
 src/service/sending/sender.rs                                | 5 ++---
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/service/{sending/appservice.rs => appservice/request.rs} (100%)

diff --git a/src/service/appservice/mod.rs b/src/service/appservice/mod.rs
index 24382ca3..08b79f3a 100644
--- a/src/service/appservice/mod.rs
+++ b/src/service/appservice/mod.rs
@@ -1,6 +1,7 @@
 mod append;
 mod namespace_regex;
 mod registration_info;
+pub(crate) mod request;
 
 use std::{
 	collections::{BTreeMap, HashSet},
@@ -15,6 +16,7 @@ use tokio::sync::{RwLock, RwLockReadGuard};
 use tuwunel_core::{Err, Result, debug, err, utils::stream::IterStream};
 use tuwunel_database::Map;
 
+pub(crate) use self::request::send_request;
 pub use self::{namespace_regex::NamespaceRegex, registration_info::RegistrationInfo};
 
 pub struct Service {
diff --git a/src/service/sending/appservice.rs b/src/service/appservice/request.rs
similarity index 100%
rename from src/service/sending/appservice.rs
rename to src/service/appservice/request.rs
diff --git a/src/service/pusher/send.rs b/src/service/pusher/send.rs
index f746c2df..ab29e716 100644
--- a/src/service/pusher/send.rs
+++ b/src/service/pusher/send.rs
@@ -57,9 +57,9 @@ where
 		};
 
 		if notify.is_some() {
-			return Err!(Database(
+			return Err!(Request(BadJson(
 				r#"Malformed pushrule contains more than one of these actions: ["dont_notify", "notify", "coalesce"]"#
-			));
+			)));
 		}
 
 		notify = Some(n);
diff --git a/src/service/sending/mod.rs b/src/service/sending/mod.rs
index d998d063..8ece9b11 100644
--- a/src/service/sending/mod.rs
+++ b/src/service/sending/mod.rs
@@ -1,4 +1,3 @@
-mod appservice;
 mod data;
 mod dest;
 mod sender;
@@ -29,7 +28,7 @@ pub use self::{
 	dest::Destination,
 	sender::{EDU_LIMIT, PDU_LIMIT},
 };
-use crate::rooms::timeline::RawPduId;
+use crate::{appservice, rooms::timeline::RawPduId};
 
 pub struct Service {
 	pub db: Data,
diff --git a/src/service/sending/sender.rs b/src/service/sending/sender.rs
index 480b2f1a..a5bc9a26 100644
--- a/src/service/sending/sender.rs
+++ b/src/service/sending/sender.rs
@@ -50,9 +50,8 @@ use tuwunel_core::{
 	warn,
 };
 
-use super::{
-	Destination, EduBuf, EduVec, Msg, SendingEvent, Service, appservice, data::QueueItem,
-};
+use super::{Destination, EduBuf, EduVec, Msg, SendingEvent, Service, data::QueueItem};
+use crate::appservice;
 
 #[derive(Debug)]
 enum TransactionStatus {