From 3d030b696887204bfa4d7761c1ecf4994c58fd87 Mon Sep 17 00:00:00 2001
From: FireMasterK <20838718+FireMasterK@users.noreply.github.com>
Date: Wed, 21 Jul 2021 17:49:05 +0530
Subject: [PATCH] Update field names for better reusablity.

---
 src/main/java/me/kavin/piped/utils/ResponseHelper.java |  9 +++++----
 src/main/java/me/kavin/piped/utils/obj/FeedItem.java   | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
index b6cc9e3..b729d62 100644
--- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java
+++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
@@ -699,10 +699,11 @@ public class ResponseHelper {
                 List<Video> videos = DatabaseHelper.getVideosFromChannelIds(s, user.getSubscribed());
 
                 videos.forEach(video -> {
-                    feedItems.add(new FeedItem(video.getId(), video.getTitle(), rewriteURL(video.getThumbnail()),
-                            video.getChannel().getUploaderId(), video.getChannel().getUploader(),
-                            rewriteURL(video.getChannel().getUploaderAvatar()), video.getViews(), video.getDuration(),
-                            video.getUploaded(), video.getChannel().isVerified()));
+                    feedItems.add(new FeedItem("/watch?v=" + video.getId(), video.getTitle(),
+                            rewriteURL(video.getThumbnail()), "/channel/" + video.getChannel().getUploaderId(),
+                            video.getChannel().getUploader(), rewriteURL(video.getChannel().getUploaderAvatar()),
+                            video.getViews(), video.getDuration(), video.getUploaded(),
+                            video.getChannel().isVerified()));
                 });
 
                 Collections.sort(feedItems, (a, b) -> (int) (b.uploaded - a.uploaded));
diff --git a/src/main/java/me/kavin/piped/utils/obj/FeedItem.java b/src/main/java/me/kavin/piped/utils/obj/FeedItem.java
index 87a0b9f..5197085 100644
--- a/src/main/java/me/kavin/piped/utils/obj/FeedItem.java
+++ b/src/main/java/me/kavin/piped/utils/obj/FeedItem.java
@@ -2,19 +2,19 @@ package me.kavin.piped.utils.obj;
 
 public class FeedItem {
 
-    public String id, title, thumbnail, uploader_id, uploader, uploaderAvatar;
+    public String url, title, thumbnail, uploaderUrl, uploaderName, uploaderAvatar;
 
     public long views, duration, uploaded;
 
     public boolean verified;
 
-    public FeedItem(String id, String title, String thumbnail, String uploader_id, String uploader,
+    public FeedItem(String url, String title, String thumbnail, String uploaderUrl, String uploaderName,
             String uploaderAvatar, long views, long duration, long uploaded, boolean verified) {
-        this.id = id;
+        this.url = url;
         this.title = title;
         this.thumbnail = thumbnail;
-        this.uploader_id = uploader_id;
-        this.uploader = uploader;
+        this.uploaderUrl = uploaderUrl;
+        this.uploaderName = uploaderName;
         this.uploaderAvatar = uploaderAvatar;
         this.views = views;
         this.duration = duration;