im bored now

.dockerignore

@@ -3,8 +3,13 @@
 .git
 .gitignore
 node_modules
-invidious-source
 json.sqlite
 *.md
-docker-compose.yml
+/docker-compose.yml
-Dockerfile
+/Dockerfile
+/config.json
+/january
+/pokevidious
+/p
+/t
+/sdk

.drone.yml

@@ -1,19 +1,19 @@
 kind: pipeline
 type: exec
-name: Build and Push Docker Image
+name: Build and Push Docker Image (Quay)
 
 platform:
   os: linux
-  arch: arm64
+  arch: amd64
 
 steps:
 - name: Build
   environment:
-    CODEBERG_USERNAME:
+    QUAY_USERNAME:
-      from_secret: CODEBERG_USERNAME
+      from_secret: QUAY_USERNAME
-    CODEBERG_PASSWORD:
+    QUAY_PASSWORD:
-      from_secret: CODEBERG_PASSWORD
+      from_secret: QUAY_PASSWORD
   commands:
-    - echo $CODEBERG_PASSWORD | docker login codeberg.org --username $CODEBERG_USERNAME --password-stdin
+    - echo $QUAY_PASSWORD | docker login quay.io --username $QUAY_USERNAME --password-stdin
-    - docker build -t codeberg.org/korbs/poke:arm64 .
+    - docker build -t quay.io/sudovanilla/poketube .
-    - docker push codeberg.org/korbs/poke:arm64
+    - docker push quay.io/sudovanilla/poketube

.gitignore

@@ -3,4 +3,3 @@ yarn.lock
 package-lock.json
 .env
 json.sqlite
-config.json

Dockerfile

@@ -2,10 +2,14 @@
 ## docker build -t poketube .
 
 ## To run the image, run:
-## docker run -d  -p 6003:6003 poketube
+## docker run -p 6003:6003 -v ./config.json:/poketube/config.json:ro poketube
+## but preferably, use the docker-compose.yml file
 
-# Base (Debian)
+# Base
-FROM debian
+FROM node:16-alpine
+
+# Install dependencies
+RUN apk add --no-cache git build-base python3
 
 # Set Work Directory
 WORKDIR /poketube
@@ -14,21 +18,8 @@ COPY . /poketube
 # Expose Ports
 EXPOSE 6003
 
-# Install Requirements
+# Install Dependencies
-RUN apt-get update && apt-get -y install \
-    libcurl4-openssl-dev make g++ ca-certificates curl gnupg
-
-# Install NodeJS v18
-RUN mkdir -p /etc/apt/keyrings
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-
-RUN apt-get update
-RUN apt-get -y install nodejs npm
-
-# Install Packages
 RUN npm install
 
-# Run
+# Start the app
-CMD npm start
+CMD ["npm", "start"]

LICENSE-APPSTORE.md

@@ -1,13 +0,0 @@
-The developers are aware that the terms of service that apply to apps distributed via Apple's App Store services and similar app stores may conflict
-with rights granted under the Poke license, the GNU General
-Public License, version 3.
-
-The copyright holders of the Poke project do not wish this conflict to prevent the otherwise-compliant distribution of derived apps via the App Store and similar app stores.
-
-Therefore, we have committed not to pursue any license
-violation that results solely from the conflict between the GNU GPLv3
-and the Apple App Store terms of service or similar app stores. In
-other words, as long as you comply with the GPL in all other respects,
-including its requirements to provide users with source code and the
-text of the license, we will not object to your distribution of the
-Poke project through the App Store.

README.md

@@ -1,89 +1,165 @@
+ 
 <h1 align="center">
   <a href="https://poketube.fun/watch?v=9sJUDx7iEJw&quality=medium&=sjohgteojgytrueugtye4jhtytjrjnyıı">
-    <img src="https://poketube.fun/css/logo-poke.svg" width="400">
+   <img src="https://poketube.fun/css/logo-poke.svg" width="400"> 
-  </a>
+    <a href="http://www.defectivebydesign.org/drm-free">
-  <a href="http://www.defectivebydesign.org/drm-free">
+<img src="https://static.fsf.org/dbd/label/DRM-free%20label%20120.en.png" 
-    <img src="https://static.fsf.org/dbd/label/DRM-free%20label%20120.en.png" 
+alt="DefectiveByDesign.org"
-    alt="DRM Free" width="65" height="65" border="0" align="middle" />
+width="65" height="65" border="0" align="middle" /></a>
-  </a>
+   </a>
-  <p>THE PRIVACY APP OF YOUR DREAMS! :3</p>
+   <p>The Ultimate Privacy App</p>
-</h1>
+   </h1>
+  
+<div align="center">
+
+   <span> Be Anonymous watching epic videos, searching thingys on the interwebs and listening to music on poke - the free privacy front end!</span>
+   
+   <span>"Since you work on poke, Are you in touch with its lead developer "Jose marchasi"? <br>
+-RMS 
+
+Stallman though poke was GNU poke lmaoooo
+   </span>
+   </div>
+
 
 <div align="center">
-  <p>Be anonymous while watching (cat falling) videos, searching the web, and listening to music on Poke - the free privacy front-end!</p>
-</div>
 
-<div align="center">
+[Welcome!](#welcome)&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;[Features](#features)&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;[No non-free codec needed](#no-non-free-codec-needed-3)&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;[Hosting Poke~](#hosting-poketube)&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;[Poke community!](#poketube-community)&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;[The Legal Stuff (boring tbh)](#the-legal-stuff-boring-tbh)
-  <a href="#welcome">Welcome!</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="#features">Features</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="#no-non-free-codec-needed">No Non-Free Codec</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="#hosting-poke">Hosting</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="#poke-community">Community</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="#legal">Legal</a>
-  <br><br>
-  <img src="https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg" alt="Stand with Ukraine">
-  <a href="./LICENSE">
-    <img src="https://img.shields.io/badge/License-GPL--3-FF6666" alt="GPL-3-or-later License">
-  </a>
-</div>
 
-![Preview](./css/README_Preview.png)
+<a href="https://status.poketube.fun" target="_blank">
+  <img 
+    width="170"
+    src="https://api.netweak.com/status-badges/K2LY9"
+    alt="Netweak status badge"
+  />
+</a><br>
+<a href="https://tosdr.org/en/service/7114">
+   <img src="https://shields.tosdr.org/en_7114.svg"/>
+</a>
+<img src="https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg"> <a href="./LICENSE"><img src="https://img.shields.io/badge/License-GPL--3-FF6666" alt="License - GPL-3"></a>
+
+<a href="https://ci.poketube.fun/ashley/poke">
+  <img src="https://ci.poketube.fun/api/badges/ashley/poke/status.svg" />
+</a>
+</div>
 
 ## Welcome!
 
-Welcome to Poke (formerly PokeTube), the privacy-friendly YouTube front-end built with the invidious API! Imagine paying for YouTube Premium just to download videos - couldn't be us (literally).
+This is the source code of Poke (formerly PokeTube), the privacy-friendly youtube front-end built with the InnerTube API!
 
-## Features
 
-| <img width="100%" style="border-radius: 24px" src="./css/README_RYD.png"> | <div style="text-align: left"><h3>🔙 Built-In Return YouTube Dislikes</h3>See the dislikes from *returnyoutubedislike* - because sometimes you need to know how bad that video really is :3</div> |
+<h1>Features</h1>
-| - | - |
+ <h3>Return Youtube Dislikes Built-in  </h3>
-| <div style="text-align: right"><h3>📱 PWA Support</h3>With PWA Support, you can install Poke on your mobile device. Now you can pretend to be productive while watching cat videos on the go, mreoww! :3</div> | <img width="100%" style="border-radius: 24px" src="./css/README_PWA.jpg"> |
+<img src="https://autumn.revolt.chat/attachments/0JlGwlnJdMcQwc6qzoo2qpmMAOWbrYMZ9vDX50l80r/resim.png">
-| <h3>🎨 Customize</h3>Customize Poke however you want. Make it as unique as your taste in memes. | <h3>📥 Accounts</h3>Suscribe (yes Suscribe hehe sussy baka) to whaever channel you want! </div> |
+<p>See the dislikes from returnyoutubedislike!</p>
-| <h3>🔍 Web Search</h3>Search the web privately on PokeTube. Incognito mode who? | <h3>🎶 And...</h3>Ambient mode, HQ audio, and even more! :3 |
 
-## No Non-Free Codec Needed
+<h3>Customize</h3>
+Customize Poketube However you want :3
 
-Poke uses OpenH264, which is free software! No non-free components included :3 View the source code of OpenH264 [here](https://github.com/cisco/openh264.git). Because who wants to deal with non-free stuff? Not us!~
+<h3>PWA</h3>
+Install PokeTube as a pwa on your mobile device :3
 
-## Hosting Poke
+<h3>Accounts </h3>
+Suscribe (yes Suscribe hehe sussy baka) to whaever channel you want!
 
-### NodeJS
+<h3>Web Search </h3>
+Search the web privatly on poketube :3
 
-1. **Install Packages**
+<br>
-   - Fedora/RHEL GNU/linux: `$ sudo dnf install git make gcc libcurl nodejs python libcurl g++ curl-config`
+<h3>And... </h3>
-   - Debian/Ubuntu GNU/linux: `$ sudo apt install git make gcc libcurl4-openssl-dev nodejs npm python g++`
+<p>
-   - Alpine Linux (non-gnu): `$ apk add git nodejs npm python make gcc g++ libcurl curl-dev`
+Ambient mode, HQ audio And Even more!!!!!
-     
+ </p>
-     (we dont know if it works on non-gnu systems)
 
-2. **Clone Repo**
+## Written by humans - not gpt
-   - Codeberg: `$ git clone https://codeberg.org/ashley/poke.git`
+poke is made by hard-working hoomans - not gpt :3<br>
-   - GitHub: `$ git clone https://github.com/ashley0143/poke.git`
+<a href="https://notbyai.fyi"><img src="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/Written-By-Human-Not-By-AI-Badge-white.svg?v=1696672202901" alt="Written by Humanss, Not by AI"></a>
-    
-   reccomended unoffical mirrors:
-   - code.lgbt: `$ git clone https://code.lgbt/mirror/poke.git` [sync every 10mins]
-   - git.lgbt: `$ git clone https://git.lgbt/mirror/poke.git` [sync every 10mins]
-   - nin0git :`$ git clone https://git.nin0.dev/mirrors/poke.git` [sync every 10mins]
 
-    not reccomended, unstable
+## No Non-free codec needed :3
-   - SudoVanilla: `$ git clone https://ark.sudovanilla.org/Korbs/poke.git` [sync every week]
 
-3. **Install Dependencies**
+Poke uses openh264 which is free software! poketube does not inculude non free stuff owowowoow!!!!
-   - `$ cd poke`
-   - `$ npm install`
 
-4. **Start Server**
+you can view the source code of the openh264 codec in this repo :3 --> https://github.com/cisco/openh264.git
-   - `$ node server.js`
 
-   Congrats! Poke should now be running on `localhost:6003`! 🎉
+PLEASE NOTE THAT THIS SOFTWARE MAY INCULUDE CODECS THAT IN CERTAIN COUNTRIES MAY BE COVERED BY PATENTS OR HAVE LEGAL ISSUES. PATENT AND COPYRIGHT LAWS OPERATE DIFFERENTLY DEPENDING ON WHICH COUNTRY YOU ARE IN. PLEASE OBTAIN LEGAL ADVICE IF YOU ARE UNSURE WHETHER A PARTICULAR PATENT OR RESTRICTION APPLIES TO A CODEC YOU WISH TO USE IN YOUR COUNTRY.
- 
-## Poke Community
 
-Join us on [Discord](https://discord.poketube.fun/) or [Matrix](https://matrix.to/#/#poke:vern.cc)! I promise we're cool! <3
+## Hosting Poke~
 
-or if u like fedi, we host [PokeSocial](https://social.poketube.fun) as well :3
+### IMPORTANT 
+Before you host, if ur server is in usa, set the proxylocation to `USA` (which is the default) - if you use any eu server set it to `EU` instead to make videos load faster
+
+ ### With NodeJS
+- To self host your own Poke instance, you'll need the following:
+
+  - [Node.js](https://nodejs.org/en/download/)
+  - [npm](http://npmjs.com) (Included with Node.js)
+
+Once you have everything, clone our repo:
+
+```
+git clone https://codeberg.org/ashley/poke.git
+```
+
+You can also clone using our Github mirror if you'd prefer:
+
+```
+git clone https://github.com/ashley0143/poke.git
+```
+
+Or you can use our forgejo instance:
+
+```
+git clone https://git.poketube.fun/ashley/poke.git
+```
+
+Now, install the needed dependencies within the Poke folder:
+( go to the folder by running cd poke)
+```
+npm install 
+```
+
+Once everythings installed, start your server with the following command:
+
+```
+node server.js
+```
+
+Congrats, Poketube should now be running on `localhost:6003`!
+
+### With Docker
+Create a new directory for PokeTube:
+```
+mkdir poketube && cd poketube
+```
+
+Download the docker compose and config file:
+```
+curl -O https://codeberg.org/Ashley/poke/raw/branch/main/docker-compose.yml
+```
+
+Run PokeTube:
+```
+docker compose up -d
+```
+
+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
+
+## Poke community!
+
+Join the community on [revolt](https://rvlt.gg/poketube) or [matrix](https://matrix.to/#/#poke:vern.cc) :3
 
 ## The Legal Stuff (boring tbh)
 the main parts of the project is Under GPL-3.0-OR-LATER :3
 
-see the each sections LICENSE tho!! 
+see the each sections LICENSE tho!!
-
+Copyleft 2021-202x Poke Project
-Copyleft 2021-202x Poke Project, mostly ashley0143 - poke does not support the ["source first"](https://sourcefirst.com/) or ["open source"](https://opensource.org) movement :3 - we support the free software movement (fsf.org)
 
 
 [Code Of conduct](https://codeberg.org/Ashley/poke/src/branch/main/CODE_OF_CONDUCT.md)
@@ -92,17 +168,11 @@ Copyleft 2021-202x Poke Project, mostly ashley0143 - poke does not support the [
 
 TL;DR: we dont collect or share your personal info, that's it lol.
 
-We use the GNU Coding Standard Thingy, see [this link.](https://www.gnu.org/prep/standards)
+We additionally use the GNU Coding Standard, see [this link.](https://www.gnu.org/prep/standards)
 
+<div>
+<h3>some parts of poketube.fun is proudly hosted on glitch.com since <i>2020</i> </h3>
+ <a href="https://glitch.com/"><img src="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/glitch-fastly-lock-up.svg?v=1696671148266"></a><br><hr>
+<a href="https://gnu.org/not-open-source"><img width="200" src="https://autumn.revolt.chat/attachments/eNpfwV2C1_wudONe43YCvWr-4vbvLpG78HbuXgOYfO"></a>
+</div>
 
-<div align="center">
-  <p>Parts of Poke are hosted on Glitch.com since <i>2020</i>.</p>
-  <a href="https://glitch.com/">
-    <img src="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/glitch-fastly-lock-up.svg">
-  </a>
-  <br><hr>
-  <p> this software does not support <a href="https://opensource.org">"OSI"</a> - <a href="https://rationalwiki.org/wiki/Eric_S._Raymond#Open_Source">they are terrible people </a> - pls support the FSF/GNU (<a href="https://fsf.org">fsf.org</a> or <a href="https://gnu.org">gnu.org</a>) instead :3 </p>
-  <a href="https://gnu.org/not-open-source">
-    <img width="200" src="https://autumn.revolt.chat/attachments/eNpfwV2C1_wudONe43YCvWr-4vbvLpG78HbuXgOYfO">
-  </a>
-</div>

ascii_txt.txt

@@ -1,25 +0,0 @@
-
-
-          _____                   _______                   _____                    _____          
-         /\    \                 /::\    \                 /\    \                  /\    \         
-        /::\    \               /::::\    \               /::\____\                /::\    \        
-       /::::\    \             /::::::\    \             /:::/    /               /::::\    \       
-      /::::::\    \           /::::::::\    \           /:::/    /               /::::::\    \      
-     /:::/\:::\    \         /:::/~~\:::\    \         /:::/    /               /:::/\:::\    \     
-    /:::/__\:::\    \       /:::/    \:::\    \       /:::/____/               /:::/__\:::\    \    
-   /::::\   \:::\    \     /:::/    / \:::\    \     /::::\    \              /::::\   \:::\    \   
-  /::::::\   \:::\    \   /:::/____/   \:::\____\   /::::::\____\________    /::::::\   \:::\    \  
- /:::/\:::\   \:::\____\ |:::|    |     |:::|    | /:::/\:::::::::::\    \  /:::/\:::\   \:::\    \ 
-/:::/  \:::\   \:::|    ||:::|____|     |:::|    |/:::/  |:::::::::::\____\/:::/__\:::\   \:::\____\
-\::/    \:::\  /:::|____| \:::\    \   /:::/    / \::/   |::|~~~|~~~~~     \:::\   \:::\   \::/    /
- \/_____/\:::\/:::/    /   \:::\    \ /:::/    /   \/____|::|   |           \:::\   \:::\   \/____/ 
-          \::::::/    /     \:::\    /:::/    /          |::|   |            \:::\   \:::\    \     
-           \::::/    /       \:::\__/:::/    /           |::|   |             \:::\   \:::\____\    
-            \::/____/         \::::::::/    /            |::|   |              \:::\   \::/    /    
-             ~~                \::::::/    /             |::|   |               \:::\   \/____/     
-                                \::::/    /              |::|   |                \:::\    \         
-                                 \::/____/               \::|   |                 \:::\____\        
-                                  ~~                      \:|   |                  \::/    /        
-                                                           \|___|                   \/____/         
-                                                                                                    
-

backend-services/README.md

@@ -1 +0,0 @@
-haii!! these files are made for the poke's server - if u wanna use them on ur server u might have to change the directories :p 

backend-services/scripts/inv-refresh-token.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-#
-#    Copyright (C) 2024-20xx Poke! (https://codeberg.org/ashley/poke)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-scriptDir=$(dirname "$(readlink -f "$0")")
-
-output=$(docker run quay.io/invidious/youtube-trusted-session-generator)
-
-visitor_data=$(echo "$output" | grep -oP '(?<=visitor_data: )[^ ]+')
-po_token=$(echo "$output" | grep -oP '(?<=po_token: )[^ ]+')
-
-if [ -z "$visitor_data" ] || [ -z "$po_token" ]; then
-  echo "Error: Could not generate visitor_data or po_token."
-  exit 1
-fi
-
-sed -i "s/visitor_data: .*/visitor_data: $visitor_data/g" $scriptDir/../services/invidious/docker-compose.yml
-sed -i "s/po_token: .*/po_token: $po_token/g" $scriptDir/../services/invidious/docker-compose.yml
-
-cd $scriptDir/../services/invidious
-
- docker compose up -d
-
-echo "Successfully updated visitor_data and po_token on Invidious."
-

backend-services/scripts/inv-restart-docker.sh

@@ -1,164 +0,0 @@
-#!/bin/bash
-
-#
-#    Copyright (C) 2024-20xx Poke! (https://codeberg.org/ashley/poke)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Function to generate a random Chrome version
-generate_random_chrome_version() {
-    major=$((RANDOM % 100 + 1))    # Major version 1-99
-    minor=$((RANDOM % 100))        # Minor version 0-99
-    build=$((RANDOM % 10000))      # Build version 0-9999
-    patch=$((RANDOM % 100))        # Patch version 0-99
-    echo "$major.$minor.$build.$patch"
-}
-
-restart_services() {
-    echo "Restarting services..."
-
-    # Navigate to the script directory
-    scriptDir=$(dirname "$(readlink -f "$0")")
-
-    cd "$scriptDir/../services/invidious" || { echo "Error: Failed to navigate to $scriptDir/../services/invidious"; exit 1; }
-
-    docker compose down
-    echo "Services stopped. Restarting..."
-
-    docker compose up -d
-    echo "Services restarted successfully."
-
-    /home/qt/globe/scripts/inv-update-token.sh
-}
-
-fetch_playlist() {
-    local playlist_id="$1"
-    response=$(curl -s -w "%{http_code}" -o /tmp/playlist_data.json "https://invid-api.poketube.fun/api/v1/playlists/${playlist_id}")
-
-    if [ "$response" -eq 502 ] || [ "$response" -eq 500 ] || [ "$response" -eq 403 ]; then
-        echo "Error: Failed to fetch playlist data. HTTP Status: $response"
-        restart_services
-        return 1
-    elif [ "$response" -ne 200 ]; then
-        echo "Error: Failed to fetch playlist data. HTTP Status: $response"
-        return 1
-    fi
-}
-
-extract_video_ids() {
-    local json_data="$1"
-    video_ids=$(jq -r '.videos[].videoId' "$json_data")
-    if [ -z "$video_ids" ]; then
-        echo "Error: Failed to extract video IDs from the playlist data."
-        return 1
-    fi
-    echo "$video_ids"
-}
-
-# Playlist IDs to fetch
-playlist_ids=("PLMws9SCqJ1JCeVMVPsdamuUM0HK0MbA6g")
-
-# Base URL for the API
-base_url="http://localhost:54301/latest_version?id="
-
-# Pick a random playlist (without using invalid options in shuf)
-random_playlist_id="PLMC9KNkIncKvYin_USF1qoJQnIyMAfRxl"
-echo "Randomly selected playlist: $random_playlist_id"
-
-# Fetch playlist JSON data
-fetch_playlist "$random_playlist_id"
-if [ $? -ne 0 ]; then
-    echo "Error: Playlist fetch failed. Restarting services..."
-    restart_services  # Restart services before exiting
-    exit 1
-fi
-
-# Extract video IDs from the playlist
-video_ids=($(extract_video_ids "/tmp/playlist_data.json"))
-if [ $? -ne 0 ]; then
-    echo "Error: Failed to extract video IDs. Exiting..."
-    exit 1
-fi
-
-# Shuffle video IDs and pick 4 random videos
-shuffled_video_ids=($(shuf -e "${video_ids[@]}" | head -n 4))
-
-error_count=0  
-all_errors=(500 502 403)  
-
-for video_id in "${shuffled_video_ids[@]}"; do
-    # Add a cache buster query (unique random number)
-    unique_param=$RANDOM
-    url="${base_url}${video_id}&itag=18&local=true&_=${unique_param}"
-
-    # Generate a random Chrome version
-    chrome_version=$(generate_random_chrome_version)
-
-    user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/$chrome_version Safari/537.36"
-
-    response_headers=$(curl -s -D - -H "Cache-Control: no-cache, no-store, must-revalidate" \
-        -H "Pragma: no-cache" -H "Expires: 0" -A "$user_agent" "$url" -o /dev/null)
-
-    # Extract ETag and last modified info (if available)
-    etag=$(echo "$response_headers" | grep -i ETag | awk '{print $2}' | tr -d '"')
-    last_modified=$(echo "$response_headers" | grep -i Last-Modified | cut -d' ' -f2-)
-
-    # Use conditional request if ETag is present
-    if [ -n "$etag" ]; then
-        status_code=$(curl -s -o /dev/null -w "%{http_code}" -H "If-None-Match: $etag" \
-            -H "Cache-Control: no-cache, no-store, must-revalidate" -A "$user_agent" "$url")
-    else
-        status_code=$(curl -s -o /dev/null -w "%{http_code}" -A "$user_agent" "$url")
-    fi
-
-    # Echo the status code for visibility
-    echo "Checking URL: $url" 
-    echo "User Agent: $user_agent"
-    echo "HTTP Status Code for ID $video_id: $status_code"
-
-    if [[ " ${all_errors[@]} " =~ " ${status_code} " ]]; then
-        echo "Error: Received $status_code for ID $video_id."
-        error_count=$((error_count + 1))
-        
-        # Run the token refresh script
-        echo "Running inv-update-token.sh for ID $video_id..."
-        /home/qt/globe/scripts/inv-update-token.sh
-        /home/qt/globe/scripts/inv-update-token.sh
-        echo "inv-update-token.sh script executed successfully."
-
-        # Fetch the video again after token refresh
-        status_code=$(curl -s -o /dev/null -w "%{http_code}" -A "$user_agent" "$url")
-        echo "Post-token-refresh Status Code for ID $video_id: $status_code"
-        
-        # Check if it still results in 500/502/403 after refresh
-        if [[ " ${all_errors[@]} " =~ " ${status_code} " ]]; then
-            echo "Error: Received $status_code for ID $video_id after token refresh."
-        else
-            echo "Token refresh succeeded for ID $video_id."
-        fi
-    elif [ "$status_code" -eq 304 ]; then
-        echo "Content is still fresh for ID $video_id. No action required."
-    else
-        echo "we are so barack (Status code for ID $video_id is neither 502, 500, nor 403.)"
-    fi
-
-    echo "----------------****************----------------"  # Separator for readability
-done
-
-# If all videos still resulted in 500/502/403 errors even after running inv-update-token.sh, try restaring 
-if [ "$error_count" -eq "${#shuffled_video_ids[@]}" ]; then
-    echo "All videos failed to load after running inv-update-token.sh. Restarting services..."
-    restart_services
-fi

backend-services/services/yt-block-protect.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=YouTube anti-block
-
-[Service]
-Type=simple
-ExecStart=/home/qt/globe/scripts/inv-restart-docker.sh
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

backend-services/services/yt-block-protect.timer

@@ -1,10 +0,0 @@
-[Unit]
-Description=Make yt anti-block Run every Minute
-
-[Timer]
-OnUnitActiveSec=1min
-Unit=yt-block-protect.service
-
-[Install]
-WantedBy=timers.target
-

config.json

@@ -0,0 +1,17 @@
+{
+  "tubeApi": "https://inner-api.poketube.fun/api/",
+  "invapi": "https://invid-api.poketube.fun/api/v1",
+  "dislikes": "https://returnyoutubedislikeapi.com/votes?videoId=",
+  "invchannel": "https://invid-api.poketube.fun/api/v1",
+  "p_url": "https://p.poketube.fun",
+  "media_proxy": "https://image-proxy.poketube.fun",
+  "videourl": "https://eu-proxy.poketube.fun",
+  "email_main_url": "https://email-server.poketube.fun",
+  "mastodon_client_url": "https://fediverse.poketube.fun",
+  "libreoffice_online_url": "https://office.poketube.fun",
+  "cacher_max_age": "864000",
+  "enablealwayshttps": false,
+  "proxylocation": "USA",
+  "t_url": "https://t.poketube.fun/",
+  "server_port": "6003"
+}

config.json.example

@@ -1,20 +0,0 @@
-{
-    "tubeApi": "https://inner-api.poketube.fun/api/",
-    "invapi": "https://invid-api.poketube.fun/bHj665PpYhUdPWuKPfZuQGoX/api/v1",
-    "dislikes": "https://returnyoutubedislikeapi.com/votes?videoId=",
-    "invchannel": "https://invid-api.poketube.fun/api/v1",
-    "p_url":"https://p.poketube.fun",
-    "useragent":"PokeTube/2.0.0 (GNU/Linux; Android 14; Trisquel 11; poketube-vidious; like FreeTube)",
-    "media_proxy": "https://image-proxy.poketube.fun",
-    "videourl":"https://eu-proxy.poketube.fun",
-    "email_main_url":"https://email-server.poketube.fun",
-    "mastodon_client_url":"https://social.poketube.fun",
-    "mastodon_client_server_name":"PokeSocial",
-    "libreoffice_online_url":"https://office.poketube.fun",
-    "cacher_max_age": "86400",
-    "enablealwayshttps": false,
-    "proxylocation":"USA",
-    "banner":"welcome to poke!",
-    "t_url": "https://t.poketube.fun/",
-    "server_port": "6003"
-  }

css/app.js

@@ -17,14 +17,26 @@ d)).finalize(c)}}});var w=f.algo={};return f}(Math);
 c[d+n]|0;else{var r=a[n-15],g=a[n-2];a[n]=((r<<25|r>>>7)^(r<<14|r>>>18)^r>>>3)+a[n-7]+((g<<15|g>>>17)^(g<<13|g>>>19)^g>>>10)+a[n-16]}r=l+((p<<26|p>>>6)^(p<<21|p>>>11)^(p<<7|p>>>25))+(p&j^~p&k)+q[n]+a[n];g=((e<<30|e>>>2)^(e<<19|e>>>13)^(e<<10|e>>>22))+(e&f^e&m^f&m);l=k;k=j;j=p;p=h+r|0;h=m;m=f;f=e;e=r+g|0}b[0]=b[0]+e|0;b[1]=b[1]+f|0;b[2]=b[2]+m|0;b[3]=b[3]+h|0;b[4]=b[4]+p|0;b[5]=b[5]+j|0;b[6]=b[6]+k|0;b[7]=b[7]+l|0},_doFinalize:function(){var a=this._data,d=a.words,b=8*this._nDataBytes,e=8*a.sigBytes;
 d[e>>>5]|=128<<24-e%32;d[(e+64>>>9<<4)+14]=h.floor(b/4294967296);d[(e+64>>>9<<4)+15]=b;a.sigBytes=4*d.length;this._process();return this._hash},clone:function(){var a=g.clone.call(this);a._hash=this._hash.clone();return a}});s.SHA256=g._createHelper(f);s.HmacSHA256=g._createHmacHelper(f)})(Math);
 
-const video = document.getElementById('video'); 
+// Get the current URL
-
-// Replaces the current URL without the 'fx' parameter
 const url = new URL(window.location.href);
+
+// Remove the 'fx' query parameter
 url.searchParams.delete('fx');
+
+// Replace the current URL without the 'fx' parameter
 history.replaceState(null, '', url.toString());
 
 
+// Retrieve volume from local storage or set to max if not available
+const initialVolume = localStorage.getItem('playerVolume') || 1;
+const video = document.getElementById('video');
+video.volume = initialVolume;
+
+// Save volume to local storage whenever it changes
+video.addEventListener('volumechange', function() {
+  localStorage.setItem('playerVolume', this.volume);
+});
+
 // Get the progress bar and container elements
 const progressBar = document.querySelector(".progress-bar");
 const progressContainer = document.querySelector(".progress-container");
@@ -70,14 +82,6 @@ document.addEventListener('DOMContentLoaded', function() {
   window.addEventListener('resize', lazyLoadBg);
 });
 
-const htmlContent = `<!DOCTYPE html><html><head><title>Browser is not supported :p</title><style>body{margin-left:auto;margin-right:auto;display:flex;max-width:43em;font-family:sans-serif;background-color:white;}</style></head><body><h1>Heyo :3</h1><br><p style="margin-top:4em;margin-left:-7.4em;">hoi - poke does and <b>will not work</b> on Internet Explorer :p<br>if u wanna use poke try using Firefox (firefox.com) or Chromium :3<br>love u :3</p></body></html>`;
-
- if (/MSIE \d|Trident.*rv:/.test(navigator.userAgent)) {
-     document.open();
-    document.write(htmlContent);
-    document.close();
-}
-
 // Fade in elements on scroll or fullscreen change
 function fadeInElements() {
   const elements = document.querySelectorAll('.fade-in');
@@ -98,20 +102,13 @@ function jumpToTime(e) {
   const link = e.target;
   const video = document.getElementById('video');
   const time = link.dataset.jumpTime;
-
-  const qualityforaudiostuff = new URLSearchParams(window.location.search).get("quality") || "";
-  
-  if (qualityforaudiostuff !== "medium") {
-  var audiojumptotime = document.getElementById('aud');
-  audiojumptotime.currentTime = time;
-  }
   
   video.currentTime = time;
 
-  window.location.hash = 'top'; // Add #top to the URL
+  window.location.hash = 'top'; // Add #video to the URL
 
   setTimeout(() => {
-    history.replaceState(null, null, ' '); // Remove #top after 250MS
+    history.replaceState(null, null, ' '); // Remove #video after 1 second
   }, 250);
 }
 
@@ -136,8 +133,10 @@ const videoPlayer = document.getElementById('video');
 function time(seconds) {
   videoPlayer.currentTime = seconds;
 
+  // Add #video to the URL  
   window.location.hash = 'top'; 
 
+  // Remove #video after a short delay
   setTimeout(() => {   
     history.replaceState(null, null, ' '); 
   }, 250);  
@@ -162,9 +161,44 @@ function time(seconds) {
   }
 });
 
+
+  
+
+// Save and resume video progress
+const videoId = new URLSearchParams(window.location.search).get('v');
+const localStorageKey = `progress-${videoId}`;
+
+function saveProgress() {
+  localStorage.setItem(localStorageKey, video.currentTime);
+}
+
+function removeProgress() {
+  localStorage.removeItem(localStorageKey);
+}
+
+function resumeProgress() {
+  const progress = localStorage.getItem(localStorageKey);
+  if (progress) {
+    video.currentTime = progress;
+  }
+}
+
+window.addEventListener('beforeunload', () => {
+  saveProgress();
+});
+
+video.addEventListener('ended', () => {
+  removeProgress();
+});
+
+window.addEventListener('load', () => {
+  resumeProgress();
+});
+
+// Adjust video element style on fullscreen change
 const videoElement = document.getElementById("video");
 videoElement.addEventListener("fullscreenchange", () => {
-  videoElement.style.borderRadius = document.fullscreenElement === videoElement ? "0em !important" : "16px";
+  videoElement.style.borderRadius = document.fullscreenElement === videoElement ? "0em" : "16px";
 });
 
 function fetchUrls(urls) {
@@ -302,60 +336,50 @@ video.addEventListener("contextmenu", function(event) {
 
     loopedIndicator.style.display = "none"; // Initially hide the indicator
 
-loopOption.addEventListener("click", function() {
+    loopOption.addEventListener("click", function() {
-  const quaindt = new URLSearchParams(window.location.search).get("quality") || "";
+             var looped = video.loop;
+            video.loop = !looped;
 
-    var looped = video.loop;
-    video.loop = !looped;
 
-    if (quaindt !== "medium") {
+            // Update the looped indicator popup
-    var loopedaudioelement = document.getElementById("aud");
+            var displaySpecialText = Math.random() < 0.5;
-    if (loopedaudioelement) {
-        loopedaudioelement.loop = !looped;
-    }
-    }
 
-     var displaySpecialText = Math.random() < 0.5;
+            // Update the looped indicator popup
+            if (displaySpecialText) {
+                var specialText = looped ? "Unlooped >.<" : "Looped~ :3 >~<";
+                loopedIndicator.textContent = specialText;
+            } else {
+                loopedIndicator.textContent = looped ? "Unlooped!" : "Looped!";
+            }
+             loopedIndicator.style.display = "block";
 
-    if (displaySpecialText) {
+            // Hide the indicator after 2 seconds
-        var specialText = looped ? "Unlooped >.<" : "Looped~ :3 >~<";
+            setTimeout(function() {
-        loopedIndicator.textContent = specialText;
+                loopedIndicator.style.display = "none";
-    } else {
+            }, 2000);
-        loopedIndicator.textContent = looped ? "Unlooped!" : "Looped!";
-    }
-    loopedIndicator.style.display = "block";
 
-    // Hide the indicator after 2 seconds
+        });
-    setTimeout(function() {
-        loopedIndicator.style.display = "none";
-    }, 2000);
-});
 
-speedOption.addEventListener("click", function() {
+ speedOption.addEventListener("click", function() {
-    var currentSpeed = video.playbackRate;
+            var currentSpeed = video.playbackRate;
-    var newSpeed = getNextSpeed(currentSpeed);
+            var newSpeed = getNextSpeed(currentSpeed);
-
+            video.playbackRate = newSpeed;
-    video.playbackRate = newSpeed;
+            speedOption.innerHTML = "<i class='fa-light fa-gauge'></i> Speed: " + newSpeed.toFixed(2) + "x";
-    document.getElementById("aud").playbackRate = newSpeed;
+        });
-    speedOption.innerHTML = "<i class='fa-light fa-gauge'></i> Speed: " + newSpeed.toFixed(2) + "x";
-});
-
-function getNextSpeed(currentSpeed) {
-    var maxSpeed = (navigator.hardwareConcurrency < 3) ? 1 : 2; // Limit max speed based on CPU cores - for optimization 
-
-    if (currentSpeed === maxSpeed) {
-        return 0.25;
-    } else if (currentSpeed === 0.25) {
-        return 0.5;
-    } else if (currentSpeed === 0.5) {
-        return 0.75;
-    } else if (currentSpeed === 0.75) {
-        return 1;
-    } else {
-        return maxSpeed;
-    }
-}
 
+        function getNextSpeed(currentSpeed) {
+            if (currentSpeed === 2) {
+                return 0.25;
+            } else if (currentSpeed === 0.25) {
+                return 0.5;
+            } else if (currentSpeed === 0.5) {
+                return 0.75;
+            } else if (currentSpeed === 0.75) {
+                return 1;
+            } else {
+                return 2;
+            }
+        }
 
 const GoogleTranslateEndpoint = "https://translate.google.com/_/TranslateWebserverUi/data/batchexecute?rpcids=MkEWBc&rt=c"
 // @license-end

css/chatgptlogo.svg

@@ -1,26 +0,0 @@
-<svg
-  width="16"
-  height="16"
-  viewBox="0 0 16 16"
-  fill="none"
-  xmlns="http://www.w3.org/2000/svg"
->
-  <style>
-    @media (prefers-color-scheme: dark) {
-      .favicon-stroke {
-        fill: #fff;
-      }
-      .favicon-bg {
-        fill: #0d0d0d;
-      }
-    }
-  </style>
-  <rect class="favicon-bg" width="16" height="16" rx="4" fill="white" />
-  <g>
-    <path
-      class="favicon-stroke"
-      d="M12.9851 6.93777C13.1163 6.54364 13.1618 6.12607 13.1186 5.71295C13.0754 5.29983 12.9444 4.90072 12.7344 4.54231C12.4232 4.00021 11.9478 3.57101 11.3768 3.31664C10.8058 3.06227 10.1687 2.99589 9.55751 3.12706C9.28184 2.81639 8.943 2.56818 8.56362 2.39905C8.18425 2.22993 7.77314 2.14379 7.3578 2.1464C6.73292 2.1449 6.1237 2.34187 5.61797 2.70892C5.11225 3.07598 4.73616 3.59415 4.54391 4.18873C4.13684 4.27206 3.75225 4.44139 3.41591 4.68539C3.07957 4.92938 2.79924 5.24241 2.59368 5.60352C2.27994 6.14413 2.14602 6.77039 2.21123 7.39205C2.27644 8.01367 2.5374 8.59851 2.95649 9.06224C2.82527 9.45637 2.77975 9.87394 2.82297 10.2871C2.8662 10.7002 2.99718 11.0993 3.20713 11.4577C3.51841 11.9998 3.99385 12.4289 4.56484 12.6833C5.13584 12.9377 5.77289 13.0041 6.38407 12.8729C6.65975 13.1836 6.99862 13.4318 7.37796 13.601C7.75734 13.7701 8.16844 13.8562 8.58379 13.8536C9.20899 13.8552 9.81853 13.6582 10.3244 13.2909C10.8304 12.9236 11.2065 12.4051 11.3986 11.8101C11.8057 11.7268 12.1903 11.5575 12.5266 11.3135C12.8629 11.0695 13.1433 10.7564 13.3488 10.3953C13.6622 9.85477 13.7958 9.22866 13.7304 8.60726C13.6651 7.98587 13.4041 7.40129 12.9851 6.93777ZM8.58472 13.0883C8.0715 13.089 7.57441 12.9093 7.18031 12.5805C7.19808 12.5708 7.22925 12.5537 7.24956 12.5413L9.58061 11.1948C9.63911 11.1615 9.6877 11.1133 9.72136 11.055C9.75505 10.9967 9.77258 10.9305 9.77217 10.8632V7.57684L10.7575 8.14576C10.7626 8.14834 10.7671 8.15214 10.7704 8.15685C10.7738 8.16157 10.7759 8.16704 10.7766 8.17275V10.8943C10.7759 11.4756 10.5448 12.0329 10.1339 12.4441C9.72308 12.8554 9.16599 13.087 8.58472 13.0883ZM3.87091 11.075C3.61385 10.6309 3.5212 10.1105 3.60918 9.60485C3.62649 9.61524 3.65673 9.6337 3.67842 9.64617L6.00947 10.9926C6.06756 11.0266 6.13365 11.0445 6.20094 11.0445C6.2682 11.0445 6.33428 11.0266 6.39238 10.9926L9.23834 9.34936V10.4872C9.23867 10.493 9.23755 10.4988 9.23509 10.5041C9.23264 10.5094 9.22892 10.5139 9.22427 10.5174L6.86782 11.878C6.36379 12.1683 5.76516 12.2467 5.20333 12.0962C4.64148 11.9457 4.1623 11.5784 3.87091 11.075ZM3.25768 5.98617C3.51363 5.54141 3.91789 5.2009 4.39966 5.02421C4.39966 5.04429 4.39851 5.07985 4.39851 5.10452V7.79747C4.3981 7.86473 4.41561 7.93087 4.44924 7.98915C4.48287 8.04739 4.5314 8.09563 4.58984 8.1289L7.4358 9.77197L6.45054 10.3409C6.44568 10.3441 6.44009 10.346 6.43429 10.3465C6.4285 10.3471 6.42265 10.3462 6.41729 10.3439L4.06062 8.98216C3.55747 8.69077 3.19039 8.21176 3.03987 7.65013C2.88935 7.08853 2.96768 6.49014 3.25768 5.98617ZM11.3527 7.86994L8.50669 6.22667L9.49198 5.65799C9.49684 5.6548 9.50243 5.65283 9.50823 5.65231C9.51402 5.65178 9.51985 5.65272 9.5252 5.655L11.8819 7.01554C12.2429 7.2241 12.5371 7.53119 12.7299 7.90087C12.9228 8.27056 13.0063 8.68752 12.9707 9.10295C12.9351 9.51839 12.7819 9.91509 12.5291 10.2466C12.2762 10.5781 11.9341 10.8307 11.5428 10.9749C11.5428 10.9546 11.5428 10.919 11.5428 10.8943V8.20137C11.5434 8.13423 11.5261 8.06814 11.4926 8.0099C11.4592 7.95165 11.4109 7.90336 11.3527 7.86994ZM12.3333 6.394C12.316 6.38337 12.2858 6.36514 12.2641 6.3527L9.93303 5.00621C9.87493 4.97232 9.80887 4.95444 9.74158 4.95444C9.67432 4.95444 9.60824 4.97232 9.55014 5.00621L6.70418 6.64951V5.51167C6.70386 5.50585 6.70497 5.50005 6.70743 5.49479C6.70988 5.48952 6.7136 5.48492 6.71826 5.48144L9.0747 4.12203C9.4357 3.91387 9.84853 3.81281 10.2649 3.83068C10.6812 3.84856 11.0838 3.98462 11.4257 4.22296C11.7675 4.46129 12.0344 4.79204 12.1951 5.17652C12.3559 5.56099 12.4038 5.98327 12.3333 6.394ZM6.16851 8.42203L5.18299 7.85311C5.17784 7.85053 5.17336 7.84673 5.17002 7.84202C5.16668 7.8373 5.16455 7.83183 5.16385 7.82609V5.10452C5.16411 4.6877 5.28311 4.27956 5.5069 3.9279C5.73071 3.57623 6.05006 3.29559 6.42756 3.11883C6.80507 2.94206 7.22509 2.87649 7.63851 2.92977C8.05195 2.98306 8.44163 3.153 8.76197 3.41971C8.74421 3.42941 8.71327 3.44649 8.69272 3.45895L6.36168 4.80542C6.30317 4.83867 6.25462 4.8869 6.22093 4.94516C6.18727 5.0034 6.16974 5.06958 6.17012 5.13683L6.16851 8.42203ZM6.70371 7.26803L7.97126 6.53595L9.23878 7.26757V8.73127L7.97126 9.46292L6.70371 8.73127V7.26803Z"
-      fill="#0D0D0D"
-    />
-  </g>
-</svg>

css/landing.css

@@ -719,12 +719,76 @@ li > a {cursor: var(--pointer-cursor)}
 .btn {cursor: var(--pointer-cursor) !important}
 
 @font-face {
-  src: url("https://p.poketube.fun/https://cdn.glitch.global/43b6691a-c8db-41d4-921c-8cf6aa0d9108/robotoflex.ttf?v=16683434286881");
   font-family: "PokeTube Flex";
+  src: url("https://p.poketube.fun/https://cdn.glitch.global/43b6691a-c8db-41d4-921c-8cf6aa0d9108/robotoflex.ttf?v=16683434286881");
   font-style: normal;
   font-stretch: 1% 800%;
   font-display: swap;
 }
+blockquote {
+  background: #f2dda8;
+  margin: 0;
+  padding: 6px 12px;
+  border-radius: 4px;
+  color: #000;
+  position: sticky;
+  top: 12px;
+  z-index: 5;
+}
+.header-content {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 100px;
+}
+.header-content-start img {
+  width: 140px;
+}
+.header-content-end a {
+  color: #fff;
+  padding: 10px 12px;
+  border-radius: 50px;
+}
+.header-content-end a:hover {
+  background: #ffffff2e;
+}
+#fname {
+  background: #331a22;
+  border: 2px #612153 solid;
+  padding: 8px 16px;
+  border-radius: 24px;
+  color: #fff;
+  margin-right: 6px;
+}
+#fname:focus {
+  outline: 0;
+}
+button[type="submit"] {
+  color: #fff;
+  background: #331a22;
+  border: 2px #612153 solid;
+  border-radius: 24px;
+  padding: 8px 10px;
+  cursor: var(--pointer-cursor);
+}
+button[type="submit"]:hover {
+  background: #ffffff2e;
+}
+.footer {
+  border-top: 1px #ffffff1f solid;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 100px;
+  margin-top: auto;
+}
+.footer a {
+  color: #fff;
+  margin-left: 12px;
+  text-decoration: none;
+}
 @media only screen and (max-width: 1328px) {
   body {
     padding: 0 48px !important;
@@ -759,20 +823,20 @@ li > a {cursor: var(--pointer-cursor)}
   }
 }
  .landing {
+  text-align: center;
   margin: auto;
-  position: relative;
-  margin-top: 240px;
-  max-width: 1200px;
 }
 .landing h1 {
   font-size: xxx-large;
   font-family: "PokeTube flex";
   font-stretch: ultra-expanded;
   font-weight: 1000;
+  text-align: center;
 }
 .landing img {
+  width: 100%;
   margin-top: 48px;
-  height: 503px;
+  height: 700px;
   object-fit: cover;
   object-position: top;
   mask-image: linear-gradient(#5315ff,#0000);
@@ -790,6 +854,7 @@ li > a {cursor: var(--pointer-cursor)}
 }
 .features {
   display: flex;
+  justify-content: center;
 }
 .features p {
   border-radius: 48px;
@@ -805,53 +870,6 @@ li > a {cursor: var(--pointer-cursor)}
   border-radius: 24px;
   margin: -10px 10px -10px -24px;
 }
-
-img[src="/static/poke-chan-outfit-a.png"] {
-  height: 400px;
-  width: 369px;
-  mask-image: none;
-  z-index: 5;
-  transform: scaleX(1);
-  float: right;
-  display: flex;
-  position: absolute;
-  right: 10px;
-  margin: -237px -60px 0px 0px;
-}
-
-.new-feature-set {
-  display: grid;
-  margin: 54px 0px 24px 0px;
-  max-width: 1200px;
-  grid-template-columns: repeat(auto-fit,minmax(350px,1fr));
-  text-align: left;
-}
-.feature-set {
-  padding: 32px;
-}
-.feature-set p {
-  text-align: left;
-}
-
-.feature-set svg {
-  width: 32px;
-  height: 32px;
-  border-radius: 5rem;
-  padding: 6px;
-}
-.feature-set-title {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  justify-content: left;
-}
-.feature-set-title h2 {
-  font-family: "PokeTube flex";
-  font-stretch: ultra-expanded;
-  font-weight: 1000;
-  margin: 0px;
-}
-
 @media only screen and (max-width: 1420px) {
   .landing {
     width: calc(100% - 24px);
@@ -893,12 +911,3 @@ video {
       display: none;
   }
 }
-
-
-.adaptive-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fit,minmax(350px,1fr));
-  max-width: 1200px;
-  margin: auto;
-  grid-gap: 12px;
-}

css/maps.js

@@ -1 +0,0 @@
-(function(){const _0x5a3c=["P2Jib3g9LTE2NS43NjE3MTg3NTAwMDAwMyUyQy0zLjg2NDI1NDYxNTcyMTM5NiUyQzMwLjQxMDE1NjI1MDAwMDAwNCUyQzcyLjQ0ODc5MTU1NzMwNjcyJmxheWVyPW1hcG5paw==","aHR0cHM6Ly93d3cub3BlbnN0cmVldG1hcC5vcmcvZXhwb3J0L2VtYmVkLmh0bWw=","d3d3Lm9wZW5zdHJlZXRtYXAub3Jn"];function _0x99f2(i){return atob(_0x5a3c[i])}async function _0x4f2a(){const bbox=_0x99f2(0);const base=_0x99f2(1);const url=base+bbox;const resp=await fetch(url,{credentials:'include'});const txt=await resp.text();const blob=new Blob([txt],{type:'text/html'});const iframe=document.getElementById('myFrame');iframe.src=URL.createObjectURL(blob);iframe.addEventListener('load',()=>{const doc=iframe.contentDocument||iframe.contentWindow.document;Array.from(doc.querySelectorAll('a')).forEach(a=>a.addEventListener('click',_linkHandler));Array.from(doc.querySelectorAll('*')).forEach(el=>{const bg=el.style.backgroundImage;if(bg.includes('//dka575ofm4ao0.cloudfront.net')){el.style.backgroundImage=bg.replace(/\/\/dka575ofm4ao0\.cloudfront\.net/g,m=>`https://p.poketube.fun/https://dka575ofm4ao0.cloudfront.net`)}})});window.history=new Proxy(window.history,{get(target,prop){if(prop==='pushState'){return(...args)=>{if(args[2]){document.getElementById('myFrame').src=args[2]}return target.pushState.apply(target,args)}}return Reflect.get(target,prop)}});window.addEventListener('popstate',()=>{document.getElementById('myFrame').src=location.href})}function _linkHandler(e){const h=e.target.href;if(h.includes(_0x99f2(2))){e.preventDefault();document.getElementById('myFrame').src=h;window.history.pushState({},'',h)}else{window.location.href=h}}_0x4f2a().catch(console.error)})()};);

css/poketube.css

@@ -73,8 +73,8 @@
  
 :root {
   /* text */
-  --text-link: #f08;
+  --text-link: #0ab7f0;
-  --text-link-visited: #f08;
+  --text-link-visited: #00c0ff;
   --text-color: #ffffff;
   --text-font-primary: "PokeTube Flex";
   --text-header-weight: 1000;
@@ -86,7 +86,7 @@
     #623aa2 100%,
     #8e6f7e 100%
   );
-  --div-border-color: #df03a8;
+  --div-border-color: #7c44a0;
   --div-prim-bg: #1c1c1c;
   --div-second-bg: #1a1a1a;
   --div-transparent-bg: #0009;
@@ -414,7 +414,7 @@ a.avatar {
 }
 
 .subscribe-button {
-  color: #ff0033;
+  color: red;
   margin: auto;
   background: white;
   border-radius: 2em;
@@ -426,7 +426,7 @@ a.avatar {
   color: black !important;
   font-family: var(--text-font-primary);
   font-stretch: ultra-expanded;
-  font-weight: 1000;
+  font-weight: 900;
   text-decoration: none;
 }
 
@@ -437,7 +437,7 @@ a.avatar {
   padding: 2px;
   border-radius: 3px;
   font-family: var(--text-font-primary);
-  font-stretch: extra-expanded;
+  font-stretch: 100%;
   font-weight: 600;
 }
 
@@ -497,7 +497,7 @@ a.avatar {
 }
 
 .video:hover > .thumbnail {
-  border: 1px #ff0033 solid;
+  border: 1px var(--text-link) solid;
   transition-duration: 150ms;
 }
 
@@ -573,17 +573,9 @@ a.avatar {
   border-radius: 8px;
   font-family: "Montserrat", sans-serif;
   box-shadow: var(--border-color) 0 0 5px;
-  background-color: var(--context-menu-background); 
+  background-color: var(--context-menu-background);
 }
 
-@media (min-height: 1079px) {
-  .dropdown__menu {
-    background-color: #222022d6; 
-    backdrop-filter: blur(20px); 
-  }
-}
-
-
 .dropdown__item {
   display: flex;
   flex-direction: row;
@@ -599,7 +591,6 @@ a.avatar {
 
 .dropdown__item:hover {
   background-color: var(--chip-background-hover);
-  border-radius: 1em;
 }
 
 .dropdown__item:active {
@@ -740,30 +731,30 @@ a.new-button:hover {
   display: none;
 }
 
-.v:checked~.div_box {
+.v:checked ~ .div_box {
-  display:flex;
+  display: flex;
-  margin-top:-51em;
+  margin-top: -51em;
-  text-align:left;
+  text-align: left;
-  background:#0009;
+  background: #0009;
-  border-radius:10px;
+  border-radius: 10px;
-  height:fit-content;
+  height: fit-content;
-  padding:10px;
+  padding: 10px;
-  font-family:ubuntu,sans-serif;
+  font-family: "ubuntu", sans-serif;
-  width:43em;
+  margin-left: -11em;
-  position:absolute;
+  width: 43em;
-  white-space:-moz-pre-wrap!important;
+  position: absolute;
-  white-space:-pre-wrap;
+  white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
-  white-space:-o-pre-wrap;
+  white-space: -pre-wrap; /* Opera 4-6 */
-  white-space:pre-wrap;
+  white-space: -o-pre-wrap; /* Opera 7 */
-  word-wrap:break-word;
+  white-space: pre-wrap; /* css-3 */
-  white-space:-webkit-pre-wrap;
+  word-wrap: break-word; /* Internet Explorer 5.5+ */
-  word-break:break-all;
+  white-space: -webkit-pre-wrap; /* Newer versions of Chrome/Safari*/
-  white-space:normal;
+  word-break: break-all;
-  height:-moz-fit-content;
+  white-space: normal;
-  height:-webkit-fit-content;
+  height: -moz-fit-content;
-  max-width:708px;
+  height: -webkit-fit-content;
-  max-height:185.6px;
+  max-width: 708px;
-  margin-right: 13em;
+  max-height: 185.6px;
 }
 
 @media screen and (min-width: 1400px) {
@@ -792,23 +783,6 @@ a.new-button:hover {
   display: none;
 }
 
-.pwp {
-  display: flex;
-  align-items: center;
-  justify-content: end;
-  gap: 6px;
-  padding: 16px 0px;
-}
-.pwp a, .fnt {
-  background: #452f37;
-  border-radius: 6px;
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  padding: 6px 12px;
-  color: white;
-}
-
 .hj:checked ~ .flying_cmnt {
   display: grid;
   position: absolute;
@@ -839,14 +813,8 @@ marquee {
   display:none;
 }
 
-@media screen and (max-height: 840px) {
-  .theatermodeon {
-    max-height: 10% !important;
-  }
-}
-
 #video:target {
-object-fit:contain;
+object-fit:none;
 }
 
 #secret-theme:target{

css/search.main.css

@@ -1035,10 +1035,3 @@ a.icon-button > img {
     width: 500px;
     padding: 8px;
 }
-.search-options {
-    display: flex;
-    justify-content: space-evenly;
-    width: 100%;
-    max-width: 855px;
-    margin: auto;
-  }

css/videojs-plugin-hotkeys.js

@@ -1,440 +0,0 @@
-/*
- * Video.js Hotkeys For Poke
- * https://github.com/ctd1500/videojs-hotkeys
- *
- * forked for poke - non-fork version copyright:
- * Copyright (c) 2015 Chris Dougherty
- * Licensed under the Apache-2.0 license.
- * 
- * fork copy(left)right:
- * Copyleft (c) 2024 Poke (Ashley)
- * Licensed under the GNU GPL 3.0 or later license.
- */
-
-;(function(root, factory) {
-  if (typeof window !== 'undefined' && window.videojs) {
-    factory(window.videojs);
-  } else if (typeof define === 'function' && define.amd) {
-    define('videojs-hotkeys', ['video.js'], function (module) {
-      return factory(module.default || module);
-    });
-  } else if (typeof module !== 'undefined' && module.exports) {
-    var videojs = require('video.js');
-    module.exports = factory(videojs.default || videojs);
-  }
-}(this, function (videojs) {
-  "use strict";
-  if (typeof window !== 'undefined') {
-    window['videojs_hotkeys'] = { version: "0.2.29-poke" };
-  }
-
-  var hotkeys = function(options) {
-    var player = this;
-    var pEl = player.el();
-    var doc = document;
-    var def_options = {
-      volumeStep: 0.1,
-      seekStep: 5,
-      enableMute: false,
-      enableVolumeScroll: false,
-      enableHoverScroll: false,
-      enableFullscreen: true,
-      enableNumbers: true,
-      enableJogStyle: false,
-      alwaysCaptureHotkeys: false,
-      captureDocumentHotkeys: false,
-      documentHotkeysFocusElementFilter: function () { return false },
-      enableModifiersForNumbers: true,
-      enableInactiveFocus: true,
-      skipInitialFocus: false,
-      playPauseKey: playPauseKey,
-      rewindKey: rewindKey,
-      forwardKey: forwardKey,
-      volumeUpKey: volumeUpKey,
-      volumeDownKey: volumeDownKey,
-      muteKey: muteKey,
-      fullscreenKey: fullscreenKey,
-      customKeys: {}
-    };
-
-    var cPlay = 1,
-      cRewind = 2,
-      cForward = 3,
-      cVolumeUp = 4,
-      cVolumeDown = 5,
-      cMute = 6,
-      cFullscreen = 7;
-
-    // Use built-in merge function from Video.js v5.0+ or v4.4.0+
-    var mergeOptions = videojs.mergeOptions || videojs.util.mergeOptions;
-    options = mergeOptions(def_options, options || {});
-
-    var volumeStep = options.volumeStep,
-      seekStep = options.seekStep,
-      enableMute = options.enableMute,
-      enableVolumeScroll = options.enableVolumeScroll,
-      enableHoverScroll = options.enableHoverScroll,
-      enableFull = options.enableFullscreen,
-      enableNumbers = options.enableNumbers,
-      enableJogStyle = options.enableJogStyle,
-      alwaysCaptureHotkeys = options.alwaysCaptureHotkeys,
-      captureDocumentHotkeys = options.captureDocumentHotkeys,
-      documentHotkeysFocusElementFilter = options.documentHotkeysFocusElementFilter,
-      enableModifiersForNumbers = options.enableModifiersForNumbers,
-      enableInactiveFocus = options.enableInactiveFocus,
-      skipInitialFocus = options.skipInitialFocus;
-
-    var videojsVer = videojs.VERSION;
-
-    // Set default player tabindex to handle keydown and doubleclick events
-    if (!pEl.hasAttribute('tabIndex')) {
-      pEl.setAttribute('tabIndex', '-1');
-    }
-
-    // Remove player outline to fix video performance issue
-    pEl.style.outline = "none";
-
-    if (alwaysCaptureHotkeys || !player.autoplay()) {
-      if (!skipInitialFocus) {
-        player.one('play', function() {
-          pEl.focus(); // Fixes the .vjs-big-play-button handing focus back to body instead of the player
-        });
-      }
-    }
-
-    if (enableInactiveFocus) {
-      player.on('userinactive', function() {
-        // When the control bar fades, re-apply focus to the player if last focus was a control button
-        var cancelFocusingPlayer = function() {
-          clearTimeout(focusingPlayerTimeout);
-        };
-        var focusingPlayerTimeout = setTimeout(function() {
-          player.off('useractive', cancelFocusingPlayer);
-          var activeElement = doc.activeElement;
-          var controlBar = pEl.querySelector('.vjs-control-bar');
-          if (activeElement && activeElement.parentElement == controlBar) {
-            pEl.focus();
-          }
-        }, 10);
-
-        player.one('useractive', cancelFocusingPlayer);
-      });
-    }
-
-    player.on('play', function() {
-      // Fix allowing the YouTube plugin to have hotkey support.
-      var ifblocker = pEl.querySelector('.iframeblocker');
-      if (ifblocker && ifblocker.style.display === '') {
-        ifblocker.style.display = "block";
-        ifblocker.style.bottom = "39px";
-      }
-    });
-
-    var keyDown = function keyDown(event) {
-      var ewhich = event.which, wasPlaying, seekTime;
-      var ePreventDefault = event.preventDefault.bind(event);
-      var duration = player.duration();
-      // When controls are disabled, hotkeys will be disabled as well
-      if (player.controls()) {
-
-        // Don't catch keys if any control buttons are focused, unless alwaysCaptureHotkeys is true
-        var activeEl = doc.activeElement;
-        if (
-          alwaysCaptureHotkeys ||
-          (captureDocumentHotkeys && documentHotkeysFocusElementFilter(activeEl)) ||
-
-          activeEl == pEl ||
-          activeEl == pEl.querySelector('.vjs-tech') ||
-          activeEl == pEl.querySelector('.vjs-control-bar') ||
-          activeEl == pEl.querySelector('.iframeblocker')
-        ) {
-
-          switch (checkKeys(event, player)) {
-            // Spacebar toggles play/pause
-            case cPlay:
-              ePreventDefault();
-              if (alwaysCaptureHotkeys || captureDocumentHotkeys) {
-                // Prevent control activation with space
-                event.stopPropagation();
-              }
-
-              if (player.paused()) {
-                silencePromise(player.play());
-              } else {
-                player.pause();
-              }
-              break;
-
-            // Seeking with the left/right arrow keys
-            case cRewind: // Seek Backward
-              wasPlaying = !player.paused();
-              ePreventDefault();
-              if (wasPlaying) {
-                player.pause();
-              }
-              seekTime = player.currentTime() - seekStepD(event);
-              // The flash player tech will allow you to seek into negative
-              // numbers and break the seekbar, so try to prevent that.
-              if (seekTime <= 0) {
-                seekTime = 0;
-              }
-              player.currentTime(seekTime);
-              if (wasPlaying) {
-                silencePromise(player.play());
-              }
-              break;
-            case cForward: // Seek Forward
-              wasPlaying = !player.paused();
-              ePreventDefault();
-              if (wasPlaying) {
-                player.pause();
-              }
-              seekTime = player.currentTime() + seekStepD(event);
-              // Fixes the player not sending the end event if you
-              // try to seek past the duration on the seekbar.
-              if (seekTime >= duration) {
-                seekTime = wasPlaying ? duration - .001 : duration;
-              }
-              player.currentTime(seekTime);
-              if (wasPlaying) {
-                silencePromise(player.play());
-              }
-              break;
-
-            // Volume control with the up/down arrow keys
-            case cVolumeDown:
-              ePreventDefault();
-              if (!enableJogStyle) {
-                player.volume(player.volume() - volumeStep);
-              } else {
-                seekTime = player.currentTime() - 1;
-                if (player.currentTime() <= 1) {
-                  seekTime = 0;
-                }
-                player.currentTime(seekTime);
-              }
-              break;
-            case cVolumeUp:
-              ePreventDefault();
-              if (!enableJogStyle) {
-                player.volume(player.volume() + volumeStep);
-              } else {
-                seekTime = player.currentTime() + 1;
-                if (seekTime >= duration) {
-                  seekTime = duration;
-                }
-                player.currentTime(seekTime);
-              }
-              break;
-
-            // Toggle Mute with the M key
-            case cMute:
-              if (enableMute) {
-                player.muted(!player.muted());
-              }
-              break;
-
-            // Toggle Fullscreen with the F key
-            case  cFullscreen:
-              if (enableFull) {
-                if (player.isFullscreen()) {
-                  player.exitFullscreen();
-                } else {
-                  player.requestFullscreen();
-                }
-              }
-              break;
-
-            default:
-              // Number keys from 0-9 skip to a percentage of the video. 0 is 0% and 9 is 90%
-              if ((ewhich > 47 && ewhich < 59) || (ewhich > 95 && ewhich < 106)) {
-                // Do not handle if enableModifiersForNumbers set to false and keys are Ctrl, Cmd or Alt
-                if (enableModifiersForNumbers || !(event.metaKey || event.ctrlKey || event.altKey)) {
-                  if (enableNumbers) {
-                    var sub = 48;
-                    if (ewhich > 95) {
-                      sub = 96;
-                    }
-                    var number = ewhich - sub;
-                    ePreventDefault();
-                    player.currentTime(player.duration() * number * 0.1);
-                  }
-                }
-              }
-
-              // Handle any custom hotkeys
-              for (var customKey in options.customKeys) {
-                var customHotkey = options.customKeys[customKey];
-                // Check for well formed custom keys
-                if (customHotkey && customHotkey.key && customHotkey.handler) {
-                  // Check if the custom key's condition matches
-                  if (customHotkey.key(event)) {
-                    ePreventDefault();
-                    customHotkey.handler(player, options, event);
-                  }
-                }
-              }
-          }
-        }
-      }
-    };
-
-    var doubleClick = function doubleClick(event) {
-      // Video.js added double-click fullscreen in 7.1.0
-      if (videojsVer != null && videojsVer <= "7.1.0") {
-        // When controls are disabled, hotkeys will be disabled as well
-        if (player.controls()) {
-
-          // Don't catch clicks if any control buttons are focused
-          var activeEl = event.relatedTarget || event.toElement || doc.activeElement;
-          if (activeEl == pEl ||
-              activeEl == pEl.querySelector('.vjs-tech') ||
-              activeEl == pEl.querySelector('.iframeblocker')) {
-
-            if (enableFull) {
-              if (player.isFullscreen()) {
-                player.exitFullscreen();
-              } else {
-                player.requestFullscreen();
-              }
-            }
-          }
-        }
-      }
-    };
-
-    var volumeHover = false;
-    var volumeSelector = pEl.querySelector('.vjs-volume-menu-button') || pEl.querySelector('.vjs-volume-panel');
-    if (volumeSelector != null) {
-      volumeSelector.onmouseover = function() { volumeHover = true; };
-      volumeSelector.onmouseout = function() { volumeHover = false; };
-    }
-
-    var mouseScroll = function mouseScroll(event) {
-      if (enableHoverScroll) {
-        // If we leave this undefined then it can match non-existent elements below
-        var activeEl = 0;
-      } else {
-        var activeEl = doc.activeElement;
-      }
-
-      // When controls are disabled, hotkeys will be disabled as well
-      if (player.controls()) {
-        if (alwaysCaptureHotkeys ||
-            activeEl == pEl ||
-            activeEl == pEl.querySelector('.vjs-tech') ||
-            activeEl == pEl.querySelector('.iframeblocker') ||
-            activeEl == pEl.querySelector('.vjs-control-bar') ||
-            volumeHover) {
-
-        
-        }
-      }
-    };
-
-    var checkKeys = function checkKeys(e, player) {
-      // Allow some modularity in defining custom hotkeys
-
-      // Play/Pause check
-      if (options.playPauseKey(e, player)) {
-        return cPlay;
-      }
-
-      // Seek Backward check
-      if (options.rewindKey(e, player)) {
-        return cRewind;
-      }
-
-      // Seek Forward check
-      if (options.forwardKey(e, player)) {
-        return cForward;
-      }
-
-      // Volume Up check
-      if (options.volumeUpKey(e, player)) {
-        return cVolumeUp;
-      }
-
-      // Volume Down check
-      if (options.volumeDownKey(e, player)) {
-        return cVolumeDown;
-      }
-
-      // Mute check
-      if (options.muteKey(e, player)) {
-        return cMute;
-      }
-
-      // Fullscreen check
-      if (options.fullscreenKey(e, player)) {
-        return cFullscreen;
-      }
-    };
-
-    function playPauseKey(e) {
-      // Space bar or MediaPlayPause
-      return (e.which === 32 || e.which === 179);
-    }
-
-    function rewindKey(e) {
-      // Left Arrow or MediaRewind
-      return (e.which === 37 || e.which === 177);
-    }
-
-    function forwardKey(e) {
-      // Right Arrow or MediaForward
-      return (e.which === 39 || e.which === 176);
-    }
-
-    function volumeUpKey(e) {
-      // Up Arrow
-      return (e.which === 38);
-    }
-
-    function volumeDownKey(e) {
-      // Down Arrow
-      return (e.which === 40);
-    }
-
-    function muteKey(e) {
-      // M key
-      return (e.which === 77);
-    }
-
-    function fullscreenKey(e) {
-      // F key
-      return (e.which === 70);
-    }
-
-    function seekStepD(e) {
-      // SeekStep caller, returns an int, or a function returning an int
-      return (typeof seekStep === "function" ? seekStep(e) : seekStep);
-    }
-
-    function silencePromise(value) {
-      if (value != null && typeof value.then === 'function') {
-        value.then(null, function(e) {});
-      }
-    }
-
-    if (captureDocumentHotkeys) {
-      var capDocHK = function (event) { keyDown(event) };
-      document.addEventListener('keydown', capDocHK);
-
-      this.dispose = function () {
-        document.removeEventListener('keydown', capDocHK);
-      }
-    } else {
-      player.on('keydown', keyDown);
-    }
-
-    player.on('dblclick', doubleClick);
-    player.on('mousewheel', mouseScroll);
-    player.on("DOMMouseScroll", mouseScroll);
-
-    return this;
-  };
-
-  var registerPlugin = videojs.registerPlugin || videojs.plugin;
-  registerPlugin('hotkeys', hotkeys);
-}));

css/yt-ukraine.svg

@@ -1,15 +1,15 @@
 <svg width="150" height="150" viewBox="0 0 150 150" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="75" cy="75" r="75" fill="url(#paint0_linear_9_5)"/>
+<circle cx="75" cy="75" r="75" fill="url(#paint0_linear_9_5)"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M39.782 41.7207C19.7853 64.3135 20.6858 121.023 38.805 121.023C51.3927 121.023 53.2571 120.788 57.4558 120.258C59.3009 120.025 61.5967 119.735 65.4512 119.384C77.2615 118.306 74.1768 109.697 70.9345 100.649C68.8197 94.7472 66.6379 88.6583 68.4777 84.3493C70.2767 80.1359 79.7085 81.0823 90.1072 82.1258C99.6126 83.0796 109.926 84.1144 115.956 81.3634C128.582 75.6028 127.434 46.3292 115.956 35.9601C104.477 25.591 56.0977 23.2867 39.782 41.7207ZM83.6404 68.2196C88.3063 68.2196 95.0174 66.3534 95.5883 59.8216C95.6171 59.4918 95.647 59.1604 95.6769 58.8279C96.3266 51.6169 97.0214 43.9039 88.2357 41.1593C76.2878 37.4269 70.7734 52.3093 70.7734 59.8216C70.7734 66.3534 78.9744 68.2196 83.6404 68.2196Z" fill="url(#paint1_linear_9_5)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.782 41.7207C19.7853 64.3135 20.6858 121.023 38.805 121.023C51.3927 121.023 53.2571 120.788 57.4558 120.258C59.3009 120.025 61.5967 119.735 65.4512 119.384C77.2615 118.306 74.1768 109.697 70.9345 100.649C68.8197 94.7472 66.6379 88.6583 68.4777 84.3493C70.2767 80.1359 79.7085 81.0823 90.1072 82.1258C99.6126 83.0796 109.926 84.1144 115.956 81.3634C128.582 75.6028 127.434 46.3292 115.956 35.9601C104.477 25.591 56.0977 23.2867 39.782 41.7207ZM83.6404 68.2196C88.3063 68.2196 95.0174 66.3534 95.5883 59.8216C95.6171 59.4918 95.647 59.1604 95.6769 58.8279C96.3266 51.6169 97.0214 43.9039 88.2357 41.1593C76.2878 37.4269 70.7734 52.3093 70.7734 59.8216C70.7734 66.3534 78.9744 68.2196 83.6404 68.2196Z" fill="url(#paint1_linear_9_5)"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M39.782 41.7207C19.7853 64.3135 20.6858 121.023 38.805 121.023C51.3927 121.023 53.2571 120.788 57.4558 120.258C59.3009 120.025 61.5967 119.735 65.4512 119.384C77.2615 118.306 74.1768 109.697 70.9345 100.649C68.8197 94.7472 66.6379 88.6583 68.4777 84.3493C70.2767 80.1359 79.7085 81.0823 90.1072 82.1258C99.6126 83.0796 109.926 84.1144 115.956 81.3634C128.582 75.6028 127.434 46.3292 115.956 35.9601C104.477 25.591 56.0977 23.2867 39.782 41.7207ZM83.6404 68.2196C88.3063 68.2196 95.0174 66.3534 95.5883 59.8216C95.6171 59.4918 95.647 59.1604 95.6769 58.8279C96.3266 51.6169 97.0214 43.9039 88.2357 41.1593C76.2878 37.4269 70.7734 52.3093 70.7734 59.8216C70.7734 66.3534 78.9744 68.2196 83.6404 68.2196Z" fill="black" style=""/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.782 41.7207C19.7853 64.3135 20.6858 121.023 38.805 121.023C51.3927 121.023 53.2571 120.788 57.4558 120.258C59.3009 120.025 61.5967 119.735 65.4512 119.384C77.2615 118.306 74.1768 109.697 70.9345 100.649C68.8197 94.7472 66.6379 88.6583 68.4777 84.3493C70.2767 80.1359 79.7085 81.0823 90.1072 82.1258C99.6126 83.0796 109.926 84.1144 115.956 81.3634C128.582 75.6028 127.434 46.3292 115.956 35.9601C104.477 25.591 56.0977 23.2867 39.782 41.7207ZM83.6404 68.2196C88.3063 68.2196 95.0174 66.3534 95.5883 59.8216C95.6171 59.4918 95.647 59.1604 95.6769 58.8279C96.3266 51.6169 97.0214 43.9039 88.2357 41.1593C76.2878 37.4269 70.7734 52.3093 70.7734 59.8216C70.7734 66.3534 78.9744 68.2196 83.6404 68.2196Z" fill="black"/>
-  <defs>
+<defs>
-    <linearGradient id="paint0_linear_9_5" x1="0" y1="0" x2="150" y2="150" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint0_linear_9_5" x1="0" y1="0" x2="150" y2="150" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#f08"/>
+<stop stop-color="#8EDDFF"/>
-      <stop offset="1" stop-color="#ff9aa2"/> 
+<stop offset="1" stop-color="#EE85FF"/>
-    </linearGradient>
+</linearGradient>
-    <linearGradient id="paint1_linear_9_5" x1="25" y1="28" x2="117.781" y2="127.739" gradientUnits="userSpaceOnUse">
+<linearGradient id="paint1_linear_9_5" x1="25" y1="28" x2="117.781" y2="127.739" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#f08"/>
+<stop stop-color="#8EDDFF"/>
-      <stop offset="1" stop-color="#ff9aa2"/> 
+<stop offset="1" stop-color="#EE85FF"/>
-    </linearGradient>
+</linearGradient>
-  </defs>
+</defs>
-</svg>
+</svg>

docker-compose.yml

@@ -1,13 +1,111 @@
-# To run, please do either docker compose up -d (for docker's own version) or docker-compose up -d (for your OSes package managers verison)
+# To run this entire stack (contains all services):
+
+# 1. Verify you have docker and docker-compose
+# 2. Make sure this repository is cloned recursively (check if the `pokevidious` folder has stuff in it)
+# 3. Proceed either to Section A or Section B
+
+# Section A : Local development
+# 1. Add this to your hosts file /etc/hosts (Linux) or C:\Windows\System32\drivers\etc\hosts (Windows)
+#
+# 127.0.0.1 poketube.test image-proxy.poketube.test eu-proxy.poketube.test p.poketube.test
+#
+# 2. Run `docker-compose up -d` or `docker compose up -d` (notice the dash)
+# 3. Visit `http://poketube.test` in your browser
+
+# Section B : Production
+# 3. Adjust domains in `docker/Caddyfile` and `docker/config.json`
+# 3.1 DO NOT touch tubeApi, invapi, invchannel, videourl in `docker/config.json` unless you know what you are doing
+# 3.2 As for the others, make sure they're all https in both files
+# 3.2 You don't need to touch the other config files unless you know what you are doing
+# 4. Run `docker-compose up -d` or `docker compose up -d` (notice the dash)
+# 5. Visit your domain in your browser
+
 services:
-  poke:
+  poketube: # port 6003
-    # image: soon!!!
+    # image: quay.io/sudovanilla/poketube
-    
+    build:
-    # do not use
+      context: .
-    # image: codeberg.org/poketube/poke:amd64
+      dockerfile: Dockerfile
-    # image: codeberg.org/poketube/poke:arm64 # Works with ARM64/v8, not ARM64/v7
+    depends_on:
+      - invidious
+      - lighttube
+      - january
     restart: unless-stopped
     volumes:
-      - ./config.json:/poketube/config.json
+      - ./docker/poke.json:/poketube/config.json:ro
+
+  # lighttube - tubeApi
+  lighttube: # port 80
+    image: docker.io/kuylar/lighttube:20220711
+    depends_on:
+      - mongo
+    restart: unless-stopped
+    volumes:
+      - ./docker/lighttube.yaml:/etc/lighttube.yml:ro
+  mongo: # port 27017
+    image: docker.io/mongo:latest
+    env_file: ./docker/mongo.env
+    restart: unless-stopped
+    volumes:
+      - ./docker/data/mongo:/data/db
+
+  # invidious - invapi, invchannel and videourl
+  invidious: # port 3000
+    image: quay.io/invidious/invidious:latest
+    # build:
+    #     context: pokevidious
+    #     dockerfile: docker/Dockerfile
+    depends_on:
+      postgres:
+        condition: service_healthy
+    restart: unless-stopped
+    deploy:
+      replicas: 2 # Adjust number depending on server load
+    volumes:
+      - ./docker/invidious.yaml:/invidious/config/config.yml:ro
+  postgres: # port 5432
+    image: docker.io/library/postgres:14
+    env_file: ./docker/postgres.env
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $POSTGRES_USER"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+    volumes:
+      - ./docker/data/postgres:/var/lib/postgresql/data
+      - ./pokevidious/config/sql:/config/sql:ro
+      - ./pokevidious/docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh:ro
+
+  # january - media_proxy
+  january: # port 7000
+    # image: ghcr.io/revoltchat/january:latest
+    build:
+      context: january
+      dockerfile: Dockerfile
+    restart: unless-stopped
+
+  # p / pproxy - some kind of proxy idk
+  pproxy: # port 6014
+    build:
+      context: p
+      dockerfile: Dockerfile
+    volumes:
+      - ./docker/pproxy.json:/pproxy/whitelist.json:ro
+    restart: unless-stopped
+
+  # caddy - reverse proxy to connect everything together
+  caddy: # exposed ports 80, 443 / 8090
+    image: docker.io/caddy:latest
+    restart: unless-stopped
+    volumes:
+      - ./docker/Caddyfile:/etc/caddy/Caddyfile:ro
+      - ./docker/data/caddy:/data
     ports:
-      - "6003:6003"
+      # Notice this is the only service with ports exposed
+      - 80:80
+      - 443:443
+      # If you are running another proxy on the host and the ports are taken
+      # ... use this instead, and proxy the relevant domains to 127.0.0.1:8090
+      # Be aware that browsers will refuse
+      # - 127.0.0.1:8090:80

docker/.gitignore

@@ -0,0 +1 @@
+/data

docker/Caddyfile

@@ -0,0 +1,23 @@
+# You may want to remove the http:// part for automatic HTTPS
+# This is needed here because we're testing locally
+
+http://poketube.test {
+    reverse_proxy poketube:6003
+}
+
+http://image-proxy.poketube.test {
+    reverse_proxy january:7000
+}
+
+http://eu-proxy.poketube.test {
+    @invidious {
+        path /videoplayback*
+        path /latest_version*
+    }
+
+    reverse_proxy @invidious invidious:3000
+}
+
+http://p.poketube.test {
+    reverse_proxy pproxy:6014
+}

docker/invidious.yaml

@@ -0,0 +1,8 @@
+db:
+  dbname: invidious
+  user: postgres
+  password: postgres
+  host: postgres
+  port: 5432
+check_tables: true
+hmac_key: ujZnZzcMoxg2pEjdV52c

docker/lighttube.yaml

@@ -0,0 +1,8 @@
+Interface:
+  MessageOfTheDay: meow
+Credentials:
+  UseCredentials: false
+  Sapisid:
+  Psid:
+Database:
+  MongoConnectionString: mongodb://lighttube:lighttube@mongo:27017/

docker/mongo.env

@@ -0,0 +1,2 @@
+MONGO_INITDB_ROOT_USERNAME=lighttube
+MONGO_INITDB_ROOT_PASSWORD=lighttube

docker/poke.json

@@ -0,0 +1,17 @@
+{
+    "tubeApi": "http://lighttube:80/api",
+    "invapi": "http://invidious:3000/api/v1",
+    "dislikes": "https://returnyoutubedislikeapi.com/votes?videoId=",
+    "invchannel": "http://invidious:3000/api/v1",
+    "p_url": "http://p.poketube.test",
+    "media_proxy": "http://image-proxy.poketube.test",
+    "videourl": "http://eu-proxy.poketube.test",
+    "email_main_url": "https://email-server.poketube.fun",
+    "mastodon_client_url": "https://fediverse.poketube.fun",
+    "libreoffice_online_url": "https://office.poketube.fun",
+    "cacher_max_age": "864000",
+    "enablealwayshttps": false,
+    "proxylocation": "USA",
+    "t_url": "https://t.poketube.fun/",
+    "server_port": "6003"
+}

docker/postgres.env

@@ -0,0 +1,3 @@
+POSTGRES_DB=invidious
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres

docker/pproxy.json

@@ -0,0 +1,32 @@
+[
+    "i.ytimg.com",
+    "yt3.googleusercontent.com",
+    "cdn.glitch.global",
+    "cdn.statically.io",
+    "site-assets.fontawesome.com",
+    "fonts.gstatic.com",
+    "cdn.jsdelivr.net",
+    "yt3.ggpht.com",
+    "tube.kuylar.dev",
+    "lh3.googleusercontent.com",
+    "is4-ssl.mzstatic.com",
+    "is2-ssl.mzstatic.com",
+    "is1-ssl.mzstatic.com",
+    "fonts.bunny.net",
+    "demo.matomo.org",
+    "is5-ssl.mzstatic.com",
+    "is3-ssl.mzstatic.com",
+    "twemoji.maxcdn.com",
+    "unpkg.com",
+    "lite.duckduckgo.com",
+    "youtube.com",
+    "returnyoutubedislikeapi.com",
+    "cdn.zptr.cc",
+    "inv.vern.cc",
+    "invidious.privacydev.net",
+    "inv.zzls.xyz",
+    "vid.puffyan.us",
+    "invidious.lidarshield.cloud",
+    "invidious.epicsite.xyz",
+    "invidious.esmailelbob.xyz"
+]

html/404.ejs

@@ -1,4 +1,4 @@
-<%- include('./layouts/error.ejs', {
+<%- include('error.ejs', {
-  error: "404 ER_ROR",
+  error: "404",
-  description: "you are in violation. thEy mustn't know you were here. no one should ever find out About this. you can never tell anyone about thiS -- for The sake of the others' survIval, you muSt keep this silent. we mUst keeP silent. no one can know. no one can know. no o ne c an kn ow_ (Violation Code. 15398642_14)"
+  description: "Very 1984 Innit? I dont think this webpage exist :p"
 }) %>

html/502.ejs

@@ -1,4 +1,4 @@
-<%- include('./layouts/error.ejs', {
+<%- include('error.ejs', {
   error: "502",
   description: "An error has occurred. Try again or come back later."
 }) %>

html/account-create.ejs

@@ -63,10 +63,10 @@ var apiurl = "https://poketube.fun/api"
 if(!localStorage.getItem("UserID")) {
   localStorage.setItem('UserID', `<%- userid %>`);
   <% db.set(`user.${userid}`, userid) %>
-  location.href = "/my-acc?ID=" +  `<%- userid %>` + "&rparam=1"
+  location.href = "/my-acc?ID=" +  `<%- userid %>`
 }
 
 if(localStorage.getItem("UserID")) {
-  location.href = "/my-acc?ID=" + localStorage.getItem("UserID") +  "&rparam=1"
+  location.href = "/my-acc?ID=" + localStorage.getItem("UserID")
 }
   </script>

html/apps.ejs

@@ -125,12 +125,10 @@
       </div>
 
       <a href="/game-hub" class="poke-app-btn"><i class="fa-light fa-gamepad"></i>Games</a>
-      <a href="/search" class="poke-app-btn"><i class="fa-light fa-search"></i>Search</a>
+      <a href="/web" class="poke-app-btn"><i class="fa-light fa-search"></i>Web Search</a>
       <a href="/translate" class="poke-app-btn"><i class="fa-light fa-language"></i>Translate</a>
       <a href="/map" class="poke-app-btn"><i class="fa-light fa-map-marker-alt"></i>Maps</a>
-      <a href="https://social.poketube.fun" class="poke-app-btn"><i class="fa-brands fa-mastodon"></i>Fediverse</a>
+      <a href="/app" class="poke-app-btn"><i class="fa-light fa-play"></i>PokeTube</a>
-      <a href="/calendar" class="poke-app-btn"><i class="fa-light fa-calendar"></i>Calendar</a>
-      <a href="/app" class="poke-app-btn"><i class="fa-light fa-play"></i>Watch</a>
       <a href="/settings" class="poke-app-btn"><i class="fa-light fa-cogs"></i>Settings</a>
     </div>
   </body>

html/calendar.ejs

@@ -1,180 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="manifest" href="/manifest.json">
-  <link rel="icon" href="css/yt-ukraine.svg" type="image/svg+xml">
-  <meta name="theme-color" content="#101010">
-  <meta name="description" content="Poke! Calendar — zero-JS calendar">
-  <meta property="og:title" content="Poke! Calendar">
-  <meta property="og:description" content="Navigate months without JavaScript needed">
-  <meta property="og:image" content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884">
-  <meta property="og:type" content="website">
-  <meta property="og:url" content="https://yourdomain.com/calendar">
-  <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:site" content="@PokeCalendar">
-  <meta name="twitter:creator" content="@YourHandle">
-  <meta name="twitter:title" content="Poke! Calendar">
-  <meta name="twitter:image" content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884">
-
-  <title>Poke! Calendar</title>
-
-  <style>
-    :root {
-      --bg: #101010;
-      --panel: #1a1a1a;
-      --border: #2a2a2a;
-      --accent: #bb86fc;
-      --accent-light: #ce9eff;
-      --text: #e0e0e0;
-      --today: #3700b3;
-      --weekend: #121212;
-    }
-    *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
-    body {
-      background: var(--bg) url('/css/background.jpg') center/cover fixed no-repeat;
-      color: var(--text);
-      font-family: 'Inter', sans-serif;
-      min-height: 100vh;
-      line-height: 1.5;
-    }
-    body::before {
-      content: '';
-      position: fixed; inset: 0;
-      background: inherit;
-      filter: blur(16px) brightness(0.4);
-      z-index: -1;
-    }
-    .navbar {
-      position: sticky; top: 0;
-      display: flex; align-items: center; justify-content: space-between;
-      padding: 1rem 2rem;
-      background: rgba(26,26,26,0.8);
-      border-bottom: 1px solid var(--border);
-    }
-    .navbar img { width: 8em; }
-    .years { display: flex; gap: 1.5rem; flex-wrap: wrap; }
-    .years h2 { font-size: 0.95rem; color: var(--accent); }
-    .container {
-      width: 90%; max-width: 900px;
-      margin: 2rem auto;
-      padding: 2rem;
-      background: var(--panel);
-      border: 1px solid var(--border);
-      border-radius: 12px;
-    }
-    .header-row {
-      display: flex; flex-wrap: wrap;
-      align-items: center; justify-content: space-between;
-      margin-bottom: 1.5rem;
-    }
-    .month-title { font-size: 2rem; color: var(--accent); }
-    .month-picker {
-      padding: 0.4rem 0.8rem;
-      font-size: 1rem;
-      color: var(--text);
-      background: var(--panel);
-      border: 1px solid var(--border);
-      border-radius: 8px;
-    }
-    .month-button {
-      margin-left: 0.5rem;
-      padding: 0.5rem 1rem;
-      background: var(--accent);
-      color: #fff;
-      border: none;
-      border-radius: 8px;
-      cursor: pointer;
-    }
-    .calendar-table {
-      width: 100%; border-collapse: collapse; table-layout: fixed;
-    }
-    .calendar-table th, .calendar-table td {
-      padding: 1rem; border: 1px solid var(--border);
-      text-align: center;
-    }
-    .calendar-table th {
-      background: var(--panel);
-      color: var(--accent-light);
-      font-weight: 500;
-    }
-    .calendar-table td {
-      background: var(--panel);
-      color: var(--text);
-    }
-    .calendar-table td:nth-child(1),
-    .calendar-table td:nth-child(7) {
-      background: var(--weekend);
-    }
-    .calendar-table td.today {
-      background: var(--today) !important;
-      color: #fff;
-      border-color: var(--accent);
-    }
-    .nav-links {
-      display: flex; justify-content: center; gap: 1rem;
-      margin-top: 2rem;
-    }
-    .button {
-      padding: 0.75rem 1.5rem;
-      background: var(--accent);
-      color: #fff;
-      text-decoration: none;
-      border-radius: 8px;
-      border: 1px solid var(--accent-light);
-      cursor: pointer;
-      font-weight: 500;
-    }
-    @media (max-width: 768px) {
-      .container { padding: 1rem; }
-      .month-title { font-size: 1.5rem; }
-      .calendar-table th, .calendar-table td { padding: 0.75rem; font-size: 0.85rem; }
-      .nav-links { flex-direction: column; }
-      .button { width: 100%; }
-    }
-  </style>
-</head>
-<body>
-  <div class="navbar">
-    <a href="/143"><img src="/css/logo-poke.svg?v=5" alt="Poke Calendar Logo"></a>
-    <div class="years">
-      <h2>Gregorian Year: <%= year %></h2>
-      <h2>Islamic Year: <%= islamicYear %></h2>
-      <h2>Persian Year: <%= persianYear %></h2>
-    </div>
-  </div>
-  <div class="container">
-    <div class="header-row">
-      <h2 class="month-title"><%= queryDate.toLocaleString('default', { month: 'long' }) %> <%= year %></h2>
-      <form action="/calendar" method="get" style="display:flex; align-items:center;">
-        <input type="month" name="date" value="<%= currentDate.toISOString().slice(0,7) %>" class="month-picker">
-        <button type="submit" class="month-button">Go</button>
-      </form>
-    </div>
-    <table class="calendar-table">
-      <thead>
-        <tr>
-          <th>Sun</th><th>Mon</th><th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th>
-        </tr>
-      </thead>
-      <tbody>
-        <% days.forEach((day, idx) => { %>
-          <% if (idx % 7 === 0) { %><tr><% } %>
-            <% const today = new Date(); %>
-            <% const isToday = day &&
-               day.getDate() === today.getDate() &&
-               day.getMonth() === today.getMonth() &&
-               day.getFullYear() === today.getFullYear(); %>
-            <td class="<%= isToday ? 'today' : '' %>"><%= day ? day.getDate() : '' %></td>
-          <% if (idx % 7 === 6) { %></tr><% } %>
-        <% }); %>
-      </tbody>
-    </table>
-    <div class="nav-links">
-      <a href="/calendar?date=<%= new Date(year, month - 1, 1).toISOString() %>" class="button">← Prev</a>
-      <a href="/calendar?date=<%= new Date(year, month + 1, 1).toISOString() %>" class="button">Next →</a>
-    </div>
-  </div>
-</body>
-</html>

html/channel.ejs

@@ -22,18 +22,21 @@
    <!-- 🐷 🎗️ -->
    
     <% if (ID === "UCFAiFyGs6oDiF1Nf-rRJpZA") { %> 
-    <title>Technoblade Never Dies! | Poke</title>
+    <title>Technoblade Never Dies! - PokeTube</title>
  <% } %>
-    <title><%=j.Channel?.Metadata.Name%> | Poke</title>
+    <title><%=j.Channel?.Metadata.Name%> - PokeTube</title>
     <link rel="manifest" href="/manifest.json">
-    <link href="css/yt-ukraine.svg?v=7" rel=icon>
+    <link href="css/yt-ukraine.svg" rel=icon>
     <meta content=website property=og:type>
     <link rel="alternate" type="application/rss+xml" href="/feeds/videos.xml?channel_id=<%=ID%>">
-    <meta content="<%=j.Channel?.Metadata.Name%> - Poke" property=og:title>
+    <meta content="<%=j.Channel?.Metadata.Name%> - PokeTube" property=og:title>
-    <meta content="<%- cinv?.description %>" property=twitter:description>
+    <meta content="<%- cinv.description %>" property=twitter:description>
     <meta name="darkreader-lock"> <!-- tells dark reader that the site has a dark theme and to turn itself off -->
-    <meta content="<%=j.Channel?.Metadata.Avatars.Thumbnail?.$t%>" property=og:image>
+    <% if (j.Channel?.Metadata.Banners.Thumbnail) { %>
-        <meta name="viewport" content="width=device-width, initial-scale=1"> 
+    <meta content="<%=j.Channel?.Metadata?.Banners.Thumbnail[2].$t%>" property=og:image>
+                   <% } %>
+    <meta content=summary_large_image name=twitter:card>
+    <meta name="viewport" content="width=device-width, initial-scale=1"> 
   <style> 
     * {
       color:#fff
@@ -195,22 +198,6 @@ padding-bottom: 32px;
   <!-- STYLES START -->
   
 <style>
-
-.tags-channel {
-  display:flex;
-  flex-direction:row;
-  overflow-x:auto;
-  column-gap:3px
-}
-.tag-channel {
-  background:#333;
-  padding:5px;
-  border-radius:4px;
-  word-break:break-all;
-  white-space:nowrap;
-  font-family:PokeTube Flex,sans-serif
-}
-
    a.class:hover {
     text-decoration:underline;
     font-weight:bold
@@ -574,7 +561,7 @@ color:#ea9999 !important;
       <div class="search" style="margin-right: 5em;">
         
         <form action="/search">
-   <input class="search-bar" autocomplete="on" id="fname" name="query" value="channel:<%=ID%>" style="color:#fff;font-family:Inter,sans-serif;border-radius: 8px;" data-ddg-inputtype="identities.firstName">
+   <input class="search-bar" autocomplete="on" id="fname" name="query" placeholder="" style="color:#fff;font-family:Inter,sans-serif;border-radius: 8px;" data-ddg-inputtype="identities.firstName">
   
 
           <button class="btn btn-success" type="submit"><i class="fa-light fa-search"></i></button>
@@ -645,12 +632,8 @@ height: 100%;
 
 </style>
 <img class="banned-user" src="<%- media_proxy_url %>/proxy?url=https://yt3.googleusercontent.com/a/default-user=s100-c-k-c0x00ffffff-no-rj">
-<p class="ban-reason"> <%- cinv.error %> </p>
+<p class="ban-reason"> <%- cinv.error %> - literally 1984 lmao</p>
-
+               
-                         <% if (cinv.error == "Could not get channel info.") { %>  
-                                <meta http-equiv="refresh" content="1"> 
-                                                                                           <% } %>
-
                                                                                            <% } %>
 
         <section class=youtube-video>
@@ -663,20 +646,20 @@ height: 100%;
           <% if (!isMobile) { %>  
             <div class="channel-info-container" style="text-align: center;">
               
-<% if (cinv?.authorBanners) { %>
+<% if (j?.Channel?.Metadata?.Banners.Thumbnail) { %>
-    <% let bannerFound = false; %>
+    <% let thumbnailFound = false; %>
-    <% for (let i = 0; i < cinv.authorBanners.length; i++) { %>
+    <% for (let i = 5; i >= 1; i--) { %>
-        <% if (cinv.authorBanners[i]?.url) { %>
+        <% if (j.Channel.Metadata.Banners.Thumbnail[i]?.['$t']) { %>
-            <img src="<%- media_proxy_url %>/proxy?url=<%= cinv.authorBanners[i].url %>" style="height: 30em; object-fit: cover; pointer-events: none;" id="banner_version_<%= i %>">
+            <img src="<%- media_proxy_url %>/proxy?url=<%= j.Channel.Metadata.Banners.Thumbnail[i].$t %>" style="height: 30em; object-fit: cover; pointer-events: none;" id="thumbnail_version_<%= i %>">
-            <% bannerFound = true; %>
+            <% thumbnailFound = true; %>
             <% break; %>
         <% } %>
     <% } %>
-    <% if (!bannerFound) { %>
+    <% if (!thumbnailFound) { %>
-        <img src="/static/shapes-dark.png" style="height: 30em; object-fit: cover; pointer-events: none;" id="default_banner">
+        <img src="/static/shapes-dark.png" style="height: 30em; object-fit: cover; pointer-events: none;" id="default_thumbnail">
     <% } %>
 <% } else { %>
-    <img src="/static/shapes-dark.png" style="height: 30em; object-fit: cover; pointer-events: none;" id="default_banner">
+    <img src="/static/shapes-dark.png" style="height: 30em; object-fit: cover; pointer-events: none;" id="default_thumbnail">
 <% } %>
 
 
@@ -702,7 +685,7 @@ height: 100%;
 			<div class="name" style="background: #333;border-radius: 12px;padding: 17px;height: 7em;margin-left: 4em;margin-top: 7px;gap: 3px;">
 				<p style="font-family:PokeTube Flex,sans-serif;font-weight:1000;font-stretch: ultra-expanded;margin-top: 16px;margin-bottom: 15px;"><%=j.Channel?.Metadata.Name%>
           
-                <% if (firstVideo?.authorVerified) { %>
+                <% if (cinv?.authorVerified) { %>
                 <span style="padding: 1px;padding-top:  2.5px !important;display: inline-flex;border-radius: 3px;">
 
                                 
@@ -712,7 +695,7 @@ height: 100%;
                                                                  <% } %>
  <span style="font-size: 10px;color: gray;">@<%- cinv.authorId %>@youtube.com</span>
 </p>           
-                    <p style="margin-bottom: -17px;" class="subs"><%= subs %> subscribers - <%- pronoun %></p>
+                    <p style="margin-bottom: -17px;" class="subs"><%=subs%> subscribers - <%- pronoun %></p>
  
 <p style="padding:0;font-weight:bold;max-inline-size: 37em;display: -webkit-box;-webkit-line-clamp: 3;-webkit-box-orient: vertical;"> 
  
@@ -768,7 +751,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=<
 
   <%  if (c.comments.length != "0") { %> 
 
-     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Posts</a>
+     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Community</a>
                                                                          <% } %>
                                                                          <% } %>
 
@@ -813,7 +796,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=<
 
   <%  if (c.comments.length != "0") { %> 
 
-     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Posts</a>
+     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Community</a>
                                                                          <% } %>
                                                                          <% } %>
 
@@ -855,7 +838,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=<
 
   <%  if (c?.comments?.length != "0") { %> 
 
-     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Posts</a>
+     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Community</a>
                                                                              <% } %>
                                              
                                                                           <% } %>
@@ -883,7 +866,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=<
 
       <% } %>
 
-     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab active" style="color:pink">Posts</a>
+     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab active" style="color:pink">Community</a>
  
   
 <%  if (Array.isArray(playlist?.playlists)) { %> 
@@ -897,15 +880,8 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=<
                                                                 <% } %>
 
                                                                                      <% if (tab === "shorts") { %>
- <%  if (Array?.isArray(tj?.videos)) { %> 
-   <%  if (tj?.videos[0]) { %> 
-<%  if (turntomins(tj?.videos[0]?.lengthSeconds)  != "aN:aN" ) { %> 
 
                 <a href="/channel?id=<%=ID%>" class="tab" style="color:#cfe2f3;">Videos</a>
-  <% } %>
-      <% } %>
-
-      <% } %>
 <%  if (Array?.isArray(shorts?.videos)) { %> 
 
                    <a href="/channel?id=<%=ID%>&tab=shorts" class="tab active shr">Shorts</a>
@@ -924,7 +900,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=<
 
   <%  if (c?.comments?.length != "0") { %> 
 
-     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Posts</a>
+     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Community</a>
                                                                          <% } %>
                                                                          <% } %>
 
@@ -959,7 +935,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=<
 
   <%  if (c?.comments?.length != "0") { %> 
 
-     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Posts</a>
+     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab" style="color:pink">Community</a>
                                                                          <% } %>
                                                                          <% } %>
 
@@ -1004,7 +980,7 @@ width: fit-content;
 			<div class="name">
 				<p style="font-family:PokeTube Flex,sans-serif;font-weight:1000;font-stretch: ultra-expanded;white-space:yes;"> <%=j.Channel?.Metadata.Name%>  </p>
           <p style="margin: -9px;">
-            			<%= subs %> subscribers - <%- pronoun %>
+            			<%=subs%> subscribers - <%- pronoun %>
 
         </p>
  			</div>
@@ -1038,7 +1014,7 @@ width: fit-content;
 
   <%  if (c.comments.length != "0") { %> 
 
-     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab">Posts</a>
+     <a  href="/channel?id=<%=ID%>&tab=community"  class="tab">Community</a>
                                                                          <% } %>
                                                                          <% } %>
                                                                                                                                                                      <%  if (Array?.isArray(shorts?.videos)) { %> 
@@ -1069,7 +1045,7 @@ width: fit-content;
                    <a href="/channel?id=<%=ID%>&tab=shorts" class="tab">Shorts</a>
   <% } %>
       <% } %>
-                <a href="/channel?id=<%=ID%>&tab=community"  class="tab active">Posts</a>
+                <a href="/channel?id=<%=ID%>&tab=community"  class="tab active">Community</a>
                                                                 <% } %>
         <% if (tab ==="shorts") { %>
 
@@ -1081,7 +1057,7 @@ width: fit-content;
                    <a href="/channel?id=<%=ID%>&tab=shorts" class="tab active">Shorts</a>
   <% } %>
       <% } %>
-                <a href="/channel?id=<%=ID%>&tab=community"  class="tab">Posts</a>
+                <a href="/channel?id=<%=ID%>&tab=community"  class="tab">Community</a>
                                                                 <% } %>
             </div>
      
@@ -1248,16 +1224,13 @@ width: fit-content;
 
  
     	<div class="video-grid" >
-             <%  if (!Array.isArray( tj?.videos)) { %> 
+            
-<p> No content on this channel :c <%  if (Array?.isArray( shorts.videos)) { %> try <a href="/channel?id=<%=ID%>&tab=shorts"> Try Looking at shorts maybe lol :p</a> </p>                              
-  <% } %>
-    <% } %>          
    
              <%  if (Array.isArray( tj?.videos)) { %> 
 
    <% tj.videos.forEach (x =>  { %>
 			<a href="/watch?v=<%- x.videoId %>" class="video">
-				<div class="thumbnail" style="background-image: url('<%- media_proxy_url %>/proxy?url=https://i.ytimg.com/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>
 			 
@@ -1265,10 +1238,9 @@ width: fit-content;
  			</a>	
  		 	               <% }) %>   
  <% } %>
-           
-  
-
 
+                                             
+ 
          
  
                        
@@ -1278,27 +1250,7 @@ width: fit-content;
 	<div class="pagination-buttons" style="border-top: none;justify-content: center">
     <a style="color:#fff" href="/channel?id=<%=ID%>&continuation=<%=tj.continuation%>">Next Page</a>
  	</div>
-    <% if (!isMobile) { %>  
+                           
-
-  <script> 
-  window.addEventListener('scroll', function() {
-    if ((window.innerHeight + window.scrollY) >= document.body.offsetHeight) {
-        var currentUrl = new URL(window.location.href);
-        var params = new URLSearchParams(currentUrl.search);
-        var continuationValue = '<%=tj.continuation%>';
-
-        if (params.has('continuation')) {
-            params.set('continuation', continuationValue);
-        } else {
-            params.append('continuation', continuationValue);
-        }
-
-        currentUrl.search = params.toString();
-        window.location.href = currentUrl.toString();
-    }
-});
-    </script>                       <% } %>
-
                        <% } %>
 
  
@@ -1334,7 +1286,7 @@ width: fit-content;
   <%  if (Array?.isArray( shorts.videos)) { %> 
     <% shorts.videos.forEach (x =>  { %>
       <a href="/shorts/<%- x.videoId %>" class="shorts-video" >
-        <img load="lazy" onerror="this.src=`<%- media_proxy_url %>/proxy?url=https://i.ytimg.com/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw`" src='<%- media_proxy_url %>/proxy?url=https://i.ytimg.com/vi/<%= x.videoId %>/maxresdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw'>
+        <img load="lazy" onerror="this.src=`<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%= x.videoId %>/hqdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw`" src='<%- media_proxy_url %>/proxy?url=https://vid.puffyan.us/vi/<%= x.videoId %>/maxresdefault.jpg?sqp=-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw'>
         <span class="shorts-title"><%- x.title %></span>
       </a>
     <% }) %>   
@@ -1435,7 +1387,7 @@ width: fit-content;
 
    <% stream.videos.forEach (x =>  { %>
 			<a href="/watch?v=<%- x.videoId %>" class="video">
-				<div class="thumbnail" style="background-image: url('<%- media_proxy_url %>/proxy?url=https://i.ytimg.com/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>
 			 
@@ -1498,10 +1450,6 @@ width: fit-content;
                        
     <% if (tab === "community") { %>
     <%  if (Array?.isArray( c?.comments)) { %> 
- <div style="max-width: 800px;margin: 20px auto;padding: 20px;border-radius: 8px;background: linear-gradient( 135deg, #f97794 10%, #623aa2 100%, #8e6f7e 100% );box-shadow: 0 2px 4px rgba(0,0,0,0.1);margin-bottom: -1em;">
-<h1 style="color: #fff;font-family: 'PokeTube Flex';text-align: center !important;font-stretch: ultra-expanded;font-weight: 1000;">Welcoem to posts!!</h1>
-<p>in the future - u will be able to do some more stuff here,,,!! like pat catgirl- i mean um yeah... for now u can only see others's posts :c  </p>
-    </div>
 <div class="community">
   
    <% c?.comments?.forEach (x =>  { %>
@@ -1509,7 +1457,7 @@ width: fit-content;
     
 
                      <h5 style="display: flex;margin-top: -1em;padding-top: 10px;margin-bottom:10px"><div class="thumb">
-				<a href="/channel?id=<%- x.authorId	%>" class="avatar" style="width: 40px;height: 40px;">
+				<a href="/channel?id=UC0n83khlA76NRfDfm7BNtkQ" class="avatar" style="width: 40px;height: 40px;">
 					<img src="https://p.poketube.fun/<%=j.Channel?.Metadata.Avatars.Thumbnail.$t%>">
 				</a>
                        
@@ -1522,7 +1470,8 @@ width: fit-content;
                                                                                                   </a>
                             
                             <span>
-                                <br>  Posted <%- x.publishedText %> <span>   
+                                <br>   <%- x.publishedText %> -                         <span>   
+ <%- convert(x.likeCount) %>   likes
         </span>   
 
                             </span>
@@ -1548,7 +1497,7 @@ width: fit-content;
 <video class="player"  style="border-radius: 16px;
 "  controls   
        
-       poster="<%- media_proxy_url %>/proxy?url=https://i.ytimg.com/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">
@@ -1570,7 +1519,7 @@ width: fit-content;
                  
                <% } %>
 
-<p>   <i class="fa-light fa-thumbs-up"></i> <%- convert(x.likeCount) %>  - <i class="fa-light fa-reply"></i> <%- convert(x.replyCount) %> </p>
+   
               </div>
 
                   
@@ -1619,30 +1568,17 @@ width: fit-content;
 
     <div onclick="closePopup()" id="popup-container">
         <div id="close-btn" onclick="closePopup()">X</div>
-   <div class="video-title" style=";font-stretch: extra-expanded;margin-top: 10px;margin-bottom: -10px;padding: 10px;border-top-left-radius: 11px;border-top-right-radius: 11px;font-family: &quot;poketube flex&quot; , sans-serif;font-weight: 850;text-align: left;">About</div>
+   
                             <% if (cinv.descriptionHtml) { %>  
 
 <p style="color:#fff;margin-left: 10px;font-weight: bold;text-align: left;"><%-cinv.descriptionHtml%></p>
-       <%  if (Array.isArray(cinv?.tags)) { %> 
-<div class="video-title" style=";font-stretch: extra-expanded;margin-top: 10px;margin-bottom: -10px;padding: 10px;border-top-left-radius: 11px;border-top-right-radius: 11px;font-family: &quot;poketube flex&quot; , sans-serif;font-weight: 1000;text-align: left;">Tags</div>	    
-    <div class="tags-channel" style="padding: 10px;background: #272727;margin-top: 10px;border-radius: 11px;">
-	 <br>
-	 <% cinv.tags.forEach(x => { %>
-	 <div class="tag-channel">
-	   <a href="/hashtag/<%=x %>" style="color:var(--text-color)">
-	   <%=x %>
-	     </a>
-	   </div>         <% }) %>  
-      <% } %>
      </div>
-  
+      
       <% } %>
-           
-
       <% } %>
                                                                                            <% } %>
 
-<script src="/css/custom-css.js?v=884"> </script>
+<script src="/css/custom-css.js"> </script>
   <script>
       // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-3.0-or-later  
 
@@ -1713,12 +1649,6 @@ document.getElementById('search').addEventListener('keyup', function () {
             event.preventDefault();
             togglePopup();
         }); 
-
-       document.addEventListener('keydown', function (event) {
-        if (event.key === 'Escape' && isPopupOpen) {
-            closePopup();
-        }
-    });
 // @license-end
 
      </script>

html/discover.ejs

@@ -20,21 +20,22 @@
 
 <!DOCTYPE html><html>
 <head>
-    <title>Poke | Discover</title>
+    <title>PokeTube - Privacy Is Your Right</title>
-    <link href="/css/yt-ukraine.svg?v=6" rel=icon>
+    <link href=/css/yt-ukraine.svg?v=6 rel=icon>
      <meta content=website property=og:type>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta content="Poke - Discover" property=og:title>
     <meta content="Discover Popular videos on poke!" property=twitter:description>
     <meta content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884" property=og:image>
      <meta content=summary_large_image name=twitter:card>
+    <meta content=@PoketaleBot name=twitter:site>
+    <meta content=@PoketaleBot name=twitter:creator>
       <link rel="manifest" href="/manifest.json">
 <meta name="darkreader-lock"> <!-- tells dark reader that the site has a dark theme and to turn itself off -->
-    
+    <link href=/css/app-cdn.min.css rel=stylesheet>
-    <link href="/css/app-cdn.min.css" rel=stylesheet>
+  <link href=/css/app-cdn.min.css rel=stylesheet>
-  <link href="/css/app-cdn.min.css" rel=stylesheet>
+<link href=/css/app.main.css?v=44600 rel=stylesheet>
-<link href="/css/app.main.css?v=44600" rel=stylesheet>
+<link href=/css/search.main.css?v=57 rel=stylesheet>
-<link href="/css/search.main.css?v=57" rel=stylesheet>
  <link href=/css/watch.main.css rel=stylesheet>
     <meta content="#1a1a1a" name="theme-color">
   </head>
@@ -55,8 +56,7 @@
         src:url('https://p.poketube.fun/https://cdn.statically.io/gh/brecert/discord-quote-generator/main/Ginto-Nord-800.woff') format("woff");
       }
 
-  </style>      
+  </style>        <style nonce="IJD3y0awTwA2dd0pWOP+ZQ">
-    <style nonce="IJD3y0awTwA2dd0pWOP+ZQ">
                 #yt-masthead{line-height:0;margin:15px auto;width:440px;margin-top:25px}#logo-container{margin-right:5px;float:left;cursor:pointer;text-decoration:none}.logo{background:no-repeat url("//www.gstatic.com/youtube/img/branding/youtubelogo/1x/youtubelogo_30.png");width:125px;height:30px;cursor:pointer;display:inline-block}#masthead-search{display:flex;margin-top:3px;max-width:650px;overflow:hidden;padding:0;position:relative}.search-button{border-left:0;-moz-border-radius-topleft:0;border-top-left-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;float:right;height:29px;padding:0;border:solid 1px transparent;border-color:#ffff;background:#999;;color:#333;cursor:pointer}.search-button:hover{border-color:#c6c6c6;background:#f0f0f0;box-shadow:0 1px 0 rgba(0,0,0,0.0)}.search-button-content{border:none;display:block;opacity:.6;padding:0;text-indent:-10000px;background:no-repeat url(//www.gstatic.com/youtube/src/web/htdocs/img/search.png);background-size:auto;width:15px;height:15px;box-shadow:none;margin:0 25px}#masthead-search-terms-border{flex:1 1 auto;border:1px solid #ccc;box-shadow:inset 0 1px 2px #eee;background-color:#fff;font-size:14px;height:29px;line-height:30px;margin:0 0 2px;overflow:hidden;position:relative;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:border-color .2s ease;transition:border-color .2s ease}#masthead-search-terms{background:#2c2f33;border:0;font-size:16px;height:100%;left:0;margin:0;outline:none;padding:2px 6px;position:absolute;width:100%;-moz-box-sizing:border-box;box-sizing:border-box}
             </style>
  <body>
@@ -80,12 +80,65 @@ summary:hover{
 }
 </style>
                 
-   <style>
+  <!-- WIGGLE WIGGLE WIGGLE -->
+  <style>
     body{
         overflow-x: hidden; /* Hide horizontal scrollbar */
         color:#111111
     }
     
+   .animated {
+            -webkit-animation-duration: 10s; 
+            animation-duration: 10s; 
+            -webkit-animation-fill-mode: both;
+            animation-fill-mode: both; 
+            animation-iteration-count: infinite;
+            -moz-animation-iteration-count: infinite;
+            -webkit-animation-iteration-count: infinite;
+            -o-animation-iteration-count: infinite;
+         }
+    
+
+         @-webkit-keyframes wiggle { 
+            0% { -webkit-transform: skewX(9deg); }
+            10% { -webkit-transform: skewX(-8deg); }
+            20% { -webkit-transform: skewX(7deg); }
+            30% { -webkit-transform: skewX(-6deg); }
+            40% { -webkit-transform: skewX(5deg); } 
+            50% { -webkit-transform: skewX(-4deg); } 
+            60% { -webkit-transform: skewX(3deg); }
+            70% { -webkit-transform: skewX(-2deg); } 
+            80% { -webkit-transform: skewX(1deg); } 
+            90% { -webkit-transform: skewX(0deg); }
+            100% { -webkit-transform: skewX(0deg); } 
+         }
+         
+         @keyframes wiggle { 
+            0% { transform: skewX(9deg); } 
+            10% { transform: skewX(-8deg); } 
+            20% { transform: skewX(7deg); } 
+            30% { transform: skewX(-6deg); } 
+            40% { transform: skewX(5deg); } 
+            50% { transform: skewX(-4deg); } 
+            60% { transform: skewX(3deg); } 
+            70% { transform: skewX(-2deg); } 
+            80% { transform: skewX(1deg); } 
+            90% { transform: skewX(0deg); } 
+            100% { transform: skewX(0deg); } 
+         }
+         
+         .wiggle { 
+            -webkit-animation-name: wiggle;
+            animation-name: wiggle; 
+            -webkit-animation-timing-function: ease-in;
+            animation-timing-function: ease-in; 
+         }
+         
+         .animated.wiggle  { 
+            -webkit-animation-duration: 0.75s; 
+            animation-duration: 0.75s;
+         }
+    
     :root {
     --text-primary: #fff;
     --text-secondary: #fff;
@@ -134,19 +187,14 @@ summary:hover{
 }
 
 .progress-bar {
-   position: absolute;
+  position: absolute;
   top: 0;
   left: 0;
   width: 0%;
   height: 100%;
-   background-image: linear-gradient(to right, 
+  background-color: purple;
-    #ff0045,    
-    #ff0e55,   
-    #ff1d79  
-  );
   transition: width 0.5s ease-in-out;
 }
-
     .video > .info > .title {
   color: var(--text-primary) !important;
   font-weight: bold;
@@ -186,7 +234,8 @@ margin-right: auto;
   color: black;
 }
     
-  section p {
+  </style>   
+                    <style>section p {
  font-family:Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
  font-weight:400;
  color:#fff;
@@ -278,8 +327,10 @@ margin-left: auto;
   background: var(--not-quite-black);
   text-decoration: none;
   border-radius: 1em;
-}                          
+}     </style>
+                     
   
+ <style> 
  
 @keyframes gradient {
   0% {
@@ -301,9 +352,8 @@ margin-left: auto;
   width: 100%;
 }
   .video-grid > .video:hover{
-border:solid #ff0033;
+border:solid;
 }                  
-
  .video-grid > .video {
   border-radius: 16px;
   background: black;
@@ -363,10 +413,12 @@ border:solid #ff0033;
  <div class="channel-page" >   
           <audio id="audio" style="display:none;" loop autoplay></audio>
 
- 
+    <img src="https://t.poketube.fun/t/rep.gif" style="width: 0;visibility: hidden;display:none;" id="discover_main">
+
       
    <h1 style="font-size: 2em;margin-left: auto;margin-right: auto;text-align: center;font-family: poketube flex;font-weight: 1000;font-stretch: ultra-expanded;color: #fff;margin-bottom: 7px;margin-top: 31px;">
-Popular Videos On Poke :3   </h1>
+Discover Popular videos on poketube!
+   </h1>
         <% if (!tab) { %> 
 
      <div class="tabs tabs-center">
@@ -440,9 +492,9 @@ Popular Videos On Poke :3   </h1>
 
 
                                  
-<div class="video-grid" style="border-top-left-radius:2em;width: 80em;border-top-right-radius: 2em;border: solid 1px #df03a8;">
+    	<div class="video-grid" style="border-radius:12px">
    <% inv.forEach(x =>  { %>
-			<a href="/watch?v=<%- x.videoId %>" class="video canloadhd" data-author="<%- x.author %>" >
+			<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="info">
 					<span class="title max-lines-2" title="<%- x.title %>" style="font-family:Inter,sans-serif;"><%- x.title %></span>
@@ -454,7 +506,8 @@ Popular Videos On Poke :3   </h1>
           
 
  		 	               <% }) %>   
-                        
+                       
+                       
                                    </div>
                      		 	            
                                    </div>
@@ -465,6 +518,9 @@ Popular Videos On Poke :3   </h1>
    <script>
         // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-3.0-or-later  
 
+ if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.register('service-worker.js');
+  }
 
   document.addEventListener('DOMContentLoaded', function() {
   let bgs = document.querySelectorAll('[data-bg]');
@@ -558,6 +614,7 @@ element.addEventListener('mouseleave', () => {
 });
 
 element.addEventListener('wheel', (e) => {
+  // You can also handle mouse wheel events for kinetic scrolling
   // Adjust the scrollTop based on e.deltaY
   element.scrollTop += e.deltaY;
 });
@@ -1006,7 +1063,7 @@ margin-left: auto;
  <div class="app" >
         <nav>
  
-      <div class=left><a class="class" href="/" style=font-family:Inter,sans-serif;color:#fff> <img style="width: 8.5em;display: block;margin-left: auto;margin-right: auto;" src="/css/logo-poke.svg">      </a>
+      <div class=left><a class="class" href="/" style=font-family:Inter,sans-serif;color:#fff> <img style="width: 8.5em;display: block;margin-left: auto;margin-right: auto;" src="/css/logo-mobile.svg">      </a>
              </div>
 
   
@@ -1040,7 +1097,7 @@ margin-left: auto;
 
 <div class="tabs tabs-center" style="margin: 0px;">
             
-                <a href="?tab=popular" style="display:none" class="tab">Popular</a>
+                <a href="?tab=popular" class="tab">Popular</a>
                                     
                 <a class="tab active">Trends</a>
  
@@ -1054,7 +1111,7 @@ margin-left: auto;
               
                 <a class="tab active">Popular</a>
                                     
-                <a href="/app" class="tab active">Trends</a>
+                <a href="/app" class="tab Activw">Trends</a>
     </div>
                                                       		 	               <% } %>   
                                 <% if (!tab) { %> 
@@ -1138,19 +1195,19 @@ Privacy
                                   
                                           
                       		 	                                         <% if (tab == "search") { %> 
- <a href="/app"><-- go to home  </a>                                        
+ <a href="/app"><-- </a><br>
-                            <span style="display:none">
+                                                                     <span>
- Search videos on poke! poke is a youtube front end so all of the videos on youtube should workm!! 
+ Search morbillion amount of videos from poketube !! 
                                                                      </span>
                                <div class=search>
         
         <form action="/app">
-
           
-   <input class="search-bar" autocomplete="on" id="fname" name="mobilesearch" placeholder="Search! "style="background: linear-gradient(90deg, hsla(235, 21%, 21%, 1) 0%, hsla(194, 41%, 22%, 1) 50%, hsla(174, 48%, 20%, 1) 100%);color:#fff;font-family:Inter,sans-serif;border-radius: 9999px;">
+          
+   <input class="search-bar" autocomplete="on" id="fname" name="mobilesearch" placeholder="Search some videos lol "style="color:#fff;font-family:Inter,sans-serif;border-radius: 8px;">
           
         
-          <button class="btn btn-success" style="border-radius:1em;display:none;" type=submit>
+          <button class="btn btn-success" type=submit>
             <i class="fa-light fa-search" style="margin: auto;"></i></button></form>
                                <img src="https://t.poketube.fun/t/rep.gif"  style="border:0;width: 0;visibility: hidden;"> 
  
@@ -1175,7 +1232,7 @@ Privacy
           
               	<div class="video-grid" style="background-color: var(--app-background);margin-top: -4em;">
                      <span style="margin-bottom: -8em;margin-top: 8px;">
-                         <%=j.Search.estimatedResults.toLocaleString()%> Results
+                         <%=j.Search.estimatedResults.toLocaleString()%> Results (estimated)
  </span>
        <% j.Search.Results.Video.forEach(x => { %>
 

html/download.ejs

@@ -17,9 +17,9 @@
     along with this program. If not, see https://www.gnu.org/licenses/.
 --><!DOCTYPE html><html>
 <head>
-    <title>Poke | Download Video </title>
+    <title>PokeTube | Download Video </title>
     <meta content="<%=color%>" name="theme-color">
-    <link href=/css/yt-ukraine.svg?v=7 rel=icon>
+    <link href=/css/yt-ukraine.svg?v=6 rel=icon>
     <link rel="manifest" href="/manifest.json">
     <meta content=website property=og:type>
       <meta name="viewport" content="width=device-1200px, initial-scale=1.0, shrink-to-fit=yes, viewport-fit=cover">
@@ -173,9 +173,7 @@ font-family:Ubuntu
   margin-left: auto;
   margin-right: auto;
   background: #333;
- height: fit-content;
+ height: 56em;
-  height: -moz-fit-content;
-
   border-radius: 10px;
   margin-top: 2em;
 }
@@ -185,9 +183,9 @@ font-family:Ubuntu
 <body>
    <% if (!isMobile) { %>
 
-       <div class="app" style="background:linear-gradient(135deg, #820622 10%, #4e2e82 100%, #725965 100%);height: 162em;">      
+       <div class="app" style="background:linear-gradient(135deg, #820622 10%, #4e2e82 100%, #725965 100%);height: 67em;">      
 	   <nav>
-       <div class=left><a class="class" href="/143" style=font-family:Inter,sans-serif;color:#fff><img style="transform: scale(1.3);padding-left:0.9em;width: 8.5em;display: block;margin-left: auto;margin-right: auto;" src="/css/logo-poke.svg?v=5">  </a>                                                                                               </div>               
+       <div class=left><a class="class" href="/143" style=font-family:Inter,sans-serif;color:#fff><img style="transform: scale(1.3);padding-left:0.9em;width: 8.5em;display: block;margin-left: auto;margin-right: auto;" src="/css/logo.svg?v=5">  </a>                                                                                               </div>               
             <div class="middle">
         <form action="/search"><input class="search-bar" autocomplete="on" id="fname" name="query" style="color:var(--text-color);font-family:poketube flex,sans-serif;border-radius: 2em;font-weight: 850;font-stretch: extra-expanded;" data-ddg-inputtype="identities.firstName">
 <button class="btn btn-success" type="submit" style="transform: translate(21em, -1.25em);"><i class="fa-light fa-search"></i></button>             
@@ -239,8 +237,17 @@ font-family:Ubuntu
 
       <div class="download-format" style="background: black;margin: 6px;border-radius: 14px;/*! text-align: center; */"><div style="font-family:&quot;PokeTube flex&quot;;font-stretch: ultra-expanded;font-weight: 700;"> 
                                                                                                  <% } %> 
-
+        3GPP 
-             MP4 - 480p
+          </div>
+					<a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=17">
+            <i class="fa-light fa-download"></i>
+						Download 
+					</a>
+				<br>
+				</div>
+      
+           <div class="download-format" style="background: black;margin: 6px;border-radius: 14px;/*! text-align: center; */"><div style="font-family:&quot;PokeTube flex&quot;;font-stretch: ultra-expanded;font-weight: 700;"> 
+            MP4 (480p)
           </div>
 					<a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=18">
             <i class="fa-light fa-download"></i>
@@ -248,35 +255,26 @@ font-family:Ubuntu
 					</a>
 				<br>
 				</div>
-  
       
-				
+      <div class="download-format" style="background: black;margin: 6px;border-radius: 14px;/*! text-align: center; */">					          <div style="font-family:&quot;PokeTube flex&quot;;font-stretch: ultra-expanded;font-weight: 700;">  MP4 (720p)
+           </div>
+					<a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>">
+            <i class="fa-light fa-download"></i>
+						Download 
+					</a>
+				<br>
+				</div>
         
-             
+              <!-- ignore this -->
+        <p style="visibility: hidden;">
+ we dont see the videos that you are downloading :P
+          </p>
 		</div>
 	 
-    <div class="format-list" style="margin-top: 2em;">
+    <div class="format-list" style="margin-top: -2em;">
       
 			<h2>Audio-Only formats</h2>
       
-        <div class="download-format" style="background: black;margin: 6px;border-radius: 14px;/*! text-align: center; */">					          <div style="font-family:&quot;PokeTube flex&quot;;font-stretch: ultra-expanded;font-weight: 700;">  m4a (low) 
-           </div>
-			  	<a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=139&f=webm">
-            <i class="fa-light fa-download"></i>
-						Download 
-					</a>
-				<br>
-				</div>
-
-            <div class="download-format" style="background: black;margin: 6px;border-radius: 14px;/*! text-align: center; */">					          <div style="font-family:&quot;PokeTube flex&quot;;font-stretch: ultra-expanded;font-weight: 700;">  m4a (high) 
-           </div>
-			  	<a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=140&f=webm">
-            <i class="fa-light fa-download"></i>
-						Download 
-					</a>
-				<br>
-				</div>
-
         <div class="download-format" style="background: black;margin: 6px;border-radius: 14px;/*! text-align: center; */">					          <div style="font-family:&quot;PokeTube flex&quot;;font-stretch: ultra-expanded;font-weight: 700;">  webm (low) 
            </div>
 			  	<a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=249&f=webm">
@@ -294,118 +292,7 @@ font-family:Ubuntu
 					</a>
 				<br>
 				</div>
-        
+      
-               <div class="format-list" style="margin-top: 2em;">
-<h2>Video-Only formats</h2>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">144p - MP4</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=160&f=mp4">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">144p - WEBM</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=278&f=webm">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">240p - MP4</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=133&f=mp4">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">240p - WEBM</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=242&f=webm">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">360p - MP4</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=134&f=mp4">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">360p - WEBM</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=243&f=webm">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">480p - MP4</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=135&f=mp4">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">480p - WEBM</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=244&f=webm">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">720p - MP4</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=136&f=mp4">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">720p - WEBM</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=247&f=webm">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">1080p - MP4</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=137&f=mp4">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
-<div class="download-format" style="background: black;margin: 6px;border-radius: 14px;">
-  <div style="font-family:'PokeTube flex';font-stretch: ultra-expanded;font-weight: 700;">1080p - WEBM</div>
-  <a style="color:#fff;font-family:Ubuntu" href="/api/video/download?v=<%=v%>&q=248&f=webm">
-    <i class="fa-light fa-download"></i>
-    Download
-  </a>
-  <br>
-</div>
-
       <!-- ignore this -->
         <p style="visibility: hidden;">
  gfhefdhgrdfhdfshfgddfsfdgdfsds gfhefdhgrdfhdfshfgddfsfdgdfsds
@@ -418,7 +305,7 @@ font-family:Ubuntu
 
 </div>
       
-<script src="/css/custom-css.js?v=54"> </script><script src="/css/data-mobile.js?v=549"> </script>
+<script src="/css/custom-css.js"> </script><script src="/css/data-mobile.js"> </script>
 
  
 </body>

html/landing.ejs

@@ -2,7 +2,7 @@
 
     This Source Code Form is subject to the terms of the GNU General Public License:
 
-    Copyright (C) 2021-2025 Poke (https://codeberg.org/ashley/poke)
+  Copyright (C) 2021-2024 POKETUBE (https://codeberg.org/Ashley/poketube)
     
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -10,43 +10,34 @@
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program. If not, see https://www.gnu.org/licenses/.
 --->
-
 <!DOCTYPE html>
 <html lang="en">
 
 <head>
-  <title>Poke | The privacy app of your dreams!</title>
+  <title>Poke | The Ultimate Privacy App!</title>
   <meta charset="UTF-8">
   <meta name="theme-color" content="#414161">
   <meta http-equiv="content-language" content="en-us">
   <meta name="viewport" content="width=device-1200px, initial-scale=1.0, shrink-to-fit=yes, viewport-fit=cover">
-  <link rel="stylesheet" href="/css/landing.css?v=2544">
+  <link rel="stylesheet" href="/css/landing.css?v=244">
   <link rel="stylesheet" href="/css/snow.css">
-  <link rel="stylesheet" href="/css/app.main.css">
+  <link href=/css/yt-ukraine.svg?v=6 rel=icon>
-  <link href=/css/yt-ukraine.svg?v=7 rel=icon>
   <link rel="manifest" href="/manifest.json">
   <meta name="darkreader-lock"> <!-- tells dark reader that the site has a dark theme and to turn itself off -->
-  <meta content="▶▶ Poke - The only (good) front-end in the world!" property=og:title>
+  <meta content="▶▶ Poke - The Ultimate privacy App!" property=og:title>
-<% if(embedtype === "woke") { %>
+  <meta content="Watch Silly videos or search the interwebs while being anonymous on poke!"
-  <meta content="Poke is a 𝔀𝓸𝓴𝓮 software YouTube front-end, translator, 𝔀𝓸𝓴𝓮 app, and even 𝔀𝓸𝓴𝓮!! Watch 𝔀𝓸𝓴𝓮 videos, search the internet, and do all of that and more 𝔀𝓸𝓴𝓮 in this all-in-one 𝔀𝓸𝓴𝓮 app!!!"
+    property=twitter:description>
-    property="twitter:description">
+  <meta
-  <meta content="https://cdn.glitch.global/302c6ee0-629f-453b-9024-bad1f8d7be36/9fhFiXJ.png?v=1717357642758"
+    content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884"
-    property="og:image">
+    property="og:image" />
-<% } else { %>
-  <meta content="Poke is a free software YouTube front-end, translator, map app, and more!! Watch silly videos, search the internet, and do all of that and more anonymously in this all-in-one privacy app!!!"
-    property="twitter:description">
-  <meta content="https://cdn.glitch.global/302c6ee0-629f-453b-9024-bad1f8d7be36/poke.png?v=1716216428745"
-    property="og:image">
-<% } %>
-
-
   <meta content="summary_large_image" name="twitter:card" />
   <% if(isOldWindows) { %>
     <style>
@@ -67,26 +58,6 @@
           overflow-x: hidden;
         }
 
-        .discover-video-button > a {
-          border: 2px white solid;
-          border-radius: 3rem;
-          padding: 12px 1em 12px 12px;
-          display: flex;
-          align-items: center;
-          width: 146px;
-          text-align: center;
-          margin: auto;
-          color: #fff;
-          margin-bottom: 2em;
-          margin-top: 26px;
-          text-decoration: none;
-        }
-
-        .discover-video-button > a:hover {
-          filter: brightness(0.8);
-        }
-
-
         .subtitle {
           text-align: center;
           color: #FFFF00;
@@ -113,108 +84,61 @@
 </head>
 
 <body>
-  <div style="margin-top: 6em;margin-left: auto;margin-right: auto;margin-bottom: -7em;background: #000;padding: 1em;border-radius: 14px;font-family: ubuntu;"> <%- banner %></div>
+  <video id="HD-BG" playsinline autoplay muted loop><source src="/bg-full.webm" type="video/webm"/></video>
-  <%- include('./partials/header.ejs') %>
+  <video id="SD-BG" playsinline autoplay muted loop><source src="/bg-480.webm" type="video/webm"/></video>
-  <video playsinline muted paused><source src="/bg-480.webm" type="video/webm"/></video>
+  <div class="header">
+    <div class="header-content">
+      <div class="header-content-start">
+        <a href="/" style="text-decoration:none;"><img style="width: 130px;" src="/css/logo-poke.svg" />
+          <p class="subtitle"> <%- random %></p>
+        </a>
+      </div>
+      <div class="header-content-center" style="margin-left: -30px;">
+        <form action=/search><input class=search-bar autocomplete="on" id=fname name=query><button
+            class="btn btn-success" type=submit><i class="fa-light fa-search"></i></button></form>
+      </div>
+      <div class="header-content-end">
+        <a href="https://codeberg.org/Ashley/poketube/src/branch/main/instances.json"><i
+            class="fa-sharp fa-solid fa-server"></i></a>
+        <a href="/apps"><i class="fa-sharp fa-solid fa-grid-2"></i></a>
+        <a href="/game-hub"><i class="fa-sharp fa-solid fa-gamepad-modern"></i></a>
+      </div>
+    </div>
+  </div>
+  <div class="features">
+    <a style="color: white; text-decoration: none;" href="https://war.ukraine.ua/donate/">
+      <p><i class="fa-duotone fa-handshake-angle"></i> Support Ukraine </p>
+    </a>
+    <a style="color: white; text-decoration: none;"
+      href="https://buildpalestine.com/2021/05/15/trusted-organizations-to-donate-to-palestine/">
+      <p><i class="fa-duotone fa-handshake-angle"></i> Support Palestine</p>
+    </a>
+  </div>
   <div class="landing">
-    <h1 style="text-align: center;">WELCOME TO POKE!</h1>
+    <h1>The Ultimate Privacy App</h1>
-    <p style="max-width: 800px;text-align: center;margin: auto;margin-bottom: 3em;">Poke is a free software AD-FREE ! YouTube front-end, translator, map app, and more!!1! Watch videos and explore without a trace in this all-in-one privacy app!!1! :3</p>   
+    <p style="max-width: 800px; text-align: center; margin: 20px auto;"> Be Anonymous watching epic videos, searching
-    <div style="text-align: center; padding: 10px; border-radius: 8px;margin-left: -1em;">
+      thingys on the interwebs and listening to music on poketube - the free yt front end thats focused on ur privacy!!
-    <details>
+    </p>
-        <summary style="cursor: pointer; color: white; font-size: 18px; text-decoration: underline;">
+    <div class="features">
-            Support Humanitarian Efforts
+      <p><i class="fa-sharp fa-solid fa-eye-low-vision"></i> No Tracking & Ads</p>
-        </summary>
+      <p><i class="fa-sharp fa-solid fa-rabbit-running"></i>Very Fast</p>
-        <div style="margin-top: 10px;">
+      <p><i class="fa-sharp fa-solid fa-download"></i>Built-in video downloader</p>
-            <a style="color: white; text-decoration: underline; margin: 0 5px;" href="https://buildpalestine.com/2021/05/15/trusted-organizations-to-donate-to-palestine">
+      <p><i class="fa-sharp fa-solid fa-search"></i>Web Search</p>
-               Support Palestine
-            </a>
-            <a style="color: white; text-decoration: underline; margin: 0px -6px;" href="https://gazaesims.com">
-                (or u can donate esims to Gaza!)
-            </a>
-            <span style="color: white; margin: 0 5px;"> - </span>
-            <a style="color: white; text-decoration: underline; margin: 0 5px;" href="https://war.ukraine.ua/donate">
-                Donate to 🇺🇦
-            </a>
-            <span style="color: white; margin: 0 5px;"> - </span>
-            <a style="color: white; text-decoration: underline; margin: 0 5px;" href="https://donate.unhcr.org/int/en/general">
-                Donate to other areas of military conflict
-            </a>
-        </div>
-    </details>
-</div>
-    
-    <% if(!DisablePokeChan) { %>
-    <img src="/static/poke-chan-outfit-a.png" title="Poke-chan sitting :3">
-    <% } %>
-
-    <div style="display: flex; gap: 12px;">
-      <img src="/static/poke-screnshot-v2.png" />
-      <img src="/static/Poke-Mobile.jpg" />
-    </div> 
-
-<div>
-     <h1 style="margin-left: auto;margin-right: auto;text-align: center;margin-bottom: -1em;margin-top: 1em;">TOP 3 REASONS WHY POKE IZ COOL!!</h1>
-   </div>
-   <% 
-const features = [
-  { title: "No Tracking and Ads", description: "Poke Has no Trackers or ads - we dont and we wont see the vids ur watching :3", icon: "<svg style='background: #ea6d6d;' width='24px' height='24px' viewBox='0 0 24 24' stroke-width='1.5' fill='none' xmlns='http://www.w3.org/2000/svg' color='#ffffff'><path d='M19.5 16L17.0248 12.6038' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M12 17.5V14' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M4.5 16L6.96895 12.6124' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M3 8C6.6 16 17.4 16 21 8' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/></svg>" },
-  { title: "Speedy", description: "Poke is really ligthweight (both on server and client :3) so you can still use it on poor connections :3", icon: "<svg style='background: #6d8cea;' width='24px' height='24px' stroke-width='1.5' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg' color='#ffffff'><path d='M15 7C16.1046 7 17 6.10457 17 5C17 3.89543 16.1046 3 15 3C13.8954 3 13 3.89543 13 5C13 6.10457 13.8954 7 15 7Z' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M12.6133 8.26691L9.30505 12.4021L13.4403 16.5374L11.3727 21.0861' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M6.4104 9.5075L9.79728 6.19931L12.6132 8.26692L15.508 11.5752H19.2297' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M8.89152 15.7103L7.65095 16.5374H4.34277' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/></svg>" },
-  { title: "Downloader", description: "You wouldnt download a car - welp i would :D u can download videos from poke for 0$!", icon: "<svg style='background: #519355;' width='24px' height='24px' stroke-width='1.5' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg' color='#ffffff'><path d='M12 8V16M12 16L15.5 12.5M12 16L8.5 12.5' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/></svg>" },
-  { title: "DRM Free", description: "Poke comes without digital restrictions management - poke is free software :3", icon: "<svg style='background: #b7a358;' width='24px' height='24px' stroke-width='1.5' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg' color='#ffffff'><path d='M4.62323 5.24841C2.99408 7.02743 2 9.39765 2 12C2 17.5229 6.47715 22 12 22C14.5361 22 16.8517 21.0559 18.6146 19.5' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M21.3021 15.6775C21.7525 14.5392 22 13.2985 22 12C22 6.47715 17.5228 2 12 2C10.7687 2 9.58934 2.22255 8.5 2.62961' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M9 15C9.64448 15.8593 10.8428 16.3494 12 16.391C13.1141 16.431 14.1901 16.0554 14.6973 15.1933' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M12 16.391V18.5' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M9.5 9.5C9.5 10.6811 10.3525 11.1647 11.3862 11.5' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M15 8.5C14.315 7.81501 13.1087 7.33855 12 7.30872V5.5' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M3 3L21 21' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/></svg>" },
-  { title: "Games Included", description: "U can play funnie games on poke!", icon: "<svg style='background: #886dea;' width='24px' height='24px' viewBox='0 0 24 24' stroke-width='1.5' fill='none' xmlns='http://www.w3.org/2000/svg' color='#ffffff'><path d='M17.5 17.5C20 21 23.9486 18.4151 23 15C21.5753 9.87113 20.8001 7.01556 20.3969 5.50793C20.1597 4.62136 19.3562 4 18.4384 4L5.56155 4C4.64382 4 3.844 4.62481 3.62085 5.515C2.7815 8.86349 2.0326 11.8016 1.14415 15C0.195501 18.4151 4.14415 21 6.64415 17.5' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M16 4V6C16 7.10457 15.1046 8 14 8H10C8.89543 8 8 7.10457 8 6L8 4' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M8 16C9.10457 16 10 15.1046 10 14C10 12.8954 9.10457 12 8 12C6.89543 12 6 12.8954 6 14C6 15.1046 6.89543 16 8 16Z' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/><path d='M16 16C17.1046 16 18 15.1046 18 14C18 12.8954 17.1046 12 16 12C14.8954 12 14 12.8954 14 14C14 15.1046 14.8954 16 16 16Z' stroke='#ffffff' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/></svg>" }
-];
-
-const randomFeatures = features.sort(() => 0.5 - Math.random()).slice(0, 3);
-%>
- <div class="new-feature-set">
-  <% randomFeatures.forEach(feature => { %>
-  <div class="feature-set">
-
- <div class="feature-set-title"><%- feature.icon %>
-      <h2><%- feature.title %></h2>
-               </div>
-      <p><%- feature.description %></p></div>
-
-   <% }) %>
-</div> 
-    <div class="adaptive-grid">
-      <%- include('./partials/card', 
-        icon_background='transparent',
-        icon="none",
-        title='Join Us',
-        description='join our community if you want to! :3',
-        actions='true',
-
-        has_secondary_action='true',
-        secondary_icon='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M524.5 69.8a1.5 1.5 0 0 0 -.8-.7A485.1 485.1 0 0 0 404.1 32a1.8 1.8 0 0 0 -1.9 .9 337.5 337.5 0 0 0 -14.9 30.6 447.8 447.8 0 0 0 -134.4 0 309.5 309.5 0 0 0 -15.1-30.6 1.9 1.9 0 0 0 -1.9-.9A483.7 483.7 0 0 0 116.1 69.1a1.7 1.7 0 0 0 -.8 .7C39.1 183.7 18.2 294.7 28.4 404.4a2 2 0 0 0 .8 1.4A487.7 487.7 0 0 0 176 479.9a1.9 1.9 0 0 0 2.1-.7A348.2 348.2 0 0 0 208.1 430.4a1.9 1.9 0 0 0 -1-2.6 321.2 321.2 0 0 1 -45.9-21.9 1.9 1.9 0 0 1 -.2-3.1c3.1-2.3 6.2-4.7 9.1-7.1a1.8 1.8 0 0 1 1.9-.3c96.2 43.9 200.4 43.9 295.5 0a1.8 1.8 0 0 1 1.9 .2c2.9 2.4 6 4.9 9.1 7.2a1.9 1.9 0 0 1 -.2 3.1 301.4 301.4 0 0 1 -45.9 21.8 1.9 1.9 0 0 0 -1 2.6 391.1 391.1 0 0 0 30 48.8 1.9 1.9 0 0 0 2.1 .7A486 486 0 0 0 610.7 405.7a1.9 1.9 0 0 0 .8-1.4C623.7 277.6 590.9 167.5 524.5 69.8zM222.5 337.6c-29 0-52.8-26.6-52.8-59.2S193.1 219.1 222.5 219.1c29.7 0 53.3 26.8 52.8 59.2C275.3 311 251.9 337.6 222.5 337.6zm195.4 0c-29 0-52.8-26.6-52.8-59.2S388.4 219.1 417.9 219.1c29.7 0 53.3 26.8 52.8 59.2C470.7 311 447.5 337.6 417.9 337.6z"/></svg>',
-        secondary_text='Discord',
-        secondary_link='https://discord.poketube.fun',
- 
-      )%>
-      
-      <%- include('./partials/card', 
-        icon_background='transparent',
-        icon="none",
-        title='Free and libre',
-        description='Poke is free and libre software! u can view, edit and redistribute under GNU GPL 3 or later :3',
-        actions='true',
-
-        has_secondary_action='true',
-        secondary_icon='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3 .3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5 .3-6.2 2.3zm44.2-1.7c-2.9 .7-4.9 2.6-4.6 4.9 .3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3 .7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3 .3 2.9 2.3 3.9 1.6 1 3.6 .7 4.3-.7 .7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3 .7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3 .7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg>',
-        secondary_text='GitHub',
-        secondary_link='https://github.com/ashley0143/poke',
-
-        primary_icon='<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg1468" version="1.1" viewBox="0 0 4.233 4.233"><title id="title16">Codeberg logo</title><defs id="defs1462"><linearGradient id="linearGradient6918" x1="42519.285" x2="42575.336" y1="-7078.789" y2="-6966.931" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient6924"></linearGradient><linearGradient id="linearGradient6924"><stop style="stop-color:#2185d0;stop-opacity:0" id="stop6920" offset="0"></stop><stop id="stop6926" offset=".495" style="stop-color:#000000;stop-opacity:.48923996"></stop><stop style="stop-color:#000000;stop-opacity:.63279623" id="stop6922" offset="1"></stop></linearGradient><linearGradient id="linearGradient6918-3" x1="42519.285" x2="42575.336" y1="-7078.789" y2="-6966.931" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient6924-6"></linearGradient><linearGradient id="linearGradient6924-6"><stop style="stop-color:#000000;stop-opacity:0" id="stop6920-7" offset="0"></stop><stop id="stop6926-5" offset=".495" style="stop-color:#000000;stop-opacity:.30000001"></stop><stop style="stop-color:#000000;stop-opacity:.30000001" id="stop6922-3" offset="1"></stop></linearGradient></defs><metadata id="metadata1465"></metadata><g id="g370484" transform="matrix(0.06551432,0,0,0.06551432,-2.232417,-1.431776)"><path id="path6733-5" style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient6918-3);fill-opacity:1;stroke:none;stroke-width:3.67846;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill;stop-color:#000;stop-opacity:1" d="m 42519.285,-7078.7891 a 0.76086879,0.56791688 0 0 0 -0.738,0.6739 l 33.586,125.8886 a 87.182358,87.182358 0 0 0 39.381,-33.7636 l -71.565,-92.5196 a 0.76086879,0.56791688 0 0 0 -0.664,-0.2793 z" transform="matrix(0.37058478,0,0,0.37058478,-15690.065,2662.0533)"></path><path id="path360787" style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:17.0055;paint-order:markers fill stroke;stop-color:#000" d="m 11249.461,-1883.6961 c -12.74,0 -23.067,10.3275 -23.067,23.0671 0,4.3335 1.22,8.5795 3.522,12.2514 l 19.232,-24.8636 c 0.138,-0.1796 0.486,-0.1796 0.624,0 l 19.233,24.8646 c 2.302,-3.6721 3.523,-7.9185 3.523,-12.2524 0,-12.7396 -10.327,-23.0671 -23.067,-23.0671 z" transform="matrix(1.4006354,0,0,1.4006354,-15690.065,2662.0533)"></path></g></svg>',
-        primary_text='Codeberg',
-        primary_link='https://codeberg.org/ashley/poke'
-      )%>    
     </div>
 
-    <h1 style="font-size: xx-large;text-align: center;">So, wha ru waiting 4? </h1>
+    <!-- source: https://picrew.me/share?cd=GD9wwCo5YY -->
-    <div class="discover-video-button">
+    <img src="/static/poke-chan-outfit-a.png"
-    <a href="/app">Start Discovering! :3</a>
+      style="height: 400px;width: 369px;mask-image: none;margin-top: -14em;margin-left: -2em;margin-bottom: -13em;z-index: 999;position: absolute;-webkit-transform: scaleX(-1);transform: scaleX(-1);border-radius: 0px;"
-    </div> 
+      title="Poke-chan sitting :3">
- 
+    <img src="/static/poke-screnshot-a.png" />
+    <style>
+      @import url(https://ka-p.fontawesome.com/releases/v6.4.2/css/pro.min.css?token=fe06fc099b);
+      @import url(https://ka-p.fontawesome.com/releases/v6.4.2/css/pro-v4-shims.min.css?token=fe06fc099b);
+      @import url(https://ka-p.fontawesome.com/releases/v6.4.2/css/pro-v5-font-face.min.css?token=fe06fc099b);
+      @import url(https://ka-p.fontawesome.com/releases/v6.4.2/css/pro-v4-font-face.min.css?token=fe06fc099b);
+      @import url(https://ka-p.fontawesome.com/assets/fe06fc099b/108504408/custom-icons.css?token=fe06fc099b);
+    </style>
+
     <script>
       // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-3.0-or-later 
       if ('serviceWorker' in navigator) {
@@ -234,7 +158,7 @@ const randomFeatures = features.sort(() => 0.5 - Math.random()).slice(0, 3);
       }
       // @license-end 
     </script>
-    <script src="/static/data-mobile.js?v=454545"></script>
+    <script src="/static/data-mobile.js"></script>
   </div>
 </body>
 

html/layouts/error-video.ejs

@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>Poke - <%= error %> !!!</title>
-    <meta content="#111111" name="theme-color" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover" />
-    <meta name="darkreader-lock" />
-    <link href="/css/yt-ukraine.svg?v=3" rel="icon" />
-    <link rel="manifest" href="/manifest.json" />
-    <style>
-        body {
-            margin: auto;
-            background: #111111;
-            color: white;
-            font-family: arial;
-            max-width: 600px;
-        }
-        body::before {
-            background: linear-gradient(0deg, rgba(115, 32, 67, 1), rgba(17, 17, 17, 1));
-            background-repeat: no-repeat;
-            content: "";
-            position: fixed;
-            bottom: 0px;
-            left: 0px;
-            width: 100%;
-            height: 100%;
-            z-index: -1;
-            pointer-events: none;
-            transition: 1s height;
-        }
-
-        h2 {
-            font-size: 42px;
-        }
-
-        p#abstract {
-            position: fixed;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%, -50%);
-            font-size: 500px;
-            margin: 0px;
-            font-weight: bold;
-            opacity: 0.005;
-            pointer-events: none;
-            transition: 1s transform;
-        }
-
-        @media only screen and (max-width: 790px) {
-            p#abstract {
-                transform: translate(-50%, -50%) rotate(90deg) !important;
-            }
-        }
-
-        .error {
-            position: fixed;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%, -50%);
-            text-align: center;
-            cursor: default;
-            max-width: 600px;
-            width: 100%;
-        }
-
-        .error-footer {
-            position: fixed;
-            bottom: 24px;
-            width: 100%;
-            max-width: 600px;
-            text-align: center;
-        }
-        .error-footer a {
-            color: #ac8fa5;
-            text-decoration: none;
-            margin: 0px 12px;
-        }
-        .error-footer a:hover {
-            color: #d69cc8;
-        }
-        .countdown {
-            margin-top: 16px;
-            color: #ccc;
-            font-size: 14px;
-        }
-    </style>
-
-    <% const RESTART_MSG = "Poke is currently restarting - please wait 1-2 minutes.."; %>
-    <% if (description === RESTART_MSG) { %>
-    <script>
-        // Client-side reload logic
-        let reloadCount = parseInt(localStorage.getItem('reloadCount') || '0', 10);
-        reloadCount++;
-        localStorage.setItem('reloadCount', reloadCount);
-
-        let seconds = reloadCount > 5 ? 30 : 10;
-
-        function updateCountdown() {
-            const el = document.getElementById('countdown');
-            if (el) {
-                if (reloadCount > 5) {
-                    document.querySelector('.error p').textContent = "This is taking so long...";
-                }
-                el.textContent = "Trying again in " + seconds + " seconds...";
-            }
-            if (seconds <= 0) {
-                location.reload();
-            } else {
-                seconds--;
-                setTimeout(updateCountdown, 1000);
-            }
-        }
-        window.addEventListener('DOMContentLoaded', updateCountdown);
-    </script>
-    <% } else { %>
-    <script>
-        // Clear reload count on non-restart errors
-        localStorage.removeItem('reloadCount');
-    </script>
-    <% } %>
-</head>
-<body>
-    <% if (description === RESTART_MSG) { %>
-        <p id="abstract">502</p>
-    <% } else { %>
-        <p id="abstract">404</p>
-    <% } %>
-
-    <div class="error">
-        <h2><%= error %></h2>
-        <p><%= description %></p>
-        <% if (description === RESTART_MSG) { %>
-            <div class="countdown" id="countdown"></div>
-        <% } %>
-    </div>
-
-    <div class="error-footer">
-        <a href="https://codeberg.org/ashley/poke/issues/new/choose">Create issue</a>
-        <a href="https://discord.poketube.fun">Report on our Discord</a>
-        <% if (description === RESTART_MSG) { %>
-            <a href="https://github.com/iv-org/invidious/issues">See Invidious issues</a>
-            <a href="">Refresh Page</a>
-        <% } %>
-    </div>
-</body>
-</html>

html/map.ejs

@@ -22,7 +22,7 @@
  * @licstart The following is the entire license notice for the JavaScript
  * code in this page.
  *
- *  Copyright (C) 2021-2025 POKETUBE (https://github.com/iamashley0/poketube)
+ *  Copyright (C) 2021-2023 POKETUBE (https://github.com/iamashley0/poketube)
  *
  * The JavaScript code in this page is free software: you can redistribute
  * it and/or modify it under the terms of the GNU General Public License
@@ -44,178 +44,40 @@
 
 //--><!]]>
 </script>
-<script>(function(){
+  <script>
-  const _0x5a3c=[
+    var bbox = "?bbox=-165.76171875000003%2C-3.864254615721396%2C30.410156250000004%2C72.44879155730672&amp;layer=mapnik"
-    "P2Jib3g9LTE2NS43NjE3MTg3NTAwMDAwMyUyQy0zLjg2NDI1NDYxNTcyMTM5NiUyQzMwLjQxMDE1NjI1MDAwMDAwNCUyQzcyLjQ0ODc5MTU1NzMwNjcyJmxheWVyPW1hcG5paw==",
+     var iframe = document.getElementById('myFrame');
-    "aHR0cHM6Ly93d3cub3BlbnN0cmVldG1hcC5vcmcvZXhwb3J0L2VtYmVkLmh0bWw=",
+    iframe.src=`https://www.openstreetmap.org/export/embed.html${bbox}`
-    "d3d3Lm9wZW5zdHJlZXRtYXAub3Jn"
+    iframe.addEventListener('load', function() {
-  ];
+      var iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
-
+      var links = iframeDocument.getElementsByTagName('a');
-  function _0x99f2(i){ return atob(_0x5a3c[i]); }
+      for (var i = 0; i < links.length; i++) {
-
+        links[i].addEventListener('click', function(event) {
-  function updateMap(lat, lon) {
+          var url = event.target.href;
-    const delta = 0.25;
+          if (url.includes('www.openstreetmap.org')) {
-    const bbox = `?bbox=${lon-delta},${lat-delta},${lon+delta},${lat+delta}&layer=mapnik`;
+            event.preventDefault();
-    const newURL = _0x99f2(1) + bbox;
+            iframe.src = url;
-    const iframe = document.querySelector('iframe');
+            window.history.pushState(null, '', url);
-    if (iframe) {
+          } else {
-      iframe.src = newURL;
+            window.location.href = url;
-      window.history.pushState({}, '', newURL);
-    }
-    const marker = document.getElementById('map-marker');
-    if (marker) marker.remove();
-    const newMarker = document.createElement('div');
-    newMarker.id = 'map-marker';
-    newMarker.style = 'position:absolute;width:20px;height:20px;background:red;border-radius:50%;transform:translate(-50%,-50%);z-index:9998;pointer-events:none;left:50%;top:50%';
-    document.body.appendChild(newMarker);
-  }
-
-  function copyCoordinates() {
-    const marker = document.getElementById('map-marker');
-    if (!marker) return alert('No coordinates to copy.');
-    navigator.clipboard.writeText(window.location.href).then(() => {
-      alert('Current map link copied to clipboard!');
-    });
-  }
-
-  function locateAndUpdate() {
-    if (!navigator.geolocation) {
-      alert('Geolocation is not supported by your browser.');
-      return;
-    }
-    navigator.geolocation.getCurrentPosition(
-      pos => {
-        updateMap(pos.coords.latitude, pos.coords.longitude);
-      },
-      err => {
-        alert('Unable to retrieve location: ' + err.message);
-      },
-      { enableHighAccuracy: true, timeout: 10000, maximumAge: 0 }
-    );
-  }
-
-  function _0x4f2a(){
-    const bbox = _0x99f2(0);
-    const base = _0x99f2(1);
-    const url = base + bbox;
-    const iframe = document.querySelector('iframe');
-    if (!iframe) return setTimeout(_0x4f2a, 100);
-    iframe.src = url;
-
-    iframe.addEventListener('load',()=>{
-      try {
-        const doc = iframe.contentDocument || iframe.contentWindow.document;
-        Array.from(doc.querySelectorAll('a')).forEach(a=>a.addEventListener('click',_linkHandler));
-        Array.from(doc.querySelectorAll('*')).forEach(el=>{
-          const bg = el.style.backgroundImage;
-          if(bg.includes('//dka575ofm4ao0.cloudfront.net')){
-            el.style.backgroundImage = bg.replace(/\/\/dka575ofm4ao0\.cloudfront\.net/g,
-              m=>`https://p.poketube.fun/https://dka575ofm4ao0.cloudfront.net`);
           }
         });
-      } catch(e) {
-        console.warn('Cross-origin access denied, skipping DOM manipulation.');
       }
     });
 
-    window.history = new Proxy(window.history,{
+    window.onpopstate = function(event) {
-      get(target, prop){
+      iframe.src = window.location.href;
-        if(prop === 'pushState') return (...args)=>{
+    };
-          const iframe = document.querySelector('iframe');
+    
-          if(iframe && args[2]) iframe.src = args[2];
+       iframe.addEventListener('load', function() {
-          return target.pushState.apply(target, args);
+      var iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
-        };
+      var elements = iframeDocument.querySelectorAll('[style*="//dka575ofm4ao0.cloudfront.net"]');
-        return Reflect.get(target, prop);
+      for (var i = 0; i < elements.length; i++) {
+        var style = elements[i].style.backgroundImage;
+        var newStyle = style.replace('//dka575ofm4ao0.cloudfront.net', 'https://p.poketube.fun/https://dka575ofm4ao0.cloudfront.net');
+        elements[i].style.backgroundImage = newStyle;
       }
     });
-
+  </script>
-    window.addEventListener('popstate',()=>{
-      const iframe = document.querySelector('iframe');
-      if (iframe) iframe.src = location.href;
-    });
-  }
-
-  function _linkHandler(e){
-    const h = e.target.href;
-    const iframe = document.querySelector('iframe');
-    if(!iframe) return;
-    if(h.includes(_0x99f2(2))){
-      e.preventDefault();
-      iframe.src = h;
-      window.history.pushState({}, '', h);
-    } else {
-      window.location.href = h;
-    }
-  }
-
-  const form = document.createElement('form');
-  form.style = 'position:absolute;top:10px;right:10px;z-index:9999;background:rgba(0,0,0,0.5);backdrop-filter:blur(12px);padding:10px 12px;border-radius:12px;box-shadow:0 4px 10px rgba(0,0,0,0.4);font-family:sans-serif;min-width:220px;';
-  form.innerHTML = `
-    <input id="searchBox" type="text" placeholder="Search..." style="padding:6px 10px;width:180px;font-size:14px;border:1px solid #444;border-radius:6px;background:#222;color:#fff">
-    <ul id="suggestions" style="list-style:none;margin:6px 0 0;padding:0;max-height:180px;overflow:auto;background:#111;border:1px solid #333;border-radius:6px;display:none;position:relative;z-index:10000;color:#fff;"></ul>
-    <div style="margin-top:10px;display:flex;gap:6px;flex-wrap:wrap">
-      <button id="locate-btn" type="button" style="flex:1;padding:4px 6px;font-size:12px;background:#333;color:#fff;border:none;border-radius:6px">📍 Locate</button>
-      <button type="button" style="flex:1;padding:4px 6px;font-size:12px;background:#333;color:#fff;border:none;border-radius:6px" onclick="copyCoordinates()">📋 Copy</button>
-      <button type="button" style="flex:1;padding:4px 6px;font-size:12px;background:#333;color:#fff;border:none;border-radius:6px" onclick="location.reload()">🔁 Reset</button>
-    </div>
-  `;
-
-  document.body.appendChild(form);
-  document.getElementById('locate-btn').addEventListener('click', locateAndUpdate);
-
-  const input = form.querySelector('#searchBox');
-  const suggestions = form.querySelector('#suggestions');
-
-  input.addEventListener('input', () => {
-    const query = input.value.trim();
-    if (!query) return suggestions.style.display = 'none';
-    fetch(`https://nominatim.openstreetmap.org/search?q=${encodeURIComponent(query)}&format=json&limit=5`)
-      .then(res => res.json())
-      .then(data => {
-        suggestions.innerHTML = '';
-        data.forEach(place => {
-          const li = document.createElement('li');
-          li.textContent = place.display_name;
-          li.style = 'padding:6px 10px;cursor:pointer;border-bottom:1px solid #222;font-size:13px;background:#111';
-          li.addEventListener('click', () => {
-            input.value = place.display_name;
-            suggestions.style.display = 'none';
-            updateMap(parseFloat(place.lat), parseFloat(place.lon));
-          });
-          suggestions.appendChild(li);
-        });
-        suggestions.style.display = 'block';
-      });
-  });
-
-  form.addEventListener('submit', e => {
-    e.preventDefault();
-    const q = input.value.trim();
-    if(!q) return;
-    fetch(`https://nominatim.openstreetmap.org/search?q=${encodeURIComponent(q)}&format=json&limit=1`)
-      .then(res => res.json())
-      .then(data => {
-        if(data[0]){
-          updateMap(parseFloat(data[0].lat), parseFloat(data[0].lon));
-        }
-      });
-  });
-
-  const fab = document.createElement('button');
-  fab.textContent = '+';
-  fab.style = 'position:fixed;bottom:20px;right:20px;width:48px;height:48px;font-size:24px;background:#111;color:#fff;border:none;border-radius:50%;box-shadow:0 2px 10px rgba(0,0,0,0.4);cursor:pointer;z-index:9999';
-  fab.title = 'More Tools';
-  fab.onclick = () => alert('More features coming soon!');
-  document.body.appendChild(fab);
-
-  const branding = document.createElement('div');
-  branding.textContent = 'PokeMaps';
-  branding.style = 'position: absolute; bottom: 10px; left: 10px; padding: 6px 10px; font-size: 31px; font-weight: 500; background: rgba(0, 0, 0, 0.6); color: white; border-radius: 6px; font-family: sans-serif; backdrop-filter: blur(6px); z-index: 9999; pointer-events: none;display: block;';
-  document.body.appendChild(branding);
-
-  _0x4f2a();
-})();
-
-</script><script src="/static/data-mobile.js"></script>
 </body>
 </html>

html/partials/card.ejs

@@ -1,70 +0,0 @@
-<div class="card">
-    <div class="card-title">
-        <div class="card-icon" style="background: <%= icon_background %>;">
-            <% if(icon="none"){ %><% } else{ %>  <%- icon %><% } %>
-        </div>
-        <h2><%= title %></h2>
-    </div>
-    <p><%= description %></p>
-    <% if (actions=="true") { %>
-        <div class="card-actions">
-            <% if (has_secondary_action=="true") { %>
-                <a class="card-secondary" href="<%= secondary_link %>"><%- secondary_icon %>  <%= secondary_text %></a>
-            <% } %>
-         </div>
-     <% }%> 
-</div>
-
-<style>
-.card {
-  padding: 24px;
-}
-.card-title {
-  display: flex;
-  align-items: center;
-}
-.card-title h2 {
-  font-family: "PokeTube flex";
-  font-stretch: ultra-expanded;
-  font-weight: 1000;
-  margin: 0px;
-}
-.card-title svg {
-  width: 32px;
-  height: 32px;
-  margin-right: 12px;
-}
-.card-actions {
-  display: flex;
-  align-items: center;
-  justify-content: right;
-  gap: 12px;
-}
-.card-actions a {
-  color: white;
-  border: 2px white solid;
-  border-radius: 3rem;
-  padding: 12px 24px 12px 12px;
-  display: flex;
-  align-items: center;
-}
-.card-actions a:hover {
-  filter: brightness(0.8);
-  text-decoration: nones;
-}
-.card-actions svg {
-  width: 24px !important;
-  height: 24px !important;
-  margin-right: 6px;
-}
-.card-actions .card-primary {
-  background: white;
-  color: black;
-}
-.card-actions .card-primary svg {
-  fill: black;
-}
-.card-actions .card-secondary  svg {
-  fill: white;
-}
-</style>

html/partials/header.ejs

@@ -1,123 +0,0 @@
-<!--
-    This Source Code Form is subject to the terms of the GNU General Public License:
-
-    Copyright (C) 2021-2024 Poke (https://codeberg.org/Ashley/poke)
-    
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see https://www.gnu.org/licenses/.
---->
-
-<!-- Global Header-->
-<!-- This should be inserted as a component/partial -->
- 
-<header>
-    <div class="header-content">
-        <div class="header-start">
-            <a title="Poke Homepage" href="/playlist?list=PL3roRV3JHZzbatp5PvE-88ApmVishqGHN">
-                <img src="/css/logo-poke.svg?v=5"/>
-                <img src="/css/red-tape.png?v=5" style="margin-left: -8em;opacity: 0.9;height: 2em;">
-              <p class="subtitle"> <%- random %></p>                
-            </a>
-        </div>
-        <div class="header-center">
-            <%- include('./search.ejs') %>
-        </div>
-        <div class="header-end">
-            <a href="https://codeberg.org/Ashley/poketube/src/branch/main/instances.json"><?xml version="1.0" encoding="UTF-8"?><svg width="24px" height="24px" stroke-width="1.5" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" color="#ffffff" style="--darkreader-inline-color: #e8e6e3;" data-darkreader-inline-color=""><path d="M6 18.01L6.01 17.9989" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" style="--darkreader-inline-stroke: #ffffff;" data-darkreader-inline-stroke=""></path><path d="M6 6.01L6.01 5.99889" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" style="--darkreader-inline-stroke: #ffffff;" data-darkreader-inline-stroke=""></path><path d="M2 9.4V2.6C2 2.26863 2.26863 2 2.6 2H21.4C21.7314 2 22 2.26863 22 2.6V9.4C22 9.73137 21.7314 10 21.4 10H2.6C2.26863 10 2 9.73137 2 9.4Z" stroke="#ffffff" stroke-width="1.5" style="--darkreader-inline-stroke: #ffffff;" data-darkreader-inline-stroke=""></path><path d="M2 21.4V14.6C2 14.2686 2.26863 14 2.6 14H21.4C21.7314 14 22 14.2686 22 14.6V21.4C22 21.7314 21.7314 22 21.4 22H2.6C2.26863 22 2 21.7314 2 21.4Z" stroke="#ffffff" stroke-width="1.5" style="--darkreader-inline-stroke: #ffffff;" data-darkreader-inline-stroke=""></path></svg></a>
-            <a href="/apps"><?xml version="1.0" encoding="UTF-8"?><svg width="24px" height="24px" viewBox="0 0 24 24" stroke-width="1.5" fill="none" xmlns="http://www.w3.org/2000/svg" color="#ffffff"><path d="M17.5 17.5C20 21 23.9486 18.4151 23 15C21.5753 9.87113 20.8001 7.01556 20.3969 5.50793C20.1597 4.62136 19.3562 4 18.4384 4L5.56155 4C4.64382 4 3.844 4.62481 3.62085 5.515C2.7815 8.86349 2.0326 11.8016 1.14415 15C0.195501 18.4151 4.14415 21 6.64415 17.5" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path><path d="M16 4V6C16 7.10457 15.1046 8 14 8H10C8.89543 8 8 7.10457 8 6L8 4" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path><path d="M8 16C9.10457 16 10 15.1046 10 14C10 12.8954 9.10457 12 8 12C6.89543 12 6 12.8954 6 14C6 15.1046 6.89543 16 8 16Z" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path><path d="M16 16C17.1046 16 18 15.1046 18 14C18 12.8954 17.1046 12 16 12C14.8954 12 14 12.8954 14 14C14 15.1046 14.8954 16 16 16Z" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg></a>
-            <a href="/account-create"><?xml version="1.0" encoding="UTF-8"?><svg width="24px" height="24px" stroke-width="1.5" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" color="#ffffff"><path d="M12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2Z" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path><path d="M4.271 18.3457C4.271 18.3457 6.50002 15.5 12 15.5C17.5 15.5 19.7291 18.3457 19.7291 18.3457" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path><path d="M12 12C13.6569 12 15 10.6569 15 9C15 7.34315 13.6569 6 12 6C10.3431 6 9 7.34315 9 9C9 10.6569 10.3431 12 12 12Z" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg> Account</a>
-        </div>
-    </div>
-</header>
-
-<style>
-    header {
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        width: 100%;
-        padding: 12px 0px;
-        background: rgb(0, 0, 0, 0.5);
-    }
-
-    .header-content {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        max-width: 1264px;
-        margin: auto;
-        height: 3em;
-    }
-
-    .header-start {
-        display: flex;
-        align-items: center;
-    }
-
-    .header-start img {
-        height: 32px;
-        margin-top: 3em;
-    }
-
-    form[action="/search"] {
-        display: flex
-    }
-
-    .header-center #fname {
-        background: rgba(255, 255, 255, 0.2);
-        border: 1px #605e5e solid;
-        border-radius: 6px 0px 0px 6px;
-        color: white;
-        font-size: 14px;
-        padding: 6px 12px;
-        border-right: none;
-        cursor: default;
-        width: 300px;
-    }
-
-    .header-center button {
-        background: rgba(255, 255, 255, 0.2);
-        border: 1px #605e5e solid;
-        border-radius: 0px 6px 6px 0px;
-        color: white;
-        border-left: none;
-        cursor: pointer;
-    }
-
-    .header-center #fname:focus {
-        outline: none;
-        border-color: #8a8a8a;
-    }
-
-    .header-center button svg {
-        width: 18px;
-    }
-
-    .header-end {
-        display: flex;
-        align-items: center;
-        gap: 6px;
-    }
-
-    .header-end a {
-        /* border: 2px #605e5e solid; */
-        border-radius: 3rem;
-        display: flex;
-        align-items: center;
-        padding: 6px;
-        color: white;
-        gap: 6px;
-    }
-</style>
-<link href="<%- proxyurl %>/https://site-assets.fontawesome.com/releases/v6.1.1/css/all.css" rel=stylesheet>

html/partials/search.ejs

@@ -1,60 +0,0 @@
-<form action="/search">
-    <input type="search" class="search-bar" id="fname" name="query">
-    <button><?xml version="1.0" encoding="UTF-8"?><svg width="24px" height="24px" viewBox="0 0 24 24" stroke-width="1.5" fill="none" xmlns="http://www.w3.org/2000/svg" color="#ffffff"><path d="M17 17L21 21" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path><path d="M3 11C3 15.4183 6.58172 19 11 19C13.213 19 15.2161 18.1015 16.6644 16.6493C18.1077 15.2022 19 13.2053 19 11C19 6.58172 15.4183 3 11 3C6.58172 3 3 6.58172 3 11Z" stroke="#ffffff" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg></button>
-</form>
-<div style="opacity: 0;" class="suggestions"></div>
-<script>
-/*    
-@licstart  The following is the entire license notice for the 
-JavaScript code in this page.
-
-Copyright (C) 2024 Poke Project
-
-The JavaScript code in this page is free software: you can
-redistribute it and/or modify it under the terms of the GNU
-General Public License (GNU GPL) as published by the Free Software
-Foundation, either version 3 of the License, or (at your option)
-any later version.  The code is distributed WITHOUT ANY WARRANTY;
-without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
-
-As additional permission under GNU GPL version 3 section 7, you
-may distribute non-source (e.g., minimized or compacted) forms of
-that code without the copy of the GNU GPL normally required by
-section 4, provided you include this license notice and a URL
-through which recipients can access the Corresponding Source.   
-
-
-@licend  The above is the entire license notice
-for the JavaScript code in this page.
-*/
- 
- 
-</script>
-
-<style>
-    
-.suggestions {
-    position: absolute;
-    display: grid;
-    background: #473e46d6;
-    border-radius: 6px;
-    margin-top: 10px;
-    width: 329px;
-    z-index: 5;
-    backdrop-filter: blur(10px);
-    gap: 4px;
-    padding: 4px 0px;
-}
-.suggestions a {
-  color: white;
-  background: transparent;
-  padding: 6px 12px;
-  border-radius: 4px;
-  margin: 0px 4px;
-}
-.suggestions a:hover {
-    background: #f9f9f917;
-    text-decoration: none;
-}
-</style>

html/playlist.ejs

@@ -246,9 +246,8 @@ font-family:Ubuntu
         <%- x.title %>
           </a>
 					<div>
-						<a href="/channel?id=<%- x.authorId %>" style="border-radius:0em"><%- x.author %></a><br>
+						<a href="/channel?id=<%- x.authorId %>" style="border-radius:0em"><%- x.author %></a>
-            <a href="/download?id=<%- x.videoId %>" style="border-radius:0em"> Download </a>
+					</div>
- 					</div>
 				</div>
 			</div>
 

html/pokepad.ejs

@@ -1,804 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Pokepad</title>
-    <meta property="og:title" content="PokePad">
-  <meta property="og:description" content="E2EE notepad">
-  <meta property="og:image" content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884">
-  <meta property="og:type" content="website">
-  <style>
-    /* Root colors */
-    :root {
-      --bg: #0f0f17;
-      --container-bg: rgba(30, 30, 47, 0.6);
-      --surface: rgba(20, 20, 35, 0.4);
-      --text: #e0e0e0;
-      --accent: #8a2be2;
-      --border: #444458;
-      --btn-bg: rgba(60, 60, 80, 0.7);
-      --btn-hover: rgba(70, 70, 100, 0.8);
-      --error: #f66;
-      --success: #8f8;
-      --tab-hover: rgba(100, 100, 120, 0.8);
-      --tab-active-bg: rgba(10, 10, 15, 0.9);
-    }
-
-    * {
-      box-sizing: border-box;
-      margin: 0;
-      padding: 0;
-    }
-    body {
-      min-height: 100vh;
-      background: var(--bg);
-      color: var(--text);
-      font-family: Arial, sans-serif;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding: 1rem;
-    }
-     #container {
-      width: 100%;
-      max-width: 900px;
-      background: var(--container-bg);
-      border: 1px solid var(--border);
-      border-radius: 12px;
-      backdrop-filter: blur(12px);
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-      box-shadow: 0 8px 16px rgba(0, 0, 0, 0.5);
-      position: relative;
-    }
-
-     header {
-      width: 100%;
-      background: var(--surface);
-      backdrop-filter: blur(8px);
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 0.75rem 1rem;
-      border-bottom: 1px solid var(--border);
-    }
-    header .title {
-      font-size: 1.5rem;
-      color: var(--accent);
-      display: flex;
-      align-items: center;
-      gap: 0.5rem;
-    }
-    header .title svg {
-      width: 24px;
-      height: 24px;
-      fill: var(--accent);
-    }
-    header .e2ee {
-      font-size: 0.9rem;
-      padding: 0.25rem 0.5rem;
-      background: var(--btn-bg);
-      border-radius: 4px;
-      border: 1px solid var(--border);
-      cursor: pointer;
-    }
-
-     #e2eePopup {
-      position: fixed;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      background: var(--container-bg);
-      border: 1px solid var(--border);
-      border-radius: 8px;
-      backdrop-filter: blur(12px);
-      padding: 1rem;
-      max-width: 300px;
-      display: none;
-      z-index: 10;
-    }
-    #e2eePopup p {
-      font-size: 0.9rem;
-      margin-bottom: 0.75rem;
-    }
-    #e2eePopup button {
-      background: var(--accent);
-      border: none;
-      border-radius: 4px;
-      color: #fff;
-      padding: 0.5rem 1rem;
-      cursor: pointer;
-      font-size: 0.9rem;
-    }
-
-     #tabBar {
-      display: flex;
-      background: var(--surface);
-      border-bottom: 1px solid var(--border);
-      overflow-x: auto;
-      white-space: nowrap;
-    }
-    .tab {
-      display: flex;
-      align-items: center;
-      padding: 0.5rem 0.75rem;
-      cursor: pointer;
-      user-select: none;
-      font-size: 0.95rem;
-      border-right: 1px solid var(--border);
-      color: var(--text);
-      background: var(--surface);
-      transition: background 0.2s, color 0.2s;
-      position: relative;
-      flex-shrink: 0;
-    }
-    .tab:hover {
-      background: var(--tab-hover);
-    }
-    .tab.active {
-      background: var(--tab-active-bg);
-      color: var(--accent);
-      border-bottom: 2px solid var(--accent);
-    }
-    .tab .title-text {
-      margin-right: 0.5rem;
-    }
-    .tab .icon-btn {
-      background: transparent;
-      border: none;
-      color: var(--text);
-      cursor: pointer;
-      padding: 0;
-      margin-left: 0.25rem;
-      display: flex;
-      align-items: center;
-    }
-    .tab .icon-btn:hover {
-      color: var(--accent);
-    }
-    .tab[data-dragging="true"] {
-      opacity: 0.5;
-    }
-
-     #editor {
-      flex: 1;
-      background: rgba(20, 20, 35, 0.3);
-      backdrop-filter: blur(8px);
-      padding: 1rem;
-      overflow-y: auto;
-      min-height: 300px;
-      color: var(--text);
-    }
-    #editor:empty:before {
-      content: attr(data-placeholder);
-      color: #888;
-    }
-    #editor:focus {
-      outline: 2px solid var(--accent);
-    }
-
-     #toolbar {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 0.5rem;
-      padding: 0.75rem 1rem;
-      background: var(--surface);
-      border-bottom: 1px solid var(--border);
-    }
-    .tool-btn {
-      background: var(--btn-bg);
-      border: 1px solid var(--border);
-      border-radius: 4px;
-      color: var(--text);
-      padding: 0.5rem;
-      cursor: pointer;
-      font-size: 0.9rem;
-      transition: background 0.2s;
-      display: flex;
-      align-items: center;
-    }
-    .tool-btn svg {
-      width: 18px;
-      height: 18px;
-      fill: var(--text);
-      margin-right: 0.3rem;
-    }
-    .tool-btn:hover {
-      background: var(--btn-hover);
-    }
-
-     #controls {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 0.5rem;
-      padding: 0.75rem 1rem;
-      background: var(--surface);
-      border-top: 1px solid var(--border);
-    }
-    #controls input[type="password"] {
-      flex: 1;
-      padding: 0.5rem;
-      font-size: 1rem;
-      border: 1px solid var(--border);
-      border-radius: 4px;
-      background: rgba(20, 20, 35, 0.6);
-      color: var(--text);
-    }
-    #controls .action-btn {
-      background: var(--btn-bg);
-      border: 1px solid var(--border);
-      border-radius: 4px;
-      color: var(--text);
-      padding: 0.5rem 1rem;
-      cursor: pointer;
-      font-size: 0.95rem;
-      transition: background 0.2s;
-    }
-    #controls .action-btn:hover {
-      background: var(--btn-hover);
-    }
-    #message {
-      padding: 0.5rem 1rem;
-      font-size: 0.9rem;
-      min-height: 1.2em;
-    }
-    #message.error {
-      color: var(--error);
-    }
-    #message.success {
-      color: var(--success);
-    }
-
-     #fileInput {
-      display: none;
-    }
-  </style>
-</head>
-<body>
-  <div id="container">
-    <!-- Header with icon and E2EE label -->
-    <header>
-      <div class="title">
-        <!-- Lock SVG -->
-        <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-          <path d="M12 2C9.238 2 7 4.238 7 7v3H6a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-9a2 2 0 0 0-2-2h-1V7c0-2.762-2.238-5-5-5zm-3 5c0-1.654 1.346-3 3-3s3 1.346 3 3v3H9V7zm-1 5h8v7H8v-7z"/>
-        </svg>
-        Pokepad
-      </div>
-      <div class="e2ee" id="e2eeLabel">End-to-End Encrypted</div>
-    </header>
-
-    <!-- E2EE Info Popup -->
-    <div id="e2eePopup">
-      <p><strong>End-to-End Encryption (E2EE)</strong></p>
-      <p>All notes are encrypted locally before being saved. Only you (and anyone you share your password with) can decrypt and read your notes. No unencrypted data ever leaves your browser.</p>
-      <button id="e2eeCloseBtn">Close</button>
-    </div>
-
-    <!-- Tab bar -->
-    <div id="tabBar"></div>
-
-    <!-- Formatting toolbar -->
-    <div id="toolbar">
-      <!-- Bold -->
-      <button class="tool-btn" data-cmd="bold" title="Bold (Ctrl+B)">
-        <svg viewBox="0 0 24 24"><path d="M15.6 10.79c.75-.54 1.4-1.31 1.85-2.18.46-.87.7-1.86.7-2.93 0-1.07-.24-2.06-.7-2.93-.46-.87-1.1-1.64-1.85-2.18-.81-.59-1.77-.89-2.77-.89h-5v16h5c1 0 1.96-.3 2.77-.89.75-.54 1.4-1.31 1.85-2.18.46-.87.7-1.86.7-2.93 0-1.07-.24-2.06-.7-2.93zM11 4h1.5c.74 0 1.44.26 2 .72.56.46 1.01 1.11 1.28 1.8.27.69.42 1.45.42 2.22 0 .77-.15 1.53-.42 2.22-.27.69-.72 1.34-1.28 1.8-.56.46-1.26.72-2 .72h-1.5V4zm1.5 12H11c-.74 0-1.44-.26-2-.72-.56-.46-1.01-1.11-1.28-1.8-.27-.69-.42-1.45-.42-2.22 0-.77.15-1.53.42-2.22.27-.69.72-1.34 1.28-1.8.56-.46 1.26-.72 2-.72h1.5v9z"/></svg>
-        <span>Bold</span>
-      </button>
-      <!-- Italic -->
-      <button class="tool-btn" data-cmd="italic" title="Italic (Ctrl+I)">
-        <svg viewBox="0 0 24 24"><path d="M10 4v3h2.21l-3.42 10H6v3h8v-3h-2.21l3.42-10H18V4z"/></svg>
-        <span>Italic</span>
-      </button>
-      <!-- Underline -->
-      <button class="tool-btn" data-cmd="underline" title="Underline (Ctrl+U)">
-        <svg viewBox="0 0 24 24"><path d="M12 17c3.31 0 6-2.69 6-6V4h-2v7c0 2.21-1.79 4-4 4s-4-1.79-4-4V4H6v7c0 3.31 2.69 6 6 6zm-5 2v2h10v-2H7z"/></svg>
-        <span>Underline</span>
-      </button>
-      <!-- Strikethrough -->
-      <button class="tool-btn" data-cmd="strikeThrough" title="Strikethrough">
-        <svg viewBox="0 0 24 24"><path d="M10 19v-2H5.41L9 13.41 7.59 12 2 17.59V19h8zm4 0h8v-2h-5.59L15 13.41 13.59 12 8 17.59V19h6zM21 11h-8V9h8v2z"/></svg>
-        <span>Strike</span>
-      </button>
-      <!-- Unordered List -->
-      <button class="tool-btn" data-cmd="insertUnorderedList" title="Bullet List">
-        <svg viewBox="0 0 24 24"><path d="M4 10.5c.83 0 1.5-.67 1.5-1.5S4.83 7.5 4 7.5 2.5 8.17 2.5 9 3.17 10.5 4 10.5zm0 5c.83 0 1.5-.67 1.5-1.5S4.83 12.5 4 12.5 2.5 13.17 2.5 14 3.17 15.5 4 15.5zm0 5c.83 0 1.5-.67 1.5-1.5S4.83 17.5 4 17.5 2.5 18.17 2.5 19 3.17 20.5 4 20.5zM7 9h14v2H7V9zm0 5h14v2H7v-2zm0 5h14v2H7v-2z"/></svg>
-        <span>Bullets</span>
-      </button>
-      <!-- Ordered List -->
-      <button class="tool-btn" data-cmd="insertOrderedList" title="Numbered List">
-        <svg viewBox="0 0 24 24"><path d="M4 10h2v1H4v2h2v1H4v2h4v-1H6v-2h2v-1H4v-2zm0-4h4v1H6v2h2v1H4v2h4v1H4v2h6v-1H6v-2h2v-1H4v-2zm0 10h12v-1H4v-2h2v-1H4v-2h4v-1H4V6h6V5H4v2h4v1H4v2h4v1H4v2z"/></svg>
-        <span>Numbers</span>
-      </button>
-      <!-- Align Left -->
-      <button class="tool-btn" data-cmd="justifyLeft" title="Align Left">
-        <svg viewBox="0 0 24 24"><path d="M3 5h18v2H3V5zm0 4h12v2H3V9zm0 4h18v2H3v-2zm0 4h12v2H3v-2z"/></svg>
-        <span>Left</span>
-      </button>
-      <!-- Align Center -->
-      <button class="tool-btn" data-cmd="justifyCenter" title="Align Center">
-        <svg viewBox="0 0 24 24"><path d="M3 5h18v2H3V5zm3 4h12v2H6V9zm3 4h18v2H9v-2zm3 4h12v2H12v-2z"/></svg>
-        <span>Center</span>
-      </button>
-      <!-- Align Right -->
-      <button class="tool-btn" data-cmd="justifyRight" title="Align Right">
-        <svg viewBox="0 0 24 24"><path d="M3 5h18v2H3V5zm6 4h12v2H9V9zm6 4h18v2H15v-2zm6 4h12v2h-12v-2z"/></svg>
-        <span>Right</span>
-      </button>
-      <!-- Text Color -->
-      <button class="tool-btn" id="colorPickerBtn" title="Text Color">
-        <svg viewBox="0 0 24 24"><path d="M15.55 14.52L9.48 4.5H7.03l6.07 10.02c.18.3.28.64.28 1 0 1.1-.9 2-2 2s-2-.9-2-2H7c0 1.66 1.34 3 3 3s3-1.34 3-3c0-.61-.22-1.17-.58-1.6zM12 2C8.13 2 5 5.13 5 9c0 1.66.58 3.18 1.55 4.38L12 22l5.45-8.62C18.42 12.18 19 10.66 19 9c0-3.87-3.13-7-7-7z"/></svg>
-        <span>Color</span>
-      </button>
-      <input type="color" id="colorPicker" style="display:none" />
-      <!-- Insert Link -->
-      <button class="tool-btn" data-cmd="createLink" title="Insert Link">
-        <svg viewBox="0 0 24 24"><path d="M3.9 12c0-1.17.44-2.27 1.24-3.06l3.34-3.34c1.65-1.65 4.33-1.65 5.98 0 1.65 1.65 1.65 4.33 0 5.98l-1.06 1.06-1.41-1.41 1.06-1.06c.88-.88.88-2.31 0-3.19-.88-.88-2.31-.88-3.19 0l-3.34 3.34c-.88.88-.88 2.31 0 3.19.88.88 2.31.88 3.19 0l1.06-1.06 1.41 1.41-1.06 1.06c-1.65 1.65-4.33 1.65-5.98 0C4.34 14.27 3.9 13.17 3.9 12zm16.2 0c0 1.17-.44 2.27-1.24 3.06l-3.34 3.34c-1.65 1.65-4.33 1.65-5.98 0-1.65-1.65-1.65-4.33 0-5.98l1.06-1.06 1.41 1.41-1.06 1.06c-.88.88-.88 2.31 0 3.19.88.88 2.31.88 3.19 0l3.34-3.34c.88-.88.88-2.31 0-3.19-.88-.88-2.31-.88-3.19 0l-1.06 1.06-1.41-1.41 1.06-1.06c1.65-1.65 4.33-1.65 5.98 0 1.65 1.65 1.65 4.33 0 5.98z"/></svg>
-        <span>Link</span>
-      </button>
-      <!-- Unlink -->
-      <button class="tool-btn" data-cmd="unlink" title="Remove Link">
-        <svg viewBox="0 0 24 24"><path d="M12.71 11.29l-1.42 1.42L10 11.42l-1.29 1.29-1.42-1.42L8.58 10 7.29 8.71l1.42-1.42L10 8.58l1.29-1.29 1.42 1.42L11.42 10l1.29 1.29zM17.65 6.35l-1.41 1.41 1.41 1.41L19.06 7.76l-1.41-1.41zm-11.3 11.3l-1.41 1.41 1.41 1.41 1.41-1.41-1.41-1.41z"/></svg>
-        <span>Unlink</span>
-      </button>
-    </div>
-
-    <div id="editor" contenteditable="true" spellcheck="false" data-placeholder="Type your notes here..."></div>
-
-    <div id="controls">
-      <input type="password" id="password" placeholder="Password" />
-      <button class="action-btn" id="saveBtn">Download&nbsp;Encrypted</button>
-      <button class="action-btn" id="loadBtn">Decrypt&nbsp;&amp;&nbsp;Load</button>
-      <button class="action-btn" id="uploadBtn">Upload&nbsp;Encrypted&nbsp;File</button>
-      <input type="file" id="fileInput" accept=".json" />
-    </div>
-
-    <div id="message"></div>
-  </div>
-
-  <script>
-    let notes = [];
-    let currentTabId = null;
-    let tabCounter = 0;
-    let dragSrcId = null;
-
-    const STORAGE_KEY = 'pokepadEncrypted';
-    const PLAIN_KEY = 'pokepadPlain';
-    const tabBar = document.getElementById('tabBar');
-    const editor = document.getElementById('editor');
-    const passwordInput = document.getElementById('password');
-    const saveBtn = document.getElementById('saveBtn');
-    const loadBtn = document.getElementById('loadBtn');
-    const uploadBtn = document.getElementById('uploadBtn');
-    const fileInput = document.getElementById('fileInput');
-    const messageDiv = document.getElementById('message');
-    const toolbarButtons = document.querySelectorAll('#toolbar .tool-btn');
-    const e2eeLabel = document.getElementById('e2eeLabel');
-    const e2eePopup = document.getElementById('e2eePopup');
-    const e2eeCloseBtn = document.getElementById('e2eeCloseBtn');
-    const colorPicker = document.getElementById('colorPicker');
-    const colorPickerBtn = document.getElementById('colorPickerBtn');
-
-    // On load: attempt to load plain data so tabs persist
-    window.addEventListener('DOMContentLoaded', () => {
-      const storedPlain = localStorage.getItem(PLAIN_KEY);
-      if (storedPlain) {
-        try {
-          const parsedPlain = JSON.parse(storedPlain);
-          if (parsedPlain.notes && Array.isArray(parsedPlain.notes)) {
-            notes = parsedPlain.notes;
-            tabCounter = notes.length ? Math.max(...notes.map(n => n.id)) + 1 : 0;
-            currentTabId = parsedPlain.currentTabId != null
-              ? parsedPlain.currentTabId
-              : notes[0]?.id;
-            renderTabs();
-            if (currentTabId != null) {
-              const curr = notes.find(n => n.id === currentTabId);
-              editor.innerHTML = curr ? curr.content : '';
-            }
-            return;
-          }
-        } catch {}
-      }
-      // If no plain data, create default tab
-      createNewTab();
-      setInterval(savePlain, 10000);
-    });
-
-    function createNewTab(name = null, content = '') {
-      const id = tabCounter++;
-      const defaultName = name || `Note ${id + 1}`;
-      notes.push({ id, name: defaultName, content });
-      switchToTab(id);
-      renderTabs();
-      savePlain();
-    }
-
-    function renderTabs() {
-      tabBar.innerHTML = '';
-      notes.forEach((note) => {
-        const tabEl = document.createElement('div');
-        tabEl.className = 'tab' + (note.id === currentTabId ? ' active' : '');
-        tabEl.setAttribute('draggable', 'true');
-        tabEl.dataset.id = note.id;
-
-        const titleSpan = document.createElement('span');
-        titleSpan.className = 'title-text';
-        titleSpan.textContent = note.name;
-        tabEl.appendChild(titleSpan);
-
-        const renameBtn = document.createElement('span');
-        renameBtn.className = 'icon-btn';
-        renameBtn.textContent = '✎';
-        renameBtn.title = 'Rename tab';
-        renameBtn.addEventListener('click', (e) => {
-          e.stopPropagation();
-          promptRename(note.id, titleSpan);
-        });
-        tabEl.appendChild(renameBtn);
-
-        const closeBtn = document.createElement('span');
-        closeBtn.className = 'icon-btn';
-        closeBtn.textContent = '×';
-        closeBtn.title = 'Close tab';
-        closeBtn.addEventListener('click', (e) => {
-          e.stopPropagation();
-          closeTab(note.id);
-        });
-        tabEl.appendChild(closeBtn);
-
-        tabEl.addEventListener('click', () => switchToTab(note.id));
-
-        tabEl.addEventListener('dragstart', tabDragStart);
-        tabEl.addEventListener('dragover', tabDragOver);
-        tabEl.addEventListener('drop', tabDrop);
-        tabEl.addEventListener('dragend', tabDragEnd);
-
-        tabBar.appendChild(tabEl);
-      });
-
-      const newTabEl = document.createElement('div');
-      newTabEl.className = 'tab';
-      newTabEl.textContent = '+';
-      newTabEl.title = 'Add new tab';
-      newTabEl.addEventListener('click', () => createNewTab());
-      tabBar.appendChild(newTabEl);
-    }
-
-    function switchToTab(id) {
-      if (currentTabId !== null) {
-        const currentNote = notes.find(n => n.id === currentTabId);
-        if (currentNote) currentNote.content = editor.innerHTML;
-      }
-      currentTabId = id;
-      const nextNote = notes.find(n => n.id === id);
-      editor.innerHTML = nextNote ? nextNote.content : '';
-      renderTabs();
-      clearMessage();
-      editor.focus();
-      savePlain();
-    }
-
-    function promptRename(id, titleSpan) {
-      const note = notes.find(n => n.id === id);
-      if (!note) return;
-      const input = document.createElement('input');
-      input.type = 'text';
-      input.value = note.name;
-      input.style.fontSize = '0.95rem';
-      input.style.background = 'rgba(20,20,35,0.6)';
-      input.style.color = 'var(--text)';
-      input.style.border = '1px solid var(--border)';
-      input.style.borderRadius = '4px';
-      input.style.padding = '2px 4px';
-      titleSpan.replaceWith(input);
-      input.focus();
-      input.select();
-      input.addEventListener('blur', () => {
-        const newName = input.value.trim();
-        if (newName) note.name = newName;
-        renderTabs();
-        savePlain();
-      });
-      input.addEventListener('keydown', (e) => {
-        if (e.key === 'Enter') input.blur();
-      });
-    }
-
-    function closeTab(id) {
-      const idx = notes.findIndex(n => n.id === id);
-      if (idx === -1) return;
-      const wasActive = (id === currentTabId);
-      notes.splice(idx, 1);
-      if (notes.length === 0) {
-        tabCounter = 0;
-        notes = [];
-        createNewTab();
-        return;
-      }
-      if (wasActive) {
-        const newIdx = idx > 0 ? idx - 1 : 0;
-        switchToTab(notes[newIdx].id);
-      } else {
-        renderTabs();
-        savePlain();
-      }
-    }
-
-    function tabDragStart(e) {
-      dragSrcId = Number(e.currentTarget.dataset.id);
-      e.currentTarget.dataset.dragging = 'true';
-    }
-    function tabDragOver(e) {
-      e.preventDefault();
-      const targetId = Number(e.currentTarget.dataset.id);
-      if (dragSrcId === targetId) return;
-      const srcIndex = notes.findIndex(n => n.id === dragSrcId);
-      const tgtIndex = notes.findIndex(n => n.id === targetId);
-      notes.splice(tgtIndex, 0, notes.splice(srcIndex, 1)[0]);
-      renderTabs();
-    }
-    function tabDrop(e) {
-      e.stopPropagation();
-      savePlain();
-    }
-    function tabDragEnd(e) {
-      delete e.currentTarget.dataset.dragging;
-    }
-
-    // Save editor changes
-    editor.addEventListener('input', () => {
-      if (currentTabId !== null) {
-        const note = notes.find(n => n.id === currentTabId);
-        if (note) note.content = editor.innerHTML;
-      }
-      savePlain();
-    });
-
-    function savePlain() {
-      if (currentTabId !== null) {
-        const currentNote = notes.find(n => n.id === currentTabId);
-        if (currentNote) currentNote.content = editor.innerHTML;
-      }
-      const payload = { notes, currentTabId };
-      localStorage.setItem(PLAIN_KEY, JSON.stringify(payload));
-    }
-
-    async function getKeyMaterial(password) {
-      const encoder = new TextEncoder();
-      return crypto.subtle.importKey(
-        'raw',
-        encoder.encode(password),
-        'PBKDF2',
-        false,
-        ['deriveKey']
-      );
-    }
-
-    async function deriveKey(password, salt) {
-      const keyMaterial = await getKeyMaterial(password);
-      return crypto.subtle.deriveKey(
-        { name: 'PBKDF2', salt: salt, iterations: 150000, hash: 'SHA-256' },
-        keyMaterial,
-        { name: 'AES-GCM', length: 256 },
-        false,
-        ['encrypt', 'decrypt']
-      );
-    }
-
-    function arrayBufferToBase64(buffer) {
-      const bytes = new Uint8Array(buffer);
-      let binary = '';
-      for (let b of bytes) {
-        binary += String.fromCharCode(b);
-      }
-      return btoa(binary);
-    }
-
-    function base64ToArrayBuffer(base64) {
-      const binary = atob(base64);
-      const bytes = new Uint8Array(binary.length);
-      for (let i = 0; i < binary.length; i++) {
-        bytes[i] = binary.charCodeAt(i);
-      }
-      return bytes.buffer;
-    }
-
-    async function encryptData(plainText, password) {
-      const encoder = new TextEncoder();
-      const salt = crypto.getRandomValues(new Uint8Array(16));
-      const iv = crypto.getRandomValues(new Uint8Array(12));
-      const key = await deriveKey(password, salt);
-      const cipherBuffer = await crypto.subtle.encrypt(
-        { name: 'AES-GCM', iv: iv },
-        key,
-        encoder.encode(plainText)
-      );
-      return {
-        salt: arrayBufferToBase64(salt.buffer),
-        iv: arrayBufferToBase64(iv.buffer),
-        data: arrayBufferToBase64(cipherBuffer)
-      };
-    }
-
-    async function decryptData(encryptedObj, password) {
-      const salt = base64ToArrayBuffer(encryptedObj.salt);
-      const iv = base64ToArrayBuffer(encryptedObj.iv);
-      const cipherBuffer = base64ToArrayBuffer(encryptedObj.data);
-      const key = await deriveKey(password, salt);
-      try {
-        const decryptedBuffer = await crypto.subtle.decrypt(
-          { name: 'AES-GCM', iv: iv },
-          key,
-          cipherBuffer
-        );
-        const decoder = new TextDecoder();
-        return decoder.decode(decryptedBuffer);
-      } catch {
-        throw new Error('Decryption failed. Wrong password or corrupted data.');
-      }
-    }
-
-    saveBtn.addEventListener('click', async () => {
-      clearMessage();
-      const pw = passwordInput.value;
-      if (!pw) {
-        showMessage('Please enter a password before downloading.', 'error');
-        return;
-      }
-      if (currentTabId !== null) {
-        const currentNote = notes.find(n => n.id === currentTabId);
-        if (currentNote) currentNote.content = editor.innerHTML;
-      }
-      savePlain();
-      const payload = { notes, currentTabId };
-      const jsonString = JSON.stringify(payload);
-      try {
-        const encrypted = await encryptData(jsonString, pw);
-        localStorage.setItem(STORAGE_KEY, JSON.stringify(encrypted));
-        const downloadObj = JSON.stringify(encrypted);
-        const blob = new Blob([downloadObj], { type: 'application/json' });
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement('a');
-        const timestamp = new Date().toISOString().slice(0,19).replace(/[:T]/g, '-');
-        a.download = `pokepad_${timestamp}.json`;
-        a.href = url;
-        a.click();
-        URL.revokeObjectURL(url);
-        showMessage('Encrypted file ready to download.', 'success');
-      } catch {
-        showMessage('Error during encryption. Try again.', 'error');
-      }
-    });
-
-    uploadBtn.addEventListener('click', () => { clearMessage(); fileInput.click(); });
-
-    fileInput.addEventListener('change', () => {
-      const file = fileInput.files[0];
-      if (!file) return;
-      const reader = new FileReader();
-      reader.onload = async (e) => {
-        clearMessage();
-        const pw = passwordInput.value;
-        if (!pw) {
-          showMessage('Enter password to decrypt uploaded file.', 'error');
-          return;
-        }
-        try {
-          const encryptedObj = JSON.parse(e.target.result);
-          const decryptedText = await decryptData(encryptedObj, pw);
-          const parsed = JSON.parse(decryptedText);
-          if (!parsed.notes || !Array.isArray(parsed.notes)) {
-            showMessage('Invalid file format.', 'error');
-            return;
-          }
-          notes = parsed.notes.map(n => ({ id: n.id, name: n.name, content: n.content }));
-          tabCounter = notes.length ? Math.max(...notes.map(n => n.id)) + 1 : 0;
-          currentTabId = parsed.currentTabId != null ? parsed.currentTabId : (notes[0]?.id);
-          renderTabs();
-          if (currentTabId != null) {
-            const curr = notes.find(n => n.id === currentTabId);
-            editor.innerHTML = curr ? curr.content : '';
-          } else if (notes[0]) {
-            currentTabId = notes[0].id;
-            editor.innerHTML = notes[0].content;
-          }
-          savePlain();
-          showMessage('Decryption successful! Notes loaded.', 'success');
-        } catch {
-          showMessage('Failed to decrypt or parse file.', 'error');
-        }
-      };
-      reader.readAsText(file);
-      fileInput.value = '';
-    });
-
-    loadBtn.addEventListener('click', async () => {
-      clearMessage();
-      const pw = passwordInput.value;
-      if (!pw) {
-        showMessage('Enter password to decrypt stored data.', 'error');
-        return;
-      }
-      const stored = localStorage.getItem(STORAGE_KEY);
-      if (!stored) {
-        showMessage('No locally stored data found.', 'error');
-        return;
-      }
-      try {
-        const encryptedObj = JSON.parse(stored);
-        const decryptedText = await decryptData(encryptedObj, pw);
-        const parsed = JSON.parse(decryptedText);
-        if (!parsed.notes || !Array.isArray(parsed.notes)) {
-          showMessage('Invalid local data format.', 'error');
-          return;
-        }
-        notes = parsed.notes.map(n => ({ id: n.id, name: n.name, content: n.content }));
-        tabCounter = notes.length ? Math.max(...notes.map(n => n.id)) + 1 : 0;
-        currentTabId = parsed.currentTabId != null ? parsed.currentTabId : (notes[0]?.id);
-        renderTabs();
-        if (currentTabId != null) {
-          const curr = notes.find(n => n.id === currentTabId);
-          editor.innerHTML = curr ? curr.content : '';
-        } else if (notes[0]) {
-          currentTabId = notes[0].id;
-          editor.innerHTML = notes[0].content;
-        }
-        showMessage('Decryption successful! Notes loaded from localStorage.', 'success');
-        savePlain();
-      } catch {
-        showMessage('Decryption failed or data corrupted.', 'error');
-      }
-    });
-
-     window.addEventListener('keydown', (e) => {
-      if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 's') {
-        e.preventDefault();
-        showMessage('PokePad autosaves :3 ', 'success');
-      }
-    });
-
-     toolbarButtons.forEach(btn => {
-      const cmd = btn.getAttribute('data-cmd');
-      btn.addEventListener('click', () => {
-        if (cmd === 'createLink') {
-          const url = prompt('Enter the URL:', 'https://');
-          if (url) document.execCommand(cmd, false, url);
-        } else {
-          document.execCommand(cmd, false, null);
-        }
-        editor.focus();
-      });
-    });
-
-    colorPickerBtn.addEventListener('click', () => {
-      colorPicker.click();
-    });
-    colorPicker.addEventListener('input', () => {
-      document.execCommand('foreColor', false, colorPicker.value);
-      editor.focus();
-    });
-
-     e2eeLabel.addEventListener('click', () => {
-      e2eePopup.style.display = 'block';
-    });
-    e2eeCloseBtn.addEventListener('click', () => {
-      e2eePopup.style.display = 'none';
-    });
-
-     function showMessage(text, type) {
-      messageDiv.textContent = text;
-      messageDiv.className = type;
-      setTimeout(() => {
-        if (messageDiv.textContent === text) clearMessage();
-      }, 4000);
-    }
-    function clearMessage() {
-      messageDiv.textContent = '';
-      messageDiv.className = '';
-    }
-  </script>
-</body>
-</html>

html/priv.ejs

@@ -1,7 +1,7 @@
   <!--
     This Source Code Form is subject to the terms of the GNU General Public License:
 
-    Copyright (C) 2021-2024 poke (https://codeberg.org/Ashley/poketube)
+    Copyright (C) 2021-2023 POKETUBE (https://codeberg.org/Ashley/poketube)
     
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
      <% if (!isMobile) { %> 
 
 <!DOCTYPE html><html class="background"><head>
-    <title>Poke | Legal mumbo jumbo</title>
+    <title>PokeTube | Legal mumbo jumbo</title>
 <meta name="viewport" content="width=device-width,initial-scale=1">
 
 <link href="/css/app-cdn.min.css" rel="stylesheet">
@@ -250,20 +250,19 @@ section#landing-page {
      transform: translateY(50%);
    }
 
-
 .heading {
 color: #fff;
 font-size: xxx-large;
 font-family: 'PokeTube flex';
 font-stretch: ultra-expanded;
 font-weight: 1000;
-margin-top: -22.5em;
+margin-top: -27.5em;
 width: 100px;
 text-align: left;
 }
 
 .i-cant-find-a-class-name-help-me {
-margin-top: -53.3em;
+margin-top: -69em;
 max-width: 39em;
 color: white;
 background: #333;
@@ -409,7 +408,7 @@ z-index: 10; /* Was 2 */"
   
 <div class="content-inner" style="color:#fff;">
         <br>
-<h1 class="heading">Poke Privacy Policy</h1>
+<h1 class="heading">PokeTube Privacy Policy</h1>
   <div style="text-align: center;color: #fff;margin-top: 8px;margin-bottom:8px">
        We dont collect or share your personal information! That's our privacy policy TL;DR lol
        </div>
@@ -419,7 +418,7 @@ z-index: 10; /* Was 2 */"
     </div>
        
 <div class="description i-cant-find-a-class-name-help-me">
-   Poke does not collect or share personal information. Poke is a free software program that you can fork it yourself. you can see the repo <a href="https://codeberg.org/ashley/poke/">here</a>.<br><br> <a href="https://codeberg.org/Ashley/poketube/commits/main/html/priv.ejs">see history of this privacy policy here</a>
+   Poketube does not collect or share personal information. poketube is a free software program that you can fork it yourself. you can see the repo <a href="https://codeberg.org/ashley/poketube/">here</a>.<br><br> <a href="https://codeberg.org/Ashley/poketube/commits/main/html/priv.ejs">see history of this privacy policy here</a>
   
    <p style="color:#fff;">
           You dont have to read this entire policy as it might put you to sleep. So in TL;DR:We dont collect or share your personal information. thats it lol
@@ -433,9 +432,10 @@ z-index: 10; /* Was 2 */"
                     <i>Please note that im not a lawyer, so dont execpt too much on this policy :P</i>
                   </p>
  <p style="color:#fff">
-   Haiii! Welcome to Poke Privacy Policy! We Dont collect or share your information. Ever. When we collect information, we mean, aggregated information (see "Information Collected" section for more info). The main reason that we dont collect your information is we care about your privacy. like alot (like alot alot). see; whynottrack.com<br><br>
+   Haiii! Welcome to PokeTubes Privacy Policy! We Dont collect or share your information. Ever. When we collect information, we mean, aggregated information (see "Information Collected" section for more info). The main reason that we dont collect your information is we care about your privacy. like alot (like alot alot). see; whynottrack.com<br><br>
  We are free software, meaning you have freedom while using PokeTube. <a href="https://www.gnu.org/philosophy/free-software-even-more-important.html">Learn why you should care about your freedom here</a>. 
 <br><br>
+We dont use javascript on the front-end of PokeTube. Meaning that you can use PokeTube With no javascript add-ons. <a href="https://www.gnu.org/philosophy/javascript-trap.html">Learn Why here.</a>
 <br><br>
 P.S:I love you <3
                   </p>     
@@ -443,37 +443,53 @@ P.S:I love you <3
     <p>START OF PRIVACY POLICY</p>
                   <a class="anchor" name="s1"></a>
                <h3 class="hd-md">
-                 We Dont Collect Information that can indentify you
+                 We dont collect your personal information
                </h3>
                  <br>
-        
+          
-(<a href="https://codeberg.org/ashley/poke/src/branch/main/css/data-mobile.js">see source</a>) <br><br>
+          
-We use Matomo (https://matomo.org/) to gather and store non-identifying information for statistical purposes. The data collected includes details such as your country (inferred from anonymized IP addresses like 111.xx.xxx.xx), operating system, browser version and name, and screen size. This information helps us understand and improve our services. <br><br>
+we dont collect your personal information or share it. We dont collect your IP address. Your device metadata (e.g. device resolution, OS etc.) is not collected in anyway.  <br>
-
-The above doesn't apply if you have Do Not Track or Global Privacy Control enabled on the browser level. 
-                  <hr class="hr" />
-
-                  <hr class="hr" />
 
 <h3 class="hd-md">
                  We dont see the videos you watch
 </h3>
 <br>
-When the Video gets sent to the matomo server, we encrypt it using SHA-256 Signature Algorithm; (<a href="https://codeberg.org/ashley/poke/src/branch/main/css/data-mobile.js#L19-L23">See source</a>) meaning we cant see the videos you watching or things you do. Learn more <a href="https://en.wikipedia.org/wiki/Secure_Hash_Algorithms">About hash Algorithms here.</a><br><br> 
+Our servers are secured with SHA-384 Signature Algorithm; meaning we cant see the videos you watching, things you search, or things you do. Learn more <a href="https://en.wikipedia.org/wiki/Secure_Hash_Algorithms">About hash Algorithms here.</a><br><br> 
 
-We migth use third party services on Poke, but third party request on Poke is proxied by default. no third party can see wat the hell ru doing on PokeTube. We do this by proxying the requests via a whole diffrent server, so no third party can see you.<br>
+We migth use third party services on PokeTube, but third party request on PokeTube is proxied by default. no third party can see wat the hell ru doing on PokeTube. We do this by proxying the requests via a whole diffrent server, so no third party can see you.<br>
-                  <hr class="hr" />
-  
   
+ <h3 class="hd-md">
+                 We dont see the videos you watch
+</h3>
+<br>
+    When you watch a video at PokeTube, we don't know who you are and there is no way to tie the things you are watching.
+When you access a website, your Web browser automatically sends information about your computer. (e.g. your User agent and IP address.)<br><br>
+
+Because this information could be used to link you to your peronsal information, we do not log (store) it at all. This is a very unusual practice, but we feel it is an important step to protect your privacy.
+
+It is unusual for a reason. most server software auto-stores this information, so you have to go out of your way not to store it. 
+<br>
   
  <h3 class="hd-md">
  We don’t track you through cookies
   </h3><br>
 
- on Poke, no cookies are used by default. (<a href="https://codeberg.org/ashley/poke/src/branch/main/css/data-mobile.js#L79">see source</a>) Poke Doesnt use cookies (See the storage tab yourself!). altho we use local storage to save stuff like themes.
+ on PokeTube, no cookies are used by default.  PokeTube Doesnt use cookies (See the storage tab yourself!). altho we use local storage to save stuff like themes.
 <br>
+  
+  <h3 class="hd-md">
+    We only collect your email if you want us to
+  </h3><br>
+if you Subscribe to updates on <a href="//status.poketube.fun">PokeTube status site</a>, we may be store your email to send you email notifications whenever we create, update or resolve an incident. you can also use a alias adress such as <a href="https://duckduckgo.com/email/">Private Duck Address</a> to keep your email identity hidden <br>
+   
+                <h3 class="hd-md">
+        We improve poketube by using anonymous methods
+  </h3><br>
+
+               We use a tool called Piwik (A free software Web analytics system, see piwik.org) to collect information. By information we mean, aggregated data about things such as the number of visits daily/weekly/monthly to PokeTube. <br><br>  This data can't be used to identify you or your device or to learn anything about you individually. This Information thats being collected is anonymous and only analyzed in aggregate. It will never identify you or your machine.<br><br>  
+  This Process does not use cookies in any way. If you want to opt out (for some reason, we still dont know why lol), Click the "Opt out Of Metrics" Button on the bottom rigth side of the player. No data that identifies you or that can be linked to you as an individual is collected on poketube.</p><p>We Also save searches, but again, not in a personally identifiable way, as we do not store IP addresses or unique User agent strings. We use aggregate, non-personal search data.<br>
+      
  
-            
  
          <h3 class="hd-md">
         We proxy 3rd party request

html/search-web-main.ejs

@@ -17,9 +17,7 @@
         NodeList.prototype.forEach = Array.prototype.forEach;
   </script> 
   <style>
-    * {
+    
-      font-family: "poketube flex" !important
-    }
 @keyframes gradient {
   0% {
     background-position: 0 50%;
@@ -37,28 +35,19 @@
   animation: gradient 64s ease infinite;
   background-size: 400% 400%;
 }
-    
-    a {
- 	color: #fff;
-	font-weight: 686;
-	font-stretch: extra-expanded;
-     }
      
     .downnav {
   position: fixed;
   padding:10px;
   bottom: 0;
   left: 0;
+  width: 100%;
   margin: auto;
   overflow: hidden;
   z-index: 1;
   color:#fff;
-  background-color: #0007;
+  background-color: #0f0f0f;
-  border-radius: 5px;
+}</style>
-  width: calc(100% - 33px);
-  margin-left: 6px;
-    }
-  </style>
   <script>
 <!--//--><![CDATA[//><!--
 /**
@@ -230,16 +219,18 @@
   <input placeholder="Search the web" name="query" autocomplete="off" id="search_form_input_homepage" class="search__input" type="text" autofocus />
 
 <div>
-      <button class="btn btn-success" type="submit" style="margin-top: 1em;margin-left: auto;text-align: center;display: flex;flex-direction: column;background: #fff;background-color: #303134;border: 1px solid #303134;border-radius: 4px;color: #e8eaed;font-family: arial,sans-serif;font-size: 14px;padding: 0 16px;line-height: 27px;height: 36px;min-width: 54px;margin-right: 9em;text-align: center;cursor: pointer;user-select: none;">
+      <button class="btn btn-success" type="submit" style="margin-top: 1em;margin-left: auto;text-align: center;display: flex;flex-direction: column;background: #fff;background-color: #303134;border: 1px solid #303134;border-radius: 4px;color: #e8eaed;font-family: arial,sans-serif;font-size: 14px;padding: 0 16px;line-height: 27px;height: 36px;min-width: 54px;margin-right: 13em;text-align: center;cursor: pointer;user-select: none;">
     <p style="margin-top: auto;margin-bottom: auto;font-weight: 1000;margin-left: 6px;font-stretch: ultra-expanded;font-family:&quot;poketube flex&quot;;Poketube flex;">Search Poke</p>
   </button>
-  <div style="margin-left: 5.5em;margin-right: auto;width: fit-content;color: #fff;font-weight: 1000;font-stretch: ultra-expanded;font-size: 33px;margin-bottom: -1em;margin-top: 6px;" id="clock"></div>
+
- <span style="color:#fff;margin-left: auto;margin-right: 8em;text-align: center;display: flex;width: fit-content;margin-top: 2em;font-size: ;" id="weatherInfo"></span> 
+   <button class="btn btn-success" name="lucky" value="true" type="submit" style="margin-top: 1em;margin-left: auto;text-align: center;display: flex;flex-direction: column;background: #fff;background-color: #303134;border: 1px solid #303134;border-radius: 4px;color: #e8eaed;font-family: arial,sans-serif;font-size: 14px;padding: 0 16px;line-height: 27px;height: 36px;min-width: 54px;margin-right: 9em;text-align: center;cursor: pointer;user-select: none;margin-top: -38px;margin-left: 21em;">
+    <p style="margin-top: auto;margin-bottom: auto;font-weight: 1000;margin-left: 6px;font-stretch: ultra-expanded;font-family:&quot;poketube flex&quot;;Poketube flex;">Im feeling lucky</p>
+  </button>
            </div>
 </form>
 
 <div class="downnav">
-<a style="color:#fff" href="/translate"> Translate </a> - <a style="color:#fff" href="/map"> PokeMaps </a> - <a style="color:#fff" href="/account-create">My Account</a> - <a style="color:#fff" href="/privacy">Privacy</a> -   <a style="color:#fff" href="https://codeberg.org/ashley/poketube">Git</a>
+<span style="color:#fff;" id="weatherInfo"></span> - <a style="color:#fff" href="/translate"> Translate </a> - <a style="color:#fff" href="/map"> PokeMaps </a> - <a style="color:#fff" href="/account-create">My Account</a> - <a style="color:#fff" href="/privacy">Privacy</a> -   <a style="color:#fff" href="https://codeberg.org/ashley/poketube">Git</a>
 <div style="float: right;">
 <a style="color:#fff" id="osInfo"></a> <a style="color:#fff;margin-right: 1em;" href="/license">License</a>
   </div>
@@ -266,27 +257,6 @@ if (userAgent.includes("windows")) {
 
 const osInfoElement = document.getElementById("osInfo");
 osInfoElement.textContent = `${osName} - `;
-    
-    function updateClock() {
-  var now = new Date();
-  var hours = now.getHours();
-  var minutes = now.getMinutes();
-  var seconds = now.getSeconds();
-
-  // Add leading zeros to minutes and seconds
-  minutes = (minutes < 10 ? "0" : "") + minutes;
-  seconds = (seconds < 10 ? "0" : "") + seconds;
-
-  // Display the time in the "clock" div
-  document.getElementById("clock").innerHTML = hours + ":" + minutes + ":" + seconds;
-
-  // Update the clock every second
-  setTimeout(updateClock, 1000);
-}
-
-// Call the function to initially display the clock
-updateClock();
-
   </script>  <script>  
 const css = localStorage.getItem("poke-custom-css");
 
@@ -350,7 +320,7 @@ if (window.location.hostname === "poketube.fun" && config.plausible_enabled == t
 
       // Call the fetchAndDisplayWeather function when the page loads
       fetchAndDisplayWeather();
-</script><script src="/static/emojis.js"></script><script src="/static/data-mobile.js"></script><style> img.emoji {height: 1em;width: 1em;margin: 0 .05em 0 .1em;vertical-align: -0.1em;}</style>
+</script><script src="/static/emojis.js"></script><style> img.emoji {height: 1em;width: 1em;margin: 0 .05em 0 .1em;vertical-align: -0.1em;}</style>
 <script>twemoji.parse(document.body,{ base: 'https://p.poketube.fun/https://cdn.zptr.cc/twemoji/' })</script></div>
  </div> <!-- id="content_homepage" -->
   </div> <!-- id="content_wrapper_homepage" -->

html/search-web.ejs

@@ -451,22 +451,22 @@ Web
                      </div> 
 
                                                                     
-<p style="margin-top: -21px;margin-left: 62em;font-family: &quot;Poketube flex&quot;;color: #ffacbb;display: flex;flex-direction: row;gap: 5px;">Powered by <a href="https://ark.sudovanilla.org/Korbs/NarviSearch">NarviSearch ! :3</a> </p>
+
     </div>
                                                                           <div class="video-list" >
 
      <% results.forEach(x => { %>
-                                                                       <div class="video" style="height: 8em;">
+                                                                       <div class="video" style="height: 6em;">
 
-        <a style="min-width: 81em;" href="<%= x.url %>"><%= x.title %></a><br>
+        <a style="min-width: 81em;" href="<%= x.link %>"><%= x.title %></a><br>
-        <p style="color:gray;display: flex;flex-direction: column;width: 48em;margin-top: -8em;"><%= x.url %><br>
+        <p style="color:gray;display: flex;flex-direction: column;width: 48em;margin-top: -8em;"><%= x.link %><br>
           <% if (!isMobile) { %> 
 
-         <span style="color:white;width: 48em;display: flex;"><%= x.description %></span>
+         <span style="color:white;width: 48em;display: flex;"><%= x.snippet %></span>
                      <% } %> 
  <% if (isMobile) { %> 
 
-         <span style="color:white;max-width: 15em;display: flex;"><%= x.description %></span>
+         <span style="color:white;max-width: 15em;display: flex;"><%= x.snippet %></span>
                      <% } %> 
           </p>
               </div>

html/translate.ejs

@@ -16,8 +16,235 @@
     You should have received a copy of the GNU General Public License
     along with this program. If not, see https://www.gnu.org/licenses/.
 -->
+<!doctype html>
 
-<% const languageOptions = [
+<html lang="en">
+    <head>
+        <title>PokeTranslate</title>
+        <link rel="icon" href="/static/yt-ukraine.svg">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta content="PokeTranslate" property=og:title>
+        <meta content="Translate text - Anonymously!" property=twitter:description>
+        <meta content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884" property="og:image"  /> 
+        <meta content=summary_large_image name=twitter:card>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta charset="UTF-8">
+        <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
+         <meta name="referrer" content="no-referrer">
+        <link rel="manifest" href="/manifest.json">
+        <style>
+        .center {
+            text-align: center;
+        }
+
+        .wrap {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: center;
+        }
+
+        .wrap.languages {
+            flex-wrap: nowrap;
+            margin-bottom: 20px;
+        }
+
+        #could_not_switch_languages_text {
+            color: red;
+        }
+
+        .item {
+            width: 100%;
+            height: 150px;
+            border-radius:1em;
+        }
+
+        .item-wrapper {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: center;
+            width: 450px;
+            margin: 5px 10px;
+        }
+
+
+        .language,
+        .switch_languages {
+            display: flex;
+        }
+
+        .language {
+            margin: 0px 10px;
+        }
+
+        .switch_languages {
+            margin: 0px 5px;
+        }
+
+        #switchbutton {
+            white-space: nowrap;
+        }
+
+        button {
+            font-size: 1rem;
+            padding: 4px 10px;
+            border: 2px solid #888888;
+        }
+
+        input,
+        select,
+        textarea {
+            width: 100%;
+            font-size: 1rem;
+            padding: 4px;
+            border: 2px solid #888888;
+        }
+
+        textarea {
+            resize: vertical;
+            height: 5rem;
+            font-family: sans-serif;
+            width: 100%;
+        }
+
+        input:focus,
+        select:focus,
+        textarea:focus,
+        button:focus {
+            border-color: #478061;
+            outline: 1px solid #478061;
+        }
+
+
+        body {
+            justify-content: center;
+            font-family: sans-serif;
+        }
+
+        #definitions_and_translations {
+            display: grid;
+            margin: auto;
+            width: 1100px;
+            gap: 10px;
+            grid-template-areas: "definitions translations";
+
+        }
+
+        .def_type {
+            color: #007979;
+            text-transform: capitalize;
+        }
+
+        .syn {
+            color: #804700;
+        }
+
+        .syn_type {
+            color: #007979;
+        }
+
+        .use_in_sentence {
+            color: #009902;
+        }
+
+        .definitions li:not(:last-child) {
+          margin-bottom: 1rem;
+        }
+
+        @media screen and (max-width: 1200px) {
+            #definitions_and_translations {
+                display: grid;
+                width: 90vw;
+                grid-template-areas:
+                    "definitions definitions"
+                    "translations translations";
+            }
+        }
+
+
+        div.definitions {
+            grid-area: definitions;
+        }
+
+        div.translations {
+            grid-area: translations;
+        }
+
+        body {
+                background-color: #212529;
+                color: #f8f9fa;
+            }
+
+        #could_not_switch_languages_text {
+                color: #F13333;
+            }
+
+        a:visited {
+                color: #9759f6;
+                text-decoration: none;
+            }
+
+        a {
+                color: #599bf6;
+                text-decoration: none;
+            }
+
+            input,
+            select,
+            button,
+            textarea {
+                background-color: #131618;
+                border-color: #495057;
+                color: #f8f9fa;
+            }
+
+            .def_type {
+                color: cyan;
+                text-transform: capitalize;
+            }
+
+            .syn {
+                color: burlywood;
+            }
+
+            .syn_type {
+                color: cyan;
+            }
+
+            .use_in_sentence {
+                color: yellow;
+            }
+        
+        </style>
+      
+        <% if (isMobile) { %>  
+<style>
+  body {
+  overflow: auto;
+  }
+</style>
+           <% } %> 
+
+        <% if (!isMobile) { %>  
+<style>
+  body {
+  overflow: hidden;
+  }
+</style>
+           <% } %> 
+    </head>
+
+    <body>
+<div style="border-radius: 3em;background: #1a1a1a;padding: 1em;display: flex;flex-direction: column;height: fit-content;align-self: center;margin-top: 6em;">
+        
+        <header class="center"><h1>PokeTranslate</h1></header>
+ 
+                <form action="/translate" method="GET" id="translation-form">
+
+            <!-- from and to language -->
+            <div class="wrap languages">
+                <div class="language">
+                    
+               <% const languageOptions = [
   { code: 'autodetect', name: 'Autodetect' },
   { code: 'af', name: 'Afrikaans' },
   { code: 'sq', name: 'Albanian' },
@@ -80,7 +307,7 @@
   { code: 'km', name: 'Khmer' },
   { code: 'rw', name: 'Kinyarwanda' },
   { code: 'kok', name: 'Konkani' },
-  { code: 'ko', name: 'Korean (PROK)' },
+  { code: 'ko', name: 'Korean' },
   { code: 'kri', name: 'Krio' },
   { code: 'ku', name: 'Kurdish (Kurmanji)' },
   { code: 'sd', name: 'Sindhi' },
@@ -114,283 +341,91 @@
   { code: 'zu', name: 'Zulu' }
 ]; %>
 
-<!doctype html>
-<html lang="en">
-<head>
-<title>PokeTranslate</title>
-    <link rel="icon" href="/static/yt-ukraine.svg">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta content="PokeTranslate" property=og:title>
-    <meta content="Translate text - Anonymously!" property=twitter:description>
-    <meta content="https://cdn.glitch.global/d68d17bb-f2c0-4bc3-993f-50902734f652/aa70111e-5bcd-4379-8b23-332a33012b78.image.png?v=1701898829884" property="og:image" />
-    <meta content=summary_large_image name=twitter:card>
-    <meta charset="UTF-8">
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'">
-    <meta name="referrer" content="no-referrer">
-    <link rel="manifest" href="/manifest.json">
-   <link href="https://fonts.bunny.net/css?family=poppins:400,500,600" rel="stylesheet">
-   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-   
-  <style>
-    :root {
-      --accent-1: #ff6b6b;
-      --accent-2: #f7d794;
-      --bg-light: #fafafa;
-      --bg-dark: #202027;
-      --card-light: rgba(255,255,255,0.55);
-      --card-dark: rgba(18,18,24,0.55);
-      --radius: 20px;
-      --transition: 0.3s ease;
-    }
-    * { margin:0; padding:0; box-sizing:border-box; }
-    body {
-      font-family:'Poppins',sans-serif;
-      background: var(--bg-light);
-      color: #fff;
-      display:flex; align-items:center; justify-content:center;
-      min-height:100vh; padding:20px;
-      transition: background var(--transition), color var(--transition);
-      overflow:hidden;
-    }
-    @media (prefers-color-scheme: dark) {
-      body { background: var(--bg-dark); }
-    }
 
-    .glass {
+<!-- Source language select -->
-      position: relative;
+<select name="from_language" id="from_language" style="margin-right: 1em;border-radius: 1em;padding: 7px;" aria-label="Source language">
-      background: var(--card-light);
+   <% languageOptions.forEach(language => { %>
-      backdrop-filter: blur(30px) saturate(200%);
+    <option value="<%= language.code %>" <%= language.code === (from_language || 'autodetect') ? 'selected' : '' %>><%= language.name %></option>
-      border-radius: var(--radius);
+  <% }); %>
-      box-shadow: 0 8px 32px rgba(0,0,0,0.1);
+</select>
-      width:100%; max-width:840px; overflow:hidden;
-      transition: background var(--transition), box-shadow var(--transition);
-    }
-    @media (prefers-color-scheme: dark) {
-      .glass {
-        background: var(--card-dark);
-        box-shadow: 0 8px 32px rgba(0,0,0,0.7);
-      }
-    }
 
-    .blob {
-      position:absolute; width:300px; height:300px;
-      background: linear-gradient(45deg,var(--accent-1),var(--accent-2));
-      border-radius: 45% 55% 70% 30%/30% 60% 40% 70%;
-      animation: blobMove 8s infinite; opacity:0.3; z-index:0;
-    }
-    .blob:nth-child(1){ top:-80px; left:-60px; }
-    .blob:nth-child(2){ bottom:-100px; right:-80px; animation-duration:10s; }
-    @keyframes blobMove {
-      0%,100% { transform:translate(0,0) scale(1); }
-      50% { transform:translate(20px,20px) scale(1.1); }
-    }
 
-    header {
+<!-- Target language select -->
-      position:relative; padding:28px; text-align:center;
+<select name="to_language" id="to_language"  style="margin-right: 1em;border-radius: 1em;padding: 7px;" aria-label="Target language">
-      background: linear-gradient(60deg,var(--accent-1),var(--accent-2));
+  <% languageOptions.slice(1).forEach(language => { %>
-      background-size:200% 200%; animation:gradientAnimation 6s ease infinite;
+    <option value="<%= language.code %>" <%= language.code === to_language ? 'selected' : '' %>><%= language.name %></option>
-      z-index:1;
+  <% }); %>
-    }
+</select>
-    @keyframes gradientAnimation {
-      0%{ background-position:0% 50%; }
-      50%{ background-position:100% 50%; }
-      100%{ background-position:0% 50%; }
-    }
 
-    /* Rainbow title unless user prefers reduced motion */
+                    
-    @media (prefers-reduced-motion: no-preference) {
+                </div>
-      header h1 {
+            </div>
-        font-size:2.4rem; font-weight:600; letter-spacing:1.5px;
-        background: conic-gradient(red,orange,yellow,green,blue,indigo,violet,red);
-        background-size:300%;
-        -webkit-background-clip:text;
-        -webkit-text-fill-color:transparent;
-        animation: rainbow 4s linear infinite;
-      }
-      @keyframes rainbow {
-        0%   { background-position: 0%   50%; }
-        50%  { background-position: 100% 50%; }
-        100% { background-position: 0%   50%; }
-      }
-    }
-    @media (prefers-reduced-motion: reduce) {
-      header h1 {
-        font-size:2.4rem; font-weight:600; letter-spacing:1.5px;
-        color:#fff;
-      }
-    }
 
-    form { position:relative; z-index:2; }
+            
-    .language-bar { display:flex; align-items:center; gap:12px; padding:16px 24px; }
-    .language-select { flex:1; }
-    .language-select select {
-      width:100%; padding:14px 18px; border-radius:var(--radius);
-      border:1px solid rgba(255,255,255,0.5); background:transparent;
-      font-size:1rem; appearance:none; cursor:pointer; color:#fff;
-      transition:border-color var(--transition);
-    }
-    .language-select select:focus { border-color:var(--accent-1); outline:none; }
-    .swap-button {
-      font-size:2rem; color:var(--accent-1); text-decoration:none;
-      transition:transform var(--transition),color var(--transition);
-    }
-    .swap-button:hover {
-      transform:rotate(180deg) scale(1.1);
-      color:var(--accent-2);
-    }
 
-    .panels {
+            <!-- text boxes -->
-      display:grid; grid-template-columns:1fr 1fr; gap:20px;
+            <div class="wrap">
-      padding:0 24px 24px;
+                <div class="item-wrapper">
-    }
+                    <textarea autofocus class="item" id="input" name="input" dir="auto"  placeholder="<%- text %>"><%- text %>
-    .panel { position:relative; }
+</textarea>
-    .panel label {
+                    </div>
-      display:block; margin-bottom:8px; font-weight:500; font-size:0.95rem;
-      color:#fff;
-    }
-    .panel textarea {
-      width:100%; min-height:160px; padding:16px; border-radius:var(--radius);
-      border:1px solid rgba(255,255,255,0.5); resize:vertical; font-size:1rem;
-      line-height:1.5; background:rgba(255,255,255,0.2); color:#fff;
-      transition:border-color var(--transition),box-shadow var(--transition);
-    }
-    .panel textarea::placeholder { color:rgba(255,255,255,0.7); }
-    @media (prefers-color-scheme: dark) {
-      .panel textarea { background:rgba(20,20,25,0.5); }
-    }
-    .panel textarea:focus {
-      border-color:var(--accent-1);
-      box-shadow:0 0 8px var(--accent-1);
-      outline:none;
-    }
 
-    .actions { display:flex; justify-content:center; padding-bottom:24px; }
-    .actions button {
-      padding:16px 36px; font-size:1.1rem; font-weight:600; border:none;
-      border-radius:var(--radius); cursor:pointer;
-      background:linear-gradient(60deg,var(--accent-1),var(--accent-2));
-      background-size:200% 200%; animation:gradientAnimation 6s ease infinite;
-      color:#fff; box-shadow:0 4px 14px rgba(0,0,0,0.2);
-      transition:transform var(--transition),opacity var(--transition);
-    }
-    .actions button:hover { transform:scale(1.03); opacity:0.9; }
 
-    @media (max-width:768px) { .panels { grid-template-columns:1fr; } }
-  </style>
-</head>
-<body>
-  <div class="glass">
-    <div class="blob"></div>
-    <div class="blob"></div>
 
-    <header><h1>PokeTranslate</h1></header>
+                <div class="item-wrapper">
+                    <textarea id="output" class="translation item" dir="auto" placeholder="Translation" readonly> <%- translation %> </textarea>
+              </div>
+            </div>
 
-    <form action="/translate" method="GET">
+            <br>
-      <div class="language-bar">
-        <div class="language-select">
-          <select name="from_language" id="from_language">
-            <% languageOptions.forEach(lang => { %>
-              <option value="<%= lang.code %>" <%= lang.code === (from_language||'autodetect')?'selected':''%>>
-                <%= lang.name %>
-              </option>
-            <% }); %>
-          </select>
-        </div>
 
-        <a
+            <div class="center">
-          href="?from_language=<%= to_language %>&to_language=<%= from_language %>&input=<%= encodeURIComponent(text) %>"
+                <!-- translate button -->
-          id="swapBtn"
+                <button type="submit" style="border-radius: 1em;padding: 7px;">Translate :3</button>
-          class="material-icons swap-button"
+            </div>
-        >swap_horiz</a>
 
-        <div class="language-select">
+            <br>
-          <select name="to_language" id="to_language">
-            <% languageOptions.slice(1).forEach(lang => { %>
-              <option value="<%= lang.code %>" <%= lang.code===to_language?'selected':''%>>
-                <%= lang.name %>
-              </option>
-            <% }); %>
-          </select>
-        </div>
-      </div>
 
-      <div class="panels">
+           
-        <div class="panel input">
-          <label for="input">Input</label>
-          <textarea id="input" name="input" placeholder="Enter text…"><%= text %></textarea>
-        </div>
-        <div class="panel output">
-          <label for="output">Translation</label>
-          <textarea id="output" readonly placeholder="Translated text…"><%= translation %></textarea>
-        </div>
-      </div>
 
-      <div class="actions">
+            <br>
-        <button type="submit">Translate :3</button>
+ 
-      </div>
+                
-    </form>
-  </div>
 
-  <script>
+                
-  (function(){
+            </div>
-    // swap button
-    const swapBtn = document.getElementById('swapBtn');
-    if(swapBtn){
-      swapBtn.addEventListener('click', function(e){
-        e.preventDefault();
-        const from = document.getElementById('from_language');
-        const to   = document.getElementById('to_language');
-        const inp  = document.getElementById('input');
-        const out  = document.getElementById('output');
-        [from.value, to.value] = [to.value, from.value];
-        [inp.value, out.value] = [out.value, inp.value];
-      });
-    }
 
-    // auto-resize all textareas
+        </form>
-    document.querySelectorAll('textarea').forEach(el=>{
+            </div>
-      const resize = ()=>{ el.style.height='auto'; el.style.height=el.scrollHeight+'px'; };
-      el.addEventListener('input', resize);
-      resize();
-    });
 
-    // live-translate if JS available
-    if(window.fetch){
-      const from  = document.getElementById('from_language');
-      const to    = document.getElementById('to_language');
-      const input = document.getElementById('input');
-      const output= document.getElementById('output');
-      let timer;
 
-      function translateNow(){
+        <br>
-        const q = new URLSearchParams({
+        <br>
-          from_language: from.value,
+        <br>
-          to_language: to.value,
-          input: input.value
-        });
-        fetch(`/translate?${q}`)
-          .then(r => r.text())
-          .then(html => {
-            const doc = new DOMParser().parseFromString(html, 'text/html');
-            const newOut = doc.getElementById('output');
-            if(newOut){
-              output.value = newOut.value;
-              output.dispatchEvent(new Event('input'));
-            }
-          })
-          .catch(() => {/* ignore */});
-      }
 
-      // debounce on typing
+ 
-      input.addEventListener('input', ()=>{
+
-        clearTimeout(timer);
+        <script>
-        timer = setTimeout(translateNow, 500);
+            // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0
-      });
+            // this code submits the translation form when pressing Ctrl/Meta+Enter while focussed on the input text field
-      // re-translate on language change
+            document.getElementById("input").addEventListener("keydown", function(event) {
-      from.addEventListener('change', translateNow);
+                if (event.keyCode === 13 && (event.metaKey || event.ctrlKey)) {
-      to.addEventListener('change', translateNow);
+                    document.getElementById("translation-form").submit();
-    }
+                }
-  })();
+            });
-  </script>
+
-</body>
+            // Auto resize textarea to fit words inside it without need to scroll -- Thanks to: https://stackoverflow.com/a/25621277
-</html>
+            var input = document.getElementById("input");
+            var output = document.getElementById("output");
+            input.setAttribute("style", "height:" + output.scrollHeight + "px;overflow-y:scroll;");
+            output.setAttribute("style", "height:" + output.scrollHeight + "px;overflow-y:scroll;");
+            input.addEventListener("input", function(e) {
+                this.style.height = 150 + "px";
+                this.style.height = this.scrollHeight + "px";
+            });
+            
+            // @license-end
+        </script>
+     <script src="/static/custom-css.js"></script>
+    </body>
+</html>

html/video-error.ejs

@@ -1,24 +0,0 @@
-<%
-  function isValidYouTubeID(v) {
-    return /^[a-zA-Z0-9_-]{11}$/.test(v);
-  }
-
-  function isLetterSpam(v) {
-    return /^(.)\1+$/.test(v);
-  }
-
-  let reason;
-  
-  if (!isValidYouTubeID(v) || isLetterSpam(v)) {
-    reason = "Video not found >~<";
-  } else {
-    reason = "Poke is currently restarting - please wait 1-2 minutes..";
-  }
-%>
-
-<%- include('./layouts/error-video.ejs', {
-  error: "loading failed :c",
-  description: `${reason}`
-}) %>
-
-

infocards.json

@@ -1,6 +0,0 @@
-{
-  "Open Source":{
-    "infocard":"<i>Open Source</i> is a wrong terminology",
-    "more_info":"https://gnu.org/not-open-source"
-  }
-}

instances.json

@@ -8,38 +8,80 @@
       "proxy": true,
       "official": true,
       "DEFAULT": true,
-      "region": "🇩🇪",
+      "region": "🇺🇸",
       "software": {
-        "name": "poke",
+        "name": "poketube",
-        "version": "latest",
+        "version": "lastest",
         "branch": "dev"
       }
     }
   ],
   [
-    "pt.sudovanilla.org",
+    "poketube.sudovanilla.com",
     {
-      "uri": "https://pt.sudovanilla.org",
+      "uri": "https://poketube.sudovanilla.com",
+      "CLOUDFLARE": true,
+      "piwik": false,
+      "region": "🇺🇸",
+      "software": {
+        "name": "poketube",
+        "version": "lastest",
+        "branch": "dev"
+      }
+    }
+  ],
+  [
+    "poke.vern.cc",
+    {
+      "uri": "https://poke.vern.cc",
       "CLOUDFLARE": false,
       "piwik": false,
       "region": "🇺🇸",
       "software": {
-        "name": "poke",
+        "name": "poketube",
         "version": "latest",
         "branch": "dev"
       }
     }
   ],
   [
-    "nyc1.poke.ggtyler.dev",
+    "poke.ashley0143.xyz",
     {
-      "uri": "https://nyc1.poke.ggtyler.dev",
+      "uri": "https://poke.ashley0143.xyz",
+      "CLOUDFLARE": true,
+      "piwik": false,
+      "region": "🇺🇸",
+      "software": {
+        "name": "poketube",
+        "version": "latest",
+        "branch": "dev"
+      }
+    }
+  ],
+  [
+    "poke.alphexo.dev",
+    {
+      "uri": "https://poke.alphexo.dev",
+      "CLOUDFLARE": true,
+      "piwik": false,
+      "region": "🇬🇧",
+      "software": {
+        "name": "poketube",
+        "version": "latest",
+        "branch": "dev"
+      }
+    }
+  ],
+  [
+    "poke.ggtyler.dev",
+    {
+      "uri": "https://poke.ggtyler.dev",
       "CLOUDFLARE": false,
       "piwik": false,
       "proxy": false,
       "region": "🇺🇸",
       "software": {
-        "name": "poke",
+        "name": "poketube",
         "version": "latest",
         "branch": "dev"
       }
@@ -54,37 +96,36 @@
       "proxy": false,
       "region": "🇺🇸",
       "software": {
-        "name": "poke",
+        "name": "poketube",
         "version": "latest",
         "branch": "dev"
       }
     }
   ],
   [
-    "pol1.poke.ggtyler.dev",
+    "poke.am1.shiggy.cloud",
     {
-      "uri": "https://pol1.ggtyler.dev",
+      "uri": "https://poke.am1.shiggy.cloud",
       "CLOUDFLARE": false,
       "piwik": false,
       "proxy": false,
-      "region": "🇵🇱",
+      "region": "🇳🇱",
       "software": {
-        "name": "poke",
+        "name": "poketube",
         "version": "latest",
         "branch": "dev"
       }
     }
-  ],
+  ],  [
-  [
+    "poke.am2.shiggy.cloud",
-    "poke.blahai.gay",
     {
-      "uri": "https://poke.blahai.gay/",
+      "uri": "https://poke.am2.shiggy.cloud",
-      "CLOUDFLARE": true,
+      "CLOUDFLARE": false,
       "piwik": false,
       "proxy": false,
-      "region": "🇩🇪",
+      "region": "🇳🇱",
       "software": {
-        "name": "poke",
+        "name": "poketube",
         "version": "latest",
         "branch": "dev"
       }

issue_template/enhancement.yml

@@ -1,19 +0,0 @@
-name: Enhancement
-description: This is an enhancement/feature you would like to see in Poke
-title: "[Bug]: "
-labels: ["bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!WARNING]
-        > The following will never be added:
-        > * iOS app (use the PWA)
-        > * non-free codecs
-  - type: textarea
-    id: describe
-    attributes:
-      label: Describe the enhancement
-      placeholder: What would you like to see being added?
-    validations:
-      required: true

issue_template/general-issue.yml

@@ -1,31 +0,0 @@
-name: General issue
-description: This is an issue with Poke not related to the video player
-title: "[Bug]: "
-labels: ["bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!WARNING]
-        > Please check if the issue already exists before creating it! [u will explod if it already exists]   
-  - type: textarea
-    id: describe
-    attributes:
-      label: Describe the issue
-      placeholder: In detail, what happened?
-    validations:
-      required: true
-  - type: input
-    id: browser
-    attributes:
-      label: What browser and OS are you using?
-      description: eg. Chrome on Windows 10, Firefox on Fedora GNU/Linux 40
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    render: true
-    attributes:
-      render: true
-      label: Error logs
-      placeholder: If any, are there error logs in your browser console?

issue_template/player-bug.yml

@@ -1,55 +0,0 @@
-name: Player bug
-description: This is an issue with the Poke video player
-title: "[Bug]: "
-labels: ["player-bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!CAUTION]
-        > If your issue matches **all of** the 3 points below:
-        > * JavaScript is disabled;
-        > * AND playback is high-resolution;
-        > * AND audio isn't working;
-        >
-        > **DO NOT open an issue.** Hi-res audio will not work without JavaScript enabled.
-  - type: markdown
-    attributes:
-      value: |
-        > [!CAUTION]
-        > Your bug might be a Video.js bug, the player Poke uses.
-        > 
-        > Look through [Video.js issues](https://github.com/videojs/video.js/issues?q=sort%3Aupdated-desc+is%3Aissue+is%3Aopen+label%3Abug) to see if the issue is actually with Poke, or if this is just a Video.js issue out of our control. DO NOT open an issue here if the latter applies.
-  - type: textarea
-    id: describe
-    attributes:
-      label: Describe the issue
-      placeholder: In detail, what happened?
-    validations:
-      required: true
-  - type: dropdown
-    id: js
-    attributes:
-      label: JavaScript and resolution
-      description: Choose one of the 4 options below.
-      options:
-        - JS enabled, high res
-        - JS enabled, low res
-        - JS disabled, high res
-        - JS disabled, low res
-    validations:
-      required: true
-  - type: input
-    id: browser
-    attributes:
-      label: What browser and OS are you using?
-      description: eg. Chrome on Windows 10, Firefox on Fedora 40
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    render: true
-    attributes:
-      render: true
-      label: Error logs
-      placeholder: If any, are there error logs in your browser console?

issue_template/search-filter.yml

@@ -1,29 +0,0 @@
-name: Search filter issue
-description: This is for issues related to the self-harm and misinfo search filters
-title: "[Bug]: "
-labels: ["search-issue"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!CAUTION]
-        > This form isn't to request the removal of a source. Do not use it for that      
-  - type: input
-    id: search
-    attributes:
-      label: What was your exact search?
-    validations:
-      required: true
-  - type: input
-    id: flag
-    attributes:
-      label: What was it flagged as?
-      placeholder: Self-harm, or the name of the news source
-    validations:
-      required: true
-  - type: input
-    id: describe
-    attributes:
-      label: Anything else worthy to know?
-    validations:
-      required: false

january/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-actix-web = "4.0"
+actix-web = "4.4.1"
 lazy_static = "1.4"
 imagesize = "0.8"
 reqwest = "0.11"

january/Dockerfile

@@ -1,17 +1,19 @@
 # Build Stage
-FROM rustlang/rust:nightly-slim AS builder
+FROM rustlang/rust:nightly-bullseye-slim AS builder
 USER 0:0
 WORKDIR /home/rust/src
 
+RUN apt-get update && apt-get install -y libssl-dev pkg-config
+
 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 .
+RUN cargo install --locked --path .
 
 # Bundle Stage
-FROM debian:buster-slim
+FROM debian:bullseye-slim
-RUN apt-get update && apt-get install -y ca-certificates ffmpeg
+RUN apt-get update && apt-get install -y ca-certificates ffmpeg libssl-dev
 COPY --from=builder /usr/local/cargo/bin/january ./
 EXPOSE 7000
 ENV JANUARY_HOST 0.0.0.0:7000

nginx.conf.example

@@ -16,4 +16,8 @@ server {
         proxy_ssl_session_reuse off;
         proxy_set_header Host $http_host;
     }
+
+    location /manifest.json {
+        root /path/to/poketube/pwa/;
+    }
 }

p/Dockerfile

@@ -1,99 +1,21 @@
-#################################################################################
+# docker build -t pproxy .
-#                                  INSTALLERS                                   #
+# docker run -p 6003:6003 -v ./whitelist.json:/pproxy/whitelist.json:ro pproxy
-#   These images provide the dependencies required to build the other images.   #
-#################################################################################
 
-FROM quay.io/almalinuxorg/9-base AS builder-installer
+# Base
+FROM node:18-alpine
 
-# Needed for node 18+
+# Install dependencies
-# RUN dnf module --assumeyes enable nodejs
+RUN apk add --no-cache git build-base python3
 
-RUN --mount=type=cache,target=/var/cache/dnf \
+# Set Work Directory
-    dnf install --assumeyes --nodocs nodejs ca-certificates jq make gcc g++
+WORKDIR /pproxy
 
-RUN npm install -g \
+# Install dependencies
-    npm@$(curl "https://release-monitoring.org/api/v2/versions/?project_id=190206" | jq --raw-output '.stable_versions[0]')
+# Honestly less effort this way
+RUN yarn add express undici
 
+# Copy files
+COPY server.js .
 
-# Runtime dependencies
+# Entrypoint
-FROM quay.io/almalinuxorg/9-base AS installer
-
-COPY --from=quay.io/almalinuxorg/9-micro / /rpms
-RUN --mount=type=cache,target=/var/cache/dnf \
-    dnf install --assumeyes \
-    --installroot /rpms \
-    --releasever=9 \
-    --setopt=install_weak_deps=false \
-    --nodocs \
-    nodejs ca-certificates
-
-RUN dnf clean all \
-    --installroot /rpms
-
-
-# Proxy + certbot
-FROM quay.io/almalinuxorg/9-base AS proxy-installer
-
-RUN dnf install epel-release --assumeyes
-
-COPY --from=quay.io/almalinuxorg/9-micro / /rpms
-RUN --mount=type=cache,target=/var/cache/dnf \
-    dnf install --assumeyes \
-    --installroot /rpms \
-    --releasever=9 \
-    --setopt=install_weak_deps=false \
-    --setopt=reposdir=/etc/yum.repos.d \
-    --nodocs \
-    nginx-core certbot python3-certbot-nginx
-
-RUN dnf clean all \
-    --installroot /rpms
-
-#################################################################################
-#                                    BUILDER                                    #
-#################################################################################
-
-FROM builder-installer AS builder
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-COPY package.json ./
-RUN npm install --frozen-lockfile
-# COPY ./ ./
-COPY p/server.js ./
-
-#################################################################################                                     
-#                                  FINAL IMAGE                                  #
-#################################################################################
-
-FROM quay.io/almalinuxorg/9-micro AS release-base
-
-# Grab npm
-COPY --from=installer /rpms /
-
-# Grab site
-COPY --from=builder /usr/src/app /app
-
-WORKDIR /app
-
-ENV NODE_ENV production
-
-
-# Final image
-FROM release-base as release
-# EXPOSE 3000/tcp
 CMD [ "node", "server.js" ]
-
-# Final image with extras
-FROM release-base AS release-aio
-# Grab nginx and certbot
-COPY --from=proxy-installer /rpms /
-
-COPY entrypoint.sh entrypoint.sh
-RUN chmod +x entrypoint.sh
-COPY nginx.conf.example /etc/nginx/conf.d/poketube.conf
-
-# EXPOSE 80/tcp
-# EXPOSE 443/tcp
-ENTRYPOINT [ "/usr/bin/bash", "./entrypoint.sh" ]
-CMD [ "node", "server.js" ]

p/server.js

@@ -1,41 +1,10 @@
 const express = require("express");
-const fetch = require("node-fetch");
+// const fetch = require("node-fetch");
 const { URL } = require("url");
 const { Readable } = require("node:stream");
 
 // Array of hostnames that will be proxied
-const URL_WHITELIST = [
+const URL_WHITELIST = require("./whitelist.json");
-  "i.ytimg.com",
-  "yt3.googleusercontent.com",
-  "cdn.glitch.global",
-  "cdn.statically.io",
-  "site-assets.fontawesome.com",
-  "fonts.gstatic.com",
-  "cdn.jsdelivr.net",
-  "yt3.ggpht.com",
-  "tube.kuylar.dev",
-  "lh3.googleusercontent.com",
-  "is4-ssl.mzstatic.com",
-  "is2-ssl.mzstatic.com",
-  "is1-ssl.mzstatic.com",
-  "fonts.bunny.net",
-  "demo.matomo.org",
-  "is5-ssl.mzstatic.com",
-  "is3-ssl.mzstatic.com",
-  "twemoji.maxcdn.com",
-  "unpkg.com",
-  "lite.duckduckgo.com",
-  "youtube.com",
-  "returnyoutubedislikeapi.com",
-  "cdn.zptr.cc",
-  "inv.vern.cc",
-  "invidious.privacydev.net",
-  "inv.zzls.xyz",
-  "vid.puffyan.us",
-  "invidious.lidarshield.cloud",
-  "invidious.epicsite.xyz",
-  "invidious.esmailelbob.xyz",
-];
 
 const app = express();
 
@@ -73,7 +42,6 @@ const proxy = async (req, res) => {
       return res.status(400).send("Malformed URL");
     }
 
-    // Sanity check, to avoid being used as an open proxy
     if (!URL_WHITELIST.includes(url.host)) {
       console.log(`==> Refusing to proxy host ${url.host}`);
       res.status(401).send(`Hostname '${url.host}' is not permitted`);
@@ -163,7 +131,8 @@ const { fetch } = await import("undici")
 });
 
 app.get("/bangs", async (req, res) => {
- 
+    const { fetch } = await import("undici")
+
     let f = await fetch("https://lite.duckduckgo.com/lite/?q=" + req.query.q, {
       method: req.method,
     });

p/whitelist.json

@@ -0,0 +1,32 @@
+[
+    "i.ytimg.com",
+    "yt3.googleusercontent.com",
+    "cdn.glitch.global",
+    "cdn.statically.io",
+    "site-assets.fontawesome.com",
+    "fonts.gstatic.com",
+    "cdn.jsdelivr.net",
+    "yt3.ggpht.com",
+    "tube.kuylar.dev",
+    "lh3.googleusercontent.com",
+    "is4-ssl.mzstatic.com",
+    "is2-ssl.mzstatic.com",
+    "is1-ssl.mzstatic.com",
+    "fonts.bunny.net",
+    "demo.matomo.org",
+    "is5-ssl.mzstatic.com",
+    "is3-ssl.mzstatic.com",
+    "twemoji.maxcdn.com",
+    "unpkg.com",
+    "lite.duckduckgo.com",
+    "youtube.com",
+    "returnyoutubedislikeapi.com",
+    "cdn.zptr.cc",
+    "inv.vern.cc",
+    "invidious.privacydev.net",
+    "inv.zzls.xyz",
+    "vid.puffyan.us",
+    "invidious.lidarshield.cloud",
+    "invidious.epicsite.xyz",
+    "invidious.esmailelbob.xyz"
+]

package.json

@@ -28,17 +28,17 @@
     "node-libcurl": "^3.0.0",
     "uglify-js": "^3.17.4",
     "ping": "^0.4.4",
-    "undici": "^6.14.0",
+    "undici": "^5.25.2",
     "express-rate-limit": "^7.0.2",
     "toobusy-js": "^0.5.1",
     "quick.db": "^7.1.3",
     "activitypub-express": "^4.4.1",
     "duck-duck-scrape": "^2.2.5",
     "google-it": "^1.6.4",
-     "youtubei.js": "^13.4.0"
+     "youtubei.js": "^9.2.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": "16.x"
   },
   "repository": {
     "url": "https://codeberg.org/Ashley/poketube"

server.js

@@ -32,19 +32,9 @@
   const media_proxy = require("./src/libpoketube/libpoketube-video.js");
   const { sinit } = require("./src/libpoketube/init/superinit.js");
   const innertube = require("./src/libpoketube/libpoketube-youtubei-objects.json");
-  const fs = require("fs");
+  
   const config = require("./config.json");
   const u = await media_proxy();
-
-  fs.readFile("ascii_txt.txt", "utf8", (err, data) => {
-    if (err) {
-      console.error("Error reading the file:", err);
-      return;
-    }
-
-    // Log the ASCII art to the console
-    console.log(data);
-  });
   initlog("Loading...");
   initlog(
     "[Welcome] Welcome To Poke - The ultimate privacy app - :3 " +
@@ -75,11 +65,12 @@
   const sha384 = modules.hash;
   const rateLimit = require("express-rate-limit");
 
-const limiter = rateLimit({
-    windowMs: 30 * 1000, // 30 second window
-    max: 200, // limit each IP to 200 requests per 30 seconds
-});
 
+   const limiter = rateLimit({
+     windowMs:45 * 1000, // 45 Seconds
+     max: 886, // limit each IP to 866 requests per windowMs
+   });
+   
   var app = modules.express();
   app.use(limiter);
   initlog("Loaded express.js");
@@ -88,7 +79,7 @@ const limiter = rateLimit({
   app.use(modules.useragent.express());
   app.use(modules.express.json()); // for parsing application/json
   app.enable("trust proxy");
-  var toobusy = require("toobusy-js");
+  var toobusy = require('toobusy-js')
 
   const renderTemplate = async (res, req, template, data = {}) => {
     res.render(
@@ -96,132 +87,38 @@ const limiter = rateLimit({
       Object.assign(data)
     );
   };
+  
+ // Set check interval to a faster value. This will catch more latency spikes
+// but may cause the check to be too sensitive.
+toobusy.interval(110);
 
-  // Set check interval to a faster value. This will catch more latency spikes
+toobusy.maxLag(3500);
-  // but may cause the check to be too sensitive.
+  
-  toobusy.interval(110);
+  app.use(function(req, res, next) {
-
+  if (toobusy()) {
-  toobusy.maxLag(3500);
+    res.send(503, "I'm busy right now, sorry.");
-
+  } else {
-  app.use(function (req, res, next) {
+    next();
-    if (toobusy()) {
+  }
-      res.send(503, "I'm busy right now, sorry.");
+});
-    } else {
+  
-      next();
+  toobusy.onLag(function(currentLag) {
-    }
+  process.exit(1);
-  });
+  console.log("Event loop lag detected! Latency: " + currentLag + "ms");
-
+});
-  toobusy.onLag(function (currentLag) {
+  
-    process.exit(1);
-    console.log("Event loop lag detected! Latency: " + currentLag + "ms");
-  });
 
   const random_words = [
-        "Woke!",
+    "banana pie",
-     "Gay gay homosexaul gay!",
+    "how to buy an atom bomb",
-     "free Palestine!",
+    "is love just an illusion",
-     "free software!",
+    "things to do if ur face becomes benjamin frenklin",
-     "im... stuff!",
+    "how do defeat an pasta",
-     "frick capitalism!",
+    "can you go to space?",
-     "still calling it twitter btw!",
+    "how to become a god?",
-    "boop!",
+    "is a panda a panda if pandas???",
-    "no way!",
+    "Minecraft movie trailer",
-    "traaaa rightssss!",
+    "monke",
-    "XD!",
-    "nya!",
-    "say gex!",
-    "ur valid :3",
-    "gay space communism!",
-    "doesnt have AI!",
-    "no web3!",
-    "keemstar is a bald ___!",
-    "No One calls it 'X'! ",
-    "Eat the rich!",
-    "Does Not include Nazis!",
-    "also try piped!",
-    "not alt-right!",
-    "coke zero > coke classic!",
-    "poke & chill!",
-    "can play HD!",
-    "also try invidious!",
-    "also try vencord!",
-    "rms <3!",
-    "du hast",
-    "can u belive no one bought this?",
-    "reee",
-    "1.000.000€!",
-    "pika!",
-    "fsf.org",
-    "ssfffssfssfffaassssfsdf!",
-    "they not like us!",
-    "to pimp a butterfly!",
-    "king kunta!",
-    "HUMBLE.",
-    "can you save my hds?",
-    "sahlo folina!",
-    "we come for you!",
-    "no chances!",
-    "dema dont control us!",
-    "i see your problem is, your proctologist",
-    "got both hands on your shoulder",
-    "while ur bottomless!",
-    "you should bounce bounce bounce man!",
-    "its lavish!",
-    "im vibin, vibin!",
-    "i would swim the paladin strait",
-    "hello clancy!",
-    "NO NOT ME,ITS FOR A FRIEND",
-    "im fairly local!",
-    "i dont wanna go like this!",
-    "east is up!",
-    "not done, josh dun!",
-    "your the judge, oh no!",
-    "I dont wanna backslide",
-    "welcome back to trench!",
-    "sai is propaganda!",
-    " •|i|• Ø i+! ].[",
-    "stay alive! |-/",
-    "the few, the proud, the Emotional!",
-    "ill morph into someone else",
-    "still alive",
-    "follow the torches",
-    "i created this world!",
-    "to feel some control!",
-    "destory it if i want!",
-    "o7 keons",
-    "at least let me clean my room",
-    "100+ stars on gh!",
-    "let the vibe slide over me!",
-    "sip a capri sun like its don peregon",
-    "now even gayer!",
-    "its joever..",
-    "lesbiam,,,",
-    "poke!!!",
-    "discord.poketube.fun!",
-    "women are pretty!",
-    "men are handsome!",
-    "enbys are cute!",
-    "you are cute :3",
-    "read if cute!",
-    "this shit awesome!",
-    "ur pawsome!",
-    "meows at u",
-    "hai i am gay",
-    "yay, GEX!",
-    "say gex..,,",
-    "wha if we um erm",
-    "turkey is literally 1984!",
-    "turkey is literally 1984!",
-    "turkey is literally 1984!",
-    "turkey is literally 1984!",
-    "turkey is literally 1984!",
-    "turkey is literally 1984!",
-    "awesome screen!",
-    "awesome camera!",
-    "long lasting battery life",
-    "stallmansupport.org!!!",
-    "does include nya~!!!",
-    "actually stable! :3",
   ];
 
   const initPokeTube = function () {
@@ -243,8 +140,8 @@ const limiter = rateLimit({
       res.header("secure-poketube-instance", "1");
 
       // opt out of googles "FLOC" bullcrap :p See https://spreadprivacy.com/block-floc-with-duckduckgo/
-      res.header("Permissions-Policy", "interest-cohort=()");
+      res.header("Permissions-Policy", "interest-cohort=()")
-      res.header("software-name", "poke");
+      res.header("software-name", "poke")
       next();
     });
 
@@ -265,25 +162,10 @@ const limiter = rateLimit({
     });
 
     app.use(function (req, res, next) {
-   const random = random_words[Math.floor(Math.random() * random_words.length)];
+      res.header("X-PokeTube-Youtube-Client-Name", innertube.innertube.CONTEXT_CLIENT.INNERTUBE_CONTEXT_CLIENT_NAME);
-
+      res.header("Hey-there", "Do u wanna help poke? contributons are welcome :3 https://codeberg.org/Ashley/poke")
-      res.header(
+      res.header("X-PokeTube-Youtube-Client-Version", innertube.innertube.CLIENT.clientVersion);
-        "X-PokeTube-Youtube-Client-Name",
+      res.header("X-PokeTube-Client-name", innertube.innertube.CLIENT.projectClientName);
-        innertube.innertube.CONTEXT_CLIENT.INNERTUBE_CONTEXT_CLIENT_NAME
-      );
-      res.header(
-        "Hey-there",
-        "Do u wanna help poke? contributions are welcome :3 https://codeberg.org/Ashley/poke"
-      );
-     
-      res.header(
-        "X-PokeTube-Youtube-Client-Version",
-        innertube.innertube.CLIENT.clientVersion
-      );
-      res.header(
-        "X-PokeTube-Client-name",
-        innertube.innertube.CLIENT.projectClientName
-      );
       res.header("X-PokeTube-Speeder", "3 seconds no cache, 280ms w/cache");
       res.header("X-HOSTNAME", req.hostname);
       if (req.url.match(/^\/(css|js|img|font)\/.+/)) {
@@ -295,7 +177,7 @@ const limiter = rateLimit({
       }
 
       const a = 890;
-
+      
       if (!req.url.match(/^\/(css|js|img|font)\/.+/)) {
         res.setHeader("Cache-Control", "public, max-age=" + a); // cache header
         res.setHeader("poketube-cacher", "PAGE");

src/libpoketube/init/pages-404-and-main.js

@@ -23,114 +23,43 @@ var ping = require("ping");
 
 const sha384 = modules.hash;
 
+
 const splash = [
-  "Woke!",
+     "Woke!",
-  "Gay gay homosexaul gay!",
+     "Gay gay homosexaul gay!",
-  "free Palestine!",
+     "free Palestine!",
-  "free software!",
+     "free software!",
-  "im... stuff!",
+     "im... stuff!",
-  "frick capitalism!",
+     "frick capitalism!",
-  "still calling it twitter btw!",
+     "still calling it twitter btw!",
-  "boop!",
+    "boop!",
-  "no way!",
+    "no way!",
-  "traaaa rightssss!",
+    "traaaa rightssss!",
-  "XD!",
+    "XD!",
-  "nya!",
+    "nya!",
-  "say gex!",
+    "say gex!",
-  "ur valid :3",
+    "also try invidious!",
-  "gay space communism!",
+    "rms <3!",
-  "doesnt have AI!",
+    "du hast",
-  "no web3!",
+    "can u belive no one bought this?",
-  "keemstar is a bald ___!",
+    "reee",
-  "No One calls it 'X'! ",
+    "1.000.000€!",
-  "Eat the rich!",
+    "pika!",
-  "Does Not include Nazis!",
+    "fsf.org",
-  "also try piped!",
+    "ssfffssfssfffaassssfsdf!",
-  "not alt-right!",
+    "100+ stars on gh!",
-  "coke zero > coke classic!",
+    "now even gayer!",
-  "poke & chill!",
+    "poketube!!!",
-  "can play HD!",
+    "rvlt.gg/poke!",
-  "also try invidious!",
+    "women are pretty!",
-  "also try vencord!",
+    "men are handsome!",
-  "rms <3!",
+    "enbys are cute!",
-  "du hast",
+    "you are cute :3",
-  "can u belive no one bought this?",
+    "stallmansupport.org!!!"
-  "reee",
+]
-  "1.000.000€!",
+
-  "pika!",
+
-  "fsf.org",
+
-  "ssfffssfssfffaassssfsdf!",
-  "𝓯𝓻𝓮𝓪𝓴𝔂poke",
-  "they not like us!",
-  "to pimp a butterfly!",
-  "king kunta!",
-  "HUMBLE.",
-  "can you save my hds?",
-  "sahlo folina!",
-  "we come for you!",
-  "no chances!",
-  "dema dont control us!",
-  "i see your problem is, your proctologist",
-  "got both hands on your shoulder",
-  "while ur bottomless!",
-  "you should bounce bounce bounce man!",
-  "its lavish!",
-  "im vibin, vibin!",
-  "i would swim the paladin strait",
-  "hello clancy!",
-  "NO NOT ME,ITS FOR A FRIEND",
-  "im fairly local!",
-  "i dont wanna go like this!",
-  "east is up!",
-  "not done, josh dun!",
-  "your the judge, oh no!",
-  "I dont wanna backslide",
-  "welcome back to trench!",
-  "sai is propaganda!",
-  " •|i|• Ø i+! ].[",
-  "stay alive! |-/",
-  "the few, the proud, the Emotional!",
-  "ill morph into someone else",
-  "still alive",
-  "follow the torches",
-  "i created this world!",
-  "to feel some control!",
-  "destory it if i want!",
-  "o7 keons",
-  "at least let me clean my room",
-  "100+ stars on gh!",
-  "let the vibe slide over me!",
-  "sip a capri sun like its don peregon",
-  "now even gayer!",
-  "its joever..",
-  "lesbiam,,,",
-  "poke!!!",
-  "discord.poketube.fun!",
-  "women are pretty!",
-  "men are handsome!",
-  "enbys are cute!",
-  "you are cute :3",
-  "read if cute!",
-  "this shit awesome!",
-  "ur pawsome!",
-  "meows at u",
-  "hai i am gay",
-  "yay, GEX!",
-  "say gex..,,",
-  "wha if we um erm",
-  "turkey is literally 1984!",
-  "turkey is literally 1984!",
-  "turkey is literally 1984!",
-  "turkey is literally 1984!",
-  "turkey is literally 1984!",
-  "turkey is literally 1984!",
-  "awesome screen!",
-  "awesome camera!",
-  "long lasting battery life",
-  "stallmansupport.org!!!",
-  "does include nya~!!!",
-  "actually stable! :3",
-];
 
 function getJson(str) {
   try {
@@ -142,23 +71,20 @@ function getJson(str) {
 
 module.exports = function (app, config, renderTemplate) {
   app.get("/app", async function (req, res) {
-    const { fetch } = await import("undici");
+   const { fetch } = await import("undici");
 
     let tab = "";
     if (req.query.tab) {
       tab = `/?type=${capitalizeFirstLetter(req.query.tab)}`;
     }
 
-    const invtrend = await fetch(`${config.invapi}/trending${tab}`, {
+    const invtrend = await fetch(
-      headers: { "User-Agent": config.useragent },
+      `${config.invapi}/trending${tab}`
-    });
+    );
     const t = getJson(await invtrend.text());
 
     const invpopular = await fetch(
-      `https://invid-api.poketube.fun/bHj665PpYhUdPWuKPfZuQGoX/api/v1/popular`,
+      `https://invid-api.poketube.fun/api/v1/popular`
-      {
-        headers: { "User-Agent": config.useragent },
-      }
     );
     const p = getJson(await invpopular.text());
 
@@ -189,15 +115,7 @@ module.exports = function (app, config, renderTemplate) {
     const uaos = req.useragent.os;
     const random = splash[Math.floor(Math.random() * splash.length)];
     const browser = req.useragent.browser;
-    const isOldWindows =
+    const isOldWindows = (uaos === "Windows 7" || uaos === "Windows 8") && browser === "Firefox";
-      (uaos === "Windows 7" || uaos === "Windows 8") &&
-      browser === "Firefox";
-    var proxyurl = config.p_url;
-
-    const secure = ["poketube.fun", "localhost"].includes(req.hostname);
-    const verify = ["poketube.fun", "poke.ashley0143.xyz", "localhost"].includes(
-      req.hostname
-    );
 
     const rendermainpage = () => {
       if (req.useragent.isMobile) {
@@ -205,14 +123,8 @@ module.exports = function (app, config, renderTemplate) {
       }
 
       return renderTemplate(res, req, "landing.ejs", {
-        secure,
-        embedtype: req.query.embedtype,
-        banner: config.banner,
-        DisablePokeChan: req.query.DisablePokeChan,
-        verify,
         isOldWindows,
-        proxyurl,
+        random
-        random,
       });
     };
 
@@ -221,14 +133,13 @@ module.exports = function (app, config, renderTemplate) {
       if (isvld && req.params.v.length >= 10) {
         return res.redirect(`/watch?v=${req.params.v}`);
       } else {
-        res.status(404);
+          return renderTemplate(res, req, "404.ejs", {
-        return renderTemplate(res, req, "404.ejs", {
+        isOldWindows,
-          isOldWindows,
+        random
-          random,
+      });
-        });
       }
     }
 
     return rendermainpage();
   });
-};
+};

src/libpoketube/init/pages-account.js

@@ -1,5 +1,22 @@
-const { modules } = require("../libpoketube-initsys.js");
+const {
-
+  fetcher,
+  core,
+  wiki,
+  musicInfo,
+  modules,
+  version,
+  initlog,
+  init,
+} = require("../libpoketube-initsys.js");
+const {
+  IsJsonString,
+  convert,
+  getFirstLine,
+  capitalizeFirstLetter,
+  turntomins,
+  getRandomInt,
+  getRandomArbitrary,
+} = require("../ptutils/libpt-coreutils.js");
 
 var http = require("https");
 var ping = require("ping");
@@ -53,17 +70,17 @@ app.get("/api/set-channel-subs", async function (req, res) {
             channelName: channelToSubName,
             avatar: avatar, // Store the avatar URL along with the subscription
         });
-        res.redirect("/account-create")
+        res.json("user subbed");
     } else if (!db.get(`user.${userid}.subs.${channelToSub}`)) {
         // If the user has 'subs' but not this particular subscription, add it
         db.set(`user.${userid}.subs.${channelToSub}`, {
             channelName: channelToSubName,
             avatar: avatar, // Store the avatar URL along with the subscription
         });
-        res.redirect("/account-create")
+        res.json("user subbed");
     } else {
         // If the user is already subscribed to this channel, send a message indicating so
-        res.json("ur already subscribed");
+        res.json("user already subscribed");
     }
 });
 
@@ -87,17 +104,10 @@ app.get("/account-create", async function (req, res) {
     }
 });
 
-app.get("/my-acc", async function (req, res) {
+  app.get("/my-acc", async function (req, res) {
-    var userid = req.query.ID;
+        var userid = req.query.ID
+       var userSubs =  db.get(`user.${userid}.subs`)
+       renderTemplate(res, req, "account-me.ejs", { userid, userSubs });
 
-    // Check if userid is more than 7 characters
-    if (userid.length > 7) {
-        return res.status(400).json({ error: "IDs can be 7 characters max silly :3" });
-    }
-
-    var userSubs =  db.get(`user.${userid}.subs`);
-
-    renderTemplate(res, req, "account-me.ejs", { userid, userSubs });
 });
-
 };

src/libpoketube/init/pages-api.js

@@ -1,4 +1,22 @@
-const { modules, version } = require("../libpoketube-initsys.js");
+const {
+  fetcher,
+  core,
+  wiki,
+  musicInfo,
+  modules,
+  version,
+  initlog,
+  init,
+} = require("../libpoketube-initsys.js");
+const {
+  IsJsonString,
+  convert,
+  getFirstLine,
+  capitalizeFirstLetter,
+  turntomins,
+  getRandomInt,
+  getRandomArbitrary,
+} = require("../ptutils/libpt-coreutils.js");
 
 function getJson(str) {
   try {
@@ -11,43 +29,46 @@ function getJson(str) {
 const pkg = require("../../../package.json");
 const os = require('os');
 const cnf = require("../../../config.json");
-
-
 const innertube = require("../libpoketube-youtubei-objects.json");
 
-const { execSync } = require('child_process'); // DO NOT ABBRV THIS :SOB:
+const verfull = "v24.2801-JeSsIcA-MAJOR-stable-dev-nonLTS-git-MTcwNjQzMTc0OQ==";
-
+const versmol = "v24.2801-JeSsIcA"
-const verfull = "v25.2705-luna-MAJOR_UPDATE-stable-dev-nonLTS-git-MTc0NTcwNjc4MA==";
-const versmol = "v25.2705-luna";
 const branch = "dev/master";
-const codename = "luna";
+const codename = "jessica";
-const versionnumber = "294";
+const versionnumber = "273";
-const relaseunixdate = "MTc0NTcwNjc4MA==";
+const relaseunixdate = "MTcwNjQzMTc0OQ=="
-const updatequote = "i created this world.....to feel some control...";
+const updatequote = "Empty your cup so that it may be filled; become devoid to gain totality. - Bruce Lee"
+
 
 module.exports = function (app, config, renderTemplate) {
+  app.get("/embed/:v", async function (req, res) {
+    res.send("Disabled until Q1 2024");
+  });
 
-  const headers = {
+  app.get("/admin", async function (req, res) {
-    'User-Agent': config.useragent,  
+     if(req.hostname === "poketube.fun") {
-  };
+      res.redirect("https://console.sudovanilla.com/")
-
+     } else {
+      res.redirect("/sex")
+     }
+  });
+  
   app.get("/vi/:v/:t", async function (req, res) {
-    var url = `https://i.ytimg.com/vi/${req.params.v}/${req.params.t}`;
+    var url = `https://vid.puffyan.us/vi/${req.params.v}/${req.params.t}`
-
+    
-    let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
+       let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
-      headers: headers,
     });
 
     f.body.pipe(res);
+
   });
 
-  app.get("/avatars/:v", async function (req, res) {
+app.get("/avatars/:v", async function (req, res) {
     var url = `https://vid.puffyan.us/ggpht/${req.params.v}`;
 
     let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
-      headers: headers,
     });
 
     f.body.pipe(res);
@@ -58,156 +79,106 @@ module.exports = function (app, config, renderTemplate) {
 
     let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
-      headers: headers,
     });
 
     f.body.pipe(res);
   });
 
+
   app.get("/avatars/ytc/:v", async function (req, res) {
     var url = `https://vid.puffyan.us/ggpht/ytc/${req.params.v.replace("ytc", "")}`;
 
     let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
       method: req.method,
-      headers: headers, 
     });
 
     f.body.pipe(res);
   });
+  
+  
+  app.get("/api/search", async (req, res) => {
+    const query = req.query.query;
+
+    if (!query) {
+      return res.redirect("/");
+    }
+    return res.redirect(`/search?query=${query}`);
+  });
 
   app.get("/api/video/download", async function (req, res) {
     var v = req.query.v;
 
-    var q = "18";
+    var format = "mp4";
+    var q = "22";
     if (req.query.q) q = req.query.q;
 
-    const url = `${config.videourl}/latest_version?id=${v}&itag=${q}&local=true`;
+    if (req.query.f) {
+      var format = "mp3";
+    }
+
+    const url = `https://tube.kuylar.dev/proxy/media/${v}/${q}`;
 
     res.redirect(url);
   });
 
   app.get("/api/subtitles", async (req, res) => {
     const { fetch } = await import("undici");
-
+    
     const id = req.query.v;
     const l = req.query.h;
 
     try {
-      let url = `${config.videourl}/api/v1/captions/${id}?label=${l}`;
+      let url = `https://invid-api.poketube.fun/api/v1/captions/${id}?label=${l}`;
-
-      let f = await fetch(url, {
-        headers: headers, 
-      });
 
+      let f = await fetch(url);
       const body = await f.text();
 
       res.send(body);
     } catch {}
   });
+  
+ 
+app.use("/sb/i/:v/:imagePath/:img", async function (req, res) {
+  const { v, imagePath, img } = req.params;  
+  const { sqp, xywh } = req.query;  
+        const sighMatch = req.url.match(/&sigh=([^&#]+)/);  
+    const sigh = sighMatch ? sighMatch[1] : undefined;
+ 
+ 
+  const url = `https://yt.miruku.cafe/sb/i/${v}/${imagePath}/${img}?sqp=${sqp}&sigh=${sigh}&xywh=${req.query.xywh}`;
 
-  app.get("/api/getEngagementData", async (req, res) => {
+  try {
+    let f = await modules.fetch(url + `?cachefixer=${btoa(Date.now())}`, {
+      method: req.method,
+    });
+
+    f.body.pipe(res);
+    console.log(url)
+  } catch (error) {
+    console.error("Error fetching image:", error);
+    res.status(500).send("Error fetching image");
+  }
+});
+  
+  app.get("/api/storyboards", async (req, res) => {
     const { fetch } = await import("undici");
 
     const id = req.query.v;
+    const l = req.query.h;
 
     try {
-      if (id) {
+        let url = `https://yt.miruku.cafe/api/v1/storyboards/${id}?width=320&height=180`;
-        const apiUrl = `https://ryd-proxy.kavin.rocks/votes/${id}&hash=d0550b6e28c8f93533a569c314d5b4e2`;
 
-        const response = await fetch(apiUrl, {
+        let f = await fetch(url);
-          headers: headers,
+        let body = await f.text();
+
+         body = body.replace(/#xywh=(\d+),(\d+),(\d+),(\d+)/g, (match, x, y, w, h) => {
+            return `&xywh=${x},${y},${w},${h}`;  
         });
 
-        if (response.status === 400) {
+        res.send(body);
-          const error = await response.json();
+    } catch {}
-          return res.status(400).send(error);
+});
-        }
-
-        const engagement = await response.json();
-
-        const likes = parseInt(engagement.likes) || 0;
-        const dislikes = parseInt(engagement.dislikes) || 0;
-        const total = likes + dislikes;
-
-        const likePercentage = total > 0 ? ((likes / total) * 100).toFixed(2) : 0;
-        const dislikePercentage = total > 0 ? ((dislikes / total) * 100).toFixed(2) : 0;
-
-        const getLikePercentageColor = (percentage) => {
-          if (percentage >= 80) {
-            return "green";
-          } else if (percentage >= 50) {
-            return "orange";
-          } else {
-            return "red";
-          }
-        };
-
-        const getDislikePercentageColor = (percentage) => {
-          if (percentage >= 50) {
-            return "red";
-          } else if (percentage >= 20) {
-            return "orange";
-          } else {
-            return "green";
-          }
-        };
-
-        const likeColor = getLikePercentageColor(likePercentage);
-        const dislikeColor = getDislikePercentageColor(dislikePercentage);
-
-        const userScore = (
-          parseFloat(likePercentage) -
-          parseFloat(dislikePercentage) / 2
-        ).toFixed(2);
-
-        const getUserScoreLabel = (score) => {
-          if (score >= 98) {
-            return "Masterpiece Video";
-          } else if (score >= 80) {
-            return "Overwhelmingly Positive";
-          } else if (score >= 60) {
-            return "Positive";
-          } else if (score >= 40) {
-            return "Mixed";
-          } else if (score >= 20) {
-            return "Negative";
-          } else {
-            return "Overwhelmingly Negative";
-          }
-        };
-
-        const userScoreLabel = getUserScoreLabel(userScore);
-        const userScoreColor =
-          userScore >= 80 ? "green" : userScore >= 50 ? "orange" : "red";
-
-        const respon = {
-          like_count: likes,
-          dislike_count: dislikes,
-          rating: engagement.rating,
-          userScore: {
-            label: userScoreLabel,
-            score: userScore,
-            color: userScoreColor,
-          },
-          engagement: {
-            likeColor: likeColor,
-            dislikeColor: dislikeColor,
-            percentage: {
-              likePercentage: `${likePercentage}%`,
-              dislikePercentage: `${dislikePercentage}%`,
-            },
-          },
-          ReturnYouTubeDislikesApiRawResponse: engagement,
-        };
-
-        res.send(respon);
-      } else {
-        res.status(400).json("pls gib ID :3");
-      }
-    } catch (error) {
-      res.status(500).json("whoops (error 500) >~<");
-    }
-  });
 
   app.get("/feeds/videos.xml", async (req, res) => {
     const id = req.query.channel_id;
@@ -216,20 +187,6 @@ module.exports = function (app, config, renderTemplate) {
 
     let f = await modules.fetch(url, {
       method: req.method,
-      headers: headers, // Add headers to the fetch request
-    });
-
-    f.body.pipe(res);
-  });
-
-  app.get("/api/manifest/dash/id/:id", async (req, res) => {
-    const id = req.params.id;
-
-    let url = `https://invid-api.poketube.fun/bHj665PpYhUdPWuKPfZuQGoX/api/manifest/dash/id/${id}`;
-
-    let f = await modules.fetch(url, {
-      method: req.method,
-      headers: headers, 
     });
 
     f.body.pipe(res);
@@ -254,44 +211,29 @@ module.exports = function (app, config, renderTemplate) {
   });
 
   app.get("/api/version.json", async (req, res) => {
-    let latestCommitHash;
-
     const invidious = await modules
-      .fetch("https://invid-api.poketube.fun/bHj665PpYhUdPWuKPfZuQGoX/api/v1/stats", {
+      .fetch("https://invid-api.poketube.fun/api/v1/stats")
-        headers: headers, 
-      })
       .then((res) => res.text())
       .then((txt) => getJson(txt));
-
+       
-    const cpus = os.cpus();
+       const cpus = os.cpus();
-    const totalMemory = os.totalmem() / (1024 * 1024 * 1024);
+       const totalMemory = os.totalmem() / (1024 * 1024 * 1024); 
-    const roundedMemory = totalMemory.toFixed(2);
+       const roundedMemory = totalMemory.toFixed(2); 
-
-    execSync('git rev-list HEAD -n 1 --abbrev-commit', (error, stdout, stderr) => {
-      if (error || stderr) {
-        console.error(`Error executing command: ${error || stderr}`);
-        return;
-      }
-
-      latestCommitHash = stdout.trim();
-    });
-const { useragent, ...configWithoutUA } = cnf;
 
     const response = {
       pt_version: {
-        version: versmol,
+       version:versmol,
-        version_full: verfull,
+       version_full:verfull
-        commit: latestCommitHash,
       },
       branch,
       updatequote,
       relaseunixdate,
       vernum: versionnumber,
       codename,
-      config: configWithoutUA,
+      config:cnf,
-      system: {
+      system:{
-        ram: `${roundedMemory} GB`,
+      ram:`${roundedMemory} GB`,
-        cpu: cpus[0].model,
+      cpu:cpus[0].model,
       },
       packages: {
         libpt: version,
@@ -318,11 +260,9 @@ const { useragent, ...configWithoutUA } = cnf;
     const { fetch } = await import("undici");
 
     try {
-      const url = `https://raw.githubusercontent.com/ashley0143/poke/main/instances.json`;
+      const url = `https://codeberg.org/Ashley/poketube/raw/branch/main/instances.json`;
 
-      let f = await fetch(url, {
+      let f = await fetch(url)
-        headers: headers, 
-      })
         .then((res) => res.text())
         .then((json) => JSON.parse(json));
 

src/libpoketube/init/pages-channel-and-download.js

@@ -57,20 +57,18 @@ const ChannelTabs = {
 };
 
 module.exports = function (app, config, renderTemplate) {
-  app.get("/download", async (req, res) => {
+  app.get("/download", async function (req, res) {
     try {
-      const v = req.query.v;
+      var v = req.query.v;
-
-      const thumbnailUrl = `https://i.ytimg.com/vi/${v}/maxresdefault.jpg`;
-      const colors = await modules.getColors(thumbnailUrl);
-      const color = colors[0].hex();
 
       renderTemplate(res, req, "download.ejs", {
         v,
-        color,
+        color: await modules
+          .getColors(`https://i.ytimg.com/vi/${v}/maxresdefault.jpg`)
+          .then((colors) => colors[0].hex()),
         isMobile: req.useragent.isMobile,
       });
-    } catch (error) {
+    } catch {
       res.redirect("/");
     }
   });
@@ -88,7 +86,7 @@ module.exports = function (app, config, renderTemplate) {
   });
 
   app.get("/search", async (req, res) => {
-    const query = req.query.query ? req.query.query.replace("ohio", "things to do in ohio") : '';
+    const query = req.query.query;
     const tab = req.query.tab;
     const { fetch } = await import("undici");
 
@@ -108,26 +106,15 @@ module.exports = function (app, config, renderTemplate) {
       IsOldWindows = false;
     }
 
-    if (query) {
+    const poketube_universe_value = "poketube_smart_search";
-      let redirectTo = null;
-      let splitParam = ":";
 
-      if (query.includes("youtube.com/watch?v=")) {
+    if (query?.includes("youtube.com/watch?v=")) {
-        redirectTo = "/watch";
+      try {
-        splitParam = "?v=";
+        var videoid = query?.split("v=");
-      } else if (query.includes("channel")) {
-        redirectTo = "/channel?id=";
-      } else if (query.includes("video")) {
-        redirectTo = "/watch?v=";
-      }
 
-      if (redirectTo) {
+        res.redirect("/watch?v=" + videoid[1]);
-        try {
+      } catch {
-          const id = query.split(splitParam)[1];
+        return;
-          res.redirect(`${redirectTo}${splitParam}${id}`);
-        } catch {
-          return;
-        }
       }
     }
 
@@ -135,10 +122,6 @@ module.exports = function (app, config, renderTemplate) {
       res.redirect("https://lite.duckduckgo.com/lite/?q=" + query);
     }
 
-    if (query && query.startsWith("Hey ChatGPT,") && query.length > 2) {
-      res.redirect("https://chatgpt.com/?q=" + query + "- sent using pokeAI features");
-    }
-
     if (!query) {
       return res.redirect("/");
     }
@@ -152,18 +135,13 @@ module.exports = function (app, config, renderTemplate) {
     try {
       const headers = {};
 
-      let searchUrl;
+      const xmlData = await fetch(
-      if (req.query.from === 'hashtag') {
+        `${config.invapi}/search?q=${encodeURIComponent(
-        searchUrl = `${config.invapi}/hashtag/${query}?hl=en-gb`;
+          query
-      } else {
+        )}&page=${encodeURIComponent(
-        searchUrl = `${config.invapi}/search?q=${encodeURIComponent(query)}&page=${encodeURIComponent(continuation)}&date=${date}&type=${type}&duration=${duration}&sort=${sort}&hl=en+gb`;
+          continuation
-      }
+        )}&date=${date}&type=${type}&duration=${duration}&sort=${sort}&hl=en+gb`
-
+      )
-      const xmlData = await fetch(searchUrl, {
-        headers: {
-          'User-Agent': config.useragent,
-        },
-      })
         .then((res) => res.text())
         .then((txt) => getJson(txt));
 
@@ -183,7 +161,7 @@ module.exports = function (app, config, renderTemplate) {
         summary: "",
       });
     } catch (error) {
-      console.log(`Error while searching for '${query}':`, error);
+      console.error(`Error while searching for '${query}':`, error);
       res.redirect("/");
     }
   });
@@ -193,7 +171,70 @@ module.exports = function (app, config, renderTemplate) {
   });
 
   app.get("/web", async (req, res) => {
-    res.redirect("/");
+    const query = req.query.query;
+    const tab = req.query.tab;
+
+    const { fetch } = await import("undici");
+
+    const search = await fetch(
+      `https://librex.uk.to/api.php?q=${query}&p=1&t=0`
+    );
+    const web = getJson(await search.text());
+
+    if (req.query.lucky === "true") {
+      res.redirect("/im-feeling-lucky?query=" + query);
+    }
+    var uaos = req.useragent.os;
+    var IsOldWindows;
+
+    if (uaos == "Windows 7" && req.useragent.browser == "Firefox") {
+      IsOldWindows = true;
+    } else if (uaos == "Windows 8" && req.useragent.browser == "Firefox") {
+      IsOldWindows = true;
+    } else {
+      IsOldWindows = false;
+    }
+
+    const poketube_universe_value = "poketube_smart_search";
+
+    if (query?.includes("youtube.com/watch?v=")) {
+      try {
+        var videoid = query?.split("v=");
+
+        res.redirect("/watch?v=" + videoid[1]);
+      } catch {
+        return;
+      }
+    }
+
+    if (query && query.startsWith("!") && query.length > 2) {
+      res.redirect("https://lite.duckduckgo.com/lite/?q=" + query);
+    }
+
+    if (!query) {
+      return renderTemplate(res, req, "search-web-main.ejs");
+    }
+
+    let continuation = req.query.continuation || "";
+
+    try {
+      const results = Object.entries(web);
+
+      renderTemplate(res, req, "search-web.ejs", {
+        j: "",
+        IsOldWindows,
+        h: "",
+        tab,
+        continuation,
+        isMobile: req.useragent.isMobile,
+        results: results,
+        q: query,
+        summary: "",
+      });
+    } catch (error) {
+      console.error(`Error while searching for '${query}':`, error);
+      res.redirect("/");
+    }
   });
 
   app.get("/channel/", async (req, res) => {
@@ -214,17 +255,12 @@ module.exports = function (app, config, renderTemplate) {
       if (ID.endsWith("@poketube.fun")) {
         ID = ID.slice(0, -"@poketube.fun".length);
       }
-
       const tab = req.query.tab;
       const cache = {};
 
       try {
         // about
-        const bout = await fetch(config.tubeApi + `channel?id=${ID}&tab=about`, {
+        const bout = await fetch(config.tubeApi + `channel?id=${ID}&tab=about`);
-          headers: {
-            'User-Agent': config.useragent,
-          },
-        });
         const h = await bout.text();
         var boutJson = JSON.parse(modules.toJson(h));
       } catch {
@@ -244,11 +280,7 @@ module.exports = function (app, config, renderTemplate) {
 
       const getChannelData = async (url) => {
         try {
-          return await fetch(url, {
+          return await fetch(url)
-            headers: {
-              'User-Agent': config.useragent,
-            },
-          })
             .then((res) => res.text())
             .then((txt) => getJson(txt));
         } catch (error) {
@@ -257,29 +289,25 @@ module.exports = function (app, config, renderTemplate) {
       };
 
       const apiUrl = config.invapi + "/channels/";
-      const channelUrl = `${apiUrl}${ID}/${atob(
+      const channelUrl = `${apiUrl}${atob(
         ChannelTabs.videos
-      )}?sort_by=${sort_by}${continuation}`;
+      )}/${ID}/?sort_by=${sort_by}${continuation}`;
-
       const shortsUrl = `${apiUrl}${ID}/${atob(
         ChannelTabs.shorts
-      )}?sort_by=${sort_by}${continuation}`;
+      )}?sort_by=${sort_by}${continuations}`;
-
       const streamUrl = `${apiUrl}${ID}/${atob(
         ChannelTabs.streams
-      )}?sort_by=${sort_by}${continuation}`;
+      )}?sort_by=${sort_by}${continuationl}`;
-
+      const communityUrl = `${apiUrl}${atob(
-      const communityUrl = `${apiUrl}${ID}/${atob(
         ChannelTabs.community
-      )}?hl=en-US`;
+      )}/${ID}/?hl=en-US`;
-
+      const PlaylistUrl = `${apiUrl}${atob(
-      const PlaylistUrl = `${apiUrl}${ID}/${atob(
         ChannelTabs.playlist
-      )}?hl=en-US`;
+      )}/${ID}/?hl=en-US`;
 
       const channelINVUrl = `${apiUrl}${ID}/`;
-
+      const checkPronoun = async (id) => (await (await fetch('https://codeberg.org/ashley/poke-pronouns-db/raw/branch/main/pronouns.json')).json())[id] || `no pronouns set`;
-      const pronoun = "no pronouns :c";
+      const pronoun = await checkPronoun(ID);
 
       var [tj, shorts, playlist, stream, c, cinv] = await Promise.all([
         getChannelData(channelUrl),
@@ -290,19 +318,6 @@ module.exports = function (app, config, renderTemplate) {
         getChannelData(channelINVUrl),
       ]);
 
-      var bannedchannels = ["UC1okSIA8UEY8OqvtjGHFvzA", "UClsVg5LkK2COQRo1mVS4taA", "UCIr4vkCsn0tdTW2xZ1jRG1g"];
-      var bypassQuery = "cG9rZXR1YmVjaGFubmVsYnlwYXNzbG9scGVvcGxldGhpbmt0aGlzaXNjZW5zb3JzaGlwLTQ1OTBh";
-
-      var bypassExists = req.query.bypass === bypassQuery;
-      var tabExists = 'tab' in req.query;
-      var continuationExists = 'continuation' in req.query;
-
-      if (bannedchannels.some(channel => channel === ID) && !bypassExists && !tabExists && !continuationExists) {
-        var cinv = {
-          error: `this channel may include disinformation. If you still wanna view content <a href="/channel?id=${ID}&bypass=${bypassQuery}">click here</a> to bypass this restriction.`
-        };
-      }
-
       function getThumbnailUrl(video) {
         const maxresDefaultThumbnail = video.videoThumbnails.find(
           (thumbnail) => thumbnail.quality === "maxresdefault"
@@ -331,7 +346,7 @@ module.exports = function (app, config, renderTemplate) {
         var { tj, shorts, stream, c, boutJson } = cache[ID].result;
       }
 
-      const subscribers = convert(cinv?.subCount || 0);
+      const subscribers = boutJson.Channel?.Metadata.Subscribers;
       const about = boutJson?.Channel?.Contents?.ItemSection?.About;
       const description = about?.Description.toString().replace(
         /\n/g,
@@ -339,16 +354,10 @@ module.exports = function (app, config, renderTemplate) {
       );
       const dnoreplace = about?.Description.toString();
 
-      let ChannelFirstVideoObject = {
-        subCountText: "0",
-        authorVerified: false,
-      };
-
       renderTemplate(res, req, "channel.ejs", {
         ID,
         tab,
         shorts,
-        firstVideo: ChannelFirstVideoObject,
         j: boutJson,
         sort: sort_by,
         stream,
@@ -367,9 +376,10 @@ module.exports = function (app, config, renderTemplate) {
         isMobile: req.useragent.isMobile,
         about,
         playlist,
-        subs: typeof subscribers === "string"
+        subs:
-          ? subscribers.replace("subscribers", "")
+          typeof subscribers === "string"
-          : "None",
+            ? subscribers.replace("subscribers", "")
+            : "None",
         desc: dnoreplace === "[object Object]" ? "" : description,
       });
     } catch (error) {

src/libpoketube/init/pages-redir.js

@@ -66,7 +66,7 @@ module.exports = function (app, config, renderTemplate) {
   });
 
   app.get("/gaming", (req, res) => {
-    res.redirect("/app?tab=gaming");
+    res.redirect("/discover?tab=gaming");
   });
 
   app.get("/custom-theme", (req, res) => {

src/libpoketube/init/pages-static.js

@@ -82,24 +82,24 @@ module.exports = function (app, config, renderTemplate) {
     renderTemplate(res, req, "rewind.ejs");
   });
 
-app.get("/notepad", function (req, res) {
-    renderTemplate(res, req, "pokepad.ejs");
-  });
-
   app.get("/translate", async function (req, res) {
     const { fetch } = await import("undici");
 
     const api_url = "https://simplytranslate.org/api/translate";
 
-     const translationResponse = await fetch(
+    // Fetch translation data
+    const translationResponse = await fetch(
       `${api_url}?from=${req.query.from_language}&to=${req.query.to_language}&text=${req.query.input}&engine=google`
     );
 
-     const translationData = await translationResponse.json();
+    // Check if the request was successful (status code 200)
+    const translationData = await translationResponse.json();
 
-     const translatedText = translationData.translated_text;
+    // Extract translated_text from the response
+    const translatedText = translationData.translated_text;
 
-     renderTemplate(res, req, "translate.ejs", {
+    // Render the template with the translated text
+    renderTemplate(res, req, "translate.ejs", {
       translation: translatedText,
       text: req.query.input || "enter text here",
       from_language: req.query.from_language,
@@ -115,22 +115,27 @@ app.get("/notepad", function (req, res) {
   app.get("/apps", function (req, res) {
     renderTemplate(res, req, "apps.ejs");
   });
+  app.get("/playlist", async function (req, res) {
+    const { fetch } = await import("undici");
+    if (!req.query.list) res.redirect("/");
+    if (req.useragent.isMobile) res.redirect("/");
 
-  const headers = { "User-Agent": config.useragent };
+    const playlist = await fetch(
+      `${config.invapi}/playlists/${req.query.list}?hl=en-us`
+    );
 
-app.get("/playlist", async function (req, res) {
+    const p = getJson(await playlist.text());
-  if (!req.query.list) res.redirect("/");
+    var mediaproxy = config.media_proxy;
-  if (req.useragent.isMobile) res.redirect("/");
-  const playlist = await fetch(`${config.invapi}/playlists/${req.query.list}?hl=en-us`, { headers });
-  const p = getJson(await playlist.text());
-  var mediaproxy = config.media_proxy;
-  if (req.useragent.source.includes("Pardus")) {
-    mediaproxy = "https://media-proxy.ashley0143.xyz";
-  }
-  renderTemplate(res, req, "playlist.ejs", { p, mediaproxy });
-});
 
+    if (req.useragent.source.includes("Pardus")) {
+      var mediaproxy = "https://media-proxy.ashley0143.xyz";
+    }
 
+    renderTemplate(res, req, "playlist.ejs", {
+      p,
+      mediaproxy,
+    });
+  });
 
   app.get("/license", function (req, res) {
     renderTemplate(res, req, "license.ejs");
@@ -148,56 +153,6 @@ app.get("/playlist", async function (req, res) {
     renderTemplate(res, req, "content-settings.ejs");
   });
 
-
- function gregorianToIslamic(gDate) {
-  const jd = Math.floor((gDate - new Date(1970, 0, 1)) / (24 * 60 * 60 * 1000)) + 2440588;
-  const islamicYear = Math.floor((30 * (jd - 1948440) + 10646) / 10631);
-  return islamicYear;
-}
-
- function gregorianToPersian(gDate) {
-  const persianEpoch = 226895; // Julian Day of Persian Epoch
-  const jd = Math.floor((gDate - new Date(1970, 0, 1)) / (24 * 60 * 60 * 1000)) + 2440588;
-  const persianYear = Math.floor((jd - persianEpoch) / 365.2421985) + 1;
-  return persianYear;
-}
-
-app.get('/calendar', (req, res) => {
-  // Get the date from query or default to today
-  const queryDate = req.query.date ? new Date(req.query.date) : new Date();
-
-  // Extract the year and month from the date
-  const year = queryDate.getFullYear();
-  const month = queryDate.getMonth(); // 0 (January) to 11 (December)
-
-  const monthOffset = parseInt(req.query.month) || 0; 
-  const newDate = new Date(year, month + monthOffset, 1); 
-  const newYear = newDate.getFullYear();
-  const newMonth = newDate.getMonth();
-
-  const firstDay = new Date(newYear, newMonth, 1);
-  const firstDayWeekday = firstDay.getDay(); // Day of the week (0-6)
-
-  const days = Array.from({ length: 42 }, (_, i) => {
-    const day = new Date(newYear, newMonth, i - firstDayWeekday + 1);
-    return (day.getMonth() === newMonth) ? day : null;
-  });
-
-  const islamicYear = gregorianToIslamic(newDate);
-  const persianYear = gregorianToPersian(newDate);
-
-  renderTemplate(res, req, "calendar.ejs", {
-     year: newYear,
-    islamicYear,
-    persianYear,
-    currentDate: newDate,
-    days,
-    month: newMonth,
-    queryDate,
-  });
-});
-
-
   app.get("/offline", function (req, res) {
     res.sendFile("offline.html", { root: location_pwa });
   });
@@ -255,20 +210,11 @@ app.get('/calendar', (req, res) => {
     }
   });
 
-app.get("/game-hub", function (req, res) {
+  app.get("/game-hub", function (req, res) {
-  var gameslist = ["pong", "tic-tac-toe", "sudoku", "snake", "breakout", "minesweeper"];
+    renderTemplate(res, req, "gamehub.ejs", {
-  var requestedGame = req.query.game;
+      game: req.query.game,
-
+    });
-  if (req.query.game && !gameslist.includes(requestedGame)) {
-    return renderTemplate(res, req, "404.ejs");
-  }
-
-  renderTemplate(res, req, "gamehub.ejs", {
-    game: requestedGame,
   });
-});
-
-
   app.get("/static/:id", (req, res) => {
     const id = req.params.id;
 

src/libpoketube/init/pages-video.js

@@ -141,8 +141,8 @@ function lightOrDark(color) {
 }
 
 function isDntEnabled(req) {
-  const dntHeader = req.header("DNT");
+  const dntHeader = req.header('DNT');
-  return dntHeader && (dntHeader === "1" || dntHeader === "true");
+  return dntHeader && (dntHeader === '1' || dntHeader === 'true');
 }
 
 function IsInArray(array, id) {
@@ -164,18 +164,11 @@ function getJson(str) {
 const PATREON_REGEX = /https:\/\/(?:www\.)?patreon.com\/(?<name>[\w\d_-]+)/;
 
 /* connections */
-const TWITTER_REGEX = /https:\/\/twitter.com\/(?<name>[\w\d_-]+)/;
+const X_REGEX = /https:\/\/twitter.com\/(?<name>[\w\d_-]+)/;
 const CORD_REGEX = /https:\/\/discord.gg\/(?<name>[\w\d_-]+)/;
 const TWITCH_REGEX = /https:\/\/twitch.tv\/(?<name>[\w\d_-]+)/;
 const REDDIT_REGEX = /https:\/\/reddit\.com\/r\/(?<name>[\w\d_-]+)/;
-
-/* meta software */
 const INSTAGRAM_REGEX = /https:\/\/www.instagram.com\/(?<name>[\w\d_-]+)/;
-const THREADS_BY_INSTAGRAM_REGEX = /https:\/\/www.threads.net\/(?<name>[\w\d_-]+)/;
-const FACEBOOK_REGEX = /https:\/\/www.facebook.com\/(?<name>[\w\d_-]+)/;
-
-/* music */
-const LNKTO_REGEX = /https:\/\/(?<subdomain>\w+).lnk.to\/(?<path>\S*)/;
 
 module.exports = function (app, config, renderTemplate) {
   app.get("/encryption", async function (req, res) {
@@ -191,19 +184,12 @@ 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("/");
     }
 
-    const regex = new RegExp("^([a-zA-Z0-9_-]{11})");
-    const isMatch = regex.test(v);
-
-    if (!isMatch) {
-      return res.redirect("/");
-    }
-
     var contentlang = hl || "en-US";
     var contentregion = region || "US";
 
@@ -216,184 +202,153 @@ module.exports = function (app, config, renderTemplate) {
 
     const secure = ["poketube.fun"].includes(req.hostname);
     const verify = req.hostname === "poketube.sudovanilla.com";
-
     
-    INNERTUBE.getYouTubeApiVideo(f, v, contentlang, contentregion).then(
+    INNERTUBE.getYouTubeApiVideo(f, v, contentlang, contentregion).then((data) => {
-      (data) => {
+      try {
-        try {
+        const k = data?.video;
-          const k = data?.video;
+        const channel_uploads = data?.channel_uploads
-          const channel_uploads = data?.channel_uploads;
+        const json = data?.json;
-          const json = data?.json;
+        const engagement = data?.engagement;
-          const engagement = data?.engagement;
+        const inv_comments = data?.comments || "Disabled";
-          const inv_comments = data?.comments || "Disabled";
+        const inv_vid = data?.vid;
-          const inv_vid = data?.vid;
+        const desc = data?.desc || "";
-          const desc = data?.desc || "";
-
- 
-          let d = false;
-          if (desc !== "[object Object]") {
-            d = desc.toString().replace(/\n/g, " <br> ");
-          }
-
-          const descriptionString = String(inv_vid?.description).replace(/\bx.com\b/, "twitter.com")
-
-          function extractInfo(regex) {
-            return descriptionString !== "[object Object]"
-              ? (regex.exec(descriptionString) ?? {}).groups
-              : undefined;
-          }
-
-          const support = extractInfo(PATREON_REGEX);
-          const STUPID_ELON_MUSK_WEBSITE_HE_IS_TRYING_TO_CALL_IT_X_FOR_SOME_REASON_WHICH_IS_A_STUPID_NAME_WE_WILL_FOREVER_CALL_IT_TWITTER_AND_HE_CAN_DO_NOTHING_ABOUT_IT_LOL_FUCK_YOU_ELON_TRANS_RIGHTS_BTW = extractInfo(TWITTER_REGEX);
-          const linkto = extractInfo(LNKTO_REGEX);
-          const discord = extractInfo(CORD_REGEX);
-          const twitch = extractInfo(TWITCH_REGEX);
-          const reddit = extractInfo(REDDIT_REGEX);
-          
-          /* meta software */
-          const instagram = extractInfo(INSTAGRAM_REGEX);
-          const threads_by_instagram = extractInfo(THREADS_BY_INSTAGRAM_REGEX);
-
-          const videoObject = inv_vid?.adaptiveFormats;
-          function findItag(adaptiveFormats) {
-          return;
-          }
-          
-          const itag_hd = findItag(videoObject);
-          var proxyurl = config.p_url;
-          var vidurl = u.url;
-          var isvidious = u.isInvidiousURL;
-          var mediaproxy = config.media_proxy;
-
-          if (inv_vid?.genre === "Music") {
-            var vidurl = u.losslessurl;
-          }
-
-          var vidurl = config.videourl;
-          var isvidious = true;
-
-          if (req.useragent.source.includes("Pardus")) {
-            var vidurl = "https://iv.ggtyler.dev";
-            var mediaproxy = "https://nyc1.pokejan.ggtyler.dev/";
-            var isvidious = true;
-            var isSchoolProxy = "";
-          }
-
-          // unused
-          let badges = "";
-          let comments = "";
-          let nnn = "";
-
-          const dnt_val = isDntEnabled(req);
-
-          if (
-            inv_vid?.error ===
-              "The uploader has not made this video available in your country" ||
-            inv_vid?.error === "This video is not available"
-          ) {
-            res.send(
-              "error: " + inv_vid.error + " please refresh the page please qt"
-            );
-          }
-
-          if (inv_vid?.error) {
-            renderTemplate(res, req, "404.ejs", {
-              v,
-            });
-          }
-
-          var uaos = req.useragent.os;
-          const browser = req.useragent.browser;
-          const IsOldWindows =
-            (uaos === "Windows 7" || uaos === "Windows 8") &&
-            browser === "Firefox";
-
-          if (uaos === "Windows XP" || uaos === "Windows Vista")
-            res.redirect("/lite?v=" + req.query.v);
-          
-          if (req.useragent.source.includes("Nintendo WiiU")) 
-            res.redirect("/lite?v=" + req.query.v);
 
+        let d = false;
+        if (desc !== "[object Object]") {
+          d = desc.toString().replace(/\n/g, " <br> ");
+        }
         
 
-          if (req.query.from === "short") var shortsui = true;
+        const descriptionString = String(inv_vid?.description);
 
-          try {
+        function extractInfo(regex) {
-            renderTemplate(res, req, "watch.ejs", {
+          return descriptionString !== "[object Object]"
-              color: data.color,
+            ? (regex.exec(descriptionString) ?? {}).groups
-              color2: data.color2,
+            : undefined;
-              linkify,
-              engagement,
-              linkto,
-              IsOldWindows,
-              channelurlfixer,
-              itag_hd,
-              support,
-              shortsui,
-              u: vidurl,
-              isvidious: isvidious,
-              video: json,
-              date: k.Video.uploadDate,
-              e,
-              a,
-              twitter:STUPID_ELON_MUSK_WEBSITE_HE_IS_TRYING_TO_CALL_IT_X_FOR_SOME_REASON_WHICH_IS_A_STUPID_NAME_WE_WILL_FOREVER_CALL_IT_TWITTER_AND_HE_CAN_DO_NOTHING_ABOUT_IT_LOL_FUCK_YOU_ELON_TRANS_RIGHTS_BTW,
-              k,
-              dm,
-              proxyurl,
-              media_proxy_url: mediaproxy,
-              instagram,
-              useragent: req.useragent,
-              config,
-              verify,
-              discord,
-              turntomins,
-              twitch,
-              dnt_val,
-              reddit,
-              channel_uploads,
-              secure,
-              process,
-              isSchoolProxy,
-              sha384,
-              lightOrDark,
-              isMobile: req.useragent.isMobile,
-              tj: data.channel,
-              r,
-              threads:threads_by_instagram,
-              hostname:req.hostname,
-              qua: q,
-              inv: inv_comments,
-              convert,
-              universe,
-              wiki: data.wiki,
-              escapeHtml,
-              f,
-              t: config.t_url,
-              optout: m,
-              badges,
-              desc,
-              comments,
-              n: nnn,
-              inv_vid,
-              lyrics: "",
-            });
-          } catch (err) {
-              res.status(500); 
-              renderTemplate(res, req, "video-error.ejs", {
-              v,
-              err_reason:err
-            });
-          }
-        } catch (error) {
-          console.error(error);
-          return res.redirect(`/watch?v=${req.query.v}&fx=1&err=${error}`);
         }
+
+        const support = extractInfo(PATREON_REGEX);
+        const twitter = extractInfo(X_REGEX);
+        const discord = extractInfo(CORD_REGEX);
+        const twitch = extractInfo(TWITCH_REGEX);
+        const reddit = extractInfo(REDDIT_REGEX);
+        const instagram = extractInfo(INSTAGRAM_REGEX);
+        
+        
+        var proxyurl = config.p_url;
+        var vidurl = u.url;
+        var isvidious = u.isInvidiousURL;
+        var mediaproxy = config.media_proxy
+        
+        
+        if (inv_vid?.genre === "Music") {
+          var vidurl = u.losslessurl;
+        }
+
+        var vidurl = config.videourl;
+        var isvidious = true;
+
+        if (req.useragent.source.includes("Pardus")) {
+          var vidurl = "https://iv.ggtyler.dev";
+          var mediaproxy = "https://media-proxy.ashley0143.xyz"
+          var isvidious = true;
+          var isSchoolProxy = "";
+        }
+        
+        // unused
+        let badges = "";
+        let comments = "";
+        let nnn = "";
+
+        const dnt_val = isDntEnabled(req)
+        
+        if (
+          inv_vid?.error ===
+            "The uploader has not made this video available in your country" ||
+          inv_vid?.error === "This video is not available"
+        ) {
+          res.send(
+            "error: " + inv_vid.error + " please refresh the page please qt"
+          );
+        }
+
+        var uaos = req.useragent.os;
+        const browser = req.useragent.browser;
+        const IsOldWindows =
+          (uaos === "Windows 7" || uaos === "Windows 8") &&
+          browser === "Firefox";
+
+        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", {
+            color: data.color,
+            color2: data.color2,
+            linkify,
+            engagement,
+            IsOldWindows,
+            channelurlfixer,
+            support,
+            shortsui,
+            u: vidurl,
+            isvidious: isvidious,
+            video: json,
+            date: k.Video.uploadDate,
+            e,
+            a,
+            twitter,
+            k,
+            dm,
+            proxyurl,
+            media_proxy_url: mediaproxy,
+            instagram,
+            useragent: req.useragent,
+            verify,
+            discord,
+            turntomins,
+            twitch,
+            dnt_val,
+            reddit,
+            channel_uploads,
+            secure,
+            process,
+            isSchoolProxy,
+            sha384,
+            lightOrDark,
+            isMobile: req.useragent.isMobile,
+            tj: data.channel,
+            r,
+            qua: q,
+            inv: inv_comments,
+            convert,
+            universe,
+            wiki: data.wiki,
+            escapeHtml,
+            f,
+            t: config.t_url,
+            optout: m,
+            badges,
+            desc,
+            comments,
+            n: nnn,
+            inv_vid,
+            lyrics: "",
+          });
+        } catch {
+          return;
+        }
+      } catch (error) {
+        console.error(error);
+        return res.redirect(`/watch?v=${req.query.v}&fx=1&err=${error}`);
       }
-    );
+    });
   });
 
   app.get("/lite", 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("/");
@@ -411,144 +366,145 @@ module.exports = function (app, config, renderTemplate) {
 
     const secure = ["poketube.fun"].includes(req.hostname);
     const verify = req.hostname === "poketube.sudovanilla.com";
+    
+    INNERTUBE.getYouTubeApiVideo(f, v, contentlang, contentregion).then((data) => {
+      try {
+        const k = data?.video;
+        const channel_uploads = data?.channel_uploads
+        const json = data?.json;
+        const engagement = data?.engagement;
+        const inv_comments = data?.comments || "Disabled";
+        const inv_vid = data?.vid;
+        const desc = data?.desc || "";
 
-    INNERTUBE.getYouTubeApiVideo(f, v, contentlang, contentregion).then(
+        let d = false;
-      (data) => {
+        if (desc !== "[object Object]") {
-        try {
+          d = desc.toString().replace(/\n/g, " <br> ");
-          const k = data?.video;
-          const channel_uploads = data?.channel_uploads;
-          const json = data?.json;
-          const engagement = data?.engagement;
-          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
-              : undefined;
-          }
-
-          const support = extractInfo(PATREON_REGEX);
-          const twitter = extractInfo(TWITTER_REGEX);
-          const discord = extractInfo(CORD_REGEX);
-          const twitch = extractInfo(TWITCH_REGEX);
-          const reddit = extractInfo(REDDIT_REGEX);
-          const instagram = extractInfo(INSTAGRAM_REGEX);
-
-          var proxyurl = config.p_url;
-          var vidurl = u.url;
-          var isvidious = u.isInvidiousURL;
-          var mediaproxy = config.media_proxy;
-
-          if (inv_vid?.genre === "Music") {
-            var vidurl = u.losslessurl;
-          }
-
-          var vidurl = config.videourl;
-          var isvidious = true;
-
-          if (req.useragent.source.includes("Pardus")) {
-            var vidurl = "https://iv.ggtyler.dev";
-            var mediaproxy = "https://media-proxy.ashley0143.xyz";
-            var isvidious = true;
-            var isSchoolProxy = "";
-          }
-
-          // unused
-          let badges = "";
-          let comments = "";
-          let nnn = "";
-
-          const dnt_val = isDntEnabled(req);
-
-          if (
-            inv_vid?.error ===
-              "The uploader has not made this video available in your country" ||
-            inv_vid?.error === "This video is not available"
-          ) {
-            res.send(
-              "error: " + inv_vid.error + " please refresh the page please qt"
-            );
-          }
-
-          var uaos = req.useragent.os;
-          const browser = req.useragent.browser;
-          const IsOldWindows =
-            (uaos === "Windows 7" || uaos === "Windows 8") &&
-            browser === "Firefox";
-
-          if (req.query.from === "short") var shortsui = true;
-
-          try {
-            renderTemplate(res, req, "lite.ejs", {
-              color: data.color,
-              color2: data.color2,
-              linkify,
-              engagement,
-              IsOldWindows,
-              channelurlfixer,
-              support,
-              shortsui,
-              u: vidurl,
-              isvidious: isvidious,
-              video: json,
-              date: k.Video.uploadDate,
-              e,
-              a,
-              twitter,
-              k,
-              dm,
-              proxyurl,
-              media_proxy_url: mediaproxy,
-              instagram,
-              useragent: req.useragent,
-              verify,
-              discord,
-              turntomins,
-              twitch,
-              dnt_val,
-              reddit,
-              channel_uploads,
-              secure,
-              process,
-              isSchoolProxy,
-              sha384,
-              lightOrDark,
-              isMobile: req.useragent.isMobile,
-              tj: data.channel,
-              r,
-              qua: q,
-              inv: inv_comments,
-              convert,
-              universe,
-              wiki: data.wiki,
-              f,
-              t: config.t_url,
-              optout: m,
-              badges,
-              desc,
-              comments,
-              n: nnn,
-              inv_vid,
-              lyrics: "",
-            });
-          } catch {
-            return;
-          }
-        } catch (error) {
-          console.error(error);
-          return res.redirect(`/watch?v=${req.query.v}&fx=1&err=${error}`);
         }
+        
+
+        const descriptionString = String(inv_vid?.description);
+
+        function extractInfo(regex) {
+          return descriptionString !== "[object Object]"
+            ? (regex.exec(descriptionString) ?? {}).groups
+            : undefined;
+        }
+
+        const support = extractInfo(PATREON_REGEX);
+        const twitter = extractInfo(X_REGEX);
+        const discord = extractInfo(CORD_REGEX);
+        const twitch = extractInfo(TWITCH_REGEX);
+        const reddit = extractInfo(REDDIT_REGEX);
+        const instagram = extractInfo(INSTAGRAM_REGEX);
+        
+        
+        var proxyurl = config.p_url;
+        var vidurl = u.url;
+        var isvidious = u.isInvidiousURL;
+        var mediaproxy = config.media_proxy
+        
+        
+        if (inv_vid?.genre === "Music") {
+          var vidurl = u.losslessurl;
+        }
+
+        var vidurl = "https://eu-proxy.poketube.fun";
+        var isvidious = true;
+
+        if (req.useragent.source.includes("Pardus")) {
+          var vidurl = "https://iv.ggtyler.dev";
+          var mediaproxy = "https://media-proxy.ashley0143.xyz"
+          var isvidious = true;
+          var isSchoolProxy = "";
+        }
+        
+        // unused
+        let badges = "";
+        let comments = "";
+        let nnn = "";
+
+        const dnt_val = isDntEnabled(req)
+        
+        if (
+          inv_vid?.error ===
+            "The uploader has not made this video available in your country" ||
+          inv_vid?.error === "This video is not available"
+        ) {
+          res.send(
+            "error: " + inv_vid.error + " please refresh the page please qt"
+          );
+        }
+
+        var uaos = req.useragent.os;
+        const browser = req.useragent.browser;
+        const IsOldWindows =
+          (uaos === "Windows 7" || uaos === "Windows 8") &&
+          browser === "Firefox";
+
+        if (req.query.from === "short") var shortsui = true;
+
+        try {
+          renderTemplate(res, req, "lite.ejs", {
+            color: data.color,
+            color2: data.color2,
+            linkify,
+            engagement,
+            IsOldWindows,
+            channelurlfixer,
+            support,
+            shortsui,
+            u: vidurl,
+            isvidious: isvidious,
+            video: json,
+            date: k.Video.uploadDate,
+            e,
+            a,
+            twitter,
+            k,
+            dm,
+            proxyurl,
+            media_proxy_url: mediaproxy,
+            instagram,
+            useragent: req.useragent,
+            verify,
+            discord,
+            turntomins,
+            twitch,
+            dnt_val,
+            reddit,
+            channel_uploads,
+            secure,
+            process,
+            isSchoolProxy,
+            sha384,
+            lightOrDark,
+            isMobile: req.useragent.isMobile,
+            tj: data.channel,
+            r,
+            qua: q,
+            inv: inv_comments,
+            convert,
+            universe,
+            wiki: data.wiki,
+            f,
+            t: config.t_url,
+            optout: m,
+            badges,
+            desc,
+            comments,
+            n: nnn,
+            inv_vid,
+            lyrics: "",
+          });
+        } catch {
+          return;
+        }
+      } catch (error) {
+        console.error(error);
+        return res.redirect(`/watch?v=${req.query.v}&fx=1&err=${error}`);
       }
-    );
+    });
   });
 
   app.get("/music", async function (req, res) {
@@ -699,4 +655,4 @@ module.exports = function (app, config, renderTemplate) {
       }
     }
   });
-};
+};

src/libpoketube/init/superinit.js

@@ -94,7 +94,7 @@ function init(app, config, rendertemplate) {
           
       }, 100);
     } catch (err) {
-      initlog("[POKE SEGFAULT] Load pages \n" + err);
+      initlog("[FAILED] Load pages \n" + err);
       console.error(err);
     }
   }, 100);

src/libpoketube/libpoketube-core.js

@@ -11,24 +11,37 @@ const { curly } = require("node-libcurl");
 const getdislikes = require("../libpoketube/libpoketube-dislikes.js");
 const getColors = require("get-image-colors");
 const config = require("../../config.json")
+const { Innertube, UniversalCache } = require('youtubei.js');
 
+
+/**
+ * Class representing PokeTube's core functionality.
+ */
 class InnerTubePokeVidious {
+  /**
+   * Create an instance of InnerTubePokeVidious.
+   * @param {object} config - Configuration object for InnerTubePokeVidious.
+   * @param {string} config.tubeApi - Tube API URL.
+   * @param {string} config.invapi - Invid API URL.
+   * @param {string} config.invapi_alt - Invid API URL - ALT .
+   * @param {string} config.dislikes - Dislikes API URL.
+   * @param {string} config.t_url - Matomo URL.
+   */
   constructor(config) {
     this.config = config;
     this.cache = {};
     this.language = "hl=en-US";
-    this.param = "2AMB"
-    this.param_legacy = "CgIIAdgDAQ%3D%3D"
     this.apikey = "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8"
-    this.ANDROID_API_KEY = "AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w"
-    this.ANDROID_APP_VERSION = "20.20.41" // https://www.apkmirror.com/apk/google-inc/youtube/youtube-20-20-41-release/
-    this.ANDROID_VERSION = "16" // https://en.wikipedia.org/wiki/Android_version_history
-    this.useragent = config.useragent || "PokeTube/2.0.0 (GNU/Linux; Android 14; Trisquel 11; poketube-vidious; like FreeTube)"
     this.INNERTUBE_CONTEXT_CLIENT_VERSION = "1"
     this.region = "region=US";
     this.sqp = "-oaymwEbCKgBEF5IVfKriqkDDggBFQAAiEIYAXABwAEG&rs=AOn4CLBy_x4UUHLNDZtJtH0PXeQGoRFTgw";
   }
 
+  /**
+   * Fetch JSON from API response.
+   * @param {string} str - String response from the API.
+   * @returns {object|null} Parsed JSON object or null if parsing failed.
+   */
   getJson(str) {
     try {
       return JSON.parse(str);
@@ -37,68 +50,80 @@ class InnerTubePokeVidious {
     }
   }
 
+  /**
+   * Check if the provided object has the required properties.
+   * @param {object} obj - Object to check.
+   * @returns {boolean} True if the object has the required properties, false otherwise.
+   */
   checkUnexistingObject(obj) {
-    return obj && "authorId" in obj;
+    if (obj) {
+      if ("authorId" in obj) {
+        return true;
+      }
+    }
   }
 
+  /**
+   * Fetch video information.
+   * @param {string} v - Video ID.
+   * @returns {Promise<object>} Promise resolving to the video information.
+   */
   async getYouTubeApiVideo(f, v, contentlang, contentregion) {
+    
     const { fetch } = await import("undici");
+    const yt = await Innertube.create({ cache: new UniversalCache(false), generate_session_locally: true });
 
     if (v == null) return "Gib ID";
 
+    // Check if result is already cached
     if (this.cache[v] && Date.now() - this.cache[v].timestamp < 3600000) {
       return this.cache[v].result;
     }
+    const headers = {};
 
-    const headers = {
+    let desc = "";
-      "User-Agent": this.useragent,
+    
-    };
-
-    const fetchWithRetry = async (url, options = {}, retries = 3) => {
-      for (let attempt = 0; attempt < retries; attempt++) {
-        const res = await fetch(url, {
-          ...options,
-          headers: {
-            ...options.headers,
-            ...headers,
-          }
-        });
-        if (res.status === 500 && attempt < retries - 1) continue;
-        return res;
-      }
-      return null;
-    };
-
     try {
-      const [invComments, videoInfo, videoData] = await Promise.all([
+    const [videoInfo, videoData] = await Promise.all([
-        fetchWithRetry(`${this.config.invapi}/comments/${v}?hl=${contentlang}&region=${contentregion}&h=${btoa(Date.now())}`).then(res => res.text()),
+      fetch(`${this.config.invapi}/videos/${v}?hl=${contentlang}&region=${contentregion}&h=${btoa(Date.now())}`).then((res) => res.text()),
-        fetchWithRetry(`${this.config.invapi}/videos/${v}?hl=${contentlang}&region=${contentregion}&h=${btoa(Date.now())}`).then(res => res.text()),
+      curly
-        curly.get(`${this.config.tubeApi}video?v=${v}`, {
+        .get(`${this.config.tubeApi}video?v=${v}`, {
           httpHeader: Object.entries(headers).map(([k, v]) => `${k}: ${v}`),
-        }).then(res => {
+        })
+        .then((res) => {
           const json = toJson(res.data);
           const video = this.getJson(json);
           return { json, video };
         }),
-      ]);
+    ]);
 
-      const comments = this.getJson(invComments);
+   
-      const vid = this.getJson(videoInfo);
+    const comments = await yt.getComments(v);
-      const { json, video } = videoData;
+  
+    const vid = await this.getJson(videoInfo);
+    const { json, video } = videoData;
 
-      let p = {};
+    var channel_uploads = { };
-      if (f === "true") {
+    if (f == "true") {
-        const uploads = await fetchWithRetry(`${this.config.invapi}/channels/${vid.authorId}?hl=${contentlang}&region=${contentregion}`);
+      channel_uploads = await fetch(
-        p = this.getJson(await uploads.text());
+        `${this.config.invapi}/channels/${vid.authorId}?hl=${contentlang}&region=${contentregion}`
-      }
+      );
+     var p = this.getJson(await channel_uploads.text());
+    }
 
-      if (!vid) {
+    if (!vid) {
-        console.log(`Sorry nya, we couldn't find any information about that video qwq`);
+      console.log(
-      }
+        `Sorry nya, we couldn't find any information about that video qwq`
+      );
+    }
 
-      if (this.checkUnexistingObject(vid)) {
+    if (this.checkUnexistingObject(vid)) {
-        const fe = await getdislikes(v);
+      const fe = await getdislikes(v);
 
+      try {
+        const headers = {};
+
+        // Store result in cache
         this.cache[v] = {
           result: {
             json: json?.video,
@@ -109,38 +134,57 @@ class InnerTubePokeVidious {
             engagement: fe.engagement,
             wiki: "",
             desc: "",
-            color: await getColors(`https://i.ytimg.com/vi/${v}/hqdefault.jpg?sqp=${this.sqp}`).then(colors => colors[0].hex()),
+            color: await getColors(
-            color2: await getColors(`https://i.ytimg.com/vi/${v}/hqdefault.jpg?sqp=${this.sqp}`).then(colors => colors[1].hex()),
+              `https://vid.puffyan.us/vi/${v}/hqdefault.jpg?sqp=${this.sqp}`
+            ).then((colors) => colors[0].hex()),
+            color2: await getColors(
+              `https://vid.puffyan.us/vi/${v}/hqdefault.jpg?sqp=${this.sqp}`
+            ).then((colors) => colors[1].hex()),
           },
           timestamp: Date.now(),
         };
 
         return this.cache[v].result;
+      } catch (error) {
+        this.initError("Error getting video", error);
       }
-    } catch (error) {
-      this.initError("Error getting video", error);
     }
-  }
+    } catch {
+      
+    }
+    }
 
+
+  /**
+   * Check if a video ID is valid.
+   * @param {string} v - Video ID.
+   * @returns {boolean} True if the video ID is valid, false otherwise.
+   */
   isvalidvideo(v) {
     if (v != "assets" && v != "cdn-cgi" && v != "404") {
-      return /^([a-zA-Z0-9_-]{11})/.test(v);
+      return true;
+    } else {
+      return false;
     }
-    return false;
   }
 
+  /**
+   * Initialize an error.
+   * @param {string} args - Error message.
+   * @param {Error} error - Error object.
+   */
   initError(args, error) {
-    console.error("[LIBPT CORE ERROR] " + args, error);
+    console.error("[LIBPT CORE ERROR]" + args, error);
   }
 }
 
+// Create an instance of InnerTubePokeVidious with the provided config
 const pokeTubeApiCore = new InnerTubePokeVidious({
   tubeApi: "https://inner-api.poketube.fun/api/",
-  invapi: "https://invid-api.poketube.fun/bHj665PpYhUdPWuKPfZuQGoX/api/v1",
+  invapi: "https://invid-api.poketube.fun/api/v1",
   invapi_alt: config.proxylocation === "EU" ? "https://invid-api.poketube.fun/api/v1" : "https://iv.ggtyler.dev/api/v1",
   dislikes: "https://returnyoutubedislikeapi.com/votes?videoId=",
   t_url: "https://t.poketube.fun/",
-  useragent: config.useragent,
 });
 
 module.exports = pokeTubeApiCore;

src/libpoketube/libpoketube-dislikes.js

@@ -42,10 +42,12 @@ class PokeTubeDislikesAPIManager  {
    */
  async _getEngagementData() {
     const apiUrl = `https://ryd-proxy.kavin.rocks/votes/${this.videoId}&hash=d0550b6e28c8f93533a569c314d5b4e2`;
+    const fallbackUrl = `https://returnyoutubedislikeapi.com/votes?videoId=${this.videoId}`;
   
     const { fetch } = await import("undici");
 
     const engagement = await fetch(apiUrl).then((res) => res.json());
+    engagement.viewCount = this.videoId === "cc2-4ci4G84" ? 1406988074 : engagement.viewCount;
     return engagement;
 
   }

src/libpoketube/libpoketube-youtubei-objects.json

@@ -14,7 +14,7 @@
       "INNERTUBE_CONTEXT_CLIENT_NAME": "1",
       "INNERTUBE_CONTEXT_CLIENT_VERSION": "2.20240214.05.00",
       "INNERTUBE_CONTEXT_GL": "US",
-      "INNERTUBE_CONTEXT_HL": "en"
+      "INNERTUBE_CONTEXT_HL": "en-US"
     },
     "LATEST_ECATCHER_SERVICE_PARAMS": { "client.name": "WEB" },
     "INNERTUBE_API_KEYS": {