Beta44

applogic/gensokyo.go

@@ -217,7 +217,7 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 
 		// 向量安全词部分,机器人大安全向量安全屏障
 		if config.GetVectorSensitiveFilter() {
-			ret, err, retstr := app.InterceptSensitiveContent(vector, message)
+			ret, retstr, err := app.InterceptSensitiveContent(vector, message)
 			if err != nil {
 				fmtf.Printf("Error in InterceptSensitiveContent: %v", err)
 				// 发送响应
@@ -525,6 +525,11 @@ func (app *App) GensokyoHandler(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 
+		// OUT规则不仅对实际发送api生效,也对http结果生效
+		if config.GetSensitiveModeType() == 1 {
+			response = acnode.CheckWordOUT(response)
+		}
+
 		// 发送响应
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte("Request received and processed Q:" + newmsg + " A:" + response))

applogic/vectorsensitive.go

@@ -176,14 +176,14 @@ func (app *App) textExistsInDatabase(text string) (bool, error) {
 	return exists, nil
 }
 
-func (app *App) InterceptSensitiveContent(vector []float64, message structs.OnebotGroupMessage) (int, error, string) {
+func (app *App) InterceptSensitiveContent(vector []float64, message structs.OnebotGroupMessage) (int, string, error) {
 	// 自定义阈值
 	Threshold := config.GetVertorSensitiveThreshold()
 
 	// 进行搜索
 	results, _, err := app.searchForSingleVectorSensitive(vector, Threshold)
 	if err != nil {
-		return 1, fmtf.Errorf("error searching for sensitive content: %w", err), ""
+		return 1, "", fmtf.Errorf("error searching for sensitive content: %w", err)
 	}
 
 	// 输出搜索到的result数组
@@ -208,12 +208,12 @@ func (app *App) InterceptSensitiveContent(vector []float64, message structs.Oneb
 			} else {
 				utils.SendGroupMessage(message.GroupID, saveresponse)
 			}
-			return 1, nil, saveresponse
+			return 1, saveresponse, nil
 		}
 	} else {
 		// 未匹配到敏感内容
 		fmtf.Println("No sensitive content detected.")
 	}
 
-	return 0, nil, ""
+	return 0, "", nil
 }