xuthus/LittlePaimon
1
0
Fork 0
mirror of https://github.com/xuthus83/LittlePaimon.git synced 2024-10-21 16:27:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #208 from nicklly/Bot

Browse Source 
fix bug
This commit is contained in:
惜月 2022-08-28 04:49:59 -05:00 committed by GitHub
commit cdb0ee958c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
LittlePaimon/plugins/Genshin_Calendar/__init__.py
View File

@ -1,5 +1,8 @@
from typing import Union
from nonebot import get_bot, on_command from nonebot import get_bot, on_command
from nonebot.adapters.onebot.v11 import MessageEvent, MessageSegment from nonebot.adapters.onebot.v11 import MessageEvent, MessageSegment, GROUP_ADMIN
from nonebot.permission import SUPERUSER
from nonebot.plugin import PluginMetadata from nonebot.plugin import PluginMetadata
from .generate import * from .generate import *
@ -16,14 +19,14 @@ __plugin_meta__ = PluginMetadata(
"原神日历 on 时间/off : 订阅/取消订阅指定服务器的日历推送\n" "原神日历 on 时间/off : 订阅/取消订阅指定服务器的日历推送\n"
), ),
extra={ extra={
'type': '原神Wiki', 'type': '原神Wiki',
"author": "nicklly <1134741727@qq.com>", "author": "nicklly <1134741727@qq.com>",
"version": "1.0.1", "version": "1.0.1",
'priority': 7, 'priority': 7,
}, },
) )
calendar = on_command('原神日历', aliases={'原神日程', '活动日历'}, priority=10, block=True) calendar = on_command('原神日历', aliases={'原神日程', '活动日历'}, permission=SUPERUSER | GROUP_ADMIN, priority=10, block=True)
@calendar.handle() @calendar.handle()
@ -38,13 +41,18 @@ async def _(event: MessageEvent, sub_id=CommandObjectID(), switch=CommandSwitch(
sub_data['extra_id'] = event.guild_id sub_data['extra_id'] = event.guild_id
if switch: if switch:
if sub_time: if sub_time:
await GeneralSub.update_or_create(**sub_data, defaults={'sub_hour': sub_time[0], 'sub_minute': sub_time[1]}) await GeneralSub.update_or_create(**sub_data,
defaults={'sub_hour': sub_time[0], 'sub_minute': sub_time[1]})
if scheduler.get_job(f'genshin_calendar_{sub_id}'): if scheduler.get_job(f'genshin_calendar_{sub_id}'):
scheduler.remove_job(f'genshin_calendar_{sub_id}') scheduler.remove_job(f'genshin_calendar_{sub_id}')
scheduler.add_job(func=send_calendar, trigger='cron', hour=sub_time[0], minute=sub_time[1], id=f'genshin_calendar_{sub_id}', args=(sub_data['sub_id'], sub_data['sub_type'], sub_data.get('extra_id', None)), misfire_grace_time=10) scheduler.add_job(func=send_calendar, trigger='cron', hour=sub_time[0], minute=sub_time[1],
id=f'genshin_calendar_{sub_id}',
args=(sub_data['sub_id'], sub_data['sub_type'], sub_data.get('extra_id', None)),
misfire_grace_time=10)
logger.info('原神日历', '', {sub_data['sub_type']: sub_id, 'time': f'{sub_time[0]}:{sub_time[1]}'}, '订阅成功', True) logger.info('原神日历', '', {sub_data['sub_type']: sub_id, 'time': f'{sub_time[0]}:{sub_time[1]}'}, '订阅成功',
True)
await calendar.finish(f'原神日历订阅成功， 将在每日{sub_time[0]}:{sub_time[1]}推送') await calendar.finish(f'原神日历订阅成功， 将在每日{sub_time[0]}:{sub_time[1]}推送')
else: else:

9
LittlePaimon/plugins/Genshin_Calendar/event.py
View File

@ -30,17 +30,18 @@ ignored_key_words = [
"防沉迷", "防沉迷",
"问卷", "问卷",
"公平运营", "公平运营",
"纪行",
"有奖活动", "有奖活动",
"反馈功能" "反馈功能"
] ]
ignored_ann_ids = [ ignored_ann_ids = [
495, # 有奖问卷调查开启！
1263, # 米游社《原神》专属工具一览
423, # 《原神》玩家社区一览 423, # 《原神》玩家社区一览
422, # 《原神》防沉迷系统说明 495, # 有奖问卷调查开启！
762, # 《原神》公平运营声明 762, # 《原神》公平运营声明
1263, # 米游社《原神》专属工具一览
2388, # 原神问卷调查
2522, # 《原神》防沉迷系统说明
2911, # 功能反馈
] ]
list_api = 'https://hk4e-api.mihoyo.com/common/hk4e_cn/announcement/api/getAnnList?game=hk4e&game_biz=hk4e_cn&lang=zh-cn&bundle_id=hk4e_cn&platform=pc&region=cn_gf01&level=55&uid=100000000' list_api = 'https://hk4e-api.mihoyo.com/common/hk4e_cn/announcement/api/getAnnList?game=hk4e&game_biz=hk4e_cn&lang=zh-cn&bundle_id=hk4e_cn&platform=pc&region=cn_gf01&level=55&uid=100000000'