blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-05-01 08:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix missed JSON error response and simplify

Browse source
This commit is contained in:
oxalica 2024-09-03 20:55:31 -04:00
parent 4e78780569
commit 236fb61832
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
blahd/src/main.rs
View file

@ -10,7 +10,7 @@ use axum::http::{header, StatusCode};
use axum::response::{IntoResponse, Response}; use axum::response::{IntoResponse, Response};
use axum::routing::{get, post}; use axum::routing::{get, post};
use axum::{Json, Router}; use axum::{Json, Router};
use axum_extra::extract::WithRejection; use axum_extra::extract::WithRejection as R;
use blah::types::{ use blah::types::{
ChatItem, ChatPayload, CreateRoomPayload, MemberPermission, RoomAdminOp, RoomAdminPayload, ChatItem, ChatPayload, CreateRoomPayload, MemberPermission, RoomAdminOp, RoomAdminPayload,
RoomAttrs, ServerPermission, Signee, UserKey, WithSig, RoomAttrs, ServerPermission, Signee, UserKey, WithSig,
@ -171,6 +171,8 @@ async fn main_async(st: AppState) -> Result<()> {
Ok(()) Ok(())
} }
type RE<T> = R<T, ApiError>;
async fn handle_ws(State(st): ArcState, ws: WebSocketUpgrade) -> Response { async fn handle_ws(State(st): ArcState, ws: WebSocketUpgrade) -> Response {
ws.on_upgrade(move |mut socket| async move { ws.on_upgrade(move |mut socket| async move {
match event::handle_ws(st, &mut socket).await { match event::handle_ws(st, &mut socket).await {
@ -215,7 +217,7 @@ enum ListRoomFilter {
async fn room_list( async fn room_list(
st: ArcState, st: ArcState,
WithRejection(params, _): WithRejection<Query<ListRoomParams>, ApiError>, params: RE<Query<ListRoomParams>>,
auth: MaybeAuth, auth: MaybeAuth,
) -> Result<Json<RoomList>, ApiError> { ) -> Result<Json<RoomList>, ApiError> {
let pagination = Pagination { let pagination = Pagination {
@ -430,8 +432,8 @@ struct RoomItems {
async fn room_get_item( async fn room_get_item(
st: ArcState, st: ArcState,
WithRejection(Path(ruuid), _): WithRejection<Path<Uuid>, ApiError>, R(Path(ruuid), _): RE<Path<Uuid>>,
WithRejection(Query(pagination), _): WithRejection<Query<Pagination>, ApiError>, R(Query(pagination), _): RE<Query<Pagination>>,
auth: MaybeAuth, auth: MaybeAuth,
) -> Result<Json<RoomItems>, ApiError> { ) -> Result<Json<RoomItems>, ApiError> {
let (items, skip_token) = { let (items, skip_token) = {
@ -448,7 +450,7 @@ async fn room_get_item(
async fn room_get_metadata( async fn room_get_metadata(
st: ArcState, st: ArcState,
WithRejection(Path(ruuid), _): WithRejection<Path<Uuid>, ApiError>, R(Path(ruuid), _): RE<Path<Uuid>>,
auth: MaybeAuth, auth: MaybeAuth,
) -> Result<Json<RoomMetadata>, ApiError> { ) -> Result<Json<RoomMetadata>, ApiError> {
let (title, attrs) = let (title, attrs) =
@ -469,8 +471,8 @@ async fn room_get_metadata(
async fn room_get_feed( async fn room_get_feed(
st: ArcState, st: ArcState,
WithRejection(Path(ruuid), _): WithRejection<Path<Uuid>, ApiError>, R(Path(ruuid), _): RE<Path<Uuid>>,
Query(pagination): Query<Pagination>, R(Query(pagination), _): RE<Query<Pagination>>,
) -> Result<impl IntoResponse, ApiError> { ) -> Result<impl IntoResponse, ApiError> {
let title; let title;
let (items, skip_token) = { let (items, skip_token) = {
@ -665,7 +667,7 @@ fn query_room_items(
async fn room_post_item( async fn room_post_item(
st: ArcState, st: ArcState,
Path(ruuid): Path<Uuid>, R(Path(ruuid), _): RE<Path<Uuid>>,
SignedJson(chat): SignedJson<ChatPayload>, SignedJson(chat): SignedJson<ChatPayload>,
) -> Result<Json<u64>, ApiError> { ) -> Result<Json<u64>, ApiError> {
if ruuid != chat.signee.payload.room { if ruuid != chat.signee.payload.room {
@ -757,7 +759,7 @@ async fn room_post_item(
async fn room_admin( async fn room_admin(
st: ArcState, st: ArcState,
Path(ruuid): Path<Uuid>, R(Path(ruuid), _): RE<Path<Uuid>>,
SignedJson(op): SignedJson<RoomAdminPayload>, SignedJson(op): SignedJson<RoomAdminPayload>,
) -> Result<StatusCode, ApiError> { ) -> Result<StatusCode, ApiError> {
if ruuid != op.signee.payload.room { if ruuid != op.signee.payload.room {