Extractors: Don't error if AuthorId does not exist (#3869)

Some playlist author's don't have a YouTube channel, so does movies. This caused various extractors (related videos, search) to fail. Closes the following issues: 2530, 3349, 3766, 3812, 4133
iv-org · Feb 12, 2024 · 3b4358d · 3b4358d
2 parents cf68620 + f1edb1d
commit 3b4358d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/src/invidious/views/components/item.ecr b/src/invidious/views/components/item.ecr
@@ -82,11 +82,19 @@
             </div>
 
             <div class="video-card-row flexible">
-                <div class="flex-left"><a href="/channel/<%= item.ucid %>">
-                    <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %>
-                        <%- if author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end -%>
-                    </p>
-                </a></div>
+                <div class="flex-left">
+                    <% if !item.ucid.to_s.empty? %>
+                        <a href="/channel/<%= item.ucid %>">
+                            <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %>
+                                <%- if author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end -%>
+                            </p>
+                        </a>
+                    <% else %>
+                        <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %>
+                            <%- if author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end -%>
+                        </p>
+                    <% end %>
+                </div>
             </div>
         <% when Category %>
         <% else %>
@@ -160,11 +168,19 @@
             </div>
 
             <div class="video-card-row flexible">
-                <div class="flex-left"><a href="/channel/<%= item.ucid %>">
-                    <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %>
-                        <%- if author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end -%>
-                    </p>
-                </a></div>
+                <div class="flex-left">
+                    <% if !item.ucid.to_s.empty? %>
+                        <a href="/channel/<%= item.ucid %>">
+                            <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %>
+                                <%- if author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end -%>
+                            </p>
+                        </a>
+                    <% else %>
+                        <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %>
+                            <%- if author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end -%>
+                        </p>
+                    <% end %>
+                </div>
 
                 <%= rendered "components/video-context-buttons" %>
             </div>

diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
@@ -346,7 +346,7 @@ we're going to need to do it here in order to allow for translations.
 
                             <h5 class="pure-g">
                                 <div class="pure-u-14-24">
-                                    <% if rv["ucid"]? %>
+                                    <% if !rv["ucid"].empty? %>
                                         <b style="width:100%"><a href="/channel/<%= rv["ucid"] %>"><%= rv["author"]? %><% if rv["author_verified"]? == "true" %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></a></b>
                                     <% else %>
                                         <b style="width:100%"><%= rv["author"]? %><% if rv["author_verified"]? == "true" %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></b>

diff --git a/src/invidious/yt_backend/extractors.cr b/src/invidious/yt_backend/extractors.cr
@@ -822,9 +822,9 @@ module HelperExtractors
   end
 
   # Retrieves the ID required for querying the InnerTube browse endpoint.
-  # Raises when it's unable to do so
+  # Returns an empty string when it's unable to do so
   def self.get_browse_id(container)
-    return container.dig("navigationEndpoint", "browseEndpoint", "browseId").as_s
+    return container.dig?("navigationEndpoint", "browseEndpoint", "browseId").try &.as_s || ""
   end
 end