Merge branch 'main' into main

.github/workflows/bot.yml

@@ -1,26 +0,0 @@
-name: Helper
-
-on:
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  instructions:
-    name: instructions
-    runs-on: ubuntu-latest
-    steps:
-       - run: curl https://notify-api.is-a.dev/pr/merged/${{ github.event.pull_request.number }}
-         if: github.event.action == 'closed' && github.event.pull_request.merged == true
-#      - uses: actions/checkout@v2
-#      - name: Comment
-#        if: github.event.action == 'closed' && github.event.pull_request.merged == true
-#        uses: actions/github-script@v3
-#        with:
-#          github-token: ${{secrets.GITHUB_TOKEN}}
-#          script: |
-#            const { hasLabel } = require(`${process.env.GITHUB_WORKSPACE}/scripts/action-utils.js`);
-#            const { instructions } = require(`${process.env.GITHUB_WORKSPACE}/scripts/reply.js`);
-#            if (hasLabel(context, 'domain'))
-#              console.log('Domain');
-#            await instructions(context, github);

domains/@.json

@@ -6,8 +6,6 @@
         "email": "phenax5@gmail.com"
     },
     "record": {
-        "URL": "http://www.is-a.dev",
-        "MX": ["mail.is-a.dev"],
-        "TXT": ["v=spf1 ip4:51.161.54.164 include:mail.is-a.dev ~all"]
+        "URL": "http://www.is-a.dev"
     }
 }

domains/_discord.jirafey.json

@@ -0,0 +1,9 @@
+{
+    "owner": {
+        "username": "jirafey",
+        "email": "jirafey@tuta.io"
+    },
+    "record": {
+        "TXT": "dh=3c80d94ed181b223255b5fbf35f8fda6a402058f"
+    }
+}

domains/_github-challenge-is-a-dev-org.json

@@ -5,6 +5,6 @@
     },
 
     "record": {
-        "CNAME": "dns.beadman-network.com"
+        "TXT": "2c9dfbe7c8"
     }
 }

domains/_github-pages-challenge-is-a-dev.team.json

@@ -0,0 +1,10 @@
+{
+    "owner": {
+        "username": "is-a-dev",
+        "email": "phenax5@gmail.com"
+    },
+
+    "record": {
+        "TXT": "c551c059fb167540ec0498d9011556"
+    }
+}

domains/a-j.json

@@ -0,0 +1,9 @@
+{
+    "owner": {
+        "username": "alijafari-gd",
+        "email": "ali.jafari.sn@gmail.com"
+    },
+    "record": {
+        "URL": "https://alijafari.is-a.dev"
+    }
+}

domains/alijafari.json

@@ -0,0 +1,14 @@
+{
+    "owner": {
+        "username": "alijafari-gd",
+        "email": "ali.jafari.sn@gmail.com"
+    },
+    "record": {
+        "A": [
+            "217.174.245.249",
+            "51.161.54.161"
+            ],
+        "MX": ["mail.is-a.dev"],
+        "TXT": "v=spf1 mx a:mail.is-a.dev ~all"
+    }
+}

domains/bot.dracx.json

@@ -0,0 +1,9 @@
+{
+    "owner": {
+        "username": "DarindaDraX",
+        "email": "123kishanvish@gmail.com"
+    },
+    "record": {
+        "A": ["69.30.249.53"]
+    }
+}

domains/lavalink.trung.json

@@ -0,0 +1,9 @@
+{
+    "owner": {
+        "username": "vuthanhtrung2010",
+        "email": "vuthanhtrungsuper@gmail.com"
+    },
+    "record": {
+        "A": ["69.30.249.53"]
+    }
+}

domains/nik.json

@@ -1,6 +1,6 @@
 {
   "owner": {
-    "username": "Nikhil",
+    "username": "nikxso",
     "email": "nikhilsoniya123@gmail.com",
     "discord": "nikxso#0000"
   },

domains/siddhant.json

@@ -6,6 +6,6 @@
         "email": "pandeysiddhant21@gmail.com"
     },
     "record": {
-        "URL": "https://siddhantt.netlify.app"
+        "URL": "https://siddhantt.vercel.app/"
     }
 }

utils/domain-service.js

@@ -59,6 +59,9 @@ const recordToEmailMx = ({ name, address, priority }) => ({
 const getHostKey = host =>
   `${host.name.toLowerCase()}##${host.type.toLowerCase()}##${host.address.toLowerCase()}`;
 
+const isReserved = (domain) =>
+  domain.name.startsWith('*') || !VALID_RECORD_TYPES.includes(domain.type)
+
 const diffRecords = (oldRecords, newRecords) => {
   const isMatchingRecord = (a, b) => getHostKey(a) === getHostKey(b);
 
@@ -84,13 +87,9 @@ const executeBatch = (batches) => batches.reduce((promise, batch, index) => {
   });
 }, Promise.resolve());
 
-const isReserved = (domain) =>
-  domain.name.startsWith('*') ||
-    !VALID_RECORD_TYPES.includes(domain.type)
-
 const getDomainService = ({ cpanel }) => {
   const fetchZoneRecords = R.compose(
-    then(R.filter(R.complement(isReserved))),
+    then(R.reject(isReserved)),
     then(R.map(zoneToRecord)),
     cpanel.zone.fetch
   );
@@ -134,7 +133,6 @@ const getDomainService = ({ cpanel }) => {
     batchLazyTasks(BATCH_SIZE),
     R.filter(Boolean),
     R.map(R.cond([
-      // [R.propEq('name', 'www'), R.always(null)], // Ignore www
       [R.propEq('type', 'URL'), addRedirection],
       [R.T, addZoneRecord],
     ])),