iv-org-mirror/invidious
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/invidious.git synced 2024-08-15 00:53:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for viewing comments without js

Browse source 
Improve stylings
This commit is contained in:
ChunkyProgrammer 2023-09-27 18:40:50 -04:00
parent 4f25069f55
commit f77e4378fe
3 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assets/css/default.css
View file

@ -397,6 +397,14 @@ p.video-data { margin: 0; font-weight: bold; font-size: 80%; }
margin: auto; margin: auto;
} }
/*
* We don't want the top and bottom margin on the post page.
*/
.comments.post-comments {
margin-bottom: 0;
margin-top: 0;
}
.video-iframe-wrapper { .video-iframe-wrapper {
position: relative; position: relative;
height: 0; height: 0;

11
src/invidious/routes/channels.cr
View file

@ -200,11 +200,15 @@ module Invidious::Routes::Channels
prefs = env.get("preferences").as(Preferences) prefs = env.get("preferences").as(Preferences)
locale = prefs.locale locale = prefs.locale
region = env.params.query["region"]? || prefs.region
thin_mode = env.params.query["thin_mode"]? || prefs.thin_mode thin_mode = env.params.query["thin_mode"]? || prefs.thin_mode
thin_mode = thin_mode == "true" thin_mode = thin_mode == "true"
nojs = env.params.query["nojs"]?
nojs ||= "0"
nojs = nojs == "1"
if !ucid.nil? if !ucid.nil?
ucid = ucid.to_s ucid = ucid.to_s
post_response = fetch_channel_community_post(ucid, id, locale, "json", thin_mode) post_response = fetch_channel_community_post(ucid, id, locale, "json", thin_mode)
@ -218,6 +222,11 @@ module Invidious::Routes::Channels
end end
post_response = JSON.parse(post_response) post_response = JSON.parse(post_response)
if nojs
comments = Comments.fetch_community_post_comments(ucid, id)
comment_html = JSON.parse(Comments.parse_youtube(id, comments, "html", locale, thin_mode, isPost: true))["contentHtml"]
end
templated "post" templated "post"
end end

25
src/invidious/views/post.ecr
View file

@ -2,10 +2,27 @@
<title>Invidious</title> <title>Invidious</title>
<% end %> <% end %>
<div id="post" class="comments"> <div>
<%= IV::Frontend::Comments.template_youtube(post_response.not_nil!, locale, thin_mode) %> <div id="post" class="comments post-comments">
</div> <%= IV::Frontend::Comments.template_youtube(post_response.not_nil!, locale, thin_mode) %>
<div id="comments" class="comments"> </div>
<% if nojs %>
<hr>
<% end %>
<br />
<div id="comments" class="comments post-comments">
<% if nojs %>
<%= comment_html %>
<% else %>
<noscript>
<a href="/post/<%= id %>?ucid=<%= ucid %>&nojs=1">
<%= translate(locale, "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.") %>
</a>
</noscript>
<% end %>
</div>
</div> </div>
<script id="video_data" type="application/json"> <script id="video_data" type="application/json">