arcodange-org/url-shortener
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chg: Use Option instead of returning empty String

Browse Source
This commit is contained in:
SinTan1729
2024-03-26 23:52:24 -05:00
parent 5e4db14ea2
commit 5d8dd6fb63
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
actix/src/main.rs
View File

@@ -78,10 +78,7 @@ async fn error404() -> impl Responder {
#[get("/{shortlink}")]
async fn link_handler(shortlink: web::Path<String>, data: web::Data<AppState>) -> impl Responder {
let shortlink_str = shortlink.to_string();
let longlink = utils::get_longurl(shortlink_str, &data.db);
if longlink.is_empty() {
Redirect::to("/err/404")
} else {
if let Some(longlink) = utils::get_longurl(shortlink_str, &data.db) {
let redirect_method = env::var("redirect_method").unwrap_or(String::from("PERMANENT"));
database::add_hit(shortlink.as_str(), &data.db);
if redirect_method == "TEMPORARY" {
@@ -90,6 +87,8 @@ async fn link_handler(shortlink: web::Path<String>, data: web::Data<AppState>) -
// Defaults to permanent redirection
Redirect::to(longlink).permanent()
}
} else {
Redirect::to("/err/404")
}
}