Skip to content

Commit

Permalink
🔧 adapt to launart 0.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
BlueGlassBlock committed Jun 8, 2022
1 parent 1573248 commit d987dd6
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 15 deletions.
15 changes: 9 additions & 6 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions src/graia/ariadne/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,9 @@ def _ensure_config(cls):
cls.held_objects.setdefault(asyncio.AbstractEventLoop, cls.service.loop)
if "install_log" not in cls.options:
sys.excepthook = loguru_exc_callback
traceback.print_exception = loguru_exc_callback
traceback.print_exception = loguru_exc_callback
cls.service.loop.set_exception_handler(loguru_exc_callback_async)
cls.options["installed_log"] = True

@classmethod
def config(
Expand Down Expand Up @@ -165,6 +166,7 @@ def config(
)

richuru.install(**option._asdict())
traceback.print_exception = option.exc_hook
cls.options["installed_log"] = True

if inject_bypass_listener and "inject_bypass_listener" not in cls.options:
Expand Down Expand Up @@ -252,9 +254,13 @@ def launch_blocking(cls):

@classmethod
def stop(cls):
tsk = cls.launch_manager.blocking_task
if tsk:
tsk.cancel()
mgr = cls.launch_manager
mgr.status.exiting = True
if mgr.taskgroup is not None:
mgr.taskgroup.stop = True
task = mgr.taskgroup.blocking_task
if task and not task.done():
task.cancel()

@classmethod
def create(cls, typ: Type[T], reuse: bool = True) -> T:
Expand Down
2 changes: 1 addition & 1 deletion src/graia/ariadne/message/element.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ class Json(Element):

type = "Json"

json: str
Json: str = Field(None, alias="json")
"""JSON 文本"""

def __init__(self, json: Union[dict, list, str], **kwargs) -> None:
Expand Down
8 changes: 4 additions & 4 deletions src/graia/ariadne/model/relationship.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,16 @@ class Member(AriadneBaseModel, AttrConvertMixin):
permission: MemberPerm
"""群权限"""

special_title: Optional[str] = Field(..., alias="specialTitle")
special_title: Optional[str] = Field(None, alias="specialTitle")
"""特殊头衔"""

join_timestamp: Optional[int] = Field(..., alias="joinTimestamp")
join_timestamp: Optional[int] = Field(None, alias="joinTimestamp")
"""加入的时间"""

last_speak_timestamp: Optional[int] = Field(..., alias="lastSpeakTimestamp")
last_speak_timestamp: Optional[int] = Field(None, alias="lastSpeakTimestamp")
"""最后发言时间"""

mute_time: Optional[int] = Field(..., alias="mutetimeRemaining")
mute_time: Optional[int] = Field(None, alias="mutetimeRemaining")
"""禁言剩余时间"""

group: Group
Expand Down

0 comments on commit d987dd6

Please sign in to comment.