diff --git a/README.md b/README.md index 6435ca0..7895299 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ This is a script I made a while back to check the availability of OG words as ha - Kik ### Comptability -Version `1.9` is incompatible with custom site URLs. Use `1.8` for this feature. +Version `1.9.0` is incompatible with custom site URLs. Please revert back to `1.8` via the Release tab on GitHub or upgrade to 1.9.1 which patched the bug. Version `1.4-1.9+` is only compatible with Python 3+ diff --git a/config.ini b/config.ini index a4818ac..de627d7 100644 --- a/config.ini +++ b/config.ini @@ -24,12 +24,12 @@ ; If your target site is not listed, put "1" for CUSTOM (without the quotes). siteNum = 5 ; Fill in the option below with the profile URL of the service you want to check available names for. -; Use %%word%% or %%name%% as the placeholder for the username to check. +; Use _word_ or _name_ the placeholder for the username to check. ; customSite is only for sites not specifically listed in the chart above, but please be aware ; that not every site will work this way. If there is a service you would like to see support for, please -; don't hesistate to let Croc know. +; don't hesistate to let Croc#1111 know on Discord. ; DO NOT PUT QUOTATION MARKS AROUND URL! -customSite = http://example.com/%%word%% +customSite = https://example.com/_word_ [lists] ; Be sure to include the file extension if it has one diff --git a/lib/ConfigHelper.py b/lib/ConfigHelper.py index 510eec9..840151d 100644 --- a/lib/ConfigHelper.py +++ b/lib/ConfigHelper.py @@ -3,7 +3,7 @@ import re # Regex Patterns -PLACEHOLDER = r"%%(name|word)%%" +PLACEHOLDER = r"_(word|name)_" URLPATT = r"(^https?:\/\/[-.a-zA-Z0-9]+)" DOMAIN = r"(?:https:\/\/)?(?:\w+\.)?(\w+)\.\w+\/?" @@ -13,12 +13,12 @@ class ConfigHelper: def getSite(self): - return config.getint('site', 'siteNum', fallback=5,) + return config.getint('site', 'siteNum', fallback=5) def getCustomUrl(self): url = config.get('site', 'customSite') - if re.match(PLACEHOLDER, url): + if re.search(PLACEHOLDER, url): return url diff --git a/lib/ProxyHelper.py b/lib/ProxyHelper.py index 97ac038..cdf553f 100644 --- a/lib/ProxyHelper.py +++ b/lib/ProxyHelper.py @@ -27,7 +27,7 @@ def checkJob(self, proxy): } try: r = self.session.get('https://google.com', timeout=4, proxies=proxyDict) - if r.status_code is 200: + if r.status_code == 200: self.good.append(proxy) with self.print_lock: print("%s is working..." % proxy) diff --git a/lib/get.py b/lib/get.py index 42e1732..8c2e12c 100644 --- a/lib/get.py +++ b/lib/get.py @@ -27,7 +27,6 @@ def requestJob(item): with print_lock: print("["+threading.current_thread().name+"] "+word+" is UNAVAILABLE on pastebin because it has illegal length.") else: - link = replace(word) s = requests.Session() if ch.enableProxy(): diff --git a/lib/replace.py b/lib/replace.py index 9f23e59..3644100 100644 --- a/lib/replace.py +++ b/lib/replace.py @@ -1,4 +1,5 @@ import re +import sys from lib.ConfigHelper import ConfigHelper, PLACEHOLDER ch = ConfigHelper() diff --git a/test.py b/test.py new file mode 100644 index 0000000..4668f74 --- /dev/null +++ b/test.py @@ -0,0 +1,9 @@ +import requests + +possibleCharacters = [] +possibleCharacters[:0] = 'abcdefghijklmnopqrstuvwxyz0123456789' +print(possibleCharacters) +finalString = "" + +for character in possibleCharacters: + finalString = \ No newline at end of file