Automatically setup friendship between accounts and fix accounts list

Author: rtm516

core/src/main/java/com/rtm516/mcxboxbroadcast/core/FriendManager.java

@@ -1,8 +1,11 @@
 package com.rtm516.mcxboxbroadcast.core;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.rtm516.mcxboxbroadcast.core.configs.FriendSyncConfig;
 import com.rtm516.mcxboxbroadcast.core.exceptions.XboxFriendsException;
 import com.rtm516.mcxboxbroadcast.core.models.FriendModifyResponse;
+import com.rtm516.mcxboxbroadcast.core.models.FriendStatusResponse;
 import com.rtm516.mcxboxbroadcast.core.models.session.FollowerResponse;
 
 import java.io.IOException;
@@ -118,6 +121,7 @@ public List<FollowerResponse.Person> get() throws XboxFriendsException {
      * Add a friend from xbox live
      *
      * @param xuid The XUID of the friend to add
+     * @param gamertag The gamertag of the friend to add
      */
     public void add(String xuid, String gamertag) {
         // Remove the user from the remove list (if they are on it)
@@ -130,10 +134,47 @@ public void add(String xuid, String gamertag) {
         internalProcess();
     }
 
+    /**
+     * Add a friend from xbox live if they aren't already a friend
+     *
+     * @param xuid The XUID of the friend to add
+     * @param gamertag The gamertag of the friend to add
+     * @return True if the friend was added, false if they are already a friend
+     */
+    public boolean addIfRequired(String xuid, String gamertag) {
+        // Check if they are already in the list to be added
+        if (toAdd.containsKey(xuid)) {
+            return false;
+        }
+
+        // Check if we are already friends
+        HttpRequest xboxFriendStatus = HttpRequest.newBuilder()
+            .uri(URI.create(Constants.PEOPLE.formatted(xuid)))
+            .header("Authorization", sessionManager.getTokenHeader())
+            .GET()
+            .build();
+
+        try {
+            HttpResponse<String> response = httpClient.send(xboxFriendStatus, HttpResponse.BodyHandlers.ofString());
+            FriendStatusResponse modifyResponse = Constants.OBJECT_MAPPER.readValue(response.body(), FriendStatusResponse.class);
+
+            if (modifyResponse.isFollowingCaller() && modifyResponse.isFollowedByCaller()) {
+                return false;
+            }
+        } catch (InterruptedException | IOException e) {
+            // Debug log it failed and assume we aren't friends
+            logger.debug("Failed to check if " + gamertag + " (" + xuid + ") is a friend: " + e.getMessage());
+        }
+
+        add(xuid, gamertag);
+        return true;
+    }
+
     /**
      * Remove a friend from xbox live
      *
      * @param xuid The XUID of the friend to remove
+     * @param gamertag The gamertag of the friend to remove
      */
     public void remove(String xuid, String gamertag) {
         // Remove the user from the add list (if they are on it)

core/src/main/java/com/rtm516/mcxboxbroadcast/core/SessionManager.java

@@ -99,6 +99,12 @@ public void init(SessionInfo sessionInfo, FriendSyncConfig friendSyncConfig) thr
         }
     }
 
+    @Override
+    protected boolean handleFriendship() {
+        // Don't do anything as we are the main session
+        return false;
+    }
+
     /**
      * Update the current session with new information
      *
@@ -260,7 +266,7 @@ public void listSessions() {
         messages.add(" - Gamertag: " + getXboxToken().gamertag());
         messages.add("   Following: " + socialSummary().targetFollowingCount() + "/1000");
 
-        if (subSessionManagers.isEmpty()) {
+        if (!subSessionManagers.isEmpty()) {
             messages.add("Sub-sessions:");
             for (Map.Entry<String, SubSessionManager> subSession : subSessionManagers.entrySet()) {
                 messages.add(" - ID: " + subSession.getKey());

core/src/main/java/com/rtm516/mcxboxbroadcast/core/SessionManagerCore.java

@@ -157,6 +157,15 @@ public void init() throws SessionCreationException, SessionUpdateException {
         XboxTokenInfo tokenInfo = getXboxToken();
         logger.info("Successfully authenticated as " + tokenInfo.gamertag() + " (" + tokenInfo.userXUID() + ")");
 
+        if (handleFriendship()) {
+            logger.info("Waiting for friendship to be processed...");
+            try {
+                Thread.sleep(5000); // TODO Do a real callback not just wait
+            } catch (InterruptedException e) {
+                logger.error("Failed to wait for friendship to be processed", e);
+            }
+        }
+
         logger.info("Creating Xbox LIVE session...");
 
         // Create the session
@@ -171,6 +180,13 @@ public void init() throws SessionCreationException, SessionUpdateException {
         initialized = true;
     }
 
+    /**
+     * Handle the friendship of the current user to the main session if needed
+     *
+     * @return True if the friendship is being handled, false otherwise
+     */
+    protected abstract boolean handleFriendship();
+
     /**
      * Setup a new session and its prerequisites
      *

core/src/main/java/com/rtm516/mcxboxbroadcast/core/SubSessionManager.java

@@ -34,6 +34,19 @@ public String getSessionId() {
         return parent.sessionInfo().getSessionId();
     }
 
+    @Override
+    protected boolean handleFriendship() {
+        // TODO Some form of force flag just in case the master friends list is full
+
+        // Add the main account
+        boolean subAdd = friendManager().addIfRequired(parent.getXboxToken().userXUID(), parent.getXboxToken().gamertag());
+
+        // Get the main account to add us
+        boolean mainAdd = parent.friendManager().addIfRequired(getXboxToken().userXUID(), getXboxToken().gamertag());
+
+        return subAdd || mainAdd;
+    }
+
     @Override
     protected void updateSession() throws SessionUpdateException {
         super.updateSessionInternal(Constants.JOIN_SESSION.formatted(parent.sessionInfo().getHandleId()), new JoinSessionRequest(parent.sessionInfo()));

core/src/main/java/com/rtm516/mcxboxbroadcast/core/models/FriendStatusResponse.java

@@ -0,0 +1,16 @@
+package com.rtm516.mcxboxbroadcast.core.models;
+
+import java.time.Instant;
+
+public record FriendStatusResponse(
+    String xuid,
+    Instant addedDateTimeUtc,
+    boolean isFavorite,
+    Object[] socialNetworks,
+    boolean isFollowedByCaller,
+    boolean isFollowingCaller,
+    boolean isIdentityShared,
+    boolean isSquadMateWith,
+    boolean isUnfollowingFeed
+) {
+}