Merge branch 'master' into patch-2

3 years ago · 5ade51aa7a
parent a28454ae2f 7348c19eca
commit 5ade51aa7a
7 changed files with 177 additions and 90 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+curly_bracket_next_line = false
+
+[*.{markdown,md}]
+trim_trailing_whitespace = false
+
+[*.py]
+indent_size = 4
--- a/removed_sites.json
+++ b/removed_sites.json
@ -503,14 +503,6 @@
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
  },
-  "Instagram": {
-    "errorMsg": "href=\"/static/bundles/metro/HttpErrorPage.js/",
-    "errorType": "message",
-    "url": "https://www.instagram.com/{}",
-    "urlMain": "https://www.instagram.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
  "Pling": {
    "errorMsg": "Resource not found",
    "errorType": "message",
@ -613,22 +605,6 @@
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
  },
-  "Twitter": {
-    "errorMsg": "This account doesn’t exist",
-    "errorType": "message",
-    "url": "https://twitter.com/{}",
-    "urlMain": "https://twitter.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
-  "allmylinks": {
-    "errorMsg": "Page not found",
-    "errorType": "message",
-    "url": "https://allmylinks.com/{}",
-    "urlMain": "https://allmylinks.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
  "House-Mixes.com": {
    "errorMsg": "Profile Not Found",
    "errorType": "message",
@ -653,6 +629,13 @@
    "urlMain": "https://www.sparkpeople.com",
    "username_claimed": "adam",
    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "Cloob": {
+    "errorType": "status_code",
+    "url": "https://www.cloob.com/name/{}",
+    "urlMain": "https://www.cloob.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
  }
 }

--- a/removed_sites.md
+++ b/removed_sites.md
@ -1003,20 +1003,6 @@ As of 2021-01-13, Badoo returns false positives
  },
 ```

-## Instagram
-As of 2021-01-13, Instagram returns false positives. This can be fixed by using their username checking API endpoint, but that requires a POST request which Sherlock currently does not support. 
-
-```
-  "Instagram": {
-    "errorMsg": "href=\"/static/bundles/metro/HttpErrorPage.js/",
-    "errorType": "message",
-    "url": "https://www.instagram.com/{}",
-    "urlMain": "https://www.instagram.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
-```
-
 ## Pling
 As of 2021-01-13, Pling returns false positives.
 ```
@ -1202,35 +1188,6 @@ into this as YouTube is must have site in Sherlock.
  }
 ```

-## Twitter
-
-As of 2021-06-27, Twitter returns false positives. A solid solution has not been found yet but Twitter is temporarly removed. We will find a solution ASAP.
-```
-  "Twitter": {
-    "errorMsg": "This account doesn’t exist",
-    "errorType": "message",
-    "url": "https://twitter.com/{}",
-    "urlMain": "https://twitter.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  }
-```
-
-## AllMyLinks
-
-As of 2021-06-27, AllMyLinks has added a chapta using Cloudflare and this prevents us from checking for usernames.
-
-```
-  "allmylinks": {
-    "errorMsg": "Page not found",
-    "errorType": "message",
-    "url": "https://allmylinks.com/{}",
-    "urlMain": "https://allmylinks.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  }
-```
-
 ### House Mixes

 As of 2021-09-04, House Mixes has issues connecting causing Sherlock to freeze.
@ -1271,3 +1228,15 @@ As of 2021-09-04, SparkPeople returns false positives.
    "username_unclaimed": "noonewouldeverusethis7"
  }
 ```
+
+### Cloob
+As of 2021-10-25, Cloob seems to be down and their site is not responding.
+```
+  "Cloob": {
+    "errorType": "status_code",
+    "url": "https://www.cloob.com/name/{}",
+    "urlMain": "https://www.cloob.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  }
+```
--- a/requirements.txt
+++ b/requirements.txt
@ -1,11 +1,7 @@
-beautifulsoup4>=4.8.0
-bs4>=0.0.1
 certifi>=2019.6.16
 colorama>=0.4.1
-lxml>=4.4.0
 PySocks>=1.7.0
 requests>=2.22.0
 requests-futures>=1.0.0
-soupsieve>=1.9.2
 stem>=1.8.0 
 torrequest>=0.1.0
--- a/sherlock/resources/data.json
+++ b/sherlock/resources/data.json
@ -50,6 +50,14 @@
    "username_claimed": "julian",
    "username_unclaimed": "noonewouldeverusethis"
  },
+  "AllMyLinks": {
+    "errorMsg": "Not Found",
+    "errorType": "message",
+    "url": "https://allmylinks.com/{}",
+    "urlMain": "https://allmylinks.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "Apple Discussions": {
    "errorMsg": "The page you tried was not found. You may have used an outdated link or may have typed the address (URL) incorrectly.",
    "errorType": "message",
@ -193,6 +201,13 @@
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+  "BongaCams": {
+    "errorType": "status_code",
+    "url": "https://pt.bongacams.com/profile/{}",
+    "urlMain": "https://pt.bongacams.com",
+    "username_claimed": "asuna-black",
+    "username_unclaimed": "noonewouldeverusethis77777"
+  },
  "Bookcrossing": {
    "errorType": "status_code",
    "url": "https://www.bookcrossing.com/mybookshelf/{}/",
@ -263,6 +278,13 @@
    "username_claimed": "david",
    "username_unclaimed": "noonewouldeverusethis"
  },
+  "ChaturBate": {
+    "errorType": "status_code",
+    "url": "https://chaturbate.com/{}",
+    "urlMain": "https://chaturbate.com",
+    "username_claimed": "cute18cute",
+    "username_unclaimed": "noonewouldeverusethis77777"
+  },
  "Chess": {
    "errorMsg": "usernameSuggestions",
    "errorType": "message",
@ -273,13 +295,6 @@
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
  },
-  "Cloob": {
-    "errorType": "status_code",
-    "url": "https://www.cloob.com/name/{}",
-    "urlMain": "https://www.cloob.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
  "CloudflareCommunity": {
    "errorType": "status_code",
    "url": "https://community.cloudflare.com/u/{}",
@ -501,6 +516,14 @@
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis77"
  },
+  "FanCentro": {
+    "errorMsg": "var environment",
+    "errorType": "message",
+    "url": "https://fancentro.com/{}",
+    "urlMain": "https://fancentro.com/",
+    "username_claimed": "nielsrosanna",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "Fandom": {
    "errorType": "status_code",
    "url": "https://www.fandom.com/u/{}",
@ -571,6 +594,13 @@
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis"
  },
+  "Gam1ng": {
+    "errorType": "status_code",
+    "url": "https://gam1ng.com.br/user/{}",
+    "urlMain": "https://gam1ng.com.br",
+    "username_claimed": "PinKgirl",
+    "username_unclaimed": "noonewouldeverusethis77777"
+  },
  "Gamespot": {
    "errorType": "status_code",
    "url": "https://www.gamespot.com/profile/{}/",
@ -754,6 +784,15 @@
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+  "Instagram": {
+    "errorMsg": "Nothing found!",
+    "errorType": "message",
+    "url": "https://www.instagram.com/{}",
+    "urlMain": "https://www.instagram.com/",
+    "urlProbe": "https://www.picuki.com/profile/{}",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "Instructables": {
    "errorType": "status_code",
    "url": "https://www.instructables.com/member/{}",
@ -1000,6 +1039,13 @@
    "username_claimed": "ok",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+  "OnlyFans": {
+    "errorType": "status_code",
+    "url": "https://onlyfans.com/{}",
+    "urlMain": "https://onlyfans.com/",
+    "username_claimed": "theemilylynne",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "OpenStreetMap": {
    "errorType": "status_code",
    "url": "https://www.openstreetmap.org/user/{}",
@ -1139,6 +1185,13 @@
    "username_claimed": "swiftstickler",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+  "Pornhub": {
+    "errorType": "status_code",
+    "url": "https://pornhub.com/users/{}",
+    "urlMain": "https://pornhub.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "ProductHunt": {
    "errorMsg": "We seem to have lost this page",
    "errorType": "message",
@ -1200,18 +1253,18 @@
  "Reddit": {
    "errorMsg": "Sorry, nobody on Reddit goes by that name.",
    "errorType": "message",
-    "headers" : {
+    "headers": {
      "accept-language": "en-US,en;q=0.9"
    },
    "url": "https://www.reddit.com/user/{}",
    "urlMain": "https://www.reddit.com/",
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
-},
-  "Repl.it": {
+  },
+  "Replit.com": {
    "errorType": "status_code",
-    "url": "https://repl.it/@{}",
-    "urlMain": "https://repl.it/",
+    "url": "https://replit.com/@{}",
+    "urlMain": "https://replit.com/",
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
  },
@ -1240,6 +1293,13 @@
    "username_claimed": "bluewolfekiller",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+  "RoyalCams": {
+    "errorType": "status_code",
+    "url": "https://royalcams.com/profile/{}",
+    "urlMain": "https://royalcams.com",
+    "username_claimed": "asuna-black",
+    "username_unclaimed": "noonewouldeverusethis77777"
+  },
  "RubyGems": {
    "errorType": "status_code",
    "regexCheck": "^[a-zA-Z][a-zA-Z0-9_-]{1,40}",
@ -1443,6 +1503,14 @@
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+  "Tenor": {
+    "errorType": "status_code",
+    "regexCheck": "^[A-Za-z0-9_]{2,32}$",
+    "url": "https://tenor.com/users/{}",
+    "urlMain": "https://tenor.com/",
+    "username_claimed": "red",
+    "username_unclaimed": "impossible-username"
+  },
  "TikTok": {
    "errorType": "status_code",
    "url": "https://tiktok.com/@{}",
@ -1517,6 +1585,15 @@
    "username_claimed": "jenny",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+  "Twitter": {
+    "errorMsg": "<title>Error | nitter</title>",
+    "errorType": "message",
+    "url": "https://twitter.com/{}",
+    "urlMain": "https://twitter.com/",
+    "urlProbe": "https://nitter.net/{}",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "Typeracer": {
    "errorMsg": "Profile Not Found",
    "errorType": "message",
@ -1692,6 +1769,13 @@
    "username_claimed": "red",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+  "Xvideos": {
+    "errorType": "status_code",
+    "url": "https://xvideos.com/profiles/{}",
+    "urlMain": "https://xvideos.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "YouNow": {
    "errorMsg": "No users found",
    "errorType": "message",
@ -1708,6 +1792,13 @@
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
  },
+  "YouPorn": {
+    "errorType": "status_code",
+    "url": "https://youporn.com/uservids/{}",
+    "urlMain": "https://youporn.com",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis77777"
+  },
  "Zhihu": {
    "errorType": "response_url",
    "errorUrl": "https://www.zhihu.com/people/{}",
@ -2154,12 +2245,29 @@
    "urlMain": "https://uid.me/",
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
-  }
-},
+  },
+  "xHamster": {
+    "errorType": "status_code",
+    "url": "https://xhamster.com/users/{}",
+    "urlMain": "https://xhamster.com",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis77777"
+  },
+  "zoomit": {
+    "errorMsg": "\u0645\u062a\u0627\u0633\u0641\u0627\u0646\u0647 \u0635\u0641\u062d\u0647 \u06cc\u0627\u0641\u062a \u0646\u0634\u062f",
+    "errorType": "message",
+    "url": "https://www.zoomit.ir/user/{}",
+    "urlMain": "https://www.zoomit.ir",
+    "username_claimed": "kossher",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
  "BioHacking": {
    "errorType": "status_code",
    "url": "https://forum.dangerousthings.com/u/{}",
    "urlMain": "https://forum.dangerousthings.com/",
    "username_claimed": "blue",
    "username_unclaimed": "noonewouldeverusethis7"
-  },
+  }
+
+
+
--- a/site_list.py
+++ b/site_list.py
@ -25,5 +25,6 @@ sorted_json_data = json.dumps(data, indent=2, sort_keys=True)

 with open("sherlock/resources/data.json", "w") as data_file:
    data_file.write(sorted_json_data)
+    data_file.write('\n')

 print("Finished updating supported site listing!")
--- a/sites.md
+++ b/sites.md
@ -1,4 +1,4 @@
-## List Of Supported Sites (284 Sites In Total!)
+## List Of Supported Sites (298 Sites In Total!)
 1. [2Dimensions](https://2Dimensions.com/)
 1. [3dnews](http://forum.3dnews.ru/)
 1. [7Cups](https://www.7cups.com/)
@ -6,6 +6,7 @@
 1. [About.me](https://about.me/)
 1. [Academia.edu](https://www.academia.edu/)
 1. [Alik.cz](https://www.alik.cz/)
+1. [AllMyLinks](https://allmylinks.com/)
 1. [Apple Discussions](https://discussions.apple.com)
 1. [Archive.org](https://archive.org)
 1. [Asciinema](https://asciinema.org)
@ -24,6 +25,7 @@
 1. [BitCoinForum](https://bitcoinforum.com)
 1. [Blogger](https://www.blogger.com/)
 1. [BodyBuilding](https://bodyspace.bodybuilding.com/)
+1. [BongaCams](https://pt.bongacams.com)
 1. [Bookcrossing](https://www.bookcrossing.com/)
 1. [BuyMeACoffee](https://www.buymeacoffee.com/)
 1. [BuzzFeed](https://buzzfeed.com/)
@ -33,8 +35,8 @@
 1. [Career.habr](https://career.habr.com/)
 1. [Championat](https://www.championat.com/)
 1. [Chatujme.cz](https://chatujme.cz/)
+1. [ChaturBate](https://chaturbate.com)
 1. [Chess](https://www.chess.com/)
-1. [Cloob](https://www.cloob.com/)
 1. [CloudflareCommunity](https://community.cloudflare.com/)
 1. [Clozemaster](https://www.clozemaster.com)
 1. [Codecademy](https://www.codecademy.com/)
@ -64,6 +66,7 @@
 1. [F3.cool](https://f3.cool/)
 1. [Facebook](https://www.facebook.com/)
 1. [Facenama](https://facenama.com/)
+1. [FanCentro](https://fancentro.com/)
 1. [Fandom](https://www.fandom.com/)
 1. [Flickr](https://www.flickr.com/)
 1. [Flightradar24](https://www.flightradar24.com/)
@ -73,6 +76,7 @@
 1. [Freelance.habr](https://freelance.habr.com/)
 1. [Freelancer](https://www.freelancer.com/)
 1. [Freesound](https://freesound.org/)
+1. [Gam1ng](https://gam1ng.com.br)
 1. [Gamespot](https://www.gamespot.com/)
 1. [GetMyUni](https://getmyuni.com/)
 1. [Giphy](https://giphy.com/)
@ -97,6 +101,7 @@
 1. [IFTTT](https://www.ifttt.com/)
 1. [ImgUp.cz](https://imgup.cz/)
 1. [Imgur](https://imgur.com/)
+1. [Instagram](https://www.instagram.com/)
 1. [Instructables](https://www.instructables.com/)
 1. [Issuu](https://issuu.com/)
 1. [Itch.io](https://itch.io/)
@ -129,6 +134,7 @@
 1. [Nightbot](https://nightbot.tv/)
 1. [NotABug.org](https://notabug.org/)
 1. [OK](https://ok.ru/)
+1. [OnlyFans](https://onlyfans.com/)
 1. [OpenStreetMap](https://www.openstreetmap.org/)
 1. [Opensource](https://opensource.com/)
 1. [Oracle Community](https://community.oracle.com)
@ -148,6 +154,7 @@
 1. [Pokemon Showdown](https://pokemonshowdown.com)
 1. [Polarsteps](https://polarsteps.com/)
 1. [Polygon](https://www.polygon.com/)
+1. [Pornhub](https://pornhub.com/)
 1. [ProductHunt](https://www.producthunt.com/)
 1. [PromoDJ](http://promodj.com/)
 1. [PyPi](https://pypi.org)
@ -157,10 +164,11 @@
 1. [Rate Your Music](https://rateyourmusic.com/)
 1. [Redbubble](https://www.redbubble.com/)
 1. [Reddit](https://www.reddit.com/)
-1. [Repl.it](https://repl.it/)
+1. [Replit.com](https://replit.com/)
 1. [ResearchGate](https://www.researchgate.net/)
 1. [ReverbNation](https://www.reverbnation.com/)
 1. [Roblox](https://www.roblox.com/)
+1. [RoyalCams](https://royalcams.com)
 1. [RubyGems](https://rubygems.org/)
 1. [Sbazar.cz](https://www.sbazar.cz/)
 1. [Scratch](https://scratch.mit.edu/)
@ -188,6 +196,7 @@
 1. [TETR.IO](https://tetr.io)
 1. [Telegram](https://t.me/)
 1. [Tellonym.me](https://tellonym.me/)
+1. [Tenor](https://tenor.com/)
 1. [TikTok](https://tiktok.com/)
 1. [Tinder](https://tinder.com/)
 1. [TrackmaniaLadder](http://en.tm-ladder.com/index.php)
@ -197,6 +206,7 @@
 1. [Trello](https://trello.com/)
 1. [TryHackMe](https://tryhackme.com/)
 1. [Twitch](https://www.twitch.tv/)
+1. [Twitter](https://twitter.com/)
 1. [Typeracer](https://typeracer.com)
 1. [Ultimate-Guitar](https://ultimate-guitar.com/)
 1. [Unsplash](https://unsplash.com/)
@ -220,8 +230,10 @@
 1. [WordPress](https://wordpress.com)
 1. [WordPressOrg](https://wordpress.org/)
 1. [Xbox Gamertag](https://xboxgamertag.com/)
+1. [Xvideos](https://xvideos.com/)
 1. [YouNow](https://www.younow.com/)
 1. [YouPic](https://youpic.com/)
+1. [YouPorn](https://youporn.com)
 1. [Zhihu](https://www.zhihu.com/)
 1. [akniga](https://akniga.org/profile/blue/)
 1. [aminoapp](https://aminoapps.com/)
@ -283,3 +295,5 @@
 1. [svidbook](https://www.svidbook.ru/)
 1. [toster](https://www.toster.ru/)
 1. [uid](https://uid.me/)
+1. [xHamster](https://xhamster.com)
+1. [zoomit](https://www.zoomit.ir)