diff --git a/src/api/v1/servers/uuid/channels/mod.rs b/src/api/v1/servers/uuid/channels/mod.rs index 3786151..163234b 100644 --- a/src/api/v1/servers/uuid/channels/mod.rs +++ b/src/api/v1/servers/uuid/channels/mod.rs @@ -25,7 +25,7 @@ struct Channel { impl Channel { async fn fetch_all(pool: &Pool, guild_uuid: Uuid) -> Result, HttpResponse> { - let row = sqlx::query_as(&format!("SELECT uuid, name, description FROM channels WHERE guild_uuid = '{}'", guild_uuid)) + let row = sqlx::query_as(&format!("SELECT CAST(uuid AS VARCHAR), name, description FROM channels WHERE guild_uuid = '{}'", guild_uuid)) .fetch_all(pool) .await; @@ -40,7 +40,7 @@ impl Channel { let futures = channels.iter().map(async |t| { let (uuid, name, description) = t.to_owned(); - let row = sqlx::query_as(&format!("SELECT role_uuid, permissions FROM channel_permissions WHERE channel_uuid = '{}'", uuid)) + let row = sqlx::query_as(&format!("SELECT CAST(role_uuid AS VARCHAR), permissions FROM channel_permissions WHERE channel_uuid = '{}'", uuid)) .fetch_all(pool) .await; diff --git a/src/api/v1/servers/uuid/mod.rs b/src/api/v1/servers/uuid/mod.rs index e85016a..8e04721 100644 --- a/src/api/v1/servers/uuid/mod.rs +++ b/src/api/v1/servers/uuid/mod.rs @@ -30,12 +30,13 @@ struct Role { } pub fn web() -> Scope { - web::scope("/") - .service(res) + web::scope("") .service(channels::response) + .service(res) + } -#[get("{uuid}")] +#[get("/{uuid}")] pub async fn res(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data) -> Result { let headers = req.headers();