From 477ffeb3ceb595968cf5f6e17136835df81ecb9b Mon Sep 17 00:00:00 2001
From: trisua <tri@swmff.org>
Date: Fri, 8 Nov 2024 17:02:16 -0500
Subject: [PATCH] add: stricter username limits add: better post intent

---
 crates/authbeam/src/database.rs                   | 15 ++++++++++++---
 .../templates/partials/components/compose.html    |  2 +-
 crates/rainbeam/templates/timelines/posts.html    |  6 +-----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/crates/authbeam/src/database.rs b/crates/authbeam/src/database.rs
index ed89abb..fe2924c 100644
--- a/crates/authbeam/src/database.rs
+++ b/crates/authbeam/src/database.rs
@@ -594,9 +594,18 @@ impl Database {
             "login",
             "sign_up",
             "settings",
+            "api",
+            "intents",
+            "circles",
+            "chats",
+            "responses",
+            "questions",
+            "comments",
+            "pages",
+            "inbox",
         ];
 
-        let regex = regex::RegexBuilder::new(r"[^\w_\-\.!]+$")
+        let regex = regex::RegexBuilder::new(r"[^\w_\-\.!]+")
             .multi_line(true)
             .build()
             .unwrap();
@@ -628,8 +637,8 @@ impl Database {
         }
 
         // ...
-        let username = props.username.clone();
-        let password = props.password.clone();
+        let username = props.username.trim().to_string();
+        let password = props.password.trim().to_string();
 
         // check captcha
         if let Err(_) = props
diff --git a/crates/rainbeam/templates/partials/components/compose.html b/crates/rainbeam/templates/partials/components/compose.html
index ef684dc..b1b58dd 100644
--- a/crates/rainbeam/templates/partials/components/compose.html
+++ b/crates/rainbeam/templates/partials/components/compose.html
@@ -7,7 +7,7 @@
         <div></div>
         <div class="flex gap-2">
             <button class="primary bold">Post</button>
-            <button type="button" class="bold" onclick="window.close()">
+            <button type="button" class="bold" onclick="window.history.back()">
                 Cancel
             </button>
         </div>
diff --git a/crates/rainbeam/templates/timelines/posts.html b/crates/rainbeam/templates/timelines/posts.html
index 332b1d2..3479d45 100644
--- a/crates/rainbeam/templates/timelines/posts.html
+++ b/crates/rainbeam/templates/timelines/posts.html
@@ -80,11 +80,7 @@
         <div class="flex justify-between">
             <div></div>
             <div class="flex gap-2">
-                <a
-                    href="/intents/post"
-                    target="_blank"
-                    class="button primary bold"
-                >
+                <a href="/intents/post" class="button primary bold">
                     <svg
                         xmlns="http://www.w3.org/2000/svg"
                         viewBox="0 0 16 16"