feat: add more host and chatter info to tmi

twitch4j · Sep 24, 2020 · 1671723 · 1671723
1 parent 2e1a56c
commit 1671723
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/rest-tmi/src/main/java/com/github/twitch4j/tmi/domain/Chatters.java b/rest-tmi/src/main/java/com/github/twitch4j/tmi/domain/Chatters.java
@@ -27,12 +27,18 @@ public class Chatters {
     @JsonIgnore
     private List<String> vips;
 
+    /** Broadcaster */
+    @JsonIgnore
+    private List<String> broadcaster;
+
     /** Staff */
     @JsonIgnore
+    @Deprecated
     private List<String> staff;
 
     /** Admins */
     @JsonIgnore
+    @Deprecated
     private List<String> admins;
 
     /** Moderators */
@@ -45,6 +51,7 @@ public class Chatters {
 
     @JsonProperty("chatters")
     private void unpackMessage(Map<String, List<String>> chatters) {
+        broadcaster = chatters.get("broadcaster");
         vips = chatters.get("vips");
         moderators = chatters.get("moderators");
         staff = chatters.get("staff");
@@ -58,7 +65,8 @@ private void unpackMessage(Map<String, List<String>> chatters) {
      * @return all viewers (name)
      */
     public List<String> getAllViewers() {
-        List<String> newList = new ArrayList<String>();
+        List<String> newList = new ArrayList<>(viewerCount);
+        newList.addAll(broadcaster);
         newList.addAll(vips);
         newList.addAll(moderators);
         newList.addAll(staff);

diff --git a/rest-tmi/src/main/java/com/github/twitch4j/tmi/domain/Host.java b/rest-tmi/src/main/java/com/github/twitch4j/tmi/domain/Host.java
@@ -1,7 +1,6 @@
 package com.github.twitch4j.tmi.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.AccessLevel;
@@ -15,17 +14,19 @@
 @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Host {
-
-	@JsonProperty("host_id")
-	private String hostId;
-
-	@JsonProperty("host_login")
-	private String hostLogin;
-
-	@JsonProperty("target_id")
-	private String targetId;
-
-	@JsonProperty("target_login")
-	private String targetLogin;
-
+
+    private String hostId;
+
+    private String hostLogin;
+
+    private String hostDisplayName;
+
+    private String targetId;
+
+    private String targetLogin;
+
+    private String targetDisplayName;
+
+    private Boolean hostPartnered;
+
 }