Fix remove cacheing

Author: JustHumanz

pkg/database/generaldb.go

@@ -8,7 +8,6 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"time"
 
 	config "github.com/JustHumanz/Go-Simp/pkg/config"
 	"github.com/go-redis/redis/v8"
@@ -913,47 +912,14 @@ func (i *LiveStream) RemoveCache(Key string, drop bool) error {
 	ctx := context.Background()
 
 	if !drop {
-		OldKey := Key + "-old"
 		log.WithFields(log.Fields{
 			"Key":     Key,
 			"VideoID": i.VideoID,
-			"OldKey":  OldKey,
-		}).Info("Reslice Cache")
-		//Yt
-		val, err := LiveCache.LRange(ctx, Key, 0, -1).Result()
+		}).Info("Remove cache from list")
+		err := LiveCache.LRem(ctx, Key, 0, i).Err()
 		if err != nil {
 			return err
 		}
-
-		var Data []LiveStream
-		for _, result := range unique(val) {
-			var list LiveStream
-			err := json.Unmarshal([]byte(result), &list)
-			if err != nil {
-				return err
-			}
-			Data = append(Data, list)
-		}
-
-		err = LiveCache.Rename(ctx, Key, OldKey).Err()
-		if err != nil {
-			return err
-		}
-
-		err = LiveCache.Expire(ctx, OldKey, 5*time.Minute).Err()
-		if err != nil {
-			return err
-		}
-
-		for _, v := range Data {
-			if v.VideoID == i.VideoID {
-				continue
-			}
-			err = LiveCache.LPush(ctx, Key, v).Err()
-			if err != nil {
-				return err
-			}
-		}
 	} else {
 		log.WithFields(log.Fields{
 			"Key": Key,

service/livestream/youtube/counter/counter.go

@@ -97,6 +97,7 @@ type checkYtJob struct {
 }
 
 func (i *checkYtJob) Run() {
+	var RemovedCache []database.LiveStream
 	for _, Group := range *GroupPayload {
 		YoutubeStatus, Key, err := database.YtGetStatus(map[string]interface{}{
 			"GroupID":   Group.ID,
@@ -138,6 +139,7 @@ func (i *checkYtJob) Run() {
 								}
 
 								Youtube.UpdateYt(config.LiveStatus)
+								RemovedCache = append(RemovedCache, Youtube)
 								return
 							}
 							log.WithFields(log.Fields{
@@ -153,10 +155,7 @@ func (i *checkYtJob) Run() {
 							}
 							if len(Data.Items) > 0 {
 								if Data.Items[0].Snippet.VideoStatus != "none" {
-									err = Youtube.RemoveCache(Key, false)
-									if err != nil {
-										log.Panic(err)
-									}
+									RemovedCache = append(RemovedCache, Youtube)
 
 									if Data.Items[0].Statistics.ViewCount != "" {
 										Youtube.UpdateViewers(Data.Items[0].Statistics.ViewCount)
@@ -207,10 +206,7 @@ func (i *checkYtJob) Run() {
 										Youtube.UpdateYt(config.PrivateStatus)
 									}
 								} else if Data.Items[0].Snippet.VideoStatus == "none" {
-									err = Youtube.RemoveCache(Key, false)
-									if err != nil {
-										log.Panic(err)
-									}
+									RemovedCache = append(RemovedCache, Youtube)
 
 									if Data.Items[0].Statistics.ViewCount != "" {
 										Youtube.UpdateViewers(Data.Items[0].Statistics.ViewCount)
@@ -266,7 +262,14 @@ func (i *checkYtJob) Run() {
 				}
 			}(Y, &i.wg)
 		}
+
 		i.wg.Wait()
+		for _, v := range RemovedCache {
+			err := v.RemoveCache(Key, false)
+			if err != nil {
+				log.Error(err)
+			}
+		}
 	}
 }