From 36edf34793e2f5cfad0731d44cc3ef5b347a4719 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sat, 29 Jul 2023 11:19:56 +0200
Subject: [PATCH] add visibility, license and tags to streams info

---
 src/main/java/me/kavin/piped/utils/CollectionUtils.java | 5 ++---
 src/main/java/me/kavin/piped/utils/obj/Streams.java     | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/me/kavin/piped/utils/CollectionUtils.java b/src/main/java/me/kavin/piped/utils/CollectionUtils.java
index 0c46fdf0..b04fa1d4 100644
--- a/src/main/java/me/kavin/piped/utils/CollectionUtils.java
+++ b/src/main/java/me/kavin/piped/utils/CollectionUtils.java
@@ -4,7 +4,6 @@
 import me.kavin.piped.utils.obj.*;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
-import org.schabi.newpipe.extractor.channel.ChannelTabInfo;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.extractor.linkhandler.ReadyChannelTabListLinkHandler;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
@@ -16,7 +15,6 @@
 import java.util.Locale;
 import java.util.Optional;
 
-import static me.kavin.piped.consts.Constants.YOUTUBE_SERVICE;
 import static me.kavin.piped.utils.URLUtils.*;
 
 public class CollectionUtils {
@@ -71,7 +69,8 @@ public static Streams collectStreamInfo(StreamInfo info) {
                 rewriteURL(info.getUploaderAvatarUrl()), rewriteURL(info.getThumbnailUrl()), info.getDuration(),
                 info.getViewCount(), info.getLikeCount(), info.getDislikeCount(), info.getUploaderSubscriberCount(), info.isUploaderVerified(),
                 audioStreams, videoStreams, relatedStreams, subtitles, livestream, rewriteVideoURL(info.getHlsUrl()),
-                rewriteVideoURL(info.getDashMpdUrl()), null, info.getCategory(), chapters, previewFrames);
+                rewriteVideoURL(info.getDashMpdUrl()), null, info.getCategory(), info.getLicence(),
+                info.getPrivacy().name().toLowerCase(), info.getTags(), chapters, previewFrames);
     }
 
     public static List<ContentItem> collectRelatedItems(List<? extends InfoItem> items) {
diff --git a/src/main/java/me/kavin/piped/utils/obj/Streams.java b/src/main/java/me/kavin/piped/utils/obj/Streams.java
index 2567e899..f521b980 100644
--- a/src/main/java/me/kavin/piped/utils/obj/Streams.java
+++ b/src/main/java/me/kavin/piped/utils/obj/Streams.java
@@ -9,7 +9,9 @@
 public class Streams {
 
     public String title, description, uploadDate, uploader, uploaderUrl, uploaderAvatar, thumbnailUrl, hls, dash,
-            lbryId, category;
+            lbryId, category, license, visibility;
+
+    public List<String> tags;
 
     public boolean uploaderVerified;
 
@@ -33,7 +35,7 @@ public Streams(String title, String description, String uploadDate, String uploa
                    String uploaderAvatar, String thumbnailUrl, long duration, long views, long likes, long dislikes, long uploaderSubscriberCount,
                    boolean uploaderVerified, List<PipedStream> audioStreams, List<PipedStream> videoStreams,
                    List<ContentItem> relatedStreams, List<Subtitle> subtitles, boolean livestream, String hls, String dash,
-                   String lbryId, String category, List<ChapterSegment> chapters, List<PreviewFrames> previewFrames) {
+                   String lbryId, String category, String license, String visibility, List<String> tags, List<ChapterSegment> chapters, List<PreviewFrames> previewFrames) {
         this.title = title;
         this.description = description;
         this.uploadDate = uploadDate;
@@ -58,5 +60,8 @@ public Streams(String title, String description, String uploadDate, String uploa
         this.chapters = chapters;
         this.previewFrames = previewFrames;
         this.category = category;
+        this.license = license;
+        this.tags = tags;
+        this.visibility = visibility;
     }
 }