add some accessors to Ar for common patterns

Signed-off-by: Jason Volk <jason@zemos.net>

src/api/router/args.rs

@@ -3,17 +3,14 @@ use std::{mem, ops::Deref};
 use axum::{async_trait, body::Body, extract::FromRequest};
 use bytes::{BufMut, BytesMut};
 use conduit::{debug, err, trace, utils::string::EMPTY, Error, Result};
-use ruma::{api::IncomingRequest, CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId};
+use ruma::{api::IncomingRequest, CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, ServerName, UserId};
 use service::Services;
 
 use super::{auth, auth::Auth, request, request::Request};
 use crate::{service::appservice::RegistrationInfo, State};
 
 /// Extractor for Ruma request structs
-pub(crate) struct Args<T>
-where
-	T: IncomingRequest + Send + Sync + 'static,
-{
+pub(crate) struct Args<T> {
 	/// Request struct body
 	pub(crate) body: T,
 
@@ -38,6 +35,17 @@ where
 	pub(crate) json_body: Option<CanonicalJsonValue>,
 }
 
+impl<T> Args<T>
+where
+	T: IncomingRequest + Send + Sync + 'static,
+{
+	#[inline]
+	pub(crate) fn sender_user(&self) -> &UserId { self.sender_user.as_deref().expect("user is authenticated") }
+
+	#[inline]
+	pub(crate) fn origin(&self) -> &ServerName { self.origin.as_deref().expect("server is authenticated") }
+}
+
 #[async_trait]
 impl<T> FromRequest<State, Body> for Args<T>
 where

src/api/router/handler.rs

@@ -38,7 +38,7 @@ macro_rules! ruma_handler {
 		where
 			Fun: Fn($($tx,)* Ruma<Req>,) -> Fut + Send + Sync + 'static,
 			Fut: Future<Output = Result<Req::OutgoingResponse, Err>> + Send,
-			Req: IncomingRequest + Send + Sync,
+			Req: IncomingRequest + Send + Sync + 'static,
 			Err: IntoResponse + Send,
 			<Req as IncomingRequest>::OutgoingResponse: Send,
 			$( $tx: FromRequestParts<State> + Send + Sync + 'static, )*