NGワード追加時のチェックをgoで実施するよう変更 8460

home/isucon/bin/prepare.sh

@@ -35,6 +35,6 @@ sudo truncate -s 0 "${nginx_access_log}"
 # sudo systemctl reload nginx
 
 # cleanup
-rm -f "${result_dir}"/*.*
+#rm -f "${result_dir}"/*.*
 
 echo "OK"

home/isucon/webapp/go/livecomment_handler.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/jmoiron/sqlx"
@@ -395,20 +396,11 @@ func moderateHandler(c echo.Context) error {
 		}
 
 		for _, livecomment := range livecomments {
-			query := `
-			DELETE FROM livecomments
-			WHERE
-			id = ? AND
-			livestream_id = ? AND
-			(SELECT COUNT(*)
-			FROM
-			(SELECT ? AS text) AS texts
-			INNER JOIN
-			(SELECT CONCAT('%', ?, '%')	AS pattern) AS patterns
-			ON texts.text LIKE patterns.pattern) >= 1;
-			`
-			if _, err := tx.ExecContext(ctx, query, livecomment.ID, livestreamID, livecomment.Comment, ngword.Word); err != nil {
-				return echo.NewHTTPError(http.StatusInternalServerError, "failed to delete old livecomments that hit spams: "+err.Error())
+			if strings.Contains(livecomment.Comment, ngword.Word) {
+				query := `DELETE FROM livecomments WHERE id = ? AND livestream_id = ?`
+				if _, err := tx.ExecContext(ctx, query, livecomment.ID, livestreamID); err != nil {
+					return echo.NewHTTPError(http.StatusInternalServerError, "failed to delete old livecomments that hit spams: "+err.Error())
+				}
 			}
 		}
 	}