mirror of
https://gitea.invidious.io/iv-org/invidious-copy-2022-04-11.git
synced 2024-08-15 00:43:26 +00:00
Merge pull request #334 from aaferrari/master
Color change in the links and several improvements in the comments
This commit is contained in:
commit
a1af27b125
4 changed files with 88 additions and 6 deletions
|
@ -1,3 +1,43 @@
|
||||||
|
.channel-owner {
|
||||||
|
background-color: #008BEC;
|
||||||
|
color: #fff;
|
||||||
|
border-radius: 9px;
|
||||||
|
padding: 1px 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.creator-heart-container {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 0px 7px 6px 0px;
|
||||||
|
margin: 0px -7px -4px 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.creator-heart {
|
||||||
|
position: relative;
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
border: 2px none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.creator-heart-background-hearted {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
padding: 0px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.creator-heart-small-hearted {
|
||||||
|
position: absolute;
|
||||||
|
right: -7px;
|
||||||
|
bottom: -4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.creator-heart-small-container {
|
||||||
|
position: relative;
|
||||||
|
width: 13px;
|
||||||
|
height: 13px;
|
||||||
|
color: rgb(255, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
.h-box {
|
.h-box {
|
||||||
padding-left: 1em;
|
padding-left: 1em;
|
||||||
padding-right: 1em;
|
padding-right: 1em;
|
||||||
|
@ -23,7 +63,7 @@ div {
|
||||||
}
|
}
|
||||||
|
|
||||||
button.pure-button-primary,
|
button.pure-button-primary,
|
||||||
a.pure-button-primary {
|
a.pure-button-primary, .channel-owner:hover {
|
||||||
background-color: #a0a0a0;
|
background-color: #a0a0a0;
|
||||||
color: rgba(35, 35, 35, 1);
|
color: rgba(35, 35, 35, 1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,6 @@ a:active {
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
color: #303030;
|
color: #61809b;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
|
@ -270,5 +270,9 @@
|
||||||
"News": "News",
|
"News": "News",
|
||||||
"Movies": "Movies",
|
"Movies": "Movies",
|
||||||
"Download": "Download",
|
"Download": "Download",
|
||||||
"Download as: ": "Download as: "
|
"Download as: ": "Download as: ",
|
||||||
|
"%A %B %-d, %Y": "%A %B %-d, %Y",
|
||||||
|
"(edited)": "(edited)",
|
||||||
|
"Youtube permalink of the comment": "Youtube permalink of the comment",
|
||||||
|
"`x` marked it with a ❤": "`x` marked it with a ❤"
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,6 +159,8 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
|
||||||
json.field "commentCount", comment_count
|
json.field "commentCount", comment_count
|
||||||
end
|
end
|
||||||
|
|
||||||
|
json.field "videoId", id
|
||||||
|
|
||||||
json.field "comments" do
|
json.field "comments" do
|
||||||
json.array do
|
json.array do
|
||||||
contents.as_a.each do |node|
|
contents.as_a.each do |node|
|
||||||
|
@ -209,7 +211,14 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
|
||||||
json.field "authorUrl", ""
|
json.field "authorUrl", ""
|
||||||
end
|
end
|
||||||
|
|
||||||
published = decode_date(node_comment["publishedTimeText"]["runs"][0]["text"].as_s.rchop(" (edited)"))
|
published_text = node_comment["publishedTimeText"]["runs"][0]["text"].as_s
|
||||||
|
published = decode_date(published_text.rchop(" (edited)"))
|
||||||
|
|
||||||
|
if published_text.includes?(" (edited)")
|
||||||
|
json.field "isEdited", true
|
||||||
|
else
|
||||||
|
json.field "isEdited", false
|
||||||
|
end
|
||||||
|
|
||||||
json.field "content", content
|
json.field "content", content
|
||||||
json.field "contentHtml", content_html
|
json.field "contentHtml", content_html
|
||||||
|
@ -217,6 +226,17 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
|
||||||
json.field "publishedText", translate(locale, "`x` ago", recode_date(published))
|
json.field "publishedText", translate(locale, "`x` ago", recode_date(published))
|
||||||
json.field "likeCount", node_comment["likeCount"]
|
json.field "likeCount", node_comment["likeCount"]
|
||||||
json.field "commentId", node_comment["commentId"]
|
json.field "commentId", node_comment["commentId"]
|
||||||
|
json.field "authorIsChannelOwner", node_comment["authorIsChannelOwner"]
|
||||||
|
|
||||||
|
if node_comment["actionButtons"]["commentActionButtonsRenderer"]["creatorHeart"]?
|
||||||
|
hearth_data = node_comment["actionButtons"]["commentActionButtonsRenderer"]["creatorHeart"]["creatorHeartRenderer"]["creatorThumbnail"]
|
||||||
|
json.field "creatorHeart" do
|
||||||
|
json.object do
|
||||||
|
json.field "creatorThumbnail", hearth_data["thumbnails"][-1]["url"]
|
||||||
|
json.field "creatorName", hearth_data["accessibility"]["accessibilityData"]["label"]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if node_replies && !response["commentRepliesContinuation"]?
|
if node_replies && !response["commentRepliesContinuation"]?
|
||||||
reply_count = node_replies["moreText"]["simpleText"].as_s.delete("View all reply replies,")
|
reply_count = node_replies["moreText"]["simpleText"].as_s.delete("View all reply replies,")
|
||||||
|
@ -326,12 +346,30 @@ def template_youtube_comments(comments, locale)
|
||||||
<div class="pure-u-20-24 pure-u-md-22-24">
|
<div class="pure-u-20-24 pure-u-md-22-24">
|
||||||
<p>
|
<p>
|
||||||
<b>
|
<b>
|
||||||
<a href="#{child["authorUrl"]}">#{child["author"]}</a>
|
<a class="#{child["authorIsChannelOwner"] == true ? "channel-owner" : ""}" href="#{child["authorUrl"]}">#{child["author"]}</a>
|
||||||
</b>
|
</b>
|
||||||
<p style="white-space:pre-wrap">#{child["contentHtml"]}</p>
|
<p style="white-space:pre-wrap">#{child["contentHtml"]}</p>
|
||||||
#{translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64)))}
|
<span title="#{Time.unix(child["published"].as_i64).to_s(translate(locale,"%A %B %-d, %Y"))}">#{translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64)))} #{child["isEdited"] == true ? translate(locale, "(edited)") : ""}</span>
|
||||||
|
|
|
||||||
|
<a href="https://www.youtube.com/watch?v=#{comments["videoId"]}&lc=#{child["commentId"]}" title="#{translate(locale, "Youtube permalink of the comment")}">[YT]</a>
|
||||||
|
|
|
|
||||||
<i class="icon ion-ios-thumbs-up"></i> #{number_with_separator(child["likeCount"])}
|
<i class="icon ion-ios-thumbs-up"></i> #{number_with_separator(child["likeCount"])}
|
||||||
|
END_HTML
|
||||||
|
|
||||||
|
if child["creatorHeart"]?
|
||||||
|
html += <<-END_HTML
|
||||||
|
<span class="creator-heart-container" title="#{translate(locale, "`x` marked it with a ❤", child["creatorHeart"]["creatorName"].as_s)}">
|
||||||
|
<div class="creator-heart">
|
||||||
|
<img class="creator-heart-background-hearted" src="#{child["creatorHeart"]["creatorThumbnail"]}"></img>
|
||||||
|
<div class="creator-heart-small-hearted">
|
||||||
|
<div class="creator-heart-small-container">🖤</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</span>
|
||||||
|
END_HTML
|
||||||
|
end
|
||||||
|
|
||||||
|
html += <<-END_HTML
|
||||||
</p>
|
</p>
|
||||||
#{replies_html}
|
#{replies_html}
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue