phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

Fixing possible nil user_id field in SongQueue when calling a function

Browse Source
This commit is contained in:
kdeng00
2025-07-21 19:44:48 -04:00
parent 0eeacd2ed4
commit 3118cff274
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/callers/song.rs
+27 -18
View File
@@ -422,24 +422,33 @@ mod song_queue {
}); });
match result { match result {
Ok(row) => Ok(SongQueue { Ok(row) => {
id: row let user_id_result = row.try_get("user_id");
.try_get("id") let song_queue = SongQueue {
.map_err(|_e| sqlx::Error::RowNotFound) id: row
.unwrap(), .try_get("id")
filename: row .map_err(|_e| sqlx::Error::RowNotFound)
.try_get("filename") .unwrap(),
.map_err(|_e| sqlx::Error::RowNotFound) filename: row
.unwrap(), .try_get("filename")
status: row .map_err(|_e| sqlx::Error::RowNotFound)
.try_get("status") .unwrap(),
.map_err(|_e| sqlx::Error::RowNotFound) status: row
.unwrap(), .try_get("status")
user_id: row .map_err(|_e| sqlx::Error::RowNotFound)
.try_get("user_id") .unwrap(),
.map_err(|_e| sqlx::Error::RowNotFound) user_id: match user_id_result {
.unwrap(), Ok(id) => {
}), id
}
Err(_) => {
uuid::Uuid::nil()
}
}
};
Ok(song_queue)
}
Err(_err) => Err(sqlx::Error::RowNotFound), Err(_err) => Err(sqlx::Error::RowNotFound),
} }
} }