xuthus/LittlePaimon
1
0
Fork 0
mirror of https://github.com/xuthus83/LittlePaimon.git synced 2025-04-12 23:29:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 修复入群欢迎屏蔽类型判断错误

Browse Source
This commit is contained in:
CMHopeSunshine 2022-09-14 13:56:05 +08:00
parent 5e0f207385
commit cc02a82d84
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LittlePaimon/plugins/NoticeAndRequest/__init__.py
View File

@ -3,10 +3,10 @@ import random
import datetime import datetime
from typing import Dict from typing import Dict
from nonebot import on_command, on_regex, on_notice, on_request from nonebot import on_command, on_notice, on_request
from nonebot.rule import Rule from nonebot.rule import Rule
from nonebot.permission import SUPERUSER from nonebot.permission import SUPERUSER
from nonebot.params import CommandArg, ArgPlainText, RegexDict from nonebot.params import CommandArg, ArgPlainText
from nonebot.adapters.onebot.v11 import Bot, Message, MessageEvent, PrivateMessageEvent, FriendRequestEvent, \ from nonebot.adapters.onebot.v11 import Bot, Message, MessageEvent, PrivateMessageEvent, FriendRequestEvent, \
GroupRequestEvent, \ GroupRequestEvent, \
RequestEvent, NoticeEvent, \ RequestEvent, NoticeEvent, \
@ -149,11 +149,11 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
done[f'new_group_{event.group_id}'] = datetime.datetime.now() done[f'new_group_{event.group_id}'] = datetime.datetime.now()
await asyncio.sleep(random.randint(10, 20)) await asyncio.sleep(random.randint(10, 20))
await bot.send_group_msg(group_id=event.group_id, message=format_message(config.new_group)) await bot.send_group_msg(group_id=event.group_id, message=format_message(config.new_group))
elif str(event.group_id) not in config.group_ban: elif event.group_id not in config.group_ban:
done[f'new_member_{event.group_id}_{event.user_id}'] = datetime.datetime.now() done[f'new_member_{event.group_id}_{event.user_id}'] = datetime.datetime.now()
await asyncio.sleep(random.randint(10, 20)) await asyncio.sleep(random.randint(10, 20))
if str(event.group_id) in config.group_greet: if event.group_id in config.group_greet:
msg = config.group_greet[str(event.group_id)] msg = config.group_greet[event.group_id]
else: else:
msg = config.group_greet['默认'] msg = config.group_greet['默认']
await bot.send_group_msg(group_id=event.group_id, message=format_message(msg, user_id=event.user_id)) await bot.send_group_msg(group_id=event.group_id, message=format_message(msg, user_id=event.user_id))

4
LittlePaimon/plugins/NoticeAndRequest/config.py
View File

@ -1,4 +1,4 @@
from typing import Dict from typing import Dict, Union
from LittlePaimon.config import GREET_CONFIG, GREET_CONFIG_DEFAULT from LittlePaimon.config import GREET_CONFIG, GREET_CONFIG_DEFAULT
from LittlePaimon.utils.files import load_yaml, save_yaml from LittlePaimon.utils.files import load_yaml, save_yaml
@ -13,7 +13,7 @@ class GreetConfig:
data = {} data = {}
self.new_friend: str = data.get('新好友见面语', '旅行者你好呀，这里是{nickname}，对我说“help”查看帮助吧~') self.new_friend: str = data.get('新好友见面语', '旅行者你好呀，这里是{nickname}，对我说“help”查看帮助吧~')
self.new_group: str = data.get('新群见面语', '旅行者们大家好呀，这里是{nickname}，对我说“help”查看帮助吧~') self.new_group: str = data.get('新群见面语', '旅行者们大家好呀，这里是{nickname}，对我说“help”查看帮助吧~')
self.group_greet: Dict[str, str] = data.get('群新人欢迎语', {'默认': '欢迎新旅行者~{at_user}'}) self.group_greet: Dict[Union[str, int], str] = data.get('群新人欢迎语', {'默认': '欢迎新旅行者~{at_user}'})
self.group_ban = data.get('群欢迎语禁用列表', []) self.group_ban = data.get('群欢迎语禁用列表', [])
self.save() self.save()

2
LittlePaimon/plugins/Paimon_Info/__init__.py
View File

@ -47,7 +47,7 @@ sy = on_command('sy', aliases={'深渊战报', '深渊信息'}, priority=10, blo
'pm_usage': 'sy(uid)(本期|上期)', 'pm_usage': 'sy(uid)(本期|上期)',
'pm_priority': 3 'pm_priority': 3
}) })
ysc = on_command('ysc', aliases={'角色图'}, priority=10, block=True, state={ ysc = on_command('ysc', aliases={'角色图', '角色卡片'}, priority=10, block=True, state={
'pm_name': 'ysc', 'pm_name': 'ysc',
'pm_description': '随机角色同人图+角色信息卡片', 'pm_description': '随机角色同人图+角色信息卡片',
'pm_usage': 'ysc(uid)<角色名>', 'pm_usage': 'ysc(uid)<角色名>',