From 9d09232319c1314029b0fddefb34729cba4815c7 Mon Sep 17 00:00:00 2001
From: FireMasterK <20838718+FireMasterK@users.noreply.github.com>
Date: Sat, 31 Jul 2021 16:09:06 +0530
Subject: [PATCH] Fix NPE and add comments disabled field.

---
 src/main/java/me/kavin/piped/utils/ResponseHelper.java   | 8 ++++----
 src/main/java/me/kavin/piped/utils/obj/CommentsPage.java | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
index 28e6b35..8dd8c8e 100644
--- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java
+++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
@@ -477,8 +477,8 @@ public class ResponseHelper {
         info.getRelatedItems().forEach(comment -> {
             comments.add(new Comment(comment.getUploaderName(), rewriteURL(comment.getUploaderAvatarUrl()),
                     comment.getCommentId(), comment.getCommentText(), comment.getTextualUploadDate(),
-                    comment.getUploaderUrl().substring(19), comment.getLikeCount(), comment.isHeartedByUploader(),
-                    comment.isPinned(), comment.isUploaderVerified()));
+                    optionalSubstring(comment.getUploaderUrl(), 19), comment.getLikeCount(),
+                    comment.isHeartedByUploader(), comment.isPinned(), comment.isUploaderVerified()));
         });
 
         String nextpage = null;
@@ -487,7 +487,7 @@ public class ResponseHelper {
             nextpage = Constants.mapper.writeValueAsString(page);
         }
 
-        CommentsPage commentsItem = new CommentsPage(comments, nextpage);
+        CommentsPage commentsItem = new CommentsPage(comments, nextpage, info.isCommentsDisabled());
 
         return Constants.mapper.writeValueAsBytes(commentsItem);
 
@@ -516,7 +516,7 @@ public class ResponseHelper {
             nextpage = Constants.mapper.writeValueAsString(page);
         }
 
-        CommentsPage commentsItem = new CommentsPage(comments, nextpage);
+        CommentsPage commentsItem = new CommentsPage(comments, nextpage, init.isCommentsDisabled());
 
         return Constants.mapper.writeValueAsBytes(commentsItem);
 
diff --git a/src/main/java/me/kavin/piped/utils/obj/CommentsPage.java b/src/main/java/me/kavin/piped/utils/obj/CommentsPage.java
index 554ba48..af8ae14 100644
--- a/src/main/java/me/kavin/piped/utils/obj/CommentsPage.java
+++ b/src/main/java/me/kavin/piped/utils/obj/CommentsPage.java
@@ -6,9 +6,11 @@ public class CommentsPage {
 
     public List<Comment> comments;
     public String nextpage;
+    public boolean disabled;
 
-    public CommentsPage(List<Comment> comments, String nextpage) {
+    public CommentsPage(List<Comment> comments, String nextpage, boolean disabled) {
         this.comments = comments;
         this.nextpage = nextpage;
+        this.disabled = disabled;
     }
 }