Skip to content
This repository was archived by the owner on Jan 31, 2023. It is now read-only.

Commit 790ddc7

Browse files
committed
optimization twitter scraping
1 parent 70ecc87 commit 790ddc7

1 file changed

Lines changed: 38 additions & 36 deletions

File tree

pkg/database/fanart.go

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -561,43 +561,45 @@ func (Member Member) ScrapTwitterFanart(Scraper *twitterscraper.Scraper, Lewd bo
561561
}
562562
}
563563

564-
for _, TweetHashtag := range tweet.Hashtags {
565-
if (strings.EqualFold("#"+TweetHashtag, Member.TwitterHashtag) || strings.EqualFold("#"+TweetHashtag, Member.TwitterLewd)) && !tweet.IsQuoted && !tweet.IsReply && len(tweet.Photos) > 0 {
566-
TweetArt := DataFanart{
567-
PermanentURL: tweet.PermanentURL,
568-
Author: tweet.Username,
569-
AuthorAvatar: func() string {
570-
profile, err := Scraper.GetProfile(tweet.Username)
571-
if err != nil {
572-
log.Error(err)
573-
}
574-
return strings.Replace(profile.Avatar, "normal.jpg", "400x400.jpg", -1)
575-
}(),
576-
TweetID: tweet.ID,
577-
Text: func() string {
578-
return regexp.MustCompile(`(?m)^(.*?)https:\/\/t.co\/.+`).ReplaceAllString(tweet.Text, "${1}$2")
579-
}(),
580-
Photos: tweet.Photos,
581-
Likes: tweet.Likes,
582-
Member: Member,
583-
State: config.TwitterArt,
584-
Lewd: Lewd,
585-
Group: Member.Group,
564+
if !tweet.IsQuoted && !tweet.IsReply && len(tweet.Photos) > 0 {
565+
for _, TweetHashtag := range tweet.Hashtags {
566+
if strings.EqualFold("#"+TweetHashtag, Member.TwitterHashtag) || strings.EqualFold("#"+TweetHashtag, Member.TwitterLewd) {
567+
TweetArt := DataFanart{
568+
PermanentURL: tweet.PermanentURL,
569+
Author: tweet.Username,
570+
AuthorAvatar: func() string {
571+
profile, err := Scraper.GetProfile(tweet.Username)
572+
if err != nil {
573+
log.Error(err)
574+
}
575+
return strings.Replace(profile.Avatar, "normal.jpg", "400x400.jpg", -1)
576+
}(),
577+
TweetID: tweet.ID,
578+
Text: func() string {
579+
return regexp.MustCompile(`(?m)^(.*?)https:\/\/t.co\/.+`).ReplaceAllString(tweet.Text, "${1}$2")
580+
}(),
581+
Photos: tweet.Photos,
582+
Likes: tweet.Likes,
583+
Member: Member,
584+
State: config.TwitterArt,
585+
Lewd: Lewd,
586+
Group: Member.Group,
587+
}
588+
if tweet.Videos != nil {
589+
TweetArt.Videos = tweet.Videos[0].Preview
590+
}
591+
592+
New, err := TweetArt.CheckTweetFanArt(update)
593+
if err != nil {
594+
return nil, err
595+
}
596+
597+
if New {
598+
FanartList = append(FanartList, TweetArt)
599+
}
600+
601+
break
586602
}
587-
if tweet.Videos != nil {
588-
TweetArt.Videos = tweet.Videos[0].Preview
589-
}
590-
591-
New, err := TweetArt.CheckTweetFanArt(update)
592-
if err != nil {
593-
return nil, err
594-
}
595-
596-
if New {
597-
FanartList = append(FanartList, TweetArt)
598-
}
599-
600-
break
601603
}
602604
}
603605
}

0 commit comments

Comments
 (0)