parent
15e24b9a61
commit
df32b9d65e
43 changed files with 708 additions and 234 deletions
|
@ -50,7 +50,7 @@ pub async fn register_request(
|
|||
.to_string();
|
||||
|
||||
// check for ip ban
|
||||
if let Ok(_) = data.get_ipban_by_ip(&real_ip).await {
|
||||
if data.get_ipban_by_ip(&real_ip).await.is_ok() {
|
||||
return (None, Json(Error::NotAllowed.into()));
|
||||
}
|
||||
|
||||
|
@ -126,7 +126,7 @@ pub async fn login_request(
|
|||
.to_string();
|
||||
|
||||
// check for ip ban
|
||||
if let Ok(_) = data.get_ipban_by_ip(&real_ip).await {
|
||||
if data.get_ipban_by_ip(&real_ip).await.is_ok() {
|
||||
return (None, Json(Error::NotAllowed.into()));
|
||||
}
|
||||
|
||||
|
|
|
@ -330,7 +330,7 @@ pub async fn disable_totp_request(
|
|||
}
|
||||
|
||||
// ...
|
||||
match data.update_user_totp(id, &String::new(), &Vec::new()).await {
|
||||
match data.update_user_totp(id, "", &Vec::new()).await {
|
||||
Ok(()) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "TOTP disabled".to_string(),
|
||||
|
|
|
@ -3,8 +3,9 @@ use axum_extra::extract::CookieJar;
|
|||
use tetratto_core::model::{ApiReturn, Error, communities::Post};
|
||||
|
||||
use crate::{
|
||||
State, get_user_from_token,
|
||||
routes::api::v1::{CreatePost, UpdatePostContent, UpdatePostContext},
|
||||
get_user_from_token,
|
||||
routes::api::v1::{CreatePost, CreateRepost, UpdatePostContent, UpdatePostContext},
|
||||
State,
|
||||
};
|
||||
|
||||
pub async fn create_request(
|
||||
|
@ -46,6 +47,39 @@ pub async fn create_request(
|
|||
}
|
||||
}
|
||||
|
||||
pub async fn create_repost_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
Path(id): Path<usize>,
|
||||
Json(req): Json<CreateRepost>,
|
||||
) -> impl IntoResponse {
|
||||
let data = &(data.read().await).0;
|
||||
let user = match get_user_from_token!(jar, data) {
|
||||
Some(ua) => ua,
|
||||
None => return Json(Error::NotAllowed.into()),
|
||||
};
|
||||
|
||||
match data
|
||||
.create_post(Post::repost(
|
||||
req.content,
|
||||
match req.community.parse::<usize>() {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
|
||||
},
|
||||
user.id,
|
||||
id,
|
||||
))
|
||||
.await
|
||||
{
|
||||
Ok(id) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Post reposted".to_string(),
|
||||
payload: Some(id.to_string()),
|
||||
}),
|
||||
Err(e) => Json(e.into()),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn delete_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
|
|
|
@ -81,6 +81,10 @@ pub fn routes() -> Router {
|
|||
// posts
|
||||
.route("/posts", post(communities::posts::create_request))
|
||||
.route("/posts/{id}", delete(communities::posts::delete_request))
|
||||
.route(
|
||||
"/posts/{id}/repost",
|
||||
post(communities::posts::create_repost_request),
|
||||
)
|
||||
.route(
|
||||
"/posts/{id}/content",
|
||||
post(communities::posts::update_content_request),
|
||||
|
@ -247,6 +251,12 @@ pub struct CreatePost {
|
|||
pub replying_to: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct CreateRepost {
|
||||
pub content: String,
|
||||
pub community: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct UpdatePostContent {
|
||||
pub content: String,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue