gorb/backend
4
0
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

style: cargo fmt

Browse source
This commit is contained in:
Radical 2025-05-19 15:14:03 +02:00
parent c21762ac7e
commit 78e87b65ce
23 changed files with 555 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/mod.rs
View file

@ -5,7 +5,5 @@ mod v1;
mod versions;
pub fn web() -> Scope {
web::scope("/api")
.service(v1::web())
.service(versions::res)
web::scope("/api").service(v1::web()).service(versions::res)
}

12
src/api/v1/auth/login.rs
View file

@ -1,12 +1,14 @@
use std::time::{SystemTime, UNIX_EPOCH};
use actix_web::{post, web, Error, HttpResponse};
use actix_web::{Error, HttpResponse, post, web};
use argon2::{PasswordHash, PasswordVerifier};
use log::error;
use serde::Deserialize;
use crate::{
api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX}, utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
Data,
api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX},
utils::{generate_access_token, generate_refresh_token, refresh_token_cookie},
};
use super::Response;
@ -166,7 +168,7 @@ async fn login(
return HttpResponse::InternalServerError().finish()
}
HttpResponse::Ok().cookie(refresh_token_cookie(refresh_token)).json(Response {
access_token,
})
HttpResponse::Ok()
.cookie(refresh_token_cookie(refresh_token))
.json(Response { access_token })
}

11
src/api/v1/auth/mod.rs
View file

@ -42,11 +42,12 @@ pub async fn check_access_token(
access_token: &str,
pool: &sqlx::Pool<Postgres>,
) -> Result<Uuid, HttpResponse> {
let row =
sqlx::query_as("SELECT CAST(uuid as VARCHAR), created_at FROM access_tokens WHERE token = $1")
.bind(access_token)
.fetch_one(pool)
.await;
let row = sqlx::query_as(
"SELECT CAST(uuid as VARCHAR), created_at FROM access_tokens WHERE token = $1",
)
.bind(access_token)
.fetch_one(pool)
.await;
if let Err(error) = row {
if error.to_string()

61
src/api/v1/auth/refresh.rs
View file

@ -1,9 +1,10 @@
use actix_web::{post, web, Error, HttpRequest, HttpResponse};
use actix_web::{Error, HttpRequest, HttpResponse, post, web};
use log::error;
use std::time::{SystemTime, UNIX_EPOCH};
use crate::{
utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
Data,
utils::{generate_access_token, generate_refresh_token, refresh_token_cookie},
};
use super::Response;
@ -13,7 +14,7 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
let recv_refresh_token_cookie = req.cookie("refresh_token");
if recv_refresh_token_cookie.is_none() {
return Ok(HttpResponse::Unauthorized().finish())
return Ok(HttpResponse::Unauthorized().finish());
}
let mut refresh_token = String::from(recv_refresh_token_cookie.unwrap().value());
@ -23,11 +24,10 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
.unwrap()
.as_secs() as i64;
if let Ok(row) =
sqlx::query_scalar("SELECT created_at FROM refresh_tokens WHERE token = $1")
.bind(&refresh_token)
.fetch_one(&data.pool)
.await
if let Ok(row) = sqlx::query_scalar("SELECT created_at FROM refresh_tokens WHERE token = $1")
.bind(&refresh_token)
.fetch_one(&data.pool)
.await
{
let created_at: i64 = row;
@ -46,7 +46,9 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
refresh_token_cookie.make_removal();
return Ok(HttpResponse::Unauthorized().cookie(refresh_token_cookie).finish());
return Ok(HttpResponse::Unauthorized()
.cookie(refresh_token_cookie)
.finish());
}
let current_time = SystemTime::now()
@ -64,12 +66,14 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
let new_refresh_token = new_refresh_token.unwrap();
match sqlx::query("UPDATE refresh_tokens SET token = $1, created_at = $2 WHERE token = $3")
.bind(&new_refresh_token)
.bind(current_time)
.bind(&refresh_token)
.execute(&data.pool)
.await
match sqlx::query(
"UPDATE refresh_tokens SET token = $1, created_at = $2 WHERE token = $3",
)
.bind(&new_refresh_token)
.bind(current_time)
.bind(&refresh_token)
.execute(&data.pool)
.await
{
Ok(_) => {
refresh_token = new_refresh_token;
@ -89,24 +93,29 @@ pub async fn res(req: HttpRequest, data: web::Data<Data>) -> Result<HttpResponse
let access_token = access_token.unwrap();
if let Err(error) = sqlx::query("UPDATE access_tokens SET token = $1, created_at = $2 WHERE refresh_token = $3")
.bind(&access_token)
.bind(current_time)
.bind(&refresh_token)
.execute(&data.pool)
.await {
if let Err(error) = sqlx::query(
"UPDATE access_tokens SET token = $1, created_at = $2 WHERE refresh_token = $3",
)
.bind(&access_token)
.bind(current_time)
.bind(&refresh_token)
.execute(&data.pool)
.await
{
error!("{}", error);
return Ok(HttpResponse::InternalServerError().finish())
return Ok(HttpResponse::InternalServerError().finish());
}
return Ok(HttpResponse::Ok().cookie(refresh_token_cookie(refresh_token)).json(Response {
access_token,
}));
return Ok(HttpResponse::Ok()
.cookie(refresh_token_cookie(refresh_token))
.json(Response { access_token }));
}
let mut refresh_token_cookie = refresh_token_cookie(refresh_token);
refresh_token_cookie.make_removal();
Ok(HttpResponse::Unauthorized().cookie(refresh_token_cookie).finish())
Ok(HttpResponse::Unauthorized()
.cookie(refresh_token_cookie)
.finish())
}

15
src/api/v1/auth/register.rs
View file

@ -11,7 +11,9 @@ use uuid::Uuid;
use super::Response;
use crate::{
api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX}, utils::{generate_access_token, generate_refresh_token, refresh_token_cookie}, Data
Data,
api::v1::auth::{EMAIL_REGEX, PASSWORD_REGEX, USERNAME_REGEX},
utils::{generate_access_token, generate_refresh_token, refresh_token_cookie},
};
#[derive(Deserialize)]
@ -54,7 +56,10 @@ impl Default for ResponseError {
}
#[post("/register")]
pub async fn res(account_information: web::Json<AccountInformation>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
pub async fn res(
account_information: web::Json<AccountInformation>,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
let uuid = Uuid::now_v7();
if !EMAIL_REGEX.is_match(&account_information.email) {
@ -142,9 +147,9 @@ pub async fn res(account_information: web::Json<AccountInformation>, data: web::
return Ok(HttpResponse::InternalServerError().finish())
}
HttpResponse::Ok().cookie(refresh_token_cookie(refresh_token)).json(Response {
access_token,
})
HttpResponse::Ok()
.cookie(refresh_token_cookie(refresh_token))
.json(Response { access_token })
}
Err(error) => {
let err_msg = error.as_database_error().unwrap().message();

7
src/api/v1/auth/revoke.rs
View file

@ -1,6 +1,6 @@
use actix_web::{Error, HttpRequest, HttpResponse, post, web};
use argon2::{PasswordHash, PasswordVerifier};
use futures::{future};
use futures::future;
use log::error;
use serde::{Deserialize, Serialize};
@ -105,10 +105,7 @@ pub async fn res(
let results = future::join_all(refresh_tokens_delete).await;
let errors: Vec<&Result<sqlx::postgres::PgQueryResult, sqlx::Error>> =
results
.iter()
.filter(|r| r.is_err())
.collect();
results.iter().filter(|r| r.is_err()).collect();
if !errors.is_empty() {
error!("{:?}", errors);

33
src/api/v1/invites/id.rs
View file

@ -1,15 +1,24 @@
use actix_web::{get, post, web, Error, HttpRequest, HttpResponse};
use actix_web::{Error, HttpRequest, HttpResponse, get, post, web};
use crate::{api::v1::auth::check_access_token, structs::{Guild, Invite, Member}, utils::get_auth_header, Data};
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Guild, Invite, Member},
utils::get_auth_header,
};
#[get("{id}")]
pub async fn get(req: HttpRequest, path: web::Path<(String,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
pub async fn get(
req: HttpRequest,
path: web::Path<(String,)>,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let invite_id = path.into_inner().0;
@ -17,7 +26,7 @@ pub async fn get(req: HttpRequest, path: web::Path<(String,)>, data: web::Data<D
let result = Invite::fetch_one(&data.pool, invite_id).await;
if let Err(error) = result {
return Ok(error)
return Ok(error);
}
let invite = result.unwrap();
@ -34,13 +43,17 @@ pub async fn get(req: HttpRequest, path: web::Path<(String,)>, data: web::Data<D
}
#[post("{id}")]
pub async fn join(req: HttpRequest, path: web::Path<(String,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
pub async fn join(
req: HttpRequest,
path: web::Path<(String,)>,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let invite_id = path.into_inner().0;
@ -48,7 +61,7 @@ pub async fn join(req: HttpRequest, path: web::Path<(String,)>, data: web::Data<
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -56,7 +69,7 @@ pub async fn join(req: HttpRequest, path: web::Path<(String,)>, data: web::Data<
let result = Invite::fetch_one(&data.pool, invite_id).await;
if let Err(error) = result {
return Ok(error)
return Ok(error);
}
let invite = result.unwrap();
@ -70,7 +83,7 @@ pub async fn join(req: HttpRequest, path: web::Path<(String,)>, data: web::Data<
let guild = guild_result.unwrap();
let member = Member::new(&data.pool, uuid, guild.uuid).await;
if let Err(error) = member {
return Ok(error);
}

6
src/api/v1/invites/mod.rs
View file

@ -1,9 +1,7 @@
use actix_web::{web, Scope};
use actix_web::{Scope, web};
mod id;
pub fn web() -> Scope {
web::scope("/invites")
.service(id::get)
.service(id::join)
web::scope("/invites").service(id::get).service(id::join)
}

4
src/api/v1/mod.rs
View file

@ -1,10 +1,10 @@
use actix_web::{Scope, web};
mod auth;
mod invites;
mod servers;
mod stats;
mod users;
mod servers;
mod invites;
pub fn web() -> Scope {
web::scope("/v1")

29
src/api/v1/servers/mod.rs
View file

@ -1,9 +1,9 @@
use actix_web::{post, web, Error, HttpRequest, HttpResponse, Scope};
use actix_web::{Error, HttpRequest, HttpResponse, Scope, post, web};
use serde::Deserialize;
mod uuid;
use crate::{api::v1::auth::check_access_token, structs::Guild, utils::get_auth_header, Data};
use crate::{Data, api::v1::auth::check_access_token, structs::Guild, utils::get_auth_header};
#[derive(Deserialize)]
struct GuildInfo {
@ -12,35 +12,42 @@ struct GuildInfo {
}
pub fn web() -> Scope {
web::scope("/servers")
.service(res)
.service(uuid::web())
web::scope("/servers").service(res).service(uuid::web())
}
#[post("")]
pub async fn res(req: HttpRequest, guild_info: web::Json<GuildInfo>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
pub async fn res(
req: HttpRequest,
guild_info: web::Json<GuildInfo>,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
let guild = Guild::new(&data.pool, guild_info.name.clone(), guild_info.description.clone(), uuid).await;
let guild = Guild::new(
&data.pool,
guild_info.name.clone(),
guild_info.description.clone(),
uuid,
)
.await;
if let Err(error) = guild {
return Ok(error)
return Ok(error);
}
Ok(HttpResponse::Ok().json(guild.unwrap()))
}

52
src/api/v1/servers/uuid/channels/mod.rs
View file

@ -1,25 +1,34 @@
use actix_web::{get, post, web, Error, HttpRequest, HttpResponse};
use serde::Deserialize;
use crate::{api::v1::auth::check_access_token, structs::{Channel, Member}, utils::get_auth_header, Data};
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Channel, Member},
utils::get_auth_header,
};
use ::uuid::Uuid;
use actix_web::{Error, HttpRequest, HttpResponse, get, post, web};
use log::error;
use serde::Deserialize;
pub mod uuid;
#[derive(Deserialize)]
struct ChannelInfo {
name: String,
description: Option<String>
description: Option<String>,
}
#[get("{uuid}/channels")]
pub async fn get(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 auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let guild_uuid = path.into_inner().0;
@ -27,7 +36,7 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -41,18 +50,22 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
let cache_result = data.get_cache_key(format!("{}_channels", guild_uuid)).await;
if let Ok(cache_hit) = cache_result {
return Ok(HttpResponse::Ok().content_type("application/json").body(cache_hit))
return Ok(HttpResponse::Ok()
.content_type("application/json")
.body(cache_hit));
}
let channels_result = Channel::fetch_all(&data.pool, guild_uuid).await;
if let Err(error) = channels_result {
return Ok(error)
return Ok(error);
}
let channels = channels_result.unwrap();
let cache_result = data.set_cache_key(format!("{}_channels", guild_uuid), channels.clone(), 1800).await;
let cache_result = data
.set_cache_key(format!("{}_channels", guild_uuid), channels.clone(), 1800)
.await;
if let Err(error) = cache_result {
error!("{}", error);
@ -63,13 +76,18 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
}
#[post("{uuid}/channels")]
pub async fn create(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 auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let guild_uuid = path.into_inner().0;
@ -77,7 +95,7 @@ pub async fn create(req: HttpRequest, channel_info: web::Json<ChannelInfo>, path
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -90,7 +108,13 @@ pub async fn create(req: HttpRequest, channel_info: web::Json<ChannelInfo>, path
// FIXME: Logic to check permissions, should probably be done in utils.rs
let channel = Channel::new(data.clone(), guild_uuid, channel_info.name.clone(), channel_info.description.clone()).await;
let channel = Channel::new(
data.clone(),
guild_uuid,
channel_info.name.clone(),
channel_info.description.clone(),
)
.await;
if let Err(error) = channel {
return Ok(error);

40
src/api/v1/servers/uuid/channels/uuid/messages.rs
View file

@ -1,8 +1,13 @@
use actix_web::{get, web, Error, HttpRequest, HttpResponse};
use serde::Deserialize;
use crate::{api::v1::auth::check_access_token, structs::{Channel, Member}, utils::get_auth_header, Data};
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Channel, Member},
utils::get_auth_header,
};
use ::uuid::Uuid;
use actix_web::{Error, HttpRequest, HttpResponse, get, web};
use log::error;
use serde::Deserialize;
#[derive(Deserialize)]
struct MessageRequest {
@ -11,13 +16,18 @@ struct MessageRequest {
}
#[get("{uuid}/channels/{channel_uuid}/messages")]
pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, message_request: web::Query<MessageRequest>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
pub async fn get(
req: HttpRequest,
path: web::Path<(Uuid, Uuid)>,
message_request: web::Query<MessageRequest>,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let (guild_uuid, channel_uuid) = path.into_inner();
@ -25,7 +35,7 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, message_reques
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -46,23 +56,27 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, message_reques
let channel_result = Channel::fetch_one(&data.pool, guild_uuid, channel_uuid).await;
if let Err(error) = channel_result {
return Ok(error)
return Ok(error);
}
channel = channel_result.unwrap();
let cache_result = data.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60).await;
let cache_result = data
.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60)
.await;
if let Err(error) = cache_result {
error!("{}", error);
return Ok(HttpResponse::InternalServerError().finish());
}
}
let messages = channel.fetch_messages(&data.pool, message_request.amount, message_request.offset).await;
let messages = channel
.fetch_messages(&data.pool, message_request.amount, message_request.offset)
.await;
if let Err(error) = messages {
return Ok(error)
return Ok(error);
}
Ok(HttpResponse::Ok().json(messages.unwrap()))

44
src/api/v1/servers/uuid/channels/uuid/mod.rs
View file

@ -1,19 +1,28 @@
pub mod messages;
pub mod socket;
use actix_web::{delete, get, web, Error, HttpRequest, HttpResponse};
use crate::{api::v1::auth::check_access_token, structs::{Channel, Member}, utils::get_auth_header, Data};
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Channel, Member},
utils::get_auth_header,
};
use ::uuid::Uuid;
use actix_web::{Error, HttpRequest, HttpResponse, delete, get, web};
use log::error;
#[get("{uuid}/channels/{channel_uuid}")]
pub async fn get(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 auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let (guild_uuid, channel_uuid) = path.into_inner();
@ -21,7 +30,7 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Dat
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -35,18 +44,22 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Dat
let cache_result = data.get_cache_key(format!("{}", channel_uuid)).await;
if let Ok(cache_hit) = cache_result {
return Ok(HttpResponse::Ok().content_type("application/json").body(cache_hit))
return Ok(HttpResponse::Ok()
.content_type("application/json")
.body(cache_hit));
}
let channel_result = Channel::fetch_one(&data.pool, guild_uuid, channel_uuid).await;
if let Err(error) = channel_result {
return Ok(error)
return Ok(error);
}
let channel = channel_result.unwrap();
let cache_result = data.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60).await;
let cache_result = data
.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60)
.await;
if let Err(error) = cache_result {
error!("{}", error);
@ -57,13 +70,17 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Dat
}
#[delete("{uuid}/channels/{channel_uuid}")]
pub async fn delete(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
pub async fn delete(
req: HttpRequest,
path: web::Path<(Uuid, Uuid)>,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let (guild_uuid, channel_uuid) = path.into_inner();
@ -71,7 +88,7 @@ pub async fn delete(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -98,7 +115,7 @@ pub async fn delete(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::
let channel_result = Channel::fetch_one(&data.pool, guild_uuid, channel_uuid).await;
if let Err(error) = channel_result {
return Ok(error)
return Ok(error);
}
channel = channel_result.unwrap();
@ -107,9 +124,8 @@ pub async fn delete(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::
let delete_result = channel.delete(&data.pool).await;
if let Err(error) = delete_result {
return Ok(error)
return Ok(error);
}
Ok(HttpResponse::Ok().finish())
}

53
src/api/v1/servers/uuid/channels/uuid/socket.rs
View file

@ -1,13 +1,23 @@
use actix_web::{get, rt, web, Error, HttpRequest, HttpResponse};
use actix_web::{Error, HttpRequest, HttpResponse, get, rt, web};
use actix_ws::AggregatedMessage;
use futures_util::StreamExt as _;
use uuid::Uuid;
use log::error;
use uuid::Uuid;
use crate::{api::v1::auth::check_access_token, structs::{Channel, Member}, utils::get_auth_header, Data};
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Channel, Member},
utils::get_auth_header,
};
#[get("{uuid}/channels/{channel_uuid}/socket")]
pub async fn echo(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, stream: web::Payload, data: web::Data<Data>) -> Result<HttpResponse, Error> {
pub async fn echo(
req: HttpRequest,
path: web::Path<(Uuid, Uuid)>,
stream: web::Payload,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
// Get all headers
let headers = req.headers();
@ -15,7 +25,7 @@ pub async fn echo(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, stream: web::
let auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
// Get uuids from path
@ -25,7 +35,7 @@ pub async fn echo(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, stream: web::
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
// Unwrap user uuid from authorization
@ -50,13 +60,15 @@ pub async fn echo(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, stream: web::
let channel_result = Channel::fetch_one(&data.pool, guild_uuid, channel_uuid).await;
if let Err(error) = channel_result {
return Ok(error)
return Ok(error);
}
channel = channel_result.unwrap();
let cache_result = data.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60).await;
let cache_result = data
.set_cache_key(format!("{}", channel_uuid), channel.clone(), 60)
.await;
if let Err(error) = cache_result {
error!("{}", error);
return Ok(HttpResponse::InternalServerError().finish());
@ -74,7 +86,7 @@ pub async fn echo(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, stream: web::
if let Err(error) = pubsub_result {
error!("{}", error);
return Ok(HttpResponse::InternalServerError().finish())
return Ok(HttpResponse::InternalServerError().finish());
}
let mut session_2 = session_1.clone();
@ -90,14 +102,25 @@ pub async fn echo(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, stream: web::
// start task but don't wait for it
rt::spawn(async move {
let mut conn = data.cache_pool.get_multiplexed_tokio_connection().await.unwrap();
let mut conn = data
.cache_pool
.get_multiplexed_tokio_connection()
.await
.unwrap();
// receive messages from websocket
while let Some(msg) = stream.next().await {
match msg {
Ok(AggregatedMessage::Text(text)) => {
// echo text message
redis::cmd("PUBLISH").arg(&[channel_uuid.to_string(), text.to_string()]).exec_async(&mut conn).await.unwrap();
channel.new_message(&data.pool, uuid, text.to_string()).await.unwrap();
redis::cmd("PUBLISH")
.arg(&[channel_uuid.to_string(), text.to_string()])
.exec_async(&mut conn)
.await
.unwrap();
channel
.new_message(&data.pool, uuid, text.to_string())
.await
.unwrap();
}
Ok(AggregatedMessage::Binary(bin)) => {

34
src/api/v1/servers/uuid/invites/mod.rs
View file

@ -1,8 +1,13 @@
use actix_web::{get, post, web, Error, HttpRequest, HttpResponse};
use actix_web::{Error, HttpRequest, HttpResponse, get, post, web};
use serde::Deserialize;
use uuid::Uuid;
use crate::{api::v1::auth::check_access_token, structs::{Guild, Member}, utils::get_auth_header, Data};
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Guild, Member},
utils::get_auth_header,
};
#[derive(Deserialize)]
struct InviteRequest {
@ -10,13 +15,17 @@ struct InviteRequest {
}
#[get("{uuid}/invites")]
pub async fn get(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 auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let guild_uuid = path.into_inner().0;
@ -24,7 +33,7 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -47,19 +56,24 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
if let Err(error) = invites {
return Ok(error);
}
}
Ok(HttpResponse::Ok().json(invites.unwrap()))
}
#[post("{uuid}/invites")]
pub async fn create(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 auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let guild_uuid = path.into_inner().0;
@ -67,7 +81,7 @@ pub async fn create(req: HttpRequest, path: web::Path<(Uuid,)>, invite_request:
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -88,7 +102,7 @@ pub async fn create(req: HttpRequest, path: web::Path<(Uuid,)>, invite_request:
let guild = guild_result.unwrap();
let custom_id = invite_request.as_ref().map(|ir| ir.custom_id.clone());
let custom_id = invite_request.as_ref().map(|ir| ir.custom_id.clone());
let invite = guild.create_invite(&data.pool, &member, custom_id).await;

22
src/api/v1/servers/uuid/mod.rs
View file

@ -1,11 +1,16 @@
use actix_web::{get, web, Error, HttpRequest, HttpResponse, Scope};
use actix_web::{Error, HttpRequest, HttpResponse, Scope, get, web};
use uuid::Uuid;
mod channels;
mod roles;
mod invites;
mod roles;
use crate::{api::v1::auth::check_access_token, structs::{Guild, Member}, utils::get_auth_header, Data};
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Guild, Member},
utils::get_auth_header,
};
pub fn web() -> Scope {
web::scope("")
@ -28,13 +33,17 @@ pub fn web() -> Scope {
}
#[get("/{uuid}")]
pub async fn res(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Data>) -> Result<HttpResponse, Error> {
pub async fn res(
req: HttpRequest,
path: web::Path<(Uuid,)>,
data: web::Data<Data>,
) -> Result<HttpResponse, Error> {
let headers = req.headers();
let auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let guild_uuid = path.into_inner().0;
@ -42,7 +51,7 @@ pub async fn res(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -61,4 +70,3 @@ pub async fn res(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
Ok(HttpResponse::Ok().json(guild.unwrap()))
}

42
src/api/v1/servers/uuid/roles/mod.rs
View file

@ -1,8 +1,13 @@
use actix_web::{get, post, web, Error, HttpRequest, HttpResponse};
use serde::Deserialize;
use crate::{api::v1::auth::check_access_token, structs::{Member, Role}, utils::get_auth_header, Data};
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Member, Role},
utils::get_auth_header,
};
use ::uuid::Uuid;
use actix_web::{Error, HttpRequest, HttpResponse, get, post, web};
use log::error;
use serde::Deserialize;
pub mod uuid;
@ -12,13 +17,17 @@ struct RoleInfo {
}
#[get("{uuid}/roles")]
pub async fn get(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 auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let guild_uuid = path.into_inner().0;
@ -26,7 +35,7 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -40,18 +49,22 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
let cache_result = data.get_cache_key(format!("{}_roles", guild_uuid)).await;
if let Ok(cache_hit) = cache_result {
return Ok(HttpResponse::Ok().content_type("application/json").body(cache_hit))
return Ok(HttpResponse::Ok()
.content_type("application/json")
.body(cache_hit));
}
let roles_result = Role::fetch_all(&data.pool, guild_uuid).await;
if let Err(error) = roles_result {
return Ok(error)
return Ok(error);
}
let roles = roles_result.unwrap();
let cache_result = data.set_cache_key(format!("{}_roles", guild_uuid), roles.clone(), 1800).await;
let cache_result = data
.set_cache_key(format!("{}_roles", guild_uuid), roles.clone(), 1800)
.await;
if let Err(error) = cache_result {
error!("{}", error);
@ -62,13 +75,18 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid,)>, data: web::Data<Dat
}
#[post("{uuid}/roles")]
pub async fn create(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 auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let guild_uuid = path.into_inner().0;
@ -76,7 +94,7 @@ pub async fn create(req: HttpRequest, role_info: web::Json<RoleInfo>, path: web:
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();

29
src/api/v1/servers/uuid/roles/uuid.rs
View file

@ -1,16 +1,25 @@
use actix_web::{get, web, Error, HttpRequest, HttpResponse};
use crate::{api::v1::auth::check_access_token, structs::{Member, Role}, utils::get_auth_header, Data};
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Member, Role},
utils::get_auth_header,
};
use ::uuid::Uuid;
use actix_web::{Error, HttpRequest, HttpResponse, get, web};
use log::error;
#[get("{uuid}/roles/{role_uuid}")]
pub async fn get(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 auth_header = get_auth_header(headers);
if let Err(error) = auth_header {
return Ok(error)
return Ok(error);
}
let (guild_uuid, role_uuid) = path.into_inner();
@ -18,7 +27,7 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Dat
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await;
if let Err(error) = authorized {
return Ok(error)
return Ok(error);
}
let uuid = authorized.unwrap();
@ -32,18 +41,22 @@ pub async fn get(req: HttpRequest, path: web::Path<(Uuid, Uuid)>, data: web::Dat
let cache_result = data.get_cache_key(format!("{}", role_uuid)).await;
if let Ok(cache_hit) = cache_result {
return Ok(HttpResponse::Ok().content_type("application/json").body(cache_hit))
return Ok(HttpResponse::Ok()
.content_type("application/json")
.body(cache_hit));
}
let role_result = Role::fetch_one(&data.pool, guild_uuid, role_uuid).await;
if let Err(error) = role_result {
return Ok(error)
return Ok(error);
}
let role = role_result.unwrap();
let cache_result = data.set_cache_key(format!("{}", role_uuid), role.clone(), 60).await;
let cache_result = data
.set_cache_key(format!("{}", role_uuid), role.clone(), 60)
.await;
if let Err(error) = cache_result {
error!("{}", error);

2
src/api/v1/users/mod.rs
View file

@ -1,5 +1,5 @@
use crate::{Data, api::v1::auth::check_access_token, utils::get_auth_header};
use actix_web::{get, web, Error, HttpRequest, HttpResponse, Scope};
use actix_web::{Error, HttpRequest, HttpResponse, Scope, get, web};
use log::error;
use serde::{Deserialize, Serialize};
use sqlx::prelude::FromRow;

8
src/api/v1/users/uuid.rs
View file

@ -37,7 +37,9 @@ pub async fn res(
let cache_result = data.get_cache_key(uuid.to_string()).await;
if let Ok(cache_hit) = cache_result {
return Ok(HttpResponse::Ok().content_type("application/json").body(cache_hit))
return Ok(HttpResponse::Ok()
.content_type("application/json")
.body(cache_hit));
}
let row = sqlx::query_as(&format!(
@ -60,7 +62,9 @@ pub async fn res(
display_name: display_name.unwrap_or_default(),
};
let cache_result = data.set_cache_key(uuid.to_string(), user.clone(), 1800).await;
let cache_result = data
.set_cache_key(uuid.to_string(), user.clone(), 1800)
.await;
if let Err(error) = cache_result {
error!("{}", error);