From ce2a3361eb906ea94981169a3b36d1848dfdee29 Mon Sep 17 00:00:00 2001
From: Omar Roth <omarroth@hotmail.com>
Date: Fri, 12 Apr 2019 16:29:23 -0500
Subject: [PATCH] Fix missing author name for channel_videos

---
 src/invidious/channels.cr        | 8 ++------
 src/invidious/helpers/helpers.cr | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/invidious/channels.cr b/src/invidious/channels.cr
index 0eeb8a8b6..9339d1978 100644
--- a/src/invidious/channels.cr
+++ b/src/invidious/channels.cr
@@ -114,9 +114,7 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
       if auto_generated
         videos = extract_videos(nodeset)
       else
-        videos = extract_videos(nodeset, ucid)
-        videos.each { |video| video.ucid = ucid }
-        videos.each { |video| video.author = author }
+        videos = extract_videos(nodeset, ucid, author)
       end
     end
 
@@ -184,9 +182,7 @@ def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
       if auto_generated
         videos = extract_videos(nodeset)
       else
-        videos = extract_videos(nodeset, ucid)
-        videos.each { |video| video.ucid = ucid }
-        videos.each { |video| video.author = author }
+        videos = extract_videos(nodeset, ucid, author)
       end
 
       count = nodeset.size
diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr
index d62e7ba6a..574f11840 100644
--- a/src/invidious/helpers/helpers.cr
+++ b/src/invidious/helpers/helpers.cr
@@ -179,8 +179,8 @@ def html_to_content(description_html)
   return description_html, description
 end
 
-def extract_videos(nodeset, ucid = nil)
-  videos = extract_items(nodeset, ucid)
+def extract_videos(nodeset, ucid = nil, author_name = nil)
+  videos = extract_items(nodeset, ucid, author_name)
   videos.select! { |item| !item.is_a?(SearchChannel | SearchPlaylist) }
   videos.map { |video| video.as(SearchVideo) }
 end