socialnetworknews-api

commit 48b4d3e8497fa333f493c193e3a983fef6d6040f
parent cfa038834865172148926d4afb900ce98e850911
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue, 27 Mar 2018 13:35:42 +0200

Transmit data of original tweet instead of the data of the new tweet

Diffstat:
M
twitter/twitter.go
 | 
76
++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------

1 file changed, 54 insertions(+), 22 deletions(-)
diff --git a/twitter/twitter.go b/twitter/twitter.go
@@ -229,30 +229,62 @@ func (t *TwitterAPI) GetTweets(tweets []int64) ([]byte, error) {
 				JT.Retweet = false
 			}
 			tweetsSlice[t.IdStr] = true
-			JT.Username = t.User.ScreenName
-			JT.UserID = t.User.IdStr
-			JT.DisplayName = t.User.Name
-			JT.UserProfileLink = "https://twitter.com/" + t.User.ScreenName
-			JT.TweetLink = "https://twitter.com/" + t.User.ScreenName + "/status/" + t.IdStr
-			if t.ExtendedTweet.FullText != "" {
-				JT.Text = t.ExtendedTweet.FullText
-			} else if t.FullText != "" {
-				JT.Text = t.FullText
-			} else {
-				JT.Text = t.Text
-			}
+			// If we got a retweet get the data of the original tweet
+			if JT.Retweet {
+				JT.Username = t.RetweetedStatus.User.ScreenName
+				JT.UserID = t.RetweetedStatus.User.IdStr
+
+				JT.DisplayName = t.User.Name
+				JT.UserProfileLink = "https://twitter.com/" + t.RetweetedStatus.User.ScreenName
+				JT.TweetLink = "https://twitter.com/" + t.RetweetedStatus.User.ScreenName + "/status/" + t.RetweetedStatus.IdStr
+				if t.RetweetedStatus.ExtendedTweet.FullText != "" {
+					JT.Text = t.RetweetedStatus.ExtendedTweet.FullText
+				} else if t.RetweetedStatus.FullText != "" {
+					JT.Text = t.RetweetedStatus.FullText
+				} else {
+					JT.Text = t.RetweetedStatus.Text
+				}
 
-			tweetTime, err := t.CreatedAtTime()
-			if err != nil {
-				return nil, err
-			}
-			JT.CreatedAt = tweetTime.Format("02.01.2006")
-			JT.Favorites = strconv.Itoa(t.FavoriteCount)
-			JT.Retweets = strconv.Itoa(t.RetweetCount)
+				tweetTime, err := t.RetweetedStatus.CreatedAtTime()
+				if err != nil {
+					return nil, err
+				}
+				JT.CreatedAt = tweetTime.Format("02.01.2006")
+				JT.Favorites = strconv.Itoa(t.RetweetedStatus.FavoriteCount)
+				JT.Retweets = strconv.Itoa(t.RetweetedStatus.RetweetCount)
+
+				for _, i := range t.RetweetedStatus.Entities.Media {
+					if i.Type == "photo" {
+						JT.IMGUrls = append(JT.IMGUrls, i.Media_url_https)
+					}
+				}
+			} else {
+				JT.Username = t.User.ScreenName
+				JT.UserID = t.User.IdStr
+
+				JT.DisplayName = t.User.Name
+				JT.UserProfileLink = "https://twitter.com/" + t.User.ScreenName
+				JT.TweetLink = "https://twitter.com/" + t.User.ScreenName + "/status/" + t.IdStr
+				if t.ExtendedTweet.FullText != "" {
+					JT.Text = t.ExtendedTweet.FullText
+				} else if t.FullText != "" {
+					JT.Text = t.FullText
+				} else {
+					JT.Text = t.Text
+				}
 
-			for _, i := range t.Entities.Media {
-				if i.Type == "photo" {
-					JT.IMGUrls = append(JT.IMGUrls, i.Media_url_https)
+				tweetTime, err := t.CreatedAtTime()
+				if err != nil {
+					return nil, err
+				}
+				JT.CreatedAt = tweetTime.Format("02.01.2006")
+				JT.Favorites = strconv.Itoa(t.FavoriteCount)
+				JT.Retweets = strconv.Itoa(t.RetweetCount)
+
+				for _, i := range t.Entities.Media {
+					if i.Type == "photo" {
+						JT.IMGUrls = append(JT.IMGUrls, i.Media_url_https)
+					}
 				}
 			}