rainerosion/genshin-impact-helper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix messages is None

Browse Source
This commit is contained in:
zhipeng wang 2021-01-05 16:33:00 +08:00
parent ff7d8d6fd2
commit c68414a325
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
genshin.py
View File

@ -39,7 +39,7 @@ class Base(object):
@staticmethod @staticmethod
def to_json(obj): def to_json(obj):
return json.dumps(obj, indent=4) return json.dumps(obj, indent=4, ensure_ascii=False)
class Roles(Base): class Roles(Base):
@ -83,6 +83,7 @@ class Roles(Base):
log.error(response) log.error(response)
exit(-1) exit(-1)
log.info("账号信息获取完毕")
return response return response
@ -121,8 +122,7 @@ class Sign(Base):
# role list empty # role list empty
if not role_list: if not role_list:
message = user_game_roles.get('message', 'role list empty') notify(sc_secret, '失败', user_game_roles.get('message', 'role list empty'))
notify(sc_secret, '失败', message)
exit(-1) exit(-1)
log.info('当前账号绑定了 {} 个角色'.format(len(role_list))) log.info('当前账号绑定了 {} 个角色'.format(len(role_list)))
@ -145,32 +145,33 @@ class Sign(Base):
if not info_list: if not info_list:
log.error("user sign info list is empty, exit...") log.error("user sign info list is empty, exit...")
exit(-1) exit(-1)
log.info("签到信息获取完毕")
return info_list return info_list
def run(self): def run(self):
log.info('任务开始') log.info('任务开始')
status = "成功" status = "成功"
messages = { messages = {
'success_message': [], 'success': [],
'failed_message': [], 'failed': [],
'already_signed_in': [] 'already_signed_in': [],
} }
info_list = self.get_info() info_list = self.get_info()
for i in range(len(info_list)): for i in range(len(info_list)):
# 已经签到, 处理下一个用户
if info_list[i]['data']['is_sign'] is True:
message = '旅行者 {} 号, 你已经签到过了'.format(i + 1)
messages['already_signed_in'] = messages.get('already_signed_in', []).append(message)
continue
if info_list[i]['data']['first_bind'] is True:
message = '旅行者 {} 号,请先前往米游社绑定账号'.format(i + 1)
messages['failed_message'] = messages.get('failed_message', []).append(message)
exit(-1)
today = info_list[i]['data']['today'] today = info_list[i]['data']['today']
total_sign_day = info_list[i]['data']['total_sign_day'] total_sign_day = info_list[i]['data']['total_sign_day']
award = Roles(self._cookie).get_awards()['data']['awards'][total_sign_day - 1] award = Roles(self._cookie).get_awards()['data']['awards']
uid = str(self._uid_list[i]).replace(str(self._uid_list[i])[3:6], '***', 1) uid = str(self._uid_list[i]).replace(str(self._uid_list[i])[3:6], '***', 1)
# 已经签到, 处理下一个用户
if info_list[i]['data']['is_sign'] is True:
messages.get('already_signed_in', []).append("旅行者 {} 号, 你已经签到过了".format(i + 1))
continue
if info_list[i]['data']['first_bind'] is True:
messages.get('failed', []).append("旅行者 {} 号, 请先前往米游社App手动签到一次".format(i + 1))
exit(-1)
data = { data = {
'act_id': CONFIG.ACT_ID, 'act_id': CONFIG.ACT_ID,
'region': self._region_list[i], 'region': self._region_list[i],
@ -199,15 +200,15 @@ class Sign(Base):
uid, uid,
award['name'], award['name'],
award['cnt'], award['cnt'],
total_sign_day, total_sign_day + 1,
response['message'], response['message'],
'' ''
) )
messages['success_message'] = messages.get('success_message', []).append(message) messages.get('success', []).append(message)
else: else:
messages['failed_message'] = messages.get('failed_message', []).append(response) messages.get('failed', []).append(response)
if messages.get('failed_message', []): if messages.get('failed', []):
status = "失败" status = "失败"
return notify(sc_secret, status, messages) return notify(sc_secret, status, messages)
@ -254,8 +255,4 @@ if __name__ == '__main__':
cookie = secret[0] cookie = secret[0]
sc_secret = secret[1] sc_secret = secret[1]
seconds = random.randint(10, 300)
log.info('将在 {} 秒后开始任务...'.format(seconds))
time.sleep(seconds)
Sign(cookie).run() Sign(cookie).run()