🔧 #152

csfwff · Oct 12, 2024 · 0ee4f1c · 0ee4f1c
1 parent 0240d7c
commit 0ee4f1c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/org/b3log/symphony/processor/ChatroomProcessor.java b/src/main/java/org/b3log/symphony/processor/ChatroomProcessor.java
@@ -1216,7 +1216,7 @@ public void getChatRaw(final RequestContext context) {
  JSONObject jsonObject = new JSONObject(content);
  String msgType = jsonObject.optString("msgType");
  if (!msgType.isEmpty()) {
- dataModel.put("raw", "{\"msg\":\"想看红包金额，想得美 :)\",\"recivers\":\"[]\",\"senderId\":\"1380013800000\",\"msgType\":\"redPacket\",\"money\":14250,\"count\":250,\"type\":\"random\",\"got\":0,\"who\":[]}");
+ dataModel.put("raw", "{\"msg\":\"6\",\"recivers\":\"[]\",\"senderId\":\"1380013800000\",\"msgType\":\"redPacket\",\"money\":14250,\"count\":250,\"type\":\"random\",\"got\":0,\"who\":[]}");
  return;
  }
  } catch (Exception ignored) {

diff --git a/src/main/java/org/b3log/symphony/processor/bot/ChatRoomBot.java b/src/main/java/org/b3log/symphony/processor/bot/ChatRoomBot.java
@@ -548,14 +548,15 @@ public static boolean record(final RequestContext context) {
  // ==? 判定恶意发送非法红包 ?==
  try {
  JSONObject checkContent = new JSONObject(content);
- if (checkContent.optString("msgType").equals("redPacket")) {
+ if (checkContent.optString("msgType").equals("redPacket") || checkContent.optString("msgType").equals("weather")) {
  if (RECORD_POOL_2_IN_24H.access(userName)) {
- sendBotMsg("监测到 @" + userName + " 伪造发送红包数据包，警告一次。");
+ sendBotMsg("监测到 @" + userName + " 伪造发送红包/天气数据包，警告一次。");
  } else {
- sendBotMsg("由于 @" + userName + " 第二次伪造发送红包数据包，现处以扣除积分 50 的处罚。");
- abusePoint(userId, 50, "机器人罚单-聊天室伪造发送红包数据包");
+ sendBotMsg("由于 @" + userName + " 第二次伪造发送红包/天气数据包，现处以扣除积分 50 的处罚。");
+ abusePoint(userId, 50, "机器人罚单-聊天室伪造发送红包/天气数据包");
  RECORD_POOL_2_IN_24H.remove(userName);
  }
+ return false;
  }
  } catch (Exception ignored) {
  }

diff --git a/src/main/resources/js/chat-room.js b/src/main/resources/js/chat-room.js
@@ -1709,6 +1709,9 @@ ${result.info.msg}
  let isPlusOne = Label.latestMessage === data.md;
  try {
  let msgJSON = $.parseJSON(data.content.replace("<p>", "").replace("</p>", ""));
+ if (msgJSON.msgType === "weather") {
+ isRedPacket = true;
+ }
  if (msgJSON.msgType === "redPacket") {
  isRedPacket = true;
  let type = "未知类型红包";