Skip to content

Commit b165730

Browse files
committed
🍻 version 0.10.4
simplify self log
1 parent a93df05 commit b165730

6 files changed

Lines changed: 17 additions & 11 deletions

File tree

arclet/entari/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
from satori.client import Account as Account
3838
from satori.client.config import WebhookInfo as WebhookInfo
3939
from satori.client.config import WebsocketsInfo as WebsocketsInfo
40-
from satori.client.protocol import ApiProtocol as ApiProtocol
4140

4241
from . import command as command
4342
from . import scheduler as scheduler
@@ -64,4 +63,4 @@
6463
WH = WebhookInfo
6564
filter_ = Filter
6665

67-
__version__ = "0.10.3"
66+
__version__ = "0.10.4"

arclet/entari/command/provider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ async def __call__(self, context: Contexts):
138138

139139
class Assign(JudgeAuxiliary):
140140
def __init__(self, path: str, value: Any = _seminal, or_not: bool = False):
141-
super().__init__()
141+
super().__init__(priority=60)
142142
self.path = path
143143
self.value = value
144144
self.or_not = or_not

arclet/entari/core.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,16 @@ async def log_msg(event: MessageCreatedEvent):
7979
f"({event.user.id}) -> {event.message.content!r}"
8080
)
8181

82-
if cfg.get("record_send", True):
82+
if cfg.get("record_send", False):
8383

8484
@plg.use(SendResponse)
8585
async def log_send(event: SendResponse):
8686
if event.session:
87-
log.message.info(f"[{event.session.channel.name or event.session.channel.id}] <- {event.message!r}")
87+
log.message.info(
88+
f"[{event.session.channel.name or event.session.channel.id}] <- {event.message.display()!r}"
89+
)
8890
else:
89-
log.message.info(f"[{event.channel}] <- {event.message!r}")
91+
log.message.info(f"[{event.channel}] <- {event.message.display()!r}")
9092

9193

9294
class Entari(App):
@@ -132,7 +134,7 @@ def __init__(
132134
for plug in EntariConfig.instance.prelude_plugin:
133135
load_plugin(plug, prelude=True)
134136
plugins = [
135-
plug for plug in EntariConfig.instance.plugin if not plug.startswith("~") or not plug.startswith("$")
137+
plug for plug in EntariConfig.instance.plugin if not plug.startswith("~") and not plug.startswith("$")
136138
]
137139
requires(*plugins)
138140
for plug in plugins:

arclet/entari/event/send.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
from ..message import MessageChain
99

1010
if TYPE_CHECKING:
11-
from ..session import Session
11+
from ..session import SatoriEvent, Session
1212

1313

1414
@dataclass
1515
class SendRequest:
1616
account: Account
1717
channel: str
1818
message: MessageChain
19-
session: Union["Session", None] = None
19+
session: Union["Session[SatoriEvent]", None] = None
2020

2121
async def gather(self, context: Contexts):
2222
context["account"] = self.account

arclet/entari/message.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from typing import TYPE_CHECKING, Any, Callable, TypeVar, Union, overload
66
from typing_extensions import Self, SupportsIndex, TypeAlias
77

8-
from satori import Element, Text
98
from satori import select as satori_select
9+
from satori.element import At, Element, Link, Sharp, Style, Text
1010

1111
T = TypeVar("T")
1212
TE = TypeVar("TE", bound=Element)
@@ -610,3 +610,8 @@ def rstrip(self, *segments: str | Element | type[Element]) -> Self:
610610
else:
611611
break
612612
return self.__class__(copy)
613+
614+
def display(self):
615+
return "".join(
616+
str(elem) if isinstance(elem, (Text, Style, At, Sharp, Link)) else elem.__class__.__name__ for elem in self
617+
)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "arclet-entari"
3-
version = "0.10.3"
3+
version = "0.10.4"
44
description = "Simple IM Framework based on satori-python"
55
authors = [
66
{name = "RF-Tar-Railt",email = "rf_tar_railt@qq.com"},

0 commit comments

Comments
 (0)