eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Payouts fees changes (#478)

Browse Source 
* Payouts fees changes

* Update src/queue/payouts.rs

Co-authored-by: triphora <emmaffle@modrinth.com>

Co-authored-by: triphora <emmaffle@modrinth.com>
This commit is contained in:
Geometrically
2022-11-16 13:46:36 -07:00
committed by GitHub
parent ecc500fc91
commit da19a07943
9 changed files with 141 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/routes/users.rs
View File

@@ -345,6 +345,22 @@ pub async fn user_edit(
));
}
let results = sqlx::query!(
"
SELECT EXISTS(SELECT 1 FROM users WHERE id = $1 AND email IS NULL)
",
id as crate::database::models::ids::UserId,
)
.fetch_one(&mut *transaction)
.await?;
if results.exists.unwrap_or(false) {
return Err(ApiError::InvalidInput(
"You must have an email set on your Modrinth account to enroll in the monetization program!"
.to_string(),
));
}
sqlx::query!(
"
UPDATE users
@@ -720,13 +736,25 @@ pub async fn user_payouts_request(
payouts_data.payout_wallet_type
{
if let Some(payout_wallet) = payouts_data.payout_wallet {
let paypal_fee = Decimal::from(1) / Decimal::from(4);
return if data.amount < payouts_data.balance
&& data.amount > paypal_fee
{
return if data.amount < payouts_data.balance {
let mut transaction = pool.begin().await?;
let mut payouts_queue = payouts_queue.lock().await;
let leftover = payouts_queue
.send_payout(PayoutItem {
amount: PayoutAmount {
currency: "USD".to_string(),
value: data.amount,
},
receiver: payout_address,
note: "Payment from Modrinth creator monetization program".to_string(),
recipient_type: payout_wallet_type.to_string().to_uppercase(),
recipient_wallet: payout_wallet.as_str_api().to_string(),
sender_item_id: format!("{}-{}", UserId::from(id), Utc::now().timestamp()),
})
.await?;
sqlx::query!(
"
INSERT INTO historical_payouts (user_id, amount, status)
@@ -745,27 +773,12 @@ pub async fn user_payouts_request(
SET balance = balance - $1
WHERE id = $2
",
data.amount,
data.amount - leftover,
id as crate::database::models::ids::UserId
)
.execute(&mut *transaction)
.await?;
let mut payouts_queue = payouts_queue.lock().await;
payouts_queue
.send_payout(PayoutItem {
amount: PayoutAmount {
currency: "USD".to_string(),
value: (data.amount - paypal_fee).to_string(),
},
receiver: payout_address,
note: "Payment from Modrinth creator monetization program".to_string(),
recipient_type: payout_wallet_type.to_string().to_uppercase(),
recipient_wallet: payout_wallet.as_str_api().to_string(),
sender_item_id: format!("{}-{}", UserId::from(id), Utc::now().timestamp()),
})
.await?;
transaction.commit().await?;
Ok(HttpResponse::NoContent().body(""))