diff --git a/.github/workflows/raw-api.yml b/.github/workflows/raw-api.yml index 6ef7b81a0..35680dc72 100644 --- a/.github/workflows/raw-api.yml +++ b/.github/workflows/raw-api.yml @@ -40,8 +40,7 @@ jobs: source-directory: "raw-api" destination-github-username: is-a-dev destination-repository-name: raw-api - user-email: 106927495+is-a-dev-bot@users.noreply.github.com - user-name: is-a-dev-bot - commit-message: "Update Data via is-a-dev/register" + user-email: actions@github.com + user-name: "GitHub Actions" env: API_TOKEN_GITHUB: ${{ secrets.BOT }} diff --git a/README.md b/README.md index 30991704c..0fe1cc629 100644 --- a/README.md +++ b/README.md @@ -57,4 +57,4 @@ If you like this project, please consider donating so we can keep this project r Liberapay ### Similar Services -If you want to find services similar to is-a.dev, take a look on [Free For Life](https://github.com/wdhdev/free-for-life#domains). +If you want to find services similar to is-a.dev, take a look at [Free For Life](https://github.com/wdhdev/free-for-life#domains). diff --git a/domains/_acme-challenge.katz.json b/domains/_acme-challenge.katz.json new file mode 100644 index 000000000..434720b24 --- /dev/null +++ b/domains/_acme-challenge.katz.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "Bananalolok", + "email": "", + "discord": "bananalol7678" + }, + + "record": { + "CNAME": "77c60266e3d311053d5b2fe1._acme.deno.dev" + } +} diff --git a/domains/_discord.mxritz.json b/domains/_discord.mxritz.json index 82aaf865c..4dacc65db 100644 --- a/domains/_discord.mxritz.json +++ b/domains/_discord.mxritz.json @@ -1,7 +1,7 @@ { "owner": { - "username": "Moritz-Deiaco", - "email": "moritz.deiaco@gmail.com" + "username": "mxritzdev", + "email": "contact@mxritz.dev" }, "record": { "TXT": "dh=01795372b646a8a36087b00130313eda00b40928" diff --git a/domains/_github-pages-challenge-Shaunfurtado.blog.shaunfurtado.json b/domains/_github-pages-challenge-Shaunfurtado.blog.shaunfurtado.json new file mode 100644 index 000000000..3ca28bde7 --- /dev/null +++ b/domains/_github-pages-challenge-Shaunfurtado.blog.shaunfurtado.json @@ -0,0 +1,10 @@ +{ + "description": "Verification for blog.shaunfurtado.is-a.dev in Github Pages", + "owner": { + "username": "Shaunfurtado", + "email": "shaunf1801@gmail.com" + }, + "record": { + "TXT": "08ce2f232e7028cbeb1a6baf8c8e49" + } +} diff --git a/domains/_github-pages-challenge-alvitodev.alvito.json b/domains/_github-pages-challenge-alvitodev.alvito.json new file mode 100644 index 000000000..a6be273d8 --- /dev/null +++ b/domains/_github-pages-challenge-alvitodev.alvito.json @@ -0,0 +1,9 @@ +{ + "owner": { + "username": "alvitodev", + "email": "alvitodev@protonmail.com" + }, + "record": { + "TXT": "c5a2eacc172cec9ec45a87d828b08c" + } +} diff --git a/domains/_vercel.cutedog5695.json b/domains/_vercel.cutedog5695.json new file mode 100644 index 000000000..0215aac17 --- /dev/null +++ b/domains/_vercel.cutedog5695.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "CuteDog5695", + "email": "", + "discord": "716306888492318790", + "twitter": "cutedog5695" + }, + "record": { + "TXT": "vc-domain-verify=vercel.cutedog5695.is-a.dev,92820276b2029f5426ec" + } +} diff --git a/domains/_vercel.uwu.json b/domains/_vercel.uwu.json new file mode 100644 index 000000000..bec23fd06 --- /dev/null +++ b/domains/_vercel.uwu.json @@ -0,0 +1,10 @@ +{ + "owner": { + "username": "orxngc", + "discord": "orangc", + "email": "orangc@proton.me" + }, + "record": { + "TXT": "vc-domain-verify=vercel.uwu.is-a.dev,61038f548f8542bd1397" + } +} diff --git a/domains/abdisa.json b/domains/abdisa.json new file mode 100644 index 000000000..162199d0b --- /dev/null +++ b/domains/abdisa.json @@ -0,0 +1,10 @@ +{ + "description": "I'm a dev.", + "owner": { + "username": "abdisadev", + "email": "abdisadev@gmail.com" + }, + "record": { + "CNAME": "abdisa.me" + } +} diff --git a/domains/alora.json b/domains/alora.json index d054df134..e3a51e208 100644 --- a/domains/alora.json +++ b/domains/alora.json @@ -5,6 +5,19 @@ "discord": "7q8x" }, "record": { - "CNAME": "aloramiaa.github.io" + "A": [ + "185.199.108.153", + "185.199.109.153", + "185.199.110.153", + "185.199.111.153" + ], + "MX": [ + "mx.zoho.in", + "mx2.zoho.in", + "mx3.zoho.in" + ], + "TXT": [ + "v=spf1 include:zohomail.in ~all" + ] } } diff --git a/domains/alvito.json b/domains/alvito.json new file mode 100644 index 000000000..94321c71b --- /dev/null +++ b/domains/alvito.json @@ -0,0 +1,11 @@ +{ + "description": "Personal portfolio website", + "repo": "https://github.com/alvitodev/alvitodev.github.io", + "owner": { + "username": "alvitodev", + "email": "alvitodev@protonmail.com" + }, + "record": { + "CNAME": "alvitodev.github.io" + } +} diff --git a/domains/arta.json b/domains/arta.json new file mode 100644 index 000000000..39071ff75 --- /dev/null +++ b/domains/arta.json @@ -0,0 +1,13 @@ +{ + "owner": { + "username": "artaabedi", + "email": "", + "discord": "884500561158869032", + "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.owS7EZmWkLuXCEo_m822uoeC1GcdDAf3u_WVZ96tBeYEh7desTGJ1ax7SgtFQLrPUKh1qGMtr34lEO6SULjAV4AsIdRlU_t1B56_sxHCicXkCN3Aat_k3pFmFDHO0zW-DgAcFSZa_3Re2fu0pGkYlbfQxyb7jfCILA_SFZIJ7AJVF2sbyCfcEDKQulQ01srevi2pU4YSOv232vfRNheibZzfARIYLd53ZvHlfzDI46gJuN9PQ2mTt19JZaXs6lCjdkuVxe8azGnJ497CKl8zbQBYD7fjR02mEt_Ct0ZaZ7bLJgPYxc2EQOHRPGPgrtHP-1kFePhh300x4mrzQyHBQA.gK_QpVLQfMfMi-yPrKkNsA.mi-s9kOqGkJRIdi8KgaSeEvIx1rzfLnfmdXalz0Rqm9Up8hwWAJ5WaTAgv786hUL1wgcwvV_5YA2XAWNiwNkV7uzB7DbziVEYd4PvkXnd0YbM6reJk9q_4s2uzVrJxj4.yESJ8TRpfXvmSoml8ktiiw" + }, + + "record": { + "CNAME": "artaabedi.github.io" + } + } + \ No newline at end of file diff --git a/domains/artaabedi.json b/domains/artaabedi.json new file mode 100644 index 000000000..6f53b671f --- /dev/null +++ b/domains/artaabedi.json @@ -0,0 +1,16 @@ +{ + "owner": { + "username": "artaabedi", + "email": "arta@mailfence.com", + "discord": "884500561158869032", + "twitter": "artaabedi" + }, + "record": { + "URL": "https://artaabedi.com", + "MX": [ + "mx1.improvmx.com", + "mx2.improvmx.com" + ], + "TXT": ["v=spf1 include:spf.improvemx.com ~all"] + } +} diff --git a/domains/blog.shaunfurtado.json b/domains/blog.shaunfurtado.json new file mode 100644 index 000000000..6f2790dcd --- /dev/null +++ b/domains/blog.shaunfurtado.json @@ -0,0 +1,12 @@ +{ + "description": "Blog Website for Shaun Furtado", + "repo": "https://github.com/Shaunfurtado/DevHavok", + "owner": { + "username": "Shaunfurtado", + "email": "shaunf1801@gmail.com" + }, + "record": { + "CNAME": "shaunfurtado.github.io" + } + } + diff --git a/domains/brocco.json b/domains/brocco.json new file mode 100644 index 000000000..9edf58e28 --- /dev/null +++ b/domains/brocco.json @@ -0,0 +1,13 @@ +{ + "owner": { + "username": "infibrocco", + "email": "", + "discord": "1170290534762422332", + "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.INVmem4kixZ__O962u4DG4GVeyIqkYZsKiQjD6jVScscMb1XqdOgp9IhGkyd93Q_Kuu0MpJgOh2imWnp9LN81Xixr0DRpADT1S9orBiDvO5Rkf_a8-OuoZlghwj3r9Q9WdCaGm4X7oGkNRUp-neXR4i7MTNfdp2uuKMw-TQ03dEBaQ0NI9U0CsyHBB39vhye68k9emmchAcsCW0e29S77UbjdNcoDkYgKGZctskLDc9AdezJVJAHExtu6sr7HoeSLjmKqpHAPLvxVaGLFB5BHaiRfLyUAGJSngncO5B7hU6TSIHM9FJ6MhyLgRin2TNsHJc4KiSEWY-5sdDQa0THlg.6IJ2lI116heB75n7x1bWMg.lWio4VpiE6RjmASqjeiBj6y7vO-hvZa6T60FRGUiFw4PH5yS83nqPo5pk3PQUAvujuK3oJPCXf33pJvk6TFKseuLHve4YpQTq-qGJBLWJAY._jvDpMlxmzwDjoRa28yYiQ" + }, + + "record": { + "CNAME": "infibrocco.pages.dev" + } + } + \ No newline at end of file diff --git a/domains/ciaobot.json b/domains/ciaobot.json index c4456c116..3ea0e921a 100644 --- a/domains/ciaobot.json +++ b/domains/ciaobot.json @@ -5,6 +5,11 @@ "discord": "687333016921440317" }, "record": { - "A": ["144.91.115.195"] + "A": ["144.91.115.195"], + "MX": [ + "mx1.improvmx.com", + "mx2.improvmx.com" + ], + "TXT": "v=spf1 include:spf.improvmx.com ~all" } } diff --git a/domains/drake.json b/domains/drake.json new file mode 100644 index 000000000..9b6fcf15b --- /dev/null +++ b/domains/drake.json @@ -0,0 +1,13 @@ +{ + "owner": { + "username": "drake-dot-o", + "email": "", + "discord": "197905102865039371", + "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.ODrtFxgSeAqIu6AI7SK6Sy6j7f0yg7jucjqWkjqwpJqkK_1AKsD8bck9idsla_3jjG2v_1TdSd7p23Tqodv7dz0jHDDL4OfNZB1XHW_uXGc8-qT6kKDcIOhdcktCf1lK54I4Sdg6RWgjj1ayYfXaoywhQZNGmLc54rRB_9b5JcXaRu75TB9Sp14vlqQ8Dotxo7aIutkzgqk7InvEHq8mA8tLH4a8RkAxv91tpxForl-Th2vjwexma8ySDg0TM_gf9y0Clsdu8X-hYR_upJX6V1bdiQxCLjzcD8xf3WXanoK_zF5YKwfchGX60LIOwjtzy8Ot2bQyIsrbVD3OFB6KEg.RPNQcCXjJymxMn5rHqeGYg.ru7RGuS07PxzcQm3fgdt1bR2L6PdF-aGcKq41dWFyHM3pRtZV2eiO3KUv8MwcrSleNe5TgBH0opHc-DRLLvNoOZLxxbt6nfZqJXmyjgQzrQ.kCHTV4x_MfBEVmAWChvmAA" + }, + + "record": { + "URL": "https://github.com/drake-dot-o" + } + } + \ No newline at end of file diff --git a/domains/katz.json b/domains/katz.json index a9b2826ab..9ea7902c3 100644 --- a/domains/katz.json +++ b/domains/katz.json @@ -6,7 +6,10 @@ }, "record": { "A": [ - "69.197.135.205" - ] + "34.120.54.55" + ], + "AAAA": [ + "2600:1901:0:6d85::" + ] } } diff --git a/domains/krishanu.json b/domains/krishanu.json index 1525211d2..ee1e0e74b 100644 --- a/domains/krishanu.json +++ b/domains/krishanu.json @@ -3,7 +3,7 @@ "username": "krishanunaskar", "email": "", "discord": "977802250716078210", - "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.if_8M4MPvJ1zUOftv83VP0p8hlljDGmF0MPd-Pyemmil8nGijJaX1skkmZj9RsAYclxPFGdIxYjGD6jfWkImt1thHvWIaT-IS-mmxkhY72atsNdbWrjp1J0vO2rLNQuYHkdp6u9ofH2SIONPDYkw3OqxjsLg9Nr-jsImnRobvRSDW587w3qbElICTA67YLQC7__aX9PEVF1eTq678TQJrVOiWs_ijSuphQhysYSVcesWYtP9ZOULdLRFIssKK3rlQCPFUPefnbNTraKtgvLaqddoYjq4UF_fxlsE6Hk2ncU9qZPjLzNwq9QsFWQRjDoRHDDcPRvX7b2UVZ6VboaFwA.GleB7BVrPuHvKy3Z8VOhxw.IdjOAICmK_13pglNBE-UVfjJpwdaROQM5uyiTm8TyKXRIEyzSCMJQrMnF3nIcrViY7jjP-4cZ8n1b9fiLqONQNJhMDO4mD9lNv8B3OmejFc.oa7znqcIkN2cx0lK25irVw" + "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.qGTBpEFfITIu63a63XbYmqGoJDIOlEN4ISz3uij_lTD_OvLRriPZqb86NtySYA_f0g1DyQ77BzrWfcKYaB_Z7qoZkZA6mdaLR6631PlsG-Sgmaxe8TuBO2nCGtR8aqKHZy1v7_zTxp2il4D9tnOBkVQZD292aZvzHRp1rQuXWD0938IP7sHJ7iWc8ZWCslMZ1JZr2ovn6dlrJRSZwKDz9EXxhml_Vh1uMCSX4j6SVlY4Igar7uynfnQXFdfTXtNL6PmFLZzbmrT-2v1IWX37sIxdImOlu2luXFJqWyUyU3l2EdxEcrsGVxjYkVi6BYwEwuMvk1bzBdSWUSuDtbsTXg.wvk0XAFUlCXQaRY3zBwCJw.MpTbqLhGorHkqyksytW5i_3xlG4siQOw70f1hCsOuwYArFbD0T0R1Cgw_Ms-ym8yf4ksFXR6HlmS5tf3ZfnRuUu60LTBKbDC0wKY8dWsUig.g_ceL7m8Sdnyp4PCmweWgQ" }, "record": { diff --git a/domains/krishanuop.json b/domains/krishanuop.json new file mode 100644 index 000000000..b21a7f6c5 --- /dev/null +++ b/domains/krishanuop.json @@ -0,0 +1,13 @@ +{ + "owner": { + "username": "krishanunaskar", + "email": "", + "discord": "977802250716078210", + "OWL": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJraWQiOiJaa1VsRmRqVThiUEstLXVVM2JJR09PVHFYYVFFS1ZINFVXOW53MTR6WTJnIn0.OszIokiYPY7t3Ds6Ht-imaGPObxAklMvCUMae8XWaQ7viZjgRMMtjX9YfSXws6xbHJFckk1Y40MhMYPCHVi0WUHywQeqZsW-6aSTatDKKSn-2Wd2a3VxtZQabmGAtsNDdp9MFZnOTgs-XAKABpTDdsg4l0akeb-X1XkflwVdS018GsnkIzCxhsLG_SssCnyx3de7ZvGvGHmUzPxMeU6s4SgBvV-fZ1V7dFgyutDZzT01uF29-oIm8Xtaq-JVfJAVgnUpPZNapJFD9c_RItCQ80ukB3-r3D81bj-rTpydIipcRZdnz9WxhFgijxjCyoegO-LsEF5bx0-Jhtq0Y92Cvg.e513GaD0mKvES-jC1IjD2w.Rs3pmM_TESrJJIneD2cMrpon252r1EHu43bKC0628WlYzvt9QKMpR28oLfMcEtNoh2ND90ua77XzKXMJ_oClI_MKCZ0-_L-mLV4O5y-qhAg.oCo-xWtH8UfH_DmSlBghqg" + }, + + "record": { + "CNAME": "krishanu.odoo.com" + } + } + \ No newline at end of file diff --git a/domains/mxritz.json b/domains/mxritz.json index c36cab614..26a02cac2 100644 --- a/domains/mxritz.json +++ b/domains/mxritz.json @@ -1,8 +1,8 @@ { "description": "Personal Portfolio", "owner": { - "username": "Moritz-Deiaco", - "email": "moritz.deiaco@gmail.com" + "username": "mxritzdev", + "email": "contact@mxritz.dev" }, "record": { "CNAME": "proxy.host.bytes.wtf" diff --git a/domains/mystie.json b/domains/mystie.json index 8fc1c4ef7..88db868f1 100644 --- a/domains/mystie.json +++ b/domains/mystie.json @@ -1,9 +1,9 @@ { "owner": { - "username": "MystieHum", + "username": "mystieneko", "email": "z232566755z@gmail.com" }, "record": { - "A": ["65.19.141.67"] + "A": ["64.62.151.106"] } } diff --git a/domains/pashigin.json b/domains/pashigin.json new file mode 100644 index 000000000..213201524 --- /dev/null +++ b/domains/pashigin.json @@ -0,0 +1,12 @@ +{ + "description": "Subdomain for personal use to present myself", + "repo": "https://github.com/Pashigin/register", + "owner": { + "username": "pashigin", + "email": "", + "telegram": "@pashigin" + }, + "record": { + "A": ["75.2.60.5"] + } +} diff --git a/domains/pepe.ravener.json b/domains/pepe.ravener.json new file mode 100644 index 000000000..829548d3a --- /dev/null +++ b/domains/pepe.ravener.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "ravener", + "email": "ravener.anime@gmail.com", + "twitter": "RavenRavener", + "discord": "292690616285134850" + }, + "record": { + "A": ["132.145.196.17"] + } +} diff --git a/domains/seui.json b/domains/seui.json index 820d0e403..b2c078312 100644 --- a/domains/seui.json +++ b/domains/seui.json @@ -7,7 +7,7 @@ }, "record": { - "A": ["158.179.173.122"] + "A": ["140.245.70.146"] } } - \ No newline at end of file + diff --git a/domains/uptimes.yug.json b/domains/uptimes.yug.json new file mode 100644 index 000000000..270e6d1aa --- /dev/null +++ b/domains/uptimes.yug.json @@ -0,0 +1,12 @@ +{ + "description": "Uptime website for my stuff, gonna use hetrixtools for now, might change to something else later", + "repo": "N/A", + "owner": { + "username": "YUG38", + "email": "4yugpatel123@gmail.com", + "discord": "name_yug" + }, + "record": { + "CNAME": "reports.hetrixtools.com" + } +} diff --git a/domains/vercel.cutedog5695.json b/domains/vercel.cutedog5695.json new file mode 100644 index 000000000..a71d11e68 --- /dev/null +++ b/domains/vercel.cutedog5695.json @@ -0,0 +1,11 @@ +{ + "owner": { + "username": "CuteDog5695", + "email": "", + "discord": "716306888492318790", + "twitter": "cutedog5695" + }, + "record": { + "CNAME": "cutedog5695test.vercel.app" + } +} diff --git a/domains/vercel.uwu.json b/domains/vercel.uwu.json new file mode 100644 index 000000000..304ea2a5c --- /dev/null +++ b/domains/vercel.uwu.json @@ -0,0 +1,10 @@ +{ + "owner": { + "username": "orxngc", + "discord": "orangc", + "email": "orangc@proton.me" + }, + "record": { + "CNAME": "orxngc-github-io.vercel.app" + } +} diff --git a/domains/yug.json b/domains/yug.json deleted file mode 100644 index c80015eaa..000000000 --- a/domains/yug.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "description": "My website", - "repo": "https://github.com/YUG38/YUG38.github.io", - "owner": { - "username": "YUG38", - "email": "4yugpatel123@gmail.com", - "discord": "name_yug" - }, - "record": { - "CNAME": "YUG38.github.io" - } -} diff --git a/domains/zmail._domainkey.alora.json b/domains/zmail._domainkey.alora.json new file mode 100644 index 000000000..1d8f5e252 --- /dev/null +++ b/domains/zmail._domainkey.alora.json @@ -0,0 +1,12 @@ +{ + "owner": { + "username": "aloramiaa", + "email": "alora@alora.is-a.dev", + "discord": "1236292707371057216" + }, + "record": { + "TXT": [ + "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpDj1YvQ59sHlGFLqD3vweqrGkr8cDp8CT5V+xBirlBb05D4V5YCvkIDgcDSu5O6yB28PXkzfWgvpGGPDIYQr1fW/zmoktXlwKE53cQv8aEfPmF8u9zucBLUqtFhb5WxBDfd4LSBaSbggLILD2/i8yP2TNQQO2F07IeVCoQFY12wIDAQAB" + ] + } +} diff --git a/tests/validations.test.js b/tests/validations.test.js index 6f71fb55f..af27b68bb 100644 --- a/tests/validations.test.js +++ b/tests/validations.test.js @@ -88,6 +88,7 @@ describe("validateDomainData", () => { { ...defaultDomain, name: "_gh-is-a-dev" }, { ...defaultDomain, name: "_domainkey" }, { ...defaultDomain, name: "_improvmx" }, + { ...defaultDomain, name: "_vercel" }, ]; const validCases = [ @@ -143,6 +144,7 @@ describe("validateDomainData", () => { { ...defaultDomain, name: "_domainkey.subdomain" }, { ...defaultDomain, name: "mx._domainkey.subdomain" }, { ...defaultDomain, name: '_improvmx.subdomain' }, + { ...defaultDomain, name: '_vercel.subdomain' }, { ...defaultDomain, name: "a.b" }, ]; diff --git a/utils/invalid-domains.json b/utils/invalid-domains.json index 1cba56e52..3e6cf64cb 100644 --- a/utils/invalid-domains.json +++ b/utils/invalid-domains.json @@ -8,6 +8,7 @@ "_github-pages-challenge-is-a-dev", "_gitlab-pages-verification-code", "_improvmx", + "_vercel", "con", "help", "no-reply", diff --git a/utils/validations.js b/utils/validations.js index 207981e73..eea099cd4 100644 --- a/utils/validations.js +++ b/utils/validations.js @@ -60,6 +60,7 @@ const extraSupportedNames = [ R.equals("_dmarc"), R.equals("_domainkey"), R.equals("_improvmx"), + R.equals("_vercel"), testRegex(/^_gh-[a-z0-9-_]+$/i), ];