From 4abc242047bc4bf855fe873a1814d0cd8cc8138e Mon Sep 17 00:00:00 2001
From: bianjiajie <qq525399365@gmail.com>
Date: Tue, 14 Feb 2023 20:37:36 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=83=A8=E5=88=86=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=BD=B1=E5=93=8D=E5=9C=A8app=E5=9B=BE?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/app/api/idl/bilibili_picture.go | 1 +
 internal/repository/bilibili_picture.go  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/internal/app/api/idl/bilibili_picture.go b/internal/app/api/idl/bilibili_picture.go
index 8421804..3dd5d08 100644
--- a/internal/app/api/idl/bilibili_picture.go
+++ b/internal/app/api/idl/bilibili_picture.go
@@ -19,6 +19,7 @@ const (
 	Uncomfortable DynamicFeedback = 4 //不适宜的内容
 )
 
+var DynamicFeedbackVec = []DynamicFeedback{Default, IncorrectTags, OnPeriod}
 var DynamicFeedbackMap = map[DynamicFeedback]struct{}{
 	Default:       {},
 	Unrelated:     {},
diff --git a/internal/repository/bilibili_picture.go b/internal/repository/bilibili_picture.go
index 31bdd42..7116b2f 100644
--- a/internal/repository/bilibili_picture.go
+++ b/internal/repository/bilibili_picture.go
@@ -108,7 +108,7 @@ func (impl *BilibiliPictureMysqlImpl) Latest(page, size, topicID int) (list []*i
 	err = conn.Where("pictures_num > 0").Select("dynamic_id,sent_at").
 		Order("sent_at DESC").
 		Offset(offset).
-		Limit(size).Preload("Pics", "feedback = ?", 0).Find(&list).Error
+		Limit(size).Preload("Pics", "feedback in (?)", idl.DynamicFeedbackVec).Find(&list).Error
 	if err != nil {
 		return nil, err
 	}
@@ -128,7 +128,7 @@ func (impl *BilibiliPictureMysqlImpl) Recommend(from, to time.Time, page, size,
 		Where("sent_at >= ? AND sent_at <= ? AND pictures_num > 0", from.Unix(), to.Unix()).
 		Order("favor DESC").
 		Offset(offset).
-		Limit(size).Preload("Pics", "feedback = ?", 0).Find(&list).Error
+		Limit(size).Preload("Pics", "feedback in (?)", idl.DynamicFeedbackVec).Find(&list).Error
 	if err != nil {
 		return nil, err
 	}
@@ -147,7 +147,7 @@ func (impl *BilibiliPictureMysqlImpl) Random(rand float64) (list []*idl.Bilibili
 		return nil, err
 	}
 	offset := math.Floor((pair.MaxId - pair.MinId) * rand)
-	err = conn.Where("id >= ? AND feedback = 0", uint64(pair.MinId+offset)).
+	err = conn.Where("id >= ? AND feedback in (?)", uint64(pair.MinId+offset), idl.DynamicFeedbackVec).
 		Select("id,dynamic_id,img_src,img_attr,verify").
 		Preload("Dynamic").Limit(5).Find(&list).Error
 	if err != nil {
@@ -172,7 +172,7 @@ func (impl *BilibiliPictureMysqlImpl) Verify(req idl.BilibiliPictureVerifyReq, d
 		if conn.Error != nil {
 			return conn.Error
 		}
-		if conn.RowsAffected == 0 || req.FeedBack == 0 {
+		if conn.RowsAffected == 0 || req.FeedBack == idl.Default || req.FeedBack == idl.IncorrectTags || req.FeedBack == idl.OnPeriod {
 			return nil
 		}
 		return _tx.Table(idl.BilibiliDynamic{}.TableName()).