Fixed bug with not being able to pass in singular Orgnization enum

6 files changed, 45 insertions, 10 deletions

diff --git a/README.md b/README.md
index b0ad51d..e23ecd8 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ public class App {
             }
 
             System.out.println("\n\n\nNow Searching Comments");
-            String word = "Mumei";
+            String word = "yabe";
             Object scr = holodex.searchComment(new CommentSearchQueryBuilder().setOrg(List.of("Hololive")).setComment(List.of(word)).setLimit(1).setPaginated(false));
             System.out.println("--- Search Results for comments containing kw: " + word + " ---");
             for (SimpleCommentVideo video : (List<SimpleCommentVideo>) scr) {
diff --git a/pom.xml b/pom.xml
index 5c8d7a3..6e4b2dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.pinapelz</groupId>
     <artifactId>jholodex</artifactId>
-    <version>1.2</version>
+    <version>1.4</version>
     <name>JHolodex</name>
     <url>http://maven.apache.org</url>
     <properties>
diff --git a/src/main/java/App.java b/src/main/java/App.java
index e55b7a7..de669f8 100644
--- a/src/main/java/App.java
+++ b/src/main/java/App.java
@@ -9,7 +9,7 @@ import java.util.List;
 public class App {
     public static void main(String[] args) {
         try {
-            Holodex holodex = new Holodex("YOUR_API_KEY_HERE");
+            Holodex holodex = new Holodex("b910328a-0cec-406b-9b15-d4ef1abf4757");
             Channel channel = holodex.getChannel("UC4WvIIAo89_AzGUh1AZ6Dkg");
             System.out.println(channel.name + " is a member of " + channel.org + " and has " + channel.suborg + " as a suborg");
 
@@ -24,8 +24,11 @@ public class App {
             ChannelQueryBuilder channelQuery = new ChannelQueryBuilder();
             channelQuery.setOrg(Organization.NIJISANJI);
             channelQuery.setLimit(75);
+
             List<Channel> nijisanjiMembers = holodex.getChannels(channelQuery);
 
+            System.out.println("There are " + nijisanjiMembers.size() + " members in " + Organization.NIJISANJI);
+
             Video anotherVideo = holodex.getVideo(new VideoByVideoIdQueryBuilder().setVideoId("9-O_IWM3184").setLang(
                     List.of(Language.ENGLISH, Language.JAPANESE)));
 
@@ -33,7 +36,7 @@ public class App {
                     " on " + anotherVideo.published_at);
 
             // SEARCHING THROUGH VIDEOS AND COMMENTS
-            Object srv = holodex.searchVideo(new VideoSearchQueryBuilder().setOrg(List.of("Nijisanji")).setSort(Sort.NEWEST).
+            Object srv = holodex.searchVideo(new VideoSearchQueryBuilder().setOrg(Organization.NIJISANJI).setSort(Sort.NEWEST).
                     setTarget(Type.STREAM).setPaginated(false).setLimit(10).setOffset(0)
                     .setTopic(List.of("singing"))
             );
@@ -43,8 +46,8 @@ public class App {
             }
 
             System.out.println("\n\n\nNow Searching Comments");
-            String word = "Mumei";
-            Object scr = holodex.searchComment(new CommentSearchQueryBuilder().setOrg(List.of("Hololive")).setComment(List.of(word)).setLimit(1).setPaginated(false));
+            String word = "eating";
+            Object scr = holodex.searchComment(new CommentSearchQueryBuilder().setOrg(Organization.NIJISANJI).setComment(List.of(word)).setLimit(1).setPaginated(false));
             System.out.println("--- Search Results for comments containing kw: " + word + " ---");
             for (SimpleCommentVideo video : (List<SimpleCommentVideo>) scr) {
                 System.out.println(video.title + " - " + video.channel.name);
diff --git a/src/main/java/com/pinapelz/query/CommentSearchQueryBuilder.java b/src/main/java/com/pinapelz/query/CommentSearchQueryBuilder.java
index 4e0020b..6c1fa90 100644
--- a/src/main/java/com/pinapelz/query/CommentSearchQueryBuilder.java
+++ b/src/main/java/com/pinapelz/query/CommentSearchQueryBuilder.java
@@ -1,6 +1,7 @@
 package com.pinapelz.query;
 
 import com.pinapelz.vtuber.Language;
+import com.pinapelz.vtuber.Organization;
 import com.pinapelz.vtuber.Sort;
 import com.pinapelz.vtuber.Type;
 
@@ -130,11 +131,26 @@ public class CommentSearchQueryBuilder {
         return org;
     }
 
-    public CommentSearchQueryBuilder setOrg(List<String> org) {
-        this.org = org;
+    public CommentSearchQueryBuilder setOrg(String org) {
+        this.org = List.of(org);
         return this;
     }
 
+    public CommentSearchQueryBuilder setOrg(Organization org) {
+        this.org = List.of(org.toString());
+        return this;
+    }
+
+    public CommentSearchQueryBuilder setOrg(List<Organization> org) {
+        List<String> orgs = new ArrayList<String>();
+        for (Organization o : org) {
+            orgs.add(o.toString());
+        }
+        this.org = orgs;
+        return this;
+    }
+
+
     public List<String> getComment() {
         return comment;
     }
diff --git a/src/main/java/com/pinapelz/query/VideoQueryBuilder.java b/src/main/java/com/pinapelz/query/VideoQueryBuilder.java
index c8db237..6a74217 100644
--- a/src/main/java/com/pinapelz/query/VideoQueryBuilder.java
+++ b/src/main/java/com/pinapelz/query/VideoQueryBuilder.java
@@ -3,6 +3,7 @@ package com.pinapelz.query;
 import com.pinapelz.datatypes.Video;
 import com.pinapelz.vtuber.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/pinapelz/query/VideoSearchQueryBuilder.java b/src/main/java/com/pinapelz/query/VideoSearchQueryBuilder.java
index e982ac7..0a42716 100644
--- a/src/main/java/com/pinapelz/query/VideoSearchQueryBuilder.java
+++ b/src/main/java/com/pinapelz/query/VideoSearchQueryBuilder.java
@@ -1,6 +1,7 @@
 package com.pinapelz.query;
 
 import com.pinapelz.vtuber.Language;
+import com.pinapelz.vtuber.Organization;
 import com.pinapelz.vtuber.Sort;
 import com.pinapelz.vtuber.Type;
 
@@ -125,8 +126,22 @@ public class VideoSearchQueryBuilder {
         return org;
     }
 
-    public VideoSearchQueryBuilder setOrg(List<String> org) {
-        this.org = org;
+    public VideoSearchQueryBuilder setOrg(String org) {
+        this.org = List.of(org);
+        return this;
+    }
+
+    public VideoSearchQueryBuilder setOrg(Organization org) {
+        this.org = List.of(org.toString());
+        return this;
+    }
+
+    public VideoSearchQueryBuilder setOrg(List<Organization> org) {
+        List<String> orgs = new ArrayList<String>();
+        for (Organization o : org) {
+            orgs.add(o.toString());
+        }
+        this.org = orgs;
         return this;
     }