Merge pull request #78 from WeCanCodeTrust/update

removed hopefully the rest of the anitpublic projekt and also clean u…

src/checker.py

@@ -1,7 +1,6 @@
 import asyncio
 import concurrent
 import ctypes
-import datetime
 import os
 import time
 from typing import Union
@@ -37,7 +36,7 @@ async def main(self) -> None:
                 input("hit enter")
                 logpass = "valcheckerdebug:Fuckyou1337!"
             else:
-                logpass = input('account (login:password) or "E" to exit >>>')
+                logpass = input('account (login:password) or "E" to exit >>> ')
             if logpass == "E":
                 break
             if ":" not in logpass:
@@ -208,16 +207,17 @@ async def main(
             open(f"{self.outpath}/record.vlchkr", "w").close()
             vlchkr = systems.vlchkrsource(f"{self.outpath}/record.vlchkr")
             vlchkr.savefile()
-
-        try:
-            self.threadam = int(
-                input(
-
-                    f"input number of threads (min 1 max 5000) (proxies: {self.proxycount}) >>>"
+        while True:
+            try:
+                self.threadam = int(
+                    input(
+
+                        f"input number of threads (min 1 max 5000) (proxies: {self.proxycount}) >>>"
+                    )
                 )
-            )
-        except ValueError:
-            self.threadam = 1
+                break
+            except ValueError:
+                print("invalid input",flush=True)
         self.threadam = int((
             self.threadam
             if 5000 > self.threadam > 0
@@ -451,7 +451,7 @@ async def checker(self, username, password) -> None:
                         file.write(f"""
 ╔═════════════════════════════════════════════════════════════╗
 ║            | {account.logpass} |{space*(49-len(f'| {account.logpass} |'))}║
-║ Permanently banned {space*(61-len(f' Permanently banned'))}║
+║ Permanently banned {space*(61-len(' Permanently banned'))}║
 ║                                                             ║
 ║ Full Access: {unverifmail} | Level: {lvl} | Region: {reg} , {country}{space*(61-len(f' Full Access: {unverifmail} | Level: {lvl} | Region: {reg} , {country}'))}║
 ║ Rank: {rank} | Last Played: {lastplayed}{space*(61-len(f' Rank: {rank} | Last Played: {lastplayed}'))}║

src/codeparts/auth.py

@@ -4,7 +4,6 @@
 import traceback
 from typing import Any
 from datetime import datetime, timedelta
-from random import randint
 
 import sys
 import asyncio
@@ -149,8 +148,8 @@ async def auth(self, logpass: str = None, username: str = None, password: str =
                 entitlement = r.json()['entitlements_token']
                 r = client.post(Constants.USERINFO_URL,
                                  headers=headers, json={})
-            except Exception as e:
-                #print(e)
+            except Exception as _e:
+                #print(_e)
                 account.code = 6
                 return account
             # print(r.text)
@@ -191,9 +190,9 @@ async def auth(self, logpass: str = None, username: str = None, password: str =
                     else:
                         banuntil = None
                         pass
-            except Exception as e:
+            except Exception as _e:
                 # print(Exception)
-                # input(e)
+                # input(_e)
                 banuntil = None
                 pass
             try:
@@ -229,8 +228,8 @@ async def auth(self, logpass: str = None, username: str = None, password: str =
                 input()
             client.close()
             return account
-        except Exception as e:
-            #input(e)
+        except Exception as _e:
+            #input(_e)
             account.errmsg = traceback.format_exc()
             account.code = int(2)
             return account

src/codeparts/checkers.py

@@ -41,8 +41,8 @@ def skins_en(self, account) -> None:
                 skinlist.append(skinname)
 
             account.skins = skinlist
-        except Exception as e:
-            #print(e)
+        except Exception as _e:
+            #print(_e)
             account.skins = ['N/A']
 
     def balance(self, account) -> None:

src/codeparts/systems.py

@@ -2,7 +2,6 @@
 import json
 import os
 import certifi
-import re
 import string
 import random
 import time
@@ -71,10 +70,10 @@ def get_country_and_level_only(account) -> None:
             response = session.get(
                 f"https://pd.{progregion}.a.pvp.net/account-xp/v1/players/{account.puuid}", headers={**headers, **Constants.PVPNETHEADERSBASE})
             lvl = response.json()['Progress']['Level']
-        except Exception as e:
+        except Exception as _e:
             lvl = -1
 
-        account.country = country
+        account.country = country   
         account.lvl = lvl
 
     @staticmethod
@@ -94,7 +93,7 @@ def get_region2(account) -> None:
                 region = userinfo['region']['id']
                 fixedregion = Constants.LOL2REG[region]
                 country = userinfo['country'].upper()
-            except:
+            except Exception as _e:
                 country = userinfo['country'].upper()
                 cou3 = Constants.A2TOA3[country]
                 fixedregion = Constants.COU2REG[cou3]
@@ -103,8 +102,8 @@ def get_region2(account) -> None:
             if progregion in ['latam', 'br']:
                 progregion = 'na'
             # input(progregion)
-        except Exception as e:
-            # input(e)
+        except Exception as _e:
+            # input(_e)
             fixedregion = 'N/A'
             country = 'N/A'
         # lvl
@@ -117,8 +116,8 @@ def get_region2(account) -> None:
                 f"https://pd.{progregion}.a.pvp.net/account-xp/v1/players/{account.puuid}", headers={**headers, **Constants.PVPNETHEADERSBASE})
             #input(response.text)
             lvl = response.json()['Progress']['Level']
-        except Exception as e:
-            #input(e)
+        except Exception as _e:
+            #input(_e)
             lvl = -1
 
         account.region = fixedregion
@@ -133,7 +132,7 @@ def load_settings():
             f.close()
             data['session'] = system.generate_random_string(10)
             return data
-        except:
+        except FileNotFoundError:
             print("can't find settings.json\nplease reinstall the ValChecker\n")
             return False
 
@@ -262,16 +261,16 @@ def load_proxy(self):
 
     def getproxy(self, proxlist):
         try:
-            if proxlist == None:
+            if proxlist is None:
                 return None
             elif len(proxlist) == 0:
                 return None
             if self.num > len(proxlist)-1:
                 self.num = 0
             nextproxy = proxlist[self.num]
             self.num += 1
-        except Exception as e:
-            # input(e)
+        except Exception as _e:
+            # input(_e)
             nextproxy = None
         return nextproxy
 

src/main.py

@@ -1,5 +1,4 @@
 import asyncio
-import ctypes
 import os
 import random
 import sys as s
@@ -96,8 +95,7 @@ def start(self) -> None:
             self.main()
             input(localizer["parts"]["checker"]["finished"])
         elif res == menu_choices[2]:
-            settings = sys.load_settings()
-            slchecker = checker.singlelinechecker(settings["antipublic_token"] if settings["antipublic"] is True else "", settings["session"])
+            slchecker = checker.singlelinechecker(isDebug=False)
             asyncio.run(slchecker.main())
         elif res == menu_choices[3]:
             sys.edit_settings()
@@ -111,7 +109,7 @@ def start(self) -> None:
             print(f'''
     valchecker v{self.version} by liljaba1337
 
-    Cleaned and Modified by WeCanCodeTrust
+    Clesinglelinecheckered and Modified by WeCanCodeTrust
     yo whatsup
 
     translated into {localizer["metadata"]["name"]} by {localizer["metadata"]["by"]}
@@ -198,7 +196,7 @@ def main(self) -> None:
         print(1)
 
         isvalkekersource = False
-        if type(accounts) == systems.vlchkrsource:
+        if type(accounts) is systems.vlchkrsource:
             isvalkekersource = True
         print("run")
         asyncio.run(scheck.main(accounts, self.count, isvalkekersource))

src/system/settings.json

@@ -3,7 +3,5 @@
     "skip_kr": "False",
     "check_banned": "False",
     "precise_rank": "False",
-    "antipublic_token": "",
-    "antipublic": "False",
     "lang":"English"
-}
+}