Develop 1.8.12

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokDisconnectedEvent.java

@@ -36,11 +36,6 @@ public TikTokDisconnectedEvent(String reason) {
 		this.reason = reason.isBlank() ? "None" : reason;
 	}
 
-	public TikTokDisconnectedEvent() {
-		this("None");
-	}
-
-
 	public static TikTokDisconnectedEvent of(String reason)
 	{
 		return new TikTokDisconnectedEvent(reason);

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokLinkMicBattleEvent.java

@@ -25,11 +25,10 @@
 import io.github.jwdeveloper.tiktok.annotations.*;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.battles.*;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.messages.enums.LinkMicBattleStatus;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
-import lombok.*;
-
-import java.util.*;
+import lombok.Getter;
 
 /**
  * Triggered every time a battle starts & ends
@@ -43,23 +42,22 @@ public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent
      true if battle is finished otherwise false
      */
     private final boolean finished;
-    private final List<Team> teams;
+    private final Team team1, team2;
 
     public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
         super(msg.getCommon());
         battleId = msg.getId();
         finished = msg.getBattleStatus() == LinkMicBattleStatus.BATTLE_FINISHED;
-        teams = new ArrayList<>();
         if (msg.getHostTeamCount() == 2) { // 1v1 battle
-            teams.add(new Team1v1(msg.getHostTeam(0), msg));
-            teams.add(new Team1v1(msg.getHostTeam(1), msg));
+            team1 = new Team1v1(msg.getHostTeam(0), msg);
+            team2 = new Team1v1(msg.getHostTeam(1), msg);
         } else { // 2v2 battle
             if (isFinished()) {
-                teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg));
-                teams.add(new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 2).findFirst().orElse(null), msg));
+                team1 = new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 1).findFirst().orElse(null), msg);
+                team2 = new Team2v2(msg.getHostData2V2List().stream().filter(data -> data.getTeamNumber() == 2).findFirst().orElse(null), msg);
             } else {
-                teams.add(new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg));
-                teams.add(new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg));
+                team1 = new Team2v2(msg.getHostTeam(0), msg.getHostTeam(1), msg);
+                team2 = new Team2v2(msg.getHostTeam(2), msg.getHostTeam(3), msg);
             }
         }
 
@@ -69,15 +67,38 @@ public TikTokLinkMicBattleEvent(WebcastLinkMicBattle msg) {
         // - msg.getHostTeamCount() always is 2 for 1v1 or 4 for 2v2
     }
 
+    /**
+     * @param battleHostName name of host to search
+     * @return Team1v1 instance containing name of host or null if no team found */
+    public Team1v1 get1v1Team(String battleHostName) {
+        if (!is1v1())
+            throw new TikTokLiveException("Teams are not instance of 1v1 battle!");
+        if (team1.getAs1v1Team().getHost().getName().equals(battleHostName))
+            return team1.getAs1v1Team();
+        if (team2.getAs1v1Team().getHost().getName().equals(battleHostName))
+            return team2.getAs1v1Team();
+        return null;
+    }
+
+    public Team2v2 get2v2Team(String battleHostName) {
+        if (!is2v2())
+            throw new TikTokLiveException("Teams are not instance of 2v2 battle!");
+        if (team1.getAs2v2Team().getHosts().stream().anyMatch(user -> user.getName().equals(battleHostName)))
+            return team1.getAs2v2Team();
+        if (team2.getAs2v2Team().getHosts().stream().anyMatch(user -> user.getName().equals(battleHostName)))
+            return team2.getAs2v2Team();
+        return null;
+    }
+
     public boolean is1v1() {
-        return teams.get(0) instanceof Team1v1;
+        return team1.is1v1Team() || team2.is1v1Team();
     }
 
     public boolean is2v2() {
-        return teams.get(0) instanceof Team2v2;
+        return team1.is2v2Team() || team2.is2v2Team();
     }
 
     public boolean isTie() {
-        return isFinished() && teams.get(0).getTotalPoints() == teams.get(1).getTotalPoints();
+        return isFinished() && team1.getTotalPoints() == team2.getTotalPoints();
     }
 }

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/TikTokUnhandledMemberEvent.java

@@ -35,4 +35,4 @@ public class TikTokUnhandledMemberEvent extends TikTokUnhandledEvent<WebcastMemb
     public TikTokUnhandledMemberEvent(WebcastMemberMessage data) {
         super(data);
     }
-}
+}

API/src/main/java/io/github/jwdeveloper/tiktok/data/events/social/TikTokJoinEvent.java

@@ -26,7 +26,6 @@
 import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.data.models.users.User;
-import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.webcast.WebcastSocialMessage;
 import lombok.Getter;
@@ -58,4 +57,4 @@ public static TikTokJoinEvent of(String userName)
                         .build())
                 .build());
     }
-}
+}

Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java

@@ -83,7 +83,7 @@ public void connect() {
         } catch (TikTokLiveException e) {
             setState(ConnectionState.DISCONNECTED);
             tikTokEventHandler.publish(this, new TikTokErrorEvent(e));
-            tikTokEventHandler.publish(this, new TikTokDisconnectedEvent());
+            tikTokEventHandler.publish(this, new TikTokDisconnectedEvent("Exception: "+e.getMessage()));
 
             if (e instanceof TikTokLiveOfflineHostException && clientSettings.isRetryOnConnectionFailure()) {
                 try {

Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketOfflineClient.java

@@ -48,6 +48,6 @@ public void stop() {
         if (liveClient == null) {
             return;
         }
-        handler.publish(liveClient, new TikTokDisconnectedEvent());
+        handler.publish(liveClient, new TikTokDisconnectedEvent("Stopping"));
     }
-}
+}