优化禁言策略

myzuhang1234 · Aug 11, 2022 · e03b306 · e03b306
1 parent 6068fa2
commit e03b306
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/src/main/java/com/badeling/msbot/serviceImpl/MsgServiceImpl.java b/src/main/java/com/badeling/msbot/serviceImpl/MsgServiceImpl.java
@@ -301,6 +301,25 @@ public ReplyMsg receive(String msg) {
         	}
         }
 
+		//禁言信息
+		List<MsgNoPrefix> result = msgNoPrefixRepository.findMsgNPList();
+		for(MsgNoPrefix m : result) {
+			if(m.isExact()&&receiveMsg.getRaw_message().contains(m.getQuestion())) {
+				System.out.println(m.getAnswer());
+				if (m.getQuestion().contains("md") && receiveMsg.getRaw_message().contains("md5")){
+					break;
+				}
+				else if (m.getAnswer().equals("禁言")){
+					ReplyMsg replyMsg = new ReplyMsg();
+					replyMsg.setAt_sender(true);
+					replyMsg.setAuto_escape(false);
+					replyMsg.setBan(true);
+					replyMsg.setReply("[CQ:image,file=save/AB59F6053D317B67646AA3B363B87415]");
+					System.out.println(replyMsg);
+					return replyMsg;
+				}
+			}
+		}
 
 		if (receiveMsg.getRaw_message().startsWith(MsbotConst.botName)) {
 			System.out.println(receiveMsg.toString());
@@ -347,29 +366,9 @@ else if (receiveMsg.getRaw_message().length() >= 4 && receiveMsg.getRaw_message(
 //    		handMemberSellAndBuy(receiveMsg);
 //    	}
 
-		//禁言信息
-		List<MsgNoPrefix> result = msgNoPrefixRepository.findMsgNPList();
-		for(MsgNoPrefix m : result) {
-			if(m.isExact()&&receiveMsg.getRaw_message().contains(m.getQuestion())) {
-				System.out.println(m.getAnswer());
-				if (m.getQuestion().contains("md") && receiveMsg.getRaw_message().contains("md5")){
-					break;
-				}
-				else if (m.getAnswer().equals("禁言")){
-					ReplyMsg replyMsg = new ReplyMsg();
-					replyMsg.setAt_sender(true);
-					replyMsg.setAuto_escape(false);
-					replyMsg.setBan(true);
-					replyMsg.setReply("[CQ:image,file=save/AB59F6053D317B67646AA3B363B87415]");
-					System.out.println(replyMsg);
-					return replyMsg;
-				}
-				else{
-					handReplyMsg(receiveMsg);
-				}
-			}
-		}
-    	//re-read
+		handReplyMsg(receiveMsg);
+
+		//re-read
     	receiveMsg.setRaw_message(receiveMsg.getMessage());
     	return handRereadMsg(receiveMsg);