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

FlameAnvil Project Sync (#481)

Browse Source 
* FlameAnvil Project Sync

* Perm fixes

* Fix compile

* Fix clippy + run prepare
This commit is contained in:
Geometrically
2022-11-20 19:50:14 -07:00
committed by GitHub
parent 589761bfd9
commit f259d81249
23 changed files with 2501 additions and 1493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/database/models/user_item.rs
View File

@@ -18,6 +18,7 @@ pub struct User {
pub payout_wallet: Option<RecipientWallet>,
pub payout_wallet_type: Option<RecipientType>,
pub payout_address: Option<String>,
pub flame_anvil_key: Option<String>,
}
impl User {
@@ -63,7 +64,7 @@ impl User {
u.avatar_url, u.username, u.bio,
u.created, u.role, u.badges,
u.balance, u.payout_wallet, u.payout_wallet_type,
u.payout_address
u.payout_address, u.flame_anvil_key
FROM users u
WHERE u.id = $1
",
@@ -93,6 +94,7 @@ impl User {
.payout_wallet_type
.map(|x| RecipientType::from_string(&x)),
payout_address: row.payout_address,
flame_anvil_key: row.flame_anvil_key,
}))
} else {
Ok(None)
@@ -112,7 +114,7 @@ impl User {
u.avatar_url, u.username, u.bio,
u.created, u.role, u.badges,
u.balance, u.payout_wallet, u.payout_wallet_type,
u.payout_address
u.payout_address, u.flame_anvil_key
FROM users u
WHERE u.github_id = $1
",
@@ -142,6 +144,7 @@ impl User {
.payout_wallet_type
.map(|x| RecipientType::from_string(&x)),
payout_address: row.payout_address,
flame_anvil_key: row.flame_anvil_key,
}))
} else {
Ok(None)
@@ -161,7 +164,7 @@ impl User {
u.avatar_url, u.username, u.bio,
u.created, u.role, u.badges,
u.balance, u.payout_wallet, u.payout_wallet_type,
u.payout_address
u.payout_address, u.flame_anvil_key
FROM users u
WHERE LOWER(u.username) = LOWER($1)
",
@@ -191,6 +194,7 @@ impl User {
.payout_wallet_type
.map(|x| RecipientType::from_string(&x)),
payout_address: row.payout_address,
flame_anvil_key: row.flame_anvil_key,
}))
} else {
Ok(None)
@@ -214,7 +218,7 @@ impl User {
u.avatar_url, u.username, u.bio,
u.created, u.role, u.badges,
u.balance, u.payout_wallet, u.payout_wallet_type,
u.payout_address
u.payout_address, u.flame_anvil_key
FROM users u
WHERE u.id = ANY($1)
",
@@ -241,6 +245,7 @@ impl User {
.payout_wallet_type
.map(|x| RecipientType::from_string(&x)),
payout_address: u.payout_address,
flame_anvil_key: u.flame_anvil_key,
}))
})
.try_collect::<Vec<User>>()