From 7ebd6b80ecc9a9b75f0c220ad7ab21afc4b2810b Mon Sep 17 00:00:00 2001
From: yzhh <2596322644@qq.com>
Date: Tue, 8 Jun 2021 20:53:49 +0800
Subject: [PATCH] split something

---
 core/parser.py   | 12 ++----------
 core/template.py | 11 +++++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/parser.py b/core/parser.py
index 2d7d2cf9..f8f141f7 100644
--- a/core/parser.py
+++ b/core/parser.py
@@ -5,7 +5,7 @@ from graia.application import Friend
 from graia.application.group import Group
 
 from core.loader import Modules, logger_info
-from core.template import sendMessage, Nudge, kwargs_GetTrigger, kwargs_AsDisplay
+from core.template import sendMessage, Nudge, kwargs_GetTrigger, kwargs_AsDisplay, RemoveDuplicateSpace
 from core.utils import remove_ineffective_text
 from database import BotDB as database
 
@@ -18,20 +18,12 @@ async def parser(kwargs: dict):
     :param kwargs: 从监听器接收到的dict，该dict将会经过此预处理器传入下游
     :return: 无返回
     """
-    display = kwargs_AsDisplay(kwargs)  # 将消息转换为一般显示形式
+    display = RemoveDuplicateSpace(kwargs_AsDisplay(kwargs))  # 将消息转换为一般显示形式
     if len(display) == 0:  # 转换后若为空消息则停止执行
         return
     trigger = kwargs_GetTrigger(kwargs)  # 得到触发者来源
     if trigger == 1143754816:  # 特殊规则
         display = re.sub('^.*:\n', '', display)
-    strip_display_space = display.split(' ')
-    display_list = []  # 清除指令中间多余的空格
-    for x in strip_display_space:
-        if x != '':
-            display_list.append(x)
-    display = ' '.join(display_list)
-    if len(display) == 0:  # 转换后若为空消息则停止执行
-        return
     if database.check_black_list(trigger):  # 检查是否在黑名单
         if not database.check_white_list(trigger):  # 检查是否在白名单
             return  # 在黑名单且不在白名单，给我爪巴
diff --git a/core/template.py b/core/template.py
index d150117b..6a9d498c 100644
--- a/core/template.py
+++ b/core/template.py
@@ -126,6 +126,17 @@ def kwargs_AsDisplay(kwargs: dict):
     return display
 
 
+def RemoveDuplicateSpace(text: str):
+    strip_display_space = text.split(' ')
+    display_list = []  # 清除指令中间多余的空格
+    for x in strip_display_space:
+        if x != '':
+            display_list.append(x)
+    text = ' '.join(display_list)
+    return text
+
+
+
 async def revokeMessage(msgchain):
     """
     用于撤回消息。