From 74c079524849e559a7b8de6ff7d7a403d2a4119a Mon Sep 17 00:00:00 2001
From: thecashewtrader <thecashewtrader@protonmail.com>
Date: Mon, 28 Nov 2022 16:57:35 +0530
Subject: [PATCH 1/4] Add a note if user attempts to register with (apparently)
 an email

---
 src/components/RegisterPage.vue | 2 ++
 src/locales/en.json             | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/RegisterPage.vue b/src/components/RegisterPage.vue
index 4817a4ac..d55f016b 100644
--- a/src/components/RegisterPage.vue
+++ b/src/components/RegisterPage.vue
@@ -52,6 +52,8 @@ export default {
     methods: {
         register() {
             if (!this.username || !this.password) return;
+            if (this.username.includes("@") && !confirm(this.$t("info.register_no_email_note"))) return;
+
             this.fetchJson(this.authApiUrl() + "/register", null, {
                 method: "POST",
                 body: JSON.stringify({
diff --git a/src/locales/en.json b/src/locales/en.json
index fab0ced3..09afa88f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -168,6 +168,7 @@
         "page_not_found": "Page not found",
         "copied": "Copied!",
         "cannot_copy": "Can't copy!",
-        "local_storage": "This action requires localStorage, are cookies enabled?"
+        "local_storage": "This action requires localStorage, are cookies enabled?",
+	  "register_no_email_note": "Piped has detected that you are using an email as username to register. Providing an email is not required to register on Piped. If you still want to continue, press OK."
     }
 }

From 66913818b44d129df1ee9efdf9ecff77c416103f Mon Sep 17 00:00:00 2001
From: thecashewtrader <thecashewtrader@protonmail.com>
Date: Mon, 28 Nov 2022 20:36:02 +0530
Subject: [PATCH 2/4] Use regex to check for email on RegisterPage

---
 src/components/RegisterPage.vue | 4 +++-
 src/utils/Misc.js               | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/Misc.js

diff --git a/src/components/RegisterPage.vue b/src/components/RegisterPage.vue
index d55f016b..ee95ebc6 100644
--- a/src/components/RegisterPage.vue
+++ b/src/components/RegisterPage.vue
@@ -33,6 +33,8 @@
 </template>
 
 <script>
+import { isEmail } from "../utils/Misc.js";
+
 export default {
     data() {
         return {
@@ -52,7 +54,7 @@ export default {
     methods: {
         register() {
             if (!this.username || !this.password) return;
-            if (this.username.includes("@") && !confirm(this.$t("info.register_no_email_note"))) return;
+            if (isEmail(this.username) && !confirm(this.$t("info.register_no_email_note"))) return;
 
             this.fetchJson(this.authApiUrl() + "/register", null, {
                 method: "POST",
diff --git a/src/utils/Misc.js b/src/utils/Misc.js
new file mode 100644
index 00000000..7cef8561
--- /dev/null
+++ b/src/utils/Misc.js
@@ -0,0 +1,8 @@
+export const isEmail = input => {
+    // Taken from https://emailregex.com
+    const result = input.match(
+        //eslint-disable-next-line
+        /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+    );
+    return result;
+};

From 0e2f1dd0f5930d7fcd9c7f9229ed44c361330e73 Mon Sep 17 00:00:00 2001
From: Bnyro <82752168+Bnyro@users.noreply.github.com>
Date: Mon, 9 Jan 2023 16:27:46 +0100
Subject: [PATCH 3/4] Change the alert text when registering with email

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 09afa88f..ae466bc2 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -169,6 +169,6 @@
         "copied": "Copied!",
         "cannot_copy": "Can't copy!",
         "local_storage": "This action requires localStorage, are cookies enabled?",
-	  "register_no_email_note": "Piped has detected that you are using an email as username to register. Providing an email is not required to register on Piped. If you still want to continue, press OK."
+	"register_no_email_note": "Using an e-mail as username is not recommended. Proceed anyways?"
     }
 }

From ed983cfb2a9e1777a1bc94829945ef429c6dfaa5 Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:59:04 +0000
Subject: [PATCH 4/4] Fix indentation.

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index ae466bc2..22701667 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -169,6 +169,6 @@
         "copied": "Copied!",
         "cannot_copy": "Can't copy!",
         "local_storage": "This action requires localStorage, are cookies enabled?",
-	"register_no_email_note": "Using an e-mail as username is not recommended. Proceed anyways?"
+        "register_no_email_note": "Using an e-mail as username is not recommended. Proceed anyways?"
     }
 }