From 5f2fc632bb6cf9ad8767e5aed18e22f00617f2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E6=81=92?= <2323333339@qq.com>
Date: Mon, 19 Apr 2021 17:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/factory.php  | 28 +++++++++++++++++-----------
 core/function.php |  2 +-
 functions.php     | 11 +++++++++++
 package.json      |  2 +-
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/core/factory.php b/core/factory.php
index f8f0430..c26f73d 100644
--- a/core/factory.php
+++ b/core/factory.php
@@ -5,23 +5,29 @@ class Intercept
 {
     public static function message($comment)
     {
-        /* 如果用户输入内容画图模式 */
+        /* 用户输入内容画图模式 */
         if (preg_match('/\{!\{(.*)\}!\}/', $comment['text'], $matches)) {
             /* 如果判断是否有双引号，如果有双引号，则禁止评论 */
             if (strpos($matches[1], '"') !== false || _checkXSS($matches[1])) {
                 $comment['status'] = 'waiting';
             }
+            /* 普通评论 */
         } else {
-            /* 判断评论内容是否包含敏感词 */
-            if (Helper::options()->JSensitiveWords) {
-                if (_checkSensitiveWords(Helper::options()->JSensitiveWords, $comment['text'])) {
-                    $comment['status'] = 'waiting';
+            /* 判断用户输入是否大于字符 */
+            if (Helper::options()->JTextLimit && strlen($comment['text']) > Helper::options()->JTextLimit) {
+                $comment['status'] = 'waiting';
+            } else {
+                /* 判断评论内容是否包含敏感词 */
+                if (Helper::options()->JSensitiveWords) {
+                    if (_checkSensitiveWords(Helper::options()->JSensitiveWords, $comment['text'])) {
+                        $comment['status'] = 'waiting';
+                    }
                 }
-            }
-            /* 判断评论是否至少包含一个中文 */
-            if (Helper::options()->JLimitOneChinese === "on") {
-                if (preg_match("/[\x{4e00}-\x{9fa5}]/u", $comment['text']) == 0) {
-                    $comment['status'] = 'waiting';
+                /* 判断评论是否至少包含一个中文 */
+                if (Helper::options()->JLimitOneChinese === "on") {
+                    if (preg_match("/[\x{4e00}-\x{9fa5}]/u", $comment['text']) == 0) {
+                        $comment['status'] = 'waiting';
+                    }
                 }
             }
         }
@@ -55,7 +61,7 @@ class Editor
                 themeURL: '<?php Helper::options()->themeUrl(); ?>'
             }
         </script>
-       
+
         <script src="https://cdn.jsdelivr.net/npm/typecho-joe-next@6.2.4/plugin/prism/prism.min.js"></script>
         <script src="<?php Helper::options()->themeUrl('typecho/write/js/joe.parse.min.js?v=202104191518') ?>"></script>
         <script src="<?php Helper::options()->themeUrl('typecho/write/js/joe.write.chunk.js?v=202104191518') ?>"></script>
diff --git a/core/function.php b/core/function.php
index abca2ed..995d487 100644
--- a/core/function.php
+++ b/core/function.php
@@ -2,7 +2,7 @@
 /* 获取主题当前版本号 */
 function _getVersion()
 {
-	return "6.4.7";
+	return "6.4.8";
 };
 
 /* 判断是否是手机 */
diff --git a/functions.php b/functions.php
index 10897c6..3b60839 100644
--- a/functions.php
+++ b/functions.php
@@ -864,6 +864,17 @@ function themeConfig($form)
     $JLimitOneChinese->setAttribute('class', 'joe_content joe_other');
     $form->addInput($JLimitOneChinese->multiMode());
 
+    $JTextLimit = new Typecho_Widget_Helper_Form_Element_Text(
+        'JTextLimit',
+        NULL,
+        NULL,
+        '限制用户评论最大字符',
+        '介绍：如果用户评论的内容超出字符限制，则将会把评论置为审核状态 <br />
+         其他：请输入数字格式，不填写则不限制'
+    );
+    $JTextLimit->setAttribute('class', 'joe_content joe_other');
+    $form->addInput($JTextLimit->multiMode());
+
     $JSiteMap = new Typecho_Widget_Helper_Form_Element_Select(
         'JSiteMap',
         array(
diff --git a/package.json b/package.json
index c5946de..db1ffe9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "typecho-joe-next",
-	"version": "6.4.7",
+	"version": "6.4.8",
 	"description": "A Theme Of Typecho",
 	"main": "index.php",
 	"keywords": [