Compare commits

..
Author SHA1 Message Date
Josiah Glosson 41cd6feff2 Misc Cargo.lock updates 2025-08-07 22:19:05 -05:00
Josiah Glosson 2443a96d1e Update zip 4.2.0 -> 4.3.0 2025-08-07 22:07:05 -05:00
Josiah Glosson 3962f338a5 Update tracing-actix-web 0.7.18 -> 0.7.19 2025-08-07 22:03:05 -05:00
Josiah Glosson 67e48331a1 Update tokio 1.45.1 -> 1.47.1 and tokio-util 0.7.15 -> 0.7.16 2025-08-07 21:59:41 -05:00
Josiah Glosson a9bfba9d9e Fix build by updating mappings 2025-08-07 21:53:27 -05:00
Josiah Glosson 26dd65d7a3 Update tauri suite 2025-08-07 21:51:19 -05:00
Josiah Glosson b1093af893 Update sysinfo 0.35.2 -> 0.36.1 2025-08-07 21:43:55 -05:00
Josiah Glosson b19ad9ccad Update spdx 0.10.8 -> 0.10.9 2025-08-07 21:40:15 -05:00
Josiah Glosson 4aae445e4a Update serde_with 3.13.0 -> 3.14.0 2025-08-07 21:37:04 -05:00
Josiah Glosson 58f1e2c585 Update serde_json 1.0.140 -> 1.0.142 2025-08-07 21:33:49 -05:00
Josiah Glosson 89901de4bd Update sentry 0.41.0 -> 0.42.0 and sentry-actix 0.41.0 -> 0.42.0 2025-08-07 21:29:18 -05:00
Josiah Glosson 2e18d5023e Update rgb 0.8.50 -> 0.8.52 2025-08-07 21:23:35 -05:00
Josiah Glosson d501f1fec6 Cargo fmt in theseus 2025-08-07 21:18:52 -05:00
Josiah Glosson 2217da078a Update reqwest 0.12.20 -> 0.12.22 2025-08-07 21:18:18 -05:00
Josiah Glosson fadbf80093 Fix theseus lint 2025-08-07 21:13:27 -05:00
Josiah Glosson 9cb1ad8024 Update quick-xml 0.37.5 -> 0.38.1 2025-08-07 20:56:28 -05:00
Josiah Glosson 14b27552db Update notify 8.0.0 -> 8.2.0 and notify-debouncer-mini 0.6.0 -> 0.7.0 2025-08-07 20:43:55 -05:00
Josiah Glosson 1c940a0d25 Update meilisearch-sdk 0.28.0 -> 0.29.1 2025-08-07 20:39:22 -05:00
Josiah Glosson 1a7b2f1806 Update lettre 0.11.17 -> 0.11.18 2025-08-07 20:31:17 -05:00
Josiah Glosson 39aea6545d Update jemalloc_pprof 0.7.0 -> 0.8.1 2025-08-07 20:27:40 -05:00
Josiah Glosson 86c408c700 Update indicatif 0.17.11 -> 0.18.0 2025-08-07 20:22:53 -05:00
Josiah Glosson 211cd05750 Update indexmap 2.9.0 -> 2.10.0 2025-08-07 16:51:25 -05:00
Josiah Glosson b7f0ec3199 Update hyper-util 0.1.14 -> 0.1.16 2025-08-07 16:44:42 -05:00
Josiah Glosson f1825fb9fa Update enumset 1.1.6 -> 1.1.7 2025-08-07 16:38:08 -05:00
Josiah Glosson 719aba383b Update deadpool-redis 0.21.1 -> 0.22.0 and redis 0.31.0 -> 0.32.4 2025-08-07 16:26:24 -05:00
Josiah Glosson dc33b4b05c Update clap 4.5.40 -> 4.5.43 2025-08-07 12:31:44 -05:00
Josiah Glosson 97a6e94d32 Update bytemuck 1.23.0 -> 1.23.1 2025-08-07 12:25:53 -05:00
Josiah Glosson 37a10c76ab Update async-tungstenite 0.29.1 -> 0.30.0 2025-08-07 12:21:16 -05:00
Josiah Glosson 3ebdac4df9 Update async-compression 0.4.25 -> 0.4.27 2025-08-07 12:11:38 -05:00
Josiah Glosson 8d16834e39 Update Rust version 2025-08-07 11:59:00 -05:00
90 changed files with 1254 additions and 2467 deletions

No files matched your search

Generated
+816 -660
View File
File diff suppressed because it is too large. Load diff
+36 -36
View File
@@ -25,31 +25,31 @@ actix-ws = "0.3.0"
argon2 = { version = "0.5.3", features = ["std"] } argon2 = { version = "0.5.3", features = ["std"] }
ariadne = { path = "packages/ariadne" } ariadne = { path = "packages/ariadne" }
async_zip = "0.0.17" async_zip = "0.0.17"
async-compression = { version = "0.4.25", default-features = false } async-compression = { version = "0.4.27", default-features = false }
async-recursion = "1.1.1" async-recursion = "1.1.1"
async-stripe = { version = "0.41.0", default-features = false, features = [ async-stripe = { version = "0.41.0", default-features = false, features = [
"runtime-tokio-hyper-rustls", "runtime-tokio-hyper-rustls",
] } ] }
async-trait = "0.1.88" async-trait = "0.1.88"
async-tungstenite = { version = "0.29.1", default-features = false, features = [ async-tungstenite = { version = "0.30.0", default-features = false, features = [
"futures-03-sink", "futures-03-sink",
] } ] }
async-walkdir = "2.1.0" async-walkdir = "2.1.0"
base64 = "0.22.1" base64 = "0.22.1"
bitflags = "2.9.1" bitflags = "2.9.1"
bytemuck = "1.23.0" bytemuck = "1.23.1"
bytes = "1.10.1" bytes = "1.10.1"
censor = "0.3.0" censor = "0.3.0"
chardetng = "0.1.17" chardetng = "0.1.17"
chrono = "0.4.41" chrono = "0.4.41"
clap = "4.5.40" clap = "4.5.43"
clickhouse = "0.13.3" clickhouse = "0.13.3"
color-thief = "0.2.2" color-thief = "0.2.2"
console-subscriber = "0.4.1" console-subscriber = "0.4.1"
daedalus = { path = "packages/daedalus" } daedalus = { path = "packages/daedalus" }
dashmap = "6.1.0" dashmap = "6.1.0"
data-url = "0.3.1" data-url = "0.3.1"
deadpool-redis = "0.21.1" deadpool-redis = "0.22.0"
dirs = "6.0.0" dirs = "6.0.0"
discord-rich-presence = "0.2.5" discord-rich-presence = "0.2.5"
dotenv-build = "0.1.1" dotenv-build = "0.1.1"
@@ -57,7 +57,7 @@ dotenvy = "0.15.7"
dunce = "1.0.5" dunce = "1.0.5"
either = "1.15.0" either = "1.15.0"
encoding_rs = "0.8.35" encoding_rs = "0.8.35"
enumset = "1.1.6" enumset = "1.1.7"
flate2 = "1.1.2" flate2 = "1.1.2"
fs4 = { version = "0.13.1", default-features = false } fs4 = { version = "0.13.1", default-features = false }
futures = { version = "0.3.31", default-features = false } futures = { version = "0.3.31", default-features = false }
@@ -74,15 +74,15 @@ hyper-rustls = { version = "0.27.7", default-features = false, features = [
"ring", "ring",
"tls12", "tls12",
] } ] }
hyper-util = "0.1.14" hyper-util = "0.1.16"
iana-time-zone = "0.1.63" iana-time-zone = "0.1.63"
image = { version = "0.25.6", default-features = false, features = ["rayon"] } image = { version = "0.25.6", default-features = false, features = ["rayon"] }
indexmap = "2.9.0" indexmap = "2.10.0"
indicatif = "0.17.11" indicatif = "0.18.0"
itertools = "0.14.0" itertools = "0.14.0"
jemalloc_pprof = "0.7.0" jemalloc_pprof = "0.8.1"
json-patch = { version = "4.0.0", default-features = false } json-patch = { version = "4.0.0", default-features = false }
lettre = { version = "0.11.17", default-features = false, features = [ lettre = { version = "0.11.18", default-features = false, features = [
"builder", "builder",
"hostname", "hostname",
"pool", "pool",
@@ -92,24 +92,24 @@ lettre = { version = "0.11.17", default-features = false, features = [
"smtp-transport", "smtp-transport",
] } ] }
maxminddb = "0.26.0" maxminddb = "0.26.0"
meilisearch-sdk = { version = "0.28.0", default-features = false } meilisearch-sdk = { version = "0.29.1", default-features = false }
murmur2 = "0.1.0" murmur2 = "0.1.0"
native-dialog = "0.9.0" native-dialog = "0.9.0"
notify = { version = "8.0.0", default-features = false } notify = { version = "8.2.0", default-features = false }
notify-debouncer-mini = { version = "0.6.0", default-features = false } notify-debouncer-mini = { version = "0.7.0", default-features = false }
p256 = "0.13.2" p256 = "0.13.2"
paste = "1.0.15" paste = "1.0.15"
phf = { version = "0.12.1", features = ["macros"] } phf = { version = "0.12.1", features = ["macros"] }
png = "0.17.16" png = "0.17.16"
prometheus = "0.14.0" prometheus = "0.14.0"
quartz_nbt = "0.2.9" quartz_nbt = "0.2.9"
quick-xml = "0.37.5" quick-xml = "0.38.1"
rand = "=0.8.5" # Locked on 0.8 until argon2 and p256 update to 0.9 rand = "=0.8.5" # Locked on 0.8 until argon2 and p256 update to 0.9
rand_chacha = "=0.3.1" # Locked on 0.3 until we can update rand to 0.9 rand_chacha = "=0.3.1" # Locked on 0.3 until we can update rand to 0.9
redis = "=0.31.0" # Locked on 0.31 until deadpool-redis updates to 0.32 redis = "0.32.4"
regex = "1.11.1" regex = "1.11.1"
reqwest = { version = "0.12.20", default-features = false } reqwest = { version = "0.12.22", default-features = false }
rgb = "0.8.50" rgb = "0.8.52"
rust_decimal = { version = "1.37.2", features = [ rust_decimal = { version = "1.37.2", features = [
"serde-with-float", "serde-with-float",
"serde-with-str", "serde-with-str",
@@ -121,7 +121,7 @@ rust-s3 = { version = "0.35.1", default-features = false, features = [
"tokio-rustls-tls", "tokio-rustls-tls",
] } ] }
rusty-money = "0.4.1" rusty-money = "0.4.1"
sentry = { version = "0.41.0", default-features = false, features = [ sentry = { version = "0.42.0", default-features = false, features = [
"backtrace", "backtrace",
"contexts", "contexts",
"debug-images", "debug-images",
@@ -129,45 +129,45 @@ sentry = { version = "0.41.0", default-features = false, features = [
"reqwest", "reqwest",
"rustls", "rustls",
] } ] }
sentry-actix = "0.41.0" sentry-actix = "0.42.0"
serde = "1.0.219" serde = "1.0.219"
serde_bytes = "0.11.17" serde_bytes = "0.11.17"
serde_cbor = "0.11.2" serde_cbor = "0.11.2"
serde_ini = "0.2.0" serde_ini = "0.2.0"
serde_json = "1.0.140" serde_json = "1.0.142"
serde_with = "3.13.0" serde_with = "3.14.0"
serde-xml-rs = "0.8.1" # Also an XML (de)serializer, consider dropping yaserde in favor of this serde-xml-rs = "0.8.1" # Also an XML (de)serializer, consider dropping yaserde in favor of this
sha1 = "0.10.6" sha1 = "0.10.6"
sha1_smol = { version = "1.0.1", features = ["std"] } sha1_smol = { version = "1.0.1", features = ["std"] }
sha2 = "0.10.9" sha2 = "0.10.9"
spdx = "0.10.8" spdx = "0.10.9"
sqlx = { version = "0.8.6", default-features = false } sqlx = { version = "0.8.6", default-features = false }
sysinfo = { version = "0.35.2", default-features = false } sysinfo = { version = "0.36.1", default-features = false }
tar = "0.4.44" tar = "0.4.44"
tauri = "2.6.1" tauri = "2.7.0"
tauri-build = "2.3.0" tauri-build = "2.3.1"
tauri-plugin-deep-link = "2.4.0" tauri-plugin-deep-link = "2.4.1"
tauri-plugin-dialog = "2.3.0" tauri-plugin-dialog = "2.3.2"
tauri-plugin-http = "2.5.0" tauri-plugin-http = "2.5.1"
tauri-plugin-opener = "2.4.0" tauri-plugin-opener = "2.4.0"
tauri-plugin-os = "2.3.0" tauri-plugin-os = "2.3.0"
tauri-plugin-single-instance = "2.3.0" tauri-plugin-single-instance = "2.3.2"
tauri-plugin-updater = { version = "2.9.0", default-features = false, features = [ tauri-plugin-updater = { version = "2.9.0", default-features = false, features = [
"rustls-tls", "rustls-tls",
"zip", "zip",
] } ] }
tauri-plugin-window-state = "2.3.0" tauri-plugin-window-state = "2.4.0"
tempfile = "3.20.0" tempfile = "3.20.0"
theseus = { path = "packages/app-lib" } theseus = { path = "packages/app-lib" }
thiserror = "2.0.12" thiserror = "2.0.12"
tikv-jemalloc-ctl = "0.6.0" tikv-jemalloc-ctl = "0.6.0"
tikv-jemallocator = "0.6.0" tikv-jemallocator = "0.6.0"
tokio = "1.45.1" tokio = "1.47.1"
tokio-stream = "0.1.17" tokio-stream = "0.1.17"
tokio-util = "0.7.15" tokio-util = "0.7.16"
totp-rs = "5.7.0" totp-rs = "5.7.0"
tracing = "0.1.41" tracing = "0.1.41"
tracing-actix-web = "0.7.18" tracing-actix-web = "0.7.19"
tracing-error = "0.2.1" tracing-error = "0.2.1"
tracing-subscriber = "0.3.19" tracing-subscriber = "0.3.19"
url = "2.5.4" url = "2.5.4"
@@ -179,7 +179,7 @@ whoami = "1.6.0"
winreg = "0.55.0" winreg = "0.55.0"
woothee = "0.13.0" woothee = "0.13.0"
yaserde = "0.12.0" yaserde = "0.12.0"
zip = { version = "4.2.0", default-features = false, features = [ zip = { version = "4.3.0", default-features = false, features = [
"bzip2", "bzip2",
"deflate", "deflate",
"deflate64", "deflate64",
@@ -226,7 +226,7 @@ wildcard_dependencies = "warn"
warnings = "deny" warnings = "deny"
[patch.crates-io] [patch.crates-io]
wry = { git = "https://github.com/modrinth/wry", rev = "21db186" } wry = { git = "https://github.com/modrinth/wry", rev = "f2ce0b0" }
# Optimize for speed and reduce size on release builds # Optimize for speed and reduce size on release builds
[profile.release] [profile.release]
+2 -4
View File
@@ -197,16 +197,14 @@ pub async fn open_link<R: Runtime>(
if url::Url::parse(&path).is_ok() if url::Url::parse(&path).is_ok()
&& !state.malicious_origins.contains(&origin) && !state.malicious_origins.contains(&origin)
&& let Some(last_click) = state.last_click
&& last_click.elapsed() < Duration::from_millis(100)
{ {
if let Some(last_click) = state.last_click {
if last_click.elapsed() < Duration::from_millis(100) {
let _ = app.opener().open_url(&path, None::<String>); let _ = app.opener().open_url(&path, None::<String>);
state.last_click = None; state.last_click = None;
return Ok(()); return Ok(());
} }
}
}
tracing::info!("Malicious click: {path} origin {origin}"); tracing::info!("Malicious click: {path} origin {origin}");
state.malicious_origins.insert(origin); state.malicious_origins.insert(origin);
+2 -5
View File
@@ -59,17 +59,14 @@ pub async fn login<R: Runtime>(
.url()? .url()?
.as_str() .as_str()
.starts_with("https://login.live.com/oauth20_desktop.srf") .starts_with("https://login.live.com/oauth20_desktop.srf")
{ && let Some((_, code)) =
if let Some((_, code)) =
window.url()?.query_pairs().find(|x| x.0 == "code") window.url()?.query_pairs().find(|x| x.0 == "code")
{ {
window.close()?; window.close()?;
let val = let val = minecraft_auth::finish_login(&code.clone(), flow).await?;
minecraft_auth::finish_login(&code.clone(), flow).await?;
return Ok(Some(val)); return Ok(Some(val));
} }
}
tokio::time::sleep(std::time::Duration::from_millis(50)).await; tokio::time::sleep(std::time::Duration::from_millis(50)).await;
} }
+2 -2
View File
@@ -63,12 +63,12 @@ pub async fn should_disable_mouseover() -> bool {
// We try to match version to 12.2 or higher. If unrecognizable to pattern or lower, we default to the css with disabled mouseover for safety // We try to match version to 12.2 or higher. If unrecognizable to pattern or lower, we default to the css with disabled mouseover for safety
if let tauri_plugin_os::Version::Semantic(major, minor, _) = if let tauri_plugin_os::Version::Semantic(major, minor, _) =
tauri_plugin_os::version() tauri_plugin_os::version()
&& major >= 12
&& minor >= 3
{ {
if major >= 12 && minor >= 3 {
// Mac os version is 12.3 or higher, we allow mouseover // Mac os version is 12.3 or higher, we allow mouseover
return false; return false;
} }
}
true true
} else { } else {
// Not macos, we allow mouseover // Not macos, we allow mouseover
+3 -3
View File
@@ -233,11 +233,11 @@ fn main() {
}); });
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
if let Some(window) = app.get_window("main") { if let Some(window) = app.get_window("main")
if let Err(e) = window.set_shadow(true) { && let Err(e) = window.set_shadow(true)
{
tracing::warn!("Failed to set window shadow: {e}"); tracing::warn!("Failed to set window shadow: {e}");
} }
}
Ok(()) Ok(())
}); });
+5 -7
View File
@@ -506,17 +506,16 @@ async fn fetch(
return Ok(lib); return Ok(lib);
} }
} else if let Some(url) = &lib.url { } else if let Some(url) = &lib.url
if !url.is_empty() { && !url.is_empty()
{
insert_mirrored_artifact( insert_mirrored_artifact(
&lib.name, &lib.name,
None, None,
vec![ vec![
url.clone(), url.clone(),
"https://libraries.minecraft.net/" "https://libraries.minecraft.net/".to_string(),
.to_string(), "https://maven.creeperhost.net/".to_string(),
"https://maven.creeperhost.net/"
.to_string(),
maven_url.to_string(), maven_url.to_string(),
], ],
false, false,
@@ -527,7 +526,6 @@ async fn fetch(
return Ok(lib); return Ok(lib);
} }
}
// Other libraries are generally available in the "maven" directory of the installer. If they are // Other libraries are generally available in the "maven" directory of the installer. If they are
// not present here, they will be generated by Forge processors. // not present here, they will be generated by Forge processors.
+2 -4
View File
@@ -93,9 +93,9 @@ async fn main() -> Result<()> {
.ok() .ok()
.and_then(|x| x.parse::<bool>().ok()) .and_then(|x| x.parse::<bool>().ok())
.unwrap_or(false) .unwrap_or(false)
&& let Ok(token) = dotenvy::var("CLOUDFLARE_TOKEN")
&& let Ok(zone_id) = dotenvy::var("CLOUDFLARE_ZONE_ID")
{ {
if let Ok(token) = dotenvy::var("CLOUDFLARE_TOKEN") {
if let Ok(zone_id) = dotenvy::var("CLOUDFLARE_ZONE_ID") {
let cache_clears = upload_files let cache_clears = upload_files
.into_iter() .into_iter()
.map(|x| format_url(&x.0)) .map(|x| format_url(&x.0))
@@ -130,8 +130,6 @@ async fn main() -> Result<()> {
})?; })?;
} }
} }
}
}
Ok(()) Ok(())
} }
+5 -7
View File
@@ -167,20 +167,18 @@ pub async fn download_file(
let bytes = x.bytes().await; let bytes = x.bytes().await;
if let Ok(bytes) = bytes { if let Ok(bytes) = bytes {
if let Some(sha1) = sha1 { if let Some(sha1) = sha1
if &*sha1_async(bytes.clone()).await? != sha1 { && &*sha1_async(bytes.clone()).await? != sha1
{
if attempt <= 3 { if attempt <= 3 {
continue; continue;
} else { } else {
return Err( return Err(crate::ErrorKind::ChecksumFailure {
crate::ErrorKind::ChecksumFailure {
hash: sha1.to_string(), hash: sha1.to_string(),
url: url.to_string(), url: url.to_string(),
tries: attempt, tries: attempt,
} }
.into(), .into());
);
}
} }
} }
@@ -1,34 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n SELECT id, metadata, unitary\n FROM products\n WHERE metadata ->> 'type' = $1",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id",
"type_info": "Int8"
},
{
"ordinal": 1,
"name": "metadata",
"type_info": "Jsonb"
},
{
"ordinal": 2,
"name": "unitary",
"type_info": "Bool"
}
],
"parameters": {
"Left": [
"Text"
]
},
"nullable": [
false,
false,
false
]
},
"hash": "139ba392ab53d975e63e2c328abad04831b4bed925bded054bb8a35d0680bed8"
}
@@ -1,15 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n UPDATE users_redeemals\n SET status = $1\n WHERE\n status = $2\n AND NOW() - last_attempt > INTERVAL '5 minutes'\n ",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Varchar",
"Text"
]
},
"nullable": []
},
"hash": "1dea22589b0440cfeaf98b6869bdaad852d58c61cf2a1affb01acc4984d42341"
}
@@ -1,59 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "SELECT * FROM users_redeemals WHERE status = $1 LIMIT $2",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id",
"type_info": "Int4"
},
{
"ordinal": 1,
"name": "user_id",
"type_info": "Int8"
},
{
"ordinal": 2,
"name": "offer",
"type_info": "Varchar"
},
{
"ordinal": 3,
"name": "redeemed",
"type_info": "Timestamptz"
},
{
"ordinal": 4,
"name": "status",
"type_info": "Varchar"
},
{
"ordinal": 5,
"name": "last_attempt",
"type_info": "Timestamptz"
},
{
"ordinal": 6,
"name": "n_attempts",
"type_info": "Int4"
}
],
"parameters": {
"Left": [
"Text",
"Int8"
]
},
"nullable": [
false,
false,
false,
false,
false,
true,
false
]
},
"hash": "58ccda393820a272d72a3e41eccc5db30ab6ad0bb346caf781efdb5aab524286"
}
@@ -1,27 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n INSERT INTO users_redeemals\n (user_id, offer, redeemed, status, last_attempt, n_attempts)\n VALUES ($1, $2, $3, $4, $5, $6)\n RETURNING id",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id",
"type_info": "Int4"
}
],
"parameters": {
"Left": [
"Int8",
"Varchar",
"Timestamptz",
"Varchar",
"Timestamptz",
"Int4"
]
},
"nullable": [
false
]
},
"hash": "7adff98b270adc4a48e2c8a89a32ca1b83104102190597f4cda05e6f1c1e8f26"
}
@@ -1,19 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n UPDATE users_redeemals\n SET\n offer = $2,\n status = $3,\n redeemed = $4,\n last_attempt = $5,\n n_attempts = $6\n WHERE id = $1\n ",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Int4",
"Varchar",
"Varchar",
"Timestamptz",
"Timestamptz",
"Int4"
]
},
"nullable": []
},
"hash": "8d61d1ecc5321e2ac8932ef99de0f77e49cced9c7726ea746392a5fcbe75f2f5"
}
@@ -1,29 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n SELECT\n users.id,\n users_redeemals.status AS \"status: Option<String>\"\n FROM\n users\n LEFT JOIN\n users_redeemals ON users_redeemals.user_id = users.id\n AND users_redeemals.offer = $2\n WHERE\n users.username = $1\n ORDER BY\n users_redeemals.redeemed DESC\n LIMIT 1\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id",
"type_info": "Int8"
},
{
"ordinal": 1,
"name": "status: Option<String>",
"type_info": "Varchar"
}
],
"parameters": {
"Left": [
"Text",
"Text"
]
},
"nullable": [
false,
false
]
},
"hash": "949da1b1e3c772f79dd1248f99774fa39f140d3943f975067799f46f2cb48a0f"
}
@@ -1,23 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "SELECT\n EXISTS (\n SELECT\n 1\n FROM\n users_redeemals\n WHERE\n user_id = $1\n AND offer = $2\n ) AS \"exists!\"\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "exists!",
"type_info": "Bool"
}
],
"parameters": {
"Left": [
"Int8",
"Text"
]
},
"nullable": [
null
]
},
"hash": "9898e9962ba497ef8482ffa57d6590f7933e9f2465e9458fab005fe33d96ec7a"
}
@@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "\n SELECT\n id, user_id, price_id, amount, currency_code, status, due, last_attempt,\n charge_type, subscription_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n subscription_interval AS \"subscription_interval?\",\n payment_platform,\n payment_platform_id AS \"payment_platform_id?\",\n parent_charge_id AS \"parent_charge_id?\",\n net AS \"net?\"\n FROM charges\n \n WHERE\n charge_type = $1 AND\n (\n (status = 'cancelled' AND due < NOW()) OR\n (status = 'expiring' AND due < NOW()) OR\n (status = 'failed' AND last_attempt < NOW() - INTERVAL '2 days')\n )\n ", "query": "\n SELECT\n id, user_id, price_id, amount, currency_code, status, due, last_attempt,\n charge_type, subscription_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n subscription_interval AS \"subscription_interval?\",\n payment_platform,\n payment_platform_id AS \"payment_platform_id?\",\n parent_charge_id AS \"parent_charge_id?\",\n net AS \"net?\"\n FROM charges\n \n WHERE\n charge_type = $1 AND\n (\n (status = 'cancelled' AND due < NOW()) OR\n (status = 'failed' AND last_attempt < NOW() - INTERVAL '2 days')\n )\n ",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@@ -102,5 +102,5 @@
true true
] ]
}, },
"hash": "fda7d5659efb2b6940a3247043945503c85e3f167216e0e2403e08095a3e32c9" "hash": "bfcbcadda1e323d56b6a21fc060c56bff2f38a54cf65dd1cc21f209240c7091b"
} }
@@ -1,41 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n SELECT id, product_id, prices, currency_code\n FROM products_prices\n WHERE product_id = ANY($1::bigint[])\n AND public = $2",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id",
"type_info": "Int8"
},
{
"ordinal": 1,
"name": "product_id",
"type_info": "Int8"
},
{
"ordinal": 2,
"name": "prices",
"type_info": "Jsonb"
},
{
"ordinal": 3,
"name": "currency_code",
"type_info": "Text"
}
],
"parameters": {
"Left": [
"Int8Array",
"Bool"
]
},
"nullable": [
false,
false,
false,
false
]
},
"hash": "c37fc91df7619ac5c10fd04fdc2556aa98b80ccbfc53813659464a0e5e09fae8"
}
@@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "\n SELECT\n id, user_id, price_id, amount, currency_code, status, due, last_attempt,\n charge_type, subscription_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n subscription_interval AS \"subscription_interval?\",\n payment_platform,\n payment_platform_id AS \"payment_platform_id?\",\n parent_charge_id AS \"parent_charge_id?\",\n net AS \"net?\"\n FROM charges\n WHERE subscription_id = $1 AND (status = 'open' OR status = 'expiring' OR status = 'cancelled' OR status = 'failed')", "query": "\n SELECT\n id, user_id, price_id, amount, currency_code, status, due, last_attempt,\n charge_type, subscription_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n subscription_interval AS \"subscription_interval?\",\n payment_platform,\n payment_platform_id AS \"payment_platform_id?\",\n parent_charge_id AS \"parent_charge_id?\",\n net AS \"net?\"\n FROM charges\n WHERE subscription_id = $1 AND (status = 'open' OR status = 'cancelled' OR status = 'failed')",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@@ -102,5 +102,5 @@
true true
] ]
}, },
"hash": "2e18682890f7ec5a618991c2a4c77ca9546970f314f902a5197eb2d189cf81f7" "hash": "cf020daa52a1316e5f60d197196b880b72c0b2a576e470d9fd7182558103d055"
} }
@@ -1,18 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n UPDATE users_redeemals\n SET\n status = $3,\n last_attempt = $4,\n n_attempts = $5\n WHERE id = $1 AND status = $2\n ",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Int4",
"Text",
"Varchar",
"Timestamptz",
"Int4"
]
},
"nullable": []
},
"hash": "e3f6fa7e5ec6dee4fcdff904b3e692dccd55372d9cc827a1d68361fd036bc183"
}
@@ -1,11 +0,0 @@
-- Add migration script here
CREATE TABLE IF NOT EXISTS users_redeemals (
id SERIAL PRIMARY KEY,
user_id BIGINT NOT NULL REFERENCES users(id),
offer VARCHAR NOT NULL,
redeemed TIMESTAMP WITH TIME ZONE NOT NULL,
status VARCHAR NOT NULL,
last_attempt TIMESTAMP WITH TIME ZONE,
n_attempts INTEGER NOT NULL
);
@@ -1,6 +0,0 @@
-- Add migration script here
ALTER TABLE
products_prices
ADD COLUMN
public BOOLEAN NOT NULL DEFAULT true;
+5 -6
View File
@@ -322,13 +322,12 @@ pub async fn is_visible_collection(
} else { } else {
!collection_data.status.is_hidden() !collection_data.status.is_hidden()
}) && !collection_data.projects.is_empty(); }) && !collection_data.projects.is_empty();
if let Some(user) = &user_option { if let Some(user) = &user_option
if !authorized && !authorized
&& (user.role.is_mod() || user.id == collection_data.user_id.into()) && (user.role.is_mod() || user.id == collection_data.user_id.into())
{ {
authorized = true; authorized = true;
} }
}
Ok(authorized) Ok(authorized)
} }
@@ -356,12 +355,12 @@ pub async fn filter_visible_collections(
for collection in check_collections { for collection in check_collections {
// Collections are simple- if we are the owner or a mod, we can see it // Collections are simple- if we are the owner or a mod, we can see it
if let Some(user) = user_option { if let Some(user) = user_option
if user.role.is_mod() || user.id == collection.user_id.into() { && (user.role.is_mod() || user.id == collection.user_id.into())
{
return_collections.push(collection.into()); return_collections.push(collection.into());
} }
} }
}
Ok(return_collections) Ok(return_collections)
} }
@@ -197,7 +197,7 @@ impl DBCharge {
) -> Result<Option<DBCharge>, DatabaseError> { ) -> Result<Option<DBCharge>, DatabaseError> {
let user_subscription_id = user_subscription_id.0; let user_subscription_id = user_subscription_id.0;
let res = select_charges_with_predicate!( let res = select_charges_with_predicate!(
"WHERE subscription_id = $1 AND (status = 'open' OR status = 'expiring' OR status = 'cancelled' OR status = 'failed')", "WHERE subscription_id = $1 AND (status = 'open' OR status = 'cancelled' OR status = 'failed')",
user_subscription_id user_subscription_id
) )
.fetch_optional(exec) .fetch_optional(exec)
@@ -240,7 +240,6 @@ impl DBCharge {
charge_type = $1 AND charge_type = $1 AND
( (
(status = 'cancelled' AND due < NOW()) OR (status = 'cancelled' AND due < NOW()) OR
(status = 'expiring' AND due < NOW()) OR
(status = 'failed' AND last_attempt < NOW() - INTERVAL '2 days') (status = 'failed' AND last_attempt < NOW() - INTERVAL '2 days')
) )
"#, "#,
@@ -95,11 +95,11 @@ impl DBFlow {
redis: &RedisPool, redis: &RedisPool,
) -> Result<Option<DBFlow>, DatabaseError> { ) -> Result<Option<DBFlow>, DatabaseError> {
let flow = Self::get(id, redis).await?; let flow = Self::get(id, redis).await?;
if let Some(flow) = flow.as_ref() { if let Some(flow) = flow.as_ref()
if predicate(flow) { && predicate(flow)
{
Self::remove(id, redis).await?; Self::remove(id, redis).await?;
} }
}
Ok(flow) Ok(flow)
} }
@@ -801,18 +801,19 @@ impl VersionField {
}; };
if let Some(count) = countable { if let Some(count) = countable {
if let Some(min) = loader_field.min_val { if let Some(min) = loader_field.min_val
if count < min { && count < min
{
return Err(format!( return Err(format!(
"Provided value '{v}' for {field_name} is less than the minimum of {min}", "Provided value '{v}' for {field_name} is less than the minimum of {min}",
v = serde_json::to_string(&value).unwrap_or_default(), v = serde_json::to_string(&value).unwrap_or_default(),
field_name = loader_field.field, field_name = loader_field.field,
)); ));
} }
}
if let Some(max) = loader_field.max_val { if let Some(max) = loader_field.max_val
if count > max { && count > max
{
return Err(format!( return Err(format!(
"Provided value '{v}' for {field_name} is greater than the maximum of {max}", "Provided value '{v}' for {field_name} is greater than the maximum of {max}",
v = serde_json::to_string(&value).unwrap_or_default(), v = serde_json::to_string(&value).unwrap_or_default(),
@@ -820,7 +821,6 @@ impl VersionField {
)); ));
} }
} }
}
Ok(VersionField { Ok(VersionField {
version_id, version_id,
-1
View File
@@ -25,7 +25,6 @@ pub mod team_item;
pub mod thread_item; pub mod thread_item;
pub mod user_item; pub mod user_item;
pub mod user_subscription_item; pub mod user_subscription_item;
pub mod users_redeemals;
pub mod version_item; pub mod version_item;
pub use collection_item::DBCollection; pub use collection_item::DBCollection;
+18 -133
View File
@@ -57,26 +57,6 @@ impl DBProduct {
Ok(Self::get_many(&[id], exec).await?.into_iter().next()) Ok(Self::get_many(&[id], exec).await?.into_iter().next())
} }
pub async fn get_by_type<'a, E>(
exec: E,
r#type: &str,
) -> Result<Vec<Self>, DatabaseError>
where
E: sqlx::PgExecutor<'a>,
{
let maybe_row = select_products_with_predicate!(
"WHERE metadata ->> 'type' = $1",
r#type
)
.fetch_all(exec)
.await?;
maybe_row
.into_iter()
.map(|r| r.try_into().map_err(Into::into))
.collect()
}
pub async fn get_many( pub async fn get_many(
ids: &[DBProductId], ids: &[DBProductId],
exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>, exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
@@ -120,11 +100,10 @@ pub struct QueryProductWithPrices {
} }
impl QueryProductWithPrices { impl QueryProductWithPrices {
/// Lists products with at least one public price. pub async fn list<'a, E>(
pub async fn list_purchaseable<'a, E>(
exec: E, exec: E,
redis: &RedisPool, redis: &RedisPool,
) -> Result<Vec<Self>, DatabaseError> ) -> Result<Vec<QueryProductWithPrices>, DatabaseError>
where where
E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy, E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
{ {
@@ -139,8 +118,7 @@ impl QueryProductWithPrices {
} }
let all_products = product_item::DBProduct::get_all(exec).await?; let all_products = product_item::DBProduct::get_all(exec).await?;
let prices = let prices = product_item::DBProductPrice::get_all_products_prices(
product_item::DBProductPrice::get_all_public_products_prices(
&all_products.iter().map(|x| x.id).collect::<Vec<_>>(), &all_products.iter().map(|x| x.id).collect::<Vec<_>>(),
exec, exec,
) )
@@ -148,13 +126,13 @@ impl QueryProductWithPrices {
let products = all_products let products = all_products
.into_iter() .into_iter()
.filter_map(|x| { .map(|x| QueryProductWithPrices {
Some(QueryProductWithPrices {
id: x.id, id: x.id,
metadata: x.metadata, metadata: x.metadata,
prices: prices prices: prices
.remove(&x.id) .remove(&x.id)
.map(|x| x.1)? .map(|x| x.1)
.unwrap_or_default()
.into_iter() .into_iter()
.map(|x| DBProductPrice { .map(|x| DBProductPrice {
id: x.id, id: x.id,
@@ -165,7 +143,6 @@ impl QueryProductWithPrices {
.collect(), .collect(),
unitary: x.unitary, unitary: x.unitary,
}) })
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
redis redis
@@ -174,45 +151,6 @@ impl QueryProductWithPrices {
Ok(products) Ok(products)
} }
pub async fn list_by_product_type<'a, E>(
exec: E,
r#type: &str,
) -> Result<Vec<Self>, DatabaseError>
where
E: sqlx::PgExecutor<'a> + Copy,
{
let all_products = DBProduct::get_by_type(exec, r#type).await?;
let prices = DBProductPrice::get_all_products_prices(
&all_products.iter().map(|x| x.id).collect::<Vec<_>>(),
exec,
)
.await?;
let products = all_products
.into_iter()
.filter_map(|x| {
Some(QueryProductWithPrices {
id: x.id,
metadata: x.metadata,
prices: prices
.remove(&x.id)
.map(|x| x.1)?
.into_iter()
.map(|x| DBProductPrice {
id: x.id,
product_id: x.product_id,
prices: x.prices,
currency_code: x.currency_code,
})
.collect(),
unitary: x.unitary,
})
})
.collect::<Vec<_>>();
Ok(products)
}
} }
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]
@@ -231,11 +169,7 @@ struct ProductPriceQueryResult {
} }
macro_rules! select_prices_with_predicate { macro_rules! select_prices_with_predicate {
($predicate:tt, $param1:ident) => { ($predicate:tt, $param:ident) => {
select_prices_with_predicate!($predicate, $param1, )
};
($predicate:tt, $($param:ident,)+) => {
sqlx::query_as!( sqlx::query_as!(
ProductPriceQueryResult, ProductPriceQueryResult,
r#" r#"
@@ -243,7 +177,7 @@ macro_rules! select_prices_with_predicate {
FROM products_prices FROM products_prices
"# "#
+ $predicate, + $predicate,
$($param),+ $param
) )
}; };
} }
@@ -297,49 +231,22 @@ impl DBProductPrice {
Ok(res.remove(&product_id).map(|x| x.1).unwrap_or_default()) Ok(res.remove(&product_id).map(|x| x.1).unwrap_or_default())
} }
pub async fn get_all_public_product_prices(
product_id: DBProductId,
exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
) -> Result<Vec<DBProductPrice>, DatabaseError> {
let res =
Self::get_all_public_products_prices(&[product_id], exec).await?;
Ok(res.remove(&product_id).map(|x| x.1).unwrap_or_default())
}
/// Gets all public prices for the given products. If a product has no public price,
/// it won't be included in the resulting map.
pub async fn get_all_public_products_prices(
product_ids: &[DBProductId],
exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
) -> Result<DashMap<DBProductId, Vec<DBProductPrice>>, DatabaseError> {
Self::get_all_products_prices_with_visibility(
product_ids,
Some(true),
exec,
)
.await
}
pub async fn get_all_products_prices( pub async fn get_all_products_prices(
product_ids: &[DBProductId], product_ids: &[DBProductId],
exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>, exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
) -> Result<DashMap<DBProductId, Vec<DBProductPrice>>, DatabaseError> {
Self::get_all_products_prices_with_visibility(product_ids, None, exec)
.await
}
async fn get_all_products_prices_with_visibility(
product_ids: &[DBProductId],
public_filter: Option<bool>,
exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
) -> Result<DashMap<DBProductId, Vec<DBProductPrice>>, DatabaseError> { ) -> Result<DashMap<DBProductId, Vec<DBProductPrice>>, DatabaseError> {
let ids = product_ids.iter().map(|id| id.0).collect_vec(); let ids = product_ids.iter().map(|id| id.0).collect_vec();
let ids_ref: &[i64] = &ids; let ids_ref: &[i64] = &ids;
use futures_util::TryStreamExt; use futures_util::TryStreamExt;
let prices = select_prices_with_predicate!(
let predicate = |acc: DashMap<DBProductId, Vec<DBProductPrice>>, x| { "WHERE product_id = ANY($1::bigint[])",
ids_ref
)
.fetch(exec)
.try_fold(
DashMap::new(),
|acc: DashMap<DBProductId, Vec<DBProductPrice>>, x| {
if let Ok(item) = <ProductPriceQueryResult as TryInto< if let Ok(item) = <ProductPriceQueryResult as TryInto<
DBProductPrice, DBProductPrice,
>>::try_into(x) >>::try_into(x)
@@ -348,31 +255,9 @@ impl DBProductPrice {
} }
async move { Ok(acc) } async move { Ok(acc) }
}; },
let prices = match public_filter {
None => {
select_prices_with_predicate!(
"WHERE product_id = ANY($1::bigint[])",
ids_ref,
) )
.fetch(exec) .await?;
.try_fold(DashMap::new(), predicate)
.await?
}
Some(public) => {
select_prices_with_predicate!(
"WHERE product_id = ANY($1::bigint[])
AND public = $2",
ids_ref,
public,
)
.fetch(exec)
.try_fold(DashMap::new(), predicate)
.await?
}
};
Ok(prices) Ok(prices)
} }
@@ -483,8 +483,9 @@ impl DBTeamMember {
.await?; .await?;
} }
if let Some(accepted) = new_accepted { if let Some(accepted) = new_accepted
if accepted { && accepted
{
sqlx::query!( sqlx::query!(
" "
UPDATE team_members UPDATE team_members
@@ -497,7 +498,6 @@ impl DBTeamMember {
.execute(&mut **transaction) .execute(&mut **transaction)
.await?; .await?;
} }
}
if let Some(payouts_split) = new_payouts_split { if let Some(payouts_split) = new_payouts_split {
sqlx::query!( sqlx::query!(
@@ -1,301 +0,0 @@
use crate::database::models::DBUserId;
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
use sqlx::{query, query_scalar};
use std::fmt;
#[derive(
Debug, Default, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize,
)]
#[serde(rename_all = "snake_case")]
pub enum Offer {
#[default]
Medal,
}
impl Offer {
pub fn as_str(&self) -> &'static str {
match self {
Offer::Medal => "medal",
}
}
pub fn from_str_or_default(s: &str) -> Self {
match s {
"medal" => Offer::Medal,
_ => Offer::Medal,
}
}
}
impl fmt::Display for Offer {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.as_str())
}
}
#[derive(
Debug, Default, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize,
)]
#[serde(rename_all = "snake_case")]
pub enum Status {
#[default]
Pending,
Processing,
Processed,
}
impl Status {
pub fn as_str(&self) -> &'static str {
match self {
Status::Pending => "pending",
Status::Processing => "processing",
Status::Processed => "processed",
}
}
pub fn from_str_or_default(s: &str) -> Self {
match s {
"pending" => Status::Pending,
"processing" => Status::Processing,
"processed" => Status::Processed,
_ => Status::default(),
}
}
}
impl fmt::Display for Status {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.as_str())
}
}
#[derive(Debug)]
pub struct UserRedeemal {
pub id: i32,
pub user_id: DBUserId,
pub offer: Offer,
pub redeemed: DateTime<Utc>,
pub last_attempt: Option<DateTime<Utc>>,
pub n_attempts: i32,
pub status: Status,
}
impl UserRedeemal {
pub async fn get_pending<'a, E>(
exec: E,
limit: i64,
) -> sqlx::Result<Vec<UserRedeemal>>
where
E: sqlx::PgExecutor<'a>,
{
let redeemals = query!(
r#"SELECT * FROM users_redeemals WHERE status = $1 LIMIT $2"#,
Status::Pending.as_str(),
limit
)
.fetch_all(exec)
.await?
.into_iter()
.map(|row| UserRedeemal {
id: row.id,
user_id: DBUserId(row.user_id),
offer: Offer::from_str_or_default(&row.offer),
redeemed: row.redeemed,
last_attempt: row.last_attempt,
n_attempts: row.n_attempts,
status: Status::from_str_or_default(&row.status),
})
.collect();
Ok(redeemals)
}
pub async fn update_stuck_5_minutes<'a, E>(exec: E) -> sqlx::Result<()>
where
E: sqlx::PgExecutor<'a>,
{
query!(
r#"
UPDATE users_redeemals
SET status = $1
WHERE
status = $2
AND NOW() - last_attempt > INTERVAL '5 minutes'
"#,
Status::Pending.as_str(),
Status::Processing.as_str(),
)
.execute(exec)
.await?;
Ok(())
}
pub async fn exists_by_user_and_offer<'a, E>(
exec: E,
user_id: DBUserId,
offer: Offer,
) -> sqlx::Result<bool>
where
E: sqlx::PgExecutor<'a>,
{
query_scalar!(
r#"SELECT
EXISTS (
SELECT
1
FROM
users_redeemals
WHERE
user_id = $1
AND offer = $2
) AS "exists!"
"#,
user_id.0,
offer.as_str(),
)
.fetch_one(exec)
.await
}
pub async fn insert<'a, E>(&mut self, exec: E) -> sqlx::Result<()>
where
E: sqlx::PgExecutor<'a>,
{
let query = query_scalar!(
r#"
INSERT INTO users_redeemals
(user_id, offer, redeemed, status, last_attempt, n_attempts)
VALUES ($1, $2, $3, $4, $5, $6)
RETURNING id"#,
self.user_id.0,
self.offer.as_str(),
self.redeemed,
self.status.as_str(),
self.last_attempt,
self.n_attempts,
);
let id = query.fetch_one(exec).await?;
self.id = id;
Ok(())
}
/// Updates `status`, `last_attempt`, and `n_attempts` only if `status` is currently pending.
/// Returns `true` if the status was updated, `false` otherwise.
pub async fn update_status_if_pending<'a, E>(
&self,
exec: E,
) -> sqlx::Result<bool>
where
E: sqlx::PgExecutor<'a>,
{
let query = query!(
r#"
UPDATE users_redeemals
SET
status = $3,
last_attempt = $4,
n_attempts = $5
WHERE id = $1 AND status = $2
"#,
self.id,
Status::Pending.as_str(),
self.status.as_str(),
self.last_attempt,
self.n_attempts,
);
let query_result = query.execute(exec).await?;
Ok(query_result.rows_affected() > 0)
}
pub async fn update<'a, E>(&self, exec: E) -> sqlx::Result<()>
where
E: sqlx::PgExecutor<'a>,
{
let query = query!(
r#"
UPDATE users_redeemals
SET
offer = $2,
status = $3,
redeemed = $4,
last_attempt = $5,
n_attempts = $6
WHERE id = $1
"#,
self.id,
self.offer.as_str(),
self.status.as_str(),
self.redeemed,
self.last_attempt,
self.n_attempts,
);
query.execute(exec).await?;
Ok(())
}
}
#[derive(Debug)]
pub struct RedeemalLookupFields {
pub user_id: DBUserId,
pub redeemal_status: Option<Status>,
}
impl RedeemalLookupFields {
/// Returns the redeemal status of a user for an offer, while looking up the user
/// itself. **This expects a single redeemal per user/offer pair**.
///
/// If the returned value is `Ok(None)`, the user doesn't exist.
///
/// If the returned value is `Ok(Some(fields))`, but `redeemal_status` is `None`,
/// the user exists and has not redeemed the offer.
pub async fn redeemal_status_by_username_and_offer<'a, E>(
exec: E,
user_username: &str,
offer: Offer,
) -> sqlx::Result<Option<RedeemalLookupFields>>
where
E: sqlx::PgExecutor<'a>,
{
let maybe_row = query!(
r#"
SELECT
users.id,
users_redeemals.status AS "status: Option<String>"
FROM
users
LEFT JOIN
users_redeemals ON users_redeemals.user_id = users.id
AND users_redeemals.offer = $2
WHERE
users.username = $1
ORDER BY
users_redeemals.redeemed DESC
LIMIT 1
"#,
user_username,
offer.as_str(),
)
.fetch_optional(exec)
.await?;
// If no row was returned, the user doesn't exist.
// If a row NULL status was returned, the user exists but has no redeemed the offer.
Ok(maybe_row.map(|row| RedeemalLookupFields {
user_id: DBUserId(row.id),
redeemal_status: row
.status
.as_deref()
.map(Status::from_str_or_default),
}))
}
}
+3 -3
View File
@@ -353,11 +353,11 @@ impl RedisPool {
}; };
for (idx, key) in fetch_ids.into_iter().enumerate() { for (idx, key) in fetch_ids.into_iter().enumerate() {
if let Some(locked) = results.get(idx) { if let Some(locked) = results.get(idx)
if locked.is_none() { && locked.is_none()
{
continue; continue;
} }
}
if let Some((key, raw_key)) = ids.remove(&key) { if let Some((key, raw_key)) = ids.remove(&key) {
if let Some(val) = expired_values.remove(&key) { if let Some(val) = expired_values.remove(&key) {
+3 -7
View File
@@ -334,19 +334,15 @@ impl From<Version> for LegacyVersion {
// the v2 loaders are whatever the corresponding loader fields are // the v2 loaders are whatever the corresponding loader fields are
let mut loaders = let mut loaders =
data.loaders.into_iter().map(|l| l.0).collect::<Vec<_>>(); data.loaders.into_iter().map(|l| l.0).collect::<Vec<_>>();
if loaders.contains(&"mrpack".to_string()) { if loaders.contains(&"mrpack".to_string())
if let Some((_, mrpack_loaders)) = data && let Some((_, mrpack_loaders)) = data
.fields .fields
.into_iter() .into_iter()
.find(|(key, _)| key == "mrpack_loaders") .find(|(key, _)| key == "mrpack_loaders")
{ && let Ok(mrpack_loaders) = serde_json::from_value(mrpack_loaders)
if let Ok(mrpack_loaders) =
serde_json::from_value(mrpack_loaders)
{ {
loaders = mrpack_loaders; loaders = mrpack_loaders;
} }
}
}
let loaders = loaders.into_iter().map(Loader).collect::<Vec<_>>(); let loaders = loaders.into_iter().map(Loader).collect::<Vec<_>>();
Self { Self {
+4 -6
View File
@@ -43,8 +43,8 @@ impl LegacyResultSearchProject {
pub fn from(result_search_project: ResultSearchProject) -> Self { pub fn from(result_search_project: ResultSearchProject) -> Self {
let mut categories = result_search_project.categories; let mut categories = result_search_project.categories;
categories.extend(result_search_project.loaders.clone()); categories.extend(result_search_project.loaders.clone());
if categories.contains(&"mrpack".to_string()) { if categories.contains(&"mrpack".to_string())
if let Some(mrpack_loaders) = result_search_project && let Some(mrpack_loaders) = result_search_project
.project_loader_fields .project_loader_fields
.get("mrpack_loaders") .get("mrpack_loaders")
{ {
@@ -56,11 +56,10 @@ impl LegacyResultSearchProject {
); );
categories.retain(|c| c != "mrpack"); categories.retain(|c| c != "mrpack");
} }
}
let mut display_categories = result_search_project.display_categories; let mut display_categories = result_search_project.display_categories;
display_categories.extend(result_search_project.loaders); display_categories.extend(result_search_project.loaders);
if display_categories.contains(&"mrpack".to_string()) { if display_categories.contains(&"mrpack".to_string())
if let Some(mrpack_loaders) = result_search_project && let Some(mrpack_loaders) = result_search_project
.project_loader_fields .project_loader_fields
.get("mrpack_loaders") .get("mrpack_loaders")
{ {
@@ -72,7 +71,6 @@ impl LegacyResultSearchProject {
); );
display_categories.retain(|c| c != "mrpack"); display_categories.retain(|c| c != "mrpack");
} }
}
// Sort then remove duplicates // Sort then remove duplicates
categories.sort(); categories.sort();
-22
View File
@@ -24,13 +24,6 @@ pub enum ProductMetadata {
swap: u32, swap: u32,
storage: u32, storage: u32,
}, },
Medal {
cpu: u32,
ram: u32,
swap: u32,
storage: u32,
region: String,
},
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
@@ -55,7 +48,6 @@ pub enum Price {
#[derive(Serialize, Deserialize, Hash, Eq, PartialEq, Debug, Copy, Clone)] #[derive(Serialize, Deserialize, Hash, Eq, PartialEq, Debug, Copy, Clone)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum PriceDuration { pub enum PriceDuration {
FiveDays,
Monthly, Monthly,
Quarterly, Quarterly,
Yearly, Yearly,
@@ -64,7 +56,6 @@ pub enum PriceDuration {
impl PriceDuration { impl PriceDuration {
pub fn duration(&self) -> chrono::Duration { pub fn duration(&self) -> chrono::Duration {
match self { match self {
PriceDuration::FiveDays => chrono::Duration::days(5),
PriceDuration::Monthly => chrono::Duration::days(30), PriceDuration::Monthly => chrono::Duration::days(30),
PriceDuration::Quarterly => chrono::Duration::days(90), PriceDuration::Quarterly => chrono::Duration::days(90),
PriceDuration::Yearly => chrono::Duration::days(365), PriceDuration::Yearly => chrono::Duration::days(365),
@@ -73,7 +64,6 @@ impl PriceDuration {
pub fn from_string(string: &str) -> PriceDuration { pub fn from_string(string: &str) -> PriceDuration {
match string { match string {
"five-days" => PriceDuration::FiveDays,
"monthly" => PriceDuration::Monthly, "monthly" => PriceDuration::Monthly,
"quarterly" => PriceDuration::Quarterly, "quarterly" => PriceDuration::Quarterly,
"yearly" => PriceDuration::Yearly, "yearly" => PriceDuration::Yearly,
@@ -86,7 +76,6 @@ impl PriceDuration {
PriceDuration::Monthly => "monthly", PriceDuration::Monthly => "monthly",
PriceDuration::Quarterly => "quarterly", PriceDuration::Quarterly => "quarterly",
PriceDuration::Yearly => "yearly", PriceDuration::Yearly => "yearly",
PriceDuration::FiveDays => "five-days",
} }
} }
@@ -95,7 +84,6 @@ impl PriceDuration {
PriceDuration::Monthly, PriceDuration::Monthly,
PriceDuration::Quarterly, PriceDuration::Quarterly,
PriceDuration::Yearly, PriceDuration::Yearly,
PriceDuration::FiveDays,
] ]
.into_iter() .into_iter()
} }
@@ -158,7 +146,6 @@ impl SubscriptionStatus {
#[serde(tag = "type", rename_all = "kebab-case")] #[serde(tag = "type", rename_all = "kebab-case")]
pub enum SubscriptionMetadata { pub enum SubscriptionMetadata {
Pyro { id: String, region: Option<String> }, Pyro { id: String, region: Option<String> },
Medal { id: String },
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
@@ -220,10 +207,6 @@ pub enum ChargeStatus {
Succeeded, Succeeded,
Failed, Failed,
Cancelled, Cancelled,
// Expiring charges are charges that aren't expected to be processed
// but can be promoted to a full charge, like for trials/freebies. When
// due, the underlying subscription is unprovisioned.
Expiring,
} }
impl ChargeStatus { impl ChargeStatus {
@@ -234,7 +217,6 @@ impl ChargeStatus {
"failed" => ChargeStatus::Failed, "failed" => ChargeStatus::Failed,
"open" => ChargeStatus::Open, "open" => ChargeStatus::Open,
"cancelled" => ChargeStatus::Cancelled, "cancelled" => ChargeStatus::Cancelled,
"expiring" => ChargeStatus::Expiring,
_ => ChargeStatus::Failed, _ => ChargeStatus::Failed,
} }
} }
@@ -246,7 +228,6 @@ impl ChargeStatus {
ChargeStatus::Failed => "failed", ChargeStatus::Failed => "failed",
ChargeStatus::Open => "open", ChargeStatus::Open => "open",
ChargeStatus::Cancelled => "cancelled", ChargeStatus::Cancelled => "cancelled",
ChargeStatus::Expiring => "expiring",
} }
} }
} }
@@ -254,14 +235,12 @@ impl ChargeStatus {
#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)] #[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
pub enum PaymentPlatform { pub enum PaymentPlatform {
Stripe, Stripe,
None,
} }
impl PaymentPlatform { impl PaymentPlatform {
pub fn from_string(string: &str) -> PaymentPlatform { pub fn from_string(string: &str) -> PaymentPlatform {
match string { match string {
"stripe" => PaymentPlatform::Stripe, "stripe" => PaymentPlatform::Stripe,
"none" => PaymentPlatform::None,
_ => PaymentPlatform::Stripe, _ => PaymentPlatform::Stripe,
} }
} }
@@ -269,7 +248,6 @@ impl PaymentPlatform {
pub fn as_str(&self) -> &'static str { pub fn as_str(&self) -> &'static str {
match self { match self {
PaymentPlatform::Stripe => "stripe", PaymentPlatform::Stripe => "stripe",
PaymentPlatform::None => "none",
} }
} }
} }
+3 -3
View File
@@ -166,12 +166,12 @@ impl From<ProjectQueryResult> for Project {
Ok(spdx_expr) => { Ok(spdx_expr) => {
let mut vec: Vec<&str> = Vec::new(); let mut vec: Vec<&str> = Vec::new();
for node in spdx_expr.iter() { for node in spdx_expr.iter() {
if let spdx::expression::ExprNode::Req(req) = node { if let spdx::expression::ExprNode::Req(req) = node
if let Some(id) = req.req.license.id() { && let Some(id) = req.req.license.id()
{
vec.push(id.full_name); vec.push(id.full_name);
} }
} }
}
// spdx crate returns AND/OR operations in postfix order // spdx crate returns AND/OR operations in postfix order
// and it would be a lot more effort to make it actually in order // and it would be a lot more effort to make it actually in order
// so let's just ignore that and make them comma-separated // so let's just ignore that and make them comma-separated
+9 -9
View File
@@ -51,17 +51,17 @@ impl ProjectPermissions {
return Some(ProjectPermissions::all()); return Some(ProjectPermissions::all());
} }
if let Some(member) = project_team_member { if let Some(member) = project_team_member
if member.accepted { && member.accepted
{
return Some(member.permissions); return Some(member.permissions);
} }
}
if let Some(member) = organization_team_member { if let Some(member) = organization_team_member
if member.accepted { && member.accepted
{
return Some(member.permissions); return Some(member.permissions);
} }
}
if role.is_mod() { if role.is_mod() {
Some( Some(
@@ -107,11 +107,11 @@ impl OrganizationPermissions {
return Some(OrganizationPermissions::all()); return Some(OrganizationPermissions::all());
} }
if let Some(member) = team_member { if let Some(member) = team_member
if member.accepted { && member.accepted
{
return member.organization_permissions; return member.organization_permissions;
} }
}
if role.is_mod() { if role.is_mod() {
return Some( return Some(
OrganizationPermissions::EDIT_DETAILS OrganizationPermissions::EDIT_DETAILS
+3 -5
View File
@@ -45,20 +45,18 @@ impl MaxMindIndexer {
if let Ok(entries) = archive.entries() { if let Ok(entries) = archive.entries() {
for mut file in entries.flatten() { for mut file in entries.flatten() {
if let Ok(path) = file.header().path() { if let Ok(path) = file.header().path()
if path.extension().and_then(|x| x.to_str()) == Some("mmdb") && path.extension().and_then(|x| x.to_str()) == Some("mmdb")
{ {
let mut buf = Vec::new(); let mut buf = Vec::new();
file.read_to_end(&mut buf).unwrap(); file.read_to_end(&mut buf).unwrap();
let reader = let reader = maxminddb::Reader::from_source(buf).unwrap();
maxminddb::Reader::from_source(buf).unwrap();
return Ok(Some(reader)); return Ok(Some(reader));
} }
} }
} }
}
if should_panic { if should_panic {
panic!( panic!(
+8 -12
View File
@@ -371,8 +371,8 @@ impl AutomatedModerationQueue {
for file in for file in
files.iter().filter(|x| x.version_id == version.id.into()) files.iter().filter(|x| x.version_id == version.id.into())
{ {
if let Some(hash) = file.hashes.get("sha1") { if let Some(hash) = file.hashes.get("sha1")
if let Some((index, (sha1, _, file_name, _))) = hashes && let Some((index, (sha1, _, file_name, _))) = hashes
.iter() .iter()
.enumerate() .enumerate()
.find(|(_, (value, _, _, _))| value == hash) .find(|(_, (value, _, _, _))| value == hash)
@@ -384,7 +384,6 @@ impl AutomatedModerationQueue {
} }
} }
} }
}
// All files are on Modrinth, so we don't send any messages // All files are on Modrinth, so we don't send any messages
if hashes.is_empty() { if hashes.is_empty() {
@@ -420,13 +419,12 @@ impl AutomatedModerationQueue {
.await?; .await?;
for row in rows { for row in rows {
if let Some(sha1) = row.sha1 { if let Some(sha1) = row.sha1
if let Some((index, (sha1, _, file_name, _))) = hashes.iter().enumerate().find(|(_, (value, _, _, _))| value == &sha1) { && let Some((index, (sha1, _, file_name, _))) = hashes.iter().enumerate().find(|(_, (value, _, _, _))| value == &sha1) {
final_hashes.insert(sha1.clone(), IdentifiedFile { file_name: file_name.clone(), status: ApprovalType::from_string(&row.status).unwrap_or(ApprovalType::Unidentified) }); final_hashes.insert(sha1.clone(), IdentifiedFile { file_name: file_name.clone(), status: ApprovalType::from_string(&row.status).unwrap_or(ApprovalType::Unidentified) });
hashes.remove(index); hashes.remove(index);
} }
} }
}
if hashes.is_empty() { if hashes.is_empty() {
let metadata = MissingMetadata { let metadata = MissingMetadata {
@@ -499,8 +497,8 @@ impl AutomatedModerationQueue {
let mut insert_ids = Vec::new(); let mut insert_ids = Vec::new();
for row in rows { for row in rows {
if let Some((curse_index, (hash, _flame_id))) = flame_files.iter().enumerate().find(|(_, x)| Some(x.1 as i32) == row.flame_project_id) { if let Some((curse_index, (hash, _flame_id))) = flame_files.iter().enumerate().find(|(_, x)| Some(x.1 as i32) == row.flame_project_id)
if let Some((index, (sha1, _, file_name, _))) = hashes.iter().enumerate().find(|(_, (value, _, _, _))| value == hash) { && let Some((index, (sha1, _, file_name, _))) = hashes.iter().enumerate().find(|(_, (value, _, _, _))| value == hash) {
final_hashes.insert(sha1.clone(), IdentifiedFile { final_hashes.insert(sha1.clone(), IdentifiedFile {
file_name: file_name.clone(), file_name: file_name.clone(),
status: ApprovalType::from_string(&row.status).unwrap_or(ApprovalType::Unidentified), status: ApprovalType::from_string(&row.status).unwrap_or(ApprovalType::Unidentified),
@@ -513,7 +511,6 @@ impl AutomatedModerationQueue {
flame_files.remove(curse_index); flame_files.remove(curse_index);
} }
} }
}
if !insert_ids.is_empty() && !insert_hashes.is_empty() { if !insert_ids.is_empty() && !insert_hashes.is_empty() {
sqlx::query!( sqlx::query!(
@@ -581,8 +578,8 @@ impl AutomatedModerationQueue {
for (sha1, _pack_file, file_name, _mumur2) in hashes { for (sha1, _pack_file, file_name, _mumur2) in hashes {
let flame_file = flame_files.iter().find(|x| x.0 == sha1); let flame_file = flame_files.iter().find(|x| x.0 == sha1);
if let Some((_, flame_project_id)) = flame_file { if let Some((_, flame_project_id)) = flame_file
if let Some(project) = flame_projects.iter().find(|x| &x.id == flame_project_id) { && let Some(project) = flame_projects.iter().find(|x| &x.id == flame_project_id) {
missing_metadata.flame_files.insert(sha1, MissingMetadataFlame { missing_metadata.flame_files.insert(sha1, MissingMetadataFlame {
title: project.name.clone(), title: project.name.clone(),
file_name, file_name,
@@ -592,7 +589,6 @@ impl AutomatedModerationQueue {
continue; continue;
} }
}
missing_metadata.unknown_files.insert(sha1, file_name); missing_metadata.unknown_files.insert(sha1, file_name);
} }
+8 -9
View File
@@ -257,17 +257,17 @@ impl PayoutsQueue {
) )
})?; })?;
if !status.is_success() { if !status.is_success()
if let Some(obj) = value.as_object() { && let Some(obj) = value.as_object()
{
if let Some(array) = obj.get("errors") { if let Some(array) = obj.get("errors") {
#[derive(Deserialize)] #[derive(Deserialize)]
struct TremendousError { struct TremendousError {
message: String, message: String,
} }
let err = serde_json::from_value::<TremendousError>( let err =
array.clone(), serde_json::from_value::<TremendousError>(array.clone())
)
.map_err(|_| { .map_err(|_| {
ApiError::Payments( ApiError::Payments(
"could not retrieve Tremendous error json body" "could not retrieve Tremendous error json body"
@@ -282,7 +282,6 @@ impl PayoutsQueue {
"could not retrieve Tremendous error body".to_string(), "could not retrieve Tremendous error body".to_string(),
)); ));
} }
}
Ok(serde_json::from_value(value)?) Ok(serde_json::from_value(value)?)
} }
@@ -449,11 +448,11 @@ impl PayoutsQueue {
}; };
// we do not support interval gift cards with non US based currencies since we cannot do currency conversions properly // we do not support interval gift cards with non US based currencies since we cannot do currency conversions properly
if let PayoutInterval::Fixed { .. } = method.interval { if let PayoutInterval::Fixed { .. } = method.interval
if !product.currency_codes.contains(&"USD".to_string()) { && !product.currency_codes.contains(&"USD".to_string())
{
continue; continue;
} }
}
methods.push(method); methods.push(method);
} }
View File
Whitespace-only changes.
+38 -374
View File
@@ -1,8 +1,5 @@
use crate::auth::{get_user_from_headers, send_email}; use crate::auth::{get_user_from_headers, send_email};
use crate::database::models::charge_item::DBCharge; use crate::database::models::charge_item::DBCharge;
use crate::database::models::user_item::DBUser;
use crate::database::models::user_subscription_item::DBUserSubscription;
use crate::database::models::users_redeemals::{self, UserRedeemal};
use crate::database::models::{ use crate::database::models::{
generate_charge_id, generate_user_subscription_id, product_item, generate_charge_id, generate_user_subscription_id, product_item,
user_subscription_item, user_subscription_item,
@@ -17,7 +14,6 @@ use crate::models::pats::Scopes;
use crate::models::users::Badges; use crate::models::users::Badges;
use crate::queue::session::AuthQueue; use crate::queue::session::AuthQueue;
use crate::routes::ApiError; use crate::routes::ApiError;
use crate::util::archon::{ArchonClient, CreateServerRequest, Specs};
use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web}; use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
use ariadne::ids::base62_impl::{parse_base62, to_base62}; use ariadne::ids::base62_impl::{parse_base62, to_base62};
use chrono::{Duration, Utc}; use chrono::{Duration, Utc};
@@ -63,10 +59,8 @@ pub async fn products(
pool: web::Data<PgPool>, pool: web::Data<PgPool>,
redis: web::Data<RedisPool>, redis: web::Data<RedisPool>,
) -> Result<HttpResponse, ApiError> { ) -> Result<HttpResponse, ApiError> {
let products = product_item::QueryProductWithPrices::list_purchaseable( let products =
&**pool, &redis, product_item::QueryProductWithPrices::list(&**pool, &redis).await?;
)
.await?;
let products = products let products = products
.into_iter() .into_iter()
@@ -188,9 +182,7 @@ pub async fn refund_charge(
ChargeStatus::Open ChargeStatus::Open
| ChargeStatus::Processing | ChargeStatus::Processing
| ChargeStatus::Succeeded => Some(x.amount), | ChargeStatus::Succeeded => Some(x.amount),
ChargeStatus::Failed ChargeStatus::Failed | ChargeStatus::Cancelled => None,
| ChargeStatus::Cancelled
| ChargeStatus::Expiring => None,
}) })
.sum::<i64>(); .sum::<i64>();
@@ -264,12 +256,6 @@ pub async fn refund_charge(
)); ));
} }
} }
PaymentPlatform::None => {
return Err(ApiError::InvalidInput(
"This charge was not processed via a payment platform."
.to_owned(),
));
}
} }
}; };
@@ -300,8 +286,9 @@ pub async fn refund_charge(
.upsert(&mut transaction) .upsert(&mut transaction)
.await?; .await?;
if body.0.unprovision.unwrap_or(false) { if body.0.unprovision.unwrap_or(false)
if let Some(subscription_id) = charge.subscription_id { && let Some(subscription_id) = charge.subscription_id
{
let open_charge = let open_charge =
DBCharge::get_open_subscription(subscription_id, &**pool) DBCharge::get_open_subscription(subscription_id, &**pool)
.await?; .await?;
@@ -312,7 +299,6 @@ pub async fn refund_charge(
open_charge.upsert(&mut transaction).await?; open_charge.upsert(&mut transaction).await?;
} }
} }
}
transaction.commit().await?; transaction.commit().await?;
} }
@@ -384,7 +370,6 @@ pub async fn edit_subscription(
})?; })?;
if let Some(cancelled) = &edit_subscription.cancelled { if let Some(cancelled) = &edit_subscription.cancelled {
// Notably, cannot cancel/uncancel expiring charges.
if !matches!( if !matches!(
open_charge.status, open_charge.status,
ChargeStatus::Open ChargeStatus::Open
@@ -407,22 +392,18 @@ pub async fn edit_subscription(
} }
} }
if let Some(interval) = &edit_subscription.interval { if let Some(interval) = &edit_subscription.interval
if let Price::Recurring { intervals } = &current_price.prices { && let Price::Recurring { intervals } = &current_price.prices
// For expiring charges, the interval is handled in the Product branch. {
if open_charge.status != ChargeStatus::Expiring {
if let Some(price) = intervals.get(interval) { if let Some(price) = intervals.get(interval) {
open_charge.subscription_interval = Some(*interval); open_charge.subscription_interval = Some(*interval);
open_charge.amount = *price as i64; open_charge.amount = *price as i64;
} else { } else {
return Err(ApiError::InvalidInput( return Err(ApiError::InvalidInput(
"Interval is not valid for this subscription!" "Interval is not valid for this subscription!".to_string(),
.to_string(),
)); ));
} }
} }
}
}
let intent = if let Some(product_id) = &edit_subscription.product { let intent = if let Some(product_id) = &edit_subscription.product {
let product_price = let product_price =
@@ -447,103 +428,6 @@ pub async fn edit_subscription(
)); ));
} }
// If the charge is an expiring charge, we need to create a payment
// intent as if the user was subscribing to the product, as opposed
// to a proration.
if open_charge.status == ChargeStatus::Expiring {
// We need a new interval when promoting the charge.
let interval = edit_subscription.interval
.ok_or_else(|| ApiError::InvalidInput("You need to specify an interval when promoting an expiring charge.".to_owned()))?;
let charge_id = generate_charge_id(&mut transaction).await?;
let customer_id = get_or_create_customer(
user.id,
user.stripe_customer_id.as_deref(),
user.email.as_deref(),
&stripe_client,
&pool,
&redis,
)
.await?;
let new_price_value = match product_price.prices {
Price::OneTime { ref price } => *price,
Price::Recurring { ref intervals } => {
*intervals
.get(&interval)
.ok_or_else(|| ApiError::InvalidInput("Could not find a valid price for the specified duration".to_owned()))?
}
};
let currency = Currency::from_str(
&current_price.currency_code.to_lowercase(),
)
.map_err(|_| {
ApiError::InvalidInput("Invalid currency code".to_string())
})?;
let mut intent =
CreatePaymentIntent::new(new_price_value as i64, currency);
let mut metadata = HashMap::new();
metadata.insert(
"modrinth_user_id".to_string(),
to_base62(user.id.0),
);
metadata.insert(
"modrinth_charge_id".to_string(),
to_base62(charge_id.0 as u64),
);
metadata.insert(
"modrinth_subscription_id".to_string(),
to_base62(subscription.id.0 as u64),
);
metadata.insert(
"modrinth_price_id".to_string(),
to_base62(product_price.id.0 as u64),
);
metadata.insert(
"modrinth_subscription_interval".to_string(),
interval.as_str().to_string(),
);
metadata.insert(
"modrinth_charge_type".to_string(),
ChargeType::Subscription.as_str().to_string(),
);
intent.customer = Some(customer_id);
intent.metadata = Some(metadata);
intent.receipt_email = user.email.as_deref();
intent.setup_future_usage =
Some(PaymentIntentSetupFutureUsage::OffSession);
if let Some(payment_method) = &edit_subscription.payment_method
{
let Ok(payment_method_id) =
PaymentMethodId::from_str(payment_method)
else {
return Err(ApiError::InvalidInput(
"Invalid payment method id".to_string(),
));
};
intent.payment_method = Some(payment_method_id);
}
let intent =
stripe::PaymentIntent::create(&stripe_client, intent)
.await?;
// We do NOT update the open charge here. It will be patched to be the next
// charge of the subscription in the stripe webhook.
//
// We also shouldn't delete it, because if the payment fails, the expiring
// charge will be gone and the preview subscription will never be unprovisioned.
Some((new_price_value, 0, intent))
} else {
// The charge is not an expiring charge, need to prorate.
let interval = open_charge.due - Utc::now(); let interval = open_charge.due - Utc::now();
let duration = PriceDuration::Monthly; let duration = PriceDuration::Monthly;
@@ -567,8 +451,7 @@ pub async fn edit_subscription(
let complete = Decimal::from(interval.num_seconds()) let complete = Decimal::from(interval.num_seconds())
/ Decimal::from(duration.duration().num_seconds()); / Decimal::from(duration.duration().num_seconds());
let proration = (Decimal::from(amount - current_amount) let proration = (Decimal::from(amount - current_amount) * complete)
* complete)
.floor() .floor()
.to_i32() .to_i32()
.ok_or_else(|| { .ok_or_else(|| {
@@ -577,8 +460,8 @@ pub async fn edit_subscription(
) )
})?; })?;
// First condition: Plan downgrade, update future charge // First branch: Plan downgrade, update future charge
// Second condition: For small transactions (under 30 cents), we make a loss on the // Second branch: For small transactions (under 30 cents), we make a loss on the
// proration due to fees. In these situations, just give it to them for free, because // proration due to fees. In these situations, just give it to them for free, because
// their next charge will be in a day or two anyway. // their next charge will be in a day or two anyway.
if current_amount > amount || proration < 30 { if current_amount > amount || proration < 30 {
@@ -587,8 +470,7 @@ pub async fn edit_subscription(
None None
} else { } else {
let charge_id = let charge_id = generate_charge_id(&mut transaction).await?;
generate_charge_id(&mut transaction).await?;
let customer_id = get_or_create_customer( let customer_id = get_or_create_customer(
user.id, user.id,
@@ -604,9 +486,7 @@ pub async fn edit_subscription(
&current_price.currency_code.to_lowercase(), &current_price.currency_code.to_lowercase(),
) )
.map_err(|_| { .map_err(|_| {
ApiError::InvalidInput( ApiError::InvalidInput("Invalid currency code".to_string())
"Invalid currency code".to_string(),
)
})?; })?;
let mut intent = let mut intent =
@@ -648,8 +528,7 @@ pub async fn edit_subscription(
intent.setup_future_usage = intent.setup_future_usage =
Some(PaymentIntentSetupFutureUsage::OffSession); Some(PaymentIntentSetupFutureUsage::OffSession);
if let Some(payment_method) = if let Some(payment_method) = &edit_subscription.payment_method
&edit_subscription.payment_method
{ {
let Ok(payment_method_id) = let Ok(payment_method_id) =
PaymentMethodId::from_str(payment_method) PaymentMethodId::from_str(payment_method)
@@ -667,7 +546,6 @@ pub async fn edit_subscription(
Some((proration, 0, intent)) Some((proration, 0, intent))
} }
}
} else { } else {
None None
}; };
@@ -1069,17 +947,14 @@ pub async fn active_servers(
let server_ids = servers let server_ids = servers
.into_iter() .into_iter()
.filter_map(|x| { .filter_map(|x| {
x.metadata.as_ref().and_then(|metadata| match metadata { x.metadata.as_ref().map(|metadata| match metadata {
SubscriptionMetadata::Pyro { id, region } => { SubscriptionMetadata::Pyro { id, region } => ActiveServer {
Some(ActiveServer {
user_id: x.user_id.into(), user_id: x.user_id.into(),
server_id: id.clone(), server_id: id.clone(),
price_id: x.price_id.into(), price_id: x.price_id.into(),
interval: x.interval, interval: x.interval,
region: region.clone(), region: region.clone(),
}) },
}
SubscriptionMetadata::Medal { .. } => None,
}) })
}) })
.collect::<Vec<ActiveServer>>(); .collect::<Vec<ActiveServer>>();
@@ -1311,7 +1186,7 @@ pub async fn initiate_payment(
})?; })?;
let mut product_prices = let mut product_prices =
product_item::DBProductPrice::get_all_public_product_prices( product_item::DBProductPrice::get_all_product_prices(
product.id, &**pool, product.id, &**pool,
) )
.await?; .await?;
@@ -1349,8 +1224,9 @@ pub async fn initiate_payment(
} }
}; };
if let Price::Recurring { .. } = price_item.prices { if let Price::Recurring { .. } = price_item.prices
if product.unitary { && product.unitary
{
let user_subscriptions = let user_subscriptions =
user_subscription_item::DBUserSubscription::get_all_user( user_subscription_item::DBUserSubscription::get_all_user(
user.id.into(), user.id.into(),
@@ -1358,13 +1234,11 @@ pub async fn initiate_payment(
) )
.await?; .await?;
let user_products = let user_products = product_item::DBProductPrice::get_many(
product_item::DBProductPrice::get_many(
&user_subscriptions &user_subscriptions
.iter() .iter()
.filter(|x| { .filter(|x| {
x.status x.status == SubscriptionStatus::Provisioned
== SubscriptionStatus::Provisioned
}) })
.map(|x| x.price_id) .map(|x| x.price_id)
.collect::<Vec<_>>(), .collect::<Vec<_>>(),
@@ -1382,7 +1256,6 @@ pub async fn initiate_payment(
)); ));
} }
} }
}
( (
price as i64, price as i64,
@@ -1828,13 +1701,6 @@ pub async fn stripe_webhook(
// Provision subscription // Provision subscription
match metadata.product_item.metadata { match metadata.product_item.metadata {
// A payment shouldn't be processed for Medal subscriptions.
ProductMetadata::Medal { .. } => {
warn!(
"A payment processed for a free subscription"
);
}
ProductMetadata::Midas => { ProductMetadata::Midas => {
let badges = let badges =
metadata.user_item.badges | Badges::MIDAS; metadata.user_item.badges | Badges::MIDAS;
@@ -1964,7 +1830,6 @@ pub async fn stripe_webhook(
"region": server_region, "region": server_region,
"source": source, "source": source,
"payment_interval": metadata.charge_item.subscription_interval.map(|x| match x { "payment_interval": metadata.charge_item.subscription_interval.map(|x| match x {
PriceDuration::FiveDays => 1,
PriceDuration::Monthly => 1, PriceDuration::Monthly => 1,
PriceDuration::Quarterly => 3, PriceDuration::Quarterly => 3,
PriceDuration::Yearly => 12, PriceDuration::Yearly => 12,
@@ -2011,32 +1876,10 @@ pub async fn stripe_webhook(
} }
}; };
// If the next open charge is actually an expiring charge,
// this means the subscription was promoted from a temporary
// free subscription to a paid subscription.
//
// In this case, we need to modify this expiring charge to be the
// next charge of the subscription, turn it into a normal open charge.
//
// Otherwise, if there *is* an open charge, the subscription was upgraded
// and the just-processed payment was the proration charge. In this case,
// the existing open charge must be updated to reflect the new product's price.
//
// If there are no open charges, the just-processed payment was a recurring
// or initial subscription charge, and we need to create the next charge.
if let Some(mut charge) = open_charge { if let Some(mut charge) = open_charge {
if charge.status == ChargeStatus::Expiring { charge.price_id = metadata.product_price_item.id;
charge.status = ChargeStatus::Open;
charge.due = Utc::now()
+ subscription.interval.duration();
charge.payment_platform =
PaymentPlatform::Stripe;
charge.last_attempt = None;
} else {
charge.price_id =
metadata.product_price_item.id;
charge.amount = new_price as i64; charge.amount = new_price as i64;
}
charge.upsert(&mut transaction).await?; charge.upsert(&mut transaction).await?;
} else if metadata.charge_item.status } else if metadata.charge_item.status
!= ChargeStatus::Cancelled != ChargeStatus::Cancelled
@@ -2158,8 +2001,7 @@ pub async fn stripe_webhook(
EventType::PaymentMethodAttached => { EventType::PaymentMethodAttached => {
if let EventObject::PaymentMethod(payment_method) = if let EventObject::PaymentMethod(payment_method) =
event.data.object event.data.object
{ && let Some(customer_id) =
if let Some(customer_id) =
payment_method.customer.map(|x| x.id()) payment_method.customer.map(|x| x.id())
{ {
let customer = stripe::Customer::retrieve( let customer = stripe::Customer::retrieve(
@@ -2192,7 +2034,6 @@ pub async fn stripe_webhook(
} }
} }
} }
}
_ => {} _ => {}
} }
} else { } else {
@@ -2259,11 +2100,7 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
let mut transaction = pool.begin().await?; let mut transaction = pool.begin().await?;
let mut clear_cache_users = Vec::new(); let mut clear_cache_users = Vec::new();
// If an active subscription has: // If an active subscription has a canceled charge OR a failed charge more than two days ago, it should be cancelled
// - A canceled charge due now
// - An expiring charge due now
// - A failed charge more than two days ago
// It should be unprovisioned.
let all_charges = DBCharge::get_unprovision(&pool).await?; let all_charges = DBCharge::get_unprovision(&pool).await?;
let mut all_subscriptions = let mut all_subscriptions =
@@ -2359,26 +2196,19 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
true true
} }
ProductMetadata::Pyro { .. } => {
ProductMetadata::Pyro { .. } if let Some(SubscriptionMetadata::Pyro { id, region: _ }) =
| ProductMetadata::Medal { .. } => 'server: { &subscription.metadata
let server_id = match &subscription.metadata { {
Some(SubscriptionMetadata::Pyro { id, region: _ }) => {
id
}
Some(SubscriptionMetadata::Medal { id }) => id,
_ => break 'server true,
};
let res = reqwest::Client::new() let res = reqwest::Client::new()
.post(format!( .post(format!(
"{}/modrinth/v0/servers/{}/suspend", "{}/modrinth/v0/servers/{}/suspend",
dotenvy::var("ARCHON_URL")?, dotenvy::var("ARCHON_URL")?,
server_id id
)) ))
.header("X-Master-Key", dotenvy::var("PYRO_API_KEY")?) .header("X-Master-Key", dotenvy::var("PYRO_API_KEY")?)
.json(&serde_json::json!({ .json(&serde_json::json!({
"reason": if charge.status == ChargeStatus::Cancelled || charge.status == ChargeStatus::Expiring { "reason": if charge.status == ChargeStatus::Cancelled {
"cancelled" "cancelled"
} else { } else {
"paymentfailed" "paymentfailed"
@@ -2393,6 +2223,9 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
} else { } else {
true true
} }
} else {
true
}
} }
}; };
@@ -2414,20 +2247,6 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
.await?; .await?;
transaction.commit().await?; transaction.commit().await?;
// If an offer redeemal has been processing for over 5 minutes, it should be set pending.
UserRedeemal::update_stuck_5_minutes(&pool).await?;
// If an offer redeemal is pending, try processing it.
// Try processing it.
let pending_redeemals = UserRedeemal::get_pending(&pool, 100).await?;
for redeemal in pending_redeemals {
if let Err(error) =
try_process_user_redeemal(&pool, &redis, redeemal).await
{
warn!(%error, "Failed to process a redeemal.")
}
}
Ok::<(), ApiError>(()) Ok::<(), ApiError>(())
}; };
@@ -2438,161 +2257,6 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
info!("Done indexing subscriptions"); info!("Done indexing subscriptions");
} }
/// Attempts to process a user redeemal.
///
/// Returns `Ok` if the entry has been succesfully processed, or will not be processed.
pub async fn try_process_user_redeemal(
pool: &PgPool,
redis: &RedisPool,
mut user_redeemal: UserRedeemal,
) -> Result<(), ApiError> {
// Immediately update redeemal row
user_redeemal.last_attempt = Some(Utc::now());
user_redeemal.n_attempts += 1;
user_redeemal.status = users_redeemals::Status::Processing;
let updated = user_redeemal.update_status_if_pending(pool).await?;
if !updated {
return Ok(());
}
let user_id = user_redeemal.user_id;
// Find the Medal product's price & metadata
let mut medal_products =
product_item::QueryProductWithPrices::list_by_product_type(
pool, "medal",
)
.await?;
let Some(product_item::QueryProductWithPrices {
id: _product_id,
metadata,
mut prices,
unitary: _,
}) = medal_products.pop()
else {
return Err(ApiError::Conflict(
"Missing Medal subscription product".to_owned(),
));
};
let ProductMetadata::Medal {
cpu,
ram,
swap,
storage,
region,
} = metadata
else {
return Err(ApiError::Conflict(
"Missing or incorrect metadata for Medal subscription".to_owned(),
));
};
let Some(medal_price) = prices.pop() else {
return Err(ApiError::Conflict(
"Missing price for Medal subscription".to_owned(),
));
};
let (price_duration, price_amount) = match medal_price.prices {
Price::OneTime { price: _ } => {
return Err(ApiError::Conflict(
"Unexpected metadata for Medal subscription price".to_owned(),
));
}
Price::Recurring { intervals } => {
let Some((price_duration, price_amount)) =
intervals.into_iter().next()
else {
return Err(ApiError::Conflict(
"Missing price interval for Medal subscription".to_owned(),
));
};
(price_duration, price_amount)
}
};
let price_id = medal_price.id;
// Get the user's username
let user = DBUser::get_id(user_id, pool, redis)
.await?
.ok_or(ApiError::NotFound)?;
// Send the provision request to Archon. On failure, the redeemal will be "stuck" processing,
// and moved back to pending by `index_subscriptions`.
let archon_client = ArchonClient::from_env()?;
let server_id = archon_client
.create_server(&CreateServerRequest {
user_id: to_base62(user_id.0 as u64),
name: format!("{}'s Medal server", user.username),
specs: Specs {
memory_mb: ram,
cpu,
swap_mb: swap,
storage_mb: storage,
},
source: crate::util::archon::Empty::default(),
region,
tags: vec!["medal".to_owned()],
})
.await?;
let mut txn = pool.begin().await?;
// Build a subscription using this price ID.
let subscription = DBUserSubscription {
id: generate_user_subscription_id(&mut txn).await?,
user_id,
price_id,
interval: PriceDuration::FiveDays,
created: Utc::now(),
status: SubscriptionStatus::Provisioned,
metadata: Some(SubscriptionMetadata::Medal {
id: server_id.to_string(),
}),
};
subscription.upsert(&mut txn).await?;
// Insert an expiring charge, `index_subscriptions` will unprovision the
// subscription when expired.
DBCharge {
id: generate_charge_id(&mut txn).await?,
user_id,
price_id,
amount: price_amount.into(),
currency_code: medal_price.currency_code,
status: ChargeStatus::Expiring,
due: Utc::now() + price_duration.duration(),
last_attempt: None,
type_: ChargeType::Subscription,
subscription_id: Some(subscription.id),
subscription_interval: Some(subscription.interval),
payment_platform: PaymentPlatform::None,
payment_platform_id: None,
parent_charge_id: None,
net: None,
}
.upsert(&mut txn)
.await?;
// Update `users_redeemal`, mark subscription as redeemed.
user_redeemal.status = users_redeemals::Status::Processed;
user_redeemal.update(&mut *txn).await?;
txn.commit().await?;
Ok(())
}
pub async fn index_billing( pub async fn index_billing(
stripe_client: stripe::Client, stripe_client: stripe::Client,
pool: PgPool, pool: PgPool,
+5 -6
View File
@@ -79,14 +79,13 @@ impl TempUser {
file_host: &Arc<dyn FileHost + Send + Sync>, file_host: &Arc<dyn FileHost + Send + Sync>,
redis: &RedisPool, redis: &RedisPool,
) -> Result<crate::database::models::DBUserId, AuthenticationError> { ) -> Result<crate::database::models::DBUserId, AuthenticationError> {
if let Some(email) = &self.email { if let Some(email) = &self.email
if crate::database::models::DBUser::get_by_email(email, client) && crate::database::models::DBUser::get_by_email(email, client)
.await? .await?
.is_some() .is_some()
{ {
return Err(AuthenticationError::DuplicateUser); return Err(AuthenticationError::DuplicateUser);
} }
}
let user_id = let user_id =
crate::database::models::generate_user_id(transaction).await?; crate::database::models::generate_user_id(transaction).await?;
@@ -1269,8 +1268,9 @@ pub async fn delete_auth_provider(
.update_user_id(user.id.into(), None, &mut transaction) .update_user_id(user.id.into(), None, &mut transaction)
.await?; .await?;
if delete_provider.provider != AuthProvider::PayPal { if delete_provider.provider != AuthProvider::PayPal
if let Some(email) = user.email { && let Some(email) = user.email
{
send_email( send_email(
email, email,
"Authentication method removed", "Authentication method removed",
@@ -1282,7 +1282,6 @@ pub async fn delete_auth_provider(
None, None,
)?; )?;
} }
}
transaction.commit().await?; transaction.commit().await?;
crate::database::models::DBUser::clear_caches( crate::database::models::DBUser::clear_caches(
-109
View File
@@ -1,109 +0,0 @@
use actix_web::{HttpResponse, post, web};
use ariadne::ids::UserId;
use chrono::Utc;
use serde::{Deserialize, Serialize};
use sqlx::PgPool;
use tracing::warn;
use crate::database::models::users_redeemals::{
Offer, RedeemalLookupFields, Status, UserRedeemal,
};
use crate::database::redis::RedisPool;
use crate::routes::ApiError;
use crate::routes::internal::billing::try_process_user_redeemal;
use crate::util::guards::medal_key_guard;
pub fn config(cfg: &mut web::ServiceConfig) {
cfg.service(web::scope("medal").service(verify).service(redeem));
}
#[derive(Deserialize)]
struct MedalQuery {
username: String,
}
#[post("verify", guard = "medal_key_guard")]
pub async fn verify(
pool: web::Data<PgPool>,
web::Query(MedalQuery { username }): web::Query<MedalQuery>,
) -> Result<HttpResponse, ApiError> {
let maybe_fields =
RedeemalLookupFields::redeemal_status_by_username_and_offer(
&**pool,
&username,
Offer::Medal,
)
.await?;
#[derive(Serialize)]
struct VerifyResponse {
user_id: UserId,
redeemed: bool,
}
match maybe_fields {
None => Err(ApiError::NotFound),
Some(fields) => Ok(HttpResponse::Ok().json(VerifyResponse {
user_id: fields.user_id.into(),
redeemed: fields.redeemal_status.is_some(),
})),
}
}
#[post("redeem", guard = "medal_key_guard")]
pub async fn redeem(
pool: web::Data<PgPool>,
redis: web::Data<RedisPool>,
web::Query(MedalQuery { username }): web::Query<MedalQuery>,
) -> Result<HttpResponse, ApiError> {
// Check the offer hasn't been redeemed yet, then insert into the table.
// In a transaction to avoid double inserts.
let mut txn = pool.begin().await?;
let maybe_fields =
RedeemalLookupFields::redeemal_status_by_username_and_offer(
&mut *txn,
&username,
Offer::Medal,
)
.await?;
let user_id = match maybe_fields {
None => return Err(ApiError::NotFound),
Some(fields) => {
if fields.redeemal_status.is_some() {
return Err(ApiError::Conflict(
"User already redeemed this offer".to_string(),
));
}
fields.user_id
}
};
// Link user to offer redeemal.
let mut redeemal = UserRedeemal {
id: 0,
user_id,
offer: Offer::Medal,
redeemed: Utc::now(),
status: Status::Pending,
last_attempt: None,
n_attempts: 0,
};
redeemal.insert(&mut *txn).await?;
txn.commit().await?;
// Immediately try to process the redeemal
if let Err(error) = try_process_user_redeemal(&pool, &redis, redeemal).await
{
warn!(%error, "Medal redeemal processing failed");
Ok(HttpResponse::Accepted().finish())
} else {
Ok(HttpResponse::Created().finish())
}
}
+1 -3
View File
@@ -2,7 +2,6 @@ pub(crate) mod admin;
pub mod billing; pub mod billing;
pub mod flows; pub mod flows;
pub mod gdpr; pub mod gdpr;
pub mod medal;
pub mod moderation; pub mod moderation;
pub mod pats; pub mod pats;
pub mod session; pub mod session;
@@ -25,7 +24,6 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
.configure(moderation::config) .configure(moderation::config)
.configure(billing::config) .configure(billing::config)
.configure(gdpr::config) .configure(gdpr::config)
.configure(statuses::config) .configure(statuses::config),
.configure(medal::config),
); );
} }
@@ -189,8 +189,8 @@ pub async fn get_project_meta(
.iter() .iter()
.find(|x| Some(x.1.id as i32) == row.flame_project_id) .find(|x| Some(x.1.id as i32) == row.flame_project_id)
.map(|x| x.0.clone()) .map(|x| x.0.clone())
&& let Some(val) = merged.flame_files.remove(&sha1)
{ {
if let Some(val) = merged.flame_files.remove(&sha1) {
merged.identified.insert( merged.identified.insert(
sha1, sha1,
IdentifiedFile { IdentifiedFile {
@@ -201,7 +201,6 @@ pub async fn get_project_meta(
); );
} }
} }
}
Ok(HttpResponse::Ok().json(merged)) Ok(HttpResponse::Ok().json(merged))
} else { } else {
+6 -6
View File
@@ -185,8 +185,9 @@ pub async fn edit_pat(
) )
.await?; .await?;
if let Some(pat) = pat { if let Some(pat) = pat
if pat.user_id == user.id.into() { && pat.user_id == user.id.into()
{
let mut transaction = pool.begin().await?; let mut transaction = pool.begin().await?;
if let Some(scopes) = &info.scopes { if let Some(scopes) = &info.scopes {
@@ -248,7 +249,6 @@ pub async fn edit_pat(
) )
.await?; .await?;
} }
}
Ok(HttpResponse::NoContent().finish()) Ok(HttpResponse::NoContent().finish())
} }
@@ -276,8 +276,9 @@ pub async fn delete_pat(
) )
.await?; .await?;
if let Some(pat) = pat { if let Some(pat) = pat
if pat.user_id == user.id.into() { && pat.user_id == user.id.into()
{
let mut transaction = pool.begin().await?; let mut transaction = pool.begin().await?;
database::models::pat_item::DBPersonalAccessToken::remove( database::models::pat_item::DBPersonalAccessToken::remove(
pat.id, pat.id,
@@ -291,7 +292,6 @@ pub async fn delete_pat(
) )
.await?; .await?;
} }
}
Ok(HttpResponse::NoContent().finish()) Ok(HttpResponse::NoContent().finish())
} }
+3 -3
View File
@@ -185,8 +185,9 @@ pub async fn delete(
let session = DBSession::get(info.into_inner().0, &**pool, &redis).await?; let session = DBSession::get(info.into_inner().0, &**pool, &redis).await?;
if let Some(session) = session { if let Some(session) = session
if session.user_id == current_user.id.into() { && session.user_id == current_user.id.into()
{
let mut transaction = pool.begin().await?; let mut transaction = pool.begin().await?;
DBSession::remove(session.id, &mut transaction).await?; DBSession::remove(session.id, &mut transaction).await?;
transaction.commit().await?; transaction.commit().await?;
@@ -200,7 +201,6 @@ pub async fn delete(
) )
.await?; .await?;
} }
}
Ok(HttpResponse::NoContent().body("")) Ok(HttpResponse::NoContent().body(""))
} }
@@ -401,8 +401,8 @@ async fn broadcast_to_known_local_friends(
friend.user_id friend.user_id
}; };
if friend.accepted { if friend.accepted
if let Some(socket_ids) = && let Some(socket_ids) =
sockets.sockets_by_user_id.get(&friend_id.into()) sockets.sockets_by_user_id.get(&friend_id.into())
{ {
for socket_id in socket_ids.iter() { for socket_id in socket_ids.iter() {
@@ -412,7 +412,6 @@ async fn broadcast_to_known_local_friends(
} }
} }
} }
}
Ok(()) Ok(())
} }
-4
View File
@@ -137,8 +137,6 @@ pub enum ApiError {
Io(#[from] std::io::Error), Io(#[from] std::io::Error),
#[error("Resource not found")] #[error("Resource not found")]
NotFound, NotFound,
#[error("Conflict: {0}")]
Conflict(String),
#[error( #[error(
"You are being rate-limited. Please wait {0} milliseconds. 0/{1} remaining." "You are being rate-limited. Please wait {0} milliseconds. 0/{1} remaining."
)] )]
@@ -174,7 +172,6 @@ impl ApiError {
ApiError::Clickhouse(..) => "clickhouse_error", ApiError::Clickhouse(..) => "clickhouse_error",
ApiError::Reroute(..) => "reroute_error", ApiError::Reroute(..) => "reroute_error",
ApiError::NotFound => "not_found", ApiError::NotFound => "not_found",
ApiError::Conflict(..) => "conflict",
ApiError::Zip(..) => "zip_error", ApiError::Zip(..) => "zip_error",
ApiError::Io(..) => "io_error", ApiError::Io(..) => "io_error",
ApiError::RateLimitError(..) => "ratelimit_error", ApiError::RateLimitError(..) => "ratelimit_error",
@@ -211,7 +208,6 @@ impl actix_web::ResponseError for ApiError {
ApiError::Mail(..) => StatusCode::INTERNAL_SERVER_ERROR, ApiError::Mail(..) => StatusCode::INTERNAL_SERVER_ERROR,
ApiError::Reroute(..) => StatusCode::INTERNAL_SERVER_ERROR, ApiError::Reroute(..) => StatusCode::INTERNAL_SERVER_ERROR,
ApiError::NotFound => StatusCode::NOT_FOUND, ApiError::NotFound => StatusCode::NOT_FOUND,
ApiError::Conflict(..) => StatusCode::CONFLICT,
ApiError::Zip(..) => StatusCode::BAD_REQUEST, ApiError::Zip(..) => StatusCode::BAD_REQUEST,
ApiError::Io(..) => StatusCode::BAD_REQUEST, ApiError::Io(..) => StatusCode::BAD_REQUEST,
ApiError::RateLimitError(..) => StatusCode::TOO_MANY_REQUESTS, ApiError::RateLimitError(..) => StatusCode::TOO_MANY_REQUESTS,
+4 -5
View File
@@ -387,9 +387,10 @@ pub async fn revenue_get(
.map(|x| (x.to_string(), HashMap::new())) .map(|x| (x.to_string(), HashMap::new()))
.collect::<HashMap<_, _>>(); .collect::<HashMap<_, _>>();
for value in payouts_values { for value in payouts_values {
if let Some(mod_id) = value.mod_id { if let Some(mod_id) = value.mod_id
if let Some(amount) = value.amount_sum { && let Some(amount) = value.amount_sum
if let Some(interval_start) = value.interval_start { && let Some(interval_start) = value.interval_start
{
let id_string = to_base62(mod_id as u64); let id_string = to_base62(mod_id as u64);
if !hm.contains_key(&id_string) { if !hm.contains_key(&id_string) {
hm.insert(id_string.clone(), HashMap::new()); hm.insert(id_string.clone(), HashMap::new());
@@ -399,8 +400,6 @@ pub async fn revenue_get(
} }
} }
} }
}
}
Ok(HttpResponse::Ok().json(hm)) Ok(HttpResponse::Ok().json(hm))
} }
+3 -3
View File
@@ -192,11 +192,11 @@ pub async fn collection_get(
.map(|x| x.1) .map(|x| x.1)
.ok(); .ok();
if let Some(data) = collection_data { if let Some(data) = collection_data
if is_visible_collection(&data, &user_option, false).await? { && is_visible_collection(&data, &user_option, false).await?
{
return Ok(HttpResponse::Ok().json(Collection::from(data))); return Ok(HttpResponse::Ok().json(Collection::from(data)));
} }
}
Err(ApiError::NotFound) Err(ApiError::NotFound)
} }
+2 -4
View File
@@ -536,11 +536,9 @@ pub async fn create_payout(
Some(true), Some(true),
) )
.await .await
&& let Some(data) = res.items.first()
{ {
if let Some(data) = res.items.first() { payout_item.platform_id = Some(data.payout_item_id.clone());
payout_item.platform_id =
Some(data.payout_item_id.clone());
}
} }
} }
+15 -15
View File
@@ -182,11 +182,11 @@ pub async fn project_get(
.map(|x| x.1) .map(|x| x.1)
.ok(); .ok();
if let Some(data) = project_data { if let Some(data) = project_data
if is_visible_project(&data.inner, &user_option, &pool, false).await? { && is_visible_project(&data.inner, &user_option, &pool, false).await?
{
return Ok(HttpResponse::Ok().json(Project::from(data))); return Ok(HttpResponse::Ok().json(Project::from(data)));
} }
}
Err(ApiError::NotFound) Err(ApiError::NotFound)
} }
@@ -403,8 +403,10 @@ pub async fn project_edit(
.await?; .await?;
} }
if status.is_searchable() && !project_item.inner.webhook_sent { if status.is_searchable()
if let Ok(webhook_url) = dotenvy::var("PUBLIC_DISCORD_WEBHOOK") { && !project_item.inner.webhook_sent
&& let Ok(webhook_url) = dotenvy::var("PUBLIC_DISCORD_WEBHOOK")
{
crate::util::webhook::send_discord_webhook( crate::util::webhook::send_discord_webhook(
project_item.inner.id.into(), project_item.inner.id.into(),
&pool, &pool,
@@ -426,10 +428,10 @@ pub async fn project_edit(
.execute(&mut *transaction) .execute(&mut *transaction)
.await?; .await?;
} }
}
if user.role.is_mod() { if user.role.is_mod()
if let Ok(webhook_url) = dotenvy::var("MODERATION_SLACK_WEBHOOK") { && let Ok(webhook_url) = dotenvy::var("MODERATION_SLACK_WEBHOOK")
{
crate::util::webhook::send_slack_webhook( crate::util::webhook::send_slack_webhook(
project_item.inner.id.into(), project_item.inner.id.into(),
&pool, &pool,
@@ -450,7 +452,6 @@ pub async fn project_edit(
.await .await
.ok(); .ok();
} }
}
if team_member.is_none_or(|x| !x.accepted) { if team_member.is_none_or(|x| !x.accepted) {
let notified_members = sqlx::query!( let notified_members = sqlx::query!(
@@ -692,8 +693,9 @@ pub async fn project_edit(
.await?; .await?;
} }
if let Some(links) = &new_project.link_urls { if let Some(links) = &new_project.link_urls
if !links.is_empty() { && !links.is_empty()
{
if !perms.contains(ProjectPermissions::EDIT_DETAILS) { if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
return Err(ApiError::CustomAuthentication( return Err(ApiError::CustomAuthentication(
"You do not have the permissions to edit the links of this project!" "You do not have the permissions to edit the links of this project!"
@@ -718,8 +720,7 @@ pub async fn project_edit(
for (platform, url) in links { for (platform, url) in links {
if let Some(url) = url { if let Some(url) = url {
let platform_id = let platform_id = db_models::categories::LinkPlatform::get_id(
db_models::categories::LinkPlatform::get_id(
platform, platform,
&mut *transaction, &mut *transaction,
) )
@@ -744,7 +745,6 @@ pub async fn project_edit(
} }
} }
} }
}
if let Some(moderation_message) = &new_project.moderation_message { if let Some(moderation_message) = &new_project.moderation_message {
if !user.role.is_mod() if !user.role.is_mod()
&& (!project_item.inner.status.is_approved() && (!project_item.inner.status.is_approved()
@@ -2430,7 +2430,7 @@ pub async fn project_get_organization(
organization, organization,
team_members, team_members,
); );
return Ok(HttpResponse::Ok().json(organization)); Ok(HttpResponse::Ok().json(organization))
} else { } else {
Err(ApiError::NotFound) Err(ApiError::NotFound)
} }
+12 -12
View File
@@ -767,13 +767,14 @@ pub async fn edit_team_member(
)); ));
} }
if let Some(new_permissions) = edit_member.permissions { if let Some(new_permissions) = edit_member.permissions
if !permissions.contains(new_permissions) { && !permissions.contains(new_permissions)
{
return Err(ApiError::InvalidInput( return Err(ApiError::InvalidInput(
"The new permissions have permissions that you don't have".to_string(), "The new permissions have permissions that you don't have"
.to_string(),
)); ));
} }
}
if edit_member.organization_permissions.is_some() { if edit_member.organization_permissions.is_some() {
return Err(ApiError::InvalidInput( return Err(ApiError::InvalidInput(
@@ -800,14 +801,13 @@ pub async fn edit_team_member(
} }
if let Some(new_permissions) = edit_member.organization_permissions if let Some(new_permissions) = edit_member.organization_permissions
&& !organization_permissions.contains(new_permissions)
{ {
if !organization_permissions.contains(new_permissions) {
return Err(ApiError::InvalidInput( return Err(ApiError::InvalidInput(
"The new organization permissions have permissions that you don't have" "The new organization permissions have permissions that you don't have"
.to_string(), .to_string(),
)); ));
} }
}
if edit_member.permissions.is_some() if edit_member.permissions.is_some()
&& !organization_permissions.contains( && !organization_permissions.contains(
@@ -822,14 +822,14 @@ pub async fn edit_team_member(
} }
} }
if let Some(payouts_split) = edit_member.payouts_split { if let Some(payouts_split) = edit_member.payouts_split
if payouts_split < Decimal::ZERO || payouts_split > Decimal::from(5000) && (payouts_split < Decimal::ZERO
|| payouts_split > Decimal::from(5000))
{ {
return Err(ApiError::InvalidInput( return Err(ApiError::InvalidInput(
"Payouts split must be between 0 and 5000!".to_string(), "Payouts split must be between 0 and 5000!".to_string(),
)); ));
} }
}
DBTeamMember::edit_team_member( DBTeamMember::edit_team_member(
id, id,
@@ -883,15 +883,15 @@ pub async fn transfer_ownership(
DBTeam::get_association(id.into(), &**pool).await?; DBTeam::get_association(id.into(), &**pool).await?;
if let Some(TeamAssociationId::Project(pid)) = team_association_id { if let Some(TeamAssociationId::Project(pid)) = team_association_id {
let result = DBProject::get_id(pid, &**pool, &redis).await?; let result = DBProject::get_id(pid, &**pool, &redis).await?;
if let Some(project_item) = result { if let Some(project_item) = result
if project_item.inner.organization_id.is_some() { && project_item.inner.organization_id.is_some()
{
return Err(ApiError::InvalidInput( return Err(ApiError::InvalidInput(
"You cannot transfer ownership of a project team that is owend by an organization" "You cannot transfer ownership of a project team that is owend by an organization"
.to_string(), .to_string(),
)); ));
} }
} }
}
if !current_user.role.is_admin() { if !current_user.role.is_admin() {
let member = DBTeamMember::get_from_user_id( let member = DBTeamMember::get_from_user_id(
+8 -12
View File
@@ -289,8 +289,9 @@ pub async fn thread_get(
.await? .await?
.1; .1;
if let Some(mut data) = thread_data { if let Some(mut data) = thread_data
if is_authorized_thread(&data, &user, &pool).await? { && is_authorized_thread(&data, &user, &pool).await?
{
let authors = &mut data.members; let authors = &mut data.members;
authors.append( authors.append(
@@ -307,18 +308,14 @@ pub async fn thread_get(
.collect::<Vec<_>>(), .collect::<Vec<_>>(),
); );
let users: Vec<User> = database::models::DBUser::get_many_ids( let users: Vec<User> =
authors, &**pool, &redis, database::models::DBUser::get_many_ids(authors, &**pool, &redis)
)
.await? .await?
.into_iter() .into_iter()
.map(From::from) .map(From::from)
.collect(); .collect();
return Ok( return Ok(HttpResponse::Ok().json(Thread::from(data, users, &user)));
HttpResponse::Ok().json(Thread::from(data, users, &user))
);
}
} }
Err(ApiError::NotFound) Err(ApiError::NotFound)
} }
@@ -454,8 +451,8 @@ pub async fn thread_send_message(
) )
.await?; .await?;
if let Some(project) = project { if let Some(project) = project
if project.inner.status != ProjectStatus::Processing && project.inner.status != ProjectStatus::Processing
&& user.role.is_mod() && user.role.is_mod()
{ {
let members = let members =
@@ -481,7 +478,6 @@ pub async fn thread_send_message(
) )
.await?; .await?;
} }
}
} else if let Some(report_id) = thread.report_id { } else if let Some(report_id) = thread.report_id {
let report = database::models::report_item::DBReport::get( let report = database::models::report_item::DBReport::get(
report_id, &**pool, report_id, &**pool,
@@ -522,11 +522,11 @@ async fn version_create_inner(
.fetch_optional(pool) .fetch_optional(pool)
.await?; .await?;
if let Some(project_status) = project_status { if let Some(project_status) = project_status
if project_status.status == ProjectStatus::Processing.as_str() { && project_status.status == ProjectStatus::Processing.as_str()
{
moderation_queue.projects.insert(project_id.into()); moderation_queue.projects.insert(project_id.into());
} }
}
Ok(HttpResponse::Ok().json(response)) Ok(HttpResponse::Ok().json(response))
} }
@@ -871,8 +871,8 @@ pub async fn upload_file(
ref format, ref format,
ref files, ref files,
} = validation_result } = validation_result
&& dependencies.is_empty()
{ {
if dependencies.is_empty() {
let hashes: Vec<Vec<u8>> = format let hashes: Vec<Vec<u8>> = format
.files .files
.iter() .iter()
@@ -933,7 +933,6 @@ pub async fn upload_file(
} }
} }
} }
}
let data = data.freeze(); let data = data.freeze();
let primary = (validation_result.is_passed() let primary = (validation_result.is_passed()
@@ -974,11 +973,11 @@ pub async fn upload_file(
)); ));
} }
if let ValidationResult::Warning(msg) = validation_result { if let ValidationResult::Warning(msg) = validation_result
if primary { && primary
{
return Err(CreateError::InvalidInput(msg.to_string())); return Err(CreateError::InvalidInput(msg.to_string()));
} }
}
let url = format!("{cdn_url}/{file_path_encode}"); let url = format!("{cdn_url}/{file_path_encode}");
+21 -42
View File
@@ -148,8 +148,7 @@ pub async fn get_update_from_hash(
&redis, &redis,
) )
.await? .await?
{ && let Some(project) = database::models::DBProject::get_id(
if let Some(project) = database::models::DBProject::get_id(
file.project_id, file.project_id,
&**pool, &**pool,
&redis, &redis,
@@ -175,14 +174,10 @@ pub async fn get_update_from_hash(
} }
if let Some(loader_fields) = &update_data.loader_fields { if let Some(loader_fields) = &update_data.loader_fields {
for (key, values) in loader_fields { for (key, values) in loader_fields {
bool &= if let Some(x_vf) = x bool &= if let Some(x_vf) =
.version_fields x.version_fields.iter().find(|y| y.field_name == *key)
.iter()
.find(|y| y.field_name == *key)
{ {
values values.iter().any(|v| x_vf.value.contains_json_value(v))
.iter()
.any(|v| x_vf.value.contains_json_value(v))
} else { } else {
true true
}; };
@@ -193,20 +188,15 @@ pub async fn get_update_from_hash(
.sorted(); .sorted();
if let Some(first) = versions.next_back() { if let Some(first) = versions.next_back() {
if !is_visible_version( if !is_visible_version(&first.inner, &user_option, &pool, &redis)
&first.inner,
&user_option,
&pool,
&redis,
)
.await? .await?
{ {
return Err(ApiError::NotFound); return Err(ApiError::NotFound);
} }
return Ok(HttpResponse::Ok() return Ok(
.json(models::projects::Version::from(first))); HttpResponse::Ok().json(models::projects::Version::from(first))
} );
} }
} }
Err(ApiError::NotFound) Err(ApiError::NotFound)
@@ -398,15 +388,14 @@ pub async fn update_files(
if let Some(version) = versions if let Some(version) = versions
.iter() .iter()
.find(|x| x.inner.project_id == file.project_id) .find(|x| x.inner.project_id == file.project_id)
&& let Some(hash) = file.hashes.get(&algorithm)
{ {
if let Some(hash) = file.hashes.get(&algorithm) {
response.insert( response.insert(
hash.clone(), hash.clone(),
models::projects::Version::from(version.clone()), models::projects::Version::from(version.clone()),
); );
} }
} }
}
Ok(HttpResponse::Ok().json(response)) Ok(HttpResponse::Ok().json(response))
} }
@@ -484,8 +473,8 @@ pub async fn update_individual_files(
for project in projects { for project in projects {
for file in files.iter().filter(|x| x.project_id == project.inner.id) { for file in files.iter().filter(|x| x.project_id == project.inner.id) {
if let Some(hash) = file.hashes.get(&algorithm) { if let Some(hash) = file.hashes.get(&algorithm)
if let Some(query_file) = && let Some(query_file) =
update_data.hashes.iter().find(|x| &x.hash == hash) update_data.hashes.iter().find(|x| &x.hash == hash)
{ {
let version = all_versions let version = all_versions
@@ -494,23 +483,17 @@ pub async fn update_individual_files(
.filter(|x| { .filter(|x| {
let mut bool = true; let mut bool = true;
if let Some(version_types) = if let Some(version_types) = &query_file.version_types {
&query_file.version_types bool &= version_types
{ .iter()
bool &= version_types.iter().any(|y| { .any(|y| y.as_str() == x.inner.version_type);
y.as_str() == x.inner.version_type
});
} }
if let Some(loaders) = &query_file.loaders { if let Some(loaders) = &query_file.loaders {
bool &= x bool &=
.loaders x.loaders.iter().any(|y| loaders.contains(y));
.iter()
.any(|y| loaders.contains(y));
} }
if let Some(loader_fields) = if let Some(loader_fields) = &query_file.loader_fields {
&query_file.loader_fields
{
for (key, values) in loader_fields { for (key, values) in loader_fields {
bool &= if let Some(x_vf) = x bool &= if let Some(x_vf) = x
.version_fields .version_fields
@@ -530,8 +513,8 @@ pub async fn update_individual_files(
.sorted() .sorted()
.next_back(); .next_back();
if let Some(version) = version { if let Some(version) = version
if is_visible_version( && is_visible_version(
&version.inner, &version.inner,
&user_option, &user_option,
&pool, &pool,
@@ -541,16 +524,12 @@ pub async fn update_individual_files(
{ {
response.insert( response.insert(
hash.clone(), hash.clone(),
models::projects::Version::from( models::projects::Version::from(version.clone()),
version.clone(),
),
); );
} }
} }
} }
} }
}
}
Ok(HttpResponse::Ok().json(response)) Ok(HttpResponse::Ok().json(response))
} }
+5 -6
View File
@@ -106,15 +106,14 @@ pub async fn version_project_get_helper(
|| x.inner.version_number == id.1 || x.inner.version_number == id.1
}); });
if let Some(version) = version { if let Some(version) = version
if is_visible_version(&version.inner, &user_option, &pool, &redis) && is_visible_version(&version.inner, &user_option, &pool, &redis)
.await? .await?
{ {
return Ok(HttpResponse::Ok() return Ok(HttpResponse::Ok()
.json(models::projects::Version::from(version))); .json(models::projects::Version::from(version)));
} }
} }
}
Err(ApiError::NotFound) Err(ApiError::NotFound)
} }
@@ -190,13 +189,13 @@ pub async fn version_get_helper(
.map(|x| x.1) .map(|x| x.1)
.ok(); .ok();
if let Some(data) = version_data { if let Some(data) = version_data
if is_visible_version(&data.inner, &user_option, &pool, &redis).await? { && is_visible_version(&data.inner, &user_option, &pool, &redis).await?
{
return Ok( return Ok(
HttpResponse::Ok().json(models::projects::Version::from(data)) HttpResponse::Ok().json(models::projects::Version::from(data))
); );
} }
}
Err(ApiError::NotFound) Err(ApiError::NotFound)
} }
+3 -5
View File
@@ -15,15 +15,13 @@ pub async fn get_user_status(
return Some(friend_status); return Some(friend_status);
} }
if let Ok(mut conn) = redis.pool.get().await { if let Ok(mut conn) = redis.pool.get().await
if let Ok(mut statuses) = && let Ok(mut statuses) =
conn.sscan::<_, String>(get_field_name(user)).await conn.sscan::<_, String>(get_field_name(user)).await
&& let Some(status_json) = statuses.next_item().await
{ {
if let Some(status_json) = statuses.next_item().await {
return serde_json::from_str::<UserStatus>(&status_json).ok(); return serde_json::from_str::<UserStatus>(&status_json).ok();
} }
}
}
None None
} }
-75
View File
@@ -1,75 +0,0 @@
use reqwest::header::HeaderName;
use serde::{Deserialize, Serialize};
use uuid::Uuid;
use crate::routes::ApiError;
const X_MASTER_KEY: HeaderName = HeaderName::from_static("x-master-key");
#[derive(Debug, Default, Serialize, Deserialize)]
pub struct Empty {}
#[derive(Debug, Serialize, Deserialize)]
pub struct Specs {
pub memory_mb: u32,
pub cpu: u32,
pub swap_mb: u32,
pub storage_mb: u32,
}
#[derive(Debug, Serialize, Deserialize)]
pub struct CreateServerRequest {
pub user_id: String,
pub name: String,
pub specs: Specs,
// Must be included because archon doesn't accept null values, only
// an empty struct, as a source.
pub source: Empty,
pub region: String,
pub tags: Vec<String>,
}
#[derive(Clone)]
pub struct ArchonClient {
client: reqwest::Client,
base_url: String,
pyro_api_key: String,
}
impl ArchonClient {
/// Builds an Archon client from environment variables. Returns `None` if the
/// required environment variables are not set.
pub fn from_env() -> Result<Self, ApiError> {
let client = reqwest::Client::new();
let base_url =
dotenvy::var("ARCHON_URL")?.trim_end_matches('/').to_owned();
Ok(Self {
client,
base_url,
pyro_api_key: dotenvy::var("PYRO_API_KEY")?,
})
}
pub async fn create_server(
&self,
request: &CreateServerRequest,
) -> Result<Uuid, reqwest::Error> {
#[derive(Deserialize)]
struct CreateServerResponse {
uuid: Uuid,
}
let response = self
.client
.post(format!("{}/modrinth/v0/servers/create", self.base_url))
.header(X_MASTER_KEY, &self.pyro_api_key)
.json(request)
.send()
.await?
.error_for_status()?;
Ok(response.json::<CreateServerResponse>().await?.uuid)
}
}
-15
View File
@@ -1,8 +1,6 @@
use actix_web::guard::GuardContext; use actix_web::guard::GuardContext;
pub const ADMIN_KEY_HEADER: &str = "Modrinth-Admin"; pub const ADMIN_KEY_HEADER: &str = "Modrinth-Admin";
pub const MEDAL_KEY_HEADER: &str = "X-Medal-Access-Key";
pub fn admin_key_guard(ctx: &GuardContext) -> bool { pub fn admin_key_guard(ctx: &GuardContext) -> bool {
let admin_key = std::env::var("LABRINTH_ADMIN_KEY").expect( let admin_key = std::env::var("LABRINTH_ADMIN_KEY").expect(
"No admin key provided, this should have been caught by check_env_vars", "No admin key provided, this should have been caught by check_env_vars",
@@ -12,16 +10,3 @@ pub fn admin_key_guard(ctx: &GuardContext) -> bool {
.get(ADMIN_KEY_HEADER) .get(ADMIN_KEY_HEADER)
.is_some_and(|it| it.as_bytes() == admin_key.as_bytes()) .is_some_and(|it| it.as_bytes() == admin_key.as_bytes())
} }
pub fn medal_key_guard(ctx: &GuardContext) -> bool {
let maybe_medal_key = dotenvy::var("LABRINTH_MEDAL_KEY").ok();
match maybe_medal_key {
None => false,
Some(medal_key) => ctx
.head()
.headers()
.get(MEDAL_KEY_HEADER)
.is_some_and(|it| it.as_bytes() == medal_key.as_bytes()),
}
}
+4 -5
View File
@@ -138,13 +138,12 @@ fn process_image(
let (orig_width, orig_height) = img.dimensions(); let (orig_width, orig_height) = img.dimensions();
let aspect_ratio = orig_width as f32 / orig_height as f32; let aspect_ratio = orig_width as f32 / orig_height as f32;
if let Some(target_width) = target_width { if let Some(target_width) = target_width
if img.width() > target_width { && img.width() > target_width
let new_height = {
(target_width as f32 / aspect_ratio).round() as u32; let new_height = (target_width as f32 / aspect_ratio).round() as u32;
img = img.resize(target_width, new_height, FilterType::Lanczos3); img = img.resize(target_width, new_height, FilterType::Lanczos3);
} }
}
if let Some(min_aspect_ratio) = min_aspect_ratio { if let Some(min_aspect_ratio) = min_aspect_ratio {
// Crop if necessary // Crop if necessary
-1
View File
@@ -1,5 +1,4 @@
pub mod actix; pub mod actix;
pub mod archon;
pub mod bitflag; pub mod bitflag;
pub mod captcha; pub mod captcha;
pub mod cors; pub mod cors;
+2 -3
View File
@@ -133,13 +133,12 @@ pub async fn rate_limit_middleware(
.expect("Rate limiter not configured properly") .expect("Rate limiter not configured properly")
.clone(); .clone();
if let Some(key) = req.headers().get("x-ratelimit-key") { if let Some(key) = req.headers().get("x-ratelimit-key")
if key.to_str().ok() && key.to_str().ok()
== dotenvy::var("RATE_LIMIT_IGNORE_KEY").ok().as_deref() == dotenvy::var("RATE_LIMIT_IGNORE_KEY").ok().as_deref()
{ {
return Ok(next.call(req).await?.map_into_left_body()); return Ok(next.call(req).await?.map_into_left_body());
} }
}
let conn_info = req.connection_info().clone(); let conn_info = req.connection_info().clone();
let ip = if parse_var("CLOUDFLARE_INTEGRATION").unwrap_or(false) { let ip = if parse_var("CLOUDFLARE_INTEGRATION").unwrap_or(false) {
+5 -4
View File
@@ -22,8 +22,9 @@ pub fn validation_errors_to_string(
let key_option = map.keys().next(); let key_option = map.keys().next();
if let Some(field) = key_option { if let Some(field) = key_option
if let Some(error) = map.get(field) { && let Some(error) = map.get(field)
{
return match error { return match error {
ValidationErrorsKind::Struct(errors) => { ValidationErrorsKind::Struct(errors) => {
validation_errors_to_string( validation_errors_to_string(
@@ -54,7 +55,8 @@ pub fn validation_errors_to_string(
&mut output, &mut output,
"Field {field} failed validation with error: {}", "Field {field} failed validation with error: {}",
error.code error.code
).unwrap(); )
.unwrap();
} }
} }
@@ -62,7 +64,6 @@ pub fn validation_errors_to_string(
} }
}; };
} }
}
String::new() String::new()
} }
+3 -3
View File
@@ -238,8 +238,9 @@ pub async fn send_slack_webhook(
} }
}); });
if let Some(icon_url) = metadata.project_icon_url { if let Some(icon_url) = metadata.project_icon_url
if let Some(project_block) = project_block.as_object_mut() { && let Some(project_block) = project_block.as_object_mut()
{
project_block.insert( project_block.insert(
"accessory".to_string(), "accessory".to_string(),
serde_json::json!({ serde_json::json!({
@@ -249,7 +250,6 @@ pub async fn send_slack_webhook(
}), }),
); );
} }
}
blocks.push(project_block); blocks.push(project_block);
+12 -12
View File
@@ -222,11 +222,11 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
resp.status().as_u16() resp.status().as_u16()
)); ));
} }
if resp.status() == StatusCode::OK { if resp.status() == StatusCode::OK
if let Some(failure_json_check) = &self.failure_json_check { && let Some(failure_json_check) = &self.failure_json_check
{
failure_json_check(&test::read_body_json(resp).await); failure_json_check(&test::read_body_json(resp).await);
} }
}
// Failure test- logged in on a non-team user // Failure test- logged in on a non-team user
let resp = req_gen(PermissionsTestContext { let resp = req_gen(PermissionsTestContext {
@@ -246,11 +246,11 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
resp.status().as_u16() resp.status().as_u16()
)); ));
} }
if resp.status() == StatusCode::OK { if resp.status() == StatusCode::OK
if let Some(failure_json_check) = &self.failure_json_check { && let Some(failure_json_check) = &self.failure_json_check
{
failure_json_check(&test::read_body_json(resp).await); failure_json_check(&test::read_body_json(resp).await);
} }
}
// Failure test- logged in with EVERY non-relevant permission // Failure test- logged in with EVERY non-relevant permission
let resp: ServiceResponse = req_gen(PermissionsTestContext { let resp: ServiceResponse = req_gen(PermissionsTestContext {
@@ -270,11 +270,11 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
resp.status().as_u16() resp.status().as_u16()
)); ));
} }
if resp.status() == StatusCode::OK { if resp.status() == StatusCode::OK
if let Some(failure_json_check) = &self.failure_json_check { && let Some(failure_json_check) = &self.failure_json_check
{
failure_json_check(&test::read_body_json(resp).await); failure_json_check(&test::read_body_json(resp).await);
} }
}
// Patch user's permissions to success permissions // Patch user's permissions to success permissions
modify_user_team_permissions( modify_user_team_permissions(
@@ -300,11 +300,11 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
resp.status().as_u16() resp.status().as_u16()
)); ));
} }
if resp.status() == StatusCode::OK { if resp.status() == StatusCode::OK
if let Some(success_json_check) = &self.success_json_check { && let Some(success_json_check) = &self.success_json_check
{
success_json_check(&test::read_body_json(resp).await); success_json_check(&test::read_body_json(resp).await);
} }
}
// If the remove_user flag is set, remove the user from the project // If the remove_user flag is set, remove the user from the project
// Relevant for existing projects/users // Relevant for existing projects/users
+1 -1
View File
@@ -1,2 +1,2 @@
allow-dbg-in-tests = true allow-dbg-in-tests = true
msrv = "1.88.0" msrv = "1.89.0"
+3 -3
View File
@@ -50,11 +50,11 @@ pub async fn parse_command(
// We assume anything else is a filepath to an .mrpack file // We assume anything else is a filepath to an .mrpack file
let path = PathBuf::from(command_string); let path = PathBuf::from(command_string);
let path = io::canonicalize(path)?; let path = io::canonicalize(path)?;
if let Some(ext) = path.extension() { if let Some(ext) = path.extension()
if ext == "mrpack" { && ext == "mrpack"
{
return Ok(CommandPayload::RunMRPack { path }); return Ok(CommandPayload::RunMRPack { path });
} }
}
emit_warning(&format!( emit_warning(&format!(
"Invalid command, unrecognized filetype: {}", "Invalid command, unrecognized filetype: {}",
path.display() path.display()
+3 -3
View File
@@ -106,15 +106,15 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
})?; })?;
// removes the old installation of java // removes the old installation of java
if let Some(file) = archive.file_names().next() { if let Some(file) = archive.file_names().next()
if let Some(dir) = file.split('/').next() { && let Some(dir) = file.split('/').next()
{
let path = path.join(dir); let path = path.join(dir);
if path.exists() { if path.exists() {
io::remove_dir_all(path).await?; io::remove_dir_all(path).await?;
} }
} }
}
emit_loading(&loading_bar, 0.0, Some("Extracting java"))?; emit_loading(&loading_bar, 0.0, Some("Extracting java"))?;
archive.extract(&path).map_err(|_| { archive.extract(&path).map_err(|_| {
+3 -3
View File
@@ -54,13 +54,13 @@ pub async fn remove_user(uuid: uuid::Uuid) -> crate::Result<()> {
if let Some((uuid, user)) = users.remove(&uuid) { if let Some((uuid, user)) = users.remove(&uuid) {
Credentials::remove(uuid, &state.pool).await?; Credentials::remove(uuid, &state.pool).await?;
if user.active { if user.active
if let Some((_, mut user)) = users.into_iter().next() { && let Some((_, mut user)) = users.into_iter().next()
{
user.active = true; user.active = true;
user.upsert(&state.pool).await?; user.upsert(&state.pool).await?;
} }
} }
}
Ok(()) Ok(())
} }
@@ -221,15 +221,15 @@ async fn import_atlauncher_unmanaged(
.unwrap_or_else(|| backup_name.to_string()); .unwrap_or_else(|| backup_name.to_string());
prof.install_stage = ProfileInstallStage::PackInstalling; prof.install_stage = ProfileInstallStage::PackInstalling;
if let Some(ref project_id) = description.project_id { if let Some(ref project_id) = description.project_id
if let Some(ref version_id) = description.version_id { && let Some(ref version_id) = description.version_id
{
prof.linked_data = Some(LinkedData { prof.linked_data = Some(LinkedData {
project_id: project_id.clone(), project_id: project_id.clone(),
version_id: version_id.clone(), version_id: version_id.clone(),
locked: true, locked: true,
}) })
} }
}
prof.icon_path = description prof.icon_path = description
.icon .icon
@@ -383,8 +383,9 @@ pub async fn set_profile_information(
.unwrap_or_else(|| backup_name.to_string()); .unwrap_or_else(|| backup_name.to_string());
prof.install_stage = ProfileInstallStage::PackInstalling; prof.install_stage = ProfileInstallStage::PackInstalling;
if let Some(ref project_id) = description.project_id { if let Some(ref project_id) = description.project_id
if let Some(ref version_id) = description.version_id { && let Some(ref version_id) = description.version_id
{
prof.linked_data = Some(LinkedData { prof.linked_data = Some(LinkedData {
project_id: project_id.clone(), project_id: project_id.clone(),
version_id: version_id.clone(), version_id: version_id.clone(),
@@ -395,7 +396,6 @@ pub async fn set_profile_information(
}, },
}) })
} }
}
prof.icon_path = description prof.icon_path = description
.icon .icon
@@ -149,14 +149,13 @@ pub async fn install_zipped_mrpack_files(
let profile_path = profile_path.clone(); let profile_path = profile_path.clone();
async move { async move {
//TODO: Future update: prompt user for optional files in a modpack //TODO: Future update: prompt user for optional files in a modpack
if let Some(env) = project.env { if let Some(env) = project.env
if env && env
.get(&EnvType::Client) .get(&EnvType::Client)
.is_some_and(|x| x == &SideType::Unsupported) .is_some_and(|x| x == &SideType::Unsupported)
{ {
return Ok(()); return Ok(());
} }
}
let file = fetch_mirrors( let file = fetch_mirrors(
&project &project
@@ -375,15 +374,15 @@ pub async fn remove_all_related_files(
) )
.await? .await?
{ {
if let Some(metadata) = &project.metadata { if let Some(metadata) = &project.metadata
if to_remove.contains(&metadata.project_id) { && to_remove.contains(&metadata.project_id)
{
let path = profile_full_path.join(file_path); let path = profile_full_path.join(file_path);
if path.exists() { if path.exists() {
io::remove_file(&path).await?; io::remove_file(&path).await?;
} }
} }
} }
}
// Iterate over all Modrinth project file paths in the json, and remove them // Iterate over all Modrinth project file paths in the json, and remove them
// (There should be few, but this removes any files the .mrpack intended as Modrinth projects but were unrecognized) // (There should be few, but this removes any files the .mrpack intended as Modrinth projects but were unrecognized)
+5 -7
View File
@@ -337,8 +337,8 @@ pub async fn update_project(
) )
.await? .await?
.remove(project_path) .remove(project_path)
&& let Some(update_version) = &file.update_version_id
{ {
if let Some(update_version) = &file.update_version_id {
let path = Profile::add_project_version( let path = Profile::add_project_version(
profile_path, profile_path,
update_version, update_version,
@@ -353,13 +353,11 @@ pub async fn update_project(
} }
if !skip_send_event.unwrap_or(false) { if !skip_send_event.unwrap_or(false) {
emit_profile(profile_path, ProfilePayloadType::Edited) emit_profile(profile_path, ProfilePayloadType::Edited).await?;
.await?;
} }
return Ok(path); return Ok(path);
} }
}
Err(crate::ErrorKind::InputError( Err(crate::ErrorKind::InputError(
"This project cannot be updated!".to_string(), "This project cannot be updated!".to_string(),
@@ -479,11 +477,11 @@ pub async fn export_mrpack(
let included_export_candidates = included_export_candidates let included_export_candidates = included_export_candidates
.into_iter() .into_iter()
.filter(|x| { .filter(|x| {
if let Some(f) = PathBuf::from(x).file_name() { if let Some(f) = PathBuf::from(x).file_name()
if f.to_string_lossy().starts_with(".DS_Store") { && f.to_string_lossy().starts_with(".DS_Store")
{
return false; return false;
} }
}
true true
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
+16 -15
View File
@@ -184,6 +184,7 @@ pub enum LoadingBarType {
} }
#[derive(Serialize, Clone)] #[derive(Serialize, Clone)]
#[cfg(feature = "tauri")]
pub struct LoadingPayload { pub struct LoadingPayload {
pub event: LoadingBarType, pub event: LoadingBarType,
pub loader_uuid: Uuid, pub loader_uuid: Uuid,
@@ -192,11 +193,7 @@ pub struct LoadingPayload {
} }
#[derive(Serialize, Clone)] #[derive(Serialize, Clone)]
pub struct OfflinePayload { #[cfg(feature = "tauri")]
pub offline: bool,
}
#[derive(Serialize, Clone)]
pub struct WarningPayload { pub struct WarningPayload {
pub message: String, pub message: String,
} }
@@ -220,12 +217,14 @@ pub enum CommandPayload {
} }
#[derive(Serialize, Clone)] #[derive(Serialize, Clone)]
#[cfg(feature = "tauri")]
pub struct ProcessPayload { pub struct ProcessPayload {
pub profile_path_id: String, pub profile_path_id: String,
pub uuid: Uuid, pub uuid: Uuid,
pub event: ProcessPayloadType, pub event: ProcessPayloadType,
pub message: String, pub message: String,
} }
#[derive(Serialize, Clone, Debug)] #[derive(Serialize, Clone, Debug)]
#[serde(rename_all = "snake_case")] #[serde(rename_all = "snake_case")]
pub enum ProcessPayloadType { pub enum ProcessPayloadType {
@@ -234,11 +233,13 @@ pub enum ProcessPayloadType {
} }
#[derive(Serialize, Clone)] #[derive(Serialize, Clone)]
#[cfg(feature = "tauri")]
pub struct ProfilePayload { pub struct ProfilePayload {
pub profile_path_id: String, pub profile_path_id: String,
#[serde(flatten)] #[serde(flatten)]
pub event: ProfilePayloadType, pub event: ProfilePayloadType,
} }
#[derive(Serialize, Clone)] #[derive(Serialize, Clone)]
#[serde(tag = "event", rename_all = "snake_case")] #[serde(tag = "event", rename_all = "snake_case")]
pub enum ProfilePayloadType { pub enum ProfilePayloadType {
@@ -257,6 +258,16 @@ pub enum ProfilePayloadType {
Removed, Removed,
} }
#[derive(Serialize, Clone)]
#[serde(rename_all = "snake_case")]
#[serde(tag = "event")]
pub enum FriendPayload {
FriendRequest { from: UserId },
UserOffline { id: UserId },
StatusUpdate { user_status: UserStatus },
StatusSync,
}
#[derive(Debug, thiserror::Error)] #[derive(Debug, thiserror::Error)]
pub enum EventError { pub enum EventError {
#[error("Event state was not properly initialized")] #[error("Event state was not properly initialized")]
@@ -269,13 +280,3 @@ pub enum EventError {
#[error("Tauri error: {0}")] #[error("Tauri error: {0}")]
TauriError(#[from] tauri::Error), TauriError(#[from] tauri::Error),
} }
#[derive(Serialize, Clone)]
#[serde(rename_all = "snake_case")]
#[serde(tag = "event")]
pub enum FriendPayload {
FriendRequest { from: UserId },
UserOffline { id: UserId },
StatusUpdate { user_status: UserStatus },
StatusSync,
}
+7 -7
View File
@@ -32,16 +32,16 @@ pub fn get_class_paths(
let mut cps = libraries let mut cps = libraries
.iter() .iter()
.filter_map(|library| { .filter_map(|library| {
if let Some(rules) = &library.rules { if let Some(rules) = &library.rules
if !parse_rules( && !parse_rules(
rules, rules,
java_arch, java_arch,
&QuickPlayType::None, &QuickPlayType::None,
minecraft_updated, minecraft_updated,
) { )
{
return None; return None;
} }
}
if !library.include_in_classpath { if !library.include_in_classpath {
return None; return None;
@@ -504,12 +504,12 @@ pub async fn get_processor_main_class(
let mut line = line.map_err(IOError::from)?; let mut line = line.map_err(IOError::from)?;
line.retain(|c| !c.is_whitespace()); line.retain(|c| !c.is_whitespace());
if line.starts_with("Main-Class:") { if line.starts_with("Main-Class:")
if let Some(class) = line.split(':').nth(1) { && let Some(class) = line.split(':').nth(1)
{
return Ok(Some(class.to_string())); return Ok(Some(class.to_string()));
} }
} }
}
Ok::<Option<String>, crate::Error>(None) Ok::<Option<String>, crate::Error>(None)
}) })
+4 -6
View File
@@ -290,12 +290,11 @@ pub async fn download_libraries(
loading_try_for_each_concurrent( loading_try_for_each_concurrent(
stream::iter(libraries.iter()) stream::iter(libraries.iter())
.map(Ok::<&Library, crate::Error>), None, loading_bar,loading_amount,num_files, None,|library| async move { .map(Ok::<&Library, crate::Error>), None, loading_bar,loading_amount,num_files, None,|library| async move {
if let Some(rules) = &library.rules { if let Some(rules) = &library.rules
if !parse_rules(rules, java_arch, &QuickPlayType::None, minecraft_updated) { && !parse_rules(rules, java_arch, &QuickPlayType::None, minecraft_updated) {
tracing::trace!("Skipped library {}", &library.name); tracing::trace!("Skipped library {}", &library.name);
return Ok(()); return Ok(());
} }
}
if !library.downloadable { if !library.downloadable {
tracing::trace!("Skipped non-downloadable library {}", &library.name); tracing::trace!("Skipped non-downloadable library {}", &library.name);
@@ -311,15 +310,14 @@ pub async fn download_libraries(
return Ok(()); return Ok(());
} }
if let Some(d::minecraft::LibraryDownloads { artifact: Some(ref artifact), ..}) = library.downloads { if let Some(d::minecraft::LibraryDownloads { artifact: Some(ref artifact), ..}) = library.downloads
if !artifact.url.is_empty(){ && !artifact.url.is_empty(){
let bytes = fetch(&artifact.url, Some(&artifact.sha1), &st.fetch_semaphore, &st.pool) let bytes = fetch(&artifact.url, Some(&artifact.sha1), &st.fetch_semaphore, &st.pool)
.await?; .await?;
write(&path, &bytes, &st.io_semaphore).await?; write(&path, &bytes, &st.io_semaphore).await?;
tracing::trace!("Fetched library {} to path {:?}", &library.name, &path); tracing::trace!("Fetched library {} to path {:?}", &library.name, &path);
return Ok::<_, crate::Error>(()); return Ok::<_, crate::Error>(());
} }
}
let url = [ let url = [
library library
+3 -3
View File
@@ -341,11 +341,11 @@ pub async fn install_minecraft(
// Forge processors (90-100) // Forge processors (90-100)
for (index, processor) in processors.iter().enumerate() { for (index, processor) in processors.iter().enumerate() {
if let Some(sides) = &processor.sides { if let Some(sides) = &processor.sides
if !sides.contains(&String::from("client")) { && !sides.contains(&String::from("client"))
{
continue; continue;
} }
}
let cp = { let cp = {
let mut cp = processor.classpath.clone(); let mut cp = processor.classpath.clone();
+3 -3
View File
@@ -385,11 +385,11 @@ impl DirectoryInfo {
return Err(e); return Err(e);
} }
} else { } else {
if let Some(disk_usage) = get_disk_usage(&move_dir)? { if let Some(disk_usage) = get_disk_usage(&move_dir)?
if total_size > disk_usage { && total_size > disk_usage
{
return Err(crate::ErrorKind::DirectoryMoveError(format!("Not enough space to move directory to {}: only {} bytes available", app_dir.display(), disk_usage)).into()); return Err(crate::ErrorKind::DirectoryMoveError(format!("Not enough space to move directory to {}: only {} bytes available", app_dir.display(), disk_usage)).into());
} }
}
let loader_bar_id = Arc::new(&loader_bar_id); let loader_bar_id = Arc::new(&loader_bar_id);
futures::future::try_join_all(paths.iter().map(|x| { futures::future::try_join_all(paths.iter().map(|x| {
+7 -11
View File
@@ -9,7 +9,7 @@ use ariadne::networking::message::{
ClientToServerMessage, ServerToClientMessage, ClientToServerMessage, ServerToClientMessage,
}; };
use ariadne::users::UserStatus; use ariadne::users::UserStatus;
use async_tungstenite::WebSocketStream; use async_tungstenite::WebSocketSender;
use async_tungstenite::tokio::{ConnectStream, connect_async}; use async_tungstenite::tokio::{ConnectStream, connect_async};
use async_tungstenite::tungstenite::Message; use async_tungstenite::tungstenite::Message;
use async_tungstenite::tungstenite::client::IntoClientRequest; use async_tungstenite::tungstenite::client::IntoClientRequest;
@@ -17,7 +17,6 @@ use bytes::Bytes;
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use dashmap::DashMap; use dashmap::DashMap;
use either::Either; use either::Either;
use futures::stream::SplitSink;
use futures::{SinkExt, StreamExt}; use futures::{SinkExt, StreamExt};
use reqwest::Method; use reqwest::Method;
use reqwest::header::HeaderValue; use reqwest::header::HeaderValue;
@@ -32,7 +31,7 @@ use tokio::sync::{Mutex, RwLock};
use uuid::Uuid; use uuid::Uuid;
pub(super) type WriteSocket = pub(super) type WriteSocket =
Arc<RwLock<Option<SplitSink<WebSocketStream<ConnectStream>, Message>>>>; Arc<RwLock<Option<WebSocketSender<ConnectStream>>>>;
pub(super) type TunnelSockets = Arc<DashMap<Uuid, Arc<InternalTunnelSocket>>>; pub(super) type TunnelSockets = Arc<DashMap<Uuid, Arc<InternalTunnelSocket>>>;
pub struct FriendsSocket { pub struct FriendsSocket {
@@ -180,27 +179,24 @@ impl FriendsSocket {
ServerToClientMessage::FriendSocketStoppedListening { .. } => {}, // TODO ServerToClientMessage::FriendSocketStoppedListening { .. } => {}, // TODO
ServerToClientMessage::SocketConnected { to_socket, new_socket } => { ServerToClientMessage::SocketConnected { to_socket, new_socket } => {
if let Some(connected_to) = sockets.get(&to_socket) { if let Some(connected_to) = sockets.get(&to_socket)
if let InternalTunnelSocket::Listening(local_addr) = *connected_to.value().clone() { && let InternalTunnelSocket::Listening(local_addr) = *connected_to.value().clone()
if let Ok(new_stream) = TcpStream::connect(local_addr).await { && let Ok(new_stream) = TcpStream::connect(local_addr).await {
let (read, write) = new_stream.into_split(); let (read, write) = new_stream.into_split();
sockets.insert(new_socket, Arc::new(InternalTunnelSocket::Connected(Mutex::new(write)))); sockets.insert(new_socket, Arc::new(InternalTunnelSocket::Connected(Mutex::new(write))));
Self::socket_read_loop(write_handle.clone(), read, new_socket); Self::socket_read_loop(write_handle.clone(), read, new_socket);
continue; continue;
} }
}
}
let _ = Self::send_message(&write_handle, ClientToServerMessage::SocketClose { socket: new_socket }).await; let _ = Self::send_message(&write_handle, ClientToServerMessage::SocketClose { socket: new_socket }).await;
}, },
ServerToClientMessage::SocketClosed { socket } => { ServerToClientMessage::SocketClosed { socket } => {
sockets.remove_if(&socket, |_, x| matches!(*x.clone(), InternalTunnelSocket::Connected(_))); sockets.remove_if(&socket, |_, x| matches!(*x.clone(), InternalTunnelSocket::Connected(_)));
}, },
ServerToClientMessage::SocketData { socket, data } => { ServerToClientMessage::SocketData { socket, data } => {
if let Some(mut socket) = sockets.get_mut(&socket) { if let Some(mut socket) = sockets.get_mut(&socket)
if let InternalTunnelSocket::Connected(ref stream) = *socket.value_mut().clone() { && let InternalTunnelSocket::Connected(ref stream) = *socket.value_mut().clone() {
let _ = stream.lock().await.write_all(&data).await; let _ = stream.lock().await.write_all(&data).await;
} }
}
}, },
} }
} }
+5 -6
View File
@@ -100,8 +100,8 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
let profile_path_str = profile_path_str.clone(); let profile_path_str = profile_path_str.clone();
let world = world.clone(); let world = world.clone();
tokio::spawn(async move { tokio::spawn(async move {
if let Ok(state) = State::get().await { if let Ok(state) = State::get().await
if let Err(e) = attached_world_data::AttachedWorldData::remove_for_world( && let Err(e) = attached_world_data::AttachedWorldData::remove_for_world(
&profile_path_str, &profile_path_str,
WorldType::Singleplayer, WorldType::Singleplayer,
&world, &world,
@@ -109,7 +109,6 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
).await { ).await {
tracing::warn!("Failed to remove AttachedWorldData for '{world}': {e}") tracing::warn!("Failed to remove AttachedWorldData for '{world}': {e}")
} }
}
}); });
} }
Some(ProfilePayloadType::WorldUpdated { world }) Some(ProfilePayloadType::WorldUpdated { world })
@@ -150,8 +149,9 @@ pub(crate) async fn watch_profiles_init(
) { ) {
if let Ok(profiles_dir) = std::fs::read_dir(dirs.profiles_dir()) { if let Ok(profiles_dir) = std::fs::read_dir(dirs.profiles_dir()) {
for profile_dir in profiles_dir { for profile_dir in profiles_dir {
if let Ok(file_name) = profile_dir.map(|x| x.file_name()) { if let Ok(file_name) = profile_dir.map(|x| x.file_name())
if let Some(file_name) = file_name.to_str() { && let Some(file_name) = file_name.to_str()
{
if file_name.starts_with(".DS_Store") { if file_name.starts_with(".DS_Store") {
continue; continue;
}; };
@@ -161,7 +161,6 @@ pub(crate) async fn watch_profiles_init(
} }
} }
} }
}
pub(crate) async fn watch_profile( pub(crate) async fn watch_profile(
profile_path: &str, profile_path: &str,
+27 -40
View File
@@ -76,11 +76,10 @@ where
.loaded_config_dir .loaded_config_dir
.clone() .clone()
.and_then(|x| x.to_str().map(|x| x.to_string())) .and_then(|x| x.to_str().map(|x| x.to_string()))
&& path != old_launcher_root_str
{ {
if path != old_launcher_root_str {
settings.custom_dir = Some(path); settings.custom_dir = Some(path);
} }
}
settings.prev_custom_dir = Some(old_launcher_root_str.clone()); settings.prev_custom_dir = Some(old_launcher_root_str.clone());
@@ -136,19 +135,17 @@ where
.await?; .await?;
} }
if let Some(device_token) = minecraft_auth.token { if let Some(device_token) = minecraft_auth.token
if let Ok(private_key) = && let Ok(private_key) =
SigningKey::from_pkcs8_pem(&device_token.private_key) SigningKey::from_pkcs8_pem(&device_token.private_key)
&& let Ok(uuid) = Uuid::parse_str(&device_token.id)
{ {
if let Ok(uuid) = Uuid::parse_str(&device_token.id) {
DeviceTokenPair { DeviceTokenPair {
token: DeviceToken { token: DeviceToken {
issue_instant: device_token.token.issue_instant, issue_instant: device_token.token.issue_instant,
not_after: device_token.token.not_after, not_after: device_token.token.not_after,
token: device_token.token.token, token: device_token.token.token,
display_claims: device_token display_claims: device_token.token.display_claims,
.token
.display_claims,
}, },
key: DeviceTokenKey { key: DeviceTokenKey {
id: uuid, id: uuid,
@@ -161,8 +158,6 @@ where
.await?; .await?;
} }
} }
}
}
let mut cached_entries = vec![]; let mut cached_entries = vec![];
@@ -207,13 +202,12 @@ where
update_version, update_version,
.. ..
} = project.metadata } = project.metadata
{ && let Some(file) = version
if let Some(file) = version
.files .files
.iter() .iter()
.find(|x| x.hashes.get("sha512") == Some(&sha512)) .find(|x| x.hashes.get("sha512") == Some(&sha512))
&& let Some(sha1) = file.hashes.get("sha1")
{ {
if let Some(sha1) = file.hashes.get("sha1") {
if let Ok(metadata) = full_path.metadata() { if let Ok(metadata) = full_path.metadata() {
let file_name = format!( let file_name = format!(
"{}/{}", "{}/{}",
@@ -227,24 +221,24 @@ where
path: file_name, path: file_name,
size: metadata.len(), size: metadata.len(),
hash: sha1.clone(), hash: sha1.clone(),
project_type: ProjectType::get_from_parent_folder(&full_path), project_type:
ProjectType::get_from_parent_folder(
&full_path,
),
}, },
)); ));
} }
cached_entries.push(CacheValue::File( cached_entries.push(CacheValue::File(CachedFile {
CachedFile {
hash: sha1.clone(), hash: sha1.clone(),
project_id: version.project_id.clone(), project_id: version.project_id.clone(),
version_id: version.id.clone(), version_id: version.id.clone(),
}, }));
));
if let Some(update_version) = update_version { if let Some(update_version) = update_version {
let mod_loader: ModLoader = let mod_loader: ModLoader =
profile.metadata.loader.into(); profile.metadata.loader.into();
cached_entries.push( cached_entries.push(CacheValue::FileUpdate(
CacheValue::FileUpdate(
CachedFileUpdate { CachedFileUpdate {
hash: sha1.clone(), hash: sha1.clone(),
game_version: profile game_version: profile
@@ -252,15 +246,13 @@ where
.game_version .game_version
.clone(), .clone(),
loaders: vec![ loaders: vec![
mod_loader mod_loader.as_str().to_string(),
.as_str()
.to_string(),
], ],
update_version_id: update_version_id: update_version
update_version.id.clone(), .id
.clone(),
}, },
), ));
);
cached_entries.push(CacheValue::Version( cached_entries.push(CacheValue::Version(
(*update_version).into(), (*update_version).into(),
@@ -280,9 +272,8 @@ where
badges: 0, badges: 0,
}; };
cached_entries.push(CacheValue::User( cached_entries
user.clone(), .push(CacheValue::User(user.clone()));
));
TeamMember { TeamMember {
team_id: x.team_id, team_id: x.team_id,
@@ -296,11 +287,8 @@ where
cached_entries.push(CacheValue::Team(members)); cached_entries.push(CacheValue::Team(members));
cached_entries.push(CacheValue::Version( cached_entries
(*version).into(), .push(CacheValue::Version((*version).into()));
));
}
}
} }
} }
@@ -332,17 +320,16 @@ where
.map(|x| x.id), .map(|x| x.id),
groups: profile.metadata.groups, groups: profile.metadata.groups,
linked_data: profile.metadata.linked_data.and_then(|x| { linked_data: profile.metadata.linked_data.and_then(|x| {
if let Some(project_id) = x.project_id { if let Some(project_id) = x.project_id
if let Some(version_id) = x.version_id { && let Some(version_id) = x.version_id
if let Some(locked) = x.locked { && let Some(locked) = x.locked
{
return Some(LinkedData { return Some(LinkedData {
project_id, project_id,
version_id, version_id,
locked, locked,
}); });
} }
}
}
None None
}), }),
+6 -12
View File
@@ -393,11 +393,10 @@ impl Credentials {
.. ..
}, },
) = *err.raw ) = *err.raw
&& (source.is_connect() || source.is_timeout())
{ {
if source.is_connect() || source.is_timeout() {
return Ok(Some(creds)); return Ok(Some(creds));
} }
}
Err(err) Err(err)
} }
@@ -640,10 +639,9 @@ impl DeviceTokenPair {
.fetch_optional(exec) .fetch_optional(exec)
.await?; .await?;
if let Some(x) = res { if let Some(x) = res
if let Ok(uuid) = Uuid::parse_str(&x.uuid) { && let Ok(uuid) = Uuid::parse_str(&x.uuid)
if let Ok(private_key) = && let Ok(private_key) = SigningKey::from_pkcs8_pem(&x.private_key)
SigningKey::from_pkcs8_pem(&x.private_key)
{ {
return Ok(Some(Self { return Ok(Some(Self {
token: DeviceToken { token: DeviceToken {
@@ -656,9 +654,7 @@ impl DeviceTokenPair {
.single() .single()
.unwrap_or_else(Utc::now), .unwrap_or_else(Utc::now),
token: x.token, token: x.token,
display_claims: serde_json::from_value( display_claims: serde_json::from_value(x.display_claims)
x.display_claims,
)
.unwrap_or_default(), .unwrap_or_default(),
}, },
key: DeviceTokenKey { key: DeviceTokenKey {
@@ -669,8 +665,6 @@ impl DeviceTokenPair {
}, },
})); }));
} }
}
}
Ok(None) Ok(None)
} }
@@ -724,7 +718,7 @@ const MICROSOFT_CLIENT_ID: &str = "00000000402b5328";
const AUTH_REPLY_URL: &str = "https://login.live.com/oauth20_desktop.srf"; const AUTH_REPLY_URL: &str = "https://login.live.com/oauth20_desktop.srf";
const REQUESTED_SCOPE: &str = "service::user.auth.xboxlive.com::MBI_SSL"; const REQUESTED_SCOPE: &str = "service::user.auth.xboxlive.com::MBI_SSL";
struct RequestWithDate<T> { pub struct RequestWithDate<T> {
pub date: DateTime<Utc>, pub date: DateTime<Utc>,
pub value: T, pub value: T,
} }
+15 -27
View File
@@ -360,8 +360,8 @@ impl Process {
} }
// Write the throwable if present // Write the throwable if present
if !current_content.is_empty() { if !current_content.is_empty()
if let Err(e) = && let Err(e) =
Process::append_to_log_file( Process::append_to_log_file(
&log_path, &log_path,
&current_content, &current_content,
@@ -374,7 +374,6 @@ impl Process {
} }
} }
} }
}
b"log4j:Event" => { b"log4j:Event" => {
in_event = false; in_event = false;
// If no throwable was present, write the log entry at the end of the event // If no throwable was present, write the log entry at the end of the event
@@ -429,8 +428,7 @@ impl Process {
if let Some(timestamp) = if let Some(timestamp) =
current_event.timestamp.as_deref() current_event.timestamp.as_deref()
{ && let Err(e) = Self::maybe_handle_server_join_logging(
if let Err(e) = Self::maybe_handle_server_join_logging(
profile_path, profile_path,
timestamp, timestamp,
message message
@@ -439,43 +437,36 @@ impl Process {
} }
} }
} }
}
_ => {} _ => {}
} }
} }
Ok(Event::Text(mut e)) => { Ok(Event::Text(mut e)) => {
if in_message || in_throwable { if in_message || in_throwable {
if let Ok(text) = e.unescape() { if let Ok(text) = e.xml_content() {
current_content.push_str(&text); current_content.push_str(&text);
} }
} else if !in_event } else if !in_event
&& !e.inplace_trim_end() && !e.inplace_trim_end()
&& !e.inplace_trim_start() && !e.inplace_trim_start()
{ && let Ok(text) = e.xml_content()
if let Ok(text) = e.unescape() { && let Err(e) = Process::append_to_log_file(
if let Err(e) = Process::append_to_log_file(
&log_path, &log_path,
&format!("{text}\n"), &format!("{text}\n"),
) { )
{
tracing::error!( tracing::error!(
"Failed to write to log file: {}", "Failed to write to log file: {}",
e e
); );
} }
} }
}
}
Ok(Event::CData(e)) => { Ok(Event::CData(e)) => {
if in_message || in_throwable { if (in_message || in_throwable)
if let Ok(text) = e && let Ok(text) = e.xml_content()
.escape()
.map_err(|x| x.into())
.and_then(|x| x.unescape())
{ {
current_content.push_str(&text); current_content.push_str(&text);
} }
} }
}
_ => (), _ => (),
} }
@@ -720,16 +711,13 @@ impl Process {
let logs_folder = state.directories.profile_logs_dir(&profile_path); let logs_folder = state.directories.profile_logs_dir(&profile_path);
let log_path = logs_folder.join(LAUNCHER_LOG_PATH); let log_path = logs_folder.join(LAUNCHER_LOG_PATH);
if log_path.exists() { if log_path.exists()
if let Err(e) = Process::append_to_log_file( && let Err(e) = Process::append_to_log_file(
&log_path, &log_path,
&format!("\n# Process exited with status: {mc_exit_status}\n"), &format!("\n# Process exited with status: {mc_exit_status}\n"),
) { )
tracing::warn!( {
"Failed to write exit status to log file: {}", tracing::warn!("Failed to write exit status to log file: {}", e);
e
);
}
} }
let _ = state.discord_rpc.clear_to_default(true).await; let _ = state.discord_rpc.clear_to_default(true).await;
+6 -8
View File
@@ -595,8 +595,8 @@ impl Profile {
} }
#[tracing::instrument(skip(self, semaphore, icon))] #[tracing::instrument(skip(self, semaphore, icon))]
pub async fn set_icon<'a>( pub async fn set_icon(
&'a mut self, &mut self,
cache_dir: &Path, cache_dir: &Path,
semaphore: &IoSemaphore, semaphore: &IoSemaphore,
icon: bytes::Bytes, icon: bytes::Bytes,
@@ -629,8 +629,8 @@ impl Profile {
{ {
let subdirectory = let subdirectory =
subdirectory.map_err(io::IOError::from)?.path(); subdirectory.map_err(io::IOError::from)?.path();
if subdirectory.is_file() { if subdirectory.is_file()
if let Some(file_name) = subdirectory && let Some(file_name) = subdirectory
.file_name() .file_name()
.and_then(|x| x.to_str()) .and_then(|x| x.to_str())
{ {
@@ -647,7 +647,6 @@ impl Profile {
} }
} }
} }
}
if profile.install_stage == ProfileInstallStage::MinecraftInstalling if profile.install_stage == ProfileInstallStage::MinecraftInstalling
{ {
@@ -901,8 +900,8 @@ impl Profile {
{ {
let subdirectory = let subdirectory =
subdirectory.map_err(io::IOError::from)?.path(); subdirectory.map_err(io::IOError::from)?.path();
if subdirectory.is_file() { if subdirectory.is_file()
if let Some(file_name) = && let Some(file_name) =
subdirectory.file_name().and_then(|x| x.to_str()) subdirectory.file_name().and_then(|x| x.to_str())
{ {
let file_size = subdirectory let file_size = subdirectory
@@ -928,7 +927,6 @@ impl Profile {
} }
} }
} }
}
let file_hashes = CachedEntry::get_file_hash_many( let file_hashes = CachedEntry::get_file_hash_many(
&keys.iter().map(|s| &*s.cache_key).collect::<Vec<_>>(), &keys.iter().map(|s| &*s.cache_key).collect::<Vec<_>>(),
+1 -1
View File
@@ -254,7 +254,7 @@ where
} }
#[tracing::instrument(skip(bytes, semaphore))] #[tracing::instrument(skip(bytes, semaphore))]
pub async fn write<'a>( pub async fn write(
path: &Path, path: &Path,
bytes: &[u8], bytes: &[u8],
semaphore: &IoSemaphore, semaphore: &IoSemaphore,
+7 -8
View File
@@ -191,13 +191,13 @@ async fn get_all_autoinstalled_jre_path() -> Result<HashSet<PathBuf>, JREError>
let mut jre_paths = HashSet::new(); let mut jre_paths = HashSet::new();
let base_path = state.directories.java_versions_dir(); let base_path = state.directories.java_versions_dir();
if base_path.is_dir() { if base_path.is_dir()
if let Ok(dir) = std::fs::read_dir(base_path) { && let Ok(dir) = std::fs::read_dir(base_path)
{
for entry in dir.flatten() { for entry in dir.flatten() {
let file_path = entry.path().join("bin"); let file_path = entry.path().join("bin");
if let Ok(contents) = if let Ok(contents) = std::fs::read_to_string(file_path.clone())
std::fs::read_to_string(file_path.clone())
{ {
let entry = entry.path().join(contents); let entry = entry.path().join(contents);
jre_paths.insert(entry); jre_paths.insert(entry);
@@ -210,7 +210,6 @@ async fn get_all_autoinstalled_jre_path() -> Result<HashSet<PathBuf>, JREError>
} }
} }
} }
}
Ok(jre_paths) Ok(jre_paths)
}) })
@@ -300,8 +299,9 @@ pub async fn check_java_at_filepath(path: &Path) -> crate::Result<JavaVersion> {
} }
// Extract version info from it // Extract version info from it
if let Some(arch) = java_arch { if let Some(arch) = java_arch
if let Some(version) = java_version { && let Some(version) = java_version
{
if let Ok(version) = extract_java_version(version) { if let Ok(version) = extract_java_version(version) {
let path = java.to_string_lossy().to_string(); let path = java.to_string_lossy().to_string();
return Ok(JavaVersion { return Ok(JavaVersion {
@@ -314,7 +314,6 @@ pub async fn check_java_at_filepath(path: &Path) -> crate::Result<JavaVersion> {
return Err(JREError::InvalidJREVersion(version.to_owned()).into()); return Err(JREError::InvalidJREVersion(version.to_owned()).into());
} }
}
Err(JREError::FailedJavaCheck(java).into()) Err(JREError::FailedJavaCheck(java).into())
} }
+4 -5
View File
@@ -33,13 +33,12 @@ pub fn is_feature_supported_in(
if part_version == part_first_release { if part_version == part_first_release {
continue; continue;
} }
if let Ok(part_version) = part_version.parse::<u32>() { if let Ok(part_version) = part_version.parse::<u32>()
if let Ok(part_first_release) = part_first_release.parse::<u32>() { && let Ok(part_first_release) = part_first_release.parse::<u32>()
if part_version > part_first_release { && part_version > part_first_release
{
return true; return true;
} }
} }
}
}
false false
} }
+1 -1
View File
@@ -1,2 +1,2 @@
[toolchain] [toolchain]
channel = "1.88.0" channel = "1.89.0"