Merge branch 'main' into patch-1

.github/workflows/stale.yml

@@ -15,7 +15,7 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 30
         days-before-close: 20
-        stale-issue-message: 'This issue has been marked as stale due to inactivity and will be closed. Comment anything on this PR to prevent it'
+        stale-issue-message: 'This issue has been marked as stale due to inactivity and will be closed. Comment anything on this issue to prevent it'
         stale-pr-message: 'This pull request has been marked as stale due to inactivity and will be closed. Comment anything on this PR to prevent it'
         exempt-issue-labels: 'no-stale'
         exempt-pr-labels: 'no-stale'

domains/_github-pages-challenge-WilliamDavidHarrison.william.json

@@ -0,0 +1,10 @@
+{
+  "owner": {
+    "username": "WilliamDavidHarrison",
+    "email": "william@williamharrison.dev"
+  },
+
+  "record": {
+    "TXT": "a41ee70a45d374b3c6e018b1d4e409"
+  }
+}

domains/ayanamy.json

@@ -7,6 +7,6 @@
     "twitter": "jy126orjy126"
   },
   "record": {
-    "CNAME": "jy1263.github.io"
+    "URL": "https://jy1263.github.io"
   }
 }

domains/blog.samihatasnim.json

@@ -1,13 +0,0 @@
-{
-  "description": "Samiha Tasnim's blog.",
-  "repo": "https://github.com/samihaTasnim/website",
-  "owner": {
-    "username": "samihaTasnim",
-    "discord": "sam.#7750",
-    "email": "samxtasnim@gmail.com",
-    "twitter": "@SamihaTasnimm"
-  },
-  "record": {
-    "CNAME": "hashnode.network"
-  }
-}

domains/boris1993.json

@@ -0,0 +1,10 @@
+{
+  "owner": {
+    "username": "boris1993",
+    "email": "boris1993@live.cn"
+  },
+  "description": "boris1993.is-a.dev",
+  "record": {
+    "CNAME": "boris1993.github.io"
+  }
+}

domains/canaris.json

@@ -0,0 +1,11 @@
+{
+  "description": "My Personal Website.",
+  "repo": "https://github.com/DET171/det171.github.io",
+  "owner": {
+    "username": "Canaris",
+    "email": "mrgeek484@gmail.com"
+  },
+  "record": {
+    "CNAME": "canaris.pages.dev"
+  }
+}

domains/cartar.json

@@ -7,6 +7,6 @@
     "twitter": "cartar0058"
   },
   "record": {
-    "A": ["154.53.34.33"]
+    "A": ["192.9.179.64"]
   }
 }

domains/daanschenkel.json

@@ -0,0 +1,12 @@
+
+    {
+      "owner": {
+        "username": "daanschenkel",
+        "email": "daan@daanschenkel.nl"
+      },
+
+      "record": {
+        "URL": "https://daanschenkel.nl"
+      }
+    }
+  

domains/dannydandan.json

@@ -5,7 +5,7 @@
         "email": "daan@daanschenkel.nl"
       },
       "record": {
-        "CNAME": "daanschenkel.nl"
+        "URL": "https://daanschenkel.nl"
       }
     }
-  
+  

domains/felixalguzman.json

@@ -0,0 +1,12 @@
+
+    {
+      "owner": {
+        "username": "felixalguzman",
+        "email": "code@felixalguzman.msk.do"
+      },
+
+      "record": {
+        "URL": "https://github.com/felixalguzman"
+      }
+    }
+  

domains/imlasiya.json

@@ -0,0 +1,12 @@
+{
+  "description": "My Personal Portfolio",
+  "repo": "https://github.com/ImLasiya/ImLasiya.github.io",
+  "owner": {
+    "username": "ImLasiya",
+    "email": "shsherlocksl@gmail.com",
+    "twitter": "ImLasiya"
+  },
+  "record": {
+    "CNAME": "imlasiya.github.io"
+  }
+}

domains/imlasiyah.json

@@ -0,0 +1,12 @@
+
+    {
+      "owner": {
+        "username": "ImLasiya",
+        "email": "senash@darktsysl.onmicrosoft.com"
+      },
+
+      "record": {
+        "CNAME": "imlasiya.github.io"
+      }
+    }
+  

domains/opaayush.json

@@ -1,5 +1,5 @@
 {
-    "description": "Aayu5h's Portfolio Website",
+    "description": "Aayu5h's Website",
     "repo": "https://github.com/OpAayush/opaayush.github.io",
     "owner": {
         "username": "OpAayush",
@@ -7,6 +7,6 @@
         "discord": "Aayu5h#1737"
     },
     "record": {
-        "CNAME": "opaayush.github.io"
+        "CNAME": "opaayush.pages.dev"
     }
 } 

domains/rya.json

@@ -0,0 +1,12 @@
+
+    {
+      "owner": {
+        "username": "Jecket22",
+        "email": "lez.vezzica@gmail.com"
+      },
+
+      "record": {
+        "URL": "https://jecket.xyz"
+      }
+    }
+  

domains/samihatasnim.json

@@ -8,6 +8,6 @@
     "twitter": "@SamihaTasnimm"
   },
   "record": {
-    "CNAME": "website-production-8e6d.up.railway.app"
+    "CNAME": "website-69g.pages.dev"
   }
 }

domains/scr.json

@@ -0,0 +1,11 @@
+{
+  "description": "Scriptyyy's site",
+  "owner": {
+    "username": "Scriptyyy",
+    "email": "mr.stikman209@gmail.com",
+    "discord": "Scriptyyy#2152"
+  },
+  "record": {
+    "A": ["75.2.69.226"]
+  }
+}

domains/taha2002.json

@@ -0,0 +1,12 @@
+
+    {
+      "owner": {
+        "username": "taha2002",
+        "email": "bouras1920@gmail.com"
+      },
+
+      "record": {
+        "CNAME": "taha2002.github.io"
+      }
+    }
+  

domains/techctg24.json

@@ -0,0 +1,12 @@
+
+    {
+      "owner": {
+        "username": "rakibctg",
+        "email": "eunus527@gmail.com"
+      },
+
+      "record": {
+        "URL": "https://techctg24.dev"
+      }
+    }
+  

domains/wiicreation.json

@@ -1,11 +1,11 @@
 {
   "description": "Wiicreation is a recreation of the Nintendo Wii made in ElectronJS.",
-  "repo": "https://github.com/C1200/WiicreationWebsite",
+  "repo": "https://github.com/C1200/blog",
   "owner": {
     "username": "C1200",
     "email": "coreyw.ultimatemedia@gmail.com"
   },
   "record": {
-    "CNAME": "C1200.github.io"
+    "URL": "https://c1200.js.org/blog/faqs/2022/07/29/wiicreation-faq.html"
   }
 }

tests/validations.test.js

@@ -58,6 +58,7 @@ describe('validateDomainData', () => {
     { ...defaultDomain, name: 'a.b' },
     { ...defaultDomain, name: 'ww2.baa' },
     { ...defaultDomain, name: 'help.baa' },
+    { ...defaultDomain, name: '_github-pages-challenge-is-a-dev' },
   ];
 
   const validCases = [
@@ -78,6 +79,9 @@ describe('validateDomainData', () => {
     { ...defaultDomain, record: { A: ['1.1.1.1'], MX: ['mx1.example.com'] } },
     { ...defaultDomain, name: 'gogo.foo.bar' },
     { ...defaultDomain, name: 'ww9.baa' },
+    { ...defaultDomain, name: '_github-pages-challenge-phenax.akshay' },
+    { ...defaultDomain, name: '_github-pages-challenge-hello01-ga' },
+    { ...defaultDomain, name: '_github-pages-challenge-hello01_ga' },
   ];
 
   it('should return false for invalid data', () => {

utils/invalid-domains.json

@@ -11,5 +11,6 @@
   "ww1",
   "ww2",
   "ww3",
-  "ww4"
+  "ww4",
+  "_github-pages-challenge-is-a-dev"
 ]

utils/validations.js

@@ -25,6 +25,8 @@ const validateMXRecord = type => and([
   R.propSatisfies(R.all(isValidDomain), type),
 ]);
 
+const checkRestrictedNames = R.complement(R.includes(R.__, INVALID_NAMES))
+
 const validateDomainData = validate({
   name: {
     reason: 'The name of the file is invalid. It must be lowercased, alphanumeric and each component must be more than 2 characters long',
@@ -33,10 +35,16 @@ const validateDomainData = validate({
       and([
         R.is(String),
         R.compose(
-          R.all(and([
-            R.compose(between(2, 100), R.length),
-            testRegex(/^[a-z0-9-]+$/g),
-            R.complement(R.includes(R.__, INVALID_NAMES)),
+          R.all(or([
+            and([
+              testRegex(/^_github-pages-challenge-[a-z0-9-_]+$/i), // Exception for github verification records
+              checkRestrictedNames,
+            ]),
+            and([
+              R.compose(between(2, 100), R.length),
+              testRegex(/^[a-z0-9-]+$/g),
+              checkRestrictedNames,
+            ])
           ])),
           R.split('.'),
         ),