summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamantaz Fox <coding@samantaz.fr>2023-04-22 19:45:45 +0200
committerSamantaz Fox <coding@samantaz.fr>2023-07-08 20:48:36 +0200
commit43dcab225caca7034346a79da340e434cdb4d407 (patch)
tree124f35311c2b2e62f4c5ddc4a8eb39d777589a8b /src
parent080c7446c6c26c5d8670107cf4161ba4609e5e4a (diff)
downloadinvidious-43dcab225caca7034346a79da340e434cdb4d407.tar.gz
invidious-43dcab225caca7034346a79da340e434cdb4d407.tar.bz2
invidious-43dcab225caca7034346a79da340e434cdb4d407.zip
HTML: merge MixVideo with other types in item.ecr
Diffstat (limited to 'src')
-rw-r--r--src/invidious/views/components/item.ecr25
1 files changed, 4 insertions, 21 deletions
diff --git a/src/invidious/views/components/item.ecr b/src/invidious/views/components/item.ecr
index decdcb2f..0fa9c807 100644
--- a/src/invidious/views/components/item.ecr
+++ b/src/invidious/views/components/item.ecr
@@ -34,26 +34,6 @@
<a href="/channel/<%= item.ucid %>">
<p dir="auto"><b><%= HTML.escape(item.author) %><% if !item.is_a?(InvidiousPlaylist) && !item.author_verified.nil? && item.author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></b></p>
</a>
- <% when MixVideo %>
- <a href="/watch?v=<%= item.id %>&list=<%= item.rdid %>">
- <% if !env.get("preferences").as(Preferences).thin_mode %>
- <div class="thumbnail">
- <img loading="lazy" class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg" alt="" />
- <% if item.length_seconds != 0 %>
- <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
- <% end %>
-
- <% if item_watched %>
- <div class="watched-overlay"></div>
- <div class="watched-indicator" data-length="<%= item.length_seconds %>" data-id="<%= item.id %>"></div>
- <% end %>
- </div>
- <% end %>
- <p dir="auto"><%= HTML.escape(item.title) %></p>
- </a>
- <a href="/channel/<%= item.ucid %>">
- <p dir="auto"><b><%= HTML.escape(item.author) %></b></p>
- </a>
<% when Category %>
<% else %>
<%-
@@ -61,6 +41,9 @@
if item.is_a?(PlaylistVideo)
link_url = "/watch?v=#{item.id}&list=#{item.plid}&index=#{item.index}"
endpoint_params = "?v=#{item.id}&list=#{item.plid}"
+ elsif item.is_a?(MixVideo)
+ link_url = "/watch?v=#{item.id}&list=#{item.rdid}"
+ endpoint_params = "?v=#{item.id}&list=#{item.rdid}"
else
link_url = "/watch?v=#{item.id}"
endpoint_params = "?v=#{item.id}"
@@ -134,7 +117,7 @@
<div class="flex-left">
<% if item.responds_to?(:premiere_timestamp) && item.premiere_timestamp.try &.> Time.utc %>
<p class="video-data" dir="auto"><%= translate(locale, "Premieres in `x`", recode_date((item.premiere_timestamp.as(Time) - Time.utc).ago, locale)) %></p>
- <% elsif Time.utc - item.published > 1.minute %>
+ <% elsif item.responds_to?(:published) && (Time.utc - item.published) > 1.minute %>
<p class="video-data" dir="auto"><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></p>
<% end %>
</div>