diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml deleted file mode 100644 index 4c68ceaa2..000000000 --- a/.github/workflows/bot.yml +++ /dev/null @@ -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); diff --git a/domains/@.json b/domains/@.json index 6fdb9372b..56f1851e8 100644 --- a/domains/@.json +++ b/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" } } diff --git a/domains/a-j.json b/domains/a-j.json new file mode 100644 index 000000000..17469e2f2 --- /dev/null +++ b/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" + } +} diff --git a/domains/abdo.json b/domains/abdo.json new file mode 100644 index 000000000..6adc0831c --- /dev/null +++ b/domains/abdo.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "xAbdoAT", + "email": "ABDO199877@gmail.com" + }, + "record": { + "A": ["217.174.245.249", "51.161.54.161"], + "MX": ["hosts.is-a.dev"], + "TXT": "v=spf1 a mx ip4:217.174.245.249 ~all" + } +} diff --git a/domains/aivietnamllm.json b/domains/aivietnamllm.json new file mode 100644 index 000000000..100cd8b28 --- /dev/null +++ b/domains/aivietnamllm.json @@ -0,0 +1,14 @@ +{ + "owner": { + "username": "BachNgoH", + "email": "nlmbao2015@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" + } +} \ No newline at end of file diff --git a/domains/akshay.json b/domains/akshay.json new file mode 100644 index 000000000..03969670a --- /dev/null +++ b/domains/akshay.json @@ -0,0 +1,11 @@ +{ + "description": "Akshay's portfolio website and blog", + "repo": "https://github.com/phenax/ediblemonad.dev", + "owner": { + "username": "phenax", + "email": "phenax5@gmail.com" + }, + "record": { + "URL": "https://ediblemonad.dev" + } +} diff --git a/domains/alijafari.json b/domains/alijafari.json new file mode 100644 index 000000000..e638a8338 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/domains/anubhav.json b/domains/anubhav.json new file mode 100644 index 000000000..db76a0aed --- /dev/null +++ b/domains/anubhav.json @@ -0,0 +1,14 @@ +{ + "owner": { + "username": "Anubhav-Pathak", + "email": "anubhavpathak99@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" + } +} \ No newline at end of file diff --git a/domains/balduzz.json b/domains/balduzz.json new file mode 100644 index 000000000..df74a7998 --- /dev/null +++ b/domains/balduzz.json @@ -0,0 +1,14 @@ +{ + "owner": { + "username": "Bbalduzz", + "email": "edoardoba2004@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" + } +} \ No newline at end of file diff --git a/domains/dinuhifi.json b/domains/dinuhifi.json new file mode 100644 index 000000000..3ad0f1f57 --- /dev/null +++ b/domains/dinuhifi.json @@ -0,0 +1,14 @@ +{ + "owner": { + "username": "dinuhifi", + "email": "dinesh23110077@snuchennai.edu.in" + }, + "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" + } +} \ No newline at end of file diff --git a/domains/hackpig520.json b/domains/hackpig520.json new file mode 100644 index 000000000..8f3286541 --- /dev/null +++ b/domains/hackpig520.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "xiaozhu2007", + "email": "lz19986912007@163.com" + }, + "record": { + "CNAME": "hashnode.network" + } +} diff --git a/domains/nik.json b/domains/nik.json index 36ee7b613..fae6c2cf1 100644 --- a/domains/nik.json +++ b/domains/nik.json @@ -1,6 +1,6 @@ { "owner": { - "username": "Nikhil", + "username": "nikxso", "email": "nikhilsoniya123@gmail.com", "discord": "nikxso#0000" }, diff --git a/domains/notify-api.json b/domains/notify-api.json deleted file mode 100644 index ef2dd2748..000000000 --- a/domains/notify-api.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "owner": { - "username": "is-a-dev", - "email": "phenax5@gmail.com" - }, - - "record": { - "CNAME": "dns.beadman-network.com" - } -} diff --git a/domains/saptarshi.json b/domains/saptarshi.json new file mode 100644 index 000000000..8bdad1157 --- /dev/null +++ b/domains/saptarshi.json @@ -0,0 +1,12 @@ +{ + "owner": { + "username": "saptarshihalder", + "email": "saptarshihalder69@gmail.com", + "discord": "747718545307336797" + }, + + "record": { + "CNAME": "saptarshihalder.github.io" + } + } + diff --git a/domains/siddhant.json b/domains/siddhant.json index 8f704162e..e4890fd6c 100644 --- a/domains/siddhant.json +++ b/domains/siddhant.json @@ -6,6 +6,6 @@ "email": "pandeysiddhant21@gmail.com" }, "record": { - "URL": "https://siddhantt.netlify.app" + "URL": "https://siddhantt.vercel.app/" } } diff --git a/domains/uptime.trung.json b/domains/uptime.trung.json index c372c8070..d2832a9c2 100644 --- a/domains/uptime.trung.json +++ b/domains/uptime.trung.json @@ -4,6 +4,6 @@ "email": "vuthanhtrungsuper@gmail.com" }, "record": { - "A": ["69.30.249.53"] + "CNAME": "manage.uptime.trung.is-a.dev" } } diff --git a/domains/wm.json b/domains/wm.json new file mode 100644 index 000000000..7c1c9f373 --- /dev/null +++ b/domains/wm.json @@ -0,0 +1,14 @@ +{ + "owner": { + "username": "cmdwm", + "email": "will@willm.xyz" + }, + "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" + } +} \ No newline at end of file diff --git a/domains/xabdoat.json b/domains/xabdoat.json new file mode 100644 index 000000000..6f37ab9c2 --- /dev/null +++ b/domains/xabdoat.json @@ -0,0 +1,12 @@ +{ + "owner": { + "username": "xAbdoAT", + "email": "ABDO199877@gmail.com", + "discord": "943662778433032242" + }, + + "record": { + "CNAME": "xabdoat.github.io" + } + } + diff --git a/domains/zeazolf.json b/domains/zeazolf.json new file mode 100644 index 000000000..2397e8492 --- /dev/null +++ b/domains/zeazolf.json @@ -0,0 +1,14 @@ +{ + "owner": { + "username": "ZeaZolf", + "email": "ZeaZolfPc@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" + } +} \ No newline at end of file diff --git a/utils/domain-service.js b/utils/domain-service.js index f5385cc2a..fe75aef04 100644 --- a/utils/domain-service.js +++ b/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], ])),