fix twitter logging

JustHumanz · Mar 11, 2022 · d5b2663 · d5b2663
1 parent 77a4e02
commit d5b2663
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/pkg/database/fanart.go b/pkg/database/fanart.go
@@ -501,17 +501,6 @@ func (Member Member) ScrapTwitterFanart(Scraper *twitterscraper.Scraper, Lewd bo
 		}
 	}()
 
-	log.WithFields(log.Fields{
-		"Hashtag": func() string {
-			if Lewd {
-				return Member.TwitterLewd
-			}
-			return Member.TwitterHashtag
-		}(),
-		"Vtuber": Member.Name,
-		"Lewd":   Lewd,
-	}).Info("Start curl twitter")
-
 	for tweet := range Scraper.SearchTweets(context.Background(), Query, config.GoSimpConf.LimitConf.TwitterFanart) {
 		if tweet.Error != nil {
 			log.Error(tweet.Error)

diff --git a/service/fanart/twitter/twitter.go b/service/fanart/twitter/twitter.go
@@ -141,6 +141,14 @@ type checkTwJob struct {
 func (i *checkTwJob) Run() {
 	Cek := func(Member database.Member, w *sync.WaitGroup) {
 		defer w.Done()
+
+		log.WithFields(log.Fields{
+			"Hashtag": Member.TwitterHashtag,
+			"Vtuber":  Member.Name,
+			"Agency":  Member.Group.GroupName,
+			"Lewd":    false,
+		}).Info("Start curl twitter")
+
 		Fanarts, err := Member.ScrapTwitterFanart(engine.InitTwitterScraper(), false)
 		if err != nil {
 			log.WithFields(log.Fields{
@@ -161,6 +169,14 @@ func (i *checkTwJob) Run() {
 		}
 
 		if *lewd {
+
+			log.WithFields(log.Fields{
+				"Hashtag": Member.TwitterLewd,
+				"Vtuber":  Member.Name,
+				"Agency":  Member.Group.GroupName,
+				"Lewd":    true,
+			}).Info("Start curl twitter")
+
 			Fanarts, err := Member.ScrapTwitterFanart(engine.InitTwitterScraper(), true)
 			if err != nil {
 				log.WithFields(log.Fields{