ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-11-30 17:15:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug when 'sender_id' is None

Browse Source
This commit is contained in:
Richard Chien 2017-01-02 13:13:25 +08:00
parent 1880409b7f
commit fa893332d9
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
little_shit.py
View File

@ -1,4 +1,6 @@
import os import os
import random
from datetime import datetime
from config import config from config import config
@ -41,20 +43,21 @@ def get_source(ctx_msg):
Source is used to distinguish the interactive sessions. Source is used to distinguish the interactive sessions.
Note: This value may change after restarting the bot. Note: This value may change after restarting the bot.
:return: an unique value representing a source, or None if the 'via' field is not recognized :return: an unique value representing a source, or a random value if something strange happened
""" """
if ctx_msg.get('via') == 'qq': if ctx_msg.get('via') == 'qq':
if ctx_msg.get('type') == 'group_message': if ctx_msg.get('type') == 'group_message' and ctx_msg.get('group_uid') and ctx_msg.get('sender_uid'):
return 'g' + ctx_msg.get('group_uid') + 'p' + ctx_msg.get('sender_uid') return 'g' + ctx_msg.get('group_uid') + 'p' + ctx_msg.get('sender_uid')
elif ctx_msg.get('type') == 'discuss_message': elif ctx_msg.get('type') == 'discuss_message' and ctx_msg.get('discuss_id') and ctx_msg.get('sender_uid'):
return 'd' + ctx_msg.get('discuss_id') + 'p' + ctx_msg.get('sender_uid') return 'd' + ctx_msg.get('discuss_id') + 'p' + ctx_msg.get('sender_uid')
else: elif ctx_msg.get('type') == 'friend_message' and ctx_msg.get('sender_uid'):
return 'p' + str(ctx_msg.get('sender_uid')) return 'p' + ctx_msg.get('sender_uid')
elif ctx_msg.get('via') == 'wx': elif ctx_msg.get('via') == 'wx':
if ctx_msg.get('type') == 'group_message': if ctx_msg.get('type') == 'group_message' and ctx_msg.get('group_id') and ctx_msg.get('sender_id'):
return 'g' + ctx_msg.get('group_id') + 'p' + ctx_msg.get('sender_id') return 'g' + ctx_msg.get('group_id') + 'p' + ctx_msg.get('sender_id')
else: elif ctx_msg.get('type') == 'friend_message' and ctx_msg.get('sender_id'):
return 'p' + ctx_msg.get('sender_id') return 'p' + ctx_msg.get('sender_id')
return str(int(datetime.now().timestamp())) + str(random.randint(100, 999))
def get_target(ctx_msg): def get_target(ctx_msg):
@ -65,16 +68,16 @@ def get_target(ctx_msg):
:return: an unique value representing a target, or None if there is no persistent unique value :return: an unique value representing a target, or None if there is no persistent unique value
""" """
if ctx_msg.get('via') == 'qq': if ctx_msg.get('via') == 'qq':
if ctx_msg.get('type') == 'group_message': if ctx_msg.get('type') == 'group_message' and ctx_msg.get('group_uid'):
return 'g' + str(ctx_msg.get('group_uid')) return 'g' + ctx_msg.get('group_uid')
elif ctx_msg.get('type') == 'discuss_message': elif ctx_msg.get('type') == 'discuss_message':
# TODO: 看看讨论组 ID 重新启动会不会变 # TODO: 看看讨论组 ID 重新启动会不会变
pass pass
elif ctx_msg.get('type') == 'friend_message': elif ctx_msg.get('type') == 'friend_message' and ctx_msg.get('sender_uid'):
return 'p' + str(ctx_msg.get('sender_uid')) return 'p' + ctx_msg.get('sender_uid')
elif ctx_msg.get('via') == 'wx': elif ctx_msg.get('via') == 'wx':
if ctx_msg.get('type') == 'friend_message' and ctx_msg.get('sender_account'): if ctx_msg.get('type') == 'friend_message' and ctx_msg.get('sender_account'):
return 'p' + str(ctx_msg.get('sender_account')) return 'p' + ctx_msg.get('sender_account')
return None return None