merge upstream master, resolve conflicts in list.txt adding new URLS …

…and remove some duplicates

CHANGELOG.md

@@ -1,5 +1,26 @@
 ## Change Log
 
+### v4.0.5 (2021/03/17 11:13 +00:00)
+- [46931f2](https://github.com/FGRibreau/mailchecker/commit/46931f202261e30dd94aad3ad14595e399700c9a) Release v4.0.5.
+- [fd08f3a](https://github.com/FGRibreau/mailchecker/commit/fd08f3af055fbe6a7b68a661b430e04f84743c79) feat(build): update plateform files
+- [52187eb](https://github.com/FGRibreau/mailchecker/commit/52187ebed028b6216125f1b865bfe7a22540b920) fix: sort list.txt at each regeneration
+- [a674a45](https://github.com/FGRibreau/mailchecker/commit/a674a45bbc24922a911c75c7ac6d695d0f34b55e) feat(cargo): updated to 4.0.4
+- [1e00aaa](https://github.com/FGRibreau/mailchecker/commit/1e00aaa950ae6a1a4ddeb04cca45638683839ed8) feat(cargo): updated to 4.0.4
+- [29b3546](https://github.com/FGRibreau/mailchecker/commit/29b3546772b214527a20ccd26b47f6b03ffd4b9e) feat(python): updated to 4.0.4
+- [c39846f](https://github.com/FGRibreau/mailchecker/commit/c39846ffc09eb2f1fb1f5fa43cf5e78ea36195ce) feat(gemspec): updated to 4.0.4
+- [fa358a7](https://github.com/FGRibreau/mailchecker/commit/fa358a7b82518702995f990bfb832e02bc084ee3) docs(changelog): updated
+
+### v4.0.4 (2021/03/17 10:18 +00:00)
+- [1df4fe9](https://github.com/FGRibreau/mailchecker/commit/1df4fe9fd4ece4cbdf18f18d98751e765b0656d6) feat(build): update plateform files
+- [582bc42](https://github.com/FGRibreau/mailchecker/commit/582bc42ed95626dfd6b8dbb58d09d7157441a3c6) Release v4.0.4.
+- [0633609](https://github.com/FGRibreau/mailchecker/commit/063360971a019453c87c9ac9cb517b95b9fad166) fix: cargo (@FGRibreau)
+- [#299](https://github.com/FGRibreau/mailchecker/pull/299) Merge pull request #299 from jakemalachowski/patch-1 (@jakemalachowski)
+- [a313f24](https://github.com/FGRibreau/mailchecker/commit/a313f2459d2dcc71569d8d686a39d5d103aac02c) Add tempmail service digdig.org (@jakemalachowski)
+- [4c2fcd3](https://github.com/FGRibreau/mailchecker/commit/4c2fcd30aa77677f344a1acd7c67ec1038464c61) feat(cargo): updated to 4.0.3 (@FGRibreau)
+- [b6cfacd](https://github.com/FGRibreau/mailchecker/commit/b6cfacd9f5f7bc7dd3137cf95db1d4033d9fc2d6) feat(python): updated to 4.0.3 (@FGRibreau)
+- [00636f2](https://github.com/FGRibreau/mailchecker/commit/00636f2f26ee431d71e76c56d372ddc5f58900af) feat(gemspec): updated to 4.0.3 (@FGRibreau)
+- [cdd36bc](https://github.com/FGRibreau/mailchecker/commit/cdd36bc601086e55f09455f8c9d621b51a942848) docs(changelog): updated (@FGRibreau)
+
 ### v4.0.3 (2021/01/03 08:39 +00:00)
 - [fdab144](https://github.com/FGRibreau/mailchecker/commit/fdab144cedc49ad90c143218e6d274c3808dd084) Release v4.0.3. (@FGRibreau)
 - [#296](https://github.com/FGRibreau/mailchecker/pull/296) Merge pull request #296 from maranqz/golang-map-storing (@maranqz)
@@ -86,7 +107,7 @@
 - [eb0ec46](https://github.com/FGRibreau/mailchecker/commit/eb0ec4664f28b9c9a2b8364e3cf35fb48f517171) Release v3.3.14. (@FGRibreau)
 - [accc689](https://github.com/FGRibreau/mailchecker/commit/accc689ac4edb1010ebccb6c4b75721ca0d66477) fix (@FGRibreau)
 - [#283](https://github.com/FGRibreau/mailchecker/pull/283) Merge pull request #283 from jannicars/master (@jannicars)
-- [72f7a49](https://github.com/FGRibreau/mailchecker/commit/72f7a494a7661d914049d5258d5abc8077c8c4be) Adding gomaild to the domain list. (@jannicars)
+- [72f7a49](https://github.com/FGRibreau/mailchecker/commit/72f7a494a7661d914049d5258d5abc8077c8c4be) Adding gomaild to the domain list. (@Buffele)
 - [5dababb](https://github.com/FGRibreau/mailchecker/commit/5dababb20470bd9fac720766a0441649c26f8d1e) feat(cargo): updated to 3.3.13 (@FGRibreau)
 - [23b3722](https://github.com/FGRibreau/mailchecker/commit/23b3722cadfdcd469f23e803543c4400e42b8a72) feat(python): updated to 3.3.13 (@FGRibreau)
 - [a53e438](https://github.com/FGRibreau/mailchecker/commit/a53e4381c62228621d50d78215a0c2d6aad1dc63) feat(gemspec): updated to 3.3.13 (@FGRibreau)
@@ -934,7 +955,7 @@
 - [a803eda](https://github.com/FGRibreau/mailchecker/commit/a803edadc1309b0e36e7469ce87338956b8b1278) Release v3.0.23. (@FGRibreau)
 - [0614ef5](https://github.com/FGRibreau/mailchecker/commit/0614ef55a84486554847d5e9cc583636e52cf071) feat(build): update plateform files (@FGRibreau)
 - [#96](https://github.com/FGRibreau/mailchecker/pull/96) Merge pull request #96 from zeeshan83/patch-1 (@zeeshan83)
-- [02f6c89](https://github.com/FGRibreau/mailchecker/commit/02f6c89cdaee209c1f2e5040d7b2302bb66deded) Update list.json (@zeeshan83)
+- [02f6c89](https://github.com/FGRibreau/mailchecker/commit/02f6c89cdaee209c1f2e5040d7b2302bb66deded) Update list.json
 - [cf03cfb](https://github.com/FGRibreau/mailchecker/commit/cf03cfbdb708e85042ad9313eefba2e1df38ef38) feat(gemspec): updated to 3.0.22 (@FGRibreau)
 - [49f7f50](https://github.com/FGRibreau/mailchecker/commit/49f7f50d62e3a9cdb0a83a4c6bd947d8dd3a668c) feat(cargo): updated to 3.0.22 (@FGRibreau)
 - [66e98dc](https://github.com/FGRibreau/mailchecker/commit/66e98dcc534a94c494a1d38ad5e15c863625c44d) Update README.md (@FGRibreau)
@@ -1102,16 +1123,12 @@
 - [297eda9](https://github.com/FGRibreau/mailchecker/commit/297eda9b6b35e55aa8e5a6645643ca5e2c5a5e4e) Release v3.0.6. (@FGRibreau)
 - [855f15d](https://github.com/FGRibreau/mailchecker/commit/855f15d7e4b6a69fa2c3828e43f4c158073352fe) feat(build): update plateform files (@FGRibreau)
 - [6101e62](https://github.com/FGRibreau/mailchecker/commit/6101e626c032f7da86e1f1ed7317fa7295c38d41) feat(build): update plateform files (@FGRibreau)
-
-### v3.0.5 (2016/05/24 19:49 +00:00)
 - [d3083ac](https://github.com/FGRibreau/mailchecker/commit/d3083acb95daedecb5445c6d275e7da7c7249ac3) Release v3.0.5. (@FGRibreau)
 - [#67](https://github.com/FGRibreau/mailchecker/pull/67) Merge pull request #67 from dustywusty/master (@dustywusty)
 - [1bc6f24](https://github.com/FGRibreau/mailchecker/commit/1bc6f24ed1e760c08cc400bcc2f9a323b5a2c67b) +4 new sources (@dustywusty)
 - [0abda9d](https://github.com/FGRibreau/mailchecker/commit/0abda9df3bab0f9d2de0926318428f2286e6e7b6) Adding leeching.net, extremail.ru, kismail.ru, and divismail.ru from https://temp-mail.org/api/ + fixed my previous formatting to be more consistent (@dustywusty)
 - [20afe30](https://github.com/FGRibreau/mailchecker/commit/20afe30ebe144a7c9956f495ddb2f8c287c2408a) feat(gemspec): updated to 3.0.4 (@FGRibreau)
 - [d34b5f0](https://github.com/FGRibreau/mailchecker/commit/d34b5f0970587cbde5b7cec2fca04b0e05351f9b) docs(changelog) (@FGRibreau)
-
-### v3.0.4 (2016/04/25 14:17 +00:00)
 - [7a2b150](https://github.com/FGRibreau/mailchecker/commit/7a2b1506cd5ff90bc4a947291ad2feec4d3e7876) Release v3.0.4. (@FGRibreau)
 - [0c8c746](https://github.com/FGRibreau/mailchecker/commit/0c8c7461c5be314623a1060120e64770cb2d2c47) feat(list) (@FGRibreau)
 - [#66](https://github.com/FGRibreau/mailchecker/pull/66) Merge pull request #66 from trisix/add-mail72-domain (@trisix)

lib/clean.js

@@ -6,12 +6,13 @@ var psl = require('psl');
 
 var path = p.resolve(__dirname, '../list.txt');
 var rawList = fs.readFileSync(path)
-                .toString()
-                .trim()
-                .split("\n");
+  .toString()
+  .trim()
+  .split("\n")
+  .sort();
 
 var cleanedList = rawList.filter(function(domain){
-  var parsed = psl.parse(domain); 
+  var parsed = psl.parse(domain);
   return parsed.listed;
 });
 

list.txt

@@ -8577,6 +8577,7 @@ dietysuplementy.pl
 dieukydieuophonggiamso7.com
 diffamr.com
 diflucanrxmeds.com
+digdig.org
 digdown.xyz
 diggmail.club
 digibeat.pl

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mailchecker",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "Cross-language temporary (disposable/throwaway) email detection library. Covers hundreds fake email providers.",
   "main": "platform/node/index.js",
   "files": [
@@ -35,7 +35,7 @@
     "release-cross": "npm run changelog-git && npm run publish-gem && npm run publish-python && npm run publish-go && npm run publish-cargo",
     "publish-go": "version=$(echo $npm_package_version | cut -d '.' -f 1) && sed -E -i '' \"s#github.com/FGRibreau/mailchecker/(.*)#github.com/FGRibreau/mailchecker/v${version}#g\" go.mod",
     "publish-gem": "sed -E -i '' \"s/spec.version[[:space:]]*=(.*)/spec.version='${npm_package_version}'/g\" *.gemspec && (git add *.gemspec && git commit -m \"feat(gemspec): updated to ${npm_package_version}\" || true) && gem build *.gemspec && gem push ruby-mailchecker-${npm_package_version}.gem",
-    "publish-cargo": "cd platform/rust && sed -E -i '' \"s/version[[:space:]]*=(.*)/version = \\\"${npm_package_version}\\\"/g\" Cargo.toml && (git add Cargo.toml && git add Cargo.lock && git commit -m \"feat(cargo): updated to ${npm_package_version}\" && git push || true); sleep 3; pwd; (git add Cargo.lock && git commit -m 'chore: update Cargo.lock' && git push || true) && cargo package && cargo publish --allow-dirty",
+    "publish-cargo": "cd platform/rust && sed -E -i '' \"s/version[[:space:]]*=(.*)/version = \\\"${npm_package_version}\\\"/g\" Cargo.toml && (git add Cargo.toml && git add Cargo.lock && git commit -m \"feat(cargo): updated to ${npm_package_version}\" && git push || true); sleep 3; pwd; (git add Cargo.lock && git commit -m 'chore: update Cargo.lock' && git push || true) && cargo package --allow-dirty && cargo publish --allow-dirty",
     "publish-python": "cd platform/python && sed -E -i '' \"s/version[[:space:]]*=(.*)/version = \\\"${npm_package_version}\\\",/g\" setup.py && (git add setup.py && git commit -m \"feat(python): updated to ${npm_package_version}\" || true) && rm -rf dist/* && python3 setup.py sdist && twine upload dist/*"
   },
   "repository": {

platform/php/blacklist.php

@@ -2048,12 +2048,6 @@
     "9ziqmkpzz3aif.ml" => true,
     "9ziqmkpzz3aif.tk" => true,
     "9zjz7suyl.pl" => true,
-    "emailmiser.com" => true,
-    "putthisinyourspamdatabase.com" => true,
-    "sendspamhere.com" => true,
-    "spamherelots.com" => true,
-    "spamhereplease.com" => true,
-    "tempemail.net" => true,
     "a-b.co.za" => true,
     "a-bc.net" => true,
     "a-glittering-gem-is-not-enough.top" => true,
@@ -4158,8 +4152,8 @@
     "awatum.de" => true,
     "awca.eu" => true,
     "awdrt.com" => true,
-    "awdrt.org" => true,
     "awdrt.net" => true,
+    "awdrt.org" => true,
     "aweather.ru" => true,
     "aweightlossguide.com" => true,
     "awemail.com" => true,
@@ -8585,6 +8579,7 @@
     "dieukydieuophonggiamso7.com" => true,
     "diffamr.com" => true,
     "diflucanrxmeds.com" => true,
+    "digdig.org" => true,
     "digdown.xyz" => true,
     "diggmail.club" => true,
     "digibeat.pl" => true,
@@ -10087,7 +10082,9 @@
     "emailme.racing" => true,
     "emailme.win" => true,
     "emailmenow.info" => true,
+    "emailmiser.com" => true,
     "emailmobile.net" => true,
+    "emailmonkey.club" => true,
     "emailmynn.com" => true,
     "emailmysr.com" => true,
     "emailna.co" => true,
@@ -12288,8 +12285,8 @@
     "gd6ubc0xilchpozgpg.ml" => true,
     "gd6ubc0xilchpozgpg.tk" => true,
     "gdb.armageddon.org" => true,
-    "gdfretertwer.com" => true,
     "gdf.it" => true,
+    "gdfretertwer.com" => true,
     "gdmail.top" => true,
     "gdradr.com" => true,
     "gdsutzghr.pl" => true,
@@ -12514,7 +12511,6 @@
     "gghfjjgt.com" => true,
     "ggmail.com" => true,
     "ggmail.guru" => true,
-    "gmailnator.com" => true,
     "ggmob-us.fun" => true,
     "ggooglecn.com" => true,
     "ggrreds.com" => true,
@@ -12752,6 +12748,7 @@
     "gmaills.eu" => true,
     "gmailmail.ga" => true,
     "gmailmarina.com" => true,
+    "gmailnator.com" => true,
     "gmailner.com" => true,
     "gmailnew.com" => true,
     "gmailom.co" => true,
@@ -12902,6 +12899,7 @@
     "gomail.in" => true,
     "gomail.pgojual.com" => true,
     "gomailbox.info" => true,
+    "gomaild.com" => true,
     "gomaile.com" => true,
     "gomailstar.xyz" => true,
     "gomessage.ml" => true,
@@ -18011,6 +18009,7 @@
     "louboutinshoesstoresjp.com" => true,
     "louboutinshoesus.com" => true,
     "louder1.bid" => true,
+    "loufad.com" => true,
     "louis-vuitton-onlinestore.com" => true,
     "louis-vuitton-outlet.com" => true,
     "louis-vuitton-outletenter.com" => true,
@@ -18758,8 +18757,8 @@
     "mailboxheaven.info" => true,
     "mailboxint.info" => true,
     "mailboxlife.net" => true,
-    "mailboxonline.org" => true,
     "mailboxok.club" => true,
+    "mailboxonline.org" => true,
     "mailboxrental.org" => true,
     "mailboxxx.net" => true,
     "mailboxy.fun" => true,
@@ -20383,7 +20382,10 @@
     "mulberrybagsoutletonlineuk.com" => true,
     "mulberrymarts.com" => true,
     "mulberrysmall.co.uk" => true,
+    "mull.email" => true,
+    "mullemail.com" => true,
     "mullerd.gq" => true,
+    "mullmail.com" => true,
     "multi-car-insurance.net" => true,
     "multiplayerwiigames.com" => true,
     "multireha.pl" => true,
@@ -20789,9 +20791,6 @@
     "mziqo.com" => true,
     "mztiqdmrw.pl" => true,
     "mzwallacepurses.info" => true,
-    "mull.email" => true,
-    "mullemail.com" => true,
-    "mullmail.com" => true,
     "n-system.com" => true,
     "n.polosburberry.com" => true,
     "n.ra3.us" => true,
@@ -24112,6 +24111,7 @@
     "puttana.ml" => true,
     "puttana.tk" => true,
     "puttanamaiala.tk" => true,
+    "putthisinyourspamdatabase.com" => true,
     "putzmail.pw" => true,
     "puyenkgel50ccb.ml" => true,
     "pvcstreifen-vorhang.de" => true,
@@ -26282,6 +26282,7 @@
     "senderelasem.tk" => true,
     "sendfree.org" => true,
     "sendingspecialflyers.com" => true,
+    "sendspamhere.com" => true,
     "sendto.cf" => true,
     "senegal-nedv.ru" => true,
     "senfgad.com" => true,
@@ -27264,6 +27265,8 @@
     "spamgourmet.com" => true,
     "spamgourmet.net" => true,
     "spamgourmet.org" => true,
+    "spamherelots.com" => true,
+    "spamhereplease.com" => true,
     "spamhole.com" => true,
     "spamify.com" => true,
     "spaminator.de" => true,
@@ -28391,6 +28394,7 @@
     "tempemail.co.za" => true,
     "tempemail.com" => true,
     "tempemail.info" => true,
+    "tempemail.net" => true,
     "tempemail.org" => true,
     "tempemail.pro" => true,
     "tempemailaddress.com" => true,
@@ -33587,7 +33591,6 @@
     "zymail.men" => true,
     "zymuying.com" => true,
     "zynga-email.com" => true,
-    "zzrgg.com" => true,
     "zyseo.com" => true,
     "zyyu6mute9qn.cf" => true,
     "zyyu6mute9qn.ga" => true,
@@ -33596,12 +33599,10 @@
     "zyyu6mute9qn.tk" => true,
     "zz.beststudentloansx.org" => true,
     "zzi.us" => true,
+    "zzrgg.com" => true,
     "zzuwnakb.pl" => true,
     "zzv2bfja5.pl" => true,
     "zzz.com" => true,
     "zzzmail.pl" => true,
     "zzzzzzzzzzzzz.com" => true,
-    "emailmonkey.club" => true,
-    "loufad.com" => true,
-    "gomaild.com" => true,
 ];

platform/python/setup.py

@@ -4,7 +4,7 @@
 
 setup(
   name='mailchecker',
-  version = "4.0.3",
+  version = "4.0.5",
   py_modules=['MailChecker'],
   url='https://github.com/FGRibreau/mailchecker',
   license='MIT',

platform/rust/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "mailchecker"
-version = "4.0.3"
+version = "4.0.5"
 authors = ["François-Guillaume Ribreau <[email protected]>"]
 
 # A short blurb about the package. This is not rendered in any format when

ruby-mailchecker.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'ruby-mailchecker'
-  spec.version='4.0.3'
+  spec.version='4.0.5'
   spec.authors       = ['Francois-Guillaume Ribreau', 'Jacob Burenstam', 'Owen Stephens']
   spec.email         = ['[email protected]']