add: user ads
This commit is contained in:
parent
46b3e66cd4
commit
2cb7d08ddc
41 changed files with 1095 additions and 29 deletions
132
crates/app/src/routes/api/v1/ads.rs
Normal file
132
crates/app/src/routes/api/v1/ads.rs
Normal file
|
@ -0,0 +1,132 @@
|
|||
use crate::{
|
||||
cookie::CookieJar,
|
||||
get_user_from_token,
|
||||
image::{save_webp_buffer, JsonMultipart},
|
||||
State,
|
||||
};
|
||||
use axum::{
|
||||
extract::Path,
|
||||
response::{IntoResponse, Redirect},
|
||||
Extension, Json,
|
||||
};
|
||||
use tetratto_core::model::{
|
||||
economy::UserAd,
|
||||
oauth,
|
||||
uploads::{MediaType, MediaUpload},
|
||||
ApiReturn, Error,
|
||||
};
|
||||
use super::{CreateAd, UpdateAdIsRunning};
|
||||
|
||||
const MAXIMUM_AD_FILE_SIZE: usize = 4_194_304;
|
||||
|
||||
pub async fn create_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
JsonMultipart(bytes_parts, req): JsonMultipart<CreateAd>,
|
||||
) -> 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()),
|
||||
};
|
||||
|
||||
// get file
|
||||
let file = match bytes_parts.get(0) {
|
||||
Some(x) => x,
|
||||
None => return Json(Error::Unknown.into()),
|
||||
};
|
||||
|
||||
if file.len() > MAXIMUM_AD_FILE_SIZE {
|
||||
return Json(Error::FileTooLarge.into());
|
||||
}
|
||||
|
||||
let upload = match data
|
||||
.create_upload(MediaUpload::new(MediaType::Webp, user.id))
|
||||
.await
|
||||
{
|
||||
Ok(x) => x,
|
||||
Err(e) => return Json(e.into()),
|
||||
};
|
||||
|
||||
match data
|
||||
.create_ad(UserAd::new(user.id, upload.id, req.target, req.size))
|
||||
.await
|
||||
{
|
||||
Ok(_) => {
|
||||
// write image
|
||||
if let Err(e) =
|
||||
save_webp_buffer(&upload.path(&data.0.0).to_string(), file.to_vec(), None)
|
||||
{
|
||||
return Json(Error::MiscError(e.to_string()).into());
|
||||
}
|
||||
|
||||
// ...
|
||||
Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Ad created".to_string(),
|
||||
payload: (),
|
||||
})
|
||||
}
|
||||
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::UserManageProducts) {
|
||||
Some(ua) => ua,
|
||||
None => return Json(Error::NotAllowed.into()),
|
||||
};
|
||||
|
||||
match data.delete_ad(id, &user).await {
|
||||
Ok(_) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Ad deleted".to_string(),
|
||||
payload: (),
|
||||
}),
|
||||
Err(e) => Json(e.into()),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn update_is_running_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
Path(id): Path<usize>,
|
||||
Json(req): Json<UpdateAdIsRunning>,
|
||||
) -> 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_ad_is_running(id, &user, if req.is_running { 1 } else { 0 })
|
||||
.await
|
||||
{
|
||||
Ok(_) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Ad updated".to_string(),
|
||||
payload: (),
|
||||
}),
|
||||
Err(e) => Json(e.into()),
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn click_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
Path((host, id)): Path<(usize, usize)>,
|
||||
) -> impl IntoResponse {
|
||||
let data = &(data.read().await).0;
|
||||
let user = get_user_from_token!(jar, data);
|
||||
|
||||
match data.ad_click(host, id, user).await {
|
||||
Ok(t) => Redirect::to(&t),
|
||||
Err(_) => Redirect::to(&data.0.0.host),
|
||||
}
|
||||
}
|
|
@ -1,3 +1,4 @@
|
|||
pub mod ads;
|
||||
pub mod app_data;
|
||||
pub mod apps;
|
||||
pub mod auth;
|
||||
|
@ -31,7 +32,7 @@ use tetratto_core::model::{
|
|||
PollOption, PostContext,
|
||||
},
|
||||
communities_permissions::CommunityPermission,
|
||||
economy::ProductFulfillmentMethod,
|
||||
economy::{ProductFulfillmentMethod, UserAdSize},
|
||||
journals::JournalPrivacyPermission,
|
||||
littleweb::{DomainData, DomainTld, ServiceFsEntry},
|
||||
oauth::AppScope,
|
||||
|
@ -767,6 +768,11 @@ pub fn routes() -> Router {
|
|||
"/products/{id}/uploads/thumbnails",
|
||||
delete(products::remove_thumbnail_request),
|
||||
)
|
||||
// ads
|
||||
.route("/ads", post(ads::create_request))
|
||||
.route("/ads/{id}", delete(ads::delete_request))
|
||||
.route("/ads/{id}/running", post(ads::update_is_running_request))
|
||||
.route("/ads/host/{host}/{id}/click", get(ads::click_request))
|
||||
}
|
||||
|
||||
pub fn lw_routes() -> Router {
|
||||
|
@ -1355,3 +1361,14 @@ pub struct UpdateProductUploads {
|
|||
pub struct RemoveProductThumbnail {
|
||||
pub idx: usize,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct CreateAd {
|
||||
pub target: String,
|
||||
pub size: UserAdSize,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct UpdateAdIsRunning {
|
||||
pub is_running: bool,
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ pub async fn delete_request(
|
|||
Path(id): Path<usize>,
|
||||
) -> impl IntoResponse {
|
||||
let data = &(data.read().await).0;
|
||||
let user = match get_user_from_token!(jar, data, oauth::AppScope::UserCreateProducts) {
|
||||
let user = match get_user_from_token!(jar, data, oauth::AppScope::UserManageProducts) {
|
||||
Some(ua) => ua,
|
||||
None => return Json(Error::NotAllowed.into()),
|
||||
};
|
||||
|
|
|
@ -92,7 +92,7 @@ pub async fn create_refund_request(
|
|||
Err(e) => return Json(e.into()),
|
||||
};
|
||||
|
||||
if user.id != other_transfer.receiver {
|
||||
if user.id != other_transfer.receiver || other_transfer.source != CoinTransferSource::Sale {
|
||||
// only the receiver of the funds can issue a refund (atm)
|
||||
return Json(Error::NotAllowed.into());
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@ pub async fn get_request(
|
|||
Body::from(read_image(PathBufD::current().extend(&[
|
||||
data.0.0.dirs.media.as_str(),
|
||||
"images",
|
||||
"default-avatar.svg",
|
||||
"default-banner.svg",
|
||||
]))),
|
||||
));
|
||||
}
|
||||
|
@ -34,7 +34,7 @@ pub async fn get_request(
|
|||
Body::from(read_image(PathBufD::current().extend(&[
|
||||
data.0.0.dirs.media.as_str(),
|
||||
"images",
|
||||
"default-avatar.svg",
|
||||
"default-banner.svg",
|
||||
]))),
|
||||
));
|
||||
}
|
||||
|
|
|
@ -21,3 +21,4 @@ serve_asset!(streams_js_request: STREAMS_JS("text/javascript"));
|
|||
serve_asset!(carp_js_request: CARP_JS("text/javascript"));
|
||||
serve_asset!(proto_links_request: PROTO_LINKS_JS("text/javascript"));
|
||||
serve_asset!(app_sdk_request: APP_SDK_JS("text/javascript"));
|
||||
serve_asset!(ads_request: ADS_JS("text/javascript"));
|
||||
|
|
|
@ -22,6 +22,7 @@ pub fn routes(config: &Config) -> Router {
|
|||
.route("/js/carp.js", get(assets::carp_js_request))
|
||||
.route("/js/proto_links.js", get(assets::proto_links_request))
|
||||
.route("/js/app_sdk.js", get(assets::app_sdk_request))
|
||||
.route("/js/ads.js", get(assets::ads_request))
|
||||
.nest_service(
|
||||
"/public",
|
||||
get_service(tower_http::services::ServeDir::new(&config.dirs.assets)),
|
||||
|
|
|
@ -4,9 +4,13 @@ use axum::{
|
|||
Extension,
|
||||
};
|
||||
use crate::cookie::CookieJar;
|
||||
use tetratto_core::model::{economy::CoinTransferMethod, Error};
|
||||
use tetratto_core::model::{
|
||||
economy::{CoinTransferMethod, UserAd, UserAdSize},
|
||||
Error,
|
||||
};
|
||||
use crate::{assets::initial_context, get_lang, get_user_from_token, State};
|
||||
use super::{render_error, PaginatedQuery};
|
||||
use serde::Deserialize;
|
||||
|
||||
/// `/wallet`
|
||||
pub async fn wallet_request(
|
||||
|
@ -60,7 +64,36 @@ pub async fn products_request(
|
|||
}
|
||||
};
|
||||
|
||||
let list = match data.0.get_products_by_user(user.id, 12, props.page).await {
|
||||
let list = match data
|
||||
.0
|
||||
.get_products_by_user(
|
||||
user.id,
|
||||
12,
|
||||
if props.page_set_id == 0 {
|
||||
props.page
|
||||
} else {
|
||||
0
|
||||
},
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
};
|
||||
|
||||
let ads_list = match data
|
||||
.0
|
||||
.get_ads_by_user(
|
||||
user.id,
|
||||
12,
|
||||
if props.page_set_id == 1 {
|
||||
props.page
|
||||
} else {
|
||||
0
|
||||
},
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
};
|
||||
|
@ -69,7 +102,9 @@ pub async fn products_request(
|
|||
let mut context = initial_context(&data.0.0.0, lang, &Some(user)).await;
|
||||
|
||||
context.insert("list", &list);
|
||||
context.insert("ads_list", &ads_list);
|
||||
context.insert("page", &props.page);
|
||||
context.insert("page_set_id", &props.page_set_id);
|
||||
|
||||
// return
|
||||
Ok(Html(
|
||||
|
@ -166,3 +201,127 @@ pub async fn product_request(
|
|||
data.1.render("economy/product.html", &context).unwrap(),
|
||||
))
|
||||
}
|
||||
|
||||
/// `/product/ad/{id}/edit`
|
||||
pub async fn edit_ad_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
Path(id): Path<usize>,
|
||||
) -> 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 ad = match data.0.get_ad_by_id(id).await {
|
||||
Ok(x) => x,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
};
|
||||
|
||||
if user.id != ad.owner {
|
||||
return Err(Html(
|
||||
render_error(Error::NotAllowed, &jar, &data, &None).await,
|
||||
));
|
||||
}
|
||||
|
||||
let lang = get_lang!(jar, data.0);
|
||||
let mut context = initial_context(&data.0.0.0, lang, &Some(user)).await;
|
||||
context.insert("ad", &ad);
|
||||
|
||||
// return
|
||||
Ok(Html(
|
||||
data.1.render("economy/edit_ad.html", &context).unwrap(),
|
||||
))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct RandomAdQuery {
|
||||
pub host: usize,
|
||||
#[serde(default)]
|
||||
pub size: UserAdSize,
|
||||
#[serde(default)]
|
||||
pub noclick: bool,
|
||||
}
|
||||
|
||||
/// `/adn/random`
|
||||
pub async fn random_ad_request(
|
||||
Extension(data): Extension<State>,
|
||||
Query(props): Query<RandomAdQuery>,
|
||||
) -> impl IntoResponse {
|
||||
let data = data.read().await;
|
||||
let ad = match data.0.random_ad_charged(props.size.clone()).await {
|
||||
Ok(x) => x,
|
||||
Err(_) => UserAd {
|
||||
// polyfill ad
|
||||
id: 0,
|
||||
created: 0,
|
||||
upload_id: 0,
|
||||
owner: data.0.0.0.system_user,
|
||||
target: data.0.0.0.host.clone(),
|
||||
last_charge_time: 0,
|
||||
is_running: true,
|
||||
size: props.size,
|
||||
},
|
||||
};
|
||||
|
||||
let mut context = tera::Context::new();
|
||||
context.insert("disable_click", &props.noclick);
|
||||
context.insert("config", &data.0.0.0);
|
||||
context.insert("host", &props.host);
|
||||
context.insert("ad", &ad);
|
||||
|
||||
// return
|
||||
(
|
||||
[(
|
||||
"content-security-policy",
|
||||
"default-src 'self' *.spotify.com musicbrainz.org; img-src * data:; media-src *; font-src *; style-src 'unsafe-inline' 'self' *; script-src 'self' 'unsafe-inline' *; worker-src * blob:; object-src 'self' *; upgrade-insecure-requests; connect-src * localhost; frame-src 'self' blob: *; frame-ancestors *",
|
||||
)],
|
||||
Html(data.1.render("economy/ad.html", &context).unwrap()),
|
||||
)
|
||||
}
|
||||
|
||||
/// `/adn/{id}`
|
||||
pub async fn known_ad_request(
|
||||
Extension(data): Extension<State>,
|
||||
Query(props): Query<RandomAdQuery>,
|
||||
Path(id): Path<usize>,
|
||||
) -> impl IntoResponse {
|
||||
let data = data.read().await;
|
||||
let ad = match data.0.get_ad_by_id(id).await {
|
||||
Ok(x) => x,
|
||||
Err(_) => UserAd {
|
||||
// polyfill ad
|
||||
id: 0,
|
||||
created: 0,
|
||||
upload_id: 0,
|
||||
owner: data.0.0.0.system_user,
|
||||
target: data.0.0.0.host.clone(),
|
||||
last_charge_time: 0,
|
||||
is_running: true,
|
||||
size: props.size,
|
||||
},
|
||||
};
|
||||
|
||||
let mut context = tera::Context::new();
|
||||
context.insert("disable_click", &props.noclick);
|
||||
context.insert("config", &data.0.0.0);
|
||||
context.insert("host", &props.host);
|
||||
context.insert("ad", &ad);
|
||||
|
||||
// return
|
||||
(
|
||||
[
|
||||
(
|
||||
"content-security-policy",
|
||||
"default-src 'self' *.spotify.com musicbrainz.org; img-src * data:; media-src *; font-src *; style-src 'unsafe-inline' 'self' *; script-src 'self' 'unsafe-inline' *; worker-src * blob:; object-src 'self' *; upgrade-insecure-requests; connect-src * localhost; frame-src 'self' blob: *; frame-ancestors *",
|
||||
),
|
||||
("Cache-Control", "no-cache"),
|
||||
],
|
||||
Html(data.1.render("economy/ad.html", &context).unwrap()),
|
||||
)
|
||||
}
|
||||
|
|
|
@ -166,6 +166,9 @@ pub fn routes() -> Router {
|
|||
.route("/products", get(economy::products_request))
|
||||
.route("/product/{id}/edit", get(economy::edit_product_request))
|
||||
.route("/product/{id}", get(economy::product_request))
|
||||
.route("/product/ad/{id}/edit", get(economy::edit_ad_request))
|
||||
.route("/adn/random", get(economy::random_ad_request))
|
||||
.route("/adn/{id}", get(economy::known_ad_request))
|
||||
}
|
||||
|
||||
pub fn lw_routes() -> Router {
|
||||
|
@ -188,6 +191,11 @@ pub async fn render_error(
|
|||
pub struct PaginatedQuery {
|
||||
#[serde(default)]
|
||||
pub page: usize,
|
||||
/// The list set on this page to be affected by the page increment.
|
||||
///
|
||||
/// This value depends on the page this query is for.
|
||||
#[serde(default)]
|
||||
pub page_set_id: usize,
|
||||
#[serde(default)]
|
||||
pub before: usize,
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue