From c3167f674cf3a7fb4ee306d0da528c3e6792ccd0 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 7 Dec 2023 19:50:18 +0000
Subject: [PATCH 01/78] add new shorts ui!!

---
 html/poketube.ejs | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index f7258935..e5b650ad 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -416,6 +416,7 @@ text-shadow: 1px 1px #000,1px 1px 0.1px #000;!important;
 </style>
                                             		 	               <% } %>   
 
+
                                                                    
             <% if(IsOldWindows) { %>
               <style>
@@ -553,7 +554,44 @@ background-color: #0000;
     top: 0;
 }
 </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) { %>
+               
+               
              <style>
                :root {
                  --div-gradient: linear-gradient(to bottom right, #33078c, #7a4d3f) !important;
@@ -1478,7 +1516,7 @@ Recommended Videos
 </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('/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: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) { %> 
 

From 8896bed1f503ee7694764b9daceefa250b56c80d Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 7 Dec 2023 19:52:19 +0000
Subject: [PATCH 02/78] add new shorts ui!!

---
 src/libpoketube/init/pages-video.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libpoketube/init/pages-video.js b/src/libpoketube/init/pages-video.js
index d873201f..907af8bf 100644
--- a/src/libpoketube/init/pages-video.js
+++ b/src/libpoketube/init/pages-video.js
@@ -258,6 +258,7 @@ module.exports = function (app, config, renderTemplate) {
         if (uaos === "Windows XP" || uaos === "Windows Vista")
           res.redirect("/lite?v=" + req.query.v);
 
+         if (req.query.from === "short") var shortsui = true
          
         try {
           renderTemplate(res, req, "poketube.ejs", {
@@ -268,6 +269,7 @@ module.exports = function (app, config, renderTemplate) {
             IsOldWindows,
             channelurlfixer,
             support,
+            shortsui,
             u: vidurl,
             isvidious: u.isInvidiousURL,
             video: json,

From 6ffe5933250988ab48a62844ae0c648637b27241 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 15:34:30 +0000
Subject: [PATCH 03/78] add new url :3

---
 src/libpoketube/libpoketube-video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpoketube/libpoketube-video.js b/src/libpoketube/libpoketube-video.js
index 6785eca0..442159fc 100644
--- a/src/libpoketube/libpoketube-video.js
+++ b/src/libpoketube/libpoketube-video.js
@@ -45,7 +45,7 @@ function toObject(arr) {
 
 // Gets Invidious instances
 const invInstanceList = [
-  "https://video-proxy.poketube.fun"
+  "https://tube.kuylar.dev"
 ];
 
 // Gets a random instance from the list

From d9cf813ba4e48561818d225f433fe3ca38a388c1 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 17:40:12 +0000
Subject: [PATCH 04/78] lol

---
 src/libpoketube/libpoketube-video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpoketube/libpoketube-video.js b/src/libpoketube/libpoketube-video.js
index 442159fc..6785eca0 100644
--- a/src/libpoketube/libpoketube-video.js
+++ b/src/libpoketube/libpoketube-video.js
@@ -45,7 +45,7 @@ function toObject(arr) {
 
 // Gets Invidious instances
 const invInstanceList = [
-  "https://tube.kuylar.dev"
+  "https://video-proxy.poketube.fun"
 ];
 
 // Gets a random instance from the list

From 047be6d949faf050a3949402678cf283ffa268ce Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 17:49:53 +0000
Subject: [PATCH 05/78] add new url :3

---
 src/libpoketube/libpoketube-video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpoketube/libpoketube-video.js b/src/libpoketube/libpoketube-video.js
index 6785eca0..442159fc 100644
--- a/src/libpoketube/libpoketube-video.js
+++ b/src/libpoketube/libpoketube-video.js
@@ -45,7 +45,7 @@ function toObject(arr) {
 
 // Gets Invidious instances
 const invInstanceList = [
-  "https://video-proxy.poketube.fun"
+  "https://tube.kuylar.dev"
 ];
 
 // Gets a random instance from the list

From 05d1d2866f58e7a91879c9ff07910b8a6f76a6df Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 18:03:36 +0000
Subject: [PATCH 06/78] fix ambient mode

---
 html/poketube.ejs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index e5b650ad..c059a059 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1799,7 +1799,10 @@ const draw = () => {
 
 const drawLoop = () => {
   draw()
-  step = window.requestAnimationFrame(drawLoop)
+  
+ setTimeout(() => {
+    step = window.requestAnimationFrame(drawLoop);
+  }, 01);
 }
 
 const drawPause = () => {

From ea3f3ee6f2b26b1165f5597bd5f947005daeb488 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 18:07:09 +0000
Subject: [PATCH 07/78] lemme test this

---
 html/poketube.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index c059a059..4ef5f2f0 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1811,7 +1811,7 @@ const drawPause = () => {
 }
 
 const init = () => {
-  AMvideo.addEventListener("loadeddata", draw, false)
+  AMvideo.addEventListener("loadeddata", drawLoop, false)
   AMvideo.addEventListener("seeked", draw, false)
   AMvideo.addEventListener("play", drawLoop, false)
   AMvideo.addEventListener("pause", drawPause, false)

From 2ab6bb1c8945cf009291cbb4ec04609cc8694295 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 18:14:01 +0000
Subject: [PATCH 08/78] lemme see lol

---
 html/poketube.ejs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 4ef5f2f0..3745af41 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1813,8 +1813,11 @@ const drawPause = () => {
 const init = () => {
   AMvideo.addEventListener("loadeddata", drawLoop, false)
   AMvideo.addEventListener("seeked", draw, false)
-  AMvideo.addEventListener("play", drawLoop, false)
-  AMvideo.addEventListener("pause", drawPause, false)
+  AMvideo.addEventListener("play", () => {
+    // Start the draw loop with a target frame rate of 250 frames per second (1 / 0.004)
+    step = window.requestAnimationFrame(drawLoop);
+  }, false); 
+   AMvideo.addEventListener("pause", drawPause, false)
   AMvideo.addEventListener("ended", drawPause, false)
 }
 

From 02a13a932527894233bebf9cc75ebfcaf3bcd50c Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 18:19:28 +0000
Subject: [PATCH 09/78] gush

---
 html/poketube.ejs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 3745af41..5b83d414 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1797,6 +1797,20 @@ const draw = () => {
 }
 
 
+// Adjust the frame rate by changing the interval
+const frameRate = 4; // Set the desired frame rate in milliseconds
+
+const drawLoopWithInterval = () => {
+  const now = performance.now();
+  
+  if (!lastDraw || now - lastDraw >= frameRate) {
+    draw();
+    lastDraw = now;
+  }
+
+  step = window.requestAnimationFrame(drawLoopWithInterval);
+};
+
 const drawLoop = () => {
   draw()
   
@@ -1813,10 +1827,7 @@ const drawPause = () => {
 const init = () => {
   AMvideo.addEventListener("loadeddata", drawLoop, false)
   AMvideo.addEventListener("seeked", draw, false)
-  AMvideo.addEventListener("play", () => {
-    // Start the draw loop with a target frame rate of 250 frames per second (1 / 0.004)
-    step = window.requestAnimationFrame(drawLoop);
-  }, false); 
+  AMvideo.addEventListener("play", drawLoopWithInterval, false);
    AMvideo.addEventListener("pause", drawPause, false)
   AMvideo.addEventListener("ended", drawPause, false)
 }

From 4f181670bb99c182212f872edc286025df48b91f Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 18:21:37 +0000
Subject: [PATCH 10/78] Update html/poketube.ejs

---
 html/poketube.ejs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 5b83d414..3e4f4891 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1776,6 +1776,7 @@ if (userID) {
 
 <script>
 let requestId;
+let lastDraw;
 
 const loopStart = () => {
   requestId = window.requestAnimationFrame(loopStart)
@@ -1846,7 +1847,7 @@ window.addEventListener("unload", cleanup)
 <style>
 .video-player-container, #video {
   position: relative;
-  z-index: 0;
+   z-index: 0;
 }
 .popup {z-index: 1}
 #ambient-canvas {

From fb935907e7f3fdec5122297c89b40c2210d3c360 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 18:27:57 +0000
Subject: [PATCH 11/78] test ignore

---
 html/poketube.ejs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 3e4f4891..aa470003 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1801,16 +1801,7 @@ const draw = () => {
 // Adjust the frame rate by changing the interval
 const frameRate = 4; // Set the desired frame rate in milliseconds
 
-const drawLoopWithInterval = () => {
-  const now = performance.now();
-  
-  if (!lastDraw || now - lastDraw >= frameRate) {
-    draw();
-    lastDraw = now;
-  }
-
-  step = window.requestAnimationFrame(drawLoopWithInterval);
-};
+ 
 
 const drawLoop = () => {
   draw()
@@ -1828,7 +1819,9 @@ const drawPause = () => {
 const init = () => {
   AMvideo.addEventListener("loadeddata", drawLoop, false)
   AMvideo.addEventListener("seeked", draw, false)
-  AMvideo.addEventListener("play", drawLoopWithInterval, false);
+   setInterval(function() {
+  AMvideo.addEventListener("play", drawLoop, false);
+   }, 50);
    AMvideo.addEventListener("pause", drawPause, false)
   AMvideo.addEventListener("ended", drawPause, false)
 }

From a821da922d60858fb1a9e0f274cb5a866ce4be19 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 18:29:27 +0000
Subject: [PATCH 12/78] Update html/poketube.ejs

---
 html/poketube.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index aa470003..9faf6f76 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1806,9 +1806,9 @@ const frameRate = 4; // Set the desired frame rate in milliseconds
 const drawLoop = () => {
   draw()
   
- setTimeout(() => {
+ setInterval(() => {
     step = window.requestAnimationFrame(drawLoop);
-  }, 01);
+  }, 50);
 }
 
 const drawPause = () => {

From 02646279d1a1736c735086428d0b0db00e5806b2 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 18:31:31 +0000
Subject: [PATCH 13/78] Update src/libpoketube/libpoketube-video.js

---
 src/libpoketube/libpoketube-video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpoketube/libpoketube-video.js b/src/libpoketube/libpoketube-video.js
index 442159fc..6785eca0 100644
--- a/src/libpoketube/libpoketube-video.js
+++ b/src/libpoketube/libpoketube-video.js
@@ -45,7 +45,7 @@ function toObject(arr) {
 
 // Gets Invidious instances
 const invInstanceList = [
-  "https://tube.kuylar.dev"
+  "https://video-proxy.poketube.fun"
 ];
 
 // Gets a random instance from the list

From ad0c20300b0d10190cabd1f3e627b75ecf2a0f5f Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 18:34:00 +0000
Subject: [PATCH 14/78] pfft

---
 html/poketube.ejs | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 9faf6f76..e5b650ad 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1776,7 +1776,6 @@ if (userID) {
 
 <script>
 let requestId;
-let lastDraw;
 
 const loopStart = () => {
   requestId = window.requestAnimationFrame(loopStart)
@@ -1798,17 +1797,9 @@ const draw = () => {
 }
 
 
-// Adjust the frame rate by changing the interval
-const frameRate = 4; // Set the desired frame rate in milliseconds
-
- 
-
 const drawLoop = () => {
   draw()
-  
- setInterval(() => {
-    step = window.requestAnimationFrame(drawLoop);
-  }, 50);
+  step = window.requestAnimationFrame(drawLoop)
 }
 
 const drawPause = () => {
@@ -1817,12 +1808,10 @@ const drawPause = () => {
 }
 
 const init = () => {
-  AMvideo.addEventListener("loadeddata", drawLoop, false)
+  AMvideo.addEventListener("loadeddata", draw, false)
   AMvideo.addEventListener("seeked", draw, false)
-   setInterval(function() {
-  AMvideo.addEventListener("play", drawLoop, false);
-   }, 50);
-   AMvideo.addEventListener("pause", drawPause, false)
+  AMvideo.addEventListener("play", drawLoop, false)
+  AMvideo.addEventListener("pause", drawPause, false)
   AMvideo.addEventListener("ended", drawPause, false)
 }
 
@@ -1840,7 +1829,7 @@ window.addEventListener("unload", cleanup)
 <style>
 .video-player-container, #video {
   position: relative;
-   z-index: 0;
+  z-index: 0;
 }
 .popup {z-index: 1}
 #ambient-canvas {

From e143dcb450f96e733ffb519ab4998b9a5ea398fa Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 20:03:46 +0000
Subject: [PATCH 15/78] lemme test this

---
 html/poketube.ejs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index e5b650ad..e03e96fa 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1790,12 +1790,13 @@ const AMvideo = document.getElementById("video")
 const canvas = document.getElementById("ambient-canvas")
 const ctx = canvas.getContext("2d")
     
-let step
+let step;
 
 const draw = () => {
-  ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
-}
-
+  if (AMvideo.readyState >= 2) { // Check if video is playable (HAVE_CURRENT_DATA or greater)
+    ctx.drawImage(AMvideo, 0, 0, canvas.width, canvas.height);
+  }
+};
 
 const drawLoop = () => {
   draw()
@@ -1808,12 +1809,13 @@ const drawPause = () => {
 }
 
 const init = () => {
-  AMvideo.addEventListener("loadeddata", draw, false)
-  AMvideo.addEventListener("seeked", draw, false)
-  AMvideo.addEventListener("play", drawLoop, false)
-  AMvideo.addEventListener("pause", drawPause, false)
-  AMvideo.addEventListener("ended", drawPause, false)
-}
+  document.addEventListener("DOMContentLoaded", () => {
+    AMvideo.addEventListener("canplaythrough", draw, false);
+    AMvideo.addEventListener("play", drawLoop, false);
+    AMvideo.addEventListener("pause", drawPause, false);
+    AMvideo.addEventListener("ended", drawPause, false);
+  });
+};
 
 const cleanup = () => {
   AMvideo.removeEventListener("loadeddata", draw)

From c0cadded4c17462d7ae17795a1ca2c3d336fb1ea Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 20:10:54 +0000
Subject: [PATCH 16/78] test ignore

---
 html/poketube.ejs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index e03e96fa..03f4bbb3 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1793,10 +1793,8 @@ const ctx = canvas.getContext("2d")
 let step;
 
 const draw = () => {
-  if (AMvideo.readyState >= 2) { // Check if video is playable (HAVE_CURRENT_DATA or greater)
-    ctx.drawImage(AMvideo, 0, 0, canvas.width, canvas.height);
-  }
-};
+     ctx.drawImage(AMvideo, 0, 0, canvas.width, canvas.height);
+ };
 
 const drawLoop = () => {
   draw()
@@ -1809,13 +1807,11 @@ const drawPause = () => {
 }
 
 const init = () => {
-  document.addEventListener("DOMContentLoaded", () => {
-    AMvideo.addEventListener("canplaythrough", draw, false);
+     AMvideo.addEventListener("canplaythrough", draw, false);
     AMvideo.addEventListener("play", drawLoop, false);
     AMvideo.addEventListener("pause", drawPause, false);
     AMvideo.addEventListener("ended", drawPause, false);
-  });
-};
+ };
 
 const cleanup = () => {
   AMvideo.removeEventListener("loadeddata", draw)

From 6b9ac260be3d5fc335aedccb7f2abc7e3bf7552e Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 20:17:17 +0000
Subject: [PATCH 17/78] yeah

---
 html/poketube.ejs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 03f4bbb3..724a387a 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1806,12 +1806,16 @@ const drawPause = () => {
   step = undefined
 }
 
+
 const init = () => {
-     AMvideo.addEventListener("canplaythrough", draw, false);
-    AMvideo.addEventListener("play", drawLoop, false);
-    AMvideo.addEventListener("pause", drawPause, false);
-    AMvideo.addEventListener("ended", drawPause, false);
- };
+  video.pause();video.play();
+  AMvideo.addEventListener("loadeddata", draw, false)
+  AMvideo.addEventListener("seeked", draw, false)
+  AMvideo.addEventListener("play", drawLoop, false)
+  AMvideo.addEventListener("pause", drawPause, false)
+  AMvideo.addEventListener("ended", drawPause, false)
+}
+
 
 const cleanup = () => {
   AMvideo.removeEventListener("loadeddata", draw)

From 4e676f57779422d4395a39d7398d22a4135acd18 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 20:19:21 +0000
Subject: [PATCH 18/78] yeah

---
 src/libpoketube/libpoketube-video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpoketube/libpoketube-video.js b/src/libpoketube/libpoketube-video.js
index 6785eca0..442159fc 100644
--- a/src/libpoketube/libpoketube-video.js
+++ b/src/libpoketube/libpoketube-video.js
@@ -45,7 +45,7 @@ function toObject(arr) {
 
 // Gets Invidious instances
 const invInstanceList = [
-  "https://video-proxy.poketube.fun"
+  "https://tube.kuylar.dev"
 ];
 
 // Gets a random instance from the list

From f65f4f454adfdbb59c7ae9152e66a94089758354 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Fri, 8 Dec 2023 21:45:34 +0000
Subject: [PATCH 19/78] dont display like count if its 0

fixes : #18

Signed-off-by: Ashley <iamashley@duck.com>
---
 html/poketube.ejs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 724a387a..6b18cb34 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1460,8 +1460,7 @@ display: block; !important;" autoplay controls
      Top Comments of this video!! :3
   </p>              
                                                                                        <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="/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><% 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>
                   <a href="#top">Go To Top</a>
                     </center>
@@ -2782,7 +2781,9 @@ More Epic options owo~
               <p class="comment" style="font-weight: bold;">
                 <%- x.contentHtml %>
               <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>
         </span>   

From ff9050a816ed8a8f043649aa088c0902d61f27bb Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sat, 9 Dec 2023 03:56:48 +0000
Subject: [PATCH 20/78] Update html/poketube.ejs

---
 html/poketube.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 6b18cb34..dcee9fe0 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1460,7 +1460,7 @@ display: block; !important;" autoplay controls
      Top Comments of this video!! :3
   </p>              
                                                                                        <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><% 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><% }) %>
+<% 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><% 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>
                   <a href="#top">Go To Top</a>
                     </center>

From a4a5d3a95cd133bbc2eee6235214a9f2b2857871 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sat, 9 Dec 2023 18:29:50 +0000
Subject: [PATCH 21/78] add new url :3

---
 html/poketube.ejs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index dcee9fe0..7da64bd7 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -884,7 +884,7 @@ About
               <% if (!isvidious) { %>
                 
                    <% 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
 </a>
 
@@ -893,7 +893,7 @@ About
 
       <% 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
 </a>
 
@@ -941,13 +941,13 @@ display: block; !important;" autoplay controls
               <% if (!isvidious) { %>
                 
                    <% if (!qua) { %>                       
-                                                <source src="https://tube.kuylar.dev/proxy/media/<%=inv_vid.videoId%>/22" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="hd720" selected="true">
+                                                <source src="https://tube-proxy.poketube.fun/proxy/media/<%=inv_vid.videoId%>/22" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="hd720" selected="true">
 
                                                                              <% } %>                
 
       <% if (qua === "medium") { %>  
 
-                                                <source src="https://tube.kuylar.dev/proxy/media/<%=inv_vid.videoId%>/18" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="sd360" selected="true">
+                                                <source src="https://tube-proxy.poketube.fun/proxy/media/<%=inv_vid.videoId%>/18" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" label="sd360" selected="true">
         
                                                                            <% } %>                
                                                                                                        <% } %>                     
@@ -1020,7 +1020,7 @@ display: block; !important;" autoplay controls
                           <% } %>
                              <% 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>
                                                   <% if (isvidious) { %>
@@ -1029,7 +1029,7 @@ display: block; !important;" autoplay controls
                                                                               <% } %>  
                                                                                                                                   <% 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>
@@ -2582,7 +2582,7 @@ the channels social media accounts!
                           <% } %>
                              <% 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>
                                                   <% if (isvidious) { %>
@@ -2591,7 +2591,7 @@ the channels social media accounts!
                                                                               <% } %>  
                                                                                                                                   <% 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>

From c7ad629260831916f5ee188eeb7f20e0092a7210 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sat, 9 Dec 2023 18:31:03 +0000
Subject: [PATCH 22/78] lol

---
 html/poketube.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 7da64bd7..17b39e70 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -2119,13 +2119,13 @@ a {
 
 
                      
-                                                <source src="<%=u%>/latest_version?id=<%=inv_vid.videoId%>&itag=22&local=true" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" 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=&quot;avc1.64001F, mp4a.40.2&quot;" label="hd720" selected="true">
 
                                                                              <% } %>                
 
       <% if (qua === "medium") { %>  
 
-                                                <source src="<%=u%>/latest_version?id=<%=inv_vid.videoId%>&itag=18&local=true" type="video/mp4; codecs=&quot;avc1.64001F, mp4a.40.2&quot;" 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=&quot;avc1.64001F, mp4a.40.2&quot;" label="sd360" selected="true">
         
                                                                            <% } %>                
 

From 1e5d9536afeb1bc0c4852a2908049b78ebc05702 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 09:15:14 +0000
Subject: [PATCH 23/78] add new url :3

---
 src/libpoketube/init/pages-api.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libpoketube/init/pages-api.js b/src/libpoketube/init/pages-api.js
index 723ffdad..4af1471f 100644
--- a/src/libpoketube/init/pages-api.js
+++ b/src/libpoketube/init/pages-api.js
@@ -52,7 +52,7 @@ module.exports = function (app, config, renderTemplate) {
   });
   
   app.get("/vi/:v/:t", async function (req, res) {
-    var url = `https://invidious.snopyta.org/vi/${req.params.v}/${req.params.t}`
+    var url = `https://yt.sudovanilla.com/vi/${req.params.v}/${req.params.t}`
     
        let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
@@ -63,7 +63,7 @@ module.exports = function (app, config, renderTemplate) {
   });
 
 app.get("/avatars/:v", async function (req, res) {
-    var url = `https://invidious.snopyta.org/ggpht/${req.params.v}`;
+    var url = `https://yt.sudovanilla.com/ggpht/${req.params.v}`;
 
     let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
@@ -73,7 +73,7 @@ app.get("/avatars/:v", async function (req, res) {
   });
 
   app.get("/ggpht/:v", async function (req, res) {
-    var url = `https://invidious.snopyta.org/ggpht/${req.params.v}`;
+    var url = `https://yt.sudovanilla.com/ggpht/${req.params.v}`;
 
     let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
@@ -84,7 +84,7 @@ app.get("/avatars/:v", async function (req, res) {
 
 
   app.get("/avatars/ytc/:v", async function (req, res) {
-    var url = `https://invidious.snopyta.org/ggpht/ytc/${req.params.v.replace("ytc", "")}`;
+    var url = `https://yt.sudovanilla.com/ggpht/ytc/${req.params.v.replace("ytc", "")}`;
 
     let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,

From 027ff27e8dcce094f174795cf6858deda814a8af Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 09:58:25 +0000
Subject: [PATCH 24/78] add media_proxy

---
 config.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.json b/config.json
index c0d7419d..f733bdb1 100644
--- a/config.json
+++ b/config.json
@@ -3,6 +3,7 @@
     "invapi": "https://invid-api.poketube.fun/api/v1",
     "dislikes": "https://returnyoutubedislikeapi.com/votes?videoId=",
     "invchannel": "https://invid-api.poketube.fun/api/v1",
+    "media_proxy": "https://image-proxy.poketube.fun",
     "cacher_max_age": "864000",
     "enablealwayshttps": false,
     "t_url": "https://t.poketube.fun/",

From acad845b304c442710c5a23ae4f87378cd42aab6 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:09:25 +0000
Subject: [PATCH 25/78] add media_proxy :3

---
 src/libpoketube/init/pages-video.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libpoketube/init/pages-video.js b/src/libpoketube/init/pages-video.js
index 907af8bf..7de1caa5 100644
--- a/src/libpoketube/init/pages-video.js
+++ b/src/libpoketube/init/pages-video.js
@@ -19,6 +19,7 @@ const {
 } = require("../ptutils/libpt-coreutils.js");
 const media_proxy = require("../libpoketube-video.js");
 const atmos = require("../../../pokeatmosurls.json");
+const config = require("../../../config.json");
 
 function linkify(text) {
   // regular expression to match URLs
@@ -279,6 +280,7 @@ module.exports = function (app, config, renderTemplate) {
             twitter,
             k,
             dm,
+            media_proxy_url : config.media_proxy,
             instagram,
             useragent: req.useragent,
             verify,

From bcbdcbab063a8f558b29edbc414ac30e8922739b Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:10:14 +0000
Subject: [PATCH 26/78] add new url :3

---
 html/poketube.ejs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 17b39e70..24e071e2 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1515,8 +1515,9 @@ Recommended Videos
 </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: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) { %><% 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://i.ytimg.com/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://i.ytimg.com/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) { %> 
 
      <% tj.forEach(x => { %>       

From de196d3ea94420cc6894768149fb6541bcbac8f3 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:15:06 +0000
Subject: [PATCH 27/78] fix spacing :3

---
 html/poketube.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 24e071e2..5ce271d1 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1515,7 +1515,7 @@ Recommended Videos
 </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://i.ytimg.com/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://i.ytimg.com/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) { %><% 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://i.ytimg.com/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://i.ytimg.com/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) { %> 

From f55d0f478883ed6fc4f5d3112144a9a6c5acf4af Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:16:12 +0000
Subject: [PATCH 28/78] fix spacing :3 (again)

---
 html/poketube.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 5ce271d1..de308aa4 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1515,7 +1515,7 @@ Recommended Videos
 </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://i.ytimg.com/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://i.ytimg.com/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) { %><% 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://i.ytimg.com/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://i.ytimg.com/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) { %> 

From fd36750cc538107c0a9b636f4a49feb71a54fba1 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:23:48 +0000
Subject: [PATCH 29/78] inital source for january

---
 january/Cargo.toml    |  26 ++
 january/Dockerfile    |  18 ++
 january/LICENSE       | 661 ++++++++++++++++++++++++++++++++++++++++++
 january/README.md     |  55 ++++
 january/gitlab-ci.yml |  18 ++
 5 files changed, 778 insertions(+)
 create mode 100644 january/Cargo.toml
 create mode 100644 january/Dockerfile
 create mode 100644 january/LICENSE
 create mode 100644 january/README.md
 create mode 100644 january/gitlab-ci.yml

diff --git a/january/Cargo.toml b/january/Cargo.toml
new file mode 100644
index 00000000..96e3bd5e
--- /dev/null
+++ b/january/Cargo.toml
@@ -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"] }
diff --git a/january/Dockerfile b/january/Dockerfile
new file mode 100644
index 00000000..ed858eaf
--- /dev/null
+++ b/january/Dockerfile
@@ -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"]
diff --git a/january/LICENSE b/january/LICENSE
new file mode 100644
index 00000000..116c2bfd
--- /dev/null
+++ b/january/LICENSE
@@ -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/>.
diff --git a/january/README.md b/january/README.md
new file mode 100644
index 00000000..ce9ed154
--- /dev/null
+++ b/january/README.md
@@ -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)
diff --git a/january/gitlab-ci.yml b/january/gitlab-ci.yml
new file mode 100644
index 00000000..369d053c
--- /dev/null
+++ b/january/gitlab-ci.yml
@@ -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

From 91ee786fc07be6400b8184b8e0a14c7b3ad13f53 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:25:26 +0000
Subject: [PATCH 30/78] inital source for january

---
 january/Cargo.lock | 2156 ++++++++++++++++++++++++++++++++++++++++++++
 january/flake.lock |   64 ++
 2 files changed, 2220 insertions(+)
 create mode 100644 january/Cargo.lock
 create mode 100644 january/flake.lock

diff --git a/january/Cargo.lock b/january/Cargo.lock
new file mode 100644
index 00000000..5d593a37
--- /dev/null
+++ b/january/Cargo.lock
@@ -0,0 +1,2156 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "actix-codec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe"
+dependencies = [
+ "bitflags",
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "log",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
+name = "actix-http"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5885cb81a0d4d0d322864bea1bb6c2a8144626b4fdc625d4c51eba197e7797a"
+dependencies = [
+ "actix-codec",
+ "actix-rt",
+ "actix-service",
+ "actix-utils",
+ "ahash",
+ "base64",
+ "bitflags",
+ "brotli",
+ "bytes",
+ "bytestring",
+ "derive_more",
+ "encoding_rs",
+ "flate2",
+ "futures-core",
+ "h2",
+ "http",
+ "httparse",
+ "httpdate",
+ "itoa 1.0.1",
+ "language-tags",
+ "local-channel",
+ "log",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "sha-1",
+ "smallvec",
+ "zstd",
+]
+
+[[package]]
+name = "actix-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "actix-router"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb60846b52c118f2f04a56cc90880a274271c489b2498623d58176f8ca21fa80"
+dependencies = [
+ "bytestring",
+ "firestorm",
+ "http",
+ "log",
+ "regex",
+ "serde",
+]
+
+[[package]]
+name = "actix-rt"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000"
+dependencies = [
+ "futures-core",
+ "tokio",
+]
+
+[[package]]
+name = "actix-server"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824"
+dependencies = [
+ "actix-rt",
+ "actix-service",
+ "actix-utils",
+ "futures-core",
+ "futures-util",
+ "mio",
+ "num_cpus",
+ "socket2",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "actix-service"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a"
+dependencies = [
+ "futures-core",
+ "paste",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "actix-utils"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94"
+dependencies = [
+ "local-waker",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "actix-web"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4e5ebffd51d50df56a3ae0de0e59487340ca456f05dd0b90c0a7a6dd6a74d31"
+dependencies = [
+ "actix-codec",
+ "actix-http",
+ "actix-macros",
+ "actix-router",
+ "actix-rt",
+ "actix-server",
+ "actix-service",
+ "actix-utils",
+ "actix-web-codegen",
+ "ahash",
+ "bytes",
+ "bytestring",
+ "cfg-if",
+ "cookie",
+ "derive_more",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "itoa 1.0.1",
+ "language-tags",
+ "log",
+ "mime",
+ "once_cell",
+ "pin-project-lite",
+ "regex",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "smallvec",
+ "socket2",
+ "time",
+ "url",
+]
+
+[[package]]
+name = "actix-web-codegen"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7525bedf54704abb1d469e88d7e7e9226df73778798a69cea5022d53b2ae91bc"
+dependencies = [
+ "actix-router",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+dependencies = [
+ "getrandom 0.2.6",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "brotli"
+version = "3.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+
+[[package]]
+name = "bytestring"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d"
+dependencies = [
+ "bytes",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+dependencies = [
+ "jobserver",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
+name = "cookie"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "cssparser"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
+dependencies = [
+ "cssparser-macros",
+ "dtoa-short",
+ "itoa 0.4.8",
+ "matches",
+ "phf",
+ "proc-macro2",
+ "quote",
+ "smallvec",
+ "syn",
+]
+
+[[package]]
+name = "cssparser-macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "dotenv"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+
+[[package]]
+name = "dtoa"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
+
+[[package]]
+name = "dtoa-short"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6"
+dependencies = [
+ "dtoa",
+]
+
+[[package]]
+name = "ego-tree"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "fastrand"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "ffprobe"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4151d364a3709c400c4aaca1988324f02dfde8d3e2e8543176e596d39eb414ac"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "firestorm"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d3d6188b8804df28032815ea256b6955c9625c24da7525f387a7af02fbb8f01"
+
+[[package]]
+name = "flate2"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
+dependencies = [
+ "cfg-if",
+ "crc32fast",
+ "libc",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+dependencies = [
+ "matches",
+ "percent-encoding",
+]
+
+[[package]]
+name = "futf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
+dependencies = [
+ "mac",
+ "new_debug_unreachable",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+
+[[package]]
+name = "futures-task"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+
+[[package]]
+name = "futures-util"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.10.2+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "http"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa 1.0.1",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6330e8a36bd8c859f3fa6d9382911fbb7147ec39807f63b923933a247240b9ba"
+
+[[package]]
+name = "httpdate"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "hyper"
+version = "0.14.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa 1.0.1",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
+[[package]]
+name = "idna"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "if_chain"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
+
+[[package]]
+name = "imagesize"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd27b2139f540ac627a6cb1b96105e86bfc5136d06236ea90272eec35a4f5088"
+
+[[package]]
+name = "indexmap"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
+
+[[package]]
+name = "itoa"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
+[[package]]
+name = "itoa"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+
+[[package]]
+name = "january"
+version = "0.3.5"
+dependencies = [
+ "actix-web",
+ "dotenv",
+ "env_logger",
+ "ffprobe",
+ "imagesize",
+ "lazy_static",
+ "log",
+ "mime",
+ "regex",
+ "reqwest",
+ "scraper",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "validator",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "language-tags"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.124"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
+
+[[package]]
+name = "local-channel"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6246c68cf195087205a0512559c97e15eaf95198bf0e206d662092cdcb03fe9f"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "local-waker",
+]
+
+[[package]]
+name = "local-waker"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "902eb695eb0591864543cbfbf6d742510642a605a61fc5e97fe6ceb5a30ac4fb"
+
+[[package]]
+name = "lock_api"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "mac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+
+[[package]]
+name = "markup5ever"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
+dependencies = [
+ "log",
+ "phf",
+ "phf_codegen",
+ "string_cache",
+ "string_cache_codegen",
+ "tendril",
+]
+
+[[package]]
+name = "matches"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+
+[[package]]
+name = "memchr"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+
+[[package]]
+name = "mime"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
+dependencies = [
+ "libc",
+ "log",
+ "miow",
+ "ntapi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
+[[package]]
+name = "miow"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
+[[package]]
+name = "nodrop"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+
+[[package]]
+name = "ntapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
+
+[[package]]
+name = "openssl"
+version = "0.10.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
+dependencies = [
+ "autocfg",
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+
+[[package]]
+name = "percent-encoding"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_macros",
+ "phf_shared 0.8.0",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+dependencies = [
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+dependencies = [
+ "phf_shared 0.8.0",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared 0.10.0",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
+dependencies = [
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+ "rand_pcg",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.3",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.3",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+dependencies = [
+ "getrandom 0.2.6",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.11.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "lazy_static",
+ "log",
+ "mime",
+ "native-tls",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-native-tls",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+
+[[package]]
+name = "schannel"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
+dependencies = [
+ "lazy_static",
+ "winapi",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "scraper"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e02aa790c80c2e494130dec6a522033b6a23603ffc06360e9fe6c611ea2c12"
+dependencies = [
+ "cssparser",
+ "ego-tree",
+ "getopts",
+ "html5ever",
+ "matches",
+ "selectors",
+ "smallvec",
+ "tendril",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "selectors"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
+dependencies = [
+ "bitflags",
+ "cssparser",
+ "derive_more",
+ "fxhash",
+ "log",
+ "matches",
+ "phf",
+ "phf_codegen",
+ "precomputed-hash",
+ "servo_arc",
+ "smallvec",
+ "thin-slice",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4"
+
+[[package]]
+name = "serde"
+version = "1.0.136"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.136"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
+dependencies = [
+ "itoa 1.0.1",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa 1.0.1",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "servo_arc"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432"
+dependencies = [
+ "nodrop",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
+[[package]]
+name = "slab"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+
+[[package]]
+name = "smallvec"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
+
+[[package]]
+name = "socket2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "string_cache"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot",
+ "phf_shared 0.10.0",
+ "precomputed-hash",
+ "serde",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "libc",
+ "redox_syscall",
+ "remove_dir_all",
+ "winapi",
+]
+
+[[package]]
+name = "tendril"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
+dependencies = [
+ "futf",
+ "mac",
+ "utf-8",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thin-slice"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
+
+[[package]]
+name = "time"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
+dependencies = [
+ "itoa 1.0.1",
+ "libc",
+ "num_threads",
+ "time-macros",
+]
+
+[[package]]
+name = "time-macros"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
+
+[[package]]
+name = "tinyvec"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "tokio"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
+dependencies = [
+ "bytes",
+ "libc",
+ "memchr",
+ "mio",
+ "once_cell",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "winapi",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+
+[[package]]
+name = "tracing"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
+dependencies = [
+ "cfg-if",
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+
+[[package]]
+name = "typenum"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+
+[[package]]
+name = "url"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "matches",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "validator"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f07b0a1390e01c0fc35ebb26b28ced33c9a3808f7f9fbe94d3cc01e233bfeed5"
+dependencies = [
+ "idna",
+ "lazy_static",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "url",
+ "validator_derive",
+]
+
+[[package]]
+name = "validator_derive"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea7ed5e8cf2b6bdd64a6c4ce851da25388a89327b17b88424ceced6bd5017923"
+dependencies = [
+ "if_chain",
+ "lazy_static",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn",
+ "validator_types",
+]
+
+[[package]]
+name = "validator_types"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ddf34293296847abfc1493b15c6e2f5d3cd19f57ad7d22673bf4c6278da329"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+dependencies = [
+ "log",
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.10.2+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
+dependencies = [
+ "bumpalo",
+ "lazy_static",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
+
+[[package]]
+name = "web-sys"
+version = "0.3.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
+
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "zstd"
+version = "0.10.0+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "4.1.4+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "1.6.3+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
+dependencies = [
+ "cc",
+ "libc",
+]
diff --git a/january/flake.lock b/january/flake.lock
new file mode 100644
index 00000000..019a6d39
--- /dev/null
+++ b/january/flake.lock
@@ -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
+}

From ff13d575632d9799243a43503a114fe54814e2c5 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:26:38 +0000
Subject: [PATCH 31/78] ini

---
 january/src/main.rs | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 january/src/main.rs

diff --git a/january/src/main.rs b/january/src/main.rs
new file mode 100644
index 00000000..286ee28a
--- /dev/null
+++ b/january/src/main.rs
@@ -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
+}

From 7f132c1517835c00ceb61fdd06b689583e09a5bc Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:27:07 +0000
Subject: [PATCH 32/78] inital source for january

---
 january/src/routes/embed.rs | 98 +++++++++++++++++++++++++++++++++++++
 january/src/routes/info.rs  | 14 ++++++
 january/src/routes/mod.rs   |  3 ++
 january/src/routes/proxy.rs | 43 ++++++++++++++++
 4 files changed, 158 insertions(+)
 create mode 100644 january/src/routes/embed.rs
 create mode 100644 january/src/routes/info.rs
 create mode 100644 january/src/routes/mod.rs
 create mode 100644 january/src/routes/proxy.rs

diff --git a/january/src/routes/embed.rs b/january/src/routes/embed.rs
new file mode 100644
index 00000000..911ff83b
--- /dev/null
+++ b/january/src/routes/embed.rs
@@ -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)
+}
diff --git a/january/src/routes/info.rs b/january/src/routes/info.rs
new file mode 100644
index 00000000..e76d9e91
--- /dev/null
+++ b/january/src/routes/info.rs
@@ -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"),
+    })
+}
diff --git a/january/src/routes/mod.rs b/january/src/routes/mod.rs
new file mode 100644
index 00000000..c4aa207d
--- /dev/null
+++ b/january/src/routes/mod.rs
@@ -0,0 +1,3 @@
+pub mod embed;
+pub mod info;
+pub mod proxy;
diff --git a/january/src/routes/proxy.rs b/january/src/routes/proxy.rs
new file mode 100644
index 00000000..f53e1634
--- /dev/null
+++ b/january/src/routes/proxy.rs
@@ -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))
+}

From 84ad874a2bc7177283b971e83318d6b347625ddf Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:28:44 +0000
Subject: [PATCH 33/78] inital source for january :3

---
 january/src/structs/embed.rs    |  16 ++
 january/src/structs/media.rs    |  25 +++
 january/src/structs/metadata.rs | 320 ++++++++++++++++++++++++++++++++
 january/src/structs/mod.rs      |   4 +
 january/src/structs/special.rs  |  52 ++++++
 5 files changed, 417 insertions(+)
 create mode 100644 january/src/structs/embed.rs
 create mode 100644 january/src/structs/media.rs
 create mode 100644 january/src/structs/metadata.rs
 create mode 100644 january/src/structs/mod.rs
 create mode 100644 january/src/structs/special.rs

diff --git a/january/src/structs/embed.rs b/january/src/structs/embed.rs
new file mode 100644
index 00000000..d0be001f
--- /dev/null
+++ b/january/src/structs/embed.rs
@@ -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,
+}
diff --git a/january/src/structs/media.rs b/january/src/structs/media.rs
new file mode 100644
index 00000000..0ce68ab4
--- /dev/null
+++ b/january/src/structs/media.rs
@@ -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,
+}
diff --git a/january/src/structs/metadata.rs b/january/src/structs/metadata.rs
new file mode 100644
index 00000000..dd3083e9
--- /dev/null
+++ b/january/src/structs/metadata.rs
@@ -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()
+    }
+}
diff --git a/january/src/structs/mod.rs b/january/src/structs/mod.rs
new file mode 100644
index 00000000..735c4ed0
--- /dev/null
+++ b/january/src/structs/mod.rs
@@ -0,0 +1,4 @@
+pub mod embed;
+pub mod media;
+pub mod metadata;
+pub mod special;
diff --git a/january/src/structs/special.rs b/january/src/structs/special.rs
new file mode 100644
index 00000000..27906a80
--- /dev/null
+++ b/january/src/structs/special.rs
@@ -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,
+    },
+}

From 365a6c10097b47a6135b0154edb3068c44f99842 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:29:22 +0000
Subject: [PATCH 34/78] inital source for january :3

---
 january/src/util/mod.rs       |   3 +
 january/src/util/request.rs   | 123 ++++++++++++++++++++++++++++++++++
 january/src/util/result.rs    |  65 ++++++++++++++++++
 january/src/util/variables.rs |   9 +++
 4 files changed, 200 insertions(+)
 create mode 100644 january/src/util/mod.rs
 create mode 100644 january/src/util/request.rs
 create mode 100644 january/src/util/result.rs
 create mode 100644 january/src/util/variables.rs

diff --git a/january/src/util/mod.rs b/january/src/util/mod.rs
new file mode 100644
index 00000000..10b33287
--- /dev/null
+++ b/january/src/util/mod.rs
@@ -0,0 +1,3 @@
+pub mod request;
+pub mod result;
+pub mod variables;
diff --git a/january/src/util/request.rs b/january/src/util/request.rs
new file mode 100644
index 00000000..eb3af269
--- /dev/null
+++ b/january/src/util/request.rs
@@ -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!(),
+    }
+}
diff --git a/january/src/util/result.rs b/january/src/util/result.rs
new file mode 100644
index 00000000..1c107cf4
--- /dev/null
+++ b/january/src/util/result.rs
@@ -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)
+    }
+}
diff --git a/january/src/util/variables.rs b/january/src/util/variables.rs
new file mode 100644
index 00000000..c472715c
--- /dev/null
+++ b/january/src/util/variables.rs
@@ -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.");
+}

From a288370d7542b51f00c4c704c6adc1c283200fd4 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:39:58 +0000
Subject: [PATCH 35/78] add hosting image proxy thingy

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 042f9f1a..b66a45f5 100644
--- a/README.md
+++ b/README.md
@@ -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. 
 
+## 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!
 
 Join the community on [revolt](https://rvlt.gg/poketube) :3

From abd5345626101b6e38c12c8b27558f215e036695 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:49:36 +0000
Subject: [PATCH 36/78] change url lol

---
 html/poketube.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index de308aa4..0d098acd 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1515,7 +1515,7 @@ Recommended Videos
 </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://i.ytimg.com/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://i.ytimg.com/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) { %><% 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://yt.sudovanilla.com/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://yt.sudovanilla.com/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) { %> 

From cd4ea32f729b303c970fcc8dcbdffe268ad4799f Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 10:56:56 +0000
Subject: [PATCH 37/78] add new url :3

---
 html/poketube.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 0d098acd..b6c50259 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -923,7 +923,7 @@ About
 box-sizing: border-box;
 min-width: 100%;
 display: block; !important;" autoplay controls   
-       poster="https://p.poketube.fun/https://i.ytimg.com/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
+       poster="<%- media_proxy_url %>/proxy?url=https://yt.sudovanilla.com/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
        
               <% if (isvidious) { %>
                    <% if (!qua) { %>                       

From 11cb4cad0649d1bdc616005160d0c15062d658b8 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 11:08:37 +0000
Subject: [PATCH 38/78] add new url :3

---
 src/libpoketube/init/pages-api.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libpoketube/init/pages-api.js b/src/libpoketube/init/pages-api.js
index 4af1471f..723ffdad 100644
--- a/src/libpoketube/init/pages-api.js
+++ b/src/libpoketube/init/pages-api.js
@@ -52,7 +52,7 @@ module.exports = function (app, config, renderTemplate) {
   });
   
   app.get("/vi/:v/:t", async function (req, res) {
-    var url = `https://yt.sudovanilla.com/vi/${req.params.v}/${req.params.t}`
+    var url = `https://invidious.snopyta.org/vi/${req.params.v}/${req.params.t}`
     
        let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
@@ -63,7 +63,7 @@ module.exports = function (app, config, renderTemplate) {
   });
 
 app.get("/avatars/:v", async function (req, res) {
-    var url = `https://yt.sudovanilla.com/ggpht/${req.params.v}`;
+    var url = `https://invidious.snopyta.org/ggpht/${req.params.v}`;
 
     let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
@@ -73,7 +73,7 @@ app.get("/avatars/:v", async function (req, res) {
   });
 
   app.get("/ggpht/:v", async function (req, res) {
-    var url = `https://yt.sudovanilla.com/ggpht/${req.params.v}`;
+    var url = `https://invidious.snopyta.org/ggpht/${req.params.v}`;
 
     let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
@@ -84,7 +84,7 @@ app.get("/avatars/:v", async function (req, res) {
 
 
   app.get("/avatars/ytc/:v", async function (req, res) {
-    var url = `https://yt.sudovanilla.com/ggpht/ytc/${req.params.v.replace("ytc", "")}`;
+    var url = `https://invidious.snopyta.org/ggpht/ytc/${req.params.v.replace("ytc", "")}`;
 
     let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,

From cbdc4b7170180b9898238878b16b1ed448ab9e7f Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 11:11:25 +0000
Subject: [PATCH 39/78] add new url :3

---
 html/poketube.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index b6c50259..1ef47c0c 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -923,7 +923,7 @@ About
 box-sizing: border-box;
 min-width: 100%;
 display: block; !important;" autoplay controls   
-       poster="<%- media_proxy_url %>/proxy?url=https://yt.sudovanilla.com/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
+       poster="<%- media_proxy_url %>/proxy?url=https://invidious.snopyta.org/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
        
               <% if (isvidious) { %>
                    <% if (!qua) { %>                       
@@ -1515,7 +1515,7 @@ Recommended Videos
 </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://yt.sudovanilla.com/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://yt.sudovanilla.com/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) { %><% 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://invidious.snopyta.org/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://invidious.snopyta.org/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) { %> 

From 7e8507c5bb95ce8e64ed7da5c4973c41e88856ca Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 14:34:13 +0000
Subject: [PATCH 40/78] add new url :3

---
 html/poketube.ejs | 51 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 1ef47c0c..25bd379f 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1460,8 +1460,55 @@ display: block; !important;" autoplay controls
      Top Comments of this video!! :3
   </p>              
                                                                                        <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><% 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>
+<% 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>
                   <a href="#top">Go To Top</a>
                     </center>
           </div>

From b456a8c0a5a038d4d9681df4aa6fa1855b172d58 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Sun, 10 Dec 2023 14:41:27 +0000
Subject: [PATCH 41/78] minify code :3

---
 html/poketube.ejs | 49 +----------------------------------------------
 1 file changed, 1 insertion(+), 48 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 25bd379f..600836d0 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1460,54 +1460,7 @@ display: block; !important;" autoplay controls
      Top Comments of this video!! :3
   </p>              
                                                                                        <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="<%- 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>
-    <% }) %>              
+<% 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>
                   <a href="#top">Go To Top</a>
                     </center>

From 43fb7dcba0218a5b947342879b24c6daf321d568 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Mon, 11 Dec 2023 12:29:06 +0000
Subject: [PATCH 42/78] add new url :3

---
 src/libpoketube/init/pages-api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpoketube/init/pages-api.js b/src/libpoketube/init/pages-api.js
index 723ffdad..f0507028 100644
--- a/src/libpoketube/init/pages-api.js
+++ b/src/libpoketube/init/pages-api.js
@@ -114,7 +114,7 @@ app.get("/avatars/:v", async function (req, res) {
       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);
   });

From 3ba428787720444b5d23fdb407febb086b572e9a Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Mon, 11 Dec 2023 16:39:48 +0000
Subject: [PATCH 43/78] add new url :3

---
 html/poketube.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 600836d0..510154d9 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -923,7 +923,7 @@ About
 box-sizing: border-box;
 min-width: 100%;
 display: block; !important;" autoplay controls   
-       poster="<%- media_proxy_url %>/proxy?url=https://invidious.snopyta.org/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
+       poster="<%- media_proxy_url %>/proxy?url=https://inv.vern.cc/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
        
               <% if (isvidious) { %>
                    <% if (!qua) { %>                       
@@ -1515,7 +1515,7 @@ Recommended Videos
 </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://invidious.snopyta.org/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://invidious.snopyta.org/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) { %><% 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://inv.vern.cc/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://inv.vern.cc/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) { %> 

From 7453b903ac8be2d4d675a2ea8b80100fe497dfa9 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Mon, 11 Dec 2023 17:51:49 +0000
Subject: [PATCH 44/78] yeah

---
 html/poketube.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 510154d9..be8b2cd0 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -923,7 +923,7 @@ About
 box-sizing: border-box;
 min-width: 100%;
 display: block; !important;" autoplay controls   
-       poster="<%- media_proxy_url %>/proxy?url=https://inv.vern.cc/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
+       poster="<%- media_proxy_url %>/proxy?url=https://vid.theedgeofrage.com//vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
        
               <% if (isvidious) { %>
                    <% if (!qua) { %>                       
@@ -1515,7 +1515,7 @@ Recommended Videos
 </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://inv.vern.cc/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://inv.vern.cc/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) { %><% 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.theedgeofrage.com//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.theedgeofrage.com//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) { %> 

From 9d5580752bb0bd860ea68a86954857bc3f22da69 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Mon, 11 Dec 2023 17:53:53 +0000
Subject: [PATCH 45/78] fix url :3

---
 html/poketube.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index be8b2cd0..590b68cb 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -923,7 +923,7 @@ About
 box-sizing: border-box;
 min-width: 100%;
 display: block; !important;" autoplay controls   
-       poster="<%- media_proxy_url %>/proxy?url=https://vid.theedgeofrage.com//vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
+       poster="<%- media_proxy_url %>/proxy?url=https://vid.theedgeofrage.com/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
        
               <% if (isvidious) { %>
                    <% if (!qua) { %>                       
@@ -1515,7 +1515,7 @@ Recommended Videos
 </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.theedgeofrage.com//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.theedgeofrage.com//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) { %><% 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.theedgeofrage.com/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.theedgeofrage.com/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) { %> 

From af0d804ea1d4afc61054663bccbe154862ad209c Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Mon, 11 Dec 2023 18:00:04 +0000
Subject: [PATCH 46/78] add new url :3

---
 html/poketube.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 590b68cb..d4146286 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -923,7 +923,7 @@ About
 box-sizing: border-box;
 min-width: 100%;
 display: block; !important;" autoplay controls   
-       poster="<%- media_proxy_url %>/proxy?url=https://vid.theedgeofrage.com/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
+       poster="<%- media_proxy_url %>/proxy?url=https://invid-api.poketube.fun/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
        
               <% if (isvidious) { %>
                    <% if (!qua) { %>                       
@@ -1515,7 +1515,7 @@ Recommended Videos
 </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.theedgeofrage.com/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.theedgeofrage.com/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) { %><% 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://invid-api.poketube.fun/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://invid-api.poketube.fun/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) { %> 

From 4f1e040d98c9225f15db8320c2d3f616da8eba41 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Mon, 11 Dec 2023 18:06:52 +0000
Subject: [PATCH 47/78] add new url :3

---
 html/poketube.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index d4146286..ca5eb634 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -923,7 +923,7 @@ About
 box-sizing: border-box;
 min-width: 100%;
 display: block; !important;" autoplay controls   
-       poster="<%- media_proxy_url %>/proxy?url=https://invid-api.poketube.fun/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
+       poster="<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
        
               <% if (isvidious) { %>
                    <% if (!qua) { %>                       
@@ -1515,7 +1515,7 @@ Recommended Videos
 </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://invid-api.poketube.fun/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://invid-api.poketube.fun/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) { %><% 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) { %> 

From 078266099d8bbd7bfda6525a0acf3fb9c690edf3 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Mon, 11 Dec 2023 18:13:41 +0000
Subject: [PATCH 48/78] hmm

---
 html/poketube.ejs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index ca5eb634..405df169 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -922,8 +922,7 @@ About
 <video class="player video-ambient-container" id="video" style="border-radius: 16px;
 box-sizing: border-box;
 min-width: 100%;
-display: block; !important;" autoplay controls   
-       poster="<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%=inv_vid.videoId%>/maxresdefault.jpg?v=607ddcd4">
+display: block; !important;" autoplay controls>
        
               <% if (isvidious) { %>
                    <% if (!qua) { %>                       

From 34d3f49bda727c29efb4a5173cf27beedb215669 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Mon, 11 Dec 2023 22:13:28 +0000
Subject: [PATCH 49/78] refactor code

---
 src/libpoketube/init/pages-video.js | 77 ++++++++++++++++++-----------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/libpoketube/init/pages-video.js b/src/libpoketube/init/pages-video.js
index 7de1caa5..99c19f17 100644
--- a/src/libpoketube/init/pages-video.js
+++ b/src/libpoketube/init/pages-video.js
@@ -27,7 +27,8 @@ function linkify(text) {
 
   return text.replace(urlRegex, (url) => {
     // 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(/reddit\.com/g, "teddit.net")
         .replace("https://youtube.com", "")
@@ -37,13 +38,12 @@ function linkify(text) {
 }
 
 function channelurlfixer(text) {
-// Create a regular expression to match <a> tags with href containing "/channel/"
-const regex = /<a\s+href="\/channel\/([^"]+)"/g;
-// Replace matching <a> tags with the modified href attribute
-const updatedDescription = text.replace(regex, '<a href="/channel?id=$1"');
-return updatedDescription;
-} 
-
+  // Create a regular expression to match <a> tags with href containing "/channel/"
+  const regex = /<a\s+href="\/channel\/([^"]+)"/g;
+  // Replace matching <a> tags with the modified href attribute
+  const updatedDescription = text.replace(regex, '<a href="/channel?id=$1"');
+  return updatedDescription;
+}
 
 function endsWithYouTubeAutoGenerated(text) {
   const target = " Auto-generated by YouTube. ";
@@ -178,14 +178,26 @@ module.exports = function (app, config, renderTemplate) {
   });
 
   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) {
       return res.redirect("/");
     }
-     
-   var contentlang = hl || "en-US";
-   var contentregion = region || "US";
+
+    var contentlang = hl || "en-US";
+    var contentregion = region || "US";
 
     const isVideoValid = await core.isvalidvideo(v);
     if (!isVideoValid) {
@@ -193,7 +205,7 @@ module.exports = function (app, config, renderTemplate) {
     }
 
     const u = await media_proxy(v);
-    
+
     const secure = ["poketube.fun"].includes(req.hostname);
     const verify = req.hostname === "poketube.sudovanilla.com";
 
@@ -205,14 +217,14 @@ module.exports = function (app, config, renderTemplate) {
         const inv_comments = data?.comments || "Disabled";
         const inv_vid = data?.vid;
         const desc = data?.desc || "";
-      
+
         let d = false;
         if (desc !== "[object Object]") {
           d = desc.toString().replace(/\n/g, " <br> ");
         }
 
         const descriptionString = String(inv_vid?.description);
-         
+
         function extractInfo(regex) {
           return descriptionString !== "[object Object]"
             ? (regex.exec(descriptionString) ?? {}).groups
@@ -226,14 +238,21 @@ module.exports = function (app, config, renderTemplate) {
         const reddit = extractInfo(REDDIT_REGEX);
         const instagram = extractInfo(INSTAGRAM_REGEX);
 
-        var vidurl = u.url
-        
-        if(inv_vid?.genre === "Music") {
-          var vidurl = u.losslessurl
-        } 
-        
-         if(req.useragent.source.includes("Pardus")){
-           var vidurl = "https://yt.sudovanilla.com"
+        var vidurl = u.url;
+        var isvidious = u.isInvidiousURL;
+
+        if (inv_vid?.genre === "Music") {
+          var vidurl = u.losslessurl;
+        }
+
+        if (inv_vid.author.endsWith(" - Topic")) {
+          var vidurl = u.losslessurl;
+          var isvidious = true;
+        }
+
+        if (req.useragent.source.includes("Pardus")) {
+          var vidurl = "https://yt.sudovanilla.com";
+          var isvidious = true;
         }
 
         let badges = "";
@@ -259,8 +278,8 @@ module.exports = function (app, config, renderTemplate) {
         if (uaos === "Windows XP" || uaos === "Windows Vista")
           res.redirect("/lite?v=" + req.query.v);
 
-         if (req.query.from === "short") var shortsui = true
-         
+        if (req.query.from === "short") var shortsui = true;
+
         try {
           renderTemplate(res, req, "poketube.ejs", {
             color: data.color,
@@ -272,7 +291,7 @@ module.exports = function (app, config, renderTemplate) {
             support,
             shortsui,
             u: vidurl,
-            isvidious: u.isInvidiousURL,
+            isvidious: isvidious,
             video: json,
             date: k.Video.uploadDate,
             e,
@@ -280,7 +299,7 @@ module.exports = function (app, config, renderTemplate) {
             twitter,
             k,
             dm,
-            media_proxy_url : config.media_proxy,
+            media_proxy_url: config.media_proxy,
             instagram,
             useragent: req.useragent,
             verify,
@@ -314,7 +333,7 @@ module.exports = function (app, config, renderTemplate) {
         }
       } catch (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}`);
       }
     });
   });
@@ -533,4 +552,4 @@ module.exports = function (app, config, renderTemplate) {
       }
     }
   });
-};
\ No newline at end of file
+};

From e37c43fcc2766ea9016aa111cbe3962b6973f617 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Tue, 12 Dec 2023 05:06:02 +0000
Subject: [PATCH 50/78] change url lol

---
 src/libpoketube/init/pages-video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpoketube/init/pages-video.js b/src/libpoketube/init/pages-video.js
index 99c19f17..58bb06b6 100644
--- a/src/libpoketube/init/pages-video.js
+++ b/src/libpoketube/init/pages-video.js
@@ -246,7 +246,7 @@ module.exports = function (app, config, renderTemplate) {
         }
 
         if (inv_vid.author.endsWith(" - Topic")) {
-          var vidurl = u.losslessurl;
+          var vidurl = "https://vid.theedgeofrage.com/";
           var isvidious = true;
         }
 

From 4562e353619c6051ee5086c6af02a01a45de902f Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Tue, 12 Dec 2023 05:07:25 +0000
Subject: [PATCH 51/78] fix this

---
 src/libpoketube/init/pages-video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpoketube/init/pages-video.js b/src/libpoketube/init/pages-video.js
index 58bb06b6..eb361f06 100644
--- a/src/libpoketube/init/pages-video.js
+++ b/src/libpoketube/init/pages-video.js
@@ -246,7 +246,7 @@ module.exports = function (app, config, renderTemplate) {
         }
 
         if (inv_vid.author.endsWith(" - Topic")) {
-          var vidurl = "https://vid.theedgeofrage.com/";
+          var vidurl = "https://vid.theedgeofrage.com";
           var isvidious = true;
         }
 

From cd1b480770f041cb380296be74d03ca71594d1ed Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Tue, 12 Dec 2023 16:11:20 +0000
Subject: [PATCH 52/78] new borer radius lol

---
 html/discover.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/discover.ejs b/html/discover.ejs
index 6a97b135..ada5c711 100644
--- a/html/discover.ejs
+++ b/html/discover.ejs
@@ -1115,7 +1115,7 @@ margin-left: auto;
                                                
    <% inv.forEach(x =>  { %>
 			<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">
 					<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>
@@ -1128,7 +1128,7 @@ margin-left: auto;
                                                
    <% p.forEach(x =>  { %>
 			<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">
 					<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>

From 2b67fb52742bbcb9704a102d565afa2ba40a6807 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Wed, 13 Dec 2023 05:21:46 +0000
Subject: [PATCH 53/78] add shorts search support :3

---
 html/channel.ejs | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/html/channel.ejs b/html/channel.ejs
index 80b5a3ba..f897c286 100644
--- a/html/channel.ejs
+++ b/html/channel.ejs
@@ -767,7 +767,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=<
                                                                 <% } %>
             </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>
      
      
      <% } %>
@@ -1375,21 +1375,39 @@ if (userID) {
 }
     
 document.getElementById('search').addEventListener('keyup', function () {
-      var value = this.value.toLowerCase();
-      var videos = document.querySelectorAll('.video');
+  var value = this.value.toLowerCase();
+  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';
-        }
-      });
-    });
+  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';
+    }
+  });
+});
+   
 // @license-end
+
      </script>
                </body>
  

From 05b7b37366c8cc2fa1d075e56b74366f1c905ea4 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Wed, 13 Dec 2023 05:26:57 +0000
Subject: [PATCH 54/78] add audio format

---
 html/poketube.ejs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 405df169..8620400a 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1012,7 +1012,13 @@ display: block; !important;" autoplay controls>
        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  <% } %>
       <% 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://codeberg.org/Ashley/poke/src/branch/main/alac) Audio/ Flac<br>
+                                    <% } %>   
+    <% if (inv_vid.genre !== "Music") { %> 
+        Audio Format: Opus - Normalized audio<br>
+                                    <% } %>   
+        PokeTubeEncryptID: <%=sha384(inv_vid.videoId)%> <br>
                       <% if (isvidious) { %>
 
        Proxy : <%= u.replace("https://","") %> - refresh the page to change the proxy location<br>
@@ -1054,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>&nbsp;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>
                                            		 	               <% } %> 
@@ -2576,6 +2583,12 @@ the channels social media accounts!
         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> 
        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) { %>
 
        Proxy : <%= u.replace("https://","") %> - refresh the page to change the proxy location<br>

From 03f4990469b5baf41e41e04242f721aa76711aad Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Wed, 13 Dec 2023 05:33:05 +0000
Subject: [PATCH 55/78] lol

---
 html/poketube.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 8620400a..163ddcf3 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -1013,7 +1013,7 @@ display: block; !important;" autoplay controls>
         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 (inv_vid.genre === "Music") { %> 
-        Audio Format: ALAC lossless (https://codeberg.org/Ashley/poke/src/branch/main/alac) Audio/ Flac<br>
+        Audio Format: ALAC lossless (https://github.com/macosforge/alac) <br>
                                     <% } %>   
     <% if (inv_vid.genre !== "Music") { %> 
         Audio Format: Opus - Normalized audio<br>

From 09535024a038019ae83fa4a1cc4d4987e816df15 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 10:13:03 +0000
Subject: [PATCH 56/78] add new proxy :3

---
 html/search.ejs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/html/search.ejs b/html/search.ejs
index 293b6998..de74edbb 100644
--- a/html/search.ejs
+++ b/html/search.ejs
@@ -402,6 +402,8 @@ video[counter].classList.add("shake");
     
        </div>
   <div class="channel-page"   style="background-color: var(--channel-contents-background);">   
+    <div class="search-options">
+      
     <div id="filters">
 	<details id="filters-collapse">		<summary>Filters</summary>
     <div id="filters-box"><form action="/search" method="get">
@@ -464,7 +466,8 @@ Videos
 Web              </a>
                   
                      </div>   
-      
+          </div>
+
                  <%  if (!tab) { %> 
  
        <% invresults.forEach (x => { %>
@@ -474,7 +477,7 @@ Web              </a>
       <a
         href="/watch?v=<%= x.videoId %>"
         class="thumbnail"
-        style="background-image: url('/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEXCNAFEJQDSFryq4qpAwkIARUAAIhCGAE=&amp;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=&amp;rs=AOn4CLBmAOZV7CM3NdDKlEFxGX7PpI5UWQ');border-radius: 10px;"
          ><span class="video-length"><%=turntomins(x.lengthSeconds) %></span></a>
 <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;

From 5395e2631dd5cbbf3916b86a592817e4a77e6547 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 10:15:09 +0000
Subject: [PATCH 57/78] add media_proxy :3

---
 src/libpoketube/init/pages-channel-and-download.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libpoketube/init/pages-channel-and-download.js b/src/libpoketube/init/pages-channel-and-download.js
index 483b8672..65d3a400 100644
--- a/src/libpoketube/init/pages-channel-and-download.js
+++ b/src/libpoketube/init/pages-channel-and-download.js
@@ -148,6 +148,7 @@ module.exports = function (app, config, renderTemplate) {
         IsOldWindows,
         tab,
         continuation,
+        media_proxy_url: config.media_proxy,
         results: "",
         q: query,
         summary: "",
@@ -314,6 +315,7 @@ module.exports = function (app, config, renderTemplate) {
         cinv,
         convert,
         turntomins,
+        media_proxy_url: config.media_proxy,
         dnoreplace,
         continuation,
         wiki: "",

From b7395b8a92930a4e5c82ba902f2b8031a7a96bb2 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 10:19:33 +0000
Subject: [PATCH 58/78] add new proxy :3

---
 html/channel.ejs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/channel.ejs b/html/channel.ejs
index f897c286..ee99c941 100644
--- a/html/channel.ejs
+++ b/html/channel.ejs
@@ -1054,7 +1054,7 @@ width: fit-content;
 
    <% tj.videos.forEach (x =>  { %>
 			<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">
 					<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)) { %> 
     <% shorts.videos.forEach (x =>  { %>
       <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>
       </a>
     <% }) %>   
@@ -1211,7 +1211,7 @@ width: fit-content;
 
    <% stream.videos.forEach (x =>  { %>
 			<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">
 					<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;
 "  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=&quot;avc1.64001F, mp4a.40.2&quot;" label="hd720" selected="false">
@@ -1303,7 +1303,7 @@ width: fit-content;
                                                                                  <% if (x.attachment.imageThumbnails[4] ) { %>
  
                                                                                    <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%>">
                <% } %>               <% } %>
 
                  

From a181b82fa455501aa57a6550085aa9c69076d480 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 18:35:30 +0000
Subject: [PATCH 59/78] fix cursor :3

---
 css/app.main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/app.main.css b/css/app.main.css
index bccb47f3..8c483fea 100644
--- a/css/app.main.css
+++ b/css/app.main.css
@@ -743,7 +743,7 @@ body {
 }
 
 
-body, .loaded {cursor: url('/static/cursor.ico'), default !important}
+body, .loaded {cursor: url('/static/cursor.ico'), default}
 
 a,
 btn,

From a5fd4198a0babe92c53dcfd45474449ca6c94002 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 18:39:34 +0000
Subject: [PATCH 60/78] fix cursor :3

---
 css/app.main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/app.main.css b/css/app.main.css
index 8c483fea..2246df48 100644
--- a/css/app.main.css
+++ b/css/app.main.css
@@ -743,7 +743,7 @@ body {
 }
 
 
-body, .loaded {cursor: url('/static/cursor.ico'), default}
+body, {cursor: url('/static/cursor.ico'), default}
 
 a,
 btn,

From 754765aa35fe1c5399b3f164404c4f8f8586dcba Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 18:42:27 +0000
Subject: [PATCH 61/78] fix cursor :3 (Again)

---
 css/app.main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/app.main.css b/css/app.main.css
index 2246df48..776fabbe 100644
--- a/css/app.main.css
+++ b/css/app.main.css
@@ -753,7 +753,7 @@ select,
 button,
 summary,
 span > a,
-li > a {cursor: url('/static/cursor-pointer.ico'), pointer}
+li > a {cursor: url('/static/cursor-pointer.ico'), pointer !important;}
 
 p {
   color: #fff;

From 8ad4f1dab6768870c57237b8743526bb985d7996 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 18:43:48 +0000
Subject: [PATCH 62/78] update version :3

---
 html/poketube.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 163ddcf3..971c5e5b 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -353,7 +353,7 @@ a[data-onclick="jump_to_time"] {
  
   <!-- css files -->
   <link href="/css/app-cdn.min.css" rel=stylesheet>
-  <link href="/css/app.main.css" rel=stylesheet>
+  <link href="/css/app.main.css?v=4" rel=stylesheet>
   <link href="/css/watch.main.css" rel=stylesheet>
   <link href="/css/watch-util.css" rel=stylesheet>
   <link href="/css/watch-navbar.css" rel=stylesheet>

From dbea239efb689a4d5333f6d6af29372e146f931f Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 18:44:27 +0000
Subject: [PATCH 63/78] update version :3

---
 html/search.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/search.ejs b/html/search.ejs
index de74edbb..6f9d54b5 100644
--- a/html/search.ejs
+++ b/html/search.ejs
@@ -23,7 +23,7 @@
 <link rel="manifest" href="/manifest.json">
   <link href=/css/yt-ukraine.svg?v=6 rel=icon>
  <link href=/css/app-cdn.min.css rel=stylesheet>
-<link href=/css/app.main.css rel=stylesheet>
+<link href=/css/app.main.css?v=2 rel=stylesheet>
 <link href=/css/search.main.css rel=stylesheet> 
  <link href=/css/watch.main.css rel=stylesheet>
 <link rel="search" type="application/opensearchdescription+xml" title="PokeTube" href="https://poketube.fun/api/opensearch" />

From 3be7e498942098cf42b316f306d661df021519e0 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 18:44:57 +0000
Subject: [PATCH 64/78] update version :3

---
 html/channel.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/channel.ejs b/html/channel.ejs
index ee99c941..9c67f00d 100644
--- a/html/channel.ejs
+++ b/html/channel.ejs
@@ -219,7 +219,7 @@ padding-bottom: 32px;
    </style>
   
   <link href=/css/app-cdn.min.css rel=stylesheet>
-  <link href=/css/app.main.css rel=stylesheet>
+  <link href=/css/app.main.css?v=459 rel=stylesheet>
   <link href="/css/watch.main.css?v=56" rel=stylesheet>
    <link href="/css/watch-util.css" rel=stylesheet>
 

From 21c8b22135de2c458a388c15fe42d3c16f7329c3 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 18:45:30 +0000
Subject: [PATCH 65/78] update version :3

---
 html/lite.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/lite.ejs b/html/lite.ejs
index d88c0f67..a51e90e5 100644
--- a/html/lite.ejs
+++ b/html/lite.ejs
@@ -261,7 +261,7 @@ background: none !important;
     </style>
  
   <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-util.css" rel=stylesheet>
    <link href="/css/watch-navbar.css?v=56" rel=stylesheet>

From 6c25d48da5b0300f86ed8839b8e778eaaff7f74d Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 18:46:07 +0000
Subject: [PATCH 66/78] update version :3

---
 html/account-me.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/account-me.ejs b/html/account-me.ejs
index ab2598a4..58314131 100644
--- a/html/account-me.ejs
+++ b/html/account-me.ejs
@@ -3,7 +3,7 @@
           <title>PokeTube | Subscriptions </title>
         <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/app.main.css rel=stylesheet>
+       <link href=/css/app.main.css?v=39 rel=stylesheet>
     <style>
 
         /* Define the grid container */

From 88f6ed5339f6fb87020b3c24dcaf8a1f53ceb617 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 18:46:42 +0000
Subject: [PATCH 67/78] update version :3

---
 html/custom-css.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/custom-css.ejs b/html/custom-css.ejs
index 49da630e..2788146d 100644
--- a/html/custom-css.ejs
+++ b/html/custom-css.ejs
@@ -28,7 +28,7 @@
     <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.main.css rel=stylesheet>
+<link href=/css/app.main.css?v=3 rel=stylesheet>
 <link href=/css/search.main.css rel=stylesheet> 
       <meta content="#f97794" name="theme-color" />
  <link href=/css/watch.main.css rel=stylesheet>

From aa05e0f735bc554a0ce0df8dd7a053f2662beb9a Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:16:20 +0000
Subject: [PATCH 68/78] oh god

---
 css/app.main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/app.main.css b/css/app.main.css
index 776fabbe..76c7eb49 100644
--- a/css/app.main.css
+++ b/css/app.main.css
@@ -743,7 +743,7 @@ body {
 }
 
 
-body, {cursor: url('/static/cursor.ico'), default}
+body {cursor: url('/static/cursor.ico'), default}
 
 a,
 btn,

From 41b231c2ab2eddf090d479d8427607ec0cbf6475 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:16:49 +0000
Subject: [PATCH 69/78] Update html/poketube.ejs

---
 html/poketube.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/poketube.ejs b/html/poketube.ejs
index 971c5e5b..a34b6259 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -353,7 +353,7 @@ a[data-onclick="jump_to_time"] {
  
   <!-- css files -->
   <link href="/css/app-cdn.min.css" rel=stylesheet>
-  <link href="/css/app.main.css?v=4" rel=stylesheet>
+  <link href="/css/app.main.css?v=445" rel=stylesheet>
   <link href="/css/watch.main.css" rel=stylesheet>
   <link href="/css/watch-util.css" rel=stylesheet>
   <link href="/css/watch-navbar.css" rel=stylesheet>

From 8923c8e82632313249f9403a638b74cb9cdf1987 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:17:12 +0000
Subject: [PATCH 70/78] update version :3

---
 html/account-me.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/account-me.ejs b/html/account-me.ejs
index 58314131..7c5b353a 100644
--- a/html/account-me.ejs
+++ b/html/account-me.ejs
@@ -3,7 +3,7 @@
           <title>PokeTube | Subscriptions </title>
         <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/app.main.css?v=39 rel=stylesheet>
+       <link href=/css/app.main.css?v=3449 rel=stylesheet>
     <style>
 
         /* Define the grid container */

From c6e840a41cebd2fbb42449321bf11bad4a478ed0 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:17:34 +0000
Subject: [PATCH 71/78] update version :3

---
 html/channel.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/channel.ejs b/html/channel.ejs
index 9c67f00d..63c9a24a 100644
--- a/html/channel.ejs
+++ b/html/channel.ejs
@@ -219,7 +219,7 @@ padding-bottom: 32px;
    </style>
   
   <link href=/css/app-cdn.min.css rel=stylesheet>
-  <link href=/css/app.main.css?v=459 rel=stylesheet>
+  <link href=/css/app.main.css?v=4459 rel=stylesheet>
   <link href="/css/watch.main.css?v=56" rel=stylesheet>
    <link href="/css/watch-util.css" rel=stylesheet>
 

From 61cb1be2c1d1fddbac343ac8e0edff33875f1304 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:18:21 +0000
Subject: [PATCH 72/78] update version :3

---
 html/channel.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/channel.ejs b/html/channel.ejs
index 63c9a24a..65f0e388 100644
--- a/html/channel.ejs
+++ b/html/channel.ejs
@@ -219,7 +219,7 @@ padding-bottom: 32px;
    </style>
   
   <link href=/css/app-cdn.min.css rel=stylesheet>
-  <link href=/css/app.main.css?v=4459 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-util.css" rel=stylesheet>
 

From 5d4dd74a35058480e3960cd22f0338f85b842bed Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:18:48 +0000
Subject: [PATCH 73/78] update version :3

---
 html/lite.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/lite.ejs b/html/lite.ejs
index a51e90e5..2c904271 100644
--- a/html/lite.ejs
+++ b/html/lite.ejs
@@ -262,7 +262,7 @@ background: none !important;
  
   <link href=/css/app-cdn.min.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-navbar.css?v=56" rel=stylesheet>
   <link href="/css/poketube.css?v=56" rel=stylesheet>

From e10ee389b975bc12f16be361884e974c47866d47 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:19:09 +0000
Subject: [PATCH 74/78] update version :3

---
 html/custom-css.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/custom-css.ejs b/html/custom-css.ejs
index 2788146d..b030e44c 100644
--- a/html/custom-css.ejs
+++ b/html/custom-css.ejs
@@ -28,7 +28,7 @@
     <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.main.css?v=3 rel=stylesheet>
+<link href=/css/app.main.css?v=35 rel=stylesheet>
 <link href=/css/search.main.css rel=stylesheet> 
       <meta content="#f97794" name="theme-color" />
  <link href=/css/watch.main.css rel=stylesheet>

From 9548852d17a093beae2333881aff6c3dd7990fb6 Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:19:29 +0000
Subject: [PATCH 75/78] update version :3

---
 html/download.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/download.ejs b/html/download.ejs
index fb75fbe8..7e820bec 100644
--- a/html/download.ejs
+++ b/html/download.ejs
@@ -31,7 +31,7 @@
     <meta content=@PoketaleBot name=twitter:site>
     <meta content=@PoketaleBot name=twitter:creator>
     <link href=/css/app-cdn.min.css rel=stylesheet>
-    <link href=/css/app.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="/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>

From c36a795fdd0bf2b2d9a6b23fc8c64b375f16127a Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:20:21 +0000
Subject: [PATCH 76/78] update version :3

---
 html/search.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/search.ejs b/html/search.ejs
index 6f9d54b5..afa3933c 100644
--- a/html/search.ejs
+++ b/html/search.ejs
@@ -23,7 +23,7 @@
 <link rel="manifest" href="/manifest.json">
   <link href=/css/yt-ukraine.svg?v=6 rel=icon>
  <link href=/css/app-cdn.min.css rel=stylesheet>
-<link href=/css/app.main.css?v=2 rel=stylesheet>
+<link href=/css/app.main.css?v=25 rel=stylesheet>
 <link href=/css/search.main.css rel=stylesheet> 
  <link href=/css/watch.main.css rel=stylesheet>
 <link rel="search" type="application/opensearchdescription+xml" title="PokeTube" href="https://poketube.fun/api/opensearch" />

From 4505cc0aa0934e1cc7beebf8ae3a197aabb11e5a Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:20:50 +0000
Subject: [PATCH 77/78] update version :3

---
 html/discover.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/discover.ejs b/html/discover.ejs
index ada5c711..2a6b330b 100644
--- a/html/discover.ejs
+++ b/html/discover.ejs
@@ -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.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/watch.main.css rel=stylesheet>
      <link href="https://fonts.poketube.fun/css/fonts.css" rel=stylesheet>

From b0776f43a7434d45ef0b24221de8973336e2294f Mon Sep 17 00:00:00 2001
From: Ashley <iamashley@duck.com>
Date: Thu, 14 Dec 2023 19:27:34 +0000
Subject: [PATCH 78/78] add new url :3

---
 src/libpoketube/init/pages-video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpoketube/init/pages-video.js b/src/libpoketube/init/pages-video.js
index eb361f06..f8e3e007 100644
--- a/src/libpoketube/init/pages-video.js
+++ b/src/libpoketube/init/pages-video.js
@@ -246,7 +246,7 @@ module.exports = function (app, config, renderTemplate) {
         }
 
         if (inv_vid.author.endsWith(" - Topic")) {
-          var vidurl = "https://vid.theedgeofrage.com";
+          var vidurl = "https://eu-proxy.poketube.fun";
           var isvidious = true;
         }