From f9e642275a4ab608e5b58aa184e64cf90d02467a Mon Sep 17 00:00:00 2001 From: SinTan1729 Date: Sun, 31 Mar 2024 00:38:42 -0500 Subject: [PATCH] new: Support uid slug --- actix/Cargo.lock | 10 ++++++++++ actix/Cargo.toml | 1 + actix/src/utils.rs | 34 ++++++++++++++++++++++++++-------- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/actix/Cargo.lock b/actix/Cargo.lock index 905044f..e252d65 100644 --- a/actix/Cargo.lock +++ b/actix/Cargo.lock @@ -481,6 +481,7 @@ dependencies = [ "actix-session", "actix-web", "env_logger", + "nanoid", "rand", "regex", "rusqlite", @@ -973,6 +974,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "nanoid" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" +dependencies = [ + "rand", +] + [[package]] name = "num-conv" version = "0.1.0" diff --git a/actix/Cargo.toml b/actix/Cargo.toml index a2d842e..6c3187d 100644 --- a/actix/Cargo.toml +++ b/actix/Cargo.toml @@ -31,3 +31,4 @@ regex = "1.10.3" rand = "0.8.5" actix-session = { version = "0.9.0", features = ["cookie-session"] } env_logger = "0.11.1" +nanoid = "0.4.0" diff --git a/actix/src/utils.rs b/actix/src/utils.rs index ba64e66..a7791dc 100644 --- a/actix/src/utils.rs +++ b/actix/src/utils.rs @@ -1,4 +1,7 @@ +use std::env; + use crate::database; +use nanoid::nanoid; use rand::seq::SliceRandom; use regex::Regex; use rusqlite::Connection; @@ -25,14 +28,21 @@ pub fn add_link(req: String, db: &Connection) -> (bool, String) { let chunks: Vec<&str> = req.split(';').collect(); let longlink = String::from(chunks[0]); + let style = env::var("slug-style").unwrap_or(String::from("pair")); + let len_str = env::var("slug-length").unwrap_or(String::from("8")); + let mut len: usize = len_str.parse().unwrap_or(8); + if len < 4 { + len = 4; + } + let mut shortlink; if chunks.len() > 1 { shortlink = chunks[1].to_string().to_lowercase(); if shortlink.is_empty() { - shortlink = random_name(); + shortlink = gen_link(style, len); } } else { - shortlink = random_name(); + shortlink = gen_link(style, len); } if validate_link(shortlink.as_str()) && get_longurl(shortlink.clone(), db).is_none() { @@ -53,7 +63,7 @@ pub fn delete_link(shortlink: String, db: &Connection) -> bool { } } -fn random_name() -> String { +fn gen_link(style: String, len: usize) -> String { #[rustfmt::skip] static ADJECTIVES: [&str; 108] = ["admiring", "adoring", "affectionate", "agitated", "amazing", "angry", "awesome", "beautiful", "blissful", "bold", "boring", "brave", "busy", "charming", "clever", "compassionate", "competent", "condescending", "confident", "cool", @@ -85,9 +95,17 @@ fn random_name() -> String { "taussig", "tesla", "tharp", "thompson", "torvalds", "tu", "turing", "varahamihira", "vaughan", "vaughn", "villani", "visvesvaraya", "volhard", "wescoff", "weierstrass", "wilbur", "wiles", "williams", "williamson", "wilson", "wing", "wozniak", "wright", "wu", "yalow", "yonath", "zhukovsky"]; - format!( - "{0}-{1}", - ADJECTIVES.choose(&mut rand::thread_rng()).unwrap(), - NAMES.choose(&mut rand::thread_rng()).unwrap() - ) + #[rustfmt::skip] + static CHARS: [char; 36] = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', + 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']; + + if style == "uid" { + nanoid!(len, &CHARS) + } else { + format!( + "{0}-{1}", + ADJECTIVES.choose(&mut rand::thread_rng()).unwrap(), + NAMES.choose(&mut rand::thread_rng()).unwrap() + ) + } }