diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index fb44d4f..a70ad44 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -34,13 +34,12 @@ jobs: - name: Install Dependencies run: | python -m pip install --upgrade pip - pip install flake8 pytest + pip install ruff flake8 pytest if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - - name: Lint With flake8 + - name: Lint With Ruff run: | # stop the build if there are Python syntax errors or undefined names - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - + ruff check . --output-format=github --select=E9,F63,F7,F82 # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Sherlock Site Detect Tests diff --git a/README.md b/README.md index 2c3cb7d..2245188 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ $ python3 -m pip install -r requirements.txt ```console $ python3 sherlock --help usage: sherlock [-h] [--version] [--verbose] [--folderoutput FOLDEROUTPUT] - [--output OUTPUT] [--tor] [--unique-tor] [--csv] + [--output OUTPUT] [--tor] [--unique-tor] [--csv] [--xlsx] [--site SITE_NAME] [--proxy PROXY_URL] [--json JSON_FILE] [--timeout TIMEOUT] [--print-all] [--print-found] [--no-color] [--browse] [--local] [--nsfw] @@ -72,7 +72,7 @@ optional arguments: path. --csv Create Comma-Separated Values (CSV) File. --xlsx Create the standard file for the modern Microsoft Excel - spreadsheet (xslx). + spreadsheet (xlsx). --site SITE_NAME Limit analysis to just the listed sites. Add multiple options to specify more than one site. --proxy PROXY_URL, -p PROXY_URL @@ -191,9 +191,13 @@ If some sites are failing due to connection problems (site is down, in maintenan you can exclude them from tests by creating a `tests/.excluded_sites` file with a list of sites to ignore (one site name per line). -## Stargazers over time +## Star History -[![Stargazers over time](https://starchart.cc/sherlock-project/sherlock.svg)](https://starchart.cc/sherlock-project/sherlock) + + + + Sherlock Project Star History Chart + ## License diff --git a/removed_sites.md b/removed_sites.md index b1e5aa5..d870500 100644 --- a/removed_sites.md +++ b/removed_sites.md @@ -424,7 +424,7 @@ Good-bye [Google Plus](https://en.wikipedia.org/wiki/Google%2B)... ## InsaneJournal As of 2020-02-23, InsaneJournal returns false positive, when providing a username which contains a period. -Since we were not able to find the critera for a valid username, the best thing to do now is to remove it. +Since we were not able to find the criteria for a valid username, the best thing to do now is to remove it. ```json "InsaneJournal": { @@ -625,7 +625,7 @@ removed ## Coderwall As of 2020-07-06, Coderwall returns false positives when checking for an username which contains a period. -I have tried to find out what Coderwall's criteria is for a valid username, but unfortunetly I have not been able to +I have tried to find out what Coderwall's criteria is for a valid username, but unfortunately I have not been able to find it and because of this, the best thing we can do now is to remove it. ```json "Coderwall": { @@ -1827,7 +1827,7 @@ As of 2023.08.29, GunsAndAmmo responds with 404 from time to time ``` ## TikTok -As of 2023.12.21, TikTok returns false positives. This is because the webpage returns a somewhat blank page. This prevents us from being able to check for the existance of usernames. Proxitok does not work either. +As of 2023.12.21, TikTok returns false positives. This is because the webpage returns a somewhat blank page. This prevents us from being able to check for the existence of usernames. Proxitok does not work either. ```json "TikTok": { @@ -1851,7 +1851,7 @@ As of 2023.12.21, Lolchess returns false positives. ``` ## Virgool -As of 2023.12.21, Lolchess returns false positives. +As of 2023.12.21, Virgool returns false positives. ```json "Virgool": { "errorMsg": "\u06f4\u06f0\u06f4", @@ -1863,7 +1863,7 @@ As of 2023.12.21, Lolchess returns false positives. ``` ## Whonix Forum -As of 2023.12.21, Lolchess returns false positives. +As of 2023.12.21, Whonix Forum returns false positives. ```json "Whonix Forum": { "errorType": "status_code", @@ -1874,7 +1874,7 @@ As of 2023.12.21, Lolchess returns false positives. ``` ## Ebio -As of 2023.12.21, Lolchess returns false positives. +As of 2023.12.21, Ebio returns false positives. ```json "ebio.gg": { "errorType": "status_code", diff --git a/sherlock/__main__.py b/sherlock/__main__.py index 28d0a16..b10bd6a 100644 --- a/sherlock/__main__.py +++ b/sherlock/__main__.py @@ -15,7 +15,7 @@ if __name__ == "__main__": python_version = sys.version.split()[0] if sys.version_info < (3, 6): - print("Sherlock requires Python 3.6+\nYou are using Python %s, which is not supported by Sherlock" % (python_version)) + print(f"Sherlock requires Python 3.6+\nYou are using Python {python_version}, which is not supported by Sherlock.") sys.exit(1) import sherlock diff --git a/sherlock/resources/data.json b/sherlock/resources/data.json index d45b806..b7500f4 100644 --- a/sherlock/resources/data.json +++ b/sherlock/resources/data.json @@ -2652,13 +2652,6 @@ "urlMain": "https://wiki.vg/", "username_claimed": "Auri" }, - "wykop.pl": { - "errorType": "status_code", - "regexCheck": "[a-z0-9-_]{4,35}", - "url": "https://www.wykop.pl/ludzie/{}", - "urlMain": "https://wykop.pl", - "username_claimed": "janusz-nowak" - }, "xHamster": { "errorType": "status_code", "isNSFW": true, diff --git a/sherlock/sherlock.py b/sherlock/sherlock.py index a8760f2..fb9f524 100644 --- a/sherlock/sherlock.py +++ b/sherlock/sherlock.py @@ -555,7 +555,7 @@ def main(): action="store_true", dest="xlsx", default=False, - help="Create the standard file for the modern Microsoft Excel spreadsheet (xslx).", + help="Create the standard file for the modern Microsoft Excel spreadsheet (xlsx).", ) parser.add_argument( "--site", diff --git a/sherlock/tests/all.py b/sherlock/tests/all.py index 7943fab..926946f 100644 --- a/sherlock/tests/all.py +++ b/sherlock/tests/all.py @@ -52,7 +52,7 @@ class SherlockDetectTests(SherlockBaseTest): self.assertEqual("message", site_data["errorType"]) # Generate a valid username based on the regex for a username that the - # site supports that is *most likely* not taken. The regex is slighlty + # site supports that is *most likely* not taken. The regex is slightly # modified version of site_data["regexCheck"] as we want a username # that has the maximum length that is supported by the site. This way, # we wont generate a random username that might actually exist. This @@ -109,7 +109,7 @@ class SherlockDetectTests(SherlockBaseTest): self.assertEqual("status_code", site_data["errorType"]) # Generate a valid username based on the regex for a username that the - # site supports that is *most likely* not taken. The regex is slighlty + # site supports that is *most likely* not taken. The regex is slightly # modified version of site_data["regexCheck"] as we want a username # that has the maximum length that is supported by the site. This way, # we wont generate a random username that might actually exist. This diff --git a/sites.md b/sites.md index 4d07404..1cb704c 100644 --- a/sites.md +++ b/sites.md @@ -1,4 +1,4 @@ -## List Of Supported Sites (396 Sites In Total!) +## List Of Supported Sites (395 Sites In Total!) 1. ![](https://www.google.com/s2/favicons?domain=https://2Dimensions.com/) [2Dimensions](https://2Dimensions.com/) 1. ![](https://www.google.com/s2/favicons?domain=http://forum.3dnews.ru/) [3dnews](http://forum.3dnews.ru/) 1. ![](https://www.google.com/s2/favicons?domain=https://www.7cups.com/) [7Cups](https://www.7cups.com/) @@ -392,6 +392,5 @@ 1. ![](https://www.google.com/s2/favicons?domain=https://www.toster.ru/) [toster](https://www.toster.ru/) 1. ![](https://www.google.com/s2/favicons?domain=https://uid.me/) [uid](https://uid.me/) 1. ![](https://www.google.com/s2/favicons?domain=https://wiki.vg/) [wiki.vg](https://wiki.vg/) -1. ![](https://www.google.com/s2/favicons?domain=https://wykop.pl) [wykop.pl](https://wykop.pl) 1. ![](https://www.google.com/s2/favicons?domain=https://xhamster.com) [xHamster](https://xhamster.com) **(NSFW)** 1. ![](https://www.google.com/s2/favicons?domain=https://znanylekarz.pl) [znanylekarz.pl](https://znanylekarz.pl)