🎨 format

Author: RF-Tar-Railt

example/plugins/demo.py

@@ -328,7 +328,7 @@ def id(self) -> str:
     async def message_provider(self, event, state, bot: Bot, use_origin: bool = False):
         if not isinstance(event, GroupMessageDeleteEvent):
             return None
-        return UniMessage(f"/recall {str(event.group_id)} {str(event.user_id)} {str(event.message_id)}")
+        return UniMessage(f"/recall {event.group_id} {event.user_id} {event.message_id}")
 
 
 recall = on_alconna(

pdm.lock

@@ -33,10 +33,10 @@ build-backend = "pdm.backend"
 [tool.pdm]
 [tool.pdm.dev-dependencies]
 dev = [
-    "isort>=5.13.2",
-    "black>=24.4.2",
+    "isort!=6.0.0",
+    "black>=25.1.0",
     "loguru>=0.7.2",
-    "ruff>=0.4.2",
+    "ruff>=0.8.4",
     "nonemoji>=0.1.4",
     "pre-commit>=3.7.0",
     "nonebug>=0.3.7",
@@ -52,12 +52,13 @@ dev = [
     "nonebot-adapter-dodo>=0.2.1",
     "nonebot-adapter-feishu>=2.6.0",
     "nonebot-adapter-kaiheila>=0.3.4",
+    "nonebot-adapter-mail>=1.0.0a7",
     "nonebot-adapter-mirai>=2.3.3",
     "nonebot-adapter-minecraft>=1.3.2",
     "nonebot-adapter-onebot>=2.4.5",
-    "nonebot-adapter-qq>=1.5.3",
+    "nonebot-adapter-qq>=1.6.2",
     "nonebot-adapter-red>=0.9.0",
-    "nonebot-adapter-satori>=0.13.0",
+    "nonebot-adapter-satori>=0.13.4",
     "nonebot-adapter-telegram>=0.1.0b18",
     "nonebot-adapter-kritor>=0.3.2",
     "nonebot-adapter-tailchat>=0.1.0b12",
@@ -67,7 +68,7 @@ dev = [
     "pytest-mock>=3.14.0",
     "nonebot-plugin-localstore>=0.7.1",
     "pyyaml>=6.0.1",
-    "nonebot-adapter-mail>=1.0.0a3",
+    "fix-future-annotations>=0.5.0",
 ]
 [tool.pdm.build]
 includes = ["src/nonebot_plugin_alconna"]
@@ -96,8 +97,102 @@ line-length = 120
 target-version = "py39"
 
 [tool.ruff.lint]
-select = ["E", "W", "F", "UP", "C", "T", "PYI", "PT", "Q"]
-ignore = ["C901", "T201", "E731", "E402", "PT023"]
+select = [
+    "F",     # pyflakes
+    "E",     # pycodestyle errors
+    "W",     # pycodestyle warnings
+    # "I",     # isort
+    "N",     # PEP8-naming
+    "UP",    # pyupgrade
+    "YTT",   # flake8-2020
+    "ASYNC", # flake8-async
+    # "S",     # flake8-bandit
+    "BLE",   # flake8-blind-except
+    # "FBT",   # flake8-boolean-trap
+    "B",     # flake8-bugbear
+    "A",     # flake8-builtins
+    "COM",   # flake8-commas
+    "C4",    # flake8-comprehensions
+    "DTZ",   # flake8-datetimez
+    "T10",   # flake8-debugger
+    # "FA",    # flake8-future-annotations
+    "ISC",   # flake8-implicit-str-concat
+    "ICN",   # flake8-import-conventions
+    "PIE",   # flake8-pie
+    "T20",   # flake8-print
+    "PYI",   # flake8-pyi
+    "Q",     # flake8-quotes
+    "RSE",   # flake8-raise
+    "RET",   # flake8-return
+    "SLOT",  # flake8-slots
+    "SIM",   # flake8-simplify
+    "TID",   # flake8-tidy-imports
+    # "TC",   # flake8-type-checking
+    # "ARG",   # flake8-unused-arguments
+    "PTH",   # flake8-use-pathlib
+    # "ERA",   # eradicate
+    "PD",    # pandas-vet
+    "PGH",   # pygrep-hooks
+    "PL",    # pylint
+    "TRY",   # tryceratops
+    "FLY",   # flynt
+    "FAST",  # FastAPI
+    "PERF",  # Perflint
+    "FURB",  # refurb
+    "RUF",   # Ruff-specific rules
+]
+ignore = [
+    "C901",
+    "T201",
+    "E731",
+    "PT023",
+    "B010",  #  Do not call `setattr` with a constant attribute value.
+    "SIM105",  # Use `contextlib.suppress`
+    "B008",  # Do not perform function call in argument defaults
+    "RUF100", # Unused `noqa` directive
+    "TC003",  # Move xxx into a type-checking block
+    "E402",  # module level import not at top of file
+    "E501",   # 过长的行由 ruff format 处理, 剩余的都是字符串
+    "UP035",  # pyupgrade, 但 typing.Callable 的导入会报错
+    "TRY003",
+    "TRY301",  # 为啥非要把 raise 丢进另外一个 inner fn 里
+    "BLE001",  # except Exception as e
+    "PGH003",  # 要求 `# type: ignore` 提供理由，但 pyright 和 mypy 等都不是统一标准。
+    "PLC0414",  # 用 import-as 表示 re-export
+    "N818",  # 要求所有自定义错误以 Error 作后缀，但我们不这么做
+    "RET502", # return = return None
+    "RET503",  # 就要 implicit return none
+    "PLC0105",  # 我们已经用 R 表示协变，Q 表示逆变了
+    "PLR0913",  # 参数就那么多的，你用 builder 什么的不是更逆天？
+    "SIM108",  # 迫真 simplicy
+    "RUF001",  # String contains ambiguous `，` (FULLWIDTH COMMA). Did you mean `,` (COMMA)?
+    "RUF002",  # Docstring contains ambiguous `，` (FULLWIDTH COMMA). Did you mean `,` (COMMA)?
+    "RUF009",  # 我不想要额外的全局变量。
+    "UP038",  # instance(..., X | Y) 还是太超前了
+    "RUF003",  # 中文注释里用全角符号怎么你了
+    "SLOT000", # 动态类型需求，主要是 json5 backend
+    "PLR0911", "PLR0912", "PLR0915",  # 复杂度高点怎么你了
+    "PYI041", # int 和 float 在运行时的类型没有交集（互不成立 issubclass）
+    "PLW2901",  # shallow 怎么你了
+    "S101", # assert 怎么你了，非要 RuntimeError 吗
+    "PLR2004",  # magic number 怎么你了
+    "TRY004",  # 我要抛啥错误我清楚
+    "COM812", # 强制尾随逗号
+    "TID252", # 相对导入
+    "ISC001", # format warning
+    "N801", # Class name should use CapWords convention
+    "N802", # Function name should be lowercase
+    "N804", # First argument of a class method should be named `cls`
+    "N805", # First argument of a method should be named `self`
+    "N806", # Variable in function should be lowercase
+]
+flake8-quotes = { inline-quotes = "double", multiline-quotes = "double" }
+
+[tool.ruff.lint.flake8-annotations]
+mypy-init-return = true
+
+[tool.ruff.lint.flake8-builtins]
+builtins-ignorelist = ["id"]
 
 [tool.pyright]
 pythonVersion = "3.9"

pyproject.toml

@@ -9,11 +9,13 @@
 def markup(self, text: Text):
     if text.extract_most_style().startswith("markdown"):
         return MessageSegment.markup(text.text, style=text.extract_most_style().split(":")[1])
+    return None
 
 
 def markdown(self, text: Text):
     if text.extract_most_style().startswith("markdown"):
         return MessageSegment.markdown(text.text, code_theme=text.extract_most_style().split(":")[1])
+    return None
 
 
 Markup = TextSegmentPattern("markup", MessageSegment, MessageSegment.markup, markup)

src/nonebot_plugin_alconna/adapters/console.py

@@ -115,7 +115,7 @@ def _translate_args(args: Args) -> list[AnyCommandOption]:
                     )
                 )
             continue
-        elif arg.value == ANY:
+        if arg.value == ANY:
             result.append(
                 StringOption(
                     name=arg.name,

src/nonebot_plugin_alconna/adapters/discord.py

@@ -31,8 +31,7 @@ def mention_channel(channel_id: str):
 def emoji(id: str, name: str = ""):
     if name:
         return MessageSegment.KMarkdown(f"(emj){name}(emj)[{id}]")
-    else:
-        return MessageSegment.KMarkdown(f":{id}:")
+    return MessageSegment.KMarkdown(f":{id}:")
 
 
 Mention = At = SegmentPattern("mention", _Mention, UniAt, MessageSegment.mention)
@@ -53,6 +52,7 @@ def emoji(id: str, name: str = ""):
 def kmarkdown(self, text: UniText):
     if text.extract_most_style() == "markdown":
         return MessageSegment.KMarkdown(text.text, text.text)
+    return None
 
 
 KMarkdown = TextSegmentPattern("kmarkdown", _KMarkdown, MessageSegment.KMarkdown, kmarkdown)

src/nonebot_plugin_alconna/adapters/kook.py

@@ -50,6 +50,7 @@
 def markdown(self, x: Text):
     if x.extract_most_style() == "markdown":
         return MessageSegment.markdown(x.text)
+    return None
 
 
 Markdown = TextSegmentPattern("markdown", _Markdown, MessageSegment.markdown, markdown)

src/nonebot_plugin_alconna/adapters/kritor.py

@@ -9,6 +9,7 @@
 def is_html(self, text: Text):
     if text.extract_most_style().startswith("html"):
         return MessageSegment.html(text.text)
+    return None
 
 
 Markup = TextSegmentPattern("html", MessageSegment, MessageSegment.html, is_html)

src/nonebot_plugin_alconna/adapters/mail.py

@@ -51,6 +51,7 @@
 def markdown(self, x: Text):
     if x.extract_most_style() == "markdown":
         return MessageSegment.markdown(x.text)
+    return None
 
 
 Markdown = TextSegmentPattern("markdown", _Markdown, MessageSegment.markdown, markdown)

src/nonebot_plugin_alconna/adapters/qq.py

@@ -47,8 +47,8 @@ def link(self, x: Text):
     if x.extract_most_style() == "link":
         if not getattr(x, "_children", []):
             return MessageSegment.link(x.text)
-        else:
-            return MessageSegment.link(x.text, x._children[0].text)  # type: ignore
+        return MessageSegment.link(x.text, x._children[0].text)  # type: ignore
+    return None
 
 
 Link = TextSegmentPattern("link", _Link, MessageSegment.link, link)