From 112f8ce91c16bae6f08dc489dbf85e1ef52cd7f5 Mon Sep 17 00:00:00 2001
From: Akshay Nair <phenax5@gmail.com>
Date: Tue, 27 Oct 2020 13:09:09 +0530
Subject: [PATCH] Fixes root domain pointing

---
 domains/@.json          | 6 ++++--
 utils/domain-service.js | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/domains/@.json b/domains/@.json
index 1a088239e..164375f24 100644
--- a/domains/@.json
+++ b/domains/@.json
@@ -5,5 +5,7 @@
     "username": "phenax",
     "email": "phenax5@gmail.com"
   },
-  "record": {}
-}
\ No newline at end of file
+  "record": {
+    "URL": "https://www.is-a.dev"
+  }
+}
diff --git a/utils/domain-service.js b/utils/domain-service.js
index 984d274cb..446ca5579 100644
--- a/utils/domain-service.js
+++ b/utils/domain-service.js
@@ -6,7 +6,7 @@ const { then, log, print, lazyTask, batchLazyTasks } = require('./helpers');
 const BATCH_SIZE = 1;
 
 const recordToRedirection = ({ name, address }) => ({
-  domain: `${name}.${DOMAIN_DOMAIN}`,
+  domain: name === '@' ? DOMAIN_DOMAIN : `${name}.${DOMAIN_DOMAIN}`,
   redirect: address,
   type: 'permanent',
   redirect_wildcard: 1,
@@ -20,7 +20,7 @@ const recordToZone = ({ name, type, address, id }) => ({
   ...(type === 'CNAME' ? { cname: address } : {}),
 });
 
-const cleanName = name => `${name}`.replace(new RegExp(`\\.${DOMAIN_DOMAIN}\\.?$`), '').toLowerCase();
+const cleanName = name => name === DOMAIN_DOMAIN ? '@' : `${name}`.replace(new RegExp(`\\.${DOMAIN_DOMAIN}\\.?$`), '').toLowerCase();
 
 const zoneToRecord = ({ name, type, cname, address, record, line: id }) => ({
   id,
@@ -42,7 +42,7 @@ const diffRecords = (oldRecords, newRecords) => {
 
   const remove = R.differenceWith(isMatchingRecord, oldRecords, newRecords);
   const add = R.differenceWith(isMatchingRecord, newRecords, oldRecords)
-    .filter(r => !['www', '@'].includes(r.name));
+    .filter(r => !['www'].includes(r.name));
 
   return { add, remove };
 };