Merge branch 'master' into master

README.md

@@ -64,6 +64,12 @@ The ```--rm``` flag is optional.  It removes the container filesystem after runn
 
 One caveat is the text file that is created will only exist in the container so you will not be able to get at that.
 
+
+Or you can simply use docker to run `sherlock`:
+```
+docker run theyahya/sherlock user123
+```
+
 ## License
 MIT License
 

data.json

@@ -167,8 +167,7 @@
   "DailyMotion": {
     "url": "https://www.dailymotion.com/{}",
     "urlMain": "https://www.dailymotion.com/",
-    "errorType": "message",
-    "errorMsg": "Page not found"
+    "errorType": "status_code"
   },
   "Etsy": {
     "url": "https://www.etsy.com/shop/{}",
@@ -632,5 +631,11 @@
     "url": "https://plug.dj/@/{}",
     "urlMain": "https://plug.dj/",
     "errorType": "status_code"
+  },
+  "Wikipedia": {
+    "url": "https://www.wikipedia.org/wiki/User:{}",
+    "urlMain": "https://www.wikipedia.org/",
+    "errorType": "message",
+    "errorMsg": "If a page was recently created here, it may not be visible yet because of a delay in updating the database"
   }
 }

sherlock.py

@@ -21,7 +21,7 @@ from requests_futures.sessions import FuturesSession
 from torrequest import TorRequest
 
 module_name = "Sherlock: Find Usernames Across Social Networks"
-__version__ = "0.1.0"
+__version__ = "0.1.3"
 amount=0
 
 # TODO: fix tumblr
@@ -80,7 +80,7 @@ def sherlock(username, verbose=False, tor=False, unique_tor=False):
                        there was an HTTP error when checking for existence.
     """
     global amount
-    fname = username + ".txt"
+    fname = username.lower() + ".txt"
 
     if os.path.isfile(fname):
         os.remove(fname)
@@ -206,8 +206,8 @@ def sherlock(username, verbose=False, tor=False, unique_tor=False):
                 exists = "no"
 
         elif error_type == "status_code":
-            # Checks if the status code of the response is 404
-            if not r.status_code == 404:
+            # Checks if the status code of the response is 2XX
+            if not r.status_code >= 300 or r.status_code < 200:
 
                 print("\033[37;1m[\033[92;1m+\033[37;1m]\033[92;1m {}:\033[0m".format(social_network), url)
                 write_to_file(url, fname)

sites.md

@@ -1,4 +1,4 @@
-## List Of Supported Sites (112 Sites In Total!)
+## List Of Supported Sites (113 Sites In Total!)
 1. [Instagram](https://www.instagram.com/)
 2. [Twitter](https://www.twitter.com/)
 3. [Facebook](https://www.facebook.com/)
@@ -111,3 +111,4 @@
 110. [GitLab](https://gitlab.com/)
 111. [NameMC (Minecraft.net skins)](https://namemc.com/)
 112. [Plug.DJ](https://plug.dj/)
+113. [Wikipedia](https://www.wikipedia.org/)