add: ProfileStyle products
This commit is contained in:
parent
077e9252e3
commit
95cb889080
19 changed files with 525 additions and 54 deletions
|
@ -3,10 +3,11 @@ use crate::{
|
|||
get_user_from_token,
|
||||
model::{ApiReturn, Error},
|
||||
routes::api::v1::{
|
||||
AppendAssociations, AwardAchievement, DeleteUser, DisableTotp, RefreshGrantToken,
|
||||
UpdateSecondaryUserRole, UpdateUserAwaitingPurchase, UpdateUserBanExpire,
|
||||
UpdateUserBanReason, UpdateUserInviteCode, UpdateUserIsDeactivated, UpdateUserIsVerified,
|
||||
UpdateUserPassword, UpdateUserRole, UpdateUserUsername,
|
||||
AddAppliedConfiguration, AppendAssociations, AwardAchievement, DeleteUser, DisableTotp,
|
||||
RefreshGrantToken, RemoveAppliedConfiguration, UpdateSecondaryUserRole,
|
||||
UpdateUserAwaitingPurchase, UpdateUserBanExpire, UpdateUserBanReason, UpdateUserInviteCode,
|
||||
UpdateUserIsDeactivated, UpdateUserIsVerified, UpdateUserPassword, UpdateUserRole,
|
||||
UpdateUserUsername,
|
||||
},
|
||||
State,
|
||||
};
|
||||
|
@ -24,6 +25,7 @@ use tetratto_core::{
|
|||
cache::Cache,
|
||||
model::{
|
||||
auth::{AchievementName, InviteCode, Token, UserSettings, SELF_SERVE_ACHIEVEMENTS},
|
||||
economy::CoinTransferMethod,
|
||||
moderation::AuditLogEntry,
|
||||
oauth,
|
||||
permissions::FinePermission,
|
||||
|
@ -180,6 +182,106 @@ pub async fn update_user_settings_request(
|
|||
}
|
||||
}
|
||||
|
||||
/// Add the given applied configuration.
|
||||
pub async fn add_applied_configuration_request(
|
||||
jar: CookieJar,
|
||||
Path(id): Path<usize>,
|
||||
Extension(data): Extension<State>,
|
||||
Json(req): Json<AddAppliedConfiguration>,
|
||||
) -> impl IntoResponse {
|
||||
let data = &(data.read().await).0;
|
||||
let mut user = match get_user_from_token!(jar, data, oauth::AppScope::UserManageProfile) {
|
||||
Some(ua) => ua,
|
||||
None => return Json(Error::NotAllowed.into()),
|
||||
};
|
||||
|
||||
if user.id != id && !user.permissions.check(FinePermission::MANAGE_USERS) {
|
||||
return Json(Error::NotAllowed.into());
|
||||
}
|
||||
|
||||
let product_id: usize = match req.id.parse() {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
|
||||
};
|
||||
|
||||
let product = match data.get_product_by_id(product_id).await {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Json(e.into()),
|
||||
};
|
||||
|
||||
if data
|
||||
.get_transfer_by_sender_method(user.id, CoinTransferMethod::Purchase(product.id))
|
||||
.await
|
||||
.is_err()
|
||||
{
|
||||
return Json(Error::NotAllowed.into());
|
||||
}
|
||||
|
||||
// update
|
||||
user.applied_configurations.push((req.r#type, product.id));
|
||||
|
||||
// ...
|
||||
match data
|
||||
.update_user_applied_configurations(id, user.applied_configurations)
|
||||
.await
|
||||
{
|
||||
Ok(_) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Applied configurations updated".to_string(),
|
||||
payload: (),
|
||||
}),
|
||||
Err(e) => Json(e.into()),
|
||||
}
|
||||
}
|
||||
|
||||
/// Remove the given applied configuration.
|
||||
pub async fn remove_applied_configuration_request(
|
||||
jar: CookieJar,
|
||||
Path(id): Path<usize>,
|
||||
Extension(data): Extension<State>,
|
||||
Json(req): Json<RemoveAppliedConfiguration>,
|
||||
) -> impl IntoResponse {
|
||||
let data = &(data.read().await).0;
|
||||
let mut user = match get_user_from_token!(jar, data, oauth::AppScope::UserManageProfile) {
|
||||
Some(ua) => ua,
|
||||
None => return Json(Error::NotAllowed.into()),
|
||||
};
|
||||
|
||||
if user.id != id && !user.permissions.check(FinePermission::MANAGE_USERS) {
|
||||
return Json(Error::NotAllowed.into());
|
||||
}
|
||||
|
||||
let product_id: usize = match req.id.parse() {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Json(Error::MiscError(e.to_string()).into()),
|
||||
};
|
||||
|
||||
// update
|
||||
user.applied_configurations.remove(
|
||||
match user
|
||||
.applied_configurations
|
||||
.iter()
|
||||
.position(|x| x.1 == product_id)
|
||||
{
|
||||
Some(x) => x,
|
||||
None => return Json(Error::GeneralNotFound("configuration".to_string()).into()),
|
||||
},
|
||||
);
|
||||
|
||||
// ...
|
||||
match data
|
||||
.update_user_applied_configurations(id, user.applied_configurations)
|
||||
.await
|
||||
{
|
||||
Ok(_) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Applied configurations updated".to_string(),
|
||||
payload: (),
|
||||
}),
|
||||
Err(e) => Json(e.into()),
|
||||
}
|
||||
}
|
||||
|
||||
/// Append associations to the current user.
|
||||
pub async fn append_associations_request(
|
||||
jar: CookieJar,
|
||||
|
|
|
@ -25,7 +25,7 @@ use axum::{
|
|||
use serde::Deserialize;
|
||||
use tetratto_core::model::{
|
||||
apps::{AppDataSelectMode, AppDataSelectQuery, AppQuota, DeveloperPassStorageQuota},
|
||||
auth::AchievementName,
|
||||
auth::{AchievementName, AppliedConfigType},
|
||||
communities::{
|
||||
CommunityContext, CommunityJoinAccess, CommunityReadAccess, CommunityWriteAccess,
|
||||
PollOption, PostContext,
|
||||
|
@ -333,6 +333,14 @@ pub fn routes() -> Router {
|
|||
"/auth/user/{id}/settings",
|
||||
post(auth::profile::update_user_settings_request),
|
||||
)
|
||||
.route(
|
||||
"/auth/user/{id}/applied_configuration",
|
||||
post(auth::profile::add_applied_configuration_request),
|
||||
)
|
||||
.route(
|
||||
"/auth/user/{id}/applied_configuration",
|
||||
delete(auth::profile::remove_applied_configuration_request),
|
||||
)
|
||||
.route(
|
||||
"/auth/user/{id}/role",
|
||||
post(auth::profile::update_user_role_request),
|
||||
|
@ -728,6 +736,7 @@ pub fn routes() -> Router {
|
|||
"/products/{id}/description",
|
||||
post(products::update_description_request),
|
||||
)
|
||||
.route("/products/{id}/data", post(products::update_data_request))
|
||||
.route(
|
||||
"/products/{id}/on_sale",
|
||||
post(products::update_on_sale_request),
|
||||
|
@ -1274,6 +1283,11 @@ pub struct UpdateProductDescription {
|
|||
pub description: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct UpdateProductData {
|
||||
pub data: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct UpdateProductOnSale {
|
||||
pub on_sale: bool,
|
||||
|
@ -1298,3 +1312,14 @@ pub struct UpdateProductMethod {
|
|||
pub struct UpdateProductStock {
|
||||
pub stock: i32,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct AddAppliedConfiguration {
|
||||
pub r#type: AppliedConfigType,
|
||||
pub id: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct RemoveAppliedConfiguration {
|
||||
pub id: String,
|
||||
}
|
||||
|
|
|
@ -1,9 +1,15 @@
|
|||
use crate::{get_user_from_token, State, cookie::CookieJar};
|
||||
use axum::{extract::Path, response::IntoResponse, Extension, Json};
|
||||
use tetratto_core::model::{economy::Product, oauth, ApiReturn, Error};
|
||||
use tetratto_core::model::{
|
||||
economy::{Product, ProductFulfillmentMethod},
|
||||
oauth,
|
||||
permissions::FinePermission,
|
||||
ApiReturn, Error,
|
||||
};
|
||||
use super::{
|
||||
CreateProduct, UpdateProductDescription, UpdateProductMethod, UpdateProductOnSale,
|
||||
UpdateProductPrice, UpdateProductSingleUse, UpdateProductStock, UpdateProductTitle,
|
||||
CreateProduct, UpdateProductData, UpdateProductDescription, UpdateProductMethod,
|
||||
UpdateProductOnSale, UpdateProductPrice, UpdateProductSingleUse, UpdateProductStock,
|
||||
UpdateProductTitle,
|
||||
};
|
||||
|
||||
pub async fn create_request(
|
||||
|
@ -112,6 +118,33 @@ pub async fn update_description_request(
|
|||
}
|
||||
}
|
||||
|
||||
pub async fn update_data_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
Path(id): Path<usize>,
|
||||
Json(mut req): Json<UpdateProductData>,
|
||||
) -> impl IntoResponse {
|
||||
let data = &(data.read().await).0;
|
||||
let user = match get_user_from_token!(jar, data, oauth::AppScope::UserManageProducts) {
|
||||
Some(ua) => ua,
|
||||
None => return Json(Error::NotAllowed.into()),
|
||||
};
|
||||
|
||||
req.data = req.data.trim().to_string();
|
||||
if req.data.len() > 16384 {
|
||||
return Json(Error::DataTooLong("data".to_string()).into());
|
||||
}
|
||||
|
||||
match data.update_product_data(id, &user, &req.data).await {
|
||||
Ok(_) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Product updated".to_string(),
|
||||
payload: (),
|
||||
}),
|
||||
Err(e) => Json(e.into()),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn update_on_sale_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
|
@ -205,6 +238,12 @@ pub async fn update_method_request(
|
|||
None => return Json(Error::NotAllowed.into()),
|
||||
};
|
||||
|
||||
if req.method == ProductFulfillmentMethod::ProfileStyle
|
||||
&& !user.permissions.check(FinePermission::SUPPORTER)
|
||||
{
|
||||
return Json(Error::RequiresSupporter.into());
|
||||
}
|
||||
|
||||
match data.update_product_method(id, &user, req.method).await {
|
||||
Ok(_) => Json(ApiReturn {
|
||||
ok: true,
|
||||
|
|
|
@ -147,12 +147,19 @@ pub async fn product_request(
|
|||
false
|
||||
};
|
||||
|
||||
let applied_configurations_mapped: Vec<usize> =
|
||||
user.applied_configurations.iter().map(|x| x.1).collect();
|
||||
|
||||
let lang = get_lang!(jar, data.0);
|
||||
let mut context = initial_context(&data.0.0.0, lang, &Some(user)).await;
|
||||
|
||||
context.insert("product", &product);
|
||||
context.insert("owner", &owner);
|
||||
context.insert("already_purchased", &already_purchased);
|
||||
context.insert(
|
||||
"applied_configurations_mapped",
|
||||
&applied_configurations_mapped,
|
||||
);
|
||||
|
||||
// return
|
||||
Ok(Html(
|
||||
|
|
|
@ -232,6 +232,7 @@ pub fn profile_context(
|
|||
user: &Option<User>,
|
||||
profile: &User,
|
||||
communities: &Vec<Community>,
|
||||
applied_configurations: Vec<String>,
|
||||
is_self: bool,
|
||||
is_following: bool,
|
||||
is_following_you: bool,
|
||||
|
@ -244,6 +245,7 @@ pub fn profile_context(
|
|||
context.insert("is_following_you", &is_following_you);
|
||||
context.insert("is_blocking", &is_blocking);
|
||||
context.insert("warning_hash", &hash(profile.settings.warning.clone()));
|
||||
context.insert("applied_configurations", &applied_configurations);
|
||||
|
||||
context.insert(
|
||||
"is_supporter",
|
||||
|
@ -376,6 +378,10 @@ pub async fn posts_request(
|
|||
&user,
|
||||
&other_user,
|
||||
&communities,
|
||||
match data.0.get_applied_configurations(&other_user).await {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
|
||||
},
|
||||
is_self,
|
||||
is_following,
|
||||
is_following_you,
|
||||
|
@ -492,6 +498,10 @@ pub async fn replies_request(
|
|||
&user,
|
||||
&other_user,
|
||||
&communities,
|
||||
match data.0.get_applied_configurations(&other_user).await {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
|
||||
},
|
||||
is_self,
|
||||
is_following,
|
||||
is_following_you,
|
||||
|
@ -604,6 +614,10 @@ pub async fn media_request(
|
|||
&user,
|
||||
&other_user,
|
||||
&communities,
|
||||
match data.0.get_applied_configurations(&other_user).await {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
|
||||
},
|
||||
is_self,
|
||||
is_following,
|
||||
is_following_you,
|
||||
|
@ -690,9 +704,13 @@ pub async fn shop_request(
|
|||
context.insert("page", &props.page);
|
||||
profile_context(
|
||||
&mut context,
|
||||
&Some(user),
|
||||
&Some(user.clone()),
|
||||
&other_user,
|
||||
&communities,
|
||||
match data.0.get_applied_configurations(&other_user).await {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
},
|
||||
is_self,
|
||||
is_following,
|
||||
is_following_you,
|
||||
|
@ -784,9 +802,13 @@ pub async fn outbox_request(
|
|||
context.insert("page", &props.page);
|
||||
profile_context(
|
||||
&mut context,
|
||||
&Some(user),
|
||||
&Some(user.clone()),
|
||||
&other_user,
|
||||
&communities,
|
||||
match data.0.get_applied_configurations(&other_user).await {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
},
|
||||
is_self,
|
||||
is_following,
|
||||
is_following_you,
|
||||
|
@ -896,6 +918,10 @@ pub async fn following_request(
|
|||
&user,
|
||||
&other_user,
|
||||
&communities,
|
||||
match data.0.get_applied_configurations(&other_user).await {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
|
||||
},
|
||||
is_self,
|
||||
is_following,
|
||||
is_following_you,
|
||||
|
@ -1005,6 +1031,10 @@ pub async fn followers_request(
|
|||
&user,
|
||||
&other_user,
|
||||
&communities,
|
||||
match data.0.get_applied_configurations(&other_user).await {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
|
||||
},
|
||||
is_self,
|
||||
is_following,
|
||||
is_following_you,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue