LamGC/ContentGrabbingJi
1
0
Fork 0
mirror of https://github.com/LamGC/ContentGrabbingJi.git synced 2025-04-30 06:37:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fix] 修复使用双引号引用的参数值没有过滤双引号的bug;

Browse Source
This commit is contained in:
LamGC 2020-03-31 10:56:08 +08:00
parent fd8b38d6fd
commit e4e7771d4d
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/net/lamgc/cgj/CQPluginMain.java
View File

@ -85,10 +85,26 @@ public class CQPluginMain extends CQPlugin {
Matcher matcher = pattern.matcher(Strings.nullToEmpty(msg)); Matcher matcher = pattern.matcher(Strings.nullToEmpty(msg));
ArrayList<String> argsList = new ArrayList<>(); ArrayList<String> argsList = new ArrayList<>();
while (matcher.find()) { while (matcher.find()) {
argsList.add(matcher.group()); String arg = matcher.group();
int startIndex = 0;
int endIndex = arg.length();
if(arg.startsWith("\"")) {
while(arg.indexOf("\"") == startIndex) {
startIndex++;
}
}
if(arg.endsWith("\"")) {
while(arg.lastIndexOf("\"") == endIndex - 1) {
endIndex--;
}
}
argsList.add(arg.substring(startIndex, endIndex));
} }
String[] args = new String[argsList.size()]; String[] args = new String[argsList.size()];
argsList.toArray(args); argsList.toArray(args);
log.debug("传入参数: {}", Arrays.toString(args));
log.warn("正在处理命令..."); log.warn("正在处理命令...");
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
@ -115,7 +131,11 @@ public class CQPluginMain extends CQPlugin {
} }
log.warn("命令处理完成(耗时: {}ms)", System.currentTimeMillis() - time); log.warn("命令处理完成(耗时: {}ms)", System.currentTimeMillis() - time);
if(Objects.requireNonNull(result) instanceof String) { if(Objects.requireNonNull(result) instanceof String) {
sendMessage(cq, event, (String) result, false); try {
sendMessage(cq, event, (String) result, false);
} catch (Throwable e) {
log.error("发送消息时发生异常", e);
}
} }
return MESSAGE_BLOCK; return MESSAGE_BLOCK;
} }