Merge pull request 'main' (#5) from Ashley/poke:main into main

Reviewed-on: https://codeberg.org/Korbs/poketube/pulls/5
This commit is contained in:
Korbs 2023-12-07 16:34:55 +00:00
commit 614ba58bfd
14 changed files with 74 additions and 63 deletions

View file

@ -1,7 +1,7 @@
Internet : 1GBIT (recommended 5GBIT)
Internet: 1GBIT (recommended 5GBIT)
Ram : 2GB
RAM: 2GB
Cpu : Any recent one
CPU: Any recent one
OS: Microsoft Windows, macOs or GNU/LINUX (doesnt work on "musl" distros ) with systemd or any service manager
OS: Microsoft Windows, macOS or GNU/LINUX (doesnt work on "musl" distros ) with systemd or any service manager

View file

@ -247,7 +247,7 @@ fetchUrls(urls);
var currentSpeed = video.playbackRate;
var newSpeed = getNextSpeed(currentSpeed);
video.playbackRate = newSpeed;
speedOption.textContent = "Speed: " + newSpeed.toFixed(2) + "x";
speedOption.innerHTML = "<i class='fa-light fa-gauge'></i> Speed: " + newSpeed.toFixed(2) + "x";
});
function getNextSpeed(currentSpeed) {

View file

@ -1773,15 +1773,14 @@ ptd-custom-more {
}
@media screen and (orientation:landscape) {
.ptnewbuttons {
margin-left:auto;
width:fit-content;
width:-moz-fit-content;
overflow:scroll;
max-width:150em!important;
margin-right: auto !important;
}
.ptnewbuttons {
margin-left:auto;
width:auto;
max-width:150em!important;
margin-right:auto !important;
}
}
.new-button.engagement:hover {
background-color:#0009
}

View file

@ -526,7 +526,12 @@ color:#ea9999 !important;
</div>
<div class="right">
<a href="/app?tab=search" style="position: absolute;right: 0;margin: 2em;" ><i class="fa-light fa-search"></i></a>
</div>
<hr style="clear: both;display: block;border: none;border-bottom: 0.5px solid #2f2f2f;/*! width: 4.5em; */height: 0;">
@ -823,6 +828,12 @@ width: fit-content;
<% if (!tab) { %>
<a href="/channel?id=<%=ID%>" class="tab active">Videos</a>
<% if (turntomins(shorts?.videos[0]?.lengthSeconds) != "aN:aN" ) { %>
<a href="/channel?id=<%=ID%>&tab=shorts" class="tab">Shorts</a>
<% } %>
<% if (Array.isArray(c.comments)) { %>
<% if (c.comments.length != "0") { %>
@ -831,22 +842,20 @@ width: fit-content;
<% } %>
<% } %>
<% if (Array?.isArray(shorts?.videos)) { %>
<% if (turntomins(shorts?.videos[0]?.lengthSeconds) != "aN:aN" ) { %>
<a href="/channel?id=<%=ID%>&tab=shorts" class="tab">Shorts</a>
<% } %>
<% } %>
<% } %>
<% if (tab ==="about") { %>
<% if (Array?.isArray(shorts?.videos)) { %>
<a href="/channel?id=<%=ID%>" class="tab">Videos</a>
<% if (Array?.isArray(shorts?.videos)) { %>
<% if (turntomins(shorts?.videos[0]?.lengthSeconds) != "aN:aN" ) { %>
<a href="/channel?id=<%=ID%>&tab=shorts" class="tab">Shorts</a>
<% } %>
<% } %>
<a href="/channel?id=<%=ID%>" class="tab">Videos</a>
<a href="/channel?id=<%=ID%>&tab=community" class="tab">Community</a>
<% } %>

View file

@ -22,24 +22,17 @@
<head>
<title>PokeTube | Customize</title>
<link href=/css/yt-ukraine.svg?v=6 rel=icon>
<meta content="PokeTube | Customize " property=og:title>
<meta content="Theme poketube and do custom js stuff - go wild !" property=twitter:description>
<meta content="https://cdn.glitch.global/33bc0843-7505-4fb9-92a6-4e8b0e74979f/0ddd4508-9a7d-4c3c-9f8e-da5a8c115e16.image.png?v=1671545627005" property="og:image" />
<meta content="Poke | Customize " property=og:title>
<meta content="Theme poke and do custom js stuff - go wild !" property=twitter:description>
<meta content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884" property="og:image" />
<meta content="summary_large_image" name="twitter:card" />
<!--
these are old lol
<meta content=@PoketaleBot name=twitter:site>
<meta content=@PoketaleBot name=twitter:creator>
-->
<link href=/css/app-cdn.min.css rel=stylesheet>
<link href=/css/app-cdn.min.css rel=stylesheet>
<link href=/css/app.main.css rel=stylesheet>
<link href=/css/search.main.css rel=stylesheet>
<meta content="#f97794" name="theme-color" />
<link href=/css/watch.main.css rel=stylesheet>
<link href="https://fonts.poketube.fun/css/fonts.css" rel=stylesheet>
</head>
</head>
<body>

View file

@ -24,9 +24,9 @@
<link href=/css/yt-ukraine.svg?v=6 rel=icon>
<meta content=website property=og:type>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta content="PokeTube - Discover" property=og:title>
<meta content="Discover Popular videos on poketube!" property=twitter:description>
<meta content="https://cdn.glitch.global/43b6691a-c8db-41d4-921c-8cf6aa0d9108/17a7fa1d-cdf9-4b73-9686-21e62c7fb285.image.png?v=1667739586452" property=og:image>
<meta content="Poke - Discover" property=og:title>
<meta content="Discover Popular videos on poke!" property=twitter:description>
<meta content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884" property=og:image>
<meta content=summary_large_image name=twitter:card>
<meta content=@PoketaleBot name=twitter:site>
<meta content=@PoketaleBot name=twitter:creator>

View file

@ -1,8 +1,7 @@
<!--
This Source Code Form is subject to the terms of the GNU General Public License:
Copyright (C) 2021-2023 POKETUBE (https://codeberg.org/Ashley/poketube)
Copyright (C) 2021-2023 POKETUBE (https://codeberg.org/Ashley/poketube)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -10,7 +9,8 @@
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@ -30,8 +30,8 @@
<link href=/css/yt-ukraine.svg?v=6 rel=icon>
<link rel="manifest" href="/manifest.json">
<meta content="▶▶ Poke - The Ultimate privacy App!" property=og:title>
<meta content="Watch Silly videos or search the interwebs while being anonymous on poketube!" property=twitter:description>
<meta content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/6eeaef4b-1e73-491d-8aa8-3c1ea99479b4.image.png?v=1696349184869" property="og:image" />
<meta content="Watch Silly videos or search the interwebs while being anonymous on poke!" property=twitter:description>
<meta content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884" property="og:image" />
<meta content="summary_large_image" name="twitter:card" />
<% if(isOldWindows) { %>
<style>
@ -102,7 +102,7 @@ body {
<p><i class="fa-sharp fa-solid fa-download"></i>Built-in video downloder</p>
<p><i class="fa-sharp fa-solid fa-search"></i>Web Search</p>
</div>
<img src="https://cdn.glitch.com/d68d17bb-f2c0-4bc3-993f-50902734f652/f9819f35-4d58-4715-9502-55772defa663.image.png?v=1695740207412"/>
<img src="https://cdn.glitch.com/d68d17bb-f2c0-4bc3-993f-50902734f652/Screenshot_20231207_182852.png?v=1701962955942"/>
<style>@import url(https://ka-p.fontawesome.com/releases/v6.4.2/css/pro.min.css?token=fe06fc099b);@import url(https://ka-p.fontawesome.com/releases/v6.4.2/css/pro-v4-shims.min.css?token=fe06fc099b);@import url(https://ka-p.fontawesome.com/releases/v6.4.2/css/pro-v5-font-face.min.css?token=fe06fc099b);@import url(https://ka-p.fontawesome.com/releases/v6.4.2/css/pro-v4-font-face.min.css?token=fe06fc099b);@import url(https://ka-p.fontawesome.com/assets/fe06fc099b/108504408/custom-icons.css?token=fe06fc099b);</style>

View file

@ -264,8 +264,7 @@ background: none !important;
<link href=/css/app.main.css rel=stylesheet>
<link href="/css/watch.main.css?v=56" rel=stylesheet>
<link href="/css/watch-util.css" rel=stylesheet>
<link href="https://fonts.poketube.fun/css/fonts.css" rel=stylesheet>
<link href="/css/watch-navbar.css?v=56" rel=stylesheet>
<link href="/css/watch-navbar.css?v=56" rel=stylesheet>
<link href="/css/poketube.css?v=56" rel=stylesheet>
<!-- ICONS -->
@ -356,14 +355,12 @@ background: none !important;
<% video.Subtitles.Subtitle.forEach(x => { %>
<track src="/api/subtitles?v=<%=inv_vid.videoId%>&h=<%= x.language %>" label="<%= x.language.replace("United States","Simplified - USA") %>" kind="subtitles">
<img src="https://t.poketube.fun/t/rep.gif?v=<%=btoa(inv_vid.videoId)%>&h=<%= x.language %>" id="subtitle_usage_rate" style="border:0;width: 0;visibility: hidden;">
<% }) %>
<% }) %>
<% } %>
<% if (!Array.isArray( video.Subtitles.Subtitle)) { %>
<track src="/api/subtitles?v=<%=inv_vid.videoId%>&h=<%= video.Subtitles.Subtitle.language %>" label="<%= video.Subtitles.Subtitle.language.replace("United States","Simplified - USA") %>" kind="subtitles">
<img src="https://t.poketube.fun/t/rep.gif?v=<%=btoa(inv_vid.videoId)%>&h=<%= video.Subtitles.Subtitle.language %>" id="subtitle_usage_rate" style="border:0;width: 0;visibility: hidden;">
<% } %>
<% } %>
@ -564,11 +561,11 @@ background: none !important;
<div class="video" >
<% if (!optout) { %>
<a href="/lite?v=<%= x.id %>" class="thumbnail" style="background-image: url('https://p.poketube.fun/https://i.ytimg.com/vi/<%= x.id %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 9.5px;" > <span class="video-length"><%=x.duration || "LIVE" %></span>
<a href="/lite?v=<%= x.id %>" class="thumbnail" style="background-image: url('/vi/<%= x.id %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 9.5px;" > <span class="video-length"><%=x.duration || "LIVE" %></span>
<% } %>
<% if (optout) { %>
<a href="/lite?v=<%= x.id %>&t=f" class="thumbnail" style="background-image: url('https://p.poketube.fun/https://i.ytimg.com/vi/<%= x.id %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 9.5px;" > <span class="video-length"><%- x.duration || "LIVE"%></span>
<a href="/lite?v=<%= x.id %>&t=f" class="thumbnail" style="background-image: url('/vi/<%= x.id %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 9.5px;" > <span class="video-length"><%- x.duration || "LIVE"%></span>
<% } %>
</a>
<div class="info">

View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>PokeMaps</title>
<title>PokeMaps Beta</title>
<link href="/css/yt-ukraine.svg" rel="icon" />
<style>
div {
@ -11,12 +11,10 @@
</head>
<body>
<p>
loading..
loading..... please wait lol
</p>
<iframe id="myFrame" style="width: 100%; height: 100%; top: 0px; bottom: 0px; left: 0px; right: 0px; position: fixed; border: none; margin: 0; padding: 0; overflow: auto;"></iframe>
<div>
<img src="https://t.poketube.fun/t/rep.gif" style="width: 0; visibility: hidden" id="status" />
</div>
<script type="text/javascript">
<!--//--><![CDATA[//><!--

View file

@ -29,7 +29,7 @@
-->
<!DOCTYPE html>
<html class="poketube_desktop_player js event" invidproxy="<%=u%>" universe="2" vid_id="<%=inv_vid.videoId%>" t="<%=btoa(Date.now())%>" version="browser_web_<%=Date.now()%>">
<html class="poketube_desktop_player js event" style="background: #000000;" invidproxy="<%=u%>" universe="2" vid_id="<%=inv_vid.videoId%>" t="<%=btoa(Date.now())%>" version="browser_web_<%=Date.now()%>">
<head>
<% if (e === false) { %>
@ -1810,7 +1810,7 @@ window.addEventListener("unload", cleanup)
<script src="/static/app.bundle.js" > </script>
<script src="/static/app.bundle.js?v=07.12.2023" > </script>
<% if(secure) { %>
<!-- Matomo -->
@ -1976,7 +1976,7 @@ fetch(statsurl + "?browser=" + encodedBrowserName)
<meta name="viewport" content="width=device-width,initial-scale=1">
<link href=/css/yt-ukraine.svg?v=6 rel=icon>
<title> <%=inv_vid.title%> | PokeTube Mobile</title>
<link href="/css/mobile.css" rel=stylesheet>
<link href="/css/mobile.css?v=2" rel=stylesheet>
<link href="/css/app.main.css" rel=stylesheet>
<link href=https://p.poketube.fun/https://unpkg.com/ionicons@4.5.10-0/dist/css/ionicons.css rel=stylesheet>
@ -2126,7 +2126,7 @@ a {
<% } %>
</div>
<div class="video-title" style="font-family:'Inter';white-space:yes;padding: 10px;background: #0009;margin-bottom: 6px;margin-left: 6px;margin-right: 12px;border-radius: 15px;margin-top: 4px;">
<div class="video-title" style="padding: 10px;background: #0009;margin-bottom: 6px;margin-left: 6px;margin-right: 12px;border-radius: 15px;margin-top: 4px;font-family: poketube flex;font-weight: 800;font-stretch: ultra-expanded;">
<%=inv_vid.title%> <br>
<a id="language-button" href="#desc-container" style="color: pink;

View file

@ -541,6 +541,7 @@ We use Apples Itunes Service to get song info. we do not send any unique identif
<ul>
<li><a href="https://invidious.io/">Invidious</a> [<a href="https://github.com/iv-org/invidious">Source Code</a>] </li>
<li><a href="https://tube.kuylar.dev/">LightTube</a> [<a href="https://gitlab.com/kuylar/lighttube">Source Code</a>]</li>
<li><a href="https://codeberg.org/lime360/yt-2005-watch">yt-2005-watch</a>, as well as it's sibling: <a href="https://codeberg.org/lime360/plaintube">plaintube/3gpipe</a></li>
</ul>
<p>Each One does things a bit differently in terms of privacy and your freedom. However, none store your personal information by default and they are free software, which make them all pretty safe in our opinion</p>
<h3 class="hd-md">

View file

@ -33,7 +33,7 @@
<meta content="website" property="og:type">
<meta content="PokeTube - Legal thingy to put you into sleep" property="og:title">
<meta content="This is the PokeTube Privacy Policy meta description. Wow, helpful meta description PokeTube. Thanks!" property="twitter:description">
<meta content="https://cdn.glitch.global/33bc0843-7505-4fb9-92a6-4e8b0e74979f/0ddd4508-9a7d-4c3c-9f8e-da5a8c115e16.image.png?v=1671545627005" property="og:image" />
<meta content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884" property="og:image" />
<meta content="summary_large_image" name="twitter:card">
<style>
@ -787,6 +787,7 @@ any 3rd party domain is proxied by our proxy (p.poketube.fun)
<ul>
<li><a href="https://invidious.io/">Invidious</a> [<a href="https://github.com/iv-org/invidious">Source Code</a>] </li>
<li><a href="https://tube.kuylar.dev/">LightTube</a> [<a href="https://gitlab.com/kuylar/lighttube">Source Code</a>]</li>
<li><a href="https://codeberg.org/lime360/yt-2005-watch">yt-2005-watch</a>, as well as it's sibling: <a href="https://codeberg.org/lime360/plaintube">plaintube/3gpipe</a></li>
</ul>
<p>Each One does things a bit differently in terms of privacy and your freedom. However, none store your personal information by default and they are free software, which make them all pretty safe in our opinion</p>
<h3 class="hd-md">

View file

@ -22,22 +22,21 @@
<title>Searching <%=q%> - PokeTube</title>
<link rel="manifest" href="/manifest.json">
<link href=/css/yt-ukraine.svg?v=6 rel=icon>
<link href="https://fonts.poketube.fun/css/fonts.css" rel=stylesheet>
<link href=/css/app-cdn.min.css rel=stylesheet>
<link href=/css/app-cdn.min.css rel=stylesheet>
<link href=/css/app.main.css rel=stylesheet>
<link href=/css/search.main.css rel=stylesheet>
<link href=/css/watch.main.css rel=stylesheet>
<link rel="search" type="application/opensearchdescription+xml" title="PokeTube" href="https://poketube.fun/api/opensearch" />
<meta content="Searching <%=q%> - PokeTube" property=og:title>
<meta content="Searching <%=q%> - Poke" property=og:title>
<% if (q == "do the harlem shake") { %>
<meta content="DO THE HARLEM SHAKE" property=twitter:description>
<% } %>
<% if (q != "do the harlem shake") { %>
<meta content="Ur Searching <%=q%> on PokeTube!" property=twitter:description>
<meta content="Ur Searching <%=q%> on Poke!" property=twitter:description>
<% } %>
<meta content="https://cdn.glitch.global/43b6691a-c8db-41d4-921c-8cf6aa0d9108/17a7fa1d-cdf9-4b73-9686-21e62c7fb285.image.png?v=1667739586452" property=og:image>
<meta content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884" property=og:image>
<meta content=summary_large_image name=twitter:card>
<meta content="#1a1a1a" name="theme-color">
<style>

View file

@ -29,6 +29,20 @@
"branch": "dev"
}
}
],
[
"poke.vern.cc",
{
"uri": "https://poke.vern.cc",
"CLOUDFLARE": false,
"piwik": false,
"region": "🇺🇸",
"software": {
"name": "poketube",
"version": "latest",
"branch": "dev"
}
}
]
]