From 189cf23720b69cc3edd3ed5043e2030b9ae74cd7 Mon Sep 17 00:00:00 2001
From: Richard Chien <richardchienthebest@gmail.com>
Date: Fri, 25 Jan 2019 21:55:07 +0800
Subject: [PATCH] Adjust

---
 nonebot/command/__init__.py             | 28 ++++++++++++---
 nonebot/command/argfilter/__init__.py   | 48 ++-----------------------
 nonebot/command/argfilter/validators.py |  3 +-
 3 files changed, 29 insertions(+), 50 deletions(-)

diff --git a/nonebot/command/__init__.py b/nonebot/command/__init__.py
index c68e668e..40edc164 100644
--- a/nonebot/command/__init__.py
+++ b/nonebot/command/__init__.py
@@ -3,7 +3,8 @@ import re
 import shlex
 from datetime import datetime
 from typing import (
-    Tuple, Union, Callable, Iterable, Any, Optional, List, Dict
+    Tuple, Union, Callable, Iterable, Any, Optional, List, Dict,
+    Awaitable
 )
 
 from nonebot import NoneBot, permission as perm
@@ -71,15 +72,34 @@ class Command:
             if session.current_arg_filters is not None and \
                     session.current_key is not None:
                 # argument-level filters are given, use them
-                await argfilter.run_arg_filters(
-                    session, session.current_arg_filters)
+                arg = session.current_arg
+                for f in session.current_arg_filters:
+                    try:
+                        res = f(arg)
+                        if isinstance(res, Awaitable):
+                            res = await res
+                        arg = res
+                    except ValidateError as e:
+                        # validation failed
+                        failure_message = e.message
+                        if failure_message is None:
+                            config = session.bot.config
+                            failure_message = render_expression(
+                                config.DEFAULT_VALIDATION_FAILURE_EXPRESSION
+                            )
+                        # noinspection PyProtectedMember
+                        session.pause(failure_message,
+                                      **session._current_send_kwargs)
+
+                # passed all filters
+                session.state[session.current_key] = arg
             else:
                 # fallback to command-level args_parser_func
                 if self.args_parser_func:
                     await self.args_parser_func(session)
                 elif session.current_key is not None:
                     # no args_parser_func, fallback to default behavior
-                    await argfilter.run_arg_filters(session, [])
+                    session.state[session.current_key] = session.current_arg
 
             await self.func(session)
             return True
diff --git a/nonebot/command/argfilter/__init__.py b/nonebot/command/argfilter/__init__.py
index ee751bce..2a199708 100644
--- a/nonebot/command/argfilter/__init__.py
+++ b/nonebot/command/argfilter/__init__.py
@@ -1,50 +1,8 @@
-from typing import Awaitable, List, TYPE_CHECKING
+from typing import Optional
 
-from nonebot.helpers import render_expression
-from nonebot.typing import Filter_T
-
-if TYPE_CHECKING:
-    from nonebot.command import CommandSession
+from nonebot.typing import Message_T
 
 
 class ValidateError(ValueError):
-    def __init__(self, message=None):
+    def __init__(self, message: Optional[Message_T] = None):
         self.message = message
-
-
-async def run_arg_filters(session: 'CommandSession',
-                          arg_filters: List[Filter_T]) -> None:
-    """
-    Run a specific list of argument filters on a command session.
-
-    This will call all argument filter functions successively,
-    with `session.current_arg` as the argument.
-
-    If all filters are passed, the final result will be put into
-    `session.state` with the key `session.current_key`.
-
-    If some validation failed, the session will be paused and
-    failure message will be sent to the user.
-
-    :param session: command session to run on
-    :param arg_filters: argument filters
-    """
-    arg = session.current_arg
-    for f in arg_filters:
-        try:
-            res = f(arg)
-            if isinstance(res, Awaitable):
-                res = await res
-            arg = res
-        except ValidateError as e:
-            # validation failed
-            failure_message = e.message
-            if failure_message is None:
-                failure_message = render_expression(
-                    session.bot.config.DEFAULT_VALIDATION_FAILURE_EXPRESSION
-                )
-            # noinspection PyProtectedMember
-            session.pause(failure_message, **session._current_send_kwargs)
-
-    # passed all filters
-    session.state[session.current_key] = arg
diff --git a/nonebot/command/argfilter/validators.py b/nonebot/command/argfilter/validators.py
index edbcd36c..9c745e4a 100644
--- a/nonebot/command/argfilter/validators.py
+++ b/nonebot/command/argfilter/validators.py
@@ -1,7 +1,8 @@
 import re
 from typing import Callable, Any
 
-from nonebot.command.argfilter import ValidateError, Filter_T
+from nonebot.command.argfilter import ValidateError
+from nonebot.typing import Filter_T
 
 
 class BaseValidator: