Merge pull request #1 from sherlock-project/master

Update
sherlock-project · May 4, 2021 · 9db4857 · 9db4857
2 parents ecf7e4d + 253ffa8
commit 9db4857
Show file tree

Hide file tree

Showing 5 changed files with 451 additions and 366 deletions.
diff --git a/removed_sites.json b/removed_sites.json
@@ -486,6 +486,62 @@
     "urlMain": "https://www.filmo.gs/",
     "username_claimed": "cupparober",
     "username_unclaimed": "noonewouldeverusethis7"
-  }
+  },
+  "500px": {
+    "errorMsg": "No message available",
+    "errorType": "message",
+    "url": "https://500px.com/p/{}",
+    "urlMain": "https://500px.com/",
+    "urlProbe": "https://api.500px.com/graphql?operationName=ProfileRendererQuery&variables=%7B%22username%22%3A%22{}%22%7D&extensions=%7B%22persistedQuery%22%3A%7B%22version%22%3A1%2C%22sha256Hash%22%3A%224d02ff5c13927a3ac73b3eef306490508bc765956940c31051468cf30402a503%22%7D%7D",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "Badoo": {
+    "errorType": "status_code",
+    "url": "https://badoo.com/profile/{}",
+    "urlMain": "https://badoo.com/",
+    "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",
+    "url": "https://www.pling.com/u/{}/",
+    "urlMain": "https://www.pling.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis"
+  },
+  "Realmeye": {
+    "errorMsg": "Sorry, but we either:",
+    "errorType": "message",
+    "url": "https://www.realmeye.com/player/{}",
+    "urlMain": "https://www.realmeye.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "Travellerspoint": {
+    "errorMsg": "Wooops. Sorry!",
+    "errorType": "message",
+    "url": "https://www.travellerspoint.com/users/{}",
+    "urlMain": "https://www.travellerspoint.com",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "Ebay": {
+    "errorMsg": "<title>eBay Profile - error</title>",
+    "errorType": "message",
+    "url": "https://www.ebay.com/usr/{}",
+    "urlMain": "https://www.ebay.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
 }
 
diff --git a/removed_sites.md b/removed_sites.md
@@ -974,3 +974,98 @@ Filmogs has closed down.
     "username_unclaimed": "noonewouldeverusethis7"
   },
 ```
+
+## 500px
+As of 2021-01-13, 500px returns false positives. This will hopefully be fixed soon once we add the ability to add different
+request methods.
+
+```
+  "500px": {
+    "errorMsg": "No message available",
+    "errorType": "message",
+    "url": "https://500px.com/p/{}",
+    "urlMain": "https://500px.com/",
+    "urlProbe": "https://api.500px.com/graphql?operationName=ProfileRendererQuery&variables=%7B%22username%22%3A%22{}%22%7D&extensions=%7B%22persistedQuery%22%3A%7B%22version%22%3A1%2C%22sha256Hash%22%3A%224d02ff5c13927a3ac73b3eef306490508bc765956940c31051468cf30402a503%22%7D%7D",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+```
+
+## Badoo
+As of 2021-01-13, Badoo returns false positives
+```
+  "Badoo": {
+    "errorType": "status_code",
+    "url": "https://badoo.com/profile/{}",
+    "urlMain": "https://badoo.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+```
+
+## 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.
+```
+  "Pling": {
+    "errorMsg": "Resource not found",
+    "errorType": "message",
+    "url": "https://www.pling.com/u/{}/",
+    "urlMain": "https://www.pling.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis"
+  },
+```
+
+## Realmeye
+As of 2021-01-13, Realmeye returns false positives.
+```
+  "Realmeye": {
+    "errorMsg": "Sorry, but we either:",
+    "errorType": "message",
+    "url": "https://www.realmeye.com/player/{}",
+    "urlMain": "https://www.realmeye.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+```
+
+## Travellerspoint
+As of 2021-01-13, Travellerspoint returns false positives
+```
+  "Travellerspoint": {
+    "errorMsg": "Wooops. Sorry!",
+    "errorType": "message",
+    "url": "https://www.travellerspoint.com/users/{}",
+    "urlMain": "https://www.travellerspoint.com",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+```
+
+## Ebay
+
+As of 2021-01-15, Ebay seems to be very laggy and take too long to return a response.
+```
+  "Ebay": {
+    "errorMsg": "<title>eBay Profile - error</title>",
+    "errorType": "message",
+    "url": "https://www.ebay.com/usr/{}",
+    "urlMain": "https://www.ebay.com/",
+    "username_claimed": "blue",
+    "username_unclaimed": "noonewouldeverusethis7"
+  },
+```
diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json
@@ -14,15 +14,6 @@
     "username_claimed": "red",
     "username_unclaimed": "noonewouldeverusethis7"
   },
-  "500px": {
-    "errorMsg": "No message available",
-    "errorType": "message",
-    "url": "https://500px.com/p/{}",
-    "urlMain": "https://500px.com/",
-    "urlProbe": "https://api.500px.com/graphql?operationName=ProfileRendererQuery&variables=%7B%22username%22%3A%22{}%22%7D&extensions=%7B%22persistedQuery%22%3A%7B%22version%22%3A1%2C%22sha256Hash%22%3A%224d02ff5c13927a3ac73b3eef306490508bc765956940c31051468cf30402a503%22%7D%7D",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
   "7Cups": {
     "errorType": "status_code",
     "url": "https://www.7cups.com/@{}",
@@ -153,13 +144,6 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
-  "Badoo": {
-    "errorType": "status_code",
-    "url": "https://badoo.com/profile/{}",
-    "urlMain": "https://badoo.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
   "Bandcamp": {
     "errorType": "status_code",
     "url": "https://www.bandcamp.com/{}",
@@ -483,14 +467,6 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
-  "Ebay": {
-    "errorMsg": "<title>eBay Profile - error</title>",
-    "errorType": "message",
-    "url": "https://www.ebay.com/usr/{}",
-    "urlMain": "https://www.ebay.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
   "Ello": {
     "errorMsg": "We couldn't find the page you're looking for",
     "errorType": "message",
@@ -814,14 +790,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"
-  },
   "Instructables": {
     "errorType": "status_code",
     "url": "https://www.instructables.com/member/{}",
@@ -1194,14 +1162,6 @@
     "username_claimed": "Facebook",
     "username_unclaimed": "noonewouldeverusethis7"
   },
-  "Pling": {
-    "errorMsg": "Resource not found",
-    "errorType": "message",
-    "url": "https://www.pling.com/u/{}/",
-    "urlMain": "https://www.pling.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis"
-  },
   "Plug.DJ": {
     "errorType": "status_code",
     "url": "https://plug.dj/@/{}",
@@ -1290,14 +1250,6 @@
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   },
-  "Realmeye": {
-    "errorMsg": "Sorry, but we either:",
-    "errorType": "message",
-    "url": "https://www.realmeye.com/player/{}",
-    "urlMain": "https://www.realmeye.com/",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
   "Redbubble": {
     "errorType": "status_code",
     "url": "https://www.redbubble.com/people/{}",
@@ -1613,14 +1565,6 @@
     "username_claimed": "blue",
     "username_unclaimed": "never-never-ever"
   },
-  "Travellerspoint": {
-    "errorMsg": "Wooops. Sorry!",
-    "errorType": "message",
-    "url": "https://www.travellerspoint.com/users/{}",
-    "urlMain": "https://www.travellerspoint.com",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis7"
-  },
   "Trello": {
     "errorMsg": "model not found",
     "errorType": "message",

diff --git a/site_list.py b/site_list.py
@@ -18,11 +18,8 @@
         url_main = data.get(social_network).get("urlMain")
         pool.append((social_network, url_main))
 
-    index = 1
     for social_network, url_main in pool:
-        site_file.write(f'{index}. [{social_network}]({url_main})\n')
-        index = index + 1
-
+        site_file.write(f'1. [{social_network}]({url_main})\n')
 
 sorted_json_data = json.dumps(data, indent=2, sort_keys=True)