diff --git a/GenshinUID/genshinuid_signin/sign.py b/GenshinUID/genshinuid_signin/sign.py index e8d1ea7f..822f9f11 100644 --- a/GenshinUID/genshinuid_signin/sign.py +++ b/GenshinUID/genshinuid_signin/sign.py @@ -147,7 +147,7 @@ async def daily_sign(): sqla = get_sqla(bot_id) user_list = await sqla.get_all_user() for user in user_list: - if user.sign_switch != 'off': + if user.sign_switch != 'off' and not user.status and user.uid: tasks.append( single_daily_sign( user.bot_id, user.uid, user.sign_switch, user.user_id diff --git a/GenshinUID/genshinuid_user/__init__.py b/GenshinUID/genshinuid_user/__init__.py index 792c5a47..f4c49103 100644 --- a/GenshinUID/genshinuid_user/__init__.py +++ b/GenshinUID/genshinuid_user/__init__.py @@ -25,7 +25,7 @@ async def send_link_uid_msg(bot: Bot, ev: Event): return await bot.send('你输入了错误的格式!') if '绑定' in ev.command: - data = await sqla.insert_bind_data(qid, uid=uid) + data = await sqla.insert_bind_data(qid, uid=uid, group_id=ev.group_id) return await send_diff_msg( bot, data, diff --git a/GenshinUID/utils/convert.py b/GenshinUID/utils/convert.py index b099fcb4..0e5cf3fb 100644 --- a/GenshinUID/utils/convert.py +++ b/GenshinUID/utils/convert.py @@ -33,6 +33,18 @@ async def get_uid( ev.text = ev.text.replace(uid, '') else: sqla = get_sqla(ev.bot_id) + data = await sqla.select_bind_data(user_id) + if data is not None: + if not data.group_id: + await sqla.update_bind_data(user_id, {'group_id': ev.group_id}) + else: + new_group_list = data.group_id.split('|') + if ev.group_id and ev.group_id not in new_group_list: + new_group_list.append(ev.group_id) + new_group = '|'.join(new_group_list) + await sqla.update_bind_data( + user_id, {'group_id': new_group} + ) uid = await sqla.get_bind_uid(user_id) if get_user_id: return uid, user_id