merge: fix(prns): url encode unicode

Cargo.lock

@@ -1003,12 +1003,13 @@ version = "0.1.0"
 dependencies = [
  "dotenvy",
  "log",
- "pronouns",
+ "pronounslib",
  "rocket",
  "simple_logger",
  "sqlx",
  "time",
  "tokio",
+ "urlencoding",
 ]
 
 [[package]]
@@ -1034,7 +1035,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "pronouns"
+name = "pronounslib"
 version = "0.1.0"
 dependencies = [
  "serde",
@@ -1971,6 +1972,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
 members = [
-    "pronouns",
+    "pronounslib",
     "prns",
 ]

prns/Cargo.toml

@@ -14,3 +14,4 @@ tokio = { version = "1.27.0", features = ["full"] }
 dotenvy = "0.15.7"
 simple_logger = "4.2.0"
 log = "0.4.19"
+urlencoding = "2.1.3"

prns/src/main.rs

@@ -1,8 +1,11 @@
-use pronouns::models::{member::Member, user::User};
+pub mod models;
+
+use crate::models::{Member, User};
 use rocket::{response::Redirect, Config, State};
 use simple_logger;
 use sqlx::{postgres::PgPoolOptions, Pool, Postgres};
 use std::{env, path::PathBuf};
+use urlencoding::encode;
 #[macro_use]
 extern crate rocket;
 
@@ -25,7 +28,7 @@ async fn redirect(state: &State<AppState>, path: PathBuf) -> Redirect {
         .await
         .map_or_else(
             |_| Redirect::temporary(state.base_url.clone()),
-            |u| Redirect::temporary(format!("{}/@{}", state.base_url, u.username)),
+            |u| Redirect::temporary(format!("{}/@{}", state.base_url, encode(&u.username))),
         ),
         6 => {
             let member = match sqlx::query_as!(
@@ -52,7 +55,7 @@ async fn redirect(state: &State<AppState>, path: PathBuf) -> Redirect {
                 |u| {
                     Redirect::temporary(format!(
                         "{}/@{}/{}",
-                        state.base_url, u.username, member.name
+                        state.base_url, encode(&u.username), encode(&member.name)
                     ))
                 },
             )

prns/src/models.rs

@@ -0,0 +1,14 @@
+#[derive(Debug)]
+pub struct User {
+    pub id: String,
+    pub sid: String,
+    pub username: String,
+}
+
+#[derive(Debug)]
+pub struct Member {
+    pub id: String,
+    pub user_id: String,
+    pub sid: String,
+    pub name: String,
+}