eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browser UA version update

Browse Source 
gitignore

Updated constants

Requirements update
This commit is contained in:
Eriks K
2021-08-18 09:11:23 +03:00
parent 61df989cb4
commit 86e738ad08
5 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erepublik/access_points.py
View File

@ -110,15 +110,13 @@ class SlowRequests(Session):
def get_random_user_agent() -> str:
windows_x64 = "Windows NT 10.0; Win64; x64"
linux_x64 = "X11; Linux x86_64"
android_11 = "Android 11; Mobile"
android_10 = "Android 10; Mobile"
android_9 = "Android 9; Mobile"
android = [f"Android {version}; Mobile" for version in range(8, 12)]
firefox_tmplt = "Mozilla/5.0 ({osystem}; rv:{version}.0) Gecko/20100101 Firefox/{version}.0"
ff_version = range(85, 92)
firefox_template = "Mozilla/5.0 ({osystem}; rv:{version}.0) Gecko/20100101 Firefox/{version}.0"
firefox_versions = range(85, 92)
chrome_tmplt = "Mozilla/5.0 ({osystem}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Safari/537.36"
chrome_version = [
chrome_template = "Mozilla/5.0 ({osystem}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Safari/537.36"
chrome_versions = [
"85.0.4183.121",
"86.0.4240.183",
"87.0.4280.141",
@ -126,15 +124,15 @@ class SlowRequests(Session):
"89.0.4389.128",
"90.0.4430.18",
"91.0.4472.73",
"92.0.4515.14",
"92.0.4515.159",
]
uas = []
for osystem in [windows_x64, linux_x64, android_9, android_10, android_11]:
for version in ff_version:
uas.append(firefox_tmplt.format(osystem=osystem, version=version))
for version in chrome_version:
uas.append(chrome_tmplt.format(osystem=osystem, version=version))
for osystem in [windows_x64, linux_x64, *android]:
for version in firefox_versions:
uas.append(firefox_template.format(osystem=osystem, version=version))
for version in chrome_versions:
uas.append(chrome_template.format(osystem=osystem, version=version))
return random.choice(uas)

6
erepublik/constants.py
View File

@ -8,7 +8,9 @@ __all__ = [
"min_datetime",
"max_datetime",
"Country",
"Rank",
"AIR_RANKS",
"AIR_RANK_POINTS",
"COUNTRIES",
"FOOD_ENERGY",
"GROUND_RANKS",
@ -199,6 +201,10 @@ class Rank:
def as_dict(self):
return dict(id=self.id, name=self.name, rank_points=self.rank_points, is_air=self.is_air)
@property
def __dict__(self):
return self.as_dict
def __str__(self):
return f"{'Air' if self.is_air else 'Ground'}Rank<#{self.id} {self.name}>"

22
erepublik/utils.py
View File

@ -23,33 +23,33 @@ except ImportError:
import json
__all__ = [
"ErepublikJSONEncoder",
"VERSION",
"b64json",
"calculate_hit",
"date_from_eday",
"eday_from_date",
"deprecation",
"get_final_hit_dmg",
"write_file",
"eday_from_date",
"get_air_hit_dmg_value",
"get_file",
"get_final_hit_dmg",
"get_ground_hit_dmg_value",
"get_sleep_seconds",
"good_timedelta",
"slugify",
"interactive_sleep",
"json",
"json_decode_object_hook",
"json_dump",
"json_dumps",
"json_load",
"json_loads",
"localize_dt",
"localize_timestamp",
"normalize_html_json",
"now",
"silent_sleep",
"json_decode_object_hook",
"json_load",
"json_loads",
"json_dump",
"json_dumps",
"b64json",
"ErepublikJSONEncoder",
"slugify",
"write_file",
]
VERSION: str = __version__