servers, channels, roles, invites, etc. #9

Merged
radical merged 34 commits from wip/messaging into main 2025-05-18 18:13:39 +00:00
6 changed files with 16 additions and 16 deletions
Showing only changes of commit b499ff1cf8 - Show all commits

View file

@ -13,7 +13,7 @@ struct ChannelInfo {
} }
#[get("{uuid}/channels")] #[get("{uuid}/channels")]
pub async fn response(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers);
@ -63,7 +63,7 @@ pub async fn response(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Dat
} }
#[post("{uuid}/channels")] #[post("{uuid}/channels")]
pub async fn response_post(req: HttpRequest, channel_info: web::Json<ChannelInfo>, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn create(req: HttpRequest, channel_info: web::Json<ChannelInfo>, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers);

View file

@ -11,7 +11,7 @@ struct MessageRequest {
} }
#[get("{uuid}/channels/{channel_uuid}/messages")] #[get("{uuid}/channels/{channel_uuid}/messages")]
pub async fn res(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, message_request: web::Json<MessageRequest>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, message_request: web::Json<MessageRequest>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers);

View file

@ -10,7 +10,7 @@ struct InviteRequest {
} }
#[get("{uuid}/invites")] #[get("{uuid}/invites")]
pub async fn get_invites(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers);
@ -53,7 +53,7 @@ pub async fn get_invites(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::
} }
#[post("{uuid}/invites")] #[post("{uuid}/invites")]
pub async fn create_invite(req: HttpRequest, path: web::Path<(Uuid,)>, invite_request: web::Json<Option<InviteRequest>>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn create(req: HttpRequest, path: web::Path<(Uuid,)>, invite_request: web::Json<Option<InviteRequest>>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers);

View file

@ -12,18 +12,18 @@ pub fn web() -> Scope {
// Servers // Servers
.service(res) .service(res)
// Channels // Channels
.service(channels::response) .service(channels::get)
.service(channels::response_post) .service(channels::create)
.service(channels::uuid::get) .service(channels::uuid::get)
.service(channels::uuid::delete) .service(channels::uuid::delete)
.service(channels::uuid::messages::res) .service(channels::uuid::messages::get)
// Roles // Roles
.service(roles::response) .service(roles::get)
.service(roles::response_post) .service(roles::create)
.service(roles::uuid::res) .service(roles::uuid::get)
// Invites // Invites
.service(invites::get_invites) .service(invites::get)
.service(invites::create_invite) .service(invites::create)
} }
#[get("/{uuid}")] #[get("/{uuid}")]

View file

@ -12,7 +12,7 @@ struct RoleInfo {
} }
#[get("{uuid}/roles")] #[get("{uuid}/roles")]
pub async fn response(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers);
@ -62,7 +62,7 @@ pub async fn response(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Dat
} }
#[post("{uuid}/roles")] #[post("{uuid}/roles")]
pub async fn response_post(req: HttpRequest, role_info: web::Json<RoleInfo>, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn create(req: HttpRequest, role_info: web::Json<RoleInfo>, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers);

View file

@ -4,7 +4,7 @@ use ::uuid::Uuid;
use log::error; use log::error;
#[get("{uuid}/roles/{role_uuid}")] #[get("{uuid}/roles/{role_uuid}")]
pub async fn res(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Data<Data>) -> Result<HttpResponse, Error> { pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers);