From d7527d9131f724be0facaf4da0926aedf5fec15a Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Mon, 9 May 2022 23:03:08 +0100
Subject: [PATCH] chore: loosen username restrictions

---
 set_version.sh                      | 2 +-
 src/routes/bots/create.rs           | 2 +-
 src/routes/users/change_username.rs | 3 +++
 src/util/regex.rs                   | 2 +-
 src/version.rs                      | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/set_version.sh b/set_version.sh
index c97229ce..b8b95de4 100755
--- a/set_version.sh
+++ b/set_version.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-export version=0.5.3-patch.2
+export version=0.5.3-1
 echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
diff --git a/src/routes/bots/create.rs b/src/routes/bots/create.rs
index 3583502a..3af72e87 100644
--- a/src/routes/bots/create.rs
+++ b/src/routes/bots/create.rs
@@ -45,7 +45,7 @@ pub async fn create_bot(db: &Db, user: User, info: Json<DataCreateBot>) -> Resul
     let id = Ulid::new().to_string();
     let bot_user = User {
         id: id.clone(),
-        username: info.name,
+        username: info.name.trim().to_string(),
         bot: Some(BotInformation {
             owner: user.id.clone(),
         }),
diff --git a/src/routes/users/change_username.rs b/src/routes/users/change_username.rs
index 9e534110..fa2bfde7 100644
--- a/src/routes/users/change_username.rs
+++ b/src/routes/users/change_username.rs
@@ -28,6 +28,9 @@ pub async fn req(
     data: Json<DataChangeUsername>,
 ) -> Result<Json<User>> {
     let data = data.into_inner();
+    data.validate()
+        .map_err(|error| Error::FailedValidation { error })?;
+
     account
         .verify_password(&data.password)
         .map_err(|_| Error::InvalidCredentials)?;
diff --git a/src/util/regex.rs b/src/util/regex.rs
index e2310902..051d518f 100644
--- a/src/util/regex.rs
+++ b/src/util/regex.rs
@@ -1,4 +1,4 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
 
-pub static RE_USERNAME: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[a-zA-Z0-9_.]+$").unwrap());
+pub static RE_USERNAME: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[^\u200B]+$").unwrap());
diff --git a/src/version.rs b/src/version.rs
index 07740ef4..68ec5e8d 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "0.5.3-patch.2";
+pub const VERSION: &str = "0.5.3-1";