mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-09 13:50:00 +08:00
🎨 修复bug,移除plugins文件夹
This commit is contained in:
@@ -33,7 +33,7 @@ class FgRequest(Model):
|
||||
)
|
||||
"""处理类型"""
|
||||
|
||||
class Meta:
|
||||
class Meta: # type: ignore
|
||||
table = "fg_request"
|
||||
table_description = "好友群组请求"
|
||||
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
from tortoise import fields
|
||||
from typing import Any
|
||||
from typing_extensions import Self
|
||||
|
||||
from tortoise import fields
|
||||
from tortoise.backends.base.client import BaseDBAsyncClient
|
||||
|
||||
from zhenxun.models.task_info import TaskInfo
|
||||
from zhenxun.services.db_context import Model
|
||||
|
||||
|
||||
@@ -35,11 +39,64 @@ class GroupConsole(Model):
|
||||
platform = fields.CharField(255, default="qq", description="所属平台")
|
||||
"""所属平台"""
|
||||
|
||||
class Meta:
|
||||
class Meta: # type: ignore
|
||||
table = "group_console"
|
||||
table_description = "群组信息表"
|
||||
unique_together = ("group_id", "channel_id")
|
||||
|
||||
@classmethod
|
||||
async def create(
|
||||
cls, using_db: BaseDBAsyncClient | None = None, **kwargs: Any
|
||||
) -> Self:
|
||||
"""覆盖create方法"""
|
||||
group = await super().create(using_db=using_db, **kwargs)
|
||||
if modules := await TaskInfo.filter(default_status=False).values_list(
|
||||
"module", flat=True
|
||||
):
|
||||
group.block_task = ",".join(modules) + "," # type: ignore
|
||||
await group.save(using_db=using_db, update_fields=["block_task"])
|
||||
return group
|
||||
|
||||
@classmethod
|
||||
async def get_or_create(
|
||||
cls,
|
||||
defaults: dict | None = None,
|
||||
using_db: BaseDBAsyncClient | None = None,
|
||||
**kwargs: Any,
|
||||
) -> tuple[Self, bool]:
|
||||
"""覆盖get_or_create方法"""
|
||||
group, is_create = await super().get_or_create(
|
||||
defaults=defaults, using_db=using_db, **kwargs
|
||||
)
|
||||
if is_create and (
|
||||
modules := await TaskInfo.filter(default_status=False).values_list(
|
||||
"module", flat=True
|
||||
)
|
||||
):
|
||||
group.block_task = ",".join(modules) + "," # type: ignore
|
||||
await group.save(using_db=using_db, update_fields=["block_task"])
|
||||
return group, is_create
|
||||
|
||||
@classmethod
|
||||
async def update_or_create(
|
||||
cls,
|
||||
defaults: dict | None = None,
|
||||
using_db: BaseDBAsyncClient | None = None,
|
||||
**kwargs: Any,
|
||||
) -> tuple[Self, bool]:
|
||||
"""覆盖update_or_create方法"""
|
||||
group, is_create = await super().update_or_create(
|
||||
defaults=defaults, using_db=using_db, **kwargs
|
||||
)
|
||||
if is_create and (
|
||||
modules := await TaskInfo.filter(default_status=False).values_list(
|
||||
"module", flat=True
|
||||
)
|
||||
):
|
||||
group.block_task = ",".join(modules) + "," # type: ignore
|
||||
await group.save(using_db=using_db, update_fields=["block_task"])
|
||||
return group, is_create
|
||||
|
||||
@classmethod
|
||||
async def get_group(
|
||||
cls, group_id: str, channel_id: str | None = None
|
||||
@@ -67,9 +124,7 @@ class GroupConsole(Model):
|
||||
返回:
|
||||
bool: 是否超级用户指定群
|
||||
"""
|
||||
if group := await cls.get_group(group_id):
|
||||
return group.is_super
|
||||
return False
|
||||
return group.is_super if (group := await cls.get_group(group_id)) else False
|
||||
|
||||
@classmethod
|
||||
async def is_super_block_plugin(
|
||||
|
||||
@@ -2,9 +2,6 @@ from tortoise import fields
|
||||
|
||||
from zhenxun.services.db_context import Model
|
||||
|
||||
from .ban_console import BanConsole
|
||||
from .group_console import GroupConsole
|
||||
|
||||
|
||||
class TaskInfo(Model):
|
||||
id = fields.IntField(pk=True, generated=True, auto_increment=True)
|
||||
@@ -15,41 +12,20 @@ class TaskInfo(Model):
|
||||
"""被动技能名称"""
|
||||
status = fields.BooleanField(default=True, description="全局开关状态")
|
||||
"""全局开关状态"""
|
||||
default_status = fields.BooleanField(default=True, description="进群默认开关状态")
|
||||
"""全局开关状态"""
|
||||
run_time = fields.CharField(255, null=True, description="运行时间")
|
||||
"""运行时间"""
|
||||
run_count = fields.IntField(default=0, description="运行次数")
|
||||
"""运行次数"""
|
||||
|
||||
class Meta:
|
||||
class Meta: # type: ignore
|
||||
table = "task_info"
|
||||
table_description = "被动技能基本信息"
|
||||
|
||||
@classmethod
|
||||
async def is_block(cls, module: str, group_id: str | None) -> bool:
|
||||
"""判断被动技能是否可以发送
|
||||
|
||||
参数:
|
||||
module: 被动技能模块名
|
||||
group_id: 群组id
|
||||
|
||||
返回:
|
||||
bool: 是否可以发送
|
||||
"""
|
||||
if task := await cls.get_or_none(module=module):
|
||||
"""被动全局状态"""
|
||||
if not task.status:
|
||||
return True
|
||||
if group_id:
|
||||
if await GroupConsole.is_block_task(group_id, module):
|
||||
"""群组是否禁用被动"""
|
||||
return True
|
||||
if g := await GroupConsole.get_or_none(
|
||||
group_id=group_id, channel_id__isnull=True
|
||||
):
|
||||
"""群组权限是否小于0"""
|
||||
if g.level < 0:
|
||||
return True
|
||||
if await BanConsole.is_ban(None, group_id):
|
||||
"""群组是否被ban"""
|
||||
return True
|
||||
return False
|
||||
async def _run_script(cls):
|
||||
return [
|
||||
"ALTER TABLE task_info ADD default_status boolean DEFAULT true;",
|
||||
# 默认状态
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user