Fix parsing of empty Space responses
This commit is contained in:
parent
05cacb1490
commit
0293f11b9b
@ -538,6 +538,11 @@ func (r SpaceResponse) ToTweetTrove() TweetTrove {
|
|||||||
ret := NewTweetTrove()
|
ret := NewTweetTrove()
|
||||||
space := Space{}
|
space := Space{}
|
||||||
space.ID = SpaceID(data.Metadata.RestId)
|
space.ID = SpaceID(data.Metadata.RestId)
|
||||||
|
if space.ID == "" {
|
||||||
|
// The response is empty. Abort processing
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
space.Title = data.Metadata.Title
|
space.Title = data.Metadata.Title
|
||||||
space.State = data.Metadata.State
|
space.State = data.Metadata.State
|
||||||
space.CreatedAt = TimestampFromUnix(data.Metadata.CreatedAt)
|
space.CreatedAt = TimestampFromUnix(data.Metadata.CreatedAt)
|
||||||
|
@ -502,6 +502,21 @@ func TestParseSpaceResponse(t *testing.T) {
|
|||||||
assert.Equal(847, user.FollowersCount)
|
assert.Equal(847, user.FollowersCount)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseEmptySpaceResponse(t *testing.T) {
|
||||||
|
require := require.New(t)
|
||||||
|
data, err := os.ReadFile("test_responses/tweet_content/space_object_empty.json")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var response SpaceResponse
|
||||||
|
err = json.Unmarshal(data, &response)
|
||||||
|
require.NoError(err)
|
||||||
|
|
||||||
|
trove := response.ToTweetTrove()
|
||||||
|
require.Len(trove.Spaces, 0)
|
||||||
|
}
|
||||||
|
|
||||||
func TestParseAPIV2UserFeed(t *testing.T) {
|
func TestParseAPIV2UserFeed(t *testing.T) {
|
||||||
data, err := os.ReadFile("test_responses/api_v2/user_feed_apiv2.json")
|
data, err := os.ReadFile("test_responses/api_v2/user_feed_apiv2.json")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -4,6 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
||||||
"offline_twitter/terminal_utils"
|
"offline_twitter/terminal_utils"
|
||||||
)
|
)
|
||||||
@ -33,7 +34,12 @@ type Tweet struct {
|
|||||||
Hashtags []string
|
Hashtags []string
|
||||||
Urls []Url
|
Urls []Url
|
||||||
Polls []Poll
|
Polls []Poll
|
||||||
|
|
||||||
|
// TODO get-rid-of-spaces: Might be good to get rid of `Spaces`. Only used in APIv1 I think.
|
||||||
|
// A first-step would be to delete the Spaces after pulling them out of a Tweet into the Trove
|
||||||
|
// in ParseTweetResponse. Then they will only be getting saved once rather than twice.
|
||||||
Spaces []Space
|
Spaces []Space
|
||||||
|
SpaceID SpaceID
|
||||||
|
|
||||||
TombstoneType string
|
TombstoneType string
|
||||||
IsStub bool
|
IsStub bool
|
||||||
@ -185,6 +191,7 @@ func ParseSingleTweet(apiTweet APITweet) (ret Tweet, err error) {
|
|||||||
if apiTweet.Card.Name == "3691233323:audiospace" {
|
if apiTweet.Card.Name == "3691233323:audiospace" {
|
||||||
space := ParseAPISpace(apiTweet.Card)
|
space := ParseAPISpace(apiTweet.Card)
|
||||||
ret.Spaces = []Space{space}
|
ret.Spaces = []Space{space}
|
||||||
|
ret.SpaceID = space.ID
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process tombstones and other metadata
|
// Process tombstones and other metadata
|
||||||
@ -258,6 +265,7 @@ func GetTweetFull(id TweetID) (trove TweetTrove, err error) {
|
|||||||
trove.TombstoneUsers = tombstoned_users
|
trove.TombstoneUsers = tombstoned_users
|
||||||
|
|
||||||
// Quoted tombstones need their user_id filled out from the tombstoned_users list
|
// Quoted tombstones need their user_id filled out from the tombstoned_users list
|
||||||
|
log.Debug("Running tweet trove post-processing\n")
|
||||||
err = trove.PostProcess()
|
err = trove.PostProcess()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = fmt.Errorf("Error getting tweet (id %d):\n %w", id, err)
|
err = fmt.Errorf("Error getting tweet (id %d):\n %w", id, err)
|
||||||
@ -294,6 +302,9 @@ func ParseTweetResponse(resp TweetResponse) (TweetTrove, error) {
|
|||||||
return trove, err
|
return trove, err
|
||||||
}
|
}
|
||||||
trove.Tweets[new_tweet.ID] = new_tweet
|
trove.Tweets[new_tweet.ID] = new_tweet
|
||||||
|
for _, space := range new_tweet.Spaces {
|
||||||
|
trove.Spaces[space.ID] = space
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
new_retweet, err := ParseSingleRetweet(single_tweet)
|
new_retweet, err := ParseSingleRetweet(single_tweet)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user