add: products api
This commit is contained in:
parent
3c4ce1fae5
commit
df5eaf24f7
29 changed files with 1022 additions and 110 deletions
|
@ -147,6 +147,8 @@ pub const MAIL_SENT: &str = include_str!("./public/html/mail/sent.lisp");
|
||||||
pub const MAIL_COMPOSE: &str = include_str!("./public/html/mail/compose.lisp");
|
pub const MAIL_COMPOSE: &str = include_str!("./public/html/mail/compose.lisp");
|
||||||
pub const MAIL_LETTER: &str = include_str!("./public/html/mail/letter.lisp");
|
pub const MAIL_LETTER: &str = include_str!("./public/html/mail/letter.lisp");
|
||||||
|
|
||||||
|
pub const ECONOMY_WALLET: &str = include_str!("./public/html/economy/wallet.lisp");
|
||||||
|
|
||||||
// langs
|
// langs
|
||||||
pub const LANG_EN_US: &str = include_str!("./langs/en-US.toml");
|
pub const LANG_EN_US: &str = include_str!("./langs/en-US.toml");
|
||||||
|
|
||||||
|
@ -379,6 +381,8 @@ pub(crate) async fn write_assets(config: &Config) -> PathBufD {
|
||||||
write_template!(html_path->"mail/compose.html"(crate::assets::MAIL_COMPOSE) --config=config --lisp plugins);
|
write_template!(html_path->"mail/compose.html"(crate::assets::MAIL_COMPOSE) --config=config --lisp plugins);
|
||||||
write_template!(html_path->"mail/letter.html"(crate::assets::MAIL_LETTER) --config=config --lisp plugins);
|
write_template!(html_path->"mail/letter.html"(crate::assets::MAIL_LETTER) --config=config --lisp plugins);
|
||||||
|
|
||||||
|
write_template!(html_path->"economy/wallet.html"(crate::assets::ECONOMY_WALLET) -d "economy" --config=config --lisp plugins);
|
||||||
|
|
||||||
html_path
|
html_path
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ version = "1.0.0"
|
||||||
"general:link.achievements" = "Achievements"
|
"general:link.achievements" = "Achievements"
|
||||||
"general:link.little_web" = "Little web"
|
"general:link.little_web" = "Little web"
|
||||||
"general:link.mail" = "Mail"
|
"general:link.mail" = "Mail"
|
||||||
|
"general:link.wallet" = "Wallet"
|
||||||
"general:action.save" = "Save"
|
"general:action.save" = "Save"
|
||||||
"general:action.delete" = "Delete"
|
"general:action.delete" = "Delete"
|
||||||
"general:action.purge" = "Purge"
|
"general:action.purge" = "Purge"
|
||||||
|
@ -324,3 +325,5 @@ version = "1.0.0"
|
||||||
"mail:label.content" = "Content"
|
"mail:label.content" = "Content"
|
||||||
"mail:action.send" = "Send"
|
"mail:action.send" = "Send"
|
||||||
"mail:action.send_mail" = "Send mail"
|
"mail:action.send_mail" = "Send mail"
|
||||||
|
|
||||||
|
"economy:label.recent_transfers" = "Recent transfers"
|
||||||
|
|
|
@ -272,6 +272,16 @@ table ol {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.card.button {
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: flex-start;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: var(--pad-2);
|
||||||
|
width: 100%;
|
||||||
|
height: max-content;
|
||||||
|
padding: var(--pad-4);
|
||||||
|
}
|
||||||
|
|
||||||
/* supporter card */
|
/* supporter card */
|
||||||
@property --border-angle {
|
@property --border-angle {
|
||||||
syntax: "<angle>";
|
syntax: "<angle>";
|
||||||
|
|
65
crates/app/src/public/html/economy/wallet.lisp
Normal file
65
crates/app/src/public/html/economy/wallet.lisp
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
(text "{% extends \"root.html\" %} {% block head %}")
|
||||||
|
(title
|
||||||
|
(text "Wallet - {{ config.name }}"))
|
||||||
|
(text "{% endblock %} {% block body %} {{ macros::nav(selected=\"wallet\") }}")
|
||||||
|
(main
|
||||||
|
("class" "flex flex_col gap_2")
|
||||||
|
(div
|
||||||
|
("class" "card_nest")
|
||||||
|
(div
|
||||||
|
("class" "card small flex items_center justify_between gap_2")
|
||||||
|
(span
|
||||||
|
("class" "flex items_center gap_2")
|
||||||
|
(icon (text "piggy-bank"))
|
||||||
|
(span (str (text "general:link.wallet")))))
|
||||||
|
(div
|
||||||
|
("class" "card lowered flex flex_col gap_4")
|
||||||
|
(a
|
||||||
|
("class" "card button raised")
|
||||||
|
("href" "/wallet/buy")
|
||||||
|
(b (text "Coin balance"))
|
||||||
|
(h3
|
||||||
|
("class" "flex gap_2 items_center")
|
||||||
|
("style" "height: 24px")
|
||||||
|
(icon (text "badge-cent"))
|
||||||
|
(text "{{ user.coins }}")))))
|
||||||
|
(div
|
||||||
|
("class" "card_nest")
|
||||||
|
(div
|
||||||
|
("class" "card small flex items_center justify_between gap_2")
|
||||||
|
(span
|
||||||
|
("class" "flex items_center gap_2")
|
||||||
|
(icon (text "clock"))
|
||||||
|
(span (str (text "economy:label.recent_transfers")))))
|
||||||
|
(div
|
||||||
|
("class" "card lowered flex flex_col gap_4")
|
||||||
|
(div
|
||||||
|
("class" "w_full")
|
||||||
|
("style" "overflow: auto")
|
||||||
|
(table
|
||||||
|
("class" "w_full")
|
||||||
|
(thead
|
||||||
|
(th (text "Created"))
|
||||||
|
(th (text "Sender"))
|
||||||
|
(th (text "Receiver"))
|
||||||
|
(th (text "Amount"))
|
||||||
|
(th (text "Product")))
|
||||||
|
(tbody
|
||||||
|
(text "{% for transfer in list -%}")
|
||||||
|
(tr
|
||||||
|
(td (span ("class" "date short") (text "{{ transfer[1] }}")))
|
||||||
|
(td ("class" "w_content") (text "{{ components::full_username(user=transfer[3]) }}"))
|
||||||
|
(td ("class" "w_content") (text "{{ components::full_username(user=transfer[4]) }}"))
|
||||||
|
(td
|
||||||
|
(text "{{ transfer[2] }}")
|
||||||
|
(text "{% if transfer[6] -%}")
|
||||||
|
(span ("title" "Pending") (icon (text "clock")))
|
||||||
|
(text "{%- endif %}"))
|
||||||
|
(td
|
||||||
|
(text "{% if transfer[5] -%}")
|
||||||
|
(a
|
||||||
|
("href" "/product/{{ transfer[5].id }}")
|
||||||
|
(icon (text "external-link")))
|
||||||
|
(text "{%- endif %}")))
|
||||||
|
(text "{%- endfor %}")))))))
|
||||||
|
(text "{% endblock %}")
|
|
@ -187,6 +187,13 @@ pub async fn create_request(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check if we're fulfilling a coin transfer
|
||||||
|
if props.transfer_id != 0 {
|
||||||
|
if let Err(e) = data.apply_transfer(props.transfer_id).await {
|
||||||
|
return Json(e.into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ...
|
// ...
|
||||||
Json(ApiReturn {
|
Json(ApiReturn {
|
||||||
ok: true,
|
ok: true,
|
||||||
|
|
|
@ -4,16 +4,17 @@ pub mod auth;
|
||||||
pub mod channels;
|
pub mod channels;
|
||||||
pub mod communities;
|
pub mod communities;
|
||||||
pub mod domains;
|
pub mod domains;
|
||||||
pub mod economy;
|
|
||||||
pub mod journals;
|
pub mod journals;
|
||||||
pub mod letters;
|
pub mod letters;
|
||||||
pub mod notes;
|
pub mod notes;
|
||||||
pub mod notifications;
|
pub mod notifications;
|
||||||
|
pub mod products;
|
||||||
pub mod reactions;
|
pub mod reactions;
|
||||||
pub mod reports;
|
pub mod reports;
|
||||||
pub mod requests;
|
pub mod requests;
|
||||||
pub mod services;
|
pub mod services;
|
||||||
pub mod stacks;
|
pub mod stacks;
|
||||||
|
pub mod transfers;
|
||||||
pub mod uploads;
|
pub mod uploads;
|
||||||
pub mod util;
|
pub mod util;
|
||||||
|
|
||||||
|
@ -30,6 +31,7 @@ use tetratto_core::model::{
|
||||||
PollOption, PostContext,
|
PollOption, PostContext,
|
||||||
},
|
},
|
||||||
communities_permissions::CommunityPermission,
|
communities_permissions::CommunityPermission,
|
||||||
|
economy::ProductFulfillmentMethod,
|
||||||
journals::JournalPrivacyPermission,
|
journals::JournalPrivacyPermission,
|
||||||
littleweb::{DomainData, DomainTld, ServiceFsEntry},
|
littleweb::{DomainData, DomainTld, ServiceFsEntry},
|
||||||
oauth::AppScope,
|
oauth::AppScope,
|
||||||
|
@ -706,8 +708,27 @@ pub fn routes() -> Router {
|
||||||
.route("/letters/{id}/read", post(letters::add_read_request))
|
.route("/letters/{id}/read", post(letters::add_read_request))
|
||||||
.route("/letters/sent", get(letters::list_sent_request))
|
.route("/letters/sent", get(letters::list_sent_request))
|
||||||
.route("/letters/received", get(letters::list_received_request))
|
.route("/letters/received", get(letters::list_received_request))
|
||||||
// economy
|
// transfers
|
||||||
.route("/transfers", post(economy::create_request))
|
.route("/transfers", post(transfers::create_request))
|
||||||
|
// products
|
||||||
|
.route("/products", post(products::create_request))
|
||||||
|
.route("/products/{id}", delete(products::delete_request))
|
||||||
|
.route("/products/{id}/buy", post(products::buy_request))
|
||||||
|
.route("/products/{id}/title", post(products::update_title_request))
|
||||||
|
.route(
|
||||||
|
"/products/{id}/description",
|
||||||
|
post(products::update_description_request),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
"/products/{id}/on_sale",
|
||||||
|
post(products::update_on_sale_request),
|
||||||
|
)
|
||||||
|
.route("/products/{id}/price", post(products::update_price_request))
|
||||||
|
.route(
|
||||||
|
"/products/{id}/method",
|
||||||
|
post(products::update_method_request),
|
||||||
|
)
|
||||||
|
.route("/products/{id}/stock", post(products::update_stock_request))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn lw_routes() -> Router {
|
pub fn lw_routes() -> Router {
|
||||||
|
@ -1214,6 +1235,8 @@ pub struct CreateLetter {
|
||||||
pub subject: String,
|
pub subject: String,
|
||||||
pub content: String,
|
pub content: String,
|
||||||
pub replying_to: String,
|
pub replying_to: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub transfer_id: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
|
@ -1221,3 +1244,39 @@ pub struct CreateCoinTransfer {
|
||||||
pub receiver: usize,
|
pub receiver: usize,
|
||||||
pub amount: i32,
|
pub amount: i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct CreateProduct {
|
||||||
|
pub title: String,
|
||||||
|
pub description: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct UpdateProductTitle {
|
||||||
|
pub title: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct UpdateProductDescription {
|
||||||
|
pub description: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct UpdateProductOnSale {
|
||||||
|
pub on_sale: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct UpdateProductPrice {
|
||||||
|
pub price: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct UpdateProductMethod {
|
||||||
|
pub method: ProductFulfillmentMethod,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct UpdateProductStock {
|
||||||
|
pub stock: i32,
|
||||||
|
}
|
||||||
|
|
225
crates/app/src/routes/api/v1/products.rs
Normal file
225
crates/app/src/routes/api/v1/products.rs
Normal file
|
@ -0,0 +1,225 @@
|
||||||
|
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 super::{
|
||||||
|
CreateProduct, UpdateProductDescription, UpdateProductMethod, UpdateProductOnSale,
|
||||||
|
UpdateProductPrice, UpdateProductStock, UpdateProductTitle,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub async fn create_request(
|
||||||
|
jar: CookieJar,
|
||||||
|
Extension(data): Extension<State>,
|
||||||
|
Json(req): Json<CreateProduct>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let data = &(data.read().await).0;
|
||||||
|
let user = match get_user_from_token!(jar, data, oauth::AppScope::UserCreateProducts) {
|
||||||
|
Some(ua) => ua,
|
||||||
|
None => return Json(Error::NotAllowed.into()),
|
||||||
|
};
|
||||||
|
|
||||||
|
match data
|
||||||
|
.create_product(Product::new(user.id, req.title, req.description))
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(s) => Json(ApiReturn {
|
||||||
|
ok: true,
|
||||||
|
message: "Product created".to_string(),
|
||||||
|
payload: s.id.to_string(),
|
||||||
|
}),
|
||||||
|
Err(e) => Json(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn delete_request(
|
||||||
|
jar: CookieJar,
|
||||||
|
Extension(data): Extension<State>,
|
||||||
|
Path(id): Path<usize>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let data = &(data.read().await).0;
|
||||||
|
let user = match get_user_from_token!(jar, data, oauth::AppScope::UserCreateProducts) {
|
||||||
|
Some(ua) => ua,
|
||||||
|
None => return Json(Error::NotAllowed.into()),
|
||||||
|
};
|
||||||
|
|
||||||
|
match data.delete_product(id, &user).await {
|
||||||
|
Ok(_) => Json(ApiReturn {
|
||||||
|
ok: true,
|
||||||
|
message: "Product deleted".to_string(),
|
||||||
|
payload: (),
|
||||||
|
}),
|
||||||
|
Err(e) => Json(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_title_request(
|
||||||
|
jar: CookieJar,
|
||||||
|
Extension(data): Extension<State>,
|
||||||
|
Path(id): Path<usize>,
|
||||||
|
Json(mut req): Json<UpdateProductTitle>,
|
||||||
|
) -> 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.title = req.title.trim().to_string();
|
||||||
|
if req.title.len() < 2 {
|
||||||
|
return Json(Error::DataTooShort("title".to_string()).into());
|
||||||
|
} else if req.title.len() > 128 {
|
||||||
|
return Json(Error::DataTooLong("title".to_string()).into());
|
||||||
|
}
|
||||||
|
|
||||||
|
match data.update_product_title(id, &user, &req.title).await {
|
||||||
|
Ok(_) => Json(ApiReturn {
|
||||||
|
ok: true,
|
||||||
|
message: "Product updated".to_string(),
|
||||||
|
payload: (),
|
||||||
|
}),
|
||||||
|
Err(e) => Json(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_description_request(
|
||||||
|
jar: CookieJar,
|
||||||
|
Extension(data): Extension<State>,
|
||||||
|
Path(id): Path<usize>,
|
||||||
|
Json(mut req): Json<UpdateProductDescription>,
|
||||||
|
) -> 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.description = req.description.trim().to_string();
|
||||||
|
if req.description.len() < 2 {
|
||||||
|
return Json(Error::DataTooShort("description".to_string()).into());
|
||||||
|
} else if req.description.len() > 1024 {
|
||||||
|
return Json(Error::DataTooLong("description".to_string()).into());
|
||||||
|
}
|
||||||
|
|
||||||
|
match data
|
||||||
|
.update_product_description(id, &user, &req.description)
|
||||||
|
.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>,
|
||||||
|
Path(id): Path<usize>,
|
||||||
|
Json(req): Json<UpdateProductOnSale>,
|
||||||
|
) -> 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()),
|
||||||
|
};
|
||||||
|
|
||||||
|
match data
|
||||||
|
.update_product_on_sale(id, &user, if req.on_sale { 1 } else { 0 })
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(_) => Json(ApiReturn {
|
||||||
|
ok: true,
|
||||||
|
message: "Product updated".to_string(),
|
||||||
|
payload: (),
|
||||||
|
}),
|
||||||
|
Err(e) => Json(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_price_request(
|
||||||
|
jar: CookieJar,
|
||||||
|
Extension(data): Extension<State>,
|
||||||
|
Path(id): Path<usize>,
|
||||||
|
Json(req): Json<UpdateProductPrice>,
|
||||||
|
) -> 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()),
|
||||||
|
};
|
||||||
|
|
||||||
|
match data.update_product_price(id, &user, req.price).await {
|
||||||
|
Ok(_) => Json(ApiReturn {
|
||||||
|
ok: true,
|
||||||
|
message: "Product updated".to_string(),
|
||||||
|
payload: (),
|
||||||
|
}),
|
||||||
|
Err(e) => Json(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_method_request(
|
||||||
|
jar: CookieJar,
|
||||||
|
Extension(data): Extension<State>,
|
||||||
|
Path(id): Path<usize>,
|
||||||
|
Json(req): Json<UpdateProductMethod>,
|
||||||
|
) -> 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()),
|
||||||
|
};
|
||||||
|
|
||||||
|
match data.update_product_method(id, &user, req.method).await {
|
||||||
|
Ok(_) => Json(ApiReturn {
|
||||||
|
ok: true,
|
||||||
|
message: "Product updated".to_string(),
|
||||||
|
payload: (),
|
||||||
|
}),
|
||||||
|
Err(e) => Json(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_stock_request(
|
||||||
|
jar: CookieJar,
|
||||||
|
Extension(data): Extension<State>,
|
||||||
|
Path(id): Path<usize>,
|
||||||
|
Json(req): Json<UpdateProductStock>,
|
||||||
|
) -> 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()),
|
||||||
|
};
|
||||||
|
|
||||||
|
match data.update_product_stock(id, &user, req.stock).await {
|
||||||
|
Ok(_) => Json(ApiReturn {
|
||||||
|
ok: true,
|
||||||
|
message: "Product updated".to_string(),
|
||||||
|
payload: (),
|
||||||
|
}),
|
||||||
|
Err(e) => Json(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn buy_request(
|
||||||
|
jar: CookieJar,
|
||||||
|
Extension(data): Extension<State>,
|
||||||
|
Path(id): Path<usize>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let data = &(data.read().await).0;
|
||||||
|
let mut user = match get_user_from_token!(jar, data, oauth::AppScope::UserSendCoins) {
|
||||||
|
Some(ua) => ua,
|
||||||
|
None => return Json(Error::NotAllowed.into()),
|
||||||
|
};
|
||||||
|
|
||||||
|
match data.purchase_product(id, &mut user).await {
|
||||||
|
Ok(_) => Json(ApiReturn {
|
||||||
|
ok: true,
|
||||||
|
message: "Product purchased".to_string(),
|
||||||
|
payload: (),
|
||||||
|
}),
|
||||||
|
Err(e) => Json(e.into()),
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,6 +1,9 @@
|
||||||
use crate::{get_user_from_token, State, cookie::CookieJar};
|
use crate::{get_user_from_token, State, cookie::CookieJar};
|
||||||
use axum::{response::IntoResponse, Extension, Json};
|
use axum::{response::IntoResponse, Extension, Json};
|
||||||
use tetratto_core::model::{economy::CoinTransfer, oauth, ApiReturn, Error};
|
use tetratto_core::model::{
|
||||||
|
economy::{CoinTransfer, CoinTransferMethod},
|
||||||
|
oauth, ApiReturn, Error,
|
||||||
|
};
|
||||||
use super::CreateCoinTransfer;
|
use super::CreateCoinTransfer;
|
||||||
|
|
||||||
pub async fn create_request(
|
pub async fn create_request(
|
||||||
|
@ -15,13 +18,21 @@ pub async fn create_request(
|
||||||
};
|
};
|
||||||
|
|
||||||
match data
|
match data
|
||||||
.create_transfer(CoinTransfer::new(user.id, req.receiver, req.amount))
|
.create_transfer(
|
||||||
|
&mut CoinTransfer::new(
|
||||||
|
user.id,
|
||||||
|
req.receiver,
|
||||||
|
req.amount,
|
||||||
|
CoinTransferMethod::Transfer, // this endpoint is ONLY for regular transfers; products export a buy endpoint for the other method
|
||||||
|
),
|
||||||
|
true,
|
||||||
|
)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(s) => Json(ApiReturn {
|
Ok(s) => Json(ApiReturn {
|
||||||
ok: true,
|
ok: true,
|
||||||
message: "Stack created".to_string(),
|
message: "Transfer created".to_string(),
|
||||||
payload: s.id.to_string(),
|
payload: s.to_string(),
|
||||||
}),
|
}),
|
||||||
Err(e) => Json(e.into()),
|
Err(e) => Json(e.into()),
|
||||||
}
|
}
|
45
crates/app/src/routes/pages/economy.rs
Normal file
45
crates/app/src/routes/pages/economy.rs
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
use axum::{
|
||||||
|
extract::{Query, Path},
|
||||||
|
response::{Html, IntoResponse},
|
||||||
|
Extension,
|
||||||
|
};
|
||||||
|
use crate::cookie::CookieJar;
|
||||||
|
use tetratto_core::model::Error;
|
||||||
|
use crate::{assets::initial_context, get_lang, get_user_from_token, State};
|
||||||
|
use super::{render_error, PaginatedQuery};
|
||||||
|
|
||||||
|
/// `/wallet`
|
||||||
|
pub async fn wallet_request(
|
||||||
|
jar: CookieJar,
|
||||||
|
Extension(data): Extension<State>,
|
||||||
|
Query(props): Query<PaginatedQuery>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let data = data.read().await;
|
||||||
|
let user = match get_user_from_token!(jar, data.0) {
|
||||||
|
Some(ua) => ua,
|
||||||
|
None => {
|
||||||
|
return Err(Html(
|
||||||
|
render_error(Error::NotAllowed, &jar, &data, &None).await,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let list = match data.0.get_transfers_by_user(user.id, 12, props.page).await {
|
||||||
|
Ok(x) => match data.0.fill_transfers(x).await {
|
||||||
|
Ok(x) => x,
|
||||||
|
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||||
|
},
|
||||||
|
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||||
|
};
|
||||||
|
|
||||||
|
let lang = get_lang!(jar, data.0);
|
||||||
|
let mut context = initial_context(&data.0.0.0, lang, &Some(user)).await;
|
||||||
|
|
||||||
|
context.insert("list", &list);
|
||||||
|
context.insert("page", &props.page);
|
||||||
|
|
||||||
|
// return
|
||||||
|
Ok(Html(
|
||||||
|
data.1.render("economy/wallet.html", &context).unwrap(),
|
||||||
|
))
|
||||||
|
}
|
|
@ -2,6 +2,7 @@ pub mod auth;
|
||||||
pub mod chats;
|
pub mod chats;
|
||||||
pub mod communities;
|
pub mod communities;
|
||||||
pub mod developer;
|
pub mod developer;
|
||||||
|
pub mod economy;
|
||||||
pub mod forge;
|
pub mod forge;
|
||||||
pub mod journals;
|
pub mod journals;
|
||||||
pub mod littleweb;
|
pub mod littleweb;
|
||||||
|
@ -159,6 +160,8 @@ pub fn routes() -> Router {
|
||||||
.route("/mail/sent", get(mail::sent_request))
|
.route("/mail/sent", get(mail::sent_request))
|
||||||
.route("/mail/compose", get(mail::compose_request))
|
.route("/mail/compose", get(mail::compose_request))
|
||||||
.route("/mail/letter/{id}", get(mail::letter_request))
|
.route("/mail/letter/{id}", get(mail::letter_request))
|
||||||
|
// economy
|
||||||
|
.route("/wallet", get(economy::wallet_request))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn lw_routes() -> Router {
|
pub fn lw_routes() -> Router {
|
||||||
|
|
|
@ -315,6 +315,9 @@ pub struct Config {
|
||||||
/// to post in by default. This should be some sort of "general" topic.
|
/// to post in by default. This should be some sort of "general" topic.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub town_square_forum_topic: usize,
|
pub town_square_forum_topic: usize,
|
||||||
|
/// The ID of the "system" user which will send system mails to users.
|
||||||
|
#[serde(default)]
|
||||||
|
pub system_user: usize,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub connections: ConnectionsConfig,
|
pub connections: ConnectionsConfig,
|
||||||
/// The path to the HTML footer file. The contents of this file are embedded
|
/// The path to the HTML footer file. The contents of this file are embedded
|
||||||
|
@ -396,6 +399,8 @@ fn default_banned_usernames() -> Vec<String> {
|
||||||
"services".to_string(),
|
"services".to_string(),
|
||||||
"domains".to_string(),
|
"domains".to_string(),
|
||||||
"mail".to_string(),
|
"mail".to_string(),
|
||||||
|
"product".to_string(),
|
||||||
|
"wallet".to_string(),
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -439,6 +444,7 @@ impl Default for Config {
|
||||||
town_square: 0,
|
town_square: 0,
|
||||||
town_square_forum: 0,
|
town_square_forum: 0,
|
||||||
town_square_forum_topic: 0,
|
town_square_forum_topic: 0,
|
||||||
|
system_user: 0,
|
||||||
connections: default_connections(),
|
connections: default_connections(),
|
||||||
html_footer_path: String::new(),
|
html_footer_path: String::new(),
|
||||||
stripe: None,
|
stripe: None,
|
||||||
|
|
|
@ -44,6 +44,8 @@ impl DataManager {
|
||||||
execute!(&conn, common::CREATE_TABLE_SERVICES).unwrap();
|
execute!(&conn, common::CREATE_TABLE_SERVICES).unwrap();
|
||||||
execute!(&conn, common::CREATE_TABLE_APP_DATA).unwrap();
|
execute!(&conn, common::CREATE_TABLE_APP_DATA).unwrap();
|
||||||
execute!(&conn, common::CREATE_TABLE_LETTERS).unwrap();
|
execute!(&conn, common::CREATE_TABLE_LETTERS).unwrap();
|
||||||
|
execute!(&conn, common::CREATE_TABLE_TRANSFERS).unwrap();
|
||||||
|
execute!(&conn, common::CREATE_TABLE_PRODUCTS).unwrap();
|
||||||
|
|
||||||
for x in common::VERSION_MIGRATIONS.split(";") {
|
for x in common::VERSION_MIGRATIONS.split(";") {
|
||||||
execute!(&conn, x).unwrap();
|
execute!(&conn, x).unwrap();
|
||||||
|
|
|
@ -32,3 +32,5 @@ pub const CREATE_TABLE_DOMAINS: &str = include_str!("./sql/create_domains.sql");
|
||||||
pub const CREATE_TABLE_SERVICES: &str = include_str!("./sql/create_services.sql");
|
pub const CREATE_TABLE_SERVICES: &str = include_str!("./sql/create_services.sql");
|
||||||
pub const CREATE_TABLE_APP_DATA: &str = include_str!("./sql/create_app_data.sql");
|
pub const CREATE_TABLE_APP_DATA: &str = include_str!("./sql/create_app_data.sql");
|
||||||
pub const CREATE_TABLE_LETTERS: &str = include_str!("./sql/create_letters.sql");
|
pub const CREATE_TABLE_LETTERS: &str = include_str!("./sql/create_letters.sql");
|
||||||
|
pub const CREATE_TABLE_TRANSFERS: &str = include_str!("./sql/create_transfers.sql");
|
||||||
|
pub const CREATE_TABLE_PRODUCTS: &str = include_str!("./sql/create_products.sql");
|
||||||
|
|
11
crates/core/src/database/drivers/sql/create_products.sql
Normal file
11
crates/core/src/database/drivers/sql/create_products.sql
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
CREATE TABLE IF NOT EXISTS products (
|
||||||
|
id BIGINT NOT NULL PRIMARY KEY,
|
||||||
|
created BIGINT NOT NULL,
|
||||||
|
owner BIGINT NOT NULL,
|
||||||
|
title TEXT NOT NULL,
|
||||||
|
description TEXT NOT NULL,
|
||||||
|
method TEXT NOT NULL,
|
||||||
|
on_sale INT NOT NULL,
|
||||||
|
price INT NOT NULL,
|
||||||
|
stock INT NOT NULL
|
||||||
|
)
|
|
@ -4,5 +4,6 @@ CREATE TABLE IF NOT EXISTS requests (
|
||||||
owner BIGINT NOT NULL,
|
owner BIGINT NOT NULL,
|
||||||
action_type TEXT NOT NULL,
|
action_type TEXT NOT NULL,
|
||||||
linked_asset BIGINT NOT NULL,
|
linked_asset BIGINT NOT NULL,
|
||||||
|
data TEXT NOT NULL,
|
||||||
PRIMARY KEY (id, owner, linked_asset)
|
PRIMARY KEY (id, owner, linked_asset)
|
||||||
)
|
)
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
CREATE TABLE IF NOT EXISTS transfers (
|
||||||
|
id BIGINT NOT NULL PRIMARY KEY,
|
||||||
|
created BIGINT NOT NULL,
|
||||||
|
sender BIGINT NOT NULL,
|
||||||
|
receiver BIGINT NOT NULL,
|
||||||
|
amount INT NOT NULL,
|
||||||
|
is_pending INT NOT NULL,
|
||||||
|
method TEXT NOT NULL
|
||||||
|
)
|
|
@ -37,3 +37,7 @@ DROP COLUMN IF EXISTS seller_data;
|
||||||
-- users coins
|
-- users coins
|
||||||
ALTER TABLE users
|
ALTER TABLE users
|
||||||
ADD COLUMN IF NOT EXISTS coins INT DEFAULT 0;
|
ADD COLUMN IF NOT EXISTS coins INT DEFAULT 0;
|
||||||
|
|
||||||
|
-- requests data
|
||||||
|
ALTER TABLE requests
|
||||||
|
ADD COLUMN IF NOT EXISTS data TEXT DEFAULT '"Null"';
|
||||||
|
|
|
@ -1,91 +0,0 @@
|
||||||
use crate::model::economy::CoinTransfer;
|
|
||||||
use crate::model::{Error, Result};
|
|
||||||
use crate::{auto_method, DataManager};
|
|
||||||
use oiseau::{cache::Cache, execute, get, params, query_rows, PostgresRow};
|
|
||||||
|
|
||||||
impl DataManager {
|
|
||||||
/// Get a [`CoinTransfer`] from an SQL row.
|
|
||||||
pub(crate) fn get_transfer_from_row(x: &PostgresRow) -> CoinTransfer {
|
|
||||||
CoinTransfer {
|
|
||||||
id: get!(x->0(i64)) as usize,
|
|
||||||
created: get!(x->1(i64)) as usize,
|
|
||||||
sender: get!(x->2(i64)) as usize,
|
|
||||||
receiver: get!(x->3(i64)) as usize,
|
|
||||||
amount: get!(x->4(i32)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto_method!(get_transfer_by_id(usize as i64)@get_transfer_from_row -> "SELECT * FROM transfers WHERE id = $1" --name="transfer" --returns=CoinTransfer --cache-key-tmpl="atto.transfer:{}");
|
|
||||||
|
|
||||||
/// Get all transfers by user.
|
|
||||||
///
|
|
||||||
/// # Arguments
|
|
||||||
/// * `id` - the ID of the user to fetch transfers for
|
|
||||||
/// * `batch` - the limit of items in each page
|
|
||||||
/// * `page` - the page number
|
|
||||||
pub async fn get_transfers_by_user(
|
|
||||||
&self,
|
|
||||||
id: usize,
|
|
||||||
batch: usize,
|
|
||||||
page: usize,
|
|
||||||
) -> Result<Vec<CoinTransfer>> {
|
|
||||||
let conn = match self.0.connect().await {
|
|
||||||
Ok(c) => c,
|
|
||||||
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
|
||||||
};
|
|
||||||
|
|
||||||
let res = query_rows!(
|
|
||||||
&conn,
|
|
||||||
"SELECT * FROM transfers WHERE sender = $1 OR receiver = $1 ORDER BY created DESC LIMIT $2 OFFSET $3",
|
|
||||||
&[&(id as i64), &(batch as i64), &((page * batch) as i64)],
|
|
||||||
|x| { Self::get_transfer_from_row(x) }
|
|
||||||
);
|
|
||||||
|
|
||||||
if res.is_err() {
|
|
||||||
return Err(Error::GeneralNotFound("transfer".to_string()));
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(res.unwrap())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Create a new transfer in the database.
|
|
||||||
///
|
|
||||||
/// # Arguments
|
|
||||||
/// * `data` - a mock [`CoinTransfer`] object to insert
|
|
||||||
pub async fn create_transfer(&self, data: CoinTransfer) -> Result<CoinTransfer> {
|
|
||||||
// check values
|
|
||||||
let mut sender = self.get_user_by_id(data.sender).await?;
|
|
||||||
let mut receiver = self.get_user_by_id(data.receiver).await?;
|
|
||||||
let (sender_bankrupt, receiver_bankrupt) = data.apply(&mut sender, &mut receiver);
|
|
||||||
|
|
||||||
if sender_bankrupt | receiver_bankrupt {
|
|
||||||
return Err(Error::MiscError(
|
|
||||||
"One party of this transfer cannot afford this".to_string(),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
// ...
|
|
||||||
let conn = match self.0.connect().await {
|
|
||||||
Ok(c) => c,
|
|
||||||
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
|
||||||
};
|
|
||||||
|
|
||||||
let res = execute!(
|
|
||||||
&conn,
|
|
||||||
"INSERT INTO transfers VALUES ($1, $2, $3, $4, $5)",
|
|
||||||
params![
|
|
||||||
&(data.id as i64),
|
|
||||||
&(data.created as i64),
|
|
||||||
&(data.sender as i64),
|
|
||||||
&(data.receiver as i64),
|
|
||||||
&data.amount
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
if let Err(e) = res {
|
|
||||||
return Err(Error::DatabaseError(e.to_string()));
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(data)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -200,6 +200,7 @@ impl DataManager {
|
||||||
community.owner,
|
community.owner,
|
||||||
ActionType::CommunityJoin,
|
ActionType::CommunityJoin,
|
||||||
community.id,
|
community.id,
|
||||||
|
None,
|
||||||
))
|
))
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@ pub mod connections;
|
||||||
mod domains;
|
mod domains;
|
||||||
mod drafts;
|
mod drafts;
|
||||||
mod drivers;
|
mod drivers;
|
||||||
mod economy;
|
|
||||||
mod emojis;
|
mod emojis;
|
||||||
mod invite_codes;
|
mod invite_codes;
|
||||||
mod ipbans;
|
mod ipbans;
|
||||||
|
@ -24,6 +23,7 @@ mod notifications;
|
||||||
mod polls;
|
mod polls;
|
||||||
mod pollvotes;
|
mod pollvotes;
|
||||||
mod posts;
|
mod posts;
|
||||||
|
mod products;
|
||||||
mod questions;
|
mod questions;
|
||||||
mod reactions;
|
mod reactions;
|
||||||
mod reports;
|
mod reports;
|
||||||
|
@ -31,6 +31,7 @@ mod requests;
|
||||||
mod services;
|
mod services;
|
||||||
mod stackblocks;
|
mod stackblocks;
|
||||||
mod stacks;
|
mod stacks;
|
||||||
|
mod transfers;
|
||||||
mod uploads;
|
mod uploads;
|
||||||
mod user_warnings;
|
mod user_warnings;
|
||||||
mod userblocks;
|
mod userblocks;
|
||||||
|
|
228
crates/core/src/database/products.rs
Normal file
228
crates/core/src/database/products.rs
Normal file
|
@ -0,0 +1,228 @@
|
||||||
|
use crate::model::{
|
||||||
|
auth::User,
|
||||||
|
economy::{CoinTransfer, CoinTransferMethod, Product, ProductFulfillmentMethod},
|
||||||
|
mail::Letter,
|
||||||
|
permissions::FinePermission,
|
||||||
|
Error, Result,
|
||||||
|
};
|
||||||
|
use crate::{auto_method, DataManager};
|
||||||
|
use oiseau::{cache::Cache, execute, get, params, query_rows, PostgresRow};
|
||||||
|
|
||||||
|
impl DataManager {
|
||||||
|
/// Get a [`Product`] from an SQL row.
|
||||||
|
pub(crate) fn get_product_from_row(x: &PostgresRow) -> Product {
|
||||||
|
Product {
|
||||||
|
id: get!(x->0(i64)) as usize,
|
||||||
|
created: get!(x->1(i64)) as usize,
|
||||||
|
owner: get!(x->2(i64)) as usize,
|
||||||
|
title: get!(x->3(String)),
|
||||||
|
description: get!(x->4(String)),
|
||||||
|
method: serde_json::from_str(&get!(x->5(String))).unwrap(),
|
||||||
|
on_sale: get!(x->6(i32)) as i8 == 1,
|
||||||
|
price: get!(x->7(i32)),
|
||||||
|
stock: get!(x->8(i32)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto_method!(get_product_by_id(usize as i64)@get_product_from_row -> "SELECT * FROM products WHERE id = $1" --name="product" --returns=Product --cache-key-tmpl="atto.product:{}");
|
||||||
|
|
||||||
|
/// Get all products by user.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `id` - the ID of the user to fetch products for
|
||||||
|
/// * `batch` - the limit of items in each page
|
||||||
|
/// * `page` - the page number
|
||||||
|
pub async fn get_products_by_user(
|
||||||
|
&self,
|
||||||
|
id: usize,
|
||||||
|
batch: usize,
|
||||||
|
page: usize,
|
||||||
|
) -> Result<Vec<Product>> {
|
||||||
|
let conn = match self.0.connect().await {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||||
|
};
|
||||||
|
|
||||||
|
let res = query_rows!(
|
||||||
|
&conn,
|
||||||
|
"SELECT * FROM products WHERE owner = $1 ORDER BY created DESC LIMIT $2 OFFSET $3",
|
||||||
|
&[&(id as i64), &(batch as i64), &((page * batch) as i64)],
|
||||||
|
|x| { Self::get_product_from_row(x) }
|
||||||
|
);
|
||||||
|
|
||||||
|
if res.is_err() {
|
||||||
|
return Err(Error::GeneralNotFound("product".to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(res.unwrap())
|
||||||
|
}
|
||||||
|
|
||||||
|
const MAXIMUM_FREE_PRODUCTS: usize = 5;
|
||||||
|
|
||||||
|
/// Create a new product in the database.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `data` - a mock [`Product`] object to insert
|
||||||
|
pub async fn create_product(&self, mut data: Product) -> Result<Product> {
|
||||||
|
data.title = data.title.trim().to_string();
|
||||||
|
data.description = data.description.trim().to_string();
|
||||||
|
|
||||||
|
// check values
|
||||||
|
if data.title.len() < 2 {
|
||||||
|
return Err(Error::DataTooShort("title".to_string()));
|
||||||
|
} else if data.title.len() > 128 {
|
||||||
|
return Err(Error::DataTooLong("title".to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
if data.description.len() < 2 {
|
||||||
|
return Err(Error::DataTooShort("description".to_string()));
|
||||||
|
} else if data.description.len() > 1024 {
|
||||||
|
return Err(Error::DataTooLong("description".to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// check number of stacks
|
||||||
|
let owner = self.get_user_by_id(data.owner).await?;
|
||||||
|
|
||||||
|
if !owner.permissions.check(FinePermission::SUPPORTER) {
|
||||||
|
let products = self
|
||||||
|
.get_table_row_count_where("products", &format!("owner = {}", owner.id))
|
||||||
|
.await? as usize;
|
||||||
|
|
||||||
|
if products >= Self::MAXIMUM_FREE_PRODUCTS {
|
||||||
|
return Err(Error::MiscError(
|
||||||
|
"You already have the maximum number of products you can have".to_string(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ...
|
||||||
|
let conn = match self.0.connect().await {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||||
|
};
|
||||||
|
|
||||||
|
let res = execute!(
|
||||||
|
&conn,
|
||||||
|
"INSERT INTO products VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
|
||||||
|
params![
|
||||||
|
&(data.id as i64),
|
||||||
|
&(data.created as i64),
|
||||||
|
&(data.owner as i64),
|
||||||
|
&data.title,
|
||||||
|
&data.description,
|
||||||
|
&serde_json::to_string(&data.method).unwrap(),
|
||||||
|
&{ if data.on_sale { 1 } else { 0 } },
|
||||||
|
&data.price,
|
||||||
|
&(data.stock as i32)
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
if let Err(e) = res {
|
||||||
|
return Err(Error::DatabaseError(e.to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Purchase the given product as the given user.
|
||||||
|
pub async fn purchase_product(
|
||||||
|
&self,
|
||||||
|
product: usize,
|
||||||
|
customer: &mut User,
|
||||||
|
) -> Result<CoinTransfer> {
|
||||||
|
let product = self.get_product_by_id(product).await?;
|
||||||
|
let mut transfer = CoinTransfer::new(
|
||||||
|
customer.id,
|
||||||
|
product.owner,
|
||||||
|
product.price,
|
||||||
|
CoinTransferMethod::Purchase(product.id),
|
||||||
|
);
|
||||||
|
|
||||||
|
if !product.stock.is_negative() {
|
||||||
|
// check stock
|
||||||
|
if product.stock == 0 {
|
||||||
|
return Err(Error::MiscError("No remaining stock".to_string()));
|
||||||
|
} else {
|
||||||
|
self.decr_product_stock(product.id).await?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
match product.method {
|
||||||
|
ProductFulfillmentMethod::AutoMail(message) => {
|
||||||
|
// we're basically done, transfer coins and send mail
|
||||||
|
self.create_transfer(&mut transfer, false).await?;
|
||||||
|
|
||||||
|
self.create_letter(Letter::new(
|
||||||
|
self.0.0.system_user,
|
||||||
|
vec![customer.id],
|
||||||
|
format!("Thank you for purchasing \"{}\"", product.title),
|
||||||
|
format!("The message below was supplied by the product owner, and was automatically sent.\n***\n{message}"),
|
||||||
|
0,
|
||||||
|
))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(transfer)
|
||||||
|
}
|
||||||
|
ProductFulfillmentMethod::ManualMail => {
|
||||||
|
// mark transfer as pending and create it
|
||||||
|
self.create_transfer(&mut transfer, false).await?;
|
||||||
|
|
||||||
|
// tell product owner they have a new pending purchase
|
||||||
|
self.create_letter(Letter::new(
|
||||||
|
self.0.0.system_user,
|
||||||
|
vec![product.owner],
|
||||||
|
"New product purchase pending".to_string(),
|
||||||
|
format!(
|
||||||
|
"Somebody has purchased your [product](/product/{}) \"{}\". Per your product's settings, the payment will not be completed until you manually mail them a letter **using the link below**.
|
||||||
|
|
||||||
|
If your product is a purchase of goods or services, please be sure to fulfill this purchase either in the letter or elsewhere. The customer may request support if you fail to do so.
|
||||||
|
|
||||||
|
***
|
||||||
|
<a class=\"button\" href=\"/mail/compose?receivers=id:{}&title=Product%20fulfillment&transfer_id={}\">Fulfill purchase</a>",
|
||||||
|
product.id, product.title, customer.id, transfer.id
|
||||||
|
),
|
||||||
|
0,
|
||||||
|
))
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
// return
|
||||||
|
Ok(transfer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn delete_product(&self, id: usize, user: &User) -> Result<()> {
|
||||||
|
let product = self.get_product_by_id(id).await?;
|
||||||
|
|
||||||
|
// check user permission
|
||||||
|
if user.id != product.owner && !user.permissions.check(FinePermission::MANAGE_USERS) {
|
||||||
|
return Err(Error::NotAllowed);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ...
|
||||||
|
let conn = match self.0.connect().await {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||||
|
};
|
||||||
|
|
||||||
|
let res = execute!(&conn, "DELETE FROM products WHERE id = $1", &[&(id as i64)]);
|
||||||
|
|
||||||
|
if let Err(e) = res {
|
||||||
|
return Err(Error::DatabaseError(e.to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ...
|
||||||
|
self.0.1.remove(format!("atto.product:{}", id)).await;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
auto_method!(update_product_title(&str)@get_product_by_id:FinePermission::MANAGE_USERS; -> "UPDATE products SET title = $1 WHERE id = $2" --cache-key-tmpl="atto.product:{}");
|
||||||
|
auto_method!(update_product_description(&str)@get_product_by_id:FinePermission::MANAGE_USERS; -> "UPDATE products SET description = $1 WHERE id = $2" --cache-key-tmpl="atto.product:{}");
|
||||||
|
auto_method!(update_product_price(i32)@get_product_by_id:FinePermission::MANAGE_USERS; -> "UPDATE products SET price = $1 WHERE id = $2" --cache-key-tmpl="atto.product:{}");
|
||||||
|
auto_method!(update_product_on_sale(i32)@get_product_by_id:FinePermission::MANAGE_USERS; -> "UPDATE products SET on_sale = $1 WHERE id = $2" --cache-key-tmpl="atto.product:{}");
|
||||||
|
auto_method!(update_product_method(ProductFulfillmentMethod)@get_product_by_id:FinePermission::MANAGE_USERS; -> "UPDATE products SET method = $1 WHERE id = $2" --serde --cache-key-tmpl="atto.product:{}");
|
||||||
|
|
||||||
|
auto_method!(update_product_stock(i32)@get_product_by_id:FinePermission::MANAGE_USERS; -> "UPDATE products SET stock = $1 WHERE id = $2" --cache-key-tmpl="atto.product:{}");
|
||||||
|
auto_method!(incr_product_stock() -> "UPDATE products SET stock = stock + 1 WHERE id = $1" --cache-key-tmpl="atto.product:{}" --incr);
|
||||||
|
auto_method!(decr_product_stock()@get_product_by_id -> "UPDATE products SET stock = stock - 1 WHERE id = $1" --cache-key-tmpl="atto.product:{}" --decr=stock);
|
||||||
|
}
|
|
@ -506,6 +506,7 @@ impl DataManager {
|
||||||
data.receiver,
|
data.receiver,
|
||||||
ActionType::Answer,
|
ActionType::Answer,
|
||||||
data.id,
|
data.id,
|
||||||
|
None,
|
||||||
))
|
))
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ impl DataManager {
|
||||||
owner: get!(x->2(i64)) as usize,
|
owner: get!(x->2(i64)) as usize,
|
||||||
action_type: serde_json::from_str(&get!(x->3(String))).unwrap(),
|
action_type: serde_json::from_str(&get!(x->3(String))).unwrap(),
|
||||||
linked_asset: get!(x->4(i64)) as usize,
|
linked_asset: get!(x->4(i64)) as usize,
|
||||||
|
data: serde_json::from_str(&get!(x->5(String))).unwrap(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,13 +119,14 @@ impl DataManager {
|
||||||
|
|
||||||
let res = execute!(
|
let res = execute!(
|
||||||
&conn,
|
&conn,
|
||||||
"INSERT INTO requests VALUES ($1, $2, $3, $4, $5)",
|
"INSERT INTO requests VALUES ($1, $2, $3, $4, $5, $6)",
|
||||||
params![
|
params![
|
||||||
&(data.id as i64),
|
&(data.id as i64),
|
||||||
&(data.created as i64),
|
&(data.created as i64),
|
||||||
&(data.owner as i64),
|
&(data.owner as i64),
|
||||||
&serde_json::to_string(&data.action_type).unwrap().as_str(),
|
&serde_json::to_string(&data.action_type).unwrap().as_str(),
|
||||||
&(data.linked_asset as i64),
|
&(data.linked_asset as i64),
|
||||||
|
&serde_json::to_string(&data.data).unwrap().as_str(),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
175
crates/core/src/database/transfers.rs
Normal file
175
crates/core/src/database/transfers.rs
Normal file
|
@ -0,0 +1,175 @@
|
||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
use crate::model::auth::User;
|
||||||
|
use crate::model::economy::{CoinTransferMethod, Product};
|
||||||
|
use crate::model::{Error, Result, economy::CoinTransfer};
|
||||||
|
use crate::{auto_method, DataManager};
|
||||||
|
use oiseau::{cache::Cache, execute, get, params, query_rows, PostgresRow};
|
||||||
|
|
||||||
|
impl DataManager {
|
||||||
|
/// Get a [`CoinTransfer`] from an SQL row.
|
||||||
|
pub(crate) fn get_transfer_from_row(x: &PostgresRow) -> CoinTransfer {
|
||||||
|
CoinTransfer {
|
||||||
|
id: get!(x->0(i64)) as usize,
|
||||||
|
created: get!(x->1(i64)) as usize,
|
||||||
|
sender: get!(x->2(i64)) as usize,
|
||||||
|
receiver: get!(x->3(i64)) as usize,
|
||||||
|
amount: get!(x->4(i32)),
|
||||||
|
is_pending: get!(x->5(i32)) as i8 == 1,
|
||||||
|
method: serde_json::from_str(&get!(x->6(String))).unwrap(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto_method!(get_transfer_by_id(usize as i64)@get_transfer_from_row -> "SELECT * FROM transfers WHERE id = $1" --name="transfer" --returns=CoinTransfer --cache-key-tmpl="atto.transfer:{}");
|
||||||
|
|
||||||
|
/// Fill a list of transfers with their users and product.
|
||||||
|
pub async fn fill_transfers(
|
||||||
|
&self,
|
||||||
|
list: Vec<CoinTransfer>,
|
||||||
|
) -> Result<Vec<(usize, usize, i32, User, User, Option<Product>, bool)>> {
|
||||||
|
let mut out = Vec::new();
|
||||||
|
let mut seen_users: HashMap<usize, User> = HashMap::new();
|
||||||
|
let mut seen_products: HashMap<usize, Product> = HashMap::new();
|
||||||
|
|
||||||
|
for transfer in list {
|
||||||
|
out.push((
|
||||||
|
transfer.id,
|
||||||
|
transfer.created,
|
||||||
|
transfer.amount,
|
||||||
|
if let Some(user) = seen_users.get(&transfer.sender) {
|
||||||
|
user.to_owned()
|
||||||
|
} else {
|
||||||
|
let user = self.get_user_by_id(transfer.sender).await?;
|
||||||
|
seen_users.insert(user.id, user.clone());
|
||||||
|
user
|
||||||
|
},
|
||||||
|
if let Some(user) = seen_users.get(&transfer.receiver) {
|
||||||
|
user.to_owned()
|
||||||
|
} else {
|
||||||
|
let user = self.get_user_by_id(transfer.receiver).await?;
|
||||||
|
seen_users.insert(user.id, user.clone());
|
||||||
|
user
|
||||||
|
},
|
||||||
|
match transfer.method {
|
||||||
|
CoinTransferMethod::Transfer => None,
|
||||||
|
CoinTransferMethod::Purchase(id) => {
|
||||||
|
Some(if let Some(product) = seen_products.get(&id) {
|
||||||
|
product.to_owned()
|
||||||
|
} else {
|
||||||
|
let product = self.get_product_by_id(id).await?;
|
||||||
|
seen_products.insert(product.id, product.clone());
|
||||||
|
product
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
transfer.is_pending,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get all transfers by user.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `id` - the ID of the user to fetch transfers for
|
||||||
|
/// * `batch` - the limit of items in each page
|
||||||
|
/// * `page` - the page number
|
||||||
|
pub async fn get_transfers_by_user(
|
||||||
|
&self,
|
||||||
|
id: usize,
|
||||||
|
batch: usize,
|
||||||
|
page: usize,
|
||||||
|
) -> Result<Vec<CoinTransfer>> {
|
||||||
|
let conn = match self.0.connect().await {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||||
|
};
|
||||||
|
|
||||||
|
let res = query_rows!(
|
||||||
|
&conn,
|
||||||
|
"SELECT * FROM transfers WHERE sender = $1 OR receiver = $1 ORDER BY created DESC LIMIT $2 OFFSET $3",
|
||||||
|
&[&(id as i64), &(batch as i64), &((page * batch) as i64)],
|
||||||
|
|x| { Self::get_transfer_from_row(x) }
|
||||||
|
);
|
||||||
|
|
||||||
|
if res.is_err() {
|
||||||
|
return Err(Error::GeneralNotFound("transfer".to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(res.unwrap())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create a new transfer in the database.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `data` - a mock [`CoinTransfer`] object to insert
|
||||||
|
pub async fn create_transfer(&self, data: &mut CoinTransfer, apply: bool) -> Result<usize> {
|
||||||
|
// check values
|
||||||
|
let mut sender = self.get_user_by_id(data.sender).await?;
|
||||||
|
let mut receiver = self.get_user_by_id(data.receiver).await?;
|
||||||
|
let (sender_bankrupt, receiver_bankrupt) = data.apply(&mut sender, &mut receiver);
|
||||||
|
|
||||||
|
if sender_bankrupt | receiver_bankrupt {
|
||||||
|
return Err(Error::MiscError(
|
||||||
|
"One party of this transfer cannot afford this".to_string(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
if apply {
|
||||||
|
self.update_user_coins(sender.id, sender.coins).await?;
|
||||||
|
self.update_user_coins(receiver.id, receiver.coins).await?;
|
||||||
|
} else {
|
||||||
|
// we haven't applied the transfer, so this must be pending
|
||||||
|
data.is_pending = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ...
|
||||||
|
let conn = match self.0.connect().await {
|
||||||
|
Ok(c) => c,
|
||||||
|
Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
|
||||||
|
};
|
||||||
|
|
||||||
|
let res = execute!(
|
||||||
|
&conn,
|
||||||
|
"INSERT INTO transfers VALUES ($1, $2, $3, $4, $5, $6, $7)",
|
||||||
|
params![
|
||||||
|
&(data.id as i64),
|
||||||
|
&(data.created as i64),
|
||||||
|
&(data.sender as i64),
|
||||||
|
&(data.receiver as i64),
|
||||||
|
&data.amount,
|
||||||
|
&{ if data.is_pending { 1 } else { 0 } },
|
||||||
|
&serde_json::to_string(&data.method).unwrap(),
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
if let Err(e) = res {
|
||||||
|
return Err(Error::DatabaseError(e.to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(data.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Apply a pending transfer.
|
||||||
|
pub async fn apply_transfer(&self, id: usize) -> Result<()> {
|
||||||
|
let transfer = self.get_transfer_by_id(id).await?;
|
||||||
|
|
||||||
|
let mut sender = self.get_user_by_id(transfer.sender).await?;
|
||||||
|
let mut receiver = self.get_user_by_id(transfer.receiver).await?;
|
||||||
|
let (sender_bankrupt, receiver_bankrupt) = transfer.apply(&mut sender, &mut receiver);
|
||||||
|
|
||||||
|
if sender_bankrupt | receiver_bankrupt {
|
||||||
|
return Err(Error::MiscError(
|
||||||
|
"One party of this transfer cannot afford this".to_string(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
self.update_user_coins(sender.id, sender.coins).await?;
|
||||||
|
self.update_user_coins(receiver.id, receiver.coins).await?;
|
||||||
|
self.update_transfer_is_pending(id, 0).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
auto_method!(update_transfer_is_pending(i32) -> "UPDATE products SET is_pending = $1 WHERE id = $2" --cache-key-tmpl="atto.transfer:{}");
|
||||||
|
}
|
|
@ -276,6 +276,7 @@ impl DataManager {
|
||||||
data.receiver,
|
data.receiver,
|
||||||
ActionType::Follow,
|
ActionType::Follow,
|
||||||
data.receiver,
|
data.receiver,
|
||||||
|
None,
|
||||||
))
|
))
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,60 @@
|
||||||
use serde::{Serialize, Deserialize};
|
use serde::{Serialize, Deserialize};
|
||||||
use tetratto_shared::{snow::Snowflake, unix_epoch_timestamp};
|
use tetratto_shared::{snow::Snowflake, unix_epoch_timestamp};
|
||||||
|
|
||||||
use super::auth::User;
|
use super::auth::User;
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
|
pub enum ProductFulfillmentMethod {
|
||||||
|
/// Automatically send a letter to the customer with the specified content.
|
||||||
|
AutoMail(String),
|
||||||
|
/// Manually send a letter to the customer with the specified content.
|
||||||
|
///
|
||||||
|
/// This will leave the [`CoinTransfer`] pending until you send this mail.
|
||||||
|
ManualMail,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Deserialize)]
|
||||||
|
pub struct Product {
|
||||||
|
pub id: usize,
|
||||||
|
pub created: usize,
|
||||||
|
pub owner: usize,
|
||||||
|
pub title: String,
|
||||||
|
pub description: String,
|
||||||
|
/// How this product will be delivered.
|
||||||
|
pub method: ProductFulfillmentMethod,
|
||||||
|
/// If this product is actually for sale.
|
||||||
|
pub on_sale: bool,
|
||||||
|
/// The price of this product.
|
||||||
|
pub price: i32,
|
||||||
|
/// The number of times this product can be purchased.
|
||||||
|
///
|
||||||
|
/// A negative stock means the product has unlimited stock.
|
||||||
|
pub stock: i32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Product {
|
||||||
|
/// Create a new [`Product`].
|
||||||
|
pub fn new(owner: usize, title: String, description: String) -> Self {
|
||||||
|
Self {
|
||||||
|
id: Snowflake::new().to_string().parse::<usize>().unwrap(),
|
||||||
|
created: unix_epoch_timestamp(),
|
||||||
|
owner,
|
||||||
|
title,
|
||||||
|
description,
|
||||||
|
method: ProductFulfillmentMethod::ManualMail,
|
||||||
|
on_sale: false,
|
||||||
|
price: 0,
|
||||||
|
stock: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub enum CoinTransferMethod {
|
||||||
|
Transfer,
|
||||||
|
/// A [`Product`] purchase with the product's ID.
|
||||||
|
Purchase(usize),
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
pub struct CoinTransfer {
|
pub struct CoinTransfer {
|
||||||
pub id: usize,
|
pub id: usize,
|
||||||
|
@ -10,17 +62,21 @@ pub struct CoinTransfer {
|
||||||
pub sender: usize,
|
pub sender: usize,
|
||||||
pub receiver: usize,
|
pub receiver: usize,
|
||||||
pub amount: i32,
|
pub amount: i32,
|
||||||
|
pub is_pending: bool,
|
||||||
|
pub method: CoinTransferMethod,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl CoinTransfer {
|
impl CoinTransfer {
|
||||||
/// Create a new [`CoinTransfer`].
|
/// Create a new [`CoinTransfer`].
|
||||||
pub fn new(sender: usize, receiver: usize, amount: i32) -> Self {
|
pub fn new(sender: usize, receiver: usize, amount: i32, method: CoinTransferMethod) -> Self {
|
||||||
Self {
|
Self {
|
||||||
id: Snowflake::new().to_string().parse::<usize>().unwrap(),
|
id: Snowflake::new().to_string().parse::<usize>().unwrap(),
|
||||||
created: unix_epoch_timestamp(),
|
created: unix_epoch_timestamp(),
|
||||||
sender,
|
sender,
|
||||||
receiver,
|
receiver,
|
||||||
amount,
|
amount,
|
||||||
|
is_pending: false,
|
||||||
|
method,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -74,10 +74,10 @@ pub enum AppScope {
|
||||||
UserReadDomains,
|
UserReadDomains,
|
||||||
/// Read the user's services.
|
/// Read the user's services.
|
||||||
UserReadServices,
|
UserReadServices,
|
||||||
/// Read the user's products.
|
|
||||||
UserReadProducts,
|
|
||||||
/// Read the user's letters.
|
/// Read the user's letters.
|
||||||
UserReadLetters,
|
UserReadLetters,
|
||||||
|
/// Read the user's products.
|
||||||
|
UserReadProducts,
|
||||||
/// Create posts as the user.
|
/// Create posts as the user.
|
||||||
UserCreatePosts,
|
UserCreatePosts,
|
||||||
/// Create messages as the user.
|
/// Create messages as the user.
|
||||||
|
@ -102,10 +102,10 @@ pub enum AppScope {
|
||||||
UserCreateDomains,
|
UserCreateDomains,
|
||||||
/// Create services on behalf of the user.
|
/// Create services on behalf of the user.
|
||||||
UserCreateServices,
|
UserCreateServices,
|
||||||
/// Create products on behalf of the user.
|
|
||||||
UserCreateProducts,
|
|
||||||
/// Create letters on behalf of the user.
|
/// Create letters on behalf of the user.
|
||||||
UserCreateLetters,
|
UserCreateLetters,
|
||||||
|
/// Create products on behalf of the user.
|
||||||
|
UserCreateProducts,
|
||||||
/// Send coins on behalf of the user.
|
/// Send coins on behalf of the user.
|
||||||
UserSendCoins,
|
UserSendCoins,
|
||||||
/// Delete posts owned by the user.
|
/// Delete posts owned by the user.
|
||||||
|
@ -148,12 +148,12 @@ pub enum AppScope {
|
||||||
UserManageDomains,
|
UserManageDomains,
|
||||||
/// Manage the user's services.
|
/// Manage the user's services.
|
||||||
UserManageServices,
|
UserManageServices,
|
||||||
/// Manage the user's products.
|
|
||||||
UserManageProducts,
|
|
||||||
/// Manage the user's channel mutes.
|
/// Manage the user's channel mutes.
|
||||||
UserManageChannelMutes,
|
UserManageChannelMutes,
|
||||||
/// Manage the user's letters.
|
/// Manage the user's letters.
|
||||||
UserManageLetters,
|
UserManageLetters,
|
||||||
|
/// Manage the user's products.
|
||||||
|
UserManageProducts,
|
||||||
/// Edit posts created by the user.
|
/// Edit posts created by the user.
|
||||||
UserEditPosts,
|
UserEditPosts,
|
||||||
/// Edit drafts created by the user.
|
/// Edit drafts created by the user.
|
||||||
|
|
|
@ -1,6 +1,51 @@
|
||||||
use serde::{Serialize, Deserialize};
|
use serde::{Serialize, Deserialize};
|
||||||
use tetratto_shared::{snow::Snowflake, unix_epoch_timestamp};
|
use tetratto_shared::{snow::Snowflake, unix_epoch_timestamp};
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, PartialEq, Eq)]
|
||||||
|
pub enum ActionData {
|
||||||
|
String(String),
|
||||||
|
Int32(i32),
|
||||||
|
Usize(usize),
|
||||||
|
Many(Vec<ActionData>),
|
||||||
|
Null,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ActionData {
|
||||||
|
pub fn read_string(self) -> String {
|
||||||
|
match self {
|
||||||
|
ActionData::String(x) => x,
|
||||||
|
_ => String::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn read_int32(self) -> i32 {
|
||||||
|
match self {
|
||||||
|
ActionData::Int32(x) => x,
|
||||||
|
_ => i32::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn read_usize(self) -> usize {
|
||||||
|
match self {
|
||||||
|
ActionData::Usize(x) => x,
|
||||||
|
_ => usize::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn read_many(self) -> Vec<ActionData> {
|
||||||
|
match self {
|
||||||
|
ActionData::Many(x) => x,
|
||||||
|
_ => Vec::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for ActionData {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::Null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, PartialEq, Eq)]
|
#[derive(Serialize, Deserialize, PartialEq, Eq)]
|
||||||
pub enum ActionType {
|
pub enum ActionType {
|
||||||
/// A request to join a community.
|
/// A request to join a community.
|
||||||
|
@ -15,6 +60,10 @@ pub enum ActionType {
|
||||||
///
|
///
|
||||||
/// `users` table.
|
/// `users` table.
|
||||||
Follow,
|
Follow,
|
||||||
|
/// A request for the `owner` user (sender) to send the `linked_asset` user (receiver) coins.
|
||||||
|
///
|
||||||
|
/// Expects a `data` value of [`ActionData::Int32`] representing the coin amount.
|
||||||
|
Transfer,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
|
@ -26,28 +75,49 @@ pub struct ActionRequest {
|
||||||
/// The ID of the asset this request links to. Should exist in the correct
|
/// The ID of the asset this request links to. Should exist in the correct
|
||||||
/// table for the given [`ActionType`].
|
/// table for the given [`ActionType`].
|
||||||
pub linked_asset: usize,
|
pub linked_asset: usize,
|
||||||
|
/// Optional data attached to the action request.
|
||||||
|
pub data: ActionData,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ActionRequest {
|
impl ActionRequest {
|
||||||
/// Create a new [`ActionRequest`].
|
/// Create a new [`ActionRequest`].
|
||||||
pub fn new(owner: usize, action_type: ActionType, linked_asset: usize) -> Self {
|
pub fn new(
|
||||||
|
owner: usize,
|
||||||
|
action_type: ActionType,
|
||||||
|
linked_asset: usize,
|
||||||
|
data: Option<ActionData>,
|
||||||
|
) -> Self {
|
||||||
Self {
|
Self {
|
||||||
id: Snowflake::new().to_string().parse::<usize>().unwrap(),
|
id: Snowflake::new().to_string().parse::<usize>().unwrap(),
|
||||||
created: unix_epoch_timestamp(),
|
created: unix_epoch_timestamp(),
|
||||||
owner,
|
owner,
|
||||||
action_type,
|
action_type,
|
||||||
linked_asset,
|
linked_asset,
|
||||||
|
data: match data {
|
||||||
|
Some(x) => x,
|
||||||
|
None => ActionData::default(),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create a new [`ActionRequest`] with the given `id`.
|
/// Create a new [`ActionRequest`] with the given `id`.
|
||||||
pub fn with_id(id: usize, owner: usize, action_type: ActionType, linked_asset: usize) -> Self {
|
pub fn with_id(
|
||||||
|
id: usize,
|
||||||
|
owner: usize,
|
||||||
|
action_type: ActionType,
|
||||||
|
linked_asset: usize,
|
||||||
|
data: Option<ActionData>,
|
||||||
|
) -> Self {
|
||||||
Self {
|
Self {
|
||||||
id,
|
id,
|
||||||
created: unix_epoch_timestamp(),
|
created: unix_epoch_timestamp(),
|
||||||
owner,
|
owner,
|
||||||
action_type,
|
action_type,
|
||||||
linked_asset,
|
linked_asset,
|
||||||
|
data: match data {
|
||||||
|
Some(x) => x,
|
||||||
|
None => ActionData::default(),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@ banned_usernames = [
|
||||||
]
|
]
|
||||||
town_square = 166340372315581657
|
town_square = 166340372315581657
|
||||||
html_footer_path = "public/footer.html"
|
html_footer_path = "public/footer.html"
|
||||||
|
system_user = 211903918383300608
|
||||||
|
|
||||||
[security]
|
[security]
|
||||||
registration_enabled = true
|
registration_enabled = true
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue