fix: post threads

Author: Preloading

bluesky/blueskyapi.go

@@ -160,7 +160,7 @@ type Timeline struct {
 type Thread struct {
 	Type    string    `json:"$type"`
 	Post    Post      `json:"post"`
-	Parent  *Post     `json:"parent"`
+	Parent  *Thread   `json:"parent"`
 	Replies *[]Thread `json:"replies"`
 }
 

twitterv1/interaction.go

@@ -41,7 +41,7 @@ func status_update(c *fiber.Ctx) error {
 	if thread.Thread.Parent == nil {
 		return c.JSON(TranslatePostToTweet(thread.Thread.Post, "", "", nil, nil, *oauthToken, *pds))
 	} else {
-		return c.JSON(TranslatePostToTweet(thread.Thread.Post, thread.Thread.Parent.URI, thread.Thread.Parent.Author.DID, &thread.Thread.Parent.Record.CreatedAt, nil, *oauthToken, *pds))
+		return c.JSON(TranslatePostToTweet(thread.Thread.Post, thread.Thread.Parent.Post.URI, thread.Thread.Parent.Post.Author.DID, &thread.Thread.Parent.Post.Record.CreatedAt, nil, *oauthToken, *pds))
 	}
 }
 
@@ -76,7 +76,7 @@ func retweet(c *fiber.Ctx) error {
 	if originalPost.Thread.Parent == nil {
 		retweet = TranslatePostToTweet(originalPost.Thread.Post, "", "", nil, nil, *oauthToken, *pds)
 	} else {
-		retweet = TranslatePostToTweet(originalPost.Thread.Post, originalPost.Thread.Parent.URI, originalPost.Thread.Parent.Author.DID, &originalPost.Thread.Parent.Record.CreatedAt, nil, *oauthToken, *pds)
+		retweet = TranslatePostToTweet(originalPost.Thread.Post, originalPost.Thread.Parent.Post.URI, originalPost.Thread.Parent.Post.Author.DID, &originalPost.Thread.Parent.Post.Record.CreatedAt, nil, *oauthToken, *pds)
 	}
 	retweet.Retweeted = true
 	now := time.Now() // pain, also fix this to use the proper timestamp according to the server.
@@ -91,7 +91,7 @@ func retweet(c *fiber.Ctx) error {
 			if originalPost.Thread.Parent == nil {
 				return TranslatePostToTweet(originalPost.Thread.Post, "", "", nil, nil, *oauthToken, *pds)
 			} else {
-				return TranslatePostToTweet(originalPost.Thread.Post, originalPost.Thread.Parent.URI, originalPost.Thread.Parent.Author.DID, &originalPost.Thread.Parent.Record.CreatedAt, nil, *oauthToken, *pds)
+				return TranslatePostToTweet(originalPost.Thread.Post, originalPost.Thread.Parent.Post.URI, originalPost.Thread.Parent.Post.Author.DID, &originalPost.Thread.Parent.Post.Record.CreatedAt, nil, *oauthToken, *pds)
 			}
 		}(),
 	})
@@ -130,7 +130,7 @@ func favourite(c *fiber.Ctx) error {
 	if post.Thread.Parent == nil {
 		newTweet = TranslatePostToTweet(post.Thread.Post, "", "", nil, nil, *oauthToken, *pds)
 	} else {
-		newTweet = TranslatePostToTweet(post.Thread.Post, post.Thread.Parent.URI, post.Thread.Parent.Author.DID, &post.Thread.Parent.Record.CreatedAt, nil, *oauthToken, *pds)
+		newTweet = TranslatePostToTweet(post.Thread.Post, post.Thread.Parent.Post.URI, post.Thread.Parent.Post.Author.DID, &post.Thread.Parent.Post.Record.CreatedAt, nil, *oauthToken, *pds)
 	}
 
 	return c.JSON(newTweet)
@@ -167,7 +167,7 @@ func Unfavourite(c *fiber.Ctx) error { // yes i am canadian
 	if post.Thread.Parent == nil {
 		newTweet = TranslatePostToTweet(post.Thread.Post, "", "", nil, nil, *oauthToken, *pds)
 	} else {
-		newTweet = TranslatePostToTweet(post.Thread.Post, post.Thread.Parent.URI, post.Thread.Parent.Author.DID, &post.Thread.Parent.Record.CreatedAt, nil, *oauthToken, *pds)
+		newTweet = TranslatePostToTweet(post.Thread.Post, post.Thread.Parent.Post.URI, post.Thread.Parent.Post.Author.DID, &post.Thread.Parent.Post.Record.CreatedAt, nil, *oauthToken, *pds)
 	}
 
 	return c.JSON(newTweet)
@@ -227,7 +227,7 @@ func DeleteTweet(c *fiber.Ctx) error {
 			if postToDelete.Thread.Parent == nil {
 				return TranslatePostToTweet(postToDelete.Thread.Post, "", "", nil, nil, *oauthToken, *pds)
 			} else {
-				return TranslatePostToTweet(postToDelete.Thread.Post, postToDelete.Thread.Parent.URI, postToDelete.Thread.Parent.Author.DID, &postToDelete.Thread.Parent.Record.CreatedAt, nil, *oauthToken, *pds)
+				return TranslatePostToTweet(postToDelete.Thread.Post, postToDelete.Thread.Parent.Post.URI, postToDelete.Thread.Parent.Post.Author.DID, &postToDelete.Thread.Parent.Post.Record.CreatedAt, nil, *oauthToken, *pds)
 			}
 		}(),
 	)

twitterv1/post_viewing.go

@@ -184,7 +184,7 @@ func GetStatusFromId(c *fiber.Ctx) error {
 	if thread.Thread.Parent == nil {
 		return c.JSON(TranslatePostToTweet(thread.Thread.Post, "", "", nil, nil, *oauthToken, *pds))
 	} else {
-		return c.JSON(TranslatePostToTweet(thread.Thread.Post, thread.Thread.Parent.URI, thread.Thread.Parent.Author.DID, &thread.Thread.Parent.Record.CreatedAt, nil, *oauthToken, *pds))
+		return c.JSON(TranslatePostToTweet(thread.Thread.Post, thread.Thread.Parent.Post.URI, thread.Thread.Parent.Post.Author.DID, &thread.Thread.Parent.Post.Record.CreatedAt, nil, *oauthToken, *pds))
 	}
 }
 
@@ -369,6 +369,7 @@ func TranslatePostToTweet(tweet blueskyapi.Post, replyMsgBskyURI string, replyUs
 }
 
 // This is "depercated"/a togglable option in the config (eventually)
+// Primarly used as a fallback if we cannot lookup user info
 func GetUserInfoFromTweetData(tweet blueskyapi.Post) bridge.TwitterUser {
 	return bridge.TwitterUser{
 		Name: func() string {