Merge remote-tracking branch 'upstream/master'

README.md

@@ -2,8 +2,8 @@
 > Find usernames across [social networks](https://github.com/theyahya/sherlock/blob/master/sites.md)
 
 <p align="center">
-<a href="https://asciinema.org/a/IMRMmbAxFGUgd2SJN0rkAfaPb">
-<img src="https://asciinema.org/a/IMRMmbAxFGUgd2SJN0rkAfaPb.svg">
+<a href="https://asciinema.org/a/223115">
+<img src="https://asciinema.org/a/223115.svg">
 </a>
 </p>
 

data.json

@@ -180,7 +180,8 @@
     "urlMain": "https://coroflot.com/"
   },
   "CreativeMarket": {
-    "errorType": "status_code",
+    "errorType": "response_url",
+    "errorUrl": "https://www.creativemarket.com/",
     "rank": 1790,
     "url": "https://creativemarket.com/{}",
     "urlMain": "https://creativemarket.com/"
@@ -232,10 +233,10 @@
     "urlMain": "https://dribbble.com/"
   },
   "EVE Online": {
-    "errorMsg": "No results found with your search...",
-    "errorType": "message",
+    "errorType": "response_url",
+    "errorUrl": "https://eveonline.com",
     "rank": 11655,
-    "url": "https://evewho.com/search/{}",
+    "url": "https://evewho.com/pilot/{}/",
     "urlMain": "https://eveonline.com"
   },
   "Ebay": {
@@ -259,7 +260,8 @@
     "urlMain": "https://www.etsy.com/"
   },
   "EyeEm": {
-    "errorType": "status_code",
+    "errorType": "response_url",
+    "errorUrl": "https://www.eyeem.com/",
     "rank": 33189,
     "url": "https://www.eyeem.com/u/{}",
     "urlMain": "https://www.eyeem.com/"

sherlock.py

@@ -24,7 +24,7 @@ from requests_futures.sessions import FuturesSession
 from torrequest import TorRequest
 
 module_name = "Sherlock: Find Usernames Across Social Networks"
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 amount = 0
 
 BANNER = r'''

site_list.py

@@ -7,6 +7,7 @@ import sys
 import requests
 from bs4 import BeautifulSoup as bs
 from datetime import datetime
+from collections import OrderedDict
 
 def get_rank(domain_to_query):
     result = -1
@@ -46,4 +47,3 @@ with open("data.json", "w") as data_file:
     data_file.write(sorted_json_data)
 
 print("\nFinished updating supported site listing!")
-

tests/all.py

@@ -111,7 +111,8 @@ class SherlockSiteCoverageTests(SherlockBaseTest):
 
         self.username_check(['noonewouldeverusethis7'],
                             ["Pinterest", "iMGSRC.RU", "Pastebin",
-                             "WordPress", "devRant", "ImageShack", "MeetMe"
+                             "WordPress", "devRant", "ImageShack", "MeetMe",
+                             "EyeEm", "CreativeMarket", "EVE Online"
                             ],
                             exist_check=False
                            )
@@ -134,7 +135,8 @@ class SherlockSiteCoverageTests(SherlockBaseTest):
 
         self.username_check(['blue'],
                             ["Pinterest", "iMGSRC.RU", "Pastebin",
-                             "WordPress", "devRant", "ImageShack", "MeetMe"
+                             "WordPress", "devRant", "ImageShack", "MeetMe",
+                             "EyeEm", "CreativeMarket", "EVE Online"
                             ],
                             exist_check=True
                            )