fix: readUntilTab

清理readUntilTab对GBK编码的特化补丁
rename: strCharacterTooBig->strBuildTooMany

Author: mystringEmpty

.gitignore

@@ -33,6 +33,7 @@
 
 # Directories for temporary file
 /.vs
+/.vscode
 /build
 /Dice/Release
 /Dice/Debug

Dice/DiceAttrVar.cpp

@@ -692,17 +692,18 @@ bool AttrVar::equal_or_less(const AttrVar& other)const {
 void AnysTable::from_json(const fifo_json& j){
 	if (j.is_object()) {
 		unordered_set<string> idxs;
-		if (string strI{ "0" }; j.count(strI)) {
+		fifo_json tab{j};
+		if (string strI{ "0" }; tab.count(strI)) {
 			new_list();
 			int idx{ 0 };
 			do {
-				list->push_back(j[strI]);
+				list->push_back(tab[strI]);
 				idxs.insert(strI);
-			} while (j.count(strI = to_string(++idx)));
+				tab.erase(strI);
+			} while (tab.count(strI = to_string(++idx)));
 		}
-		for (auto& it : j.items()) {
-			if (idxs.count(it.key()))continue;
-			if (!it.value().is_null())set(it.key(), it.value());
+		for (auto& it : tab.items()) {
+			if (!idxs.count(it.key()) && !it.value().is_null())set(it.key(), it.value());
 		}
 	}
 	else if (j.is_array()) {

Dice/DiceEvent.cpp

@@ -1204,29 +1204,23 @@ int DiceEvent::BasicOrder()
 						}
 						trigger->answer = AnysTable(deck);
 					}
+					else if (trigger->echo == DiceMsgReply::Echo::Text) {
+						trigger->answer->set("text", readRest());
+					}
 					else {
+						if (trusted < 5) {
+							replyMsg("strNotMaster");
+							return -1;
+						}
 						if (trigger->echo == DiceMsgReply::Echo::Lua) {
-							if (trusted < 5) {
-								replyMsg("strNotMaster");
-								return -1;
-							}
 							trigger->answer = AttrVars{ {"lua",readRest()} };
 						}
 						else if (trigger->echo == DiceMsgReply::Echo::JavaScript) {
-							if (trusted < 5) {
-								replyMsg("strNotMaster");
-								return -1;
-							}
 							trigger->answer = AttrVars{ {"js",readRest()} };
 						}
 						else if (trigger->echo == DiceMsgReply::Echo::Python) {
-							if (trusted < 5) {
-								replyMsg("strNotMaster");
-								return -1;
-							}
 							trigger->answer = AttrVars{ {"py",readRest()} };
 						}
-						else trigger->answer->set("text", readRest());
 					}
 					break;
 				}
@@ -2305,12 +2299,12 @@ int DiceEvent::InnerOrder() {
 		}
 		string_view strNum{ strMsg.c_str() + nBegin,intMsgCnt - nBegin };
 		if (strNum.length() > 2) {
-			replyMsg("strCharacterTooBig");
+			replyMsg("strBuildTooMany");
 			return 1;
 		}
 		const int intNum = strNum.empty() ? 1 : svtoi(strNum);
 		if (intNum > 10) {
-			replyMsg("strCharacterTooBig");
+			replyMsg("strBuildTooMany");
 			return 1;
 		}
 		if (intNum == 0) {
@@ -2814,7 +2808,7 @@ int DiceEvent::InnerOrder() {
 			intMsgCnt++;
 		}
 		if (strNum.length() > 1 && strNum != "10") {
-			replyMsg("strCharacterTooBig");
+			replyMsg("strBuildTooMany");
 			return 1;
 		}
 		const int intNum = stoi(strNum.empty() ? "1" : strNum);
@@ -2836,7 +2830,7 @@ int DiceEvent::InnerOrder() {
 			intMsgCnt++;
 		}
 		if (strNum.length() > 1 && strNum != "10") {
-			replyMsg("strCharacterTooBig");
+			replyMsg("strBuildTooMany");
 			return 1;
 		}
 		const int intNum = stoi(strNum.empty() ? "1" : strNum);

Dice/DiceEvent.h

@@ -3,7 +3,7 @@
 /*
  * 消息处理
  * Copyright (C) 2018-2021 w4123
- * Copyright (C) 2019-2024 String.Empty
+ * Copyright (C) 2019-2025 String.Empty
  */
 #ifndef DICE_EVENT
 #define DICE_EVENT
@@ -109,8 +109,7 @@ class DiceEvent : public AnysTable {
 		while (intMsgCnt < len && (!isspace(static_cast<unsigned char>(strMsg[intMsgCnt])) || strMsg[intMsgCnt] == ' '))
 		{
 			if (strMsg[intMsgCnt] != ' ' || strMsg[intEnd] != ' ')intEnd = intMsgCnt;
-			if (intMsgCnt < len && strMsg[intMsgCnt] < 0)intMsgCnt += 2;
-			else intMsgCnt++;
+			intMsgCnt++;
 		}
 		if (strMsg[intEnd] == ' ')intMsgCnt = intEnd;
 		return strMsg.substr(intBegin, intMsgCnt - intBegin);

Dice/GlobalVar.cpp

@@ -8,7 +8,7 @@
  *
  * Dice! QQ Dice Robot for TRPG
  * Copyright (C) 2018-2021 w4123溯洄
- * Copyright (C) 2019-2024 String.Empty
+ * Copyright (C) 2019-2025 String.Empty
  *
  * This program is free software: you can redistribute it and/or modify it under the terms
  * of the GNU Affero General Public License as published by the Free Software Foundation,
@@ -333,7 +333,7 @@ const dict_ci<string> PlainMsg
 	{"strSetTooBig", "这面数……让我丢个球啊!请{nick}输入1-9999之间的数字!"},
 	{"strSetCannotBeZero", "默认骰不能为零!请{nick}输入1-9999之间的数字!"},
 	{"strCharacterCannotBeZero", "人物作成次数不能为零!请输入1-10之间的数字!"},
-	{"strCharacterTooBig", "人物作成次数过多!请输入1-10之间的数字!"},
+	{"strBuildTooMany", "人物作成次数过多!请输入1-10之间的数字!"},
 	{"strCharacterInvalid", "人物作成次数无效!请输入1-10之间的数字!"},
 	{"strSanityRoll", "{pc}的San Check：\n{res} {grade:rank?2={strSuccess}&1={strFailure}&0={strFumble}}\n{case:loss?0=无理智损失√&else=理智减少{change}->剩余{final}}" },
 	{"strSanCostInvalid", "{pc}输入SC表达式不正确,格式为成功扣San/失败扣San,如1/1d6!"},
@@ -379,11 +379,11 @@ const dict_ci<string> PlainMsg
 	{"strNameSet", "{self}已将{old_nick}改称为{new_nick}√"},
 	{"strNameDel", "{self}已删除{old_nick}在当前窗口的称呼√" },
 	{"strNameClr", "{self}已清空{old_nick}的所有称呼√" },
-	{"strUnknownPropErr", "未设定{attr}成功率，请先.st {attr} 技能值 或查看.help rc×"},
+	{"strUnknownPropErr", "未设定{attr}成功率，请{pc}先.st {attr} 技能值 或查看.help rc×"},
 	{"strPropErr", "{pc}的属性录入存在异常，请遵守规范:\n{err}"},
-	{"strSetPropSuccess", "已为{pc}录入{cnt}条属性√"},
-	{"strPropCleared", "已清空{char}的所有属性√"},
-	{"strRuleReset", "已重置默认规则√"},
+	{"strSetPropSuccess", "{self}已为{pc}录入{cnt}条属性√"},
+	{"strPropCleared", "{self}已清空{char}的所有属性√"},
+	{"strRuleReset", "{self}已重置默认规则√"},
 	{"strRuleSet", "{self}已设置默认规则{rule}√"},
 	{"strRuleErr", "规则数据获取失败,具体信息:\n"},
 	{"strRulesFailedErr", "请求失败,{self}无法连接数据库×"},
@@ -451,8 +451,7 @@ const dict_ci<string> PlainMsg
 .help群管 查看群管指令
 .help设定 确认骰娘设定
 .help链接 查看源码文档
-官方论坛: https://forum.kokona.tech/
-Dice!众筹计划: https://afdian.net/@suhuiw4123)"
+官方论坛: https://forum.kokona.tech/)"
 	}
 };
 dict_ci<string> GlobalMsg{ PlainMsg };