diff --git a/OlivaDiceJoy/app.json b/OlivaDiceJoy/app.json index 16895de..c085113 100644 --- a/OlivaDiceJoy/app.json +++ b/OlivaDiceJoy/app.json @@ -3,6 +3,9 @@ "author" : "lunzhiPenxil", "namespace" : "OlivaDiceJoy", "message_mode" : "old_string", + "version" : "3.0.2", + "svn" : 10, + "compatible_svn" : 81, "priority" : 30010, "support" : [ { diff --git a/OlivaDiceJoy/data.py b/OlivaDiceJoy/data.py index 4c460e0..fd27868 100644 --- a/OlivaDiceJoy/data.py +++ b/OlivaDiceJoy/data.py @@ -15,4 +15,6 @@ ''' -OlivaDiceJoy_ver = '3.0.1' +OlivaDiceJoy_ver = '3.0.2' +OlivaDiceJoy_svn = 10 +OlivaDiceJoy_ver_short = '%s(%s)' % (str(OlivaDiceJoy_ver), str(OlivaDiceJoy_svn)) diff --git a/OlivaDiceJoy/main.py b/OlivaDiceJoy/main.py index ad2f826..91c716a 100644 --- a/OlivaDiceJoy/main.py +++ b/OlivaDiceJoy/main.py @@ -23,7 +23,7 @@ def init(plugin_event, Proc): OlivaDiceJoy.msgReply.unity_init(plugin_event, Proc) def init_after(plugin_event, Proc): - OlivaDiceCore.crossHook.dictHookList['model'].append(['OlivaDiceJoy', OlivaDiceJoy.data.OlivaDiceJoy_ver]) + OlivaDiceCore.crossHook.dictHookList['model'].append(['OlivaDiceJoy', OlivaDiceJoy.data.OlivaDiceJoy_ver_short]) OlivaDiceJoy.msgReply.data_init(plugin_event, Proc) def private_message(plugin_event, Proc): diff --git a/OlivaDiceJoy/msgCustom.py b/OlivaDiceJoy/msgCustom.py index ab2c3e4..4a22665 100644 --- a/OlivaDiceJoy/msgCustom.py +++ b/OlivaDiceJoy/msgCustom.py @@ -43,6 +43,17 @@ .mrrp 明日人品 此功能采用源自《梅花易数》的卜算方法,以日期与八字起卦进行推演,结果仅供参考。''', + 'OlivaDiceJoy': '''[OlivaDiceJoy] +OlivaDice娱乐模块 +本模块为青果跑团掷骰机器人(OlivaDice)娱乐模块,集成与跑团无关的历史遗留娱乐功能(如今日人品等)。 +核心开发者: lunzhiPenxil仑质 +[.help OlivaDiceJoy更新] 查看本模块更新日志 +注: 本模块为可选不重要模块。''', + + 'OlivaDiceJoy更新': '''[OlivaDiceJoy] +3.0.2: 用户记录优化 +3.0.0: 初始化项目''', + 'zrrp': '&jrrp', 'mrrp': '&jrrp', '今日人品': '&jrrp', diff --git a/OlivaDiceJoy/msgReply.py b/OlivaDiceJoy/msgReply.py index 80b6d6e..6ed7c91 100644 --- a/OlivaDiceJoy/msgReply.py +++ b/OlivaDiceJoy/msgReply.py @@ -79,6 +79,7 @@ def unity_reply(plugin_event, Proc): OlivaDiceCore.crossHook.dictHookList['prefix'] ) if flag_is_command: + tmp_hagID = None if plugin_event.plugin_info['func_type'] == 'group_message': if plugin_event.data.host_id != None: flag_is_from_host = True @@ -90,6 +91,13 @@ def unity_reply(plugin_event, Proc): flag_is_from_group_have_admin = True if plugin_event.data.sender['role'] in ['owner', 'admin']: flag_is_from_group_admin = True + elif plugin_event.data.sender['role'] in ['sub_admin']: + flag_is_from_group_admin = True + flag_is_from_group_sub_admin = True + if flag_is_from_host and flag_is_from_group: + tmp_hagID = '%s|%s' % (str(plugin_event.data.host_id), str(plugin_event.data.group_id)) + elif flag_is_from_group: + tmp_hagID = str(plugin_event.data.group_id) flag_hostEnable = True if flag_is_from_host: flag_hostEnable = OlivaDiceCore.userConfig.getUserConfigByKey( @@ -113,7 +121,7 @@ def unity_reply(plugin_event, Proc): if flag_is_from_host: if flag_hostEnable: flag_groupEnable = OlivaDiceCore.userConfig.getUserConfigByKey( - userId = plugin_event.data.group_id, + userId = tmp_hagID, userType = 'group', platform = plugin_event.platform['platform'], userConfigKey = 'groupEnable', @@ -121,7 +129,7 @@ def unity_reply(plugin_event, Proc): ) else: flag_groupEnable = OlivaDiceCore.userConfig.getUserConfigByKey( - userId = plugin_event.data.group_id, + userId = tmp_hagID, userType = 'group', platform = plugin_event.platform['platform'], userConfigKey = 'groupWithHostEnable', @@ -129,7 +137,7 @@ def unity_reply(plugin_event, Proc): ) else: flag_groupEnable = OlivaDiceCore.userConfig.getUserConfigByKey( - userId = plugin_event.data.group_id, + userId = tmp_hagID, userType = 'group', platform = plugin_event.platform['platform'], userConfigKey = 'groupEnable',