actually make it check friendship status

Author: Preloading

bluesky/blueskyapi.go

@@ -45,7 +45,7 @@ type User struct {
 		StarterPacks int       `json:"starterPacks"`
 		Labeler      bool      `json:"labeler"`
 		CreatedAt    time.Time `json:"created_at"`
-	}
+	} `json:"associated"`
 	Viewer struct {
 		Muted bool `json:"muted"`
 		// MutedByList
@@ -55,7 +55,7 @@ type User struct {
 		Following  *string `json:"following,omitempty"`
 		FollowedBy *string `json:"followedBy,omitempty"`
 		// KnownFollowers
-	}
+	} `json:"viewer"`
 }
 
 type PostRecord struct {
@@ -334,7 +334,7 @@ func GetUserInfo(token string, screen_name string) (*bridge.TwitterUser, error)
 		return &user, nil
 	}
 
-	url := "https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile" + "?actor=" + screen_name
+	url := "https://bsky.social/xrpc/app.bsky.actor.getProfile" + "?actor=" + screen_name
 
 	resp, err := SendRequest(&token, http.MethodGet, url, nil)
 	if err != nil {
@@ -395,7 +395,7 @@ func GetUsersInfo(token string, items []string, ignoreCache bool) ([]*bridge.Twi
 		go func(c []string) {
 			defer wg.Done()
 
-			url := "https://public.api.bsky.app/xrpc/app.bsky.actor.getProfiles" + "?actors=" + strings.Join(c, "&actors=")
+			url := "https://bsky.social/xrpc/app.bsky.actor.getProfiles" + "?actors=" + strings.Join(c, "&actors=")
 			resp, err := SendRequest(&token, http.MethodGet, url, nil)
 			if err != nil {
 				fmt.Println(err)
@@ -451,7 +451,7 @@ func GetUsersInfoRaw(token string, items []string, ignoreCache bool) ([]*User, e
 		go func(c []string) {
 			defer wg.Done()
 
-			url := "https://public.api.bsky.app/xrpc/app.bsky.actor.getProfiles" + "?actors=" + strings.Join(c, "&actors=")
+			url := "https://bsky.social/xrpc/app.bsky.actor.getProfiles" + "?actors=" + strings.Join(c, "&actors=")
 			fmt.Println(url)
 			resp, err := SendRequest(&token, http.MethodGet, url, nil)
 			if err != nil {

bridge/bridge.go

@@ -206,11 +206,21 @@ type Config struct {
 }
 
 type UserRelationship struct {
-	Name        string   `json:"name" xml:"name"`
-	IDStr       string   `json:"id_str" xml:"id_str"`
-	ID          big.Int  `json:"id" xml:"id"`
-	Connections []string `json:"connections" xml:"connections"`
-	ScreenName  string   `json:"screen_name" xml:"screen_name"`
+	Name        string      `json:"name" xml:"name"`
+	IDStr       string      `json:"id_str" xml:"id_str"`
+	ID          big.Int     `json:"id" xml:"id"`
+	Connections Connections `json:"connections" xml:"connections"`
+	ScreenName  string      `json:"screen_name" xml:"screen_name"`
+}
+
+type Connection struct {
+	XMLName xml.Name `xml:"connection"`
+	Value   string   `xml:",chardata"`
+}
+
+type Connections struct {
+	XMLName    xml.Name     `xml:"connections"`
+	Connection []Connection `xml:"connection"`
 }
 
 type UserRelationships struct {

twitterv1/user.go

@@ -130,18 +130,19 @@ func UserRelationships(c *fiber.Ctx) error {
 			return c.Status(fiber.StatusInternalServerError).SendString("Failed to encode user id")
 		}
 
-		connections := []string{}
+		connections := bridge.Connections{}
+
 		if user.Viewer.Following != nil {
-			connections = append(connections, "following")
+			connections.Connection = append(connections.Connection, bridge.Connection{Value: "following"})
 		}
 		if user.Viewer.FollowedBy != nil {
-			connections = append(connections, "followed_by")
+			connections.Connection = append(connections.Connection, bridge.Connection{Value: "followed_by"})
 		}
 		if user.Viewer.Blocking != nil {
-			connections = append(connections, "blocking") // Complete guess
+			connections.Connection = append(connections.Connection, bridge.Connection{Value: "blocked"})
 		}
 		if user.Viewer.BlockedBy {
-			connections = append(connections, "blocked_by") // Complete guess
+			connections.Connection = append(connections.Connection, bridge.Connection{Value: "blocked_by"}) // Complete guess
 		}
 
 		relationships = append(relationships, bridge.UserRelationship{