Skip to content

Commit cad7e3e

Browse files
committed
improved three lines
1 parent 65a6951 commit cad7e3e

File tree

3 files changed

+4
-25
lines changed

3 files changed

+4
-25
lines changed

src/endpoints/mod_versions.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,7 @@ pub async fn update_version(
432432

433433
if payload.status == ModVersionStatusEnum::Accepted || payload.status == ModVersionStatusEnum::Rejected {
434434
tokio::spawn(async move {
435-
let m_res_res = Mod::get_one(&path.id, false, &mut pool).await;
436-
if m_res_res.is_err() {
437-
return;
438-
}
439-
let m_res = m_res_res.unwrap();
435+
let m_res = Mod::get_one(&path.id, false, &mut pool).await.ok().flatten();
440436
if m_res.is_none() {
441437
return;
442438
}

src/endpoints/mods.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,7 @@ pub async fn create(
136136
.or(Err(ApiError::TransactionError))?;
137137

138138
tokio::spawn(async move {
139-
let m_res_res = Mod::get_one(&json.id, false, &mut pool).await;
140-
if m_res_res.is_err() {
141-
return;
142-
}
143-
let m_res = m_res_res.unwrap();
139+
let m_res = Mod::get_one(&json.id, false, &mut pool).await.ok().flatten();
144140
if m_res.is_none() {
145141
return;
146142
}

src/forum.rs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use serde_json::{json, Value};
1+
use serde_json::{json, to_string, Value};
22

33
use crate::types::models::dependency::DependencyImportance;
44
use crate::types::models::developer::FetchedDeveloper;
@@ -9,20 +9,7 @@ use crate::types::models::mod_version::ModVersion;
99
use crate::types::models::mod_version_status::ModVersionStatusEnum;
1010

1111
fn gd_to_string(gd: Option<GDVersionEnum>) -> String {
12-
match gd {
13-
Some(GDVersionEnum::All) => "*",
14-
Some(GDVersionEnum::GD2113) => "2.113",
15-
Some(GDVersionEnum::GD2200) => "2.200",
16-
Some(GDVersionEnum::GD2204) => "2.204",
17-
Some(GDVersionEnum::GD2205) => "2.205",
18-
Some(GDVersionEnum::GD2206) => "2.206",
19-
Some(GDVersionEnum::GD2207) => "2.207",
20-
Some(GDVersionEnum::GD22071) => "2.2071",
21-
Some(GDVersionEnum::GD22072) => "2.2072",
22-
Some(GDVersionEnum::GD22073) => "2.2073",
23-
Some(GDVersionEnum::GD22074) => "2.2074",
24-
None => "N/A",
25-
}.to_string()
12+
gd.map(|x| to_string(&x).ok()).flatten().unwrap_or_else(|| "N/A".to_string()).replace("\"", "")
2613
}
2714

2815
fn mod_embed(m: Mod, v: ModVersion, base_url: String) -> Value {

0 commit comments

Comments
 (0)