mirror of
				https://github.com/iv-org/invidious.git
				synced 2025-10-31 04:32:02 +00:00 
			
		
		
		
	Merge remote-tracking branch 'upstream/master' into contrib
This commit is contained in:
		| @@ -349,7 +349,7 @@ def template_youtube_comments(comments, locale) | ||||
|             <a class="#{child["authorIsChannelOwner"] == true ? "channel-owner" : ""}" href="#{child["authorUrl"]}">#{child["author"]}</a> | ||||
|           </b>  | ||||
|           <p style="white-space:pre-wrap">#{child["contentHtml"]}</p> | ||||
|           <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> | ||||
|           <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> | ||||
|           |  | ||||
| @@ -357,10 +357,11 @@ def template_youtube_comments(comments, locale) | ||||
|     END_HTML | ||||
|  | ||||
|     if child["creatorHeart"]? | ||||
|       creator_thumbnail = "/ggpht#{URI.parse(child["creatorHeart"]["creatorThumbnail"].as_s).full_path}" | ||||
|       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> | ||||
|                   <img class="creator-heart-background-hearted" src="#{creator_thumbnail}"></img> | ||||
|                   <div class="creator-heart-small-hearted"> | ||||
|                       <div class="creator-heart-small-container">🖤</div> | ||||
|                   </div> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Tommy Miland
					Tommy Miland