855 协议版本-调整完毕内容
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
from datetime import datetime, timedelta
|
||||
import logging
|
||||
from loguru import logger
|
||||
import pytz
|
||||
from typing import Dict, Any, List, Optional, Tuple
|
||||
|
||||
|
||||
from db.connection import DBConnectionManager
|
||||
from message_util import MessageUtil
|
||||
from plugin_common.message_plugin_interface import MessagePluginInterface
|
||||
from plugin_common.plugin_interface import PluginStatus
|
||||
from utils.decorator.plugin_decorators import plugin_stats_decorator
|
||||
@@ -16,6 +14,7 @@ import random
|
||||
import os
|
||||
|
||||
from utils.decorator.points_decorator import points_reward_decorator
|
||||
from wechat_ipad import WechatAPIClient
|
||||
|
||||
|
||||
class MessageSignPlugin(MessagePluginInterface):
|
||||
@@ -56,15 +55,15 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
self.vocab_file_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))),
|
||||
"resource", "6 托福-乱序.txt")
|
||||
self.vocab_list = []
|
||||
self.bot: WechatAPIClient = None
|
||||
|
||||
def initialize(self, context: Dict[str, Any]) -> bool:
|
||||
"""初始化插件"""
|
||||
self.LOG = logging.getLogger(f"Plugin.{self.name}")
|
||||
self.LOG = logger
|
||||
self.LOG.info(f"正在初始化 {self.name} 插件...")
|
||||
|
||||
# 保存上下文对象
|
||||
self.event_system = context.get("event_system")
|
||||
self.message_util: MessageUtil = context.get("message_util")
|
||||
self.gbm = context.get("gbm")
|
||||
self.all_contacts = context.get("all_contacts", {})
|
||||
|
||||
@@ -178,15 +177,15 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
# 使用数据库中已更新的连签天数
|
||||
streak = user_record.get('signin_streak', 1)
|
||||
# 如果今天刚签到,连签天数已经+1,所以这里不需要再加1
|
||||
|
||||
|
||||
# 计算积分
|
||||
points = self.calculate_points(streak)
|
||||
|
||||
|
||||
return points
|
||||
|
||||
# 修改 process_message 方法,作为路由分发
|
||||
@plugin_stats_decorator(plugin_name="签到系统")
|
||||
def process_message(self, message: Dict[str, Any]) -> Tuple[bool, Optional[str]]:
|
||||
async def process_message(self, message: Dict[str, Any]) -> Tuple[bool, Optional[str]]:
|
||||
"""处理消息"""
|
||||
content = str(message.get("content", "")).strip()
|
||||
self.LOG.info(f"插件执行: {self.name}:{content}")
|
||||
@@ -194,6 +193,7 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
sender = message.get("sender")
|
||||
roomid = message.get("roomid", "")
|
||||
gbm: GroupBotManager = message.get("gbm")
|
||||
self.bot = message.get("bot")
|
||||
|
||||
# 检查权限
|
||||
if roomid and gbm.get_group_permission(roomid, Feature.SIGNIN) == PermissionStatus.DISABLED:
|
||||
@@ -201,17 +201,17 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
|
||||
# 处理补签命令
|
||||
if command in self._makeup_commands:
|
||||
return self._handle_makeup_sign(message)
|
||||
return await self._handle_makeup_sign(message)
|
||||
|
||||
# 处理正常签到命令
|
||||
if command in self._commands:
|
||||
return self._handle_sign_in(message)
|
||||
return await self._handle_sign_in(message)
|
||||
|
||||
return False, "不支持的命令"
|
||||
|
||||
# 添加签到处理方法,应用积分奖励装饰器
|
||||
@points_reward_decorator(calculate_sign_in_points, "checkin", "每日签到奖励", Feature.SIGNIN)
|
||||
def _handle_sign_in(self, message: Dict[str, Any]) -> Tuple[bool, Optional[str]]:
|
||||
async def _handle_sign_in(self, message: Dict[str, Any]) -> Tuple[bool, Optional[str]]:
|
||||
"""处理签到请求"""
|
||||
sender = message.get("sender")
|
||||
roomid = message.get("roomid", "")
|
||||
@@ -237,8 +237,8 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
|
||||
# 如果 sign_stat 已经大于或等于今天的零点,则认为用户已经签到过了
|
||||
if sign_stat >= today_start:
|
||||
self.message_util.send_text(f"您今天已经签到过了!",
|
||||
(roomid if roomid else sender), sender)
|
||||
await self.bot.send_text_message(
|
||||
(roomid if roomid else sender), f"您今天已经签到过了!", sender)
|
||||
return False, "已签到"
|
||||
|
||||
# 在_handle_sign_in方法中,修改断签处理逻辑
|
||||
@@ -313,13 +313,13 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
daily_vocab = self.get_random_vocabulary()
|
||||
output += f"\n今日词汇:{daily_vocab}"
|
||||
|
||||
self.message_util.send_text(output, (roomid if roomid else sender), sender)
|
||||
await self.bot.send_text_message((roomid if roomid else sender), output, sender)
|
||||
return True, "签到成功"
|
||||
|
||||
except Exception as e:
|
||||
self.LOG.error(f"处理签到请求出错: {e}")
|
||||
self.message_util.send_text(f"签到出错:{e}",
|
||||
(roomid if roomid else sender), sender)
|
||||
await self.bot.send_text_message((roomid if roomid else sender), f"签到出错:{e}",
|
||||
sender)
|
||||
return False, f"处理出错: {e}"
|
||||
|
||||
def reset_today_count_if_needed(self):
|
||||
@@ -350,7 +350,7 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
|
||||
# 修改_handle_makeup_sign方法,实现连签恢复功能
|
||||
|
||||
def _handle_makeup_sign(self, message: Dict[str, Any]) -> Tuple[bool, Optional[str]]:
|
||||
async def _handle_makeup_sign(self, message: Dict[str, Any]) -> Tuple[bool, Optional[str]]:
|
||||
"""处理补签请求"""
|
||||
sender = message.get("sender")
|
||||
roomid = message.get("roomid", "")
|
||||
@@ -370,9 +370,9 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
|
||||
# 检查用户是否有签到记录
|
||||
if not user_record:
|
||||
self.message_util.send_text(
|
||||
"❌ 您还没有签到记录,请先进行签到!",
|
||||
(roomid if roomid else sender), sender
|
||||
await self.bot.send_text_message(
|
||||
(roomid if roomid else sender),
|
||||
"❌ 您还没有签到记录,请先进行签到!", sender
|
||||
)
|
||||
return True, "无签到记录"
|
||||
|
||||
@@ -403,27 +403,26 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
else:
|
||||
# 昨天已经签到了或者断签超过一天,不需要补签
|
||||
self.LOG.info(f"不符合补签条件,last_sign_date: {last_sign_date}, sign_stat: {sign_stat}")
|
||||
self.message_util.send_text(
|
||||
"❌ 您昨天已经签到过了或断签超过一天,不符合补签条件!",
|
||||
(roomid if roomid else sender), sender
|
||||
await self.bot.send_text_message(
|
||||
(roomid if roomid else sender), "❌ 您昨天已经签到过了或断签超过一天,不符合补签条件!", sender
|
||||
)
|
||||
return True, "不符合补签条件"
|
||||
else:
|
||||
# 今天未签到,检查是否符合补签条件(只能补签昨天)
|
||||
if not last_sign_date or last_sign_date < day_before_yesterday:
|
||||
self.LOG.info(f"断签超过一天,last_sign_date: {last_sign_date}")
|
||||
self.message_util.send_text(
|
||||
"❌ 只能补签断签一天的情况!您已断签超过一天或没有签到记录。",
|
||||
(roomid if roomid else sender), sender
|
||||
)
|
||||
await self.bot.send_text_message((roomid if roomid else sender),
|
||||
"❌ 只能补签断签一天的情况!您已断签超过一天或没有签到记录。",
|
||||
sender
|
||||
)
|
||||
return True, "不符合补签条件"
|
||||
|
||||
if last_sign_date >= yesterday:
|
||||
self.LOG.info(f"昨天已签到,last_sign_date: {last_sign_date}")
|
||||
self.message_util.send_text(
|
||||
"❌ 您昨天已经签到过了,不需要补签!",
|
||||
(roomid if roomid else sender), sender
|
||||
)
|
||||
await self.bot.send_text_message((roomid if roomid else sender),
|
||||
"❌ 您昨天已经签到过了,不需要补签!",
|
||||
sender
|
||||
)
|
||||
return True, "无需补签"
|
||||
|
||||
# 检查用户积分是否足够
|
||||
@@ -432,10 +431,10 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
user_points = points_db.get_user_points(sender, roomid)
|
||||
|
||||
if not user_points or user_points["total_points"] < self.makeup_cost:
|
||||
self.message_util.send_text(
|
||||
f"❌ 积分不足!补签需要 {self.makeup_cost} 积分,您当前只有 {user_points.get('total_points', 0)} 积分。",
|
||||
(roomid if roomid else sender), sender
|
||||
)
|
||||
await self.bot.send_text_message((roomid if roomid else sender),
|
||||
f"❌ 积分不足!补签需要 {self.makeup_cost} 积分,您当前只有 {user_points.get('total_points', 0)} 积分。",
|
||||
sender
|
||||
)
|
||||
return True, "积分不足"
|
||||
|
||||
# 扣除积分
|
||||
@@ -445,10 +444,10 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
)
|
||||
|
||||
if not deduct_success:
|
||||
self.message_util.send_text(
|
||||
f"❌ 扣除积分失败:{deduct_result.get('error', '未知错误')}",
|
||||
(roomid if roomid else sender), sender
|
||||
)
|
||||
await self.bot.send_text_message((roomid if roomid else sender),
|
||||
f"❌ 扣除积分失败:{deduct_result.get('error', '未知错误')}",
|
||||
sender
|
||||
)
|
||||
return True, "扣除积分失败"
|
||||
|
||||
# 在_handle_makeup_sign方法中,修改计算新连签天数的逻辑
|
||||
@@ -504,17 +503,17 @@ class MessageSignPlugin(MessagePluginInterface):
|
||||
|
||||
success_message += f"💰 当前积分:{user_points['total_points'] - self.makeup_cost}"
|
||||
|
||||
self.message_util.send_text(
|
||||
success_message,
|
||||
(roomid if roomid else sender), sender
|
||||
await self.bot.send_text_message(
|
||||
(roomid if roomid else sender),
|
||||
success_message, sender
|
||||
)
|
||||
|
||||
return True, "补签成功"
|
||||
|
||||
except Exception as e:
|
||||
self.LOG.error(f"处理补签请求出错: {e}")
|
||||
self.message_util.send_text(
|
||||
f"❌ 补签出错:{e}",
|
||||
(roomid if roomid else sender), sender
|
||||
await self.bot.send_text_message(
|
||||
(roomid if roomid else sender),
|
||||
f"❌ 补签出错:{e}", sender
|
||||
)
|
||||
return False, f"处理出错: {e}"
|
||||
|
||||
Reference in New Issue
Block a user