1 files changed, 10 insertions, 3 deletions

diff --git a/src/main/java/builders/ScheduleMessageBuilder.java b/src/main/java/builders/ScheduleMessageBuilder.java
index eb47118..4f5f78c 100644
--- a/src/main/java/builders/ScheduleMessageBuilder.java
+++ b/src/main/java/builders/ScheduleMessageBuilder.java
@@ -3,6 +3,7 @@ package builders;
 import com.pina.datatypes.SimpleVideo;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import java.text.NumberFormat;
 
 import java.awt.*;
 import java.time.OffsetDateTime;
@@ -11,6 +12,7 @@ import java.util.List;
 
 public class ScheduleMessageBuilder {
     private int COLOR = 8805674;
+    private NumberFormat numberFormat = NumberFormat.getInstance();
     public MessageEmbed buildLiveAndUpcomingMessage(List<SimpleVideo> videos){
         if (videos.size() == 0){
             return new EmbedBuilder()
@@ -31,7 +33,7 @@ public class ScheduleMessageBuilder {
         for (SimpleVideo video : videos){
             String gmtStartTime = video.start_scheduled;
             long unixTime = OffsetDateTime.parse(gmtStartTime).toEpochSecond();
-            String unixTimeStr = "<t:" + Long.toString(unixTime) + ":R> ⏰";
+            String unixTimeStr = "<t:" + unixTime + ":R> ⏰";
             if (video.status.equals("live")){
                 unixTimeStr = "LIVE \uD83D\uDD34";
             }
@@ -40,7 +42,7 @@ public class ScheduleMessageBuilder {
                 titleText = video.channel.name + " - " + unixTimeStr;
             }
             String videoURL = "https://www.youtube.com/watch?v=" + video.id;
-            messageBuilder.addField(titleText, "["+video.title+"]"+"("+videoURL+")", false);
+            messageBuilder.addField(titleText, "["+video.title+"]"+"("+videoURL+")", true);
         }
         return messageBuilder.build();
 
@@ -55,19 +57,24 @@ public class ScheduleMessageBuilder {
             }
             String title = channel_name + " is streaming soon!   ⏰";
             String fieldTitle = "Scheduled Start Time";
+            String viewerText = "Not Live Yet";
             if (video.status.equals("live")){
                 title = channel_name + " is live!   \uD83D\uDD34";
                 fieldTitle = "Live Since";
+                viewerText = "Live Viewers";
             }
             String gmtStartTime = video.start_scheduled;
             long unixTime = OffsetDateTime.parse(gmtStartTime).toEpochSecond();
             EmbedBuilder embedBuilder = new EmbedBuilder()
                     .setTitle(title)
                     .setDescription("["+video.title+"]"+"(https://www.youtube.com/watch?v="+video.id+")")
-                    .addField(fieldTitle, "<t:" + unixTime + ":R>", false)
+                    .addField(fieldTitle, "<t:" + unixTime + ":R>", true)
                     .setThumbnail(video.channel.photo)
                     .setImage("https://img.youtube.com/vi/"+video.id+"/maxresdefault.jpg")
                     .setTimestamp(OffsetDateTime.now());
+            if (video.status.equals("live")){ //uhhhhhh boilerplate but oh well
+                embedBuilder.addField(viewerText, numberFormat.format(video.live_viewers), true);
+            }
             messageEmbeds.add(embedBuilder.build());
         }
         return messageEmbeds;