youtube info updated

apo2073 · Dec 8, 2024 · d9a6d5c · d9a6d5c
1 parent 1214277
commit d9a6d5c
Show file tree

Hide file tree

Showing 10 changed files with 157 additions and 88 deletions.
diff --git a/README.md b/README.md
@@ -5,15 +5,17 @@
 ---
 
 ## Dependency
+**gradle.kts**
 ```gradle
-	repositories {
-			mavenCentral()
-			maven { url 'https://jitpack.io' }
-	}
-	
-	dependencies {
-	        implementation 'com.github.apo2073:YouTubeLiv:Tag'
-	}
+repositories {
+    mavenCentral()
+    maven("https://jitpack.io") {
+        name = "jitpack"
+    }
+}	
+dependencies {
+    implementation("com.github.apo2073:YouTubeLiv:Tag")
+}
 ```
 
 ---
@@ -24,15 +26,15 @@ public class Main {
     public static void main(String[] args) {
         Youtube youtube = new YouTubeBuilder()
                 .setApiKey("API-KEY")
-                .setVIDEO_ID("Live-Video-Id") //https://www.youtube.com/watch?v=(here)
+                .setVideoId("Live-Video-Id") //https://www.youtube.com/watch?v=(here)
                 .addListener(new YouTubeEventListener() {
                     @Override
                     public void onChat(Chatting chat) {
                         System.out.println(chat.author().getDisplayName()+": "+chat.getMessage());
                     }
                 }).build();
 
-        Youtube.YouTubeInfo info = youtube.channelInfo();
+        YouTubeInfo info = youtube.channelInfo();
         System.out.println(info.getChannelName()); // Get Channel Name
         System.out.println(info.getSubscriptionCount()); // Get Channel Subscription Count
         try {
@@ -41,8 +43,7 @@ public class Main {
             throw new RuntimeException(e);
         }
 
-        youtube.stop();
-        System.out.println("Stopped");
+        youtube.stop(); // Stop
     }
 }
 ```

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.github.apo2073"
-version = "1.0.2"
+version = "1.1"
 
 repositories {
     mavenCentral()
@@ -41,7 +41,7 @@ publishing {
         create<MavenPublication>("maven") {
             groupId = "com.github.apo2073"
             artifactId = "YoutubeLiv"
-            version = "1.0.2"
+            version = "1.1"
 
             from(components["java"])
 

diff --git a/src/main/java/kr/apo2073/ytliv/YouTubeBuilder.java b/src/main/java/kr/apo2073/ytliv/YouTubeBuilder.java
@@ -16,7 +16,7 @@ public class YouTubeBuilder {
     boolean isDebug=false;
 
     public YouTubeBuilder setApiKey(String key) {this.API_KEY=key;return this;}
-    public YouTubeBuilder setVIDEO_ID(String id) {this.VIDEO_ID =id; return this;}
+    public YouTubeBuilder setVideoId(String id) {this.VIDEO_ID =id; return this;}
     public YouTubeBuilder setDebug(boolean debug) {this.isDebug=debug; return this;}
     public YouTubeBuilder setPollingInterval(long interval) {this.pollingInterval=interval;return this;}
     public YouTubeBuilder addListener(YouTubeEventListener listener) {

diff --git a/src/main/java/kr/apo2073/ytliv/YouTubeInfo.java b/src/main/java/kr/apo2073/ytliv/YouTubeInfo.java
@@ -0,0 +1,86 @@
+package kr.apo2073.ytliv;
+
+import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
+import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.services.youtube.YouTube;
+import com.google.api.services.youtube.model.Channel;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.List;
+
+public class YouTubeInfo {
+    private final String channelName;
+    private final String channelSubscriptionCount;
+    private final Channel channel;
+    private static String API_KEY;
+
+    public static YouTubeInfo from(String videoId, String api) {
+        try {
+            YouTube youtube = new YouTube.Builder(
+                    GoogleNetHttpTransport.newTrustedTransport(),
+                    JacksonFactory.getDefaultInstance(),
+                    null
+            ).setApplicationName("YouTubeLiv").build();
+            API_KEY=api;
+
+            return new YouTubeInfo(youtube, videoId);
+        } catch (GeneralSecurityException | IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    private YouTubeInfo(YouTube youtube, String videoId) {
+        Channel tempChannel = null;
+        String tempName = null;
+        String tempCount = null;
+
+        try {
+            tempChannel = getChannel(youtube, videoId);
+            if (tempChannel != null) {
+                tempName = tempChannel.getSnippet().getTitle();
+                tempCount = tempChannel.getStatistics().getSubscriberCount().toString();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        this.channel = tempChannel;
+        this.channelName = tempName;
+        this.channelSubscriptionCount = tempCount;
+    }
+
+    private Channel getChannel(YouTube youtube, String videoId) throws IOException {
+        YouTube.Videos.List videoRequest = youtube.videos()
+                .list(List.of("snippet"))
+                .setKey(API_KEY)
+                .setId(List.of(videoId));
+
+        var videoResponse = videoRequest.execute();
+        if (videoResponse.getItems() == null || videoResponse.getItems().isEmpty()) return null;
+        String channelId = videoResponse.getItems().get(0).getSnippet().getChannelId();
+
+        YouTube.Channels.List channelRequest = youtube.channels()
+                .list(List.of("snippet", "statistics"))
+                .setKey(API_KEY)
+                .setId(List.of(channelId));
+
+        var channelResponse = channelRequest.execute();
+        if (channelResponse.getItems() == null || channelResponse.getItems().isEmpty()) return null;
+
+        return channelResponse.getItems().get(0);
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public String getSubscriptionCount() {
+        return channelSubscriptionCount;
+    }
+
+    public Channel getChannel() {
+        return channel;
+    }
+}
diff --git a/src/main/java/kr/apo2073/ytliv/Youtube.java b/src/main/java/kr/apo2073/ytliv/Youtube.java
@@ -39,7 +39,7 @@ public Youtube(YouTubeBuilder builder) throws GeneralSecurityException, IOExcept
                 GoogleNetHttpTransport.newTrustedTransport(),
                 JacksonFactory.getDefaultInstance(),
                 null
-        ).build();
+        ).setApplicationName("YouTubeLiv") .build();
 
         validateApiKey();
 
@@ -119,10 +119,14 @@ private String getListChatID() throws IOException {
     }
 
     private void processMessage(LiveChatMessage message) {
+        if (!isRunning) return;
+
         if (message.getSnippet().getType().equals(MessageType.SUPER_CHAT_MESSAGE.getType())) {
             SuperChat superChat = new SuperChat(
+                    message.getAuthorDetails().getDisplayName(),
                     message.getSnippet().getSuperChatDetails().getAmountDisplayString(),
                     message.getSnippet().getSuperChatDetails().getUserComment(),
+                    videoID,
                     message.getSnippet().getPublishedAt().toString(),
                     message
             );
@@ -131,8 +135,10 @@ private void processMessage(LiveChatMessage message) {
             }
         } else if (message.getSnippet().getType().equals(MessageType.SUPER_STICKER_MESSAGE.getType())) {
             SuperSticker superSticker = new SuperSticker(
+                    message.getAuthorDetails().getDisplayName(),
                     message.getSnippet().getSuperStickerDetails().getAmountDisplayString(),
                     message.getSnippet().getSuperStickerDetails().getSuperStickerMetadata().getStickerId(),
+                    videoID,
                     message.getSnippet().getPublishedAt().toString(),
                     message
             );
@@ -142,7 +148,7 @@ private void processMessage(LiveChatMessage message) {
         } else if (message.getSnippet().getType().equals(MessageType.TEXT_MESSAGE.getType())) {
             String contents = message.getSnippet().getDisplayMessage();
             for (YouTubeEventListener listener : listeners) {
-                listener.onChat(new Chatting(contents, message));
+                listener.onChat(new Chatting(message.getAuthorDetails().getDisplayName(), contents, videoID, message));
             }
         }
     }
@@ -154,59 +160,6 @@ private void processError(Exception e) {
     }
 
     public YouTubeInfo channelInfo() {
-        return new YouTubeInfo(youtube);
-    }
-
-    public class YouTubeInfo {
-        private String channelName;
-        private String channelSubscriptionCount;
-        private final YouTube youTube;
-        private final Channel channel;
-
-        public YouTubeInfo(YouTube youTube) {
-            this.youTube = youTube;
-            Channel tempChannel = null;
-            String tempName = null;
-            String tempCount = null;
-
-            try {
-                tempChannel = getChannel();
-                if (tempChannel != null) {
-                    tempName = tempChannel.getSnippet().getTitle();
-                    tempCount = tempChannel.getStatistics().getSubscriberCount().toString();
-                }
-            } catch (IOException e) {
-                processError(e);
-            }
-
-            this.channel = tempChannel;
-            this.channelName = tempName;
-            this.channelSubscriptionCount = tempCount;
-        }
-
-        public Channel getChannel() throws IOException {
-            YouTube.Videos.List videoRequest = youTube.videos()
-                    .list(List.of("snippet")).setKey(api).setId(List.of(videoID));
-
-            var videoResponse = videoRequest.execute();
-            if (videoResponse.getItems() == null || videoResponse.getItems().isEmpty()) return null;
-            String channelId = videoResponse.getItems().get(0).getSnippet().getChannelId();
-
-            YouTube.Channels.List channelRequest = youTube.channels()
-                    .list(List.of("snippet", "statistics")).setKey(api).setId(List.of(channelId));
-
-            var channelResponse = channelRequest.execute();
-            if (channelResponse.getItems() == null || channelResponse.getItems().isEmpty()) return null;
-
-            return channelResponse.getItems().get(0);
-        }
-
-        public String getChannelName() {
-            return channelName;
-        }
-
-        public String getSubscriptionCount() {
-            return channelSubscriptionCount;
-        }
+        return YouTubeInfo.from(videoID, api);
     }
 }
diff --git a/src/main/java/kr/apo2073/ytliv/data/Author.java b/src/main/java/kr/apo2073/ytliv/data/Author.java
@@ -0,0 +1,5 @@
+package kr.apo2073.ytliv.data;
+
+import com.google.api.services.youtube.model.LiveChatMessage;
+
+public record Author(String name, LiveChatMessage message) {}
diff --git a/src/main/java/kr/apo2073/ytliv/data/Chatting.java b/src/main/java/kr/apo2073/ytliv/data/Chatting.java
@@ -1,21 +1,29 @@
 package kr.apo2073.ytliv.data;
 
 import com.google.api.services.youtube.model.LiveChatMessage;
-import com.google.api.services.youtube.model.LiveChatMessageAuthorDetails;
 
 public class Chatting {
+    private final String author;
     private final String message;
     private final LiveChatMessage liveChatMessage;
+    private final String videoId;
 
-    public Chatting(String message, LiveChatMessage liveChatMessage) {
+    public Chatting(String author, String message, String videoId, LiveChatMessage liveChatMessage) {
+        this.author = author;
         this.message = message;
         this.liveChatMessage = liveChatMessage;
+        this.videoId=videoId;
     }
 
     public String getMessage() {
         return message;
     }
-    public LiveChatMessageAuthorDetails author() {
-        return liveChatMessage.getAuthorDetails();
+
+    public String getVideoId() {
+        return videoId;
+    }
+
+    public Author author() {
+        return new Author(author, liveChatMessage);
     }
 }
diff --git a/src/main/java/kr/apo2073/ytliv/data/SuperChat.java b/src/main/java/kr/apo2073/ytliv/data/SuperChat.java
@@ -1,19 +1,22 @@
 package kr.apo2073.ytliv.data;
 
 import com.google.api.services.youtube.model.LiveChatMessage;
-import com.google.api.services.youtube.model.LiveChatMessageAuthorDetails;
 
 public class SuperChat {
+    private final String author;
     private final String amount;
     private final String message;
     private final String timestamp;
     private final LiveChatMessage liveChatMessage;
+    private final String videoId;
 
-    public SuperChat(String amount, String message, String timestamp, LiveChatMessage liveChatMessage) {
+    public SuperChat(String author, String amount, String message, String videoId, String timestamp, LiveChatMessage liveChatMessage) {
         this.amount = amount;
         this.message = message;
         this.timestamp = timestamp;
         this.liveChatMessage = liveChatMessage;
+        this.videoId=videoId;
+        this.author=author;
     }
     public String getAmount() {
         return amount;
@@ -27,7 +30,11 @@ public String getTimestamp() {
         return timestamp;
     }
 
-    public LiveChatMessageAuthorDetails author() {
-        return liveChatMessage.getAuthorDetails();
+    public String getVideoId() {
+        return videoId;
+    }
+
+    public Author author() {
+        return new Author(author, liveChatMessage);
     }
 }
diff --git a/src/main/java/kr/apo2073/ytliv/data/SuperSticker.java b/src/main/java/kr/apo2073/ytliv/data/SuperSticker.java
@@ -1,19 +1,22 @@
 package kr.apo2073.ytliv.data;
 
 import com.google.api.services.youtube.model.LiveChatMessage;
-import com.google.api.services.youtube.model.LiveChatMessageAuthorDetails;
 
 public class SuperSticker {
+    private final String author;
     private final String amount;
     private final String stickerID;
     private final String timestamp;
     private final LiveChatMessage liveChatMessage;
+    private final String videoId;
 
-    public SuperSticker(String amount, String content, String timestamp, LiveChatMessage liveChatMessage) {
+    public SuperSticker(String author, String amount, String content, String videoId, String timestamp, LiveChatMessage liveChatMessage) {
         this.amount = amount;
         this.stickerID = content;
         this.timestamp = timestamp;
         this.liveChatMessage = liveChatMessage;
+        this.videoId=videoId;
+        this.author=author;
     }
 
     public String getAmount() {
@@ -28,5 +31,11 @@ public String getTimestamp() {
         return timestamp;
     }
 
-    public LiveChatMessageAuthorDetails author() {return liveChatMessage.getAuthorDetails();}
+    public String getVideoId() {
+        return videoId;
+    }
+
+    public Author author() {
+        return new Author(author, liveChatMessage);
+    }
 }