From 483e1caf835bc1e124f4ea3581933975fe6b847e Mon Sep 17 00:00:00 2001
From: Simon Ding <dingchuan91@gmail.com>
Date: Wed, 23 Apr 2025 16:54:59 +0800
Subject: [PATCH] chore: update

---
 server/activity.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/activity.go b/server/activity.go
index 5e7e074..0d63f56 100644
--- a/server/activity.go
+++ b/server/activity.go
@@ -86,14 +86,6 @@ func (s *Server) RemoveActivity(c *gin.Context) (interface{}, error) {
 		log.Errorf("no record of id: %d", in.ID)
 		return nil, nil
 	}
-	if in.Add2Blacklist && his.Link != "" {
-		//should add to blacklist
-		if err := s.addTorrent2Blacklist(his); err != nil {
-			return nil, errors.Errorf("add to blacklist: %v", err)
-		} else {
-			log.Infof("success add magnet link to blacklist: %v", his.Link)
-		}
-	}
 
 	if err := s.core.RemoveTaskAndTorrent(his.ID); err != nil {
 		return nil, errors.Wrap(err, "remove torrent")
@@ -107,6 +99,15 @@ func (s *Server) RemoveActivity(c *gin.Context) (interface{}, error) {
 		return nil, nil
 	}
 
+	if in.Add2Blacklist {
+		//should add to blacklist
+		if err := s.addTorrent2Blacklist(his); err != nil {
+			return nil, errors.Errorf("add to blacklist: %v", err)
+		} else {
+			log.Infof("success add magnet link to blacklist: %v", his.Link)
+		}
+	}
+
 	err := s.db.DeleteHistory(in.ID)
 	if err != nil {
 		return nil, errors.Wrap(err, "db")
@@ -132,6 +133,9 @@ func (s *Server) RemoveActivity(c *gin.Context) (interface{}, error) {
 }
 
 func (s *Server) addTorrent2Blacklist(h *ent.History) error {
+	if h.Hash == "" { //没有hash，不添加
+		return nil
+	}
 	return s.db.AddTorrent2Blacklist(h.Hash, h.SourceTitle, h.MediaID)
 }