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

Update

Browse Source
This commit is contained in:
Eriks K 2021-07-10 00:36:22 +03:00
parent e3a10af101
commit b7771b4da2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erepublik/citizen.py
View File

@ -206,6 +206,9 @@ class BaseCitizen(access_points.CitizenAPI):
citizen_js = utils.json.loads(ugly_js) citizen_js = utils.json.loads(ugly_js)
citizen = citizen_js.get('citizen', {}) citizen = citizen_js.get('citizen', {})
self.details.citizen_id = int(citizen['citizenId'])
self.name = citizen['name']
self.eday = citizen_js.get('settings').get('eDay') self.eday = citizen_js.get('settings').get('eDay')
self.division = int(citizen.get('division', 0)) self.division = int(citizen.get('division', 0))
@ -599,11 +602,11 @@ class BaseCitizen(access_points.CitizenAPI):
def _resume_session(self): def _resume_session(self):
resp = self._req.get(self.url) resp = self._req.get(self.url)
re_name_id = re.search(r'<a data-fblog="profile_avatar" href="/en/citizen/profile/(\d+)" ' try:
r'class="user_avatar" title="(.*?)">', resp.text) self.update_citizen_info(resp.text)
if re_name_id: if not self.name:
self.name = re_name_id.group(2) raise classes.ErepublikException("Unable to find player name")
self.details.citizen_id = re_name_id.group(1)
self.write_log(f"Resumed as: {self.name}") self.write_log(f"Resumed as: {self.name}")
if re.search('<div id="accountSecurity" class="it-hurts-when-ip">', resp.text): if re.search('<div id="accountSecurity" class="it-hurts-when-ip">', resp.text):
self.restricted_ip = True self.restricted_ip = True
@ -611,7 +614,7 @@ class BaseCitizen(access_points.CitizenAPI):
self.logged_in = True self.logged_in = True
self.get_csrf_token() self.get_csrf_token()
else: except classes.ErepublikException:
self._login() self._login()
def __str__(self) -> str: def __str__(self) -> str: