mirror of
https://codeberg.org/ashley/poke.git
synced 2024-11-29 17:08:49 +01:00
Merge pull request 'main' (#6) from Ashley/poke:main into main
Reviewed-on: https://codeberg.org/Korbs/poketube/pulls/6
This commit is contained in:
commit
050518132d
36 changed files with 3996 additions and 86 deletions
|
@ -124,6 +124,11 @@ PokeTube should be running on `http://localhost:6003`.
|
||||||
|
|
||||||
The port can be changed with the config file you downloaded, just change the `server_port` option.
|
The port can be changed with the config file you downloaded, just change the `server_port` option.
|
||||||
|
|
||||||
|
## Hosting Image Proxy
|
||||||
|
|
||||||
|
see [here](https://codeberg.org/Ashley/poke/src/branch/main/january) :3
|
||||||
|
just uhh change the url in config.json to ur image proxy
|
||||||
|
|
||||||
## PokeTube community!
|
## PokeTube community!
|
||||||
|
|
||||||
Join the community on [revolt](https://rvlt.gg/poketube) :3
|
Join the community on [revolt](https://rvlt.gg/poketube) :3
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
"invapi": "https://invid-api.poketube.fun/api/v1",
|
"invapi": "https://invid-api.poketube.fun/api/v1",
|
||||||
"dislikes": "https://returnyoutubedislikeapi.com/votes?videoId=",
|
"dislikes": "https://returnyoutubedislikeapi.com/votes?videoId=",
|
||||||
"invchannel": "https://invid-api.poketube.fun/api/v1",
|
"invchannel": "https://invid-api.poketube.fun/api/v1",
|
||||||
|
"media_proxy": "https://image-proxy.poketube.fun",
|
||||||
"cacher_max_age": "864000",
|
"cacher_max_age": "864000",
|
||||||
"enablealwayshttps": false,
|
"enablealwayshttps": false,
|
||||||
"t_url": "https://t.poketube.fun/",
|
"t_url": "https://t.poketube.fun/",
|
||||||
|
|
|
@ -743,7 +743,7 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
body, .loaded {cursor: url('/static/cursor.ico'), default !important}
|
body {cursor: url('/static/cursor.ico'), default}
|
||||||
|
|
||||||
a,
|
a,
|
||||||
btn,
|
btn,
|
||||||
|
@ -753,7 +753,7 @@ select,
|
||||||
button,
|
button,
|
||||||
summary,
|
summary,
|
||||||
span > a,
|
span > a,
|
||||||
li > a {cursor: url('/static/cursor-pointer.ico'), pointer}
|
li > a {cursor: url('/static/cursor-pointer.ico'), pointer !important;}
|
||||||
|
|
||||||
p {
|
p {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<title>PokeTube | Subscriptions </title>
|
<title>PokeTube | Subscriptions </title>
|
||||||
<meta name="viewport" content="width=device-1200px, initial-scale=1.0, shrink-to-fit=yes, viewport-fit=cover">
|
<meta name="viewport" content="width=device-1200px, initial-scale=1.0, shrink-to-fit=yes, viewport-fit=cover">
|
||||||
<link href=/css/yt-ukraine.svg?v=6 rel=icon>
|
<link href=/css/yt-ukraine.svg?v=6 rel=icon>
|
||||||
<link href=/css/app.main.css rel=stylesheet>
|
<link href=/css/app.main.css?v=3449 rel=stylesheet>
|
||||||
<style>
|
<style>
|
||||||
|
|
||||||
/* Define the grid container */
|
/* Define the grid container */
|
||||||
|
|
|
@ -219,7 +219,7 @@ padding-bottom: 32px;
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<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/app.main.css?v=44599 rel=stylesheet>
|
||||||
<link href="/css/watch.main.css?v=56" rel=stylesheet>
|
<link href="/css/watch.main.css?v=56" rel=stylesheet>
|
||||||
<link href="/css/watch-util.css" rel=stylesheet>
|
<link href="/css/watch-util.css" rel=stylesheet>
|
||||||
|
|
||||||
|
@ -767,7 +767,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=<
|
||||||
<% } %>
|
<% } %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<input type="text" id="search" placeholder="Search vids :3" style="margin-top: 2em;height: 1em;color: #fff;background: #111;border-radius: 1em;padding: 7px;margin-left: auto;margin-right: 1em;"> </div>
|
<input type="text" id="search" placeholder="Search :3" style="margin-top: 2em;height: 1em;color: #fff;background: #111;border-radius: 1em;padding: 7px;margin-left: auto;margin-right: 1em;"> </div>
|
||||||
|
|
||||||
|
|
||||||
<% } %>
|
<% } %>
|
||||||
|
@ -1054,7 +1054,7 @@ width: fit-content;
|
||||||
|
|
||||||
<% tj.videos.forEach (x => { %>
|
<% tj.videos.forEach (x => { %>
|
||||||
<a href="/watch?v=<%- x.videoId %>" class="video">
|
<a href="/watch?v=<%- x.videoId %>" class="video">
|
||||||
<div class="thumbnail" style="background-image: url('/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 10px;"><span class="video-length"><%- turntomins(x.lengthSeconds) %></span></div>
|
<div class="thumbnail" style="background-image: url('<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 10px;"><span class="video-length"><%- turntomins(x.lengthSeconds) %></span></div>
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<span class="title max-lines-2" style="font-family:PokeTube flex,sans-serif;font-weight: 1000;font-stretch: ultra-expanded;"><%- x.title %></span>
|
<span class="title max-lines-2" style="font-family:PokeTube flex,sans-serif;font-weight: 1000;font-stretch: ultra-expanded;"><%- x.title %></span>
|
||||||
|
|
||||||
|
@ -1110,7 +1110,7 @@ width: fit-content;
|
||||||
<% if (Array?.isArray( shorts.videos)) { %>
|
<% if (Array?.isArray( shorts.videos)) { %>
|
||||||
<% shorts.videos.forEach (x => { %>
|
<% shorts.videos.forEach (x => { %>
|
||||||
<a href="/shorts/<%- x.videoId %>" class="shorts-video" >
|
<a href="/shorts/<%- x.videoId %>" class="shorts-video" >
|
||||||
<img load="lazy" src='/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw'>
|
<img load="lazy" src='<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw'>
|
||||||
<span class="shorts-title"><%- x.title %></span>
|
<span class="shorts-title"><%- x.title %></span>
|
||||||
</a>
|
</a>
|
||||||
<% }) %>
|
<% }) %>
|
||||||
|
@ -1211,7 +1211,7 @@ width: fit-content;
|
||||||
|
|
||||||
<% stream.videos.forEach (x => { %>
|
<% stream.videos.forEach (x => { %>
|
||||||
<a href="/watch?v=<%- x.videoId %>" class="video">
|
<a href="/watch?v=<%- x.videoId %>" class="video">
|
||||||
<div class="thumbnail" style="background-image: url('/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 10px;"><span class="video-length"><%- turntomins(x.lengthSeconds) %></span></div>
|
<div class="thumbnail" style="background-image: url('<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 10px;"><span class="video-length"><%- turntomins(x.lengthSeconds) %></span></div>
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<span class="title max-lines-2" style="font-family:PokeTube flex,sans-serif;font-weight: 1000;font-stretch: ultra-expanded;"><%- x.title %></span>
|
<span class="title max-lines-2" style="font-family:PokeTube flex,sans-serif;font-weight: 1000;font-stretch: ultra-expanded;"><%- x.title %></span>
|
||||||
|
|
||||||
|
@ -1287,7 +1287,7 @@ width: fit-content;
|
||||||
<video class="player" style="border-radius: 16px;
|
<video class="player" style="border-radius: 16px;
|
||||||
" controls
|
" controls
|
||||||
|
|
||||||
poster="/vi/<%=x.attachment.videoId%>/maxresdefault.jpg?v=607ddcd4">
|
poster="<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%=x.attachment.videoId%>/maxresdefault.jpg?v=607ddcd4">
|
||||||
|
|
||||||
|
|
||||||
<source src="https://tube.kuylar.dev/proxy/media/<%=x.attachment.videoId%>/22" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="hd720" selected="false">
|
<source src="https://tube.kuylar.dev/proxy/media/<%=x.attachment.videoId%>/22" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="hd720" selected="false">
|
||||||
|
@ -1303,7 +1303,7 @@ width: fit-content;
|
||||||
<% if (x.attachment.imageThumbnails[4] ) { %>
|
<% if (x.attachment.imageThumbnails[4] ) { %>
|
||||||
|
|
||||||
<img style=" width: 100%;
|
<img style=" width: 100%;
|
||||||
border-radius: 26px;" src="https://p.poketube.fun/<%- x.attachment.imageThumbnails[4].url%>">
|
border-radius: 26px;" src="<%- media_proxy_url %>/proxy?url=<%- x.attachment.imageThumbnails[4].url%>">
|
||||||
<% } %> <% } %>
|
<% } %> <% } %>
|
||||||
|
|
||||||
|
|
||||||
|
@ -1375,21 +1375,39 @@ if (userID) {
|
||||||
}
|
}
|
||||||
|
|
||||||
document.getElementById('search').addEventListener('keyup', function () {
|
document.getElementById('search').addEventListener('keyup', function () {
|
||||||
var value = this.value.toLowerCase();
|
var value = this.value.toLowerCase();
|
||||||
var videos = document.querySelectorAll('.video');
|
var videos = document.querySelectorAll('.video, .shorts-video');
|
||||||
|
|
||||||
|
videos.forEach(function (video) {
|
||||||
|
var text = video.textContent.toLowerCase();
|
||||||
|
if (text.indexOf(value) > -1) {
|
||||||
|
video.style.visibility = 'visible';
|
||||||
|
video.style.display = 'grid';
|
||||||
|
} else {
|
||||||
|
video.style.visibility = 'hidden';
|
||||||
|
video.style.display = 'none';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getElementById('search').addEventListener('keyup', function () {
|
||||||
|
var value = this.value.toLowerCase();
|
||||||
|
var videos = document.querySelectorAll('.community-content');
|
||||||
|
|
||||||
|
videos.forEach(function (video) {
|
||||||
|
var text = video.textContent.toLowerCase();
|
||||||
|
if (text.indexOf(value) > -1) {
|
||||||
|
video.style.visibility = 'visible';
|
||||||
|
video.style.display = 'block';
|
||||||
|
} else {
|
||||||
|
video.style.visibility = 'hidden';
|
||||||
|
video.style.display = 'none';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
videos.forEach(function (video) {
|
|
||||||
var text = video.textContent.toLowerCase();
|
|
||||||
if (text.indexOf(value) > -1) {
|
|
||||||
video.style.visibility = 'visible';
|
|
||||||
video.style.display = 'grid';
|
|
||||||
} else {
|
|
||||||
video.style.visibility = 'hidden';
|
|
||||||
video.style.display = 'none';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
// @license-end
|
// @license-end
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
<meta content="summary_large_image" name="twitter:card" />
|
<meta content="summary_large_image" name="twitter:card" />
|
||||||
<link href=/css/app-cdn.min.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-cdn.min.css rel=stylesheet>
|
||||||
<link href=/css/app.main.css rel=stylesheet>
|
<link href=/css/app.main.css?v=35 rel=stylesheet>
|
||||||
<link href=/css/search.main.css rel=stylesheet>
|
<link href=/css/search.main.css rel=stylesheet>
|
||||||
<meta content="#f97794" name="theme-color" />
|
<meta content="#f97794" name="theme-color" />
|
||||||
<link href=/css/watch.main.css rel=stylesheet>
|
<link href=/css/watch.main.css rel=stylesheet>
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
<link href=/css/app-cdn.min.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-cdn.min.css rel=stylesheet>
|
||||||
<link href=/css/app.main.css rel=stylesheet>
|
<link href=/css/app.main.css?v=45 rel=stylesheet>
|
||||||
<link href=/css/search.main.css rel=stylesheet>
|
<link href=/css/search.main.css rel=stylesheet>
|
||||||
<link href=/css/watch.main.css rel=stylesheet>
|
<link href=/css/watch.main.css rel=stylesheet>
|
||||||
<link href="https://fonts.poketube.fun/css/fonts.css" rel=stylesheet>
|
<link href="https://fonts.poketube.fun/css/fonts.css" rel=stylesheet>
|
||||||
|
@ -1115,7 +1115,7 @@ margin-left: auto;
|
||||||
|
|
||||||
<% inv.forEach(x => { %>
|
<% inv.forEach(x => { %>
|
||||||
<a href="/watch?v=<%- x.videoId %>" class="video">
|
<a href="/watch?v=<%- x.videoId %>" class="video">
|
||||||
<div class="thumbnail" style="background-image: url('https://p.poketube.fun/https://i.ytimg.com/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-top-left-radius: 16px;border-top-right-radius: 16px;"><span class="video-length"><%- turntomins(x.lengthSeconds) %></span></div>
|
<div class="thumbnail" style="background-image: url('https://p.poketube.fun/https://i.ytimg.com/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 16px;"><span class="video-length"><%- turntomins(x.lengthSeconds) %></span></div>
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<span class="title max-lines-2" title="<%- x.title %>" style="font-family:Inter,sans-serif;"><%- x.title %></span>
|
<span class="title max-lines-2" title="<%- x.title %>" style="font-family:Inter,sans-serif;"><%- x.title %></span>
|
||||||
<span class="title max-lines-2" title="Video By <%- x.author %>" style="margin-top:1px">By <%- x.author %></span>
|
<span class="title max-lines-2" title="Video By <%- x.author %>" style="margin-top:1px">By <%- x.author %></span>
|
||||||
|
@ -1128,7 +1128,7 @@ margin-left: auto;
|
||||||
|
|
||||||
<% p.forEach(x => { %>
|
<% p.forEach(x => { %>
|
||||||
<a href="/watch?v=<%- x.videoId %>" class="video">
|
<a href="/watch?v=<%- x.videoId %>" class="video">
|
||||||
<div class="thumbnail" style="background-image: url('https://p.poketube.fun/https://i.ytimg.com/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-top-left-radius: 16px;border-top-right-radius: 16px;"><span class="video-length"><%- turntomins(x.lengthSeconds) %></span></div>
|
<div class="thumbnail" style="background-image: url('https://p.poketube.fun/https://i.ytimg.com/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius: 16px;"><span class="video-length"><%- turntomins(x.lengthSeconds) %></span></div>
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<span class="title max-lines-2" title="<%- x.title %>" style="font-family:Inter,sans-serif;"><%- x.title %></span>
|
<span class="title max-lines-2" title="<%- x.title %>" style="font-family:Inter,sans-serif;"><%- x.title %></span>
|
||||||
<span class="title max-lines-2" title="Video By <%- x.author %>" style="margin-top:1px">By <%- x.author %></span>
|
<span class="title max-lines-2" title="Video By <%- x.author %>" style="margin-top:1px">By <%- x.author %></span>
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
<meta content=@PoketaleBot name=twitter:site>
|
<meta content=@PoketaleBot name=twitter:site>
|
||||||
<meta content=@PoketaleBot name=twitter:creator>
|
<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/app.main.css?v=8 rel=stylesheet>
|
||||||
<link href="https://fonts.poketube.fun/css/fonts.css" rel=stylesheet>
|
<link href="https://fonts.poketube.fun/css/fonts.css" rel=stylesheet>
|
||||||
<link href="/css/watch.main.css?v=56" rel=stylesheet>
|
<link href="/css/watch.main.css?v=56" rel=stylesheet>
|
||||||
<link href=https://p.poketube.fun/https://site-assets.fontawesome.com/releases/v6.1.1/css/all.css rel=stylesheet>
|
<link href=https://p.poketube.fun/https://site-assets.fontawesome.com/releases/v6.1.1/css/all.css rel=stylesheet>
|
||||||
|
|
|
@ -261,8 +261,8 @@ background: none !important;
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<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/app.main.css?v=45 rel=stylesheet>
|
||||||
<link href="/css/watch.main.css?v=56" rel=stylesheet>
|
<link href="/css/watch.main.css?v=564" rel=stylesheet>
|
||||||
<link href="/css/watch-util.css" rel=stylesheet>
|
<link href="/css/watch-util.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>
|
<link href="/css/poketube.css?v=56" rel=stylesheet>
|
||||||
|
|
|
@ -353,7 +353,7 @@ a[data-onclick="jump_to_time"] {
|
||||||
|
|
||||||
<!-- css files -->
|
<!-- css files -->
|
||||||
<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/app.main.css?v=445" rel=stylesheet>
|
||||||
<link href="/css/watch.main.css" rel=stylesheet>
|
<link href="/css/watch.main.css" rel=stylesheet>
|
||||||
<link href="/css/watch-util.css" rel=stylesheet>
|
<link href="/css/watch-util.css" rel=stylesheet>
|
||||||
<link href="/css/watch-navbar.css" rel=stylesheet>
|
<link href="/css/watch-navbar.css" rel=stylesheet>
|
||||||
|
@ -417,6 +417,7 @@ text-shadow: 1px 1px #000,1px 1px 0.1px #000;!important;
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<% if(IsOldWindows) { %>
|
<% if(IsOldWindows) { %>
|
||||||
<style>
|
<style>
|
||||||
:root {
|
:root {
|
||||||
|
@ -553,7 +554,44 @@ background-color: #0000;
|
||||||
top: 0;
|
top: 0;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
<% if(shortsui) { %>
|
||||||
|
<script>
|
||||||
|
// Function to apply styles after DOM has loaded
|
||||||
|
function applyStyles() {
|
||||||
|
// Your existing styles
|
||||||
|
const styles = `
|
||||||
|
.player {
|
||||||
|
width: fit-content;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
height: fit-content;
|
||||||
|
}
|
||||||
|
|
||||||
|
.video-player-container {
|
||||||
|
max-width: fit-content;
|
||||||
|
min-width: fit-content;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
aspect-ratio: var(--ptd-watch-width-ratio) / var(--ptd-watch-height-ratio);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
// Create a style element and set its content
|
||||||
|
const styleElement = document.createElement('style');
|
||||||
|
styleElement.innerHTML = styles;
|
||||||
|
|
||||||
|
// Append the style element to the document head
|
||||||
|
document.head.appendChild(styleElement);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Event listener to call applyStyles after DOM has loaded
|
||||||
|
window.onload = applyStyles;
|
||||||
|
</script>
|
||||||
|
<% } %>
|
||||||
|
|
||||||
<% if(dm) { %>
|
<% if(dm) { %>
|
||||||
|
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
:root {
|
:root {
|
||||||
--div-gradient: linear-gradient(to bottom right, #33078c, #7a4d3f) !important;
|
--div-gradient: linear-gradient(to bottom right, #33078c, #7a4d3f) !important;
|
||||||
|
@ -846,7 +884,7 @@ About
|
||||||
<% if (!isvidious) { %>
|
<% if (!isvidious) { %>
|
||||||
|
|
||||||
<% if (!qua) { %>
|
<% if (!qua) { %>
|
||||||
<a href="https://tube.kuylar.dev/proxy/media/<%=inv_vid.videoId%>/22 " target="_blank" style="color: #fff;">
|
<a href="https://tube-proxy.poketube.fun/proxy/media/<%=inv_vid.videoId%>/22 " target="_blank" style="color: #fff;">
|
||||||
<i class="fa-light fa-arrow-up-right-from-square"></i> Open video in new tab
|
<i class="fa-light fa-arrow-up-right-from-square"></i> Open video in new tab
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
@ -855,7 +893,7 @@ About
|
||||||
|
|
||||||
<% if (qua === "medium") { %>
|
<% if (qua === "medium") { %>
|
||||||
|
|
||||||
<a href="https://tube.kuylar.dev/proxy/media/<%=inv_vid.videoId%>/18 " target="_blank" style="color: #fff;">
|
<a href="https://tube-proxy.poketube.fun/proxy/media/<%=inv_vid.videoId%>/18 " target="_blank" style="color: #fff;">
|
||||||
<i class="fa-light fa-arrow-up-right-from-square"></i> Open video in new tab
|
<i class="fa-light fa-arrow-up-right-from-square"></i> Open video in new tab
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
@ -884,8 +922,7 @@ About
|
||||||
<video class="player video-ambient-container" id="video" style="border-radius: 16px;
|
<video class="player video-ambient-container" id="video" style="border-radius: 16px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
min-width: 100%;
|
min-width: 100%;
|
||||||
display: block; !important;" autoplay controls
|
display: block; !important;" autoplay controls>
|
||||||
poster="https://p.poketube.fun/https://i.ytimg.com/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
|
|
||||||
|
|
||||||
<% if (isvidious) { %>
|
<% if (isvidious) { %>
|
||||||
<% if (!qua) { %>
|
<% if (!qua) { %>
|
||||||
|
@ -903,13 +940,13 @@ display: block; !important;" autoplay controls
|
||||||
<% if (!isvidious) { %>
|
<% if (!isvidious) { %>
|
||||||
|
|
||||||
<% if (!qua) { %>
|
<% if (!qua) { %>
|
||||||
<source src="https://tube.kuylar.dev/proxy/media/<%=inv_vid.videoId%>/22" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="hd720" selected="true">
|
<source src="https://tube-proxy.poketube.fun/proxy/media/<%=inv_vid.videoId%>/22" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="hd720" selected="true">
|
||||||
|
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
<% if (qua === "medium") { %>
|
<% if (qua === "medium") { %>
|
||||||
|
|
||||||
<source src="https://tube.kuylar.dev/proxy/media/<%=inv_vid.videoId%>/18" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="sd360" selected="true">
|
<source src="https://tube-proxy.poketube.fun/proxy/media/<%=inv_vid.videoId%>/18" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="sd360" selected="true">
|
||||||
|
|
||||||
<% } %>
|
<% } %>
|
||||||
<% } %>
|
<% } %>
|
||||||
|
@ -975,14 +1012,20 @@ display: block; !important;" autoplay controls
|
||||||
ImmersiveAmbientModecolor: <% if (lightOrDark(color) == "light") { %><%=color%> (color 1)<% } %><% if (lightOrDark(color) == "dark") { %> <%=color2%> (color 2) <% } %> <br>
|
ImmersiveAmbientModecolor: <% if (lightOrDark(color) == "light") { %><%=color%> (color 1)<% } %><% if (lightOrDark(color) == "dark") { %> <%=color2%> (color 2) <% } %> <br>
|
||||||
Video Format :<% if (!qua) { %> 22 (720p) openh264 ( https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %>
|
Video Format :<% if (!qua) { %> 22 (720p) openh264 ( https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %>
|
||||||
<% if (qua === "medium") { %> 18 (320p) openh264 (https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %> <br>
|
<% if (qua === "medium") { %> 18 (320p) openh264 (https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %> <br>
|
||||||
PokeTubeEncryptID: <%=sha384(inv_vid.videoId)%> <br>
|
<% if (inv_vid.genre === "Music") { %>
|
||||||
|
Audio Format: ALAC lossless (https://github.com/macosforge/alac) <br>
|
||||||
|
<% } %>
|
||||||
|
<% if (inv_vid.genre !== "Music") { %>
|
||||||
|
Audio Format: Opus - Normalized audio<br>
|
||||||
|
<% } %>
|
||||||
|
PokeTubeEncryptID: <%=sha384(inv_vid.videoId)%> <br>
|
||||||
<% if (isvidious) { %>
|
<% if (isvidious) { %>
|
||||||
|
|
||||||
Proxy : <%= u.replace("https://","") %> - refresh the page to change the proxy location<br>
|
Proxy : <%= u.replace("https://","") %> - refresh the page to change the proxy location<br>
|
||||||
<% } %>
|
<% } %>
|
||||||
<% if (!isvidious) { %>
|
<% if (!isvidious) { %>
|
||||||
|
|
||||||
Proxy : tube.kuylar.dev - refresh the page to change the proxy location<br>
|
Proxy : tube-proxy.poketube.fun - refresh the page to change the proxy location<br>
|
||||||
<% } %>
|
<% } %>
|
||||||
Date : <%- Date.now() %> - <%- useragent.os.replace("Linux", "GNU/Linux") %> on <%- useragent.browser %> <br>
|
Date : <%- Date.now() %> - <%- useragent.os.replace("Linux", "GNU/Linux") %> on <%- useragent.browser %> <br>
|
||||||
<% if (isvidious) { %>
|
<% if (isvidious) { %>
|
||||||
|
@ -991,7 +1034,7 @@ display: block; !important;" autoplay controls
|
||||||
<% } %>
|
<% } %>
|
||||||
<% if (!isvidious) { %>
|
<% if (!isvidious) { %>
|
||||||
|
|
||||||
Mystery text : <%=btoa(inv_vid.videoId + " i " + " lov " + " u " + "tube.kuylar.dev" ) %> <br>
|
Mystery text : <%=btoa(inv_vid.videoId + " i " + " lov " + " u " + "tube-proxy.poketube.fun" ) %> <br>
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
143 : true <br>
|
143 : true <br>
|
||||||
|
@ -1017,7 +1060,8 @@ display: block; !important;" autoplay controls
|
||||||
|
|
||||||
<div style="float: left;font-size: small;font-family: ubuntu;margin-bottom: 1em;"> <i title="hq audio" class="fa-light fa-waveform-lines"></i> Lossless </div>
|
<div style="float: left;font-size: small;font-family: ubuntu;margin-bottom: 1em;"> <i title="hq audio" class="fa-light fa-waveform-lines"></i> Lossless </div>
|
||||||
<% } %>
|
<% } %>
|
||||||
<% if (inv_vid.genre !== "Music") { %>
|
|
||||||
|
<% if (inv_vid.genre !== "Music") { %>
|
||||||
|
|
||||||
<a href="#connections" style="font-weight: bolder;font-family: sans-serif;color: var(--text-color);font-size: small;"> Jump to Connections </a>
|
<a href="#connections" style="font-weight: bolder;font-family: sans-serif;color: var(--text-color);font-size: small;"> Jump to Connections </a>
|
||||||
<% } %>
|
<% } %>
|
||||||
|
@ -1422,9 +1466,8 @@ display: block; !important;" autoplay controls
|
||||||
Top Comments of this video!! :3
|
Top Comments of this video!! :3
|
||||||
</p>
|
</p>
|
||||||
<hr style="clear: both;display: block;border: none;border-bottom: 0.5px solid #2f2f2f;margin: 0 0;/*! width: 4.5em; */height: 0;">
|
<hr style="clear: both;display: block;border: none;border-bottom: 0.5px solid #2f2f2f;margin: 0 0;/*! width: 4.5em; */height: 0;">
|
||||||
<% inv.comments.forEach(x =>{ %><div class=". fade-in <%- x.commentId %> <%- btoa(x.commentId) %> "><div class="_ comment_ <%- x.commentId %> <%- btoa(btoa(x.commentId)) %>"style=padding:10px><div class="comment-list left-padding"style=background:#333;padding-top:1px;padding:10px;border-radius:30px;padding-top:0><div class="d-flex justify-content-between single-comment"style=padding-top:none><div class="d-flex justify-content-between user"><div class=desc><h5 style=display:flex;margin-top:7px;padding-top:10px><div class=thumb><a href="/channel?id=<%- x.authorId%>"style=width:40px;height:40px class=avatar><img loading=lazy src="/avatars/<%= x.authorThumbnails[1].url.replace("https://yt3.ggpht.com/", "") %>"></a></div> <% if (!x.authorIsChannelOwner) { %> <p class=comments-author><a href="/channel?id=<%- x.authorId%>"style=color:var(--text-color);text-decoration:none> <%- x.author%> <% if (x.verified) { %> <i class="icon ion ion-md-checkmark-circle"></i> <% } %> <p class=date-publish> <%- x.publishedText %> </p></a></p> <% } %> <% if (x.authorIsChannelOwner) { %> <p class="comments-author owner"><a href="/channel?id=<%- x.authorId%>"style=color:var(--text-color);text-decoration:none> <%- x.author%> <% if (x.verified) { %> <i class="icon ion ion-md-checkmark-circle"></i> <% } %> <p class=date-publish> <%- x.publishedText %> </p></a> <% } %> </h5><p class=comment style=font-weight:700> <%- x.contentHtml %> <br><br><span><i class="fa-light fa-thumbs-up"></i> <%- convert(x.likeCount) %> | <i class="fa-light fa-thumbs-down"></i> <% if(x.creatorHeart) { %> <i class="icon creator-heart-small-container ion-ios-heart"style=color:#ffabcc title="<%= x.creatorHeart.creatorName%> marked it with a ❤ owo"></i> </span> <% } %> </div></div></div></div></div></div> <% }) %>
|
<% inv.comments.forEach(x =>{ %><div class="fade-in<%- x.commentId %><%- btoa(x.commentId) %>"><div class="_ comment_<%- x.commentId %><%- btoa(btoa(x.commentId)) %>"style="padding:10px"><div class="comment-list left-padding"style="background:#333;padding-top:1px;padding:10px;border-radius:30px;padding-top:0"><div class="d-flex justify-content-between single-comment"style="padding-top:none"><div class="d-flex justify-content-between user"><div class="desc"><h5 style="display:flex;margin-top:7px;padding-top:10px"><div class="thumb"><a href="/channel?id=<%- x.authorId%>"style="width:40px;height:40px"class="avatar"><img loading="lazy"src="<%- media_proxy_url %>/proxy?url=<%= x.authorThumbnails[1].url %>"></a></div><% if (!x.authorIsChannelOwner) { %><p class="comments-author"><a href="/channel?id=<%- x.authorId%>"style="color:var(--text-color);text-decoration:none"><%- x.author%><% if (x.verified) { %><i class="icon ion ion-md-checkmark-circle"></i><% } %><p class="date-publish"><%- x.publishedText %></p></a></p><% } %><% if (x.authorIsChannelOwner) { %><p class="comments-author owner"><a href="/channel?id=<%- x.authorId%>"style="color:var(--text-color);text-decoration:none"><%- x.author%><% if (x.verified) { %><i class="icon ion ion-md-checkmark-circle"></i><% } %><p class="date-publish"><%- x.publishedText %></p></a><% } %></h5><p class="comment"style="font-weight:700"><%- x.contentHtml %><br><br><% if (x.likeCount === 0) { %><i class="fa-light fa-thumbs-up"></i> | <i class="fa-light fa-thumbs-down"></i><% } else { %><i class="fa-light fa-thumbs-up"></i> <%= convert(x.likeCount) %> | <i class="fa-light fa-thumbs-down"></i><% } %><% if(x.creatorHeart) { %> <i class="icon creator-heart-small-container ion-ios-heart"style="color:#ffabcc"title="<%= x.creatorHeart.creatorName%> marked it with a ❤ owo"></i><% } %></div></div></div></div></div></div><% }) %>
|
||||||
|
<center>
|
||||||
<center>
|
|
||||||
<a href="#top">Go To Top</a>
|
<a href="#top">Go To Top</a>
|
||||||
</center>
|
</center>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1478,7 +1521,8 @@ Recommended Videos
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<% if (!f) { %> <% k.Video.Recommendations?.Video?.forEach(x => { %> <div class="fade-in video"> <% if (!optout) { %> <a class=thumbnail href="/watch?v=<%= x.id %>"style="background-image:url('/vi/<%= x.id %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius:9.5px"alt="<%= x.Title %>"><span class=video-length><%- x.duration || "LIVE"%></span> <% } %> <% if (optout) { %> <a class=thumbnail href="/watch?v=<%= x.id %>&m=f"style="background-image:url('/vi/<%= x.id %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw');border-radius:9.5px"alt="<%= x.Title %>"><span class=video-length><%- x.duration || "LIVE"%></span> <% } %> </a><div class=info> <% if (!optout) { %> <a class="max-lines-2 title"href="/watch?v=<%= x.id %>"style=font-stretch:100%;font-weight:800 title="<%= x.Title %>"><%= x.Title %></a> <% } %> <% if (optout) { %> <a class="max-lines-2 title"href="/watch?v=<%= x.id %>&m=f"style=font-stretch:100%;font-weight:800 title="<%= x.Title %>"><%= x.Title %></a> <% } %> <div><a class=max-lines-2 href="/channel?id=<%= x.Channel.id %>"style=-webkit-line-clamp:1;width:12em;word-wrap:break-word><%=x.Channel.Name %></a><div class=video-views> <%= x.uploadedAt.replace("Streamed", "Live") %> • <%= convert(x.views) %> views</div></div></div></div> <% }) %><% } %>
|
<% if (!f) { %><% k.Video.Recommendations?.Video?.forEach(x => { %><div class="fade-in video"><% if (!optout) { %><a class="thumbnail"href="/watch?v=<%= x.id %>"style="background-image:url(<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%= x.id %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw);border-radius:9.5px"alt="<%= x.Title %>"><span class="video-length"><%- x.duration || "LIVE"%></span><% } %><% if (optout) { %><a class="thumbnail"href="/watch?v=<%= x.id %>&m=f"style="background-image:url(<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%= x.id %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw);border-radius:9.5px"alt="<%= x.Title %>"><span class="video-length"><%- x.duration || "LIVE"%></span><% } %></a><div class="info"><% if (!optout) { %><a class="max-lines-2 title"href="/watch?v=<%= x.id %>"style="font-stretch:ultra-expanded;font-weight:850"title="<%= x.Title %>"><%= x.Title %></a><% } %><% if (optout) { %><a class="max-lines-2 title"href="/watch?v=<%= x.id %>&m=f"style="font-stretch:100%;font-weight:800"title="<%= x.Title %>"><%= x.Title %></a><% } %><div><a class="max-lines-2" href="/channel?id=<%= x.Channel.id %>" style="-webkit-line-clamp:1;width:12em;word-wrap:break-word"><%=x.Channel.Name %></a><div class="video-views"> <%= x.uploadedAt.replace("Streamed", "Live") %> • <%= convert(x.views) %> views</div></div></div></div><% }) %><% } %>
|
||||||
|
|
||||||
|
|
||||||
<% if (f) { %>
|
<% if (f) { %>
|
||||||
|
|
||||||
|
@ -1752,12 +1796,11 @@ const AMvideo = document.getElementById("video")
|
||||||
const canvas = document.getElementById("ambient-canvas")
|
const canvas = document.getElementById("ambient-canvas")
|
||||||
const ctx = canvas.getContext("2d")
|
const ctx = canvas.getContext("2d")
|
||||||
|
|
||||||
let step
|
let step;
|
||||||
|
|
||||||
const draw = () => {
|
const draw = () => {
|
||||||
ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
|
ctx.drawImage(AMvideo, 0, 0, canvas.width, canvas.height);
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
const drawLoop = () => {
|
const drawLoop = () => {
|
||||||
draw()
|
draw()
|
||||||
|
@ -1769,7 +1812,9 @@ const drawPause = () => {
|
||||||
step = undefined
|
step = undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const init = () => {
|
const init = () => {
|
||||||
|
video.pause();video.play();
|
||||||
AMvideo.addEventListener("loadeddata", draw, false)
|
AMvideo.addEventListener("loadeddata", draw, false)
|
||||||
AMvideo.addEventListener("seeked", draw, false)
|
AMvideo.addEventListener("seeked", draw, false)
|
||||||
AMvideo.addEventListener("play", drawLoop, false)
|
AMvideo.addEventListener("play", drawLoop, false)
|
||||||
|
@ -1777,6 +1822,7 @@ const init = () => {
|
||||||
AMvideo.addEventListener("ended", drawPause, false)
|
AMvideo.addEventListener("ended", drawPause, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const cleanup = () => {
|
const cleanup = () => {
|
||||||
AMvideo.removeEventListener("loadeddata", draw)
|
AMvideo.removeEventListener("loadeddata", draw)
|
||||||
AMvideo.removeEventListener("seeked", draw)
|
AMvideo.removeEventListener("seeked", draw)
|
||||||
|
@ -2080,13 +2126,13 @@ a {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<source src="<%=u%>/latest_version?id=<%=inv_vid.videoId%>&itag=22&local=true" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="hd720" selected="true">
|
<source src="https://video-proxy.poketube.fun/latest_version?id=<%=inv_vid.videoId%>&itag=22&local=true" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="hd720" selected="true">
|
||||||
|
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
<% if (qua === "medium") { %>
|
<% if (qua === "medium") { %>
|
||||||
|
|
||||||
<source src="<%=u%>/latest_version?id=<%=inv_vid.videoId%>&itag=18&local=true" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="sd360" selected="true">
|
<source src="https://video-proxy.poketube.fun/latest_version?id=<%=inv_vid.videoId%>&itag=18&local=true" type="video/mp4; codecs="avc1.64001F, mp4a.40.2"" label="sd360" selected="true">
|
||||||
|
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
|
@ -2537,13 +2583,19 @@ the channels social media accounts!
|
||||||
Video Format :<% if (!qua) { %> 22 (720p) openh264 ( https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %>
|
Video Format :<% if (!qua) { %> 22 (720p) openh264 ( https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %>
|
||||||
<% if (qua === "medium") { %> 18 (320p) openh264 (https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %> <br>
|
<% if (qua === "medium") { %> 18 (320p) openh264 (https://github.com/cisco/openh264) mp4a.40.2 | 44100Hz <% } %> <br>
|
||||||
PokeTubeEncryptID: <%=sha384(inv_vid.videoId)%> <br>
|
PokeTubeEncryptID: <%=sha384(inv_vid.videoId)%> <br>
|
||||||
|
<% if (inv_vid.genre === "Music") { %>
|
||||||
|
Audio Format: ALAC lossless (https://codeberg.org/Ashley/poke/src/branch/main/alac) Audio/ Flac<br>
|
||||||
|
<% } %>
|
||||||
|
<% if (inv_vid.genre !== "Music") { %>
|
||||||
|
Audio Format: Opus - Normalized audio<br>
|
||||||
|
<% } %>
|
||||||
<% if (isvidious) { %>
|
<% if (isvidious) { %>
|
||||||
|
|
||||||
Proxy : <%= u.replace("https://","") %> - refresh the page to change the proxy location<br>
|
Proxy : <%= u.replace("https://","") %> - refresh the page to change the proxy location<br>
|
||||||
<% } %>
|
<% } %>
|
||||||
<% if (!isvidious) { %>
|
<% if (!isvidious) { %>
|
||||||
|
|
||||||
Proxy : tube.kuylar.dev - refresh the page to change the proxy location<br>
|
Proxy : tube-proxy.poketube.fun - refresh the page to change the proxy location<br>
|
||||||
<% } %>
|
<% } %>
|
||||||
Date : <%- Date.now() %> - <%- useragent.os.replace("Linux", "GNU/Linux") %> on <%- useragent.browser %> <br>
|
Date : <%- Date.now() %> - <%- useragent.os.replace("Linux", "GNU/Linux") %> on <%- useragent.browser %> <br>
|
||||||
<% if (isvidious) { %>
|
<% if (isvidious) { %>
|
||||||
|
@ -2552,7 +2604,7 @@ the channels social media accounts!
|
||||||
<% } %>
|
<% } %>
|
||||||
<% if (!isvidious) { %>
|
<% if (!isvidious) { %>
|
||||||
|
|
||||||
Mystery text : <%=btoa(inv_vid.videoId + " i " + " lov " + " u " + "tube.kuylar.dev" ) %> <br>
|
Mystery text : <%=btoa(inv_vid.videoId + " i " + " lov " + " u " + "tube-proxy.poketube.fun" ) %> <br>
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
143 : true <br>
|
143 : true <br>
|
||||||
|
@ -2742,7 +2794,9 @@ More Epic options owo~
|
||||||
<p class="comment" style="font-weight: bold;">
|
<p class="comment" style="font-weight: bold;">
|
||||||
<%- x.contentHtml %>
|
<%- x.contentHtml %>
|
||||||
<span style=" white-space: nowrap;"> <i class="fa-light fa-thumbs-up"></i>
|
<span style=" white-space: nowrap;"> <i class="fa-light fa-thumbs-up"></i>
|
||||||
<%- convert(x.likeCount) %> | <i class="fa-light fa-thumbs-down"></i> <% if(x.creatorHeart) { %>
|
<%- convert(x.likeCount) %> | <i class="fa-light fa-thumbs-down"></i>
|
||||||
|
|
||||||
|
<% if(x.creatorHeart) { %>
|
||||||
|
|
||||||
<i class="icon ion-ios-heart creator-heart-small-container" title="<%= x.creatorHeart.creatorName%> marked it with a ❤ owo"></i>
|
<i class="icon ion-ios-heart creator-heart-small-container" title="<%= x.creatorHeart.creatorName%> marked it with a ❤ owo"></i>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
<link rel="manifest" href="/manifest.json">
|
<link rel="manifest" href="/manifest.json">
|
||||||
<link href=/css/yt-ukraine.svg?v=6 rel=icon>
|
<link href=/css/yt-ukraine.svg?v=6 rel=icon>
|
||||||
<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/app.main.css?v=25 rel=stylesheet>
|
||||||
<link href=/css/search.main.css rel=stylesheet>
|
<link href=/css/search.main.css rel=stylesheet>
|
||||||
<link href=/css/watch.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" />
|
<link rel="search" type="application/opensearchdescription+xml" title="PokeTube" href="https://poketube.fun/api/opensearch" />
|
||||||
|
@ -402,6 +402,8 @@ video[counter].classList.add("shake");
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="channel-page" style="background-color: var(--channel-contents-background);">
|
<div class="channel-page" style="background-color: var(--channel-contents-background);">
|
||||||
|
<div class="search-options">
|
||||||
|
|
||||||
<div id="filters">
|
<div id="filters">
|
||||||
<details id="filters-collapse"> <summary>Filters</summary>
|
<details id="filters-collapse"> <summary>Filters</summary>
|
||||||
<div id="filters-box"><form action="/search" method="get">
|
<div id="filters-box"><form action="/search" method="get">
|
||||||
|
@ -464,6 +466,7 @@ Videos
|
||||||
Web </a>
|
Web </a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<% if (!tab) { %>
|
<% if (!tab) { %>
|
||||||
|
|
||||||
|
@ -474,7 +477,7 @@ Web </a>
|
||||||
<a
|
<a
|
||||||
href="/watch?v=<%= x.videoId %>"
|
href="/watch?v=<%= x.videoId %>"
|
||||||
class="thumbnail"
|
class="thumbnail"
|
||||||
style="background-image: url('/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEXCNAFEJQDSFryq4qpAwkIARUAAIhCGAE=&rs=AOn4CLBmAOZV7CM3NdDKlEFxGX7PpI5UWQ');border-radius: 10px;"
|
style="background-image: url('<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEXCNAFEJQDSFryq4qpAwkIARUAAIhCGAE=&rs=AOn4CLBmAOZV7CM3NdDKlEFxGX7PpI5UWQ');border-radius: 10px;"
|
||||||
><span class="video-length"><%=turntomins(x.lengthSeconds) %></span></a>
|
><span class="video-length"><%=turntomins(x.lengthSeconds) %></span></a>
|
||||||
<div class="info" style="color:#fff;text-align: left;font-weight: 1000;">
|
<div class="info" style="color:#fff;text-align: left;font-weight: 1000;">
|
||||||
<a style="font-family: 'PokeTube Flex';font-size: large;text-align: left;font-stretch: extra-expanded;
|
<a style="font-family: 'PokeTube Flex';font-size: large;text-align: left;font-stretch: extra-expanded;
|
||||||
|
|
2156
january/Cargo.lock
generated
Normal file
2156
january/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
26
january/Cargo.toml
Normal file
26
january/Cargo.toml
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
[package]
|
||||||
|
name = "january"
|
||||||
|
version = "0.3.5"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
actix-web = "4.0"
|
||||||
|
lazy_static = "1.4"
|
||||||
|
imagesize = "0.8"
|
||||||
|
reqwest = "0.11"
|
||||||
|
scraper = "0.12"
|
||||||
|
serde_json = "1.0"
|
||||||
|
mime = "0.3"
|
||||||
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
regex = "1.5"
|
||||||
|
log = "0.4"
|
||||||
|
env_logger = "0.8"
|
||||||
|
dotenv = "0.15"
|
||||||
|
tempfile = "3.2.0"
|
||||||
|
ffprobe = "0.3.0"
|
||||||
|
encoding_rs = "0.8"
|
||||||
|
moka = { version = "0.10", features = ["future"]}
|
||||||
|
|
||||||
|
validator = { version = "0.15.0", features = ["derive"] }
|
18
january/Dockerfile
Normal file
18
january/Dockerfile
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
# Build Stage
|
||||||
|
FROM rustlang/rust:nightly-slim AS builder
|
||||||
|
USER 0:0
|
||||||
|
WORKDIR /home/rust/src
|
||||||
|
|
||||||
|
RUN USER=root cargo new --bin january
|
||||||
|
WORKDIR /home/rust/src/january
|
||||||
|
COPY Cargo.toml Cargo.lock ./
|
||||||
|
COPY src ./src
|
||||||
|
RUN apt-get update && apt-get install -y libssl-dev pkg-config && cargo install --locked --path .
|
||||||
|
|
||||||
|
# Bundle Stage
|
||||||
|
FROM debian:buster-slim
|
||||||
|
RUN apt-get update && apt-get install -y ca-certificates ffmpeg
|
||||||
|
COPY --from=builder /usr/local/cargo/bin/january ./
|
||||||
|
EXPOSE 7000
|
||||||
|
ENV JANUARY_HOST 0.0.0.0:7000
|
||||||
|
CMD ["./january"]
|
661
january/LICENSE
Normal file
661
january/LICENSE
Normal file
|
@ -0,0 +1,661 @@
|
||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU Affero General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU Affero General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU Affero General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
January
|
||||||
|
Copyright (C) 2021 REVOLT
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published
|
||||||
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(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
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
55
january/README.md
Normal file
55
january/README.md
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
# January
|
||||||
|
|
||||||
|
## Description
|
||||||
|
|
||||||
|
Image proxy and metadata scraper.
|
||||||
|
|
||||||
|
**Features:**
|
||||||
|
|
||||||
|
- Can scrape metadata from websites, e.g. OpenGraph
|
||||||
|
- Can scrape embeds from websites, e.g. YouTube, Spotify
|
||||||
|
|
||||||
|
## Stack
|
||||||
|
|
||||||
|
- [Actix](https://actix.rs/)
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
- Use `/embed?url=<url>` to generate an embed for given URL.
|
||||||
|
- Use `/proxy?url=<url>` to fetch and serve a remote image.
|
||||||
|
|
||||||
|
## Resources
|
||||||
|
|
||||||
|
### Revolt
|
||||||
|
|
||||||
|
- [Revolt Project Board](https://github.com/revoltchat/revolt/discussions) (Submit feature requests here)
|
||||||
|
- [Revolt Testers Server](https://app.revolt.chat/invite/Testers)
|
||||||
|
- [Contribution Guide](https://developers.revolt.chat/contributing)
|
||||||
|
|
||||||
|
## CLI Commands
|
||||||
|
|
||||||
|
| Command | Description |
|
||||||
|
| ------------------ | ------------------------------------------------------------------------------------------- |
|
||||||
|
| `cargo build` | Build/compile January. |
|
||||||
|
| `cargo run` | Run January. |
|
||||||
|
| `cargo fmt` | Format January. Not intended for PR use to avoid accidentally formatting unformatted files. |
|
||||||
|
|
||||||
|
## Contributing
|
||||||
|
|
||||||
|
The contribution guide is located at [developers.revolt.chat/contributing](https://developers.revolt.chat/contributing).
|
||||||
|
Please note that a pull request should only take care of one issue so that we can review it quickly.
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
January is licensed under the [GNU Affero General Public License v3.0](https://github.com/revoltchat/january/blob/master/LICENSE).
|
||||||
|
|
||||||
|
## To-do
|
||||||
|
|
||||||
|
- Use LRU cache for data. [See uluru](https://github.com/servo/uluru)
|
||||||
|
- Full support for OpenGraph. [See ogp.me](https://ogp.me)
|
||||||
|
- Full support for Twitter cards. See [a](https://developer.twitter.com/en/docs/twitter-for-websites/cards/overview/summary) and [b](https://developer.twitter.com/en/docs/twitter-for-websites/cards/overview/summary-card-with-large-image).
|
||||||
|
- Add max length for strings from meta tags.
|
||||||
|
|
||||||
|
## .
|
||||||
|
|
||||||
|
![jan](https://img.insrt.uk/xexu7/PuliLOWu82.png/raw)
|
64
january/flake.lock
Normal file
64
january/flake.lock
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"flake-utils": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1631561581,
|
||||||
|
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"naersk": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1631004250,
|
||||||
|
"narHash": "sha256-LGh0CjAZwh13AVkTi9w9lITEC7x6bwSQyFViOZ6HyNo=",
|
||||||
|
"owner": "nmattia",
|
||||||
|
"repo": "naersk",
|
||||||
|
"rev": "08afb3d1dbfe016108b72e05b02ba0f6ecb3c8e1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nmattia",
|
||||||
|
"repo": "naersk",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1631785487,
|
||||||
|
"narHash": "sha256-VSKEvOtaY/roDxEHFxXh6GguOqqWCJZ3E06fBdKu8+I=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "79c444b5bdeaba142d128afddee14c89ecf2a968",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"naersk": "naersk",
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
18
january/gitlab-ci.yml
Normal file
18
january/gitlab-ci.yml
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
stages:
|
||||||
|
- build
|
||||||
|
|
||||||
|
# Rocket does not currently compile on stable Rust.
|
||||||
|
# Once it does, we can uncomment this, and instead
|
||||||
|
# put `allow-failure: true` on the nightly build.
|
||||||
|
#
|
||||||
|
# rust-latest:
|
||||||
|
# stage: build
|
||||||
|
# image: rust:latest
|
||||||
|
# script:
|
||||||
|
# - cargo build --verbose
|
||||||
|
|
||||||
|
rust-nightly:
|
||||||
|
stage: build
|
||||||
|
image: rustlang/rust:nightly
|
||||||
|
script:
|
||||||
|
- cargo build --verbose
|
31
january/src/main.rs
Normal file
31
january/src/main.rs
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
#[macro_use]
|
||||||
|
extern crate lazy_static;
|
||||||
|
|
||||||
|
use actix_web::middleware::Logger;
|
||||||
|
use actix_web::{web, App, HttpServer};
|
||||||
|
use log::info;
|
||||||
|
use util::variables::HOST;
|
||||||
|
|
||||||
|
pub mod routes;
|
||||||
|
pub mod structs;
|
||||||
|
pub mod util;
|
||||||
|
|
||||||
|
#[actix_web::main]
|
||||||
|
async fn main() -> std::io::Result<()> {
|
||||||
|
dotenv::dotenv().ok();
|
||||||
|
|
||||||
|
env_logger::init_from_env(env_logger::Env::default().filter_or("RUST_LOG", "info"));
|
||||||
|
|
||||||
|
info!("Starting January server.");
|
||||||
|
|
||||||
|
HttpServer::new(|| {
|
||||||
|
App::new()
|
||||||
|
.wrap(Logger::default())
|
||||||
|
.route("/", web::get().to(routes::info::get))
|
||||||
|
.route("/embed", web::get().to(routes::embed::get))
|
||||||
|
.route("/proxy", web::get().to(routes::proxy::get))
|
||||||
|
})
|
||||||
|
.bind(HOST.clone())?
|
||||||
|
.run()
|
||||||
|
.await
|
||||||
|
}
|
98
january/src/routes/embed.rs
Normal file
98
january/src/routes/embed.rs
Normal file
|
@ -0,0 +1,98 @@
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use actix_web::{
|
||||||
|
web::{self, Query},
|
||||||
|
Responder,
|
||||||
|
};
|
||||||
|
use regex::Regex;
|
||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
use crate::structs::metadata::Metadata;
|
||||||
|
use crate::structs::{embed::Embed, media::Video};
|
||||||
|
use crate::util::request::fetch;
|
||||||
|
use crate::{
|
||||||
|
structs::media::{Image, ImageSize},
|
||||||
|
util::{request::consume_size, result::Error},
|
||||||
|
};
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
static ref CACHE: moka::future::Cache<String, Result<Embed, Error>> =
|
||||||
|
moka::future::Cache::builder()
|
||||||
|
.max_capacity(1_000)
|
||||||
|
.time_to_live(Duration::from_secs(60))
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct Parameters {
|
||||||
|
url: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn embed(mut url: String) -> Result<Embed, Error> {
|
||||||
|
// Twitter is a piece of shit and does not
|
||||||
|
// provide metadata in an easily consumable format.
|
||||||
|
//
|
||||||
|
// So... we just redirect everything to Nitter.
|
||||||
|
//
|
||||||
|
// Fun bonus: Twitter denied our developer application
|
||||||
|
// which would've been the only way to pull properly
|
||||||
|
// formatted Tweet data out and what's worse is that this
|
||||||
|
// also prevents us adding those "connections" that other
|
||||||
|
// platforms have.
|
||||||
|
//
|
||||||
|
// In any case, because Twitter, they
|
||||||
|
// do not provide OpenGraph data.
|
||||||
|
lazy_static! {
|
||||||
|
static ref RE_TWITTER: Regex =
|
||||||
|
Regex::new("^(?:https?://)?(?:www\\.)?twitter\\.com").unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
if RE_TWITTER.is_match(&url) {
|
||||||
|
url = RE_TWITTER.replace(&url, "https://nitter.net").into();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch URL
|
||||||
|
let (resp, mime) = fetch(&url).await?;
|
||||||
|
|
||||||
|
// Match appropriate MIME type to process
|
||||||
|
match (mime.type_(), mime.subtype()) {
|
||||||
|
(_, mime::HTML) => {
|
||||||
|
let mut metadata = Metadata::from(resp, url).await?;
|
||||||
|
metadata.resolve_external().await;
|
||||||
|
|
||||||
|
if metadata.is_none() {
|
||||||
|
return Ok(Embed::None);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Embed::Website(metadata))
|
||||||
|
}
|
||||||
|
(mime::IMAGE, _) => {
|
||||||
|
if let Ok((width, height)) = consume_size(resp, mime).await {
|
||||||
|
Ok(Embed::Image(Image {
|
||||||
|
url,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
size: ImageSize::Large,
|
||||||
|
}))
|
||||||
|
} else {
|
||||||
|
Ok(Embed::None)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(mime::VIDEO, _) => {
|
||||||
|
if let Ok((width, height)) = consume_size(resp, mime).await {
|
||||||
|
Ok(Embed::Video(Video { url, width, height }))
|
||||||
|
} else {
|
||||||
|
Ok(Embed::None)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => Ok(Embed::None),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get(Query(info): Query<Parameters>) -> Result<impl Responder, Error> {
|
||||||
|
let url = info.url;
|
||||||
|
let result = CACHE
|
||||||
|
.get_with(url.clone(), async { embed(url).await })
|
||||||
|
.await;
|
||||||
|
result.map(web::Json)
|
||||||
|
}
|
14
january/src/routes/info.rs
Normal file
14
january/src/routes/info.rs
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
use actix_web::web;
|
||||||
|
use actix_web::Responder;
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize)]
|
||||||
|
pub struct Info {
|
||||||
|
january: &'static str,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get() -> impl Responder {
|
||||||
|
web::Json(Info {
|
||||||
|
january: env!("CARGO_PKG_VERSION"),
|
||||||
|
})
|
||||||
|
}
|
3
january/src/routes/mod.rs
Normal file
3
january/src/routes/mod.rs
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
pub mod embed;
|
||||||
|
pub mod info;
|
||||||
|
pub mod proxy;
|
43
january/src/routes/proxy.rs
Normal file
43
january/src/routes/proxy.rs
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use actix_web::web::Bytes;
|
||||||
|
use actix_web::{web::Query, HttpResponse, Responder};
|
||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
use crate::util::request::{fetch, get_bytes};
|
||||||
|
use crate::util::result::Error;
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
static ref CACHE: moka::future::Cache<String, Result<Bytes, Error>> =
|
||||||
|
moka::future::Cache::builder()
|
||||||
|
.weigher(|_key, value: &Result<Bytes, Error>| {
|
||||||
|
value.as_ref().map(|bytes| bytes.len() as u32).unwrap_or(1)
|
||||||
|
})
|
||||||
|
.max_capacity(1024 * 1024 * 1024)
|
||||||
|
.time_to_live(Duration::from_secs(60))
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct Parameters {
|
||||||
|
url: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn proxy(url: String) -> Result<Bytes, Error> {
|
||||||
|
let (mut resp, mime) = fetch(&url).await?;
|
||||||
|
|
||||||
|
if matches!(mime.type_(), mime::IMAGE | mime::VIDEO) {
|
||||||
|
let bytes = get_bytes(&mut resp).await?;
|
||||||
|
Ok(bytes)
|
||||||
|
} else {
|
||||||
|
Err(Error::NotAllowedToProxy)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get(Query(info): Query<Parameters>) -> Result<impl Responder, Error> {
|
||||||
|
let url = info.url;
|
||||||
|
let result = CACHE
|
||||||
|
.get_with(url.clone(), async { proxy(url).await })
|
||||||
|
.await;
|
||||||
|
result.map(|b| HttpResponse::Ok().body(b))
|
||||||
|
}
|
16
january/src/structs/embed.rs
Normal file
16
january/src/structs/embed.rs
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
use super::{
|
||||||
|
media::{Image, Video},
|
||||||
|
metadata::Metadata,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Serialize)]
|
||||||
|
#[serde(tag = "type")]
|
||||||
|
#[allow(clippy::large_enum_variant)]
|
||||||
|
pub enum Embed {
|
||||||
|
Website(Metadata),
|
||||||
|
Image(Image),
|
||||||
|
Video(Video),
|
||||||
|
None,
|
||||||
|
}
|
25
january/src/structs/media.rs
Normal file
25
january/src/structs/media.rs
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
use serde::Serialize;
|
||||||
|
use validator::Validate;
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Serialize)]
|
||||||
|
pub enum ImageSize {
|
||||||
|
Large,
|
||||||
|
Preview,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Validate, Debug, Serialize)]
|
||||||
|
pub struct Image {
|
||||||
|
#[validate(length(min = 1, max = 512))]
|
||||||
|
pub url: String,
|
||||||
|
pub width: isize,
|
||||||
|
pub height: isize,
|
||||||
|
pub size: ImageSize,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Validate, Debug, Serialize)]
|
||||||
|
pub struct Video {
|
||||||
|
#[validate(length(min = 1, max = 512))]
|
||||||
|
pub url: String,
|
||||||
|
pub width: isize,
|
||||||
|
pub height: isize,
|
||||||
|
}
|
320
january/src/structs/metadata.rs
Normal file
320
january/src/structs/metadata.rs
Normal file
|
@ -0,0 +1,320 @@
|
||||||
|
use regex::Regex;
|
||||||
|
use reqwest::Response;
|
||||||
|
use scraper::Selector;
|
||||||
|
use serde::Serialize;
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use validator::Validate;
|
||||||
|
|
||||||
|
use crate::{
|
||||||
|
structs::special::{BandcampType, LightspeedType, TwitchType},
|
||||||
|
util::{
|
||||||
|
request::{consume_fragment, consume_size, fetch},
|
||||||
|
result::Error,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
use super::{
|
||||||
|
media::{Image, ImageSize, Video},
|
||||||
|
special::Special,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Clone, Validate, Debug, Serialize)]
|
||||||
|
pub struct Metadata {
|
||||||
|
#[validate(length(min = 1, max = 256))]
|
||||||
|
url: String,
|
||||||
|
original_url: String,
|
||||||
|
special: Option<Special>,
|
||||||
|
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
#[validate(length(min = 1, max = 100))]
|
||||||
|
title: Option<String>,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
#[validate(length(min = 0, max = 2000))]
|
||||||
|
description: Option<String>,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
#[validate]
|
||||||
|
image: Option<Image>,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
#[validate]
|
||||||
|
video: Option<Video>,
|
||||||
|
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
opengraph_type: Option<String>,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
#[validate(length(min = 1, max = 100))]
|
||||||
|
site_name: Option<String>,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
#[validate(length(min = 1, max = 256))]
|
||||||
|
icon_url: Option<String>,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
#[validate(length(min = 1, max = 64))]
|
||||||
|
colour: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Metadata {
|
||||||
|
pub async fn from(resp: Response, original_url: String) -> Result<Metadata, Error> {
|
||||||
|
let fragment = consume_fragment(resp).await?;
|
||||||
|
|
||||||
|
let meta_selector = Selector::parse("meta").map_err(|_| Error::MetaSelectionFailed)?;
|
||||||
|
let mut meta = HashMap::new();
|
||||||
|
for el in fragment.select(&meta_selector) {
|
||||||
|
let node = el.value();
|
||||||
|
|
||||||
|
if let (Some(property), Some(content)) = (
|
||||||
|
node.attr("property").or_else(|| node.attr("name")),
|
||||||
|
node.attr("content"),
|
||||||
|
) {
|
||||||
|
meta.insert(property.to_string(), content.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let link_selector = Selector::parse("link").map_err(|_| Error::MetaSelectionFailed)?;
|
||||||
|
let mut link = HashMap::new();
|
||||||
|
for el in fragment.select(&link_selector) {
|
||||||
|
let node = el.value();
|
||||||
|
|
||||||
|
if let (Some(property), Some(content)) = (node.attr("rel"), node.attr("href")) {
|
||||||
|
link.insert(property.to_string(), content.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let metadata = Metadata {
|
||||||
|
title: meta
|
||||||
|
.remove("og:title")
|
||||||
|
.or_else(|| meta.remove("twitter:title"))
|
||||||
|
.or_else(|| meta.remove("title")),
|
||||||
|
description: meta
|
||||||
|
.remove("og:description")
|
||||||
|
.or_else(|| meta.remove("twitter:description"))
|
||||||
|
.or_else(|| meta.remove("description")),
|
||||||
|
image: meta
|
||||||
|
.remove("og:image")
|
||||||
|
.or_else(|| meta.remove("og:image:secure_url"))
|
||||||
|
.or_else(|| meta.remove("twitter:image"))
|
||||||
|
.or_else(|| meta.remove("twitter:image:src"))
|
||||||
|
.map(|mut url| {
|
||||||
|
// If relative URL, prepend root URL. Also if root URL ends with a slash, remove it.
|
||||||
|
if let Some(ch) = url.chars().next() {
|
||||||
|
if ch == '/' {
|
||||||
|
url = format!("{}{}", &original_url.trim_end_matches('/'), &url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut size = ImageSize::Preview;
|
||||||
|
if let Some(card) = meta.remove("twitter:card") {
|
||||||
|
if &card == "summary_large_image" {
|
||||||
|
size = ImageSize::Large;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Image {
|
||||||
|
url,
|
||||||
|
width: meta
|
||||||
|
.remove("og:image:width")
|
||||||
|
.unwrap_or_else(|| "0".to_string())
|
||||||
|
.parse()
|
||||||
|
.unwrap_or(0),
|
||||||
|
height: meta
|
||||||
|
.remove("og:image:height")
|
||||||
|
.unwrap_or_else(|| "0".to_string())
|
||||||
|
.parse()
|
||||||
|
.unwrap_or(0),
|
||||||
|
size,
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
video: meta
|
||||||
|
.remove("og:video")
|
||||||
|
.or_else(|| meta.remove("og:video:url"))
|
||||||
|
.or_else(|| meta.remove("og:video:secure_url"))
|
||||||
|
.map(|mut url| {
|
||||||
|
// If relative URL, prepend root URL. Also if root URL ends with a slash, remove it.
|
||||||
|
if let Some(ch) = url.chars().next() {
|
||||||
|
if ch == '/' {
|
||||||
|
url = format!("{}{}", &original_url.trim_end_matches('/'), &url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Video {
|
||||||
|
url,
|
||||||
|
width: meta
|
||||||
|
.remove("og:video:width")
|
||||||
|
.unwrap_or_else(|| "0".to_string())
|
||||||
|
.parse()
|
||||||
|
.unwrap_or(0),
|
||||||
|
height: meta
|
||||||
|
.remove("og:video:height")
|
||||||
|
.unwrap_or_else(|| "0".to_string())
|
||||||
|
.parse()
|
||||||
|
.unwrap_or(0),
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
icon_url: link
|
||||||
|
.remove("apple-touch-icon")
|
||||||
|
.or_else(|| link.remove("icon"))
|
||||||
|
.map(|mut v| {
|
||||||
|
// If relative URL, prepend root URL.
|
||||||
|
if let Some(ch) = v.chars().next() {
|
||||||
|
if ch == '/' {
|
||||||
|
v = format!("{}{}", &original_url.trim_end_matches('/'), v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
v
|
||||||
|
}),
|
||||||
|
colour: meta.remove("theme-color"),
|
||||||
|
opengraph_type: meta.remove("og:type"),
|
||||||
|
site_name: meta.remove("og:site_name"),
|
||||||
|
url: meta
|
||||||
|
.remove("og:url")
|
||||||
|
.unwrap_or_else(|| original_url.clone()),
|
||||||
|
original_url,
|
||||||
|
special: None,
|
||||||
|
};
|
||||||
|
|
||||||
|
metadata
|
||||||
|
.validate()
|
||||||
|
.map_err(|error| Error::FailedValidation { error })?;
|
||||||
|
|
||||||
|
Ok(metadata)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn resolve_image(&mut self) -> Result<(), Error> {
|
||||||
|
if let Some(image) = &mut self.image {
|
||||||
|
// If image WxH was already provided by OpenGraph,
|
||||||
|
// just return that instead.
|
||||||
|
if image.width != 0 && image.height != 0 {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let (resp, mime) = fetch(&image.url).await?;
|
||||||
|
let (width, height) = consume_size(resp, mime).await?;
|
||||||
|
|
||||||
|
image.width = width;
|
||||||
|
image.height = height;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn generate_special(&mut self) -> Result<Special, Error> {
|
||||||
|
lazy_static! {
|
||||||
|
// ! FIXME: use youtube-dl to fetch metadata
|
||||||
|
static ref RE_YOUTUBE: Regex = Regex::new("^(?:(?:https?:)?//)?(?:(?:www|m)\\.)?(?:(?:youtube\\.com|youtu.be))(?:/(?:[\\w\\-]+\\?v=|embed/|v/)?)([\\w\\-]+)(?:\\S+)?$").unwrap();
|
||||||
|
|
||||||
|
static ref RE_LIGHTSPEED: Regex = Regex::new("^(?:https?://)?(?:[\\w]+\\.)?lightspeed\\.tv/([a-z0-9_]{4,25})").unwrap();
|
||||||
|
|
||||||
|
// ! FIXME: use Twitch API to fetch metadata
|
||||||
|
static ref RE_TWITCH: Regex = Regex::new("^(?:https?://)?(?:www\\.|go\\.)?twitch\\.tv/([a-z0-9_]+)($|\\?)").unwrap();
|
||||||
|
static ref RE_TWITCH_VOD: Regex = Regex::new("^(?:https?://)?(?:www\\.|go\\.)?twitch\\.tv/videos/([0-9]+)($|\\?)").unwrap();
|
||||||
|
static ref RE_TWITCH_CLIP: Regex = Regex::new("^(?:https?://)?(?:www\\.|go\\.)?twitch\\.tv/(?:[a-z0-9_]+)/clip/([A-z0-9_-]+)($|\\?)").unwrap();
|
||||||
|
|
||||||
|
static ref RE_SPOTIFY: Regex = Regex::new("^(?:https?://)?open.spotify.com/(track|user|artist|album|playlist)/([A-z0-9]+)").unwrap();
|
||||||
|
static ref RE_SOUNDCLOUD: Regex = Regex::new("^(?:https?://)?soundcloud.com/([a-zA-Z0-9-]+)/([A-z0-9-]+)").unwrap();
|
||||||
|
static ref RE_BANDCAMP: Regex = Regex::new("^(?:https?://)?(?:[A-z0-9_-]+).bandcamp.com/(track|album)/([A-z0-9_-]+)").unwrap();
|
||||||
|
|
||||||
|
static ref RE_STREAMABLE: Regex = Regex::new("^(?:https?://)?(?:www\\.)?streamable\\.com/([\\w\\d-]+)").unwrap();
|
||||||
|
|
||||||
|
static ref RE_GIF: Regex = Regex::new("^(?:https?://)?(www\\.)?(gifbox\\.me/view|yiffbox\\.me/view|tenor\\.com/view|giphy\\.com/gifs|gfycat\\.com|redgifs\\.com/watch)/[\\w\\d-]+").unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(captures) = RE_STREAMABLE.captures_iter(&self.url).next() {
|
||||||
|
return Ok(Special::Streamable {
|
||||||
|
id: captures[1].to_string(),
|
||||||
|
});
|
||||||
|
} else if let Some(captures) = RE_YOUTUBE.captures_iter(&self.url).next() {
|
||||||
|
lazy_static! {
|
||||||
|
static ref RE_TIMESTAMP: Regex =
|
||||||
|
Regex::new("(?:\\?|&)(?:t|start)=([\\w]+)").unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(video) = &self.video {
|
||||||
|
if let Some(timestamp_captures) = RE_TIMESTAMP.captures_iter(&video.url).next() {
|
||||||
|
return Ok(Special::YouTube {
|
||||||
|
id: captures[1].to_string(),
|
||||||
|
timestamp: Some(timestamp_captures[1].to_string()),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(Special::YouTube {
|
||||||
|
id: captures[1].to_string(),
|
||||||
|
timestamp: None,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if let Some(captures) = RE_LIGHTSPEED.captures_iter(&self.original_url).next() {
|
||||||
|
return Ok(Special::Lightspeed {
|
||||||
|
id: captures[1].to_string(),
|
||||||
|
content_type: LightspeedType::Channel,
|
||||||
|
});
|
||||||
|
} else if let Some(captures) = RE_TWITCH.captures_iter(&self.original_url).next() {
|
||||||
|
return Ok(Special::Twitch {
|
||||||
|
id: captures[1].to_string(),
|
||||||
|
content_type: TwitchType::Channel,
|
||||||
|
});
|
||||||
|
} else if let Some(captures) = RE_TWITCH_VOD.captures_iter(&self.original_url).next() {
|
||||||
|
return Ok(Special::Twitch {
|
||||||
|
id: captures[1].to_string(),
|
||||||
|
content_type: TwitchType::Video,
|
||||||
|
});
|
||||||
|
} else if let Some(captures) = RE_TWITCH_CLIP.captures_iter(&self.original_url).next() {
|
||||||
|
return Ok(Special::Twitch {
|
||||||
|
id: captures[1].to_string(),
|
||||||
|
content_type: TwitchType::Clip,
|
||||||
|
});
|
||||||
|
} else if let Some(captures) = RE_SPOTIFY.captures_iter(&self.original_url).next() {
|
||||||
|
return Ok(Special::Spotify {
|
||||||
|
content_type: captures[1].to_string(),
|
||||||
|
id: captures[2].to_string(),
|
||||||
|
});
|
||||||
|
} else if RE_SOUNDCLOUD.is_match(&self.original_url) {
|
||||||
|
return Ok(Special::Soundcloud);
|
||||||
|
} else if RE_BANDCAMP.is_match(&self.original_url) {
|
||||||
|
lazy_static! {
|
||||||
|
static ref RE_TRACK: Regex = Regex::new("track=(\\d+)").unwrap();
|
||||||
|
static ref RE_ALBUM: Regex = Regex::new("album=(\\d+)").unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(video) = &self.video {
|
||||||
|
if let Some(captures) = RE_TRACK.captures_iter(&video.url).next() {
|
||||||
|
return Ok(Special::Bandcamp {
|
||||||
|
content_type: BandcampType::Track,
|
||||||
|
id: captures[1].to_string(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(captures) = RE_ALBUM.captures_iter(&video.url).next() {
|
||||||
|
return Ok(Special::Bandcamp {
|
||||||
|
content_type: BandcampType::Album,
|
||||||
|
id: captures[1].to_string(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if RE_GIF.is_match(&self.original_url) {
|
||||||
|
return Ok(Special::GIF);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Special::None)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn resolve_external(&mut self) {
|
||||||
|
if let Ok(special) = self.generate_special().await {
|
||||||
|
match &special {
|
||||||
|
Special::YouTube { .. } => self.colour = Some("#FF424F".to_string()),
|
||||||
|
Special::Twitch { .. } => self.colour = Some("#7B68EE".to_string()),
|
||||||
|
Special::Lightspeed { .. } => self.colour = Some("#7445D9".to_string()),
|
||||||
|
Special::Spotify { .. } => self.colour = Some("#1ABC9C".to_string()),
|
||||||
|
Special::Soundcloud { .. } => self.colour = Some("#FF7F50".to_string()),
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
|
||||||
|
self.special = Some(special);
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.resolve_image().await.is_err() {
|
||||||
|
self.image = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_none(&self) -> bool {
|
||||||
|
self.title.is_none()
|
||||||
|
&& self.description.is_none()
|
||||||
|
&& self.image.is_none()
|
||||||
|
&& self.video.is_none()
|
||||||
|
}
|
||||||
|
}
|
4
january/src/structs/mod.rs
Normal file
4
january/src/structs/mod.rs
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
pub mod embed;
|
||||||
|
pub mod media;
|
||||||
|
pub mod metadata;
|
||||||
|
pub mod special;
|
52
january/src/structs/special.rs
Normal file
52
january/src/structs/special.rs
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Serialize)]
|
||||||
|
pub enum TwitchType {
|
||||||
|
Channel,
|
||||||
|
Video,
|
||||||
|
Clip,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Serialize)]
|
||||||
|
pub enum LightspeedType {
|
||||||
|
Channel,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Serialize)]
|
||||||
|
pub enum BandcampType {
|
||||||
|
Album,
|
||||||
|
Track,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Serialize)]
|
||||||
|
#[serde(tag = "type")]
|
||||||
|
pub enum Special {
|
||||||
|
None,
|
||||||
|
GIF,
|
||||||
|
YouTube {
|
||||||
|
id: String,
|
||||||
|
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
timestamp: Option<String>,
|
||||||
|
},
|
||||||
|
Lightspeed {
|
||||||
|
content_type: LightspeedType,
|
||||||
|
id: String,
|
||||||
|
},
|
||||||
|
Twitch {
|
||||||
|
content_type: TwitchType,
|
||||||
|
id: String,
|
||||||
|
},
|
||||||
|
Spotify {
|
||||||
|
content_type: String,
|
||||||
|
id: String,
|
||||||
|
},
|
||||||
|
Soundcloud,
|
||||||
|
Bandcamp {
|
||||||
|
content_type: BandcampType,
|
||||||
|
id: String,
|
||||||
|
},
|
||||||
|
Streamable {
|
||||||
|
id: String,
|
||||||
|
},
|
||||||
|
}
|
3
january/src/util/mod.rs
Normal file
3
january/src/util/mod.rs
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
pub mod request;
|
||||||
|
pub mod result;
|
||||||
|
pub mod variables;
|
123
january/src/util/request.rs
Normal file
123
january/src/util/request.rs
Normal file
|
@ -0,0 +1,123 @@
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use actix_web::web::Bytes;
|
||||||
|
use encoding_rs::{Encoding, UTF_8_INIT};
|
||||||
|
use mime::Mime;
|
||||||
|
use reqwest::{
|
||||||
|
header::{self, CONTENT_TYPE},
|
||||||
|
Client, Response,
|
||||||
|
};
|
||||||
|
use scraper::Html;
|
||||||
|
use std::io::Write;
|
||||||
|
use tempfile::NamedTempFile;
|
||||||
|
|
||||||
|
use super::{result::Error, variables::MAX_BYTES};
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
static ref CLIENT: Client = reqwest::Client::builder()
|
||||||
|
.user_agent("Mozilla/5.0 (compatible; January/1.0; +https://github.com/revoltchat/january)")
|
||||||
|
.timeout(Duration::from_secs(15))
|
||||||
|
.connect_timeout(Duration::from_secs(5))
|
||||||
|
.build()
|
||||||
|
.expect("reqwest Client");
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn fetch(url: &str) -> Result<(Response, Mime), Error> {
|
||||||
|
let resp = CLIENT
|
||||||
|
.get(url)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|_| Error::ReqwestFailed)?;
|
||||||
|
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
return Err(Error::RequestFailed);
|
||||||
|
}
|
||||||
|
|
||||||
|
let content_type = resp
|
||||||
|
.headers()
|
||||||
|
.get(CONTENT_TYPE)
|
||||||
|
.ok_or(Error::MissingContentType)?
|
||||||
|
.to_str()
|
||||||
|
.map_err(|_| Error::ConversionFailed)?;
|
||||||
|
|
||||||
|
let mime: mime::Mime = content_type
|
||||||
|
.parse()
|
||||||
|
.map_err(|_| Error::FailedToParseContentType)?;
|
||||||
|
|
||||||
|
Ok((resp, mime))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_bytes(resp: &mut Response) -> Result<Bytes, Error> {
|
||||||
|
let content_length = resp.content_length().unwrap_or(0) as usize;
|
||||||
|
if content_length > *MAX_BYTES {
|
||||||
|
return Err(Error::ExceedsMaxBytes);
|
||||||
|
}
|
||||||
|
let mut bytes = Vec::with_capacity(content_length);
|
||||||
|
while let Some(chunk) = resp
|
||||||
|
.chunk()
|
||||||
|
.await
|
||||||
|
.map_err(|_| Error::FailedToConsumeBytes)?
|
||||||
|
{
|
||||||
|
if bytes.len() + chunk.len() > *MAX_BYTES {
|
||||||
|
return Err(Error::ExceedsMaxBytes);
|
||||||
|
}
|
||||||
|
bytes.extend(chunk)
|
||||||
|
}
|
||||||
|
Ok(Bytes::from(bytes))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn consume_fragment(mut resp: Response) -> Result<Html, Error> {
|
||||||
|
let bytes = get_bytes(&mut resp).await?;
|
||||||
|
|
||||||
|
let content_type = resp
|
||||||
|
.headers()
|
||||||
|
.get(header::CONTENT_TYPE)
|
||||||
|
.and_then(|value| value.to_str().ok())
|
||||||
|
.and_then(|value| value.parse::<Mime>().ok());
|
||||||
|
let encoding_name = content_type
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|mime| mime.get_param("charset").map(|charset| charset.as_str()))
|
||||||
|
.unwrap_or("utf-8");
|
||||||
|
let encoding = Encoding::for_label(encoding_name.as_bytes()).unwrap_or(&UTF_8_INIT);
|
||||||
|
|
||||||
|
let (text, _, _) = encoding.decode(&bytes);
|
||||||
|
Ok(Html::parse_document(&text))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn determine_video_size(path: &std::path::Path) -> Result<(isize, isize), Error> {
|
||||||
|
let data = ffprobe::ffprobe(path).map_err(|_| Error::ProbeError)?;
|
||||||
|
|
||||||
|
// Take the first valid stream.
|
||||||
|
for stream in data.streams {
|
||||||
|
if let (Some(w), Some(h)) = (stream.width, stream.height) {
|
||||||
|
if let (Ok(w), Ok(h)) = (w.try_into(), h.try_into()) {
|
||||||
|
return Ok((w, h));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(Error::ProbeError)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn consume_size(mut resp: Response, mime: Mime) -> Result<(isize, isize), Error> {
|
||||||
|
let bytes = get_bytes(&mut resp).await?;
|
||||||
|
|
||||||
|
match mime.type_() {
|
||||||
|
mime::IMAGE => {
|
||||||
|
if let Ok(size) = imagesize::blob_size(&bytes) {
|
||||||
|
Ok((size.width as isize, size.height as isize))
|
||||||
|
} else {
|
||||||
|
Err(Error::CouldNotDetermineImageSize)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mime::VIDEO => {
|
||||||
|
let mut tmp = NamedTempFile::new().map_err(|_| Error::CouldNotDetermineVideoSize)?;
|
||||||
|
|
||||||
|
tmp.write_all(&bytes)
|
||||||
|
.map_err(|_| Error::CouldNotDetermineVideoSize)?;
|
||||||
|
|
||||||
|
determine_video_size(tmp.path())
|
||||||
|
}
|
||||||
|
_ => unreachable!(),
|
||||||
|
}
|
||||||
|
}
|
65
january/src/util/result.rs
Normal file
65
january/src/util/result.rs
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
use actix_web::http::StatusCode;
|
||||||
|
use actix_web::{HttpResponse, ResponseError};
|
||||||
|
use serde::Serialize;
|
||||||
|
use serde_json;
|
||||||
|
use std::fmt::Display;
|
||||||
|
use validator::ValidationErrors;
|
||||||
|
|
||||||
|
#[derive(Clone, Serialize, Debug)]
|
||||||
|
#[serde(tag = "type")]
|
||||||
|
pub enum Error {
|
||||||
|
CouldNotDetermineImageSize,
|
||||||
|
CouldNotDetermineVideoSize,
|
||||||
|
FailedToParseContentType,
|
||||||
|
FailedToConsumeBytes,
|
||||||
|
FailedToConsumeText,
|
||||||
|
MetaSelectionFailed,
|
||||||
|
MissingContentType,
|
||||||
|
NotAllowedToProxy,
|
||||||
|
ConversionFailed,
|
||||||
|
ExceedsMaxBytes,
|
||||||
|
ReqwestFailed,
|
||||||
|
RequestFailed,
|
||||||
|
ProbeError,
|
||||||
|
LabelMe,
|
||||||
|
FailedValidation {
|
||||||
|
#[serde(skip_serializing, skip_deserializing)]
|
||||||
|
error: ValidationErrors,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Display for Error {
|
||||||
|
fn fmt(&self, _f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
todo!()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ResponseError for Error {
|
||||||
|
fn status_code(&self) -> StatusCode {
|
||||||
|
match *self {
|
||||||
|
Error::CouldNotDetermineImageSize => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::CouldNotDetermineVideoSize => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::FailedToParseContentType => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::FailedToConsumeBytes => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::FailedToConsumeText => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::MetaSelectionFailed => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::MissingContentType => StatusCode::BAD_REQUEST,
|
||||||
|
Error::NotAllowedToProxy => StatusCode::BAD_REQUEST,
|
||||||
|
Error::ConversionFailed => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::ExceedsMaxBytes => StatusCode::BAD_REQUEST,
|
||||||
|
Error::ReqwestFailed => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::RequestFailed => StatusCode::BAD_REQUEST,
|
||||||
|
Error::ProbeError => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::LabelMe => StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Error::FailedValidation { .. } => StatusCode::BAD_REQUEST,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn error_response(&self) -> HttpResponse {
|
||||||
|
let body = serde_json::to_string(&self).unwrap();
|
||||||
|
|
||||||
|
HttpResponse::build(self.status_code())
|
||||||
|
.content_type("application/json")
|
||||||
|
.body(body)
|
||||||
|
}
|
||||||
|
}
|
9
january/src/util/variables.rs
Normal file
9
january/src/util/variables.rs
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
use std::env;
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
// Application Settings
|
||||||
|
pub static ref HOST: String =
|
||||||
|
env::var("JANUARY_HOST").expect("Missing JANUARY_HOST environment variable.");
|
||||||
|
pub static ref MAX_BYTES: usize =
|
||||||
|
env::var("JANUARY_MAX_BYTES").unwrap_or("104857600".to_string()).parse().expect("Invalid JANUARY_MAX_BYTES environment variable.");
|
||||||
|
}
|
|
@ -114,7 +114,7 @@ app.get("/avatars/:v", async function (req, res) {
|
||||||
var format = "mp3";
|
var format = "mp3";
|
||||||
}
|
}
|
||||||
|
|
||||||
const url = `https://tube.kuylar.dev/proxy/media/${v}/${q}`;
|
const url = `https://tube-proxy.poketube.fun/proxy/media/${v}/${q}`;
|
||||||
|
|
||||||
res.redirect(url);
|
res.redirect(url);
|
||||||
});
|
});
|
||||||
|
|
|
@ -148,6 +148,7 @@ module.exports = function (app, config, renderTemplate) {
|
||||||
IsOldWindows,
|
IsOldWindows,
|
||||||
tab,
|
tab,
|
||||||
continuation,
|
continuation,
|
||||||
|
media_proxy_url: config.media_proxy,
|
||||||
results: "",
|
results: "",
|
||||||
q: query,
|
q: query,
|
||||||
summary: "",
|
summary: "",
|
||||||
|
@ -314,6 +315,7 @@ module.exports = function (app, config, renderTemplate) {
|
||||||
cinv,
|
cinv,
|
||||||
convert,
|
convert,
|
||||||
turntomins,
|
turntomins,
|
||||||
|
media_proxy_url: config.media_proxy,
|
||||||
dnoreplace,
|
dnoreplace,
|
||||||
continuation,
|
continuation,
|
||||||
wiki: "",
|
wiki: "",
|
||||||
|
|
|
@ -19,6 +19,7 @@ const {
|
||||||
} = require("../ptutils/libpt-coreutils.js");
|
} = require("../ptutils/libpt-coreutils.js");
|
||||||
const media_proxy = require("../libpoketube-video.js");
|
const media_proxy = require("../libpoketube-video.js");
|
||||||
const atmos = require("../../../pokeatmosurls.json");
|
const atmos = require("../../../pokeatmosurls.json");
|
||||||
|
const config = require("../../../config.json");
|
||||||
|
|
||||||
function linkify(text) {
|
function linkify(text) {
|
||||||
// regular expression to match URLs
|
// regular expression to match URLs
|
||||||
|
@ -26,7 +27,8 @@ function linkify(text) {
|
||||||
|
|
||||||
return text.replace(urlRegex, (url) => {
|
return text.replace(urlRegex, (url) => {
|
||||||
// wrap the URL in an <a> tag with the URL as the href attribute
|
// wrap the URL in an <a> tag with the URL as the href attribute
|
||||||
return `<a href="/api/redirect?u=${btoa(url
|
return `<a href="/api/redirect?u=${btoa(
|
||||||
|
url
|
||||||
.replace(/twitter\.com/g, "nitter.net")
|
.replace(/twitter\.com/g, "nitter.net")
|
||||||
.replace(/reddit\.com/g, "teddit.net")
|
.replace(/reddit\.com/g, "teddit.net")
|
||||||
.replace("https://youtube.com", "")
|
.replace("https://youtube.com", "")
|
||||||
|
@ -36,14 +38,13 @@ function linkify(text) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function channelurlfixer(text) {
|
function channelurlfixer(text) {
|
||||||
// Create a regular expression to match <a> tags with href containing "/channel/"
|
// Create a regular expression to match <a> tags with href containing "/channel/"
|
||||||
const regex = /<a\s+href="\/channel\/([^"]+)"/g;
|
const regex = /<a\s+href="\/channel\/([^"]+)"/g;
|
||||||
// Replace matching <a> tags with the modified href attribute
|
// Replace matching <a> tags with the modified href attribute
|
||||||
const updatedDescription = text.replace(regex, '<a href="/channel?id=$1"');
|
const updatedDescription = text.replace(regex, '<a href="/channel?id=$1"');
|
||||||
return updatedDescription;
|
return updatedDescription;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function endsWithYouTubeAutoGenerated(text) {
|
function endsWithYouTubeAutoGenerated(text) {
|
||||||
const target = " Auto-generated by YouTube. ";
|
const target = " Auto-generated by YouTube. ";
|
||||||
return text.endsWith(target);
|
return text.endsWith(target);
|
||||||
|
@ -177,14 +178,26 @@ module.exports = function (app, config, renderTemplate) {
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get("/watch", async (req, res) => {
|
app.get("/watch", async (req, res) => {
|
||||||
const { dm, region, hl, v, e, r, f, m, quality: q, a, universe } = req.query;
|
const {
|
||||||
|
dm,
|
||||||
|
region,
|
||||||
|
hl,
|
||||||
|
v,
|
||||||
|
e,
|
||||||
|
r,
|
||||||
|
f,
|
||||||
|
m,
|
||||||
|
quality: q,
|
||||||
|
a,
|
||||||
|
universe,
|
||||||
|
} = req.query;
|
||||||
|
|
||||||
if (!v) {
|
if (!v) {
|
||||||
return res.redirect("/");
|
return res.redirect("/");
|
||||||
}
|
}
|
||||||
|
|
||||||
var contentlang = hl || "en-US";
|
var contentlang = hl || "en-US";
|
||||||
var contentregion = region || "US";
|
var contentregion = region || "US";
|
||||||
|
|
||||||
const isVideoValid = await core.isvalidvideo(v);
|
const isVideoValid = await core.isvalidvideo(v);
|
||||||
if (!isVideoValid) {
|
if (!isVideoValid) {
|
||||||
|
@ -225,14 +238,21 @@ module.exports = function (app, config, renderTemplate) {
|
||||||
const reddit = extractInfo(REDDIT_REGEX);
|
const reddit = extractInfo(REDDIT_REGEX);
|
||||||
const instagram = extractInfo(INSTAGRAM_REGEX);
|
const instagram = extractInfo(INSTAGRAM_REGEX);
|
||||||
|
|
||||||
var vidurl = u.url
|
var vidurl = u.url;
|
||||||
|
var isvidious = u.isInvidiousURL;
|
||||||
|
|
||||||
if(inv_vid?.genre === "Music") {
|
if (inv_vid?.genre === "Music") {
|
||||||
var vidurl = u.losslessurl
|
var vidurl = u.losslessurl;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(req.useragent.source.includes("Pardus")){
|
if (inv_vid.author.endsWith(" - Topic")) {
|
||||||
var vidurl = "https://yt.sudovanilla.com"
|
var vidurl = "https://eu-proxy.poketube.fun";
|
||||||
|
var isvidious = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (req.useragent.source.includes("Pardus")) {
|
||||||
|
var vidurl = "https://yt.sudovanilla.com";
|
||||||
|
var isvidious = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
let badges = "";
|
let badges = "";
|
||||||
|
@ -258,6 +278,7 @@ module.exports = function (app, config, renderTemplate) {
|
||||||
if (uaos === "Windows XP" || uaos === "Windows Vista")
|
if (uaos === "Windows XP" || uaos === "Windows Vista")
|
||||||
res.redirect("/lite?v=" + req.query.v);
|
res.redirect("/lite?v=" + req.query.v);
|
||||||
|
|
||||||
|
if (req.query.from === "short") var shortsui = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
renderTemplate(res, req, "poketube.ejs", {
|
renderTemplate(res, req, "poketube.ejs", {
|
||||||
|
@ -268,8 +289,9 @@ module.exports = function (app, config, renderTemplate) {
|
||||||
IsOldWindows,
|
IsOldWindows,
|
||||||
channelurlfixer,
|
channelurlfixer,
|
||||||
support,
|
support,
|
||||||
|
shortsui,
|
||||||
u: vidurl,
|
u: vidurl,
|
||||||
isvidious: u.isInvidiousURL,
|
isvidious: isvidious,
|
||||||
video: json,
|
video: json,
|
||||||
date: k.Video.uploadDate,
|
date: k.Video.uploadDate,
|
||||||
e,
|
e,
|
||||||
|
@ -277,6 +299,7 @@ module.exports = function (app, config, renderTemplate) {
|
||||||
twitter,
|
twitter,
|
||||||
k,
|
k,
|
||||||
dm,
|
dm,
|
||||||
|
media_proxy_url: config.media_proxy,
|
||||||
instagram,
|
instagram,
|
||||||
useragent: req.useragent,
|
useragent: req.useragent,
|
||||||
verify,
|
verify,
|
||||||
|
@ -310,7 +333,7 @@ module.exports = function (app, config, renderTemplate) {
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
return res.redirect(`/watch?v=${req.query.v}&fx=1&err=${error}`);
|
return res.redirect(`/watch?v=${req.query.v}&fx=1&err=${error}`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -45,7 +45,7 @@ function toObject(arr) {
|
||||||
|
|
||||||
// Gets Invidious instances
|
// Gets Invidious instances
|
||||||
const invInstanceList = [
|
const invInstanceList = [
|
||||||
"https://video-proxy.poketube.fun"
|
"https://tube.kuylar.dev"
|
||||||
];
|
];
|
||||||
|
|
||||||
// Gets a random instance from the list
|
// Gets a random instance from the list
|
||||||
|
|
Loading…
Reference in a new issue