From 20e569da0cbacc7a96118aa3bc2d49f093d0735c Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 1 Feb 2023 10:49:42 +0800
Subject: [PATCH] Strip out @acct@ from instance URL when log in

---
 src/pages/login.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/login.jsx b/src/pages/login.jsx
index 5bcc0ce..5968ffc 100644
--- a/src/pages/login.jsx
+++ b/src/pages/login.jsx
@@ -40,7 +40,9 @@ function Login() {
     const { elements } = e.target;
     let instanceURL = elements.instanceURL.value.toLowerCase();
     // Remove protocol from instance URL
-    instanceURL = instanceURL.replace(/(^\w+:|^)\/\//, '');
+    instanceURL = instanceURL.replace(/^https?:\/\//, '').replace(/\/+$/, '');
+    // Remove @acct@ or acct@ from instance URL
+    instanceURL = instanceURL.replace(/^@?[^@]+@/, '');
     store.local.set('instanceURL', instanceURL);
 
     (async () => {