From 03bf12ec07c9ec8c146e6d16def69edc6b3cbde7 Mon Sep 17 00:00:00 2001
From: Modnark <modnarkdev@tutanota.com>
Date: Thu, 14 May 2026 13:39:55 -0400
Subject: [PATCH] ACTUALLY fix blacklisting

---
 assets/css/main.css        | 9 +++++++++
 routes/domains.js          | 4 ++--
 views/domains.handlebars   | 8 --------
 views/login.handlebars     | 2 +-
 views/newdomain.handlebars | 2 +-
 views/register.handlebars  | 2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/assets/css/main.css b/assets/css/main.css
index cd76759..6ae8078 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -103,6 +103,15 @@ body {
     cursor: pointer;
 }
 
+#RequestErrors {
+    color: red;
+}
+
+#RequestErrors li {
+    margin: 0;
+    padding: 0;
+}
+
 .SelectedListItem {
     background-color: #2e69cb;
     color: white;
diff --git a/routes/domains.js b/routes/domains.js
index ab419a3..31c38c7 100644
--- a/routes/domains.js
+++ b/routes/domains.js
@@ -58,13 +58,13 @@ router.post('/domains/new', authMw.AllowIfAuthenticated, async(req, res, next) =
     // Make sure domain is valid
     const domainLabel = reqBody.register_domain_label;
     const domainTLD = reqBody.register_domain_tld;
-    const fullDomain = domainLabel + "." + domainLabel;
+    const fullDomain = domainLabel + "." + domainTLD;
 
     if(validationError !== undefined)
         errors = validationError.details;
 
     if(blacklistedDomains.includes(fullDomain.toLowerCase())) {
-        errors.push('Domain is not available.');
+        errors.push({message: 'Domain is not available.'});
     }
 
     try {
diff --git a/views/domains.handlebars b/views/domains.handlebars
index 25282af..8b65ceb 100644
--- a/views/domains.handlebars
+++ b/views/domains.handlebars
@@ -2,14 +2,6 @@
 
 <p>Manage your registered domains</p>
 
-{{#if errors}}
-    <ul>
-        {{#each errors}}
-            <li>{{this.message}}</li>
-        {{/each}}
-    </ul>
-{{/if}}
-
 <div class="InsetContentBox" id="DomainSelection">
     <div style="width: 600px;"></div>
     <ul>
diff --git a/views/login.handlebars b/views/login.handlebars
index 01433eb..0514ca3 100644
--- a/views/login.handlebars
+++ b/views/login.handlebars
@@ -1,7 +1,7 @@
 <br>
 <div>
     {{#if errors}}
-        <ul>
+        <ul id="RequestErrors">
             {{#each errors}}
                 <li>{{this.message}}</li>
             {{/each}}
diff --git a/views/newdomain.handlebars b/views/newdomain.handlebars
index 036b459..2253a47 100644
--- a/views/newdomain.handlebars
+++ b/views/newdomain.handlebars
@@ -1,7 +1,7 @@
 <p>Register a new domain</p>
 
 {{#if errors}}
-    <ul>
+    <ul id="RequestErrors">
         {{#each errors}}
             <li>{{this.message}}</li>
         {{/each}}
diff --git a/views/register.handlebars b/views/register.handlebars
index 9088fdb..e1458d2 100644
--- a/views/register.handlebars
+++ b/views/register.handlebars
@@ -1,7 +1,7 @@
 <br>
 <div>
     {{#if errors}}
-        <ul>
+        <ul id="RequestErrors">
             {{#each errors}}
                 <li>{{this.message}}</li>
             {{/each}}