Skip to content

Commit 9eb100c

Browse files
authored
Merge branch 'master' into patch-1
2 parents 86387d0 + 73df548 commit 9eb100c

File tree

12 files changed

+258
-145
lines changed

12 files changed

+258
-145
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ body:
1919
- Other (indicate below)
2020
validations:
2121
required: true
22+
- type: input
23+
id: package-version
24+
attributes:
25+
label: Package version
26+
description: |
27+
Knowing the version of the package you are using can help us diagnose your issue more quickly.
28+
You can find the version by running `sherlock --version`.
29+
validations:
30+
required: true
2231
- type: textarea
2332
id: description
2433
attributes:

.github/workflows/regression.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
macos-latest,
5050
]
5151
python-version: [
52-
'3.8',
5352
'3.9',
5453
'3.10',
5554
'3.11',

docs/README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,21 @@
2222

2323
## Installation
2424

25+
> [!WARNING]
26+
> Packages for ParrotOS and Ubuntu 24.04, maintained by a third party, appear to be __broken__.
27+
> Users of these systems should defer to pipx/pip or Docker.
2528
26-
| | Command | Notes |
27-
| - | - | - |
28-
| PyPI | `pipx install sherlock-project` | `pip` may be used in place of `pipx` |
29-
| Docker | `docker pull sherlock/sherlock` | |
30-
| Debian family | `apt install sherlock` | Kali, Parrot, Debian Testing and Sid |
31-
| BlackArch | `pacman -S sherlock` | |
32-
| Homebrew | `brew install sherlock` | |
29+
| Method | Notes |
30+
| - | - |
31+
| `pipx install sherlock-project` | `pip` may be used in place of `pipx` |
32+
| `docker run -it --rm sherlock/sherlock` |
33+
| `dnf install sherlock-project` | |
34+
35+
Community-maintained packages are available for Debian (>= 13), Ubuntu (>= 22.10), Homebrew, Kali, and BlackArch. These packages are not directly supported or maintained by the Sherlock Project.
3336

3437
See all alternative installation methods [here](https://sherlockproject.xyz/installation)
3538

36-
## Usage
39+
## General usage
3740

3841
To search for only one user:
3942
```bash

docs/removed-sites.md

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1892,4 +1892,66 @@ __2024-06-10 :__ Http request returns 403 forbidden, and tries to verify the con
18921892
```
18931893

18941894
## Alik.cz
1895-
__2024-07-21 :__ Target is now BLACKLISTED from the default manifest due to the site recieving unnecessarily high traffic from Sherlock. This target is not permitted to be reactivited. Inclusion in unrelated manifests is not impacted, but it is discouraged.
1895+
__2024-07-21 :__ Target is now BLACKLISTED from the default manifest due to the site recieving unnecessarily high traffic from Sherlock (by request of the site owners). This target is not permitted to be reactivited. Inclusion in unrelated manifests is not impacted, but it is discouraged.
1896+
1897+
## 8tracks
1898+
__2025-02-02 :__ Might be dead again. Nobody knows for sure.
1899+
```json
1900+
"8tracks": {
1901+
"errorType": "message",
1902+
"errorMsg": "\"available\":true",
1903+
"headers": {
1904+
"Accept-Language": "en-US,en;q=0.5"
1905+
},
1906+
"url": "https://8tracks.com/{}",
1907+
"urlProbe": "https://8tracks.com/users/check_username?login={}&format=jsonh",
1908+
"urlMain": "https://8tracks.com/",
1909+
"username_claimed": "blue"
1910+
}
1911+
```
1912+
1913+
## Shpock
1914+
__2025-02-02 :__ Can likely be added back with a new endpoint (source username availability endpoint from mobile app reg flow?)
1915+
```json
1916+
"Shpock": {
1917+
"errorType": "status_code",
1918+
"url": "https://www.shpock.com/shop/{}/items",
1919+
"urlMain": "https://www.shpock.com/",
1920+
"username_claimed": "user"
1921+
}
1922+
```
1923+
1924+
## Twitch
1925+
__2025-02-02 :__
1926+
```json
1927+
"Twitch": {
1928+
"errorType": "message",
1929+
"errorMsg": "components.availability-tracking.warn-unavailable.component",
1930+
"url": "https://www.twitch.tv/{}",
1931+
"urlMain": "https://www.twitch.tv/",
1932+
"urlProbe": "https://m.twitch.tv/{}",
1933+
"username_claimed": "jenny"
1934+
}
1935+
```
1936+
1937+
## Fiverr
1938+
__2025-02-02 :__ Fiverr added CSRF protections that messed with this test
1939+
```json
1940+
"Fiverr": {
1941+
"errorMsg": "\"status\":\"success\"",
1942+
"errorType": "message",
1943+
"headers": {
1944+
"Content-Type": "application/json",
1945+
"Accept-Language": "en-US,en;q=0.9"
1946+
},
1947+
"regexCheck": "^[A-Za-z][A-Za-z\\d_]{5,14}$",
1948+
"request_method": "POST",
1949+
"request_payload": {
1950+
"username": "{}"
1951+
},
1952+
"url": "https://www.fiverr.com/{}",
1953+
"urlMain": "https://www.fiverr.com/",
1954+
"urlProbe": "https://www.fiverr.com/validate_username",
1955+
"username_claimed": "blueman"
1956+
}
1957+
```

pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,15 @@ repository = "https://github.com/sherlock-project/sherlock"
4040
"Bug Tracker" = "https://github.com/sherlock-project/sherlock/issues"
4141

4242
[tool.poetry.dependencies]
43-
python = "^3.8"
43+
python = "^3.9"
4444
certifi = ">=2019.6.16"
4545
colorama = "^0.4.1"
4646
PySocks = "^1.7.0"
4747
requests = "^2.22.0"
4848
requests-futures = "^1.0.0"
4949
stem = "^1.8.0"
5050
torrequest = "^0.1.0"
51-
# pandas can likely be bumped up to ^2.0.0 after fc39 EOL
52-
pandas = ">=1.0.0,<3.0.0"
51+
pandas = "^2.2.1"
5352
openpyxl = "^3.0.10"
5453

5554
[tool.poetry.extras]

sherlock_project/__main__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# Check if the user is using the correct version of Python
1515
python_version = sys.version.split()[0]
1616

17-
if sys.version_info < (3, 8):
18-
print(f"Sherlock requires Python 3.8+\nYou are using Python {python_version}, which is not supported by Sherlock.")
17+
if sys.version_info < (3, 9):
18+
print(f"Sherlock requires Python 3.9+\nYou are using Python {python_version}, which is not supported by Sherlock.")
1919
sys.exit(1)
2020

2121
from sherlock_project import sherlock

sherlock_project/py.typed

Whitespace-only changes.

0 commit comments

Comments
 (0)