more possible fixes for uploading

possible upload fix
realizing webupload with approval functionality
2026-01-23 23:44:50 +01:00 · 2026-01-23 23:42:23 +01:00 · 2026-01-23 23:35:12 +01:00 · 2026-01-23 22:09:58 +01:00 · 2026-01-23 22:06:57 +01:00 · 2026-01-23 22:00:49 +01:00
24 changed files with 2510 additions and 409 deletions
--- a/debug/check_last_item.mjs
+++ b/debug/check_last_item.mjs
@@ -1,15 +0,0 @@
-import db from "../src/inc/sql.mjs";
-
-(async () => {
-    try {
-        const item = (await db`select * from items order by id desc limit 1`)?.[0];
-        console.log("Last Item:", item);
-        if (item) {
-            const tags = await db`select * from tags_assign where item_id = ${item.id}`;
-            console.log("Tags:", tags);
-        }
-    } catch (err) {
-        console.error(err);
-    }
-    process.exit(0);
-})();
--- a/debug/trigger.mjs
+++ b/debug/trigger.mjs
@@ -6,14 +6,13 @@ import { promises as fs } from "fs";
    network: "console",
    message: _args.join(" "),
    args: _args.slice(1),
-    channel: "#w0bm",
+    channel: "console",
    user: {
      prefix: "console!console@console",
      nick: "console",
      username: "console",
      account: "console"
    },
-    raw: {},
    reply: (...args) => console.log(args),
    replyAction: (...args) => console.log(args),
    replyNotice: (...args) => console.log(args)
@@ -25,14 +24,11 @@ import { promises as fs } from "fs";
  )).filter(t => t[0].call.test(_e.message)).map(t => ({ name: t[0].name, f: t[0].f }));

  try {
-    if (trigger.length === 0)
+    if(trigger.length === 0)
      return console.error("no matches");
-    for (const t of trigger) {
-      console.log(`triggered > ${t.name} (${_e.message})`);
-      await t.f(_e);
-    }
-  } catch (err) {
+    console.log(`triggered > ${trigger[0].name} (${_e.message})`);
+    await trigger[0].f(_e);
+  } catch(err) {
    console.error(err);
  }
-  process.exit(0);
 })();
--- a/init.sh
+++ b/init.sh
@@ -1,3 +0,0 @@
-#!/bin/bash
-npm i
-npm start
--- a/public/s/css/f0ck.css
+++ b/public/s/css/f0ck.css
@@ -1585,14 +1585,10 @@ span.placeholder {
 }

@media (max-width: 1056px) {
-  .navbar {
-    display: grid;
-    grid-template-rows: 1fr 1fr;
-    grid-template-areas: 'f0ck f0ck f0ck';
-  }

+  /* Navbar grid layout removed for modern-navbar compatibility */
  .navbar-brand {
-    grid-area: f0ck;
+    /* maintained for potential other uses or reset */
  }

  .pagination-container-fluid {
@@ -2947,7 +2943,7 @@ div.favs div.posts {
  filter: blur(100px);
  transform: translate3d(0, 0, 0);
  z-index: 0;
-  transition: 2s ease;
+  transition: opacity 1.5s cubic-bezier(0.4, 0, 0.2, 1);
  opacity: 0.2;
 }

@@ -3000,11 +2996,11 @@ button#togglebg {
 }

 .fader-in {
-  animation: fadeIn .8s steps(100) forwards;
+  opacity: 0.4 !important;
 }

 .fader-out {
-  animation: fadeOut .8s steps(100) forwards
+  opacity: 0 !important;
 }

 .settings {
@@ -3052,10 +3048,317 @@ input#s_avatar {

  0%,
  100% {
-    opacity: 0.4;
+    opacity: 0.1;
  }

  50% {
    opacity: 1;
  }
-}
+}
+
+/* Modern Tags Layout */
+.tags-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  gap: 20px;
+  padding: 20px 0;
+}
+
+.tag-card {
+  display: flex;
+  flex-direction: column;
+  background: var(--badge-bg, #171717);
+  border-radius: 12px;
+  overflow: hidden;
+  text-decoration: none !important;
+  transition: transform 0.2s, box-shadow 0.2s;
+  border: 1px solid var(--nav-border-color, rgba(255, 255, 255, 0.1));
+  position: relative;
+}
+
+.tag-card:hover {
+  transform: translateY(-5px);
+  box-shadow: 0 10px 20px rgba(0, 0, 0, 0.4);
+  background: var(--dropdown-bg, #232323);
+  border-color: var(--accent, #9f0);
+}
+
+.tag-card-image {
+  width: 100%;
+  height: 100px;
+  overflow: hidden;
+  position: relative;
+  background: #000;
+}
+
+.tag-card-image img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  transition: transform 0.5s;
+  opacity: 0.8;
+}
+
+.tag-card:hover .tag-card-image img {
+  transform: scale(1.1);
+  opacity: 1;
+}
+
+.tag-card-content {
+  padding: 15px;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.tag-name {
+  color: var(--white, #fff);
+  font-weight: bold;
+  font-size: 1.1em;
+  font-family: var(--font, monospace);
+}
+
+.tag-count {
+  color: #888;
+  font-size: 0.9em;
+}
+
+/* Search Overlay */
+#search-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.9);
+  backdrop-filter: blur(5px);
+  z-index: 10000;
+  display: none;
+  align-items: center;
+  justify-content: center;
+  padding: 20px;
+  opacity: 0;
+  transition: opacity 0.2s ease-in-out;
+}
+
+#search-overlay.visible {
+  opacity: 1;
+}
+
+#search-input {
+  background: transparent;
+  border: none;
+  border-bottom: 2px solid var(--accent);
+  color: var(--white);
+  font-size: 3rem;
+  width: 100%;
+  max-width: 800px;
+  text-align: center;
+  outline: none;
+  font-family: var(--font);
+  padding: 10px;
+}
+
+#search-input::placeholder {
+  color: #555;
+  text-transform: uppercase;
+}
+
+#search-close {
+  position: absolute;
+  top: 20px;
+  right: 30px;
+  color: var(--white);
+  font-size: 2rem;
+  cursor: pointer;
+  font-family: sans-serif;
+  opacity: 0.7;
+  transition: opacity 0.2s;
+}
+
+#search-close:hover {
+  opacity: 1;
+}
+
+/* Delete Tag Modal */
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.85);
+  backdrop-filter: blur(5px);
+  z-index: 10001;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.modal-content {
+  background: var(--dropdown-bg);
+  border: 1px solid var(--nav-border-color);
+  padding: 30px;
+  border-radius: 10px;
+  text-align: center;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.5);
+  min-width: 300px;
+}
+
+.modal-content h3 {
+  margin-top: 0;
+  color: var(--white);
+}
+
+.modal-content p {
+  color: #ccc;
+  margin: 20px 0;
+}
+
+.modal-actions {
+  display: flex;
+  justify-content: center;
+  gap: 15px;
+}
+
+.modal-actions button {
+  padding: 10px 20px;
+  border: none;
+  border-radius: 5px;
+  cursor: pointer;
+  font-weight: bold;
+  font-family: var(--font);
+}
+
+.btn-danger {
+  background: #e74c3c;
+  color: white;
+}
+
+.btn-danger:hover {
+  background: #c0392b;
+}
+
+.btn-secondary {
+  background: #555;
+  color: white;
+}
+
+.btn-secondary:hover {
+  background: #666;
+}
+
+/* Nav User Dropdown */
+.nav-user-dropdown {
+  position: relative;
+  margin-left: 15px;
+}
+
+.nav-user-btn {
+  background: transparent;
+  border: 1px solid var(--nav-border-color);
+  color: var(--white);
+  padding: 6px 12px;
+  border-radius: 0;
+  cursor: pointer;
+  font-family: var(--font);
+  font-size: 14px;
+  transition: all 0.2s ease;
+}
+
+.nav-user-btn:hover {
+  background: rgba(255, 255, 255, 0.1);
+  border-color: var(--nav-border-color-hover);
+}
+
+.nav-user-menu {
+  display: none;
+  position: absolute;
+  top: calc(100% + 5px);
+  left: 0;
+  min-width: 150px;
+  background: var(--dropdown-bg);
+  border: 1px solid var(--nav-border-color);
+  border-radius: 0;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.4);
+  z-index: 10000;
+  overflow: hidden;
+}
+
+.nav-user-menu.show {
+  display: block;
+}
+
+.nav-user-menu a {
+  display: block;
+  padding: 10px 15px;
+  color: var(--white);
+  text-decoration: none;
+  transition: background 0.2s;
+}
+
+.nav-user-menu a:hover {
+  background: rgba(255, 255, 255, 0.1);
+}
+
+.nav-user-divider {
+  height: 1px;
+  background: var(--nav-border-color);
+  margin: 5px 0;
+}
+/* Nav Left Group - Flexbox for dropdown + links */
+.nav-left-group {
+    display: flex;
+    align-items: center;
+    gap: 15px;
+    flex-wrap: wrap;
+}
+
+.nav-links {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}
+
+.nav-links a {
+    color: var(--white);
+    text-decoration: none;
+    font-size: 14px;
+    opacity: 0.8;
+    transition: opacity 0.2s;
+}
+
+.nav-links a:hover {
+    opacity: 1;
+}
+
+.nav-links svg {
+    vertical-align: middle;
+}
+
+/* Mobile responsive navbar */
+@media (max-width: 600px) {
+    .navbar {
+        flex-wrap: wrap;
+        gap: 10px;
+    }
+    
+    .nav-left-group {
+        order: 2;
+        width: 100%;
+        justify-content: space-between;
+    }
+    
+    .nav-links {
+        gap: 8px;
+    }
+    
+    .nav-user-btn {
+        padding: 4px 8px;
+        font-size: 12px;
+    }
+    
+    .nav-links a {
+        font-size: 12px;
+    }
+}
--- a/public/s/js/admin.js
+++ b/public/s/js/admin.js
@@ -184,13 +184,40 @@
    if (!ctx) return;
    const { postid, poster } = ctx;

-    if (!confirm(`Reason for deleting f0ckpost ${postid} by ${poster} (Weihnachten™)`))
-      return;
-    const res = await post("/api/v2/admin/deletepost", {
-      postid: postid
-    });
-    if (!res.success) {
-      alert(res.msg);
+    const modal = document.getElementById('delete-item-modal');
+    const idEl = document.getElementById('delete-item-id');
+    const posterEl = document.getElementById('delete-item-poster');
+    const confirmBtn = document.getElementById('delete-item-confirm');
+    const cancelBtn = document.getElementById('delete-item-cancel');
+
+    if (modal) {
+      idEl.textContent = postid;
+      posterEl.textContent = poster || 'unknown';
+      modal.style.display = 'flex';
+
+      const closeModal = () => {
+        modal.style.display = 'none';
+        confirmBtn.onclick = null;
+        cancelBtn.onclick = null;
+      };
+
+      cancelBtn.onclick = closeModal;
+
+      confirmBtn.onclick = async () => {
+        confirmBtn.textContent = 'Deleting...';
+        confirmBtn.disabled = true;
+        const res = await post("/api/v2/admin/deletepost", {
+          postid: postid
+        });
+        if (!res.success) {
+          alert(res.msg);
+          confirmBtn.textContent = 'Delete';
+          confirmBtn.disabled = false;
+        } else {
+          closeModal();
+          window.location.href = '/';
+        }
+      };
    }
  };

--- a/public/s/js/f0ck.js
+++ b/public/s/js/f0ck.js
@@ -8,6 +8,40 @@ window.requestAnimFrame = (function () {

 (() => {
  let video;
+
+  // User dropdown toggle
+  const userToggle = document.getElementById('nav-user-toggle');
+  const userMenu = document.getElementById('nav-user-menu');
+  if (userToggle && userMenu) {
+    userToggle.addEventListener('click', (e) => {
+      e.stopPropagation();
+      userMenu.classList.toggle('show');
+    });
+    document.addEventListener('click', (e) => {
+      if (!userMenu.contains(e.target) && !userToggle.contains(e.target)) {
+        userMenu.classList.remove('show');
+      }
+    });
+  }
+
+  // Initialize background preference
+  if (localStorage.getItem('background') == undefined) {
+    localStorage.setItem('background', 'true');
+  }
+  var background = localStorage.getItem('background') === 'true';
+  // Apply initial visual state
+  var initialCanvas = document.getElementById('bg');
+  if (initialCanvas) {
+    if (background) {
+      initialCanvas.classList.add('fader-in');
+      initialCanvas.classList.remove('fader-out');
+    } else {
+      initialCanvas.classList.add('fader-out');
+      initialCanvas.classList.remove('fader-in');
+    }
+  }
+
+
  if (elem = document.querySelector("#my-video")) {
    video = new v0ck(elem);
    document.addEventListener("keydown", e => {
@@ -17,13 +51,27 @@ window.requestAnimFrame = (function () {
      }
    });

-    const toggleBg = document.getElementById('togglebg');
-    if (toggleBg) {
-      toggleBg.addEventListener('click', function (e) {
-        e.preventDefault();
-        background = !background;
-        localStorage.setItem('background', background.toString());
-        var canvas = document.getElementById('bg');
+
+
+    if (elem !== null) {
+      // ... existing code ...
+    }
+  }
+
+  // Export init function for dynamic calls
+  window.initBackground = () => {
+    // Re-fetch elements as they might have been replaced
+    const elem = document.querySelector("#my-video");
+    const canvas = document.getElementById('bg');
+
+    if (elem) {
+      // Initialize video wrapper if needed or just get instance
+      // Assuming v0ck handles re-init or we just use raw element for events
+      // But video variable is local.
+      // We need to re-bind 'play' event if it's a new element.
+
+      if (canvas) {
+        // Restore visual state on re-init
        if (background) {
          canvas.classList.add('fader-in');
          canvas.classList.remove('fader-out');
@@ -31,33 +79,102 @@ window.requestAnimFrame = (function () {
          canvas.classList.add('fader-out');
          canvas.classList.remove('fader-in');
        }
-        animationLoop();
-      });
-    }

-    if (elem !== null) {
-      if (localStorage.getItem('background') == undefined) {
-        localStorage.setItem('background', 'true');
-      }
+        const context = canvas.getContext('2d');
+        const cw = canvas.width = canvas.clientWidth | 0;
+        const ch = canvas.height = canvas.clientHeight | 0;

-      var background = localStorage.getItem('background') === 'true';
-      var canvas = document.getElementById('bg');
-      if (canvas) {
-        var context = canvas.getContext('2d');
-        var cw = canvas.width = canvas.clientWidth | 0;
-        var ch = canvas.height = canvas.clientHeight | 0;
-
-        function animationLoop() {
-          if (video.paused || video.ended || !background)
+        const animationLoop = () => {
+          if (elem.paused || elem.ended || !background)
            return;
-          context.drawImage(video, 0, 0, cw, ch);
+          context.drawImage(elem, 0, 0, cw, ch);
          window.requestAnimFrame(animationLoop);
        }

        elem.addEventListener('play', animationLoop);
+
+        if (!elem.paused) {
+          animationLoop();
+        }
      }
    }
-  }
+  };
+
+  // Initial call
+  window.initBackground();
+
+  const loadPageAjax = async (url) => {
+    // Show loading indicator
+    const navbar = document.querySelector("nav.navbar");
+    if (navbar) navbar.classList.add("pbwork");
+
+    try {
+      // Extract page number, user, tag, etc.
+      let page = 1;
+      const pMatch = url.match(/\/p\/(\d+)/);
+      if (pMatch) page = pMatch[1];
+
+      // Extract context
+      let tag = null, user = null, mime = null;
+      const tagMatch = url.match(/\/tag\/([^/]+)/);
+      if (tagMatch) tag = decodeURIComponent(tagMatch[1]);
+
+      const userMatch = url.match(/\/user\/([^/]+)/);
+      if (userMatch) user = decodeURIComponent(userMatch[1]);
+
+      const mimeMatch = url.match(/\/(image|audio|video)/);
+      if (mimeMatch) mime = mimeMatch[1];
+
+      let ajaxUrl = `/ajax/items/?page=${page}`;
+      if (tag) ajaxUrl += `&tag=${encodeURIComponent(tag)}`;
+      if (user) ajaxUrl += `&user=${encodeURIComponent(user)}`;
+      if (mime) ajaxUrl += `&mime=${encodeURIComponent(mime)}`;
+
+      console.log("Fetching Page:", ajaxUrl);
+      const response = await fetch(ajaxUrl, { credentials: 'include' });
+      const data = await response.json();
+
+      if (data.success) {
+        // Replace grid content
+        // If "infinite scroll" we might append, but pagination implies jumping properly? 
+        // User said "resembled in pagination", which implies staying in sync.
+        // If I click Next Page, I expect to SEE page 2.
+        // But infinite scroll usually appends.
+        // Let's implement REPLACE for explicit page navigation to be safe/standard.
+        // Wait, the "infinite scroll" feature usually implies APPEND. 
+        // If the user wants infinite scroll, they shouldn't click pagination?
+        // But if they scroll, `changePage` is called which clicks `.next`.
+        // So if I replace content, it breaks infinite scroll flow (items disappear).
+        // So I should APPEND if it's "next page" and we are already on the page?
+        // But `changePage` is triggered by scroll.
+        // Let's APPEND.
+
+        const posts = document.querySelector('.posts');
+        if (posts) {
+          // Check if we are appending (next page) or jumping
+          // For simple "infinite scroll", we append.
+          posts.insertAdjacentHTML('beforeend', data.html);
+        }
+
+        // Update pagination
+        if (data.pagination) {
+          document.querySelectorAll('.pagination-wrapper').forEach(el => el.innerHTML = data.pagination);
+        }
+
+        // Update History
+        history.pushState({}, '', url);
+      }
+
+    } catch (err) {
+      console.error(err);
+      window.location.href = url; // Fallback
+    } finally {
+      if (navbar) navbar.classList.remove("pbwork");
+      // Restore pagination visibility for Grid View
+      const navPag = document.querySelector('.pagination-container-fluid');
+      if (navPag) navPag.style.display = '';
+    }
+  };

  let tt = false;
  const stimeout = 500;
@@ -89,6 +206,10 @@ window.requestAnimFrame = (function () {
    // Extract item ID from URL. Regex now handles query params, hashes, and trailing slashes.
    const match = url.match(/\/(\d+)(?:\/|#|\?|$)/);

+    // Hide navbar pagination for Item View (matches SSR)
+    const navPag = document.querySelector('.pagination-container-fluid');
+    if (navPag) navPag.style.display = 'none';
+
    if (!match) {
      console.warn("loadItemAjax: No ID match found in URL", url);
      // fallback for weird/external links
@@ -99,12 +220,15 @@ window.requestAnimFrame = (function () {

    // <context-preservation>
    // Extract context from Target URL first
-    let tag = null, user = null;
+    let tag = null, user = null, isFavs = false;
    const tagMatch = url.match(/\/tag\/([^/]+)/);
    if (tagMatch) tag = decodeURIComponent(tagMatch[1]);

    const userMatch = url.match(/\/user\/([^/]+)/);
-    if (userMatch) user = decodeURIComponent(userMatch[1]); // Note: "user" variable shadowed? No, block scope or different name? let user defined above.
+    if (userMatch) {
+      user = decodeURIComponent(userMatch[1]);
+      if (url.match(/\/user\/[^/]+\/favs(\/|$|\?)/)) isFavs = true;
+    }

    // If missing and inheritContext is true, check Window Location
    if (inheritContext) {
@@ -114,7 +238,11 @@ window.requestAnimFrame = (function () {
      }
      if (!user) {
        const wUserMatch = window.location.href.match(/\/user\/([^/]+)/);
-        if (wUserMatch) user = decodeURIComponent(wUserMatch[1]);
+        if (wUserMatch) {
+          user = decodeURIComponent(wUserMatch[1]);
+          // Check for /favs (with or without trailing /, item id, or query params)
+          if (window.location.href.match(/\/user\/[^/]+\/favs(\/|$|\?)/)) isFavs = true;
+        }
      }
    }
    // </context-preservation>
@@ -126,13 +254,14 @@ window.requestAnimFrame = (function () {
      const params = new URLSearchParams();
      if (tag) params.append('tag', tag);
      if (user) params.append('user', user);
+      if (isFavs) params.append('fav', 'true');

      if ([...params].length > 0) {
        ajaxUrl += '?' + params.toString();
      }

      console.log("Fetching:", ajaxUrl);
-      const response = await fetch(ajaxUrl);
+      const response = await fetch(ajaxUrl, { credentials: 'include' });
      if (!response.ok) throw new Error(`Network response was not ok: ${response.status}`);

      const rawText = await response.text();
@@ -159,6 +288,11 @@ window.requestAnimFrame = (function () {
        const main = document.getElementById('main');
        main.innerHTML = '<div class="container"></div>';
        container = main.querySelector('.container');
+      } else if (!container && document.getElementById('main')) {
+        // Transition from User Profile or other pages without .container
+        const main = document.getElementById('main');
+        main.innerHTML = '<div class="container"></div>';
+        container = main.querySelector('.container');
      } else if (container) {
        // Check if we are on Tags Overview logic (which reuses .container)
        const tagsOverview = container.querySelector('.tags');
@@ -187,13 +321,17 @@ window.requestAnimFrame = (function () {
      // If we inherited context, we should reflect it in the URL
      let pushUrl = `/${itemid}`;
      // Logic from ajax.mjs context reconstruction:
-      if (user) pushUrl = `/user/${user}/${itemid}`; // User takes precedence usually? Or strictly mutually exclusive in UI
+      if (user) {
+        pushUrl = `/user/${user}/${itemid}`;
+        if (isFavs) pushUrl = `/user/${user}/favs/${itemid}`;
+      }
      else if (tag) pushUrl = `/tag/${tag}/${itemid}`;

      // We overwrite proper URL even if the link clicked was "naked"
      history.pushState({}, '', pushUrl);

      setupMedia();
+      if (window.initBackground) window.initBackground();
      // Try to extract ID from response if possible or just use itemid
      document.title = `f0bm - ${itemid}`;
      if (navbar) navbar.classList.remove("pbwork");
@@ -241,7 +379,12 @@ window.requestAnimFrame = (function () {
        if (wTagMatch) params.append('tag', decodeURIComponent(wTagMatch[1]));

        const wUserMatch = window.location.href.match(/\/user\/([^/]+)/);
-        if (wUserMatch) params.append('user', decodeURIComponent(wUserMatch[1]));
+        if (wUserMatch) {
+          params.append('user', decodeURIComponent(wUserMatch[1]));
+          if (window.location.href.match(/\/favs(\/|$|\?)/)) {
+            params.append('fav', 'true');
+          }
+        }

        if ([...params].length > 0) {
          randomUrl += '?' + params.toString();
@@ -266,12 +409,100 @@ window.requestAnimFrame = (function () {

      // Standard item links
      e.preventDefault();
-      loadItemAjax(link.href, true);
+      if (link.href.match(/\/p\/\d+/) || link.href.match(/[?&]page=\d+/)) {
+        loadPageAjax(link.href);
+      } else {
+        loadItemAjax(link.href, true);
+      }
+    } else if (e.target.closest('#togglebg')) {
+      e.preventDefault();
+      background = !background;
+      localStorage.setItem('background', background.toString());
+      var canvas = document.getElementById('bg');
+      if (canvas) {
+        if (background) {
+          canvas.classList.remove('fader-out');
+          canvas.classList.add('fader-in');
+          // Re-trigger loop if started completely fresh or paused
+          if (video && !video.paused) {
+            // We need to access animationLoop from closure? 
+            // Accessing it via window.initBackground might be cleaner or just restart it.
+            // But initBackground defines it locally.
+            // We can just rely on initBackground being called or canvas update.
+            // Actually, if we just change opacity, the loop doesn't need to stop/start technically, 
+            // but for performance we stopped it if !background.
+            // So we should restart it.
+            window.initBackground();
+          }
+        } else {
+          canvas.classList.remove('fader-in');
+          canvas.classList.add('fader-out');
+        }
+      }
+    } else if (e.target.closest('.removetag')) {
+      e.preventDefault();
+      const removeBtn = e.target.closest('.removetag');
+      const tagLink = removeBtn.previousElementSibling;
+
+      if (tagLink) {
+        const tagName = tagLink.textContent.trim();
+        const idLink = document.querySelector('.id-link');
+        const id = idLink ? idLink.textContent.trim() : null;
+
+        if (id && tagName) {
+          const modal = document.getElementById('delete-tag-modal');
+          const nameEl = document.getElementById('delete-tag-name');
+          const confirmBtn = document.getElementById('delete-tag-confirm');
+          const cancelBtn = document.getElementById('delete-tag-cancel');
+
+          if (modal) {
+            nameEl.textContent = tagName;
+            modal.style.display = 'flex';
+
+            const closeModal = () => {
+              modal.style.display = 'none';
+              confirmBtn.onclick = null;
+              cancelBtn.onclick = null;
+            };
+
+            cancelBtn.onclick = closeModal;
+
+            confirmBtn.onclick = () => {
+              confirmBtn.textContent = 'Deleting...';
+              confirmBtn.disabled = true;
+              fetch(`/api/v2/admin/${id}/tags/${encodeURIComponent(tagName)}`, {
+                method: 'DELETE'
+              })
+                .then(r => r.json())
+                .then(data => {
+                  if (data.success) {
+                    removeBtn.parentElement.remove();
+                    closeModal();
+                  } else {
+                    alert('Error: ' + (data.msg || 'Unknown error'));
+                    confirmBtn.textContent = 'Delete';
+                    confirmBtn.disabled = false;
+                  }
+                })
+                .catch(err => {
+                  console.error(err);
+                  alert('Failed to delete tag');
+                  confirmBtn.textContent = 'Delete';
+                  confirmBtn.disabled = false;
+                });
+            };
+          }
+        }
+      }
    }
  });

  window.addEventListener('popstate', (e) => {
-    loadItemAjax(window.location.href, true);
+    if (window.location.href.match(/\/p\/\d+/) || window.location.href.match(/[?&]page=\d+/) || window.location.pathname === '/') {
+      loadPageAjax(window.location.href);
+    } else {
+      loadItemAjax(window.location.href, true);
+    }
  });

  // <keybindings>
@@ -590,9 +821,77 @@ window.requestAnimFrame = (function () {

  // <scroller>

+  // <search-overlay>
+  const initSearch = () => {
+    if (!document.getElementById('search-overlay')) {
+      const overlay = document.createElement('div');
+      overlay.id = 'search-overlay';
+      overlay.innerHTML = `
+             <div id="search-close">&times;</div>
+             <input type="text" id="search-input" placeholder="Search Tags..." autocomplete="off">
+         `;
+      document.body.appendChild(overlay);
+
+      const input = document.getElementById('search-input');
+      const close = document.getElementById('search-close');
+      const btns = document.querySelectorAll('#nav-search-btn, #nav-search-btn-guest');
+
+      const toggleSearch = (show) => {
+        if (show) {
+          overlay.style.display = 'flex';
+          // Force reflow
+          overlay.offsetHeight;
+          overlay.classList.add('visible');
+          input.focus();
+        } else {
+          overlay.classList.remove('visible');
+          setTimeout(() => {
+            overlay.style.display = 'none';
+          }, 200);
+        }
+      };
+
+      btns.forEach(btn => btn.addEventListener('click', (e) => {
+        e.preventDefault();
+        toggleSearch(true);
+      }));
+
+      close.addEventListener('click', () => toggleSearch(false));
+
+      // Close on click outside (background)
+      overlay.addEventListener('click', (e) => {
+        if (e.target === overlay) toggleSearch(false);
+      });
+
+      // ESC to close
+      document.addEventListener('keydown', (e) => {
+        if (e.key === 'Escape' && overlay.classList.contains('visible')) {
+          toggleSearch(false);
+        }
+        // "k" to open
+        if (e.key === 'k' && e.target.tagName !== 'INPUT' && e.target.tagName !== 'TEXTAREA' && !overlay.classList.contains('visible')) {
+          e.preventDefault();
+          toggleSearch(true);
+        }
+      });
+
+      input.addEventListener('keydown', (e) => {
+        if (e.key === 'Enter') {
+          const val = input.value.trim();
+          if (val) {
+            window.location.href = `/tag/${encodeURIComponent(val)}`;
+          }
+        }
+      });
+    }
+  };
+  initSearch();
+  // </search-overlay>
+
  // </scroller>
 })();

+
 // disable default scroll event when mouse is on content div
 // this is useful for items that have a lot of tags for example: 12536
 const targetSelector = '.content';
--- a/public/s/js/upload.js
+++ b/public/s/js/upload.js
@@ -0,0 +1,262 @@
+(() => {
+    const form = document.getElementById('upload-form');
+    if (!form) return;
+
+    const fileInput = document.getElementById('file-input');
+    const dropZone = document.getElementById('drop-zone');
+    const filePreview = document.getElementById('file-preview');
+    const dropZonePrompt = dropZone.querySelector('.drop-zone-prompt');
+    const fileName = document.getElementById('file-name');
+    const fileSize = document.getElementById('file-size');
+    const removeFile = document.getElementById('remove-file');
+    const tagInput = document.getElementById('tag-input');
+    const tagsList = document.getElementById('tags-list');
+    const tagsHidden = document.getElementById('tags-hidden');
+    const tagCount = document.getElementById('tag-count');
+    const tagSuggestions = document.getElementById('tag-suggestions');
+    const submitBtn = document.getElementById('submit-btn');
+    const progressContainer = document.getElementById('upload-progress');
+    const progressFill = document.getElementById('progress-fill');
+    const progressText = document.getElementById('progress-text');
+    const statusDiv = document.getElementById('upload-status');
+
+    let tags = [];
+    let selectedFile = null;
+
+    const formatSize = (bytes) => {
+        const units = ['B', 'KB', 'MB', 'GB'];
+        let i = 0;
+        while (bytes >= 1024 && i < units.length - 1) {
+            bytes /= 1024;
+            i++;
+        }
+        return bytes.toFixed(2) + ' ' + units[i];
+    };
+
+    const updateSubmitButton = () => {
+        const rating = document.querySelector('input[name="rating"]:checked');
+        const hasFile = selectedFile !== null;
+        const hasRating = rating !== null;
+        const hasTags = tags.length >= 3;
+
+        submitBtn.disabled = !(hasFile && hasRating && hasTags);
+
+        if (!hasTags) {
+            submitBtn.querySelector('.btn-text').textContent = (3 - tags.length) + ' more tag' + (3 - tags.length !== 1 ? 's' : '') + ' required';
+        } else if (!hasFile) {
+            submitBtn.querySelector('.btn-text').textContent = 'Select a file';
+        } else if (!hasRating) {
+            submitBtn.querySelector('.btn-text').textContent = 'Select SFW or NSFW';
+        } else {
+            submitBtn.querySelector('.btn-text').textContent = 'Upload';
+        }
+
+        tagCount.textContent = '(' + tags.length + '/3 minimum)';
+        tagCount.classList.toggle('valid', tags.length >= 3);
+    };
+
+    const handleFile = (file) => {
+        if (!file) return;
+
+        const validTypes = ['video/mp4', 'video/webm'];
+        if (!validTypes.includes(file.type)) {
+            statusDiv.textContent = 'Only mp4 and webm files are allowed';
+            statusDiv.className = 'upload-status error';
+            return;
+        }
+
+        selectedFile = file;
+        fileName.textContent = file.name;
+        fileSize.textContent = formatSize(file.size);
+        dropZonePrompt.style.display = 'none';
+        filePreview.style.display = 'flex';
+        statusDiv.textContent = '';
+        statusDiv.className = 'upload-status';
+        updateSubmitButton();
+    };
+
+    fileInput.addEventListener('change', (e) => handleFile(e.target.files[0]));
+
+    removeFile.addEventListener('click', (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        selectedFile = null;
+        fileInput.value = '';
+        dropZonePrompt.style.display = 'block';
+        filePreview.style.display = 'none';
+        updateSubmitButton();
+    });
+
+    dropZone.addEventListener('dragover', (e) => {
+        e.preventDefault();
+        dropZone.classList.add('dragover');
+    });
+
+    dropZone.addEventListener('dragleave', () => {
+        dropZone.classList.remove('dragover');
+    });
+
+    dropZone.addEventListener('drop', (e) => {
+        e.preventDefault();
+        dropZone.classList.remove('dragover');
+        handleFile(e.dataTransfer.files[0]);
+    });
+
+    const addTag = (tagName) => {
+        tagName = tagName.trim().toLowerCase();
+        if (!tagName || tags.includes(tagName)) return;
+        if (tagName === 'sfw' || tagName === 'nsfw') return;
+
+        tags.push(tagName);
+
+        const chip = document.createElement('span');
+        chip.className = 'tag-chip';
+        chip.innerHTML = tagName + '<button type="button">&times;</button>';
+        chip.querySelector('button').addEventListener('click', () => {
+            tags = tags.filter(t => t !== tagName);
+            chip.remove();
+            updateSubmitButton();
+        });
+
+        tagsList.appendChild(chip);
+        tagsHidden.value = tags.join(',');
+        tagInput.value = '';
+        tagSuggestions.innerHTML = '';
+        tagSuggestions.classList.remove('show');
+        updateSubmitButton();
+    };
+
+    tagInput.addEventListener('keydown', (e) => {
+        if (e.key === 'Enter') {
+            e.preventDefault();
+            addTag(tagInput.value);
+        }
+    });
+
+    let debounceTimer;
+    tagInput.addEventListener('input', () => {
+        clearTimeout(debounceTimer);
+        const query = tagInput.value.trim();
+
+        if (query.length < 2) {
+            tagSuggestions.classList.remove('show');
+            return;
+        }
+
+        debounceTimer = setTimeout(async () => {
+            try {
+                const res = await fetch('/api/v2/admin/tags/suggest?q=' + encodeURIComponent(query));
+                const data = await res.json();
+
+                if (data.success && data.suggestions && data.suggestions.length > 0) {
+                    const filtered = data.suggestions.filter(s => !tags.includes(s.tag.toLowerCase()));
+                    let html = '';
+                    for (let i = 0; i < Math.min(8, filtered.length); i++) {
+                        html += '<div class="tag-suggestion">' + filtered[i].tag + '</div>';
+                    }
+                    tagSuggestions.innerHTML = html;
+                    tagSuggestions.classList.add('show');
+
+                    tagSuggestions.querySelectorAll('.tag-suggestion').forEach(el => {
+                        el.addEventListener('click', () => addTag(el.textContent));
+                    });
+                } else {
+                    tagSuggestions.classList.remove('show');
+                }
+            } catch (err) {
+                console.error(err);
+            }
+        }, 200);
+    });
+
+    document.addEventListener('click', (e) => {
+        if (!tagInput.contains(e.target) && !tagSuggestions.contains(e.target)) {
+            tagSuggestions.classList.remove('show');
+        }
+    });
+
+    document.querySelectorAll('input[name="rating"]').forEach(radio => {
+        radio.addEventListener('change', updateSubmitButton);
+    });
+
+    form.addEventListener('submit', async (e) => {
+        e.preventDefault();
+
+        if (!selectedFile || tags.length < 3) return;
+
+        const rating = document.querySelector('input[name="rating"]:checked');
+        if (!rating) return;
+
+        submitBtn.disabled = true;
+        submitBtn.querySelector('.btn-text').style.display = 'none';
+        submitBtn.querySelector('.btn-loading').style.display = 'inline';
+        progressContainer.style.display = 'flex';
+        statusDiv.textContent = '';
+        statusDiv.className = 'upload-status';
+
+        const formData = new FormData();
+        formData.append('file', selectedFile);
+        formData.append('rating', rating.value);
+        formData.append('tags', tags.join(','));
+
+        try {
+            const xhr = new XMLHttpRequest();
+
+            xhr.upload.addEventListener('progress', (e) => {
+                if (e.lengthComputable) {
+                    const percent = Math.round((e.loaded / e.total) * 100);
+                    progressFill.style.width = percent + '%';
+                    progressText.textContent = percent + '%';
+                }
+            });
+
+            xhr.onload = () => {
+                const res = JSON.parse(xhr.responseText);
+                if (res.success) {
+                    statusDiv.innerHTML = '✓ ' + res.msg;
+                    statusDiv.className = 'upload-status success';
+                    form.reset();
+                    tags = [];
+                    tagsList.innerHTML = '';
+                    selectedFile = null;
+                    dropZonePrompt.style.display = 'block';
+                    filePreview.style.display = 'none';
+                } else {
+                    statusDiv.textContent = '✕ ' + res.msg;
+                    statusDiv.className = 'upload-status error';
+                    if (res.repost) {
+                        statusDiv.innerHTML += ' <a href="/' + res.repost + '">View existing</a>';
+                    }
+                }
+
+                submitBtn.querySelector('.btn-text').style.display = 'inline';
+                submitBtn.querySelector('.btn-loading').style.display = 'none';
+                progressContainer.style.display = 'none';
+                progressFill.style.width = '0%';
+                updateSubmitButton();
+            };
+
+            xhr.onerror = () => {
+                statusDiv.textContent = '✕ Upload failed. Please try again.';
+                statusDiv.className = 'upload-status error';
+                submitBtn.querySelector('.btn-text').style.display = 'inline';
+                submitBtn.querySelector('.btn-loading').style.display = 'none';
+                progressContainer.style.display = 'none';
+                updateSubmitButton();
+            };
+
+            xhr.open('POST', '/api/v2/upload');
+            xhr.send(formData);
+
+        } catch (err) {
+            console.error(err);
+            statusDiv.textContent = '✕ Upload failed: ' + err.message;
+            statusDiv.className = 'upload-status error';
+            submitBtn.querySelector('.btn-text').style.display = 'inline';
+            submitBtn.querySelector('.btn-loading').style.display = 'none';
+            updateSubmitButton();
+        }
+    });
+
+    updateSubmitButton();
+})();
--- a/src/inc/routeinc/f0cklib.mjs
+++ b/src/inc/routeinc/f0cklib.mjs
@@ -8,13 +8,13 @@ const globalfilter = cfg.nsfp.map(n => `tag_id = ${n}`).join(' or ');

 export default {
  getf0cks: async (o = { user, tag, mime, page, mode, fav, session, limit }) => {
-    const user    = o.user ? decodeURI(o.user) : null;
-    const tag     = lib.parseTag(o.tag ?? null);
-    const mime    = o.mime ?? null;
-    const page    = +(o.page ?? 1);
-    const smime   = cfg.allowedMimes.includes(mime) ? mime + "/%" : mime === "" ? "%" : "%";
-    const eps     = o.limit ?? cfg.websrv.eps;
-    
+    const user = o.user ? decodeURI(o.user) : null;
+    const tag = lib.parseTag(o.tag ?? null);
+    const mime = o.mime ?? null;
+    const page = +(o.page ?? 1);
+    const smime = cfg.allowedMimes.includes(mime) ? mime + "/%" : mime === "" ? "%" : "%";
+    const eps = o.limit ?? cfg.websrv.eps;
+
    const tmp = { user, tag, mime, smime, page, mode: o.mode };
    const modequery = mime == "audio" ? lib.getMode(0) : lib.getMode(o.mode ?? 0);

@@ -27,17 +27,17 @@ export default {
      left join favorites on favorites.item_id = items.id
      left join "user" on "user".id = favorites.user_id
      where
-        ${ db.unsafe(modequery) }
+        ${db.unsafe(modequery)}
        and items.active = 'true'
-        ${ tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db`` }
-        ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
-        ${ !o.fav && user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
-        ${ mime ? db`and items.mime ilike ${smime}` : db`` }
-        ${ !o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db`` }
+        ${tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db``}
+        ${o.fav ? db`and "user".user ilike ${'%' + user + '%'}` : db``}
+        ${!o.fav && user ? db`and items.username ilike ${'%' + user + '%'}` : db``}
+        ${mime ? db`and items.mime ilike ${smime}` : db``}
+        ${!o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db``}
      group by items.id, tags.tag
    `)?.length || 0;

-    if(!total || total === 0) {
+    if (!total || total === 0) {
      return {
        success: false,
        message: "404 - no f0cks given"
@@ -61,13 +61,13 @@ export default {
      left join "user" on "user".id = favorites.user_id
      left join tags_assign ta on ta.item_id = items.id and (ta.tag_id = 1 or ta.tag_id = 2)
      where
-        ${ db.unsafe(modequery) }
+        ${db.unsafe(modequery)}
        and items.active = 'true'
-        ${ tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db`` }
-        ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
-        ${ !o.fav && user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
-        ${ mime ? db`and items.mime ilike ${smime}` : db`` }
-        ${ !o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db`` }
+        ${tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db``}
+        ${o.fav ? db`and "user".user ilike ${'%' + user + '%'}` : db``}
+        ${!o.fav && user ? db`and items.username ilike ${'%' + user + '%'}` : db``}
+        ${mime ? db`and items.mime ilike ${smime}` : db``}
+        ${!o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db``}
      group by items.id, tags.tag, ta.tag_id
      order by items.id desc
      offset ${offset}
@@ -75,11 +75,11 @@ export default {
    `;

    const cheat = [];
-    for(let i = Math.max(1, act_page - 3); i <= Math.min(act_page + 3, pages); i++)
+    for (let i = Math.max(1, act_page - 3); i <= Math.min(act_page + 3, pages); i++)
      cheat.push(i);
-  
+
    const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks', path: 'p/' });
-  
+
    return {
      success: true,
      items: rows,
@@ -96,54 +96,61 @@ export default {
    };
  },
  getf0ck: async (o = ({ user, tag, mime, itemid, mode, session })) => {
-    const user    = o.user ? decodeURI(o.user) : null;
-    const tag     = lib.parseTag(o.tag ?? null);
-    const mime    = (o.mime ?? "");
-    const itemid  = +(o.itemid ?? 404);
-    const smime   = cfg.allowedMimes.includes(mime) ? mime + "/%" : mime === "" ? "%" : "%";
-    
+    const user = o.user ? decodeURI(o.user) : null;
+    const tag = lib.parseTag(o.tag ?? null);
+    const mime = (o.mime ?? "");
+    const itemid = +(o.itemid ?? 404);
+    const smime = cfg.allowedMimes.includes(mime) ? mime + "/%" : mime === "" ? "%" : "%";
+
    const tmp = { user, tag, mime, smime, itemid };
-  
+
    const modequery = mime == "audio" ? lib.getMode(0) : lib.getMode(o.mode ?? 0);
-  
-    if(itemid === 404) {
+
+    if (itemid === 404) {
      return {
        success: false,
        message: "404 - f0ck not found"
      };
    }
-  
+
    const items = await db`
      select distinct on (items.id)
        items.*
      from items
      left join tags_assign on tags_assign.item_id = items.id
      left join tags on tags.id = tags_assign.tag_id
-      left join favorites on favorites.item_id = items.id
-      left join "user" on "user".id = favorites.user_id
+      ${o.fav
+        ? db`inner join favorites on favorites.item_id = items.id inner join "user" on "user".id = favorites.user_id`
+        : db`left join favorites on favorites.item_id = items.id left join "user" on "user".id = favorites.user_id`
+      }
      left join tags_assign ta on ta.item_id = items.id and (ta.tag_id = 1 or ta.tag_id = 2)
      where
-        ${ db.unsafe(modequery) }
+        ${db.unsafe(modequery)}
        and items.active = 'true'
-        ${ tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db`` }
-        ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
-        ${ !o.fav && user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
-        ${ mime ? db`and items.mime ilike ${smime}` : db`` }
-        ${ !o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db`` }
+        ${tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db``}
+        ${o.fav ? db`and "user"."user" = ${user}` : db``}
+        ${!o.fav && user ? db`and items.username ilike ${'%' + user + '%'}` : db``}
+        ${mime ? db`and items.mime ilike ${smime}` : db``}
+        ${!o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db``}
      group by items.id, tags.tag, ta.tag_id
      order by items.id desc
    `;

+    console.log('[GETF0CK DEBUG] Query params:', { user, itemid, fav: o.fav });
+    console.log('[GETF0CK DEBUG] Items found:', items.length, 'Item IDs:', items.slice(0, 10).map(i => i.id));
+
    const item = items.findIndex(i => i.id === itemid);
    const actitem = items[item];
-  
-    if(!actitem) { // sfw-check!
+
+    console.log('[GETF0CK DEBUG] findIndex result:', item, 'actitem exists:', !!actitem);
+
+    if (!actitem) { // sfw-check!
      return {
        success: false,
        message: "Sorry, this post is currently not visible."
      };
    }
-  
+
    const tags = await lib.getTags(itemid);
    const cheat = [...new Set(items.slice(Math.max(0, item - 3), item + 4).map(i => i.id))];
    const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks', path: '' });
@@ -154,14 +161,14 @@ export default {
      left join "user_options" on "user_options".user_id = "favorites".user_id
      where "favorites".item_id = ${itemid}
    `;
-    
+
    let coverart = true;
    try {
      await fs.promises.access(`./public${cfg.websrv.paths.coverarts}/${actitem.id}.webp`);
-    } catch(err) {
+    } catch (err) {
      coverart = false;
    }
-  
+
    const data = {
      success: true,
      user: {
@@ -201,16 +208,16 @@ export default {
      tmp
    };
    return data;
-  },getRandom: async (o = ({ user, tag, mime, mode, fav, session })) => {
+  }, getRandom: async (o = ({ user, tag, mime, mode, fav, session })) => {
    const user = o.user ? decodeURI(o.user) : null;
    const tag = lib.parseTag(o.tag ?? null);
    const mime = (o.mime ?? "");
    const smime = cfg.allowedMimes.includes(mime) ? mime + "/%" : mime === "" ? "%" : "%";
-  
+
    const modequery = mime == "audio" ? lib.getMode(0) : lib.getMode(o.mode ?? 0);
-  
+
    let item;
-  
+
    if (o.fav && user) {
      // Special case: random from user's favorites
      item = await db`
@@ -219,10 +226,15 @@ export default {
        from favorites
        inner join items on favorites.item_id = items.id
        inner join "user" on "user".id = favorites.user_id
+        left join tags_assign on tags_assign.item_id = items.id
+        left join tags on tags.id = tags_assign.tag_id
        where
-          "user".user ilike ${'%' + user + '%'}
+          ${db.unsafe(modequery)}
+          and "user".user ilike ${'%' + user + '%'}
          and items.active = 'true'
          ${mime ? db`and items.mime ilike ${smime}` : db``}
+          ${!o.session && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db``}
+        group by items.id
        order by random()
        limit 1
      `;
@@ -246,20 +258,20 @@ export default {
        limit 1
      `;
    }
-  
+
    if (item.length === 0) {
      return {
        success: false,
        message: "no f0cks found :("
      };
    }
-  
+
    const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks' });
-  
+
    return {
      success: true,
      link: link,
      itemid: item[0].id
    };
  }
-  };
+};
--- a/src/inc/routes/admin.mjs
+++ b/src/inc/routes/admin.mjs
@@ -5,7 +5,7 @@ import { promises as fs } from "fs";

 export default (router, tpl) => {
  router.get(/^\/login(\/)?$/, async (req, res) => {
-    if(req.cookies.session) {
+    if (req.cookies.session) {
      return res.reply({
        body: tpl.render('error', {
          message: "you're already logged in lol",
@@ -17,7 +17,7 @@ export default (router, tpl) => {
      body: tpl.render("login", { theme: req.cookies.theme ?? "f0ck" })
    });
  });
-  
+
  router.post(/^\/login(\/)?$/, async (req, res) => {
    const user = await db`
      select *
@@ -25,9 +25,9 @@ export default (router, tpl) => {
      where "login" = ${req.post.username.toLowerCase()}
      limit 1
    `;
-    if(user.length === 0)
+    if (user.length === 0)
      return res.reply({ body: "user doesn't exist or wrong password" });
-    if(!(await lib.verify(req.post.password, user[0].password)))
+    if (!(await lib.verify(req.post.password, user[0].password)))
      return res.reply({ body: "user doesn't exist or wrong password" });
    const stamp = ~~(Date.now() / 1e3);

@@ -36,7 +36,7 @@ export default (router, tpl) => {
      where last_action <= ${(Date.now() - 6048e5)}
      and kmsi = 0
    `;
-  
+
    const session = lib.md5(lib.createID());
    const blah = {
      user_id: user[0].id,
@@ -49,8 +49,7 @@ export default (router, tpl) => {
    };

    await db`
-      insert into "user_sessions" ${
-        db(blah, 'user_id', 'session', 'browser', 'created_at', 'last_used', 'last_action', 'kmsi')
+      insert into "user_sessions" ${db(blah, 'user_id', 'session', 'browser', 'created_at', 'last_used', 'last_action', 'kmsi')
      }
    `;

@@ -60,16 +59,16 @@ export default (router, tpl) => {
      "Location": "/"
    }).end();
  });
-  
+
  router.get(/^\/logout$/, lib.loggedin, async (req, res) => {
    const usersession = await db`
      select *
      from "user_sessions"
      where id = ${+req.session.sess_id}
    `;
-    if(usersession.length === 0)
+    if (usersession.length === 0)
      return res.reply({ body: "nope 2" });
-    
+
    await db`
      delete from "user_sessions"
      where id = ${+req.session.sess_id}
@@ -80,7 +79,7 @@ export default (router, tpl) => {
      "Location": "/"
    }).end();
  });
-  
+
  router.get(/^\/login\/pwdgen$/, async (req, res) => {
    res.reply({
      body: "<form action=\"/login/pwdgen\" method=\"post\"><input type=\"text\" name=\"pwd\" placeholder=\"pwd\" /><input type=\"submit\" value=\"f0ck it\" /></form>"
@@ -102,7 +101,7 @@ export default (router, tpl) => {
      }, req)
    });
  });
-  
+
  router.get(/^\/admin\/sessions(\/)?$/, lib.auth, async (req, res) => {
    const rows = await db`
      select "user_sessions".*, "user".user
@@ -110,7 +109,7 @@ export default (router, tpl) => {
      left join "user" on "user".id = "user_sessions".user_id
      order by "user_sessions".last_used desc
    `;
-  
+
    res.reply({
      body: tpl.render("admin/sessions", {
        session: req.session,
@@ -121,79 +120,157 @@ export default (router, tpl) => {
    });
  });

-  // router.get(/^\/admin\/log(\/)?$/, lib.auth, async (req, res) => {
-  //   // Funktioniert ohne systemd service natürlich nicht.
-  //   exec("journalctl -qeu f0ck --no-pager", (err, stdout) => {
-  //     res.reply({
-  //       body: tpl.render("admin/log", {
-  //         log: stdout.split("\n").slice(0, -1),
-  //         tmp: null
-  //       }, req)
-  //     });
-  //   });
-  // });
+  router.get(/^\/admin\/approve\/?/, lib.auth, async (req, res) => {
+    if (req.url.qs?.id) {
+      const id = +req.url.qs.id;
+      const f0ck = await db`
+        select dest, mime
+        from "items"
+        where
+          id = ${id} and
+          active = 'false'
+        limit 1
+      `;
+      if (f0ck.length === 0) {
+        return res.reply({
+          body: `f0ck ${id}: f0ck not found`
+        });
+      }

-  // router.get(/^\/admin\/recover\/?/, lib.auth, async (req, res) => {
-  //  Gelöschte Objekte werden nicht aufgehoben.
-  //   if(req.url.qs?.id) {
-  //     const id = +req.url.qs.id;
-  //     const f0ck = await db`
-  //       select dest, mime
-  //       from "items"
-  //       where
-  //         id = ${id} and
-  //         active = 'false'
-  //       limit 1
-  //     `;
-  //     if(f0ck.length === 0) {
-  //       return res.reply({
-  //         body: `f0ck ${id}: f0ck not found`
-  //       });
-  //     }
+      await db`update "items" set active = 'true' where id = ${id}`;

-  //     await db`update "items" set active = 'true' where id = ${id}`;
+      // Check if files need moving (if they are in deleted/)
+      try {
+        await fs.access(`./public/b/${f0ck[0].dest}`);
+        // Exists in public, good (new upload)
+      } catch {
+        // Not in public, likely a deleted item being recovered
+        await fs.copyFile(`./deleted/b/${f0ck[0].dest}`, `./public/b/${f0ck[0].dest}`).catch(_ => { });
+        await fs.copyFile(`./deleted/t/${id}.webp`, `./public/t/${id}.webp`).catch(_ => { });
+        await fs.unlink(`./deleted/b/${f0ck[0].dest}`).catch(_ => { });
+        await fs.unlink(`./deleted/t/${id}.webp`).catch(_ => { });

-  //     await fs.copyFile(`./deleted/b/${f0ck[0].dest}`, `./public/b/${f0ck[0].dest}`).catch(_=>{});
-  //     await fs.copyFile(`./deleted/t/${id}.webp`, `./public/t/${id}.webp`).catch(_=>{});
-  //     await fs.unlink(`./deleted/b/${f0ck[0].dest}`).catch(_=>{});
-  //     await fs.unlink(`./deleted/t/${id}.webp`).catch(_=>{});
+        if (f0ck[0].mime.startsWith('audio')) {
+          await fs.copyFile(`./deleted/ca/${id}.webp`, `./public/ca/${id}.webp`).catch(_ => { });
+          await fs.unlink(`./deleted/ca/${id}.webp`).catch(_ => { });
+        }
+      }

-  //     if(f0ck[0].mime.startsWith('audio')) {
-  //       await fs.copyFile(`./deleted/ca/${id}.webp`, `./public/ca/${id}.webp`).catch(_=>{});
-  //       await fs.unlink(`./deleted/ca/${id}.webp`).catch(_=>{});
-  //     }
+      return res.writeHead(302, {
+        "Location": `/${id}`
+      }).end();
+    }

-  //     return res.reply({
-  //       body: `f0ck ${id} recovered. <a href="/admin/recover">back</a>`
-  //     });
-  //   }
+    const page = +req.url.qs.page || 1;
+    const limit = 50;
+    const offset = (page - 1) * limit;

-  //   const _posts = await db`
-  //     select id, mime, username
-  //     from "items"
-  //     where
-  //       active = 'false'
-  //     order by id desc
-  //   `;
+    const total = (await db`select count(*) as c from "items" where active = 'false'`)[0].c;
+    const pages = Math.ceil(total / limit);

-  //   if(_posts.length === 0) {
-  //     return res.reply({
-  //       body: 'blah'
-  //     });
-  //   }
+    const _posts = await db`
+      select id, mime, username, dest
+      from "items"
+      where
+        active = 'false'
+      order by id desc
+      limit ${limit} offset ${offset}
+    `;

-  //   const posts = await Promise.all(_posts.map(async p => ({
-  //     ...p,
-  //     thumbnail: (await fs.readFile(`./deleted/t/${p.id}.webp`)).toString('base64')
-  //   })));
+    if (_posts.length === 0 && page > 1) {
+      // if page empty, maybe redirect to last page or page 1?
+      // Just render empty for now
+    }

-  //   res.reply({
-  //     body: tpl.render('admin/recover', {
-  //       posts,
-  //       tmp: null
-  //     }, req)
-  //   });
-  // });
+    if (_posts.length === 0) {
+      return res.reply({
+        body: tpl.render('admin/approve', { posts: [], pages: 0, page: 1, tmp: null }, req)
+      });
+    }
+
+    const posts = await Promise.all(_posts.map(async p => {
+      // Try to get thumbnail from public or deleted
+      let thumb;
+      try {
+        // Try public first
+        thumb = (await fs.readFile(`./public/t/${p.id}.webp`)).toString('base64');
+      } catch {
+        try {
+          thumb = (await fs.readFile(`./deleted/t/${p.id}.webp`)).toString('base64');
+        } catch {
+          thumb = ""; // No thumbnail?
+        }
+      }
+      return {
+        ...p,
+        thumbnail: thumb
+      };
+    }));
+
+    res.reply({
+      body: tpl.render('admin/approve', {
+        posts,
+        page,
+        pages,
+        tmp: null
+      }, req)
+    });
+  });
+
+  router.get(/^\/admin\/deny\/?/, lib.auth, async (req, res) => {
+    console.log('[ADMIN DENY] Logs initiated');
+    if (req.url.qs?.id) {
+      const id = +req.url.qs.id;
+      console.log(`[ADMIN DENY] Denying ID: ${id}`);
+
+      try {
+        const f0ck = await db`
+        select dest, mime
+        from "items"
+        where
+          id = ${id}
+        limit 1
+      `;
+
+        if (f0ck.length > 0) {
+          console.log(`[ADMIN DENY] Found item, deleting files: ${f0ck[0].dest}`);
+          // Delete files
+          await fs.unlink(`./public/b/${f0ck[0].dest}`).catch(e => console.log('File error pub/b:', e.message));
+          await fs.unlink(`./public/t/${id}.webp`).catch(e => console.log('File error pub/t:', e.message));
+          await fs.unlink(`./deleted/b/${f0ck[0].dest}`).catch(e => console.log('File error del/b:', e.message));
+          await fs.unlink(`./deleted/t/${id}.webp`).catch(e => console.log('File error del/t:', e.message));
+
+          if (f0ck[0].mime.startsWith('audio')) {
+            await fs.unlink(`./public/ca/${id}.webp`).catch(() => { });
+            await fs.unlink(`./deleted/ca/${id}.webp`).catch(() => { });
+          }
+
+          // Delete DB entries
+          console.log('[ADMIN DENY] Deleting DB entries...');
+          try {
+            await db`delete from "tags_assign" where item_id = ${id}`;
+            await db`delete from "favorites" where item_id = ${id}`;
+            await db`delete from "comments" where item_id = ${id}`.catch(() => { });
+            await db`delete from "items" where id = ${id}`;
+            console.log('[ADMIN DENY] Deleted successfully');
+          } catch (dbErr) {
+            console.error('[ADMIN DENY DB ERROR]', dbErr);
+          }
+        } else {
+          console.log('[ADMIN DENY] Item not found in DB');
+        }
+      } catch (err) {
+        console.error('[ADMIN DENY ERROR]', err);
+      }
+
+      return res.writeHead(302, {
+        "Location": `/admin/approve`
+      }).end();
+    }
+
+    console.log('[ADMIN DENY] No ID provided');
+    return res.writeHead(302, { "Location": "/admin/approve" }).end();
+  });

  return router;
 };
--- a/src/inc/routes/ajax.mjs
+++ b/src/inc/routes/ajax.mjs
@@ -14,7 +14,13 @@ export default (router, tpl) => {

        let contextUrl = `/${req.params.itemid}`;
        if (query.tag) contextUrl = `/tag/${query.tag}/${req.params.itemid}`;
-        if (query.user) contextUrl = `/user/${query.user}/${req.params.itemid}`; // User filter takes precedence if both? usually mutually exclusive
+        if (query.user) {
+            contextUrl = query.fav === 'true'
+                ? `/user/${query.user}/favs/${req.params.itemid}`
+                : `/user/${query.user}/${req.params.itemid}`;
+        }
+
+        console.log('[AJAX DEBUG] Params:', { itemid: req.params.itemid, user: query.user, fav: query.fav, contextUrl });

        const data = await f0cklib.getf0ck({
            itemid: req.params.itemid,
@@ -23,9 +29,12 @@ export default (router, tpl) => {
            url: contextUrl,
            user: query.user,
            tag: query.tag,
-            mime: query.mime
+            mime: query.mime,
+            fav: query.fav === 'true'
        });

+        console.log('[AJAX DEBUG] getf0ck result:', { success: data.success, message: data.message });
+
        if (!data.success) {
            return res.reply({
                code: 404,
@@ -38,10 +47,8 @@ export default (router, tpl) => {
        if (req.session) {
            data.session = { ...req.session };
            // data.user comes from f0cklib (uploader). req.session.user is logged-in user string.
-            // If template engine confuses them, removing session.user from this context might help.
-            // item-partial doesn't use session.user.
-            // Note: If anything fails, it prints literal code, so we ensure no collision.
-            if (data.session.user) delete data.session.user;
+            // Templates use session.user for matching favorites. We must preserve it.
+            // if (data.session.user) delete data.session.user; // REMOVED THIS
        } else {
            data.session = false;
        }
@@ -103,6 +110,12 @@ export default (router, tpl) => {
            link: data.link
        });

+        // Render pagination
+        const paginationHtml = tpl.render('snippets/pagination', {
+            pagination: data.pagination,
+            link: data.link
+        });
+
        const hasMore = data.pagination.next !== null;

        return res.reply({
@@ -110,6 +123,7 @@ export default (router, tpl) => {
            body: JSON.stringify({
                success: true,
                html: itemsHtml,
+                pagination: paginationHtml,
                hasMore: hasMore,
                nextPage: data.pagination.next,
                currentPage: data.pagination.page
--- a/src/inc/routes/apiv2/index.mjs
+++ b/src/inc/routes/apiv2/index.mjs
@@ -1,9 +1,12 @@
 import { promises as fs } from "fs";
 import db from '../../sql.mjs';
 import lib from '../../lib.mjs';
+import cfg from '../../config.mjs';
 import search from '../../routeinc/search.mjs';

 const allowedMimes = ["audio", "image", "video", "%"];
+const globalfilter = cfg.nsfp?.length ? cfg.nsfp.map(n => `tag_id = ${n}`).join(' or ') : null;
+
 export default router => {
  router.group(/^\/api\/v2/, group => {
    group.get(/$/, (req, res) => {
@@ -11,20 +14,33 @@ export default router => {
    });

    group.get(/\/random(\/user\/.+|\/image|\/video|\/audio)?$/, async (req, res) => {
-      const user = req.url.split[3] === "user" ? req.url.split[4] : "%";
-      const mime = (allowedMimes.filter(n => req.url.split[3]?.startsWith(n))[0] ? req.url.split[3] : "") + "%";
+      const pathUser = req.url.split[3] === "user" ? req.url.split[4] : null;
+      const user = req.url.qs.user || pathUser || "%";
+
+      const pathMime = allowedMimes.filter(n => req.url.split[3]?.startsWith(n))[0] ? req.url.split[3] : "";
+      const mime = (req.url.qs.mime || pathMime) + "%";
+
      const tag = req.url.qs.tag || null;
+      const isFav = req.url.qs.fav === 'true';
+      const hasSession = !!req.session;
+      const modequery = mime.startsWith("audio") ? lib.getMode(0) : lib.getMode(req.session?.mode ?? 0);

      const rows = await db`
        select "items".*
        from "items"
+        ${isFav
+          ? db`join "favorites" on "favorites".item_id = "items".id join "user" as fu on fu.id = "favorites".user_id`
+          : db``
+        }
        left join tags_assign on tags_assign.item_id = items.id
        left join tags on tags.id = tags_assign.tag_id
        where
+          ${db.unsafe(modequery)} and
          mime ilike ${mime} and
-          username ilike ${user} and
          active = 'true'
+          ${isFav ? db`and fu."user" = ${user}` : db`and items.username ilike ${user}`}
          ${tag ? db`and tags.normalized ilike ${'%' + tag + '%'}` : db``}
+          ${!hasSession && globalfilter ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db``}
        order by random()
        limit 1
      `;
--- a/src/inc/routes/apiv2/upload.mjs
+++ b/src/inc/routes/apiv2/upload.mjs
@@ -0,0 +1,260 @@
+import { promises as fs } from "fs";
+import db from '../../sql.mjs';
+import lib from '../../lib.mjs';
+import cfg from '../../config.mjs';
+import queue from '../../queue.mjs';
+import path from "path";
+
+// Native multipart form data parser
+const parseMultipart = (buffer, boundary) => {
+    const parts = {};
+    const boundaryBuffer = Buffer.from(`--${boundary}`);
+    const segments = [];
+
+    let start = 0;
+    let idx;
+
+    while ((idx = buffer.indexOf(boundaryBuffer, start)) !== -1) {
+        if (start !== 0) {
+            segments.push(buffer.slice(start, idx - 2)); // -2 for \r\n before boundary
+        }
+        start = idx + boundaryBuffer.length + 2; // +2 for \r\n after boundary
+    }
+
+    for (const segment of segments) {
+        const headerEnd = segment.indexOf('\r\n\r\n');
+        if (headerEnd === -1) continue;
+
+        const headers = segment.slice(0, headerEnd).toString();
+        const body = segment.slice(headerEnd + 4);
+
+        const nameMatch = headers.match(/name="([^"]+)"/);
+        const filenameMatch = headers.match(/filename="([^"]+)"/);
+        const contentTypeMatch = headers.match(/Content-Type:\s*([^\r\n]+)/i);
+
+        if (nameMatch) {
+            const name = nameMatch[1];
+            if (filenameMatch) {
+                parts[name] = {
+                    filename: filenameMatch[1],
+                    contentType: contentTypeMatch ? contentTypeMatch[1] : 'application/octet-stream',
+                    data: body
+                };
+            } else {
+                parts[name] = body.toString().trim();
+            }
+        }
+    }
+
+    return parts;
+};
+
+// Collect request body as buffer with debug logging
+const collectBody = (req) => {
+    return new Promise((resolve, reject) => {
+        console.log('[UPLOAD DEBUG] collectBody started');
+        const chunks = [];
+        req.on('data', chunk => {
+            // console.log(`[UPLOAD DEBUG] chunk received: ${chunk.length} bytes`);
+            chunks.push(chunk);
+        });
+        req.on('end', () => {
+            console.log(`[UPLOAD DEBUG] Stream ended. Total size: ${chunks.reduce((acc, c) => acc + c.length, 0)}`);
+            resolve(Buffer.concat(chunks));
+        });
+        req.on('error', err => {
+            console.error('[UPLOAD DEBUG] Stream error:', err);
+            reject(err);
+        });
+
+        // Ensure stream is flowing
+        if (req.isPaused()) {
+            console.log('[UPLOAD DEBUG] Stream was paused, resuming...');
+            req.resume();
+        }
+    });
+};
+
+export default router => {
+    router.group(/^\/api\/v2/, group => {
+
+        group.post(/\/upload$/, lib.loggedin, async (req, res) => {
+            try {
+                console.log('[UPLOAD DEBUG] Request received');
+                // Use stored content type if available (from middleware bypass), otherwise use header
+                const contentType = req._multipartContentType || req.headers['content-type'] || '';
+                const boundaryMatch = contentType.match(/boundary=(.+)$/);
+
+                if (!boundaryMatch) {
+                    console.log('[UPLOAD DEBUG] No boundary found');
+                    return res.json({ success: false, msg: 'Invalid content type' }, 400);
+                }
+
+                let body;
+                if (req.bodyPromise) {
+                    console.log('[UPLOAD DEBUG] Waiting for buffered body from middleware promise...');
+                    body = await req.bodyPromise;
+                    console.log('[UPLOAD DEBUG] Received body from promise');
+                } else if (req.rawBody) {
+                    console.log('[UPLOAD DEBUG] Using buffered body from middleware');
+                    body = req.rawBody;
+                } else {
+                    console.log('[UPLOAD DEBUG] Collecting body via collectBody...');
+                    body = await collectBody(req);
+                }
+
+                if (!body) {
+                    return res.json({ success: false, msg: 'Failed to receive file body' }, 400);
+                }
+
+                console.log('[UPLOAD DEBUG] Body size:', body.length);
+                const parts = parseMultipart(body, boundaryMatch[1]);
+                console.log('[UPLOAD DEBUG] Parsed parts:', Object.keys(parts));
+
+                // Validate required fields
+                const file = parts.file;
+                const rating = parts.rating; // 'sfw' or 'nsfw'
+                const tagsRaw = parts.tags;  // comma-separated tags
+
+                if (!file || !file.data) {
+                    return res.json({ success: false, msg: 'No file provided' }, 400);
+                }
+
+                if (!rating || !['sfw', 'nsfw'].includes(rating)) {
+                    return res.json({ success: false, msg: 'Rating (sfw/nsfw) is required' }, 400);
+                }
+
+                const tags = tagsRaw ? tagsRaw.split(',').map(t => t.trim()).filter(t => t.length > 0) : [];
+                if (tags.length < 3) {
+                    return res.json({ success: false, msg: 'At least 3 tags are required' }, 400);
+                }
+
+                // Validate MIME type
+                const allowedMimes = ['video/mp4', 'video/webm'];
+                let mime = file.contentType;
+
+                if (!allowedMimes.includes(mime)) {
+                    return res.json({ success: false, msg: `Invalid file type. Only mp4 and webm allowed. Got: ${mime}` }, 400);
+                }
+
+                // Validate file size
+                const maxfilesize = cfg.main.maxfilesize;
+                const size = file.data.length;
+
+                if (size > maxfilesize) {
+                    return res.json({
+                        success: false,
+                        msg: `File too large. Max: ${lib.formatSize(maxfilesize)}, Got: ${lib.formatSize(size)}`
+                    }, 400);
+                }
+
+                // Generate UUID for filename
+                const uuid = await queue.genuuid();
+                const ext = mime === 'video/mp4' ? 'mp4' : 'webm';
+                const filename = `${uuid}.${ext}`;
+                const tmpPath = `./tmp/${filename}`;
+                const destPath = `./public/b/${filename}`;
+
+                // Save file temporarily
+                await fs.writeFile(tmpPath, file.data);
+
+                // Verify MIME with file command
+                const actualMime = (await queue.exec(`file --mime-type -b ${tmpPath}`)).stdout.trim();
+                if (!allowedMimes.includes(actualMime)) {
+                    await fs.unlink(tmpPath).catch(() => { });
+                    return res.json({ success: false, msg: `Invalid file type detected: ${actualMime}` }, 400);
+                }
+
+                // Generate checksum
+                const checksum = (await queue.exec(`sha256sum ${tmpPath}`)).stdout.trim().split(" ")[0];
+
+                // Check for repost
+                const repost = await queue.checkrepostsum(checksum);
+                if (repost) {
+                    await fs.unlink(tmpPath).catch(() => { });
+                    return res.json({
+                        success: false,
+                        msg: `This file already exists`,
+                        repost: repost
+                    }, 409);
+                }
+
+                // Move to public folder
+                await fs.copyFile(tmpPath, destPath);
+                await fs.unlink(tmpPath).catch(() => { });
+
+                // Insert into database (active=false for admin approval)
+                await db`
+          insert into items ${db({
+                    src: '',
+                    dest: filename,
+                    mime: actualMime,
+                    size: size,
+                    checksum: checksum,
+                    username: req.session.user,
+                    userchannel: 'web',
+                    usernetwork: 'web',
+                    stamp: ~~(Date.now() / 1000),
+                    active: false
+                }, 'src', 'dest', 'mime', 'size', 'checksum', 'username', 'userchannel', 'usernetwork', 'stamp', 'active')
+                    }
+        `;
+
+                // Get the new item ID
+                const itemid = await queue.getItemID(filename);
+
+                // Generate thumbnail
+                try {
+                    await queue.genThumbnail(filename, actualMime, itemid, '');
+                } catch (err) {
+                    await queue.exec(`magick ./mugge.png ./public/t/${itemid}.webp`);
+                }
+
+                // Assign rating tag (sfw=1, nsfw=2)
+                const ratingTagId = rating === 'sfw' ? 1 : 2;
+                await db`
+          insert into tags_assign ${db({ item_id: itemid, tag_id: ratingTagId, user_id: req.session.id })}
+        `;
+
+                // Assign user tags
+                for (const tagName of tags) {
+                    // Check if tag exists, create if not
+                    let tagRow = await db`
+            select id from tags where normalized = slugify(${tagName}) limit 1
+          `;
+
+                    let tagId;
+                    if (tagRow.length === 0) {
+                        // Create new tag
+                        await db`
+              insert into tags ${db({ tag: tagName }, 'tag')}
+            `;
+                        tagRow = await db`
+              select id from tags where normalized = slugify(${tagName}) limit 1
+            `;
+                    }
+                    tagId = tagRow[0].id;
+
+                    // Assign tag to item
+                    await db`
+            insert into tags_assign ${db({ item_id: itemid, tag_id: tagId, user_id: req.session.id })}
+            on conflict do nothing
+          `;
+                }
+
+                return res.json({
+                    success: true,
+                    msg: 'Upload successful! Your upload is pending admin approval.',
+                    itemid: itemid
+                });
+
+            } catch (err) {
+                console.error('[UPLOAD ERROR]', err);
+                return res.json({ success: false, msg: 'Upload failed: ' + err.message }, 500);
+            }
+        });
+
+    });
+
+    return router;
+};
--- a/src/inc/routes/tag_image.mjs
+++ b/src/inc/routes/tag_image.mjs
@@ -0,0 +1,56 @@
+import crypto from 'crypto';
+
+export default (router, tpl) => {
+  router.get(/^\/tag_image\/(?<tag>.+)$/, async (req, res) => {
+    const tag = decodeURIComponent(req.params.tag);
+
+    // Create a deterministic hash from the tag
+    const hash = crypto.createHash('md5').update(tag).digest('hex');
+
+    // Escape character for SVG
+    const escapeXml = (unsafe) => {
+      return unsafe.replace(/[<>&'"]/g, (c) => {
+        switch (c) {
+          case '<': return '&lt;';
+          case '>': return '&gt;';
+          case '&': return '&amp;';
+          case '\'': return '&apos;';
+          case '"': return '&quot;';
+        }
+      });
+    };
+
+    const displayTag = escapeXml(tag);
+
+    // Generate colors from hash
+    const c1 = '#' + hash.substring(0, 6);
+    const c2 = '#' + hash.substring(6, 12);
+    const c3 = '#' + hash.substring(12, 18);
+
+    // Generate some deterministic numbers for shapes
+    const n1 = parseInt(hash.substring(18, 20), 16);
+    const n2 = parseInt(hash.substring(20, 22), 16);
+
+    const svg = `
+      <svg width="300" height="150" viewBox="0 0 300 150" xmlns="http://www.w3.org/2000/svg">
+        <defs>
+          <linearGradient id="grad" x1="0%" y1="0%" x2="100%" y2="100%">
+            <stop offset="0%" style="stop-color:${c1};stop-opacity:1" />
+            <stop offset="100%" style="stop-color:${c2};stop-opacity:1" />
+          </linearGradient>
+        </defs>
+        <rect width="300" height="150" fill="url(#grad)" />
+        <circle cx="${n1}%" cy="${n2}%" r="${(n1 + n2) / 4}" fill="${c3}" fill-opacity="0.3" />
+        <circle cx="${100 - n1}%" cy="${100 - n2}%" r="${(n1 + n2) / 3}" fill="${c3}" fill-opacity="0.2" />
+        <text x="50%" y="50%" dominant-baseline="middle" text-anchor="middle" font-family="sans-serif" font-size="24" fill="#fff" fill-opacity="0.9" font-weight="bold">${displayTag}</text>
+      </svg>
+    `.trim();
+
+    res.writeHead(200, {
+      'Content-Type': 'image/svg+xml',
+      'Cache-Control': 'public, max-age=86400'
+    });
+    res.end(svg);
+  });
+  return router;
+};
--- a/src/inc/trigger/parser.mjs
+++ b/src/inc/trigger/parser.mjs
@@ -9,8 +9,8 @@ import fs from "fs";
 import path from "path";

 const regex = {
-  all: /https?:\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?/gi,
-  yt: /(?:youtube\.com\/\S*(?:(?:\/e(?:mbed))?\/|watch\/?\?(?:\S*?&?v\=))|youtu\.be\/)([a-zA-Z0-9_-]{6,11})/gi,
+  all:   /https?:\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?/gi,
+  yt:    /(?:youtube\.com\/\S*(?:(?:\/e(?:mbed))?\/|watch\/?\?(?:\S*?&?v\=))|youtu\.be\/)([a-zA-Z0-9_-]{6,11})/gi,
  imgur: /(?:https?:)?\/\/(\w+\.)?imgur\.com\/(\S*)(\..{3,4})/i,
  fourchan: /https?:\/\/i\.4cdn\.org\/(\w+)\/(\d+)\.(\w{3,4})/i,
  instagram: /(?:https?:\/\/www\.)?instagram\.com\S*?\/(?:p|reel)\/(\w{11})\/?/im
@@ -23,35 +23,35 @@ export default async bot => {
    name: "parser",
    call: regex.all,
    active: true,
-    f: async e => {
+    f: e => {
      const links = e.message.match(regex.all)?.filter(link => !link.includes(cfg.main.url.domain)) || [];
      let repost;
-      if (e.media)
+      if(e.media)
        links.push(e.media);
-
-      if (links.length === 0)
+      
+      if(links.length === 0)
        return false;

-      if (e.message.match(/\!i(gnore)?\b/))
+      if(e.message.match(/\!i(gnore)?\b/))
        return false;

-      if (!e.channel.includes("w0bm") && (!e.message.match(/\!w(0bm)?\b/i) && (typeof e.raw.forward_from == 'undefined')))
+      if(!e.channel.includes("w0bm") && (!e.message.match(/\!w(0bm)?\b/i) && (typeof e.raw.forward_from == 'undefined')))
        return false;

-      if (e.type === 'tg' && // proto: tg
+      if(e.type === 'tg' && // proto: tg
        !e.message.match(/\!w(0bm)?\b/i) && // !w / !w0bm
        !e.raw.forward_date && // is forwarded?
        !mediagroupids.has(e.raw.media_group_id) // prepared mediagroup?
      ) {
        return false;
      }
-      else if (e.raw.media_group_id && e.message.match(/\!w(0bm)?\b/i)) {
+      else if(e.raw.media_group_id && e.message.match(/\!w(0bm)?\b/i)) {
        mediagroupids.add(e.raw.media_group_id);
      }

      console.log(`parsing ${links.length} link${links.length > 1 ? "s" : ""}...`);

-      for (const link of links) {
+      links.forEach(async link => {
        //if(regex.imgur.test(link))
        //  return await e.reply(`fuck imgur... seriously`);

@@ -63,7 +63,7 @@ export default async bot => {

        // check repost (link)
        repost = await queue.checkrepostlink(link);
-        if (repost)
+        if(repost)
          return await e.reply(`repost motherf0cker (link): ${cfg.main.url.full}/${repost}`);

        // generate uuid
@@ -73,41 +73,39 @@ export default async bot => {

        // read metadata
        let ext;
-        const proxyArgs = cfg.main.socks ? `--proxy ${cfg.main.socks}` : '';
-        if (link.match(regex.instagram)) {
+        if(link.match(regex.instagram)) {
          // is instagram
          try {
            // @flummi -> is there a variable for the actual work directory so it doesn't have to be hardcoded?
-            const meta = JSON.parse((await queue.exec(`yt-dlp ${proxyArgs} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' --skip-download --dump-json "${link}"`)).stdout);
+            const meta = JSON.parse((await queue.exec(`yt-dlp --proxy ${cfg.main.socks} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' --skip-download --dump-json "${link}"`)).stdout);
            ext = meta.ext;
-          } catch (err) {
+          } catch(err) {
            const tmphead = (await fetch(link, { method: "HEAD" })).headers["content-type"];
            // this can be undefined for unsupported mime types, but will be caught in the general mime check below
            ext = cfg.mimes[tmphead];
          }
        }
-        else if (link.match(regex.imgur)) {
+        else if(link.match(regex.imgur)) {
          // imghure
          ext = link.split('.').pop();
        }
-        else if (link.match(regex.yt)) {
+        else if(link.match(regex.yt)) {
          //yt - fuck anti bot protection
          try {
-            const meta = JSON.parse((await queue.exec(`yt-dlp ${proxyArgs} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' -I 1 --skip-download --dump-json "${link}"`)).stdout);
+            const meta = JSON.parse((await queue.exec(`yt-dlp --proxy ${cfg.main.socks} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' -I 1 --skip-download --dump-json "${link}"`)).stdout);
            ext = meta.ext;
-          } catch (err) {
-            console.error("YT-DLP Error:", err);
+          } catch(err) {
            const tmphead = (await fetch(link, { method: "HEAD" })).headers["content-type"];
            // this can be undefined for unsupported mime types, but will be caught in the general mime check below
            ext = cfg.mimes[tmphead];
          }
        }
-        else if (link.match(regex.fourchan)) {
+        else if(link.match(regex.fourchan)) {
          //4chan - fuck cloudflare :)
          try {
-            const meta = JSON.parse((await queue.exec(`yt-dlp ${proxyArgs} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' --skip-download --dump-json "${link}"`)).stdout);
+            const meta = JSON.parse((await queue.exec(`yt-dlp --proxy ${cfg.main.socks} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' --skip-download --dump-json "${link}"`)).stdout);
            ext = meta.ext;
-          } catch (err) {
+          } catch(err) {
            const tmphead = (await fetch(link, { method: "HEAD" })).headers["content-type"];
            // this can be undefined for unsupported mime types, but will be caught in the general mime check below
            ext = cfg.mimes[tmphead];
@@ -119,15 +117,14 @@ export default async bot => {
          try {
            const meta = JSON.parse((await queue.exec(`yt-dlp -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' --skip-download --dump-json "${link}"`)).stdout);
            ext = meta.ext;
-          } catch (err) {
-            console.error('err:', err);
-            if (e.type == 'tg')
-              return await e.editMessageText(msg.result.chat.id, msg.result.message_id, err);
-            return await e.reply('something went wrong lol / check maxfilesize?');
+          } catch(err) {
+            const tmphead = (await fetch(link, { method: "HEAD" })).headers["content-type"];
+            // this can be undefined for unsupported mime types, but will be caught in the general mime check below
+            ext = cfg.mimes[tmphead];
          }
        }

-        if (!Object.values(cfg.mimes).includes(ext?.toLowerCase())) {
+        if(!Object.values(cfg.mimes).includes(ext?.toLowerCase())) {
          return console.log('mime schmime ' + ext);
        }

@@ -139,44 +136,44 @@ export default async bot => {
        const start = new Date();
        let source;

-        if (link.match(regex.instagram)) {
+        if(link.match(regex.instagram)) {
          try {
            // add --cookies <path-to-cookies-file> on local instance if you want to avoid getting rate limited or optionally use a socks proxy from a network that is not being detected as a public network
-            source = (await queue.exec(`yt-dlp ${proxyArgs} -f 'bv*[height<=1080]+ba/b[height<=1080] / wv*+ba/w' "${link}" --max-filesize ${maxfilesize / 1024}k --postprocessor-args "ffmpeg:-bitexact" -o "./tmp/${uuid}.%(ext)s" --print after_move:filepath --merge-output-format "mp4"`)).stdout.trim();
-          } catch (err) {
-            if (e.type == 'tg')
+            source = (await queue.exec(`yt-dlp --proxy ${cfg.main.socks} -f 'bv*[height<=1080]+ba/b[height<=1080] / wv*+ba/w' "${link}" --max-filesize ${maxfilesize / 1024}k --postprocessor-args "ffmpeg:-bitexact" -o "./tmp/${uuid}.%(ext)s" --print after_move:filepath --merge-output-format "mp4"`)).stdout.trim();
+          } catch(err) {
+            if(e.type == 'tg')
              return await e.editMessageText(msg.result.chat.id, msg.result.message_id, "instagram dl error");
            return await e.reply("instagram dl error", err);
          }
        }
-        else if (link.match(regex.imgur)) {
+        else if(link.match(regex.imgur)) {
          // imghure via torsocks // needs torsocks setup so this is optional
          try {
            await queue.exec(`torsocks wget ${link} -O ./tmp/${uuid}.${ext}`);
            source = `./tmp/${uuid}.${ext}`;
-          } catch (err) {
+          } catch(err) {
            console.error('err:', err);
-            if (e.type == 'tg')
+            if(e.type == 'tg')
              return await e.editMessageText(msg.result.chat.id, msg.result.message_id, err);
            return await e.reply('something went wrong lol');
          }
        }
-        else if (link.match(regex.yt)) {
+        else if(link.match(regex.yt)) {
          try {
            // add --cookies <path-to-cookies-file> on local instance if you want to avoid getting rate limited or optionally use a socks proxy from a network that is not being detected as a public network
-            source = (await queue.exec(`yt-dlp ${proxyArgs} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' "${link}" -I 1 --max-filesize ${maxfilesize / 1024}k --postprocessor-args "ffmpeg:-bitexact" -o "./tmp/${uuid}.%(ext)s" --print after_move:filepath --merge-output-format "mp4"`)).stdout.trim();
-          } catch (err) {
-            if (e.type == 'tg')
+            source = (await queue.exec(`yt-dlp --proxy ${cfg.main.socks} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' "${link}" -I 1 --max-filesize ${maxfilesize / 1024}k --postprocessor-args "ffmpeg:-bitexact" -o "./tmp/${uuid}.%(ext)s" --print after_move:filepath --merge-output-format "mp4"`)).stdout.trim();
+          } catch(err) {
+            if(e.type == 'tg')
              return await e.editMessageText(msg.result.chat.id, msg.result.message_id, "yt dl error");
            return await e.reply("yt dl error", err);
          }
        }
-        else if (link.match(regex.fourchan)) {
+        else if(link.match(regex.fourchan)) {
          // 4chan via proxy - fuck cloudflare
          try {
-            source = (await queue.exec(`yt-dlp ${proxyArgs} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' "${link}" --max-filesize ${maxfilesize / 1024}k --postprocessor-args "ffmpeg:-bitexact" -o "./tmp/${uuid}.%(ext)s" --print after_move:filepath --merge-output-format "mp4"`)).stdout.trim();
-          } catch (err) {
-            if (e.type == 'tg')
+            source = (await queue.exec(`yt-dlp --proxy ${cfg.main.socks} -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' "${link}" --max-filesize ${maxfilesize / 1024}k --postprocessor-args "ffmpeg:-bitexact" -o "./tmp/${uuid}.%(ext)s" --print after_move:filepath --merge-output-format "mp4"`)).stdout.trim();
+          } catch(err) {
+            if(e.type == 'tg')
              return await e.editMessageText(msg.result.chat.id, msg.result.message_id, "yt dl error");
            return await e.reply("yt dl error", err);
          }
@@ -185,23 +182,23 @@ export default async bot => {
          // everything except the exceptions
          try {
            source = (await queue.exec(`yt-dlp -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' "${link}" --max-filesize ${maxfilesize / 1024}k --postprocessor-args "ffmpeg:-bitexact" -o "./tmp/${uuid}.%(ext)s" --print after_move:filepath --merge-output-format "mp4"`)).stdout.trim();
-          } catch (err) {
+          } catch(err) {
            console.error('err:', err);
-            if (e.type == 'tg')
+            if(e.type == 'tg')
              return await e.editMessageText(msg.result.chat.id, msg.result.message_id, err);
            return await e.reply('something went wrong lol / check maxfilesize?');
          }
        }
        // </download data>

-        if (!source) {
-          if (e.type == 'tg')
+        if(!source) {
+          if(e.type == 'tg')
            return await e.editMessageText(msg.result.chat.id, msg.result.message_id, "something went wrong lol");
          return await e.reply("something went wrong lol");
        }

-        if (source.match(/larger than/)) {
-          if (e.type == 'tg')
+        if(source.match(/larger than/)) {
+          if(e.type == 'tg')
            return await e.editMessageText(msg.result.chat.id, msg.result.message_id, "too large lol");
          return await e.reply("too large lol");
        }
@@ -209,38 +206,38 @@ export default async bot => {

        // filesize check
        const size = fs.statSync(source).size;
-        if (size > maxfilesize) {
-          await fs.promises.unlink(source).catch(_ => { });
-          if (e.type == 'tg')
+        if(size > maxfilesize) {
+          await fs.promises.unlink(source).catch(_=>{});
+          if(e.type == 'tg')
            return await e.editMessageText(msg.result.chat.id, msg.result.message_id, `too large lol. (${lib.formatSize(size)} / ${lib.formatSize(maxfilesize)})`);
          return await e.reply(`too large lol. (${lib.formatSize(size)} / ${lib.formatSize(maxfilesize)})`);
        }
-
+        
        // mime check
        let mime = (await queue.exec(`file --mime-type -b ${source}`)).stdout.trim();
        try {
-          if (mime == 'video/x-matroska') { // mkv failsafe
+          if(mime == 'video/x-matroska') { // mkv failsafe
            await queue.exec(`ffmpeg -i ./tmp/${uuid}.mkv -codec copy ./tmp/${uuid}.mp4`);
-            await fs.promises.unlink(source).catch(_ => { });
+            await fs.promises.unlink(source).catch(_=>{});
            source = source.replace(/\.mkv$/, '.mp4');
            mime = 'video/mp4';
          }
-          if (source.match(/\.opus$/)) { // opus failsafe
+          if(source.match(/\.opus$/)) { // opus failsafe
            await queue.exec(`ffmpeg -i ./tmp/${uuid}.opus -codec copy ./tmp/${uuid}.ogg`);
            await fs.promises.unlink(source);
            source = source.replace(/\.opus$/, '.ogg');
            mime = 'audio/ogg';
          }
-        } catch (err) {
-          await fs.promises.unlink(source).catch(_ => { });
-          if (e.type == 'tg')
+        } catch(err) {
+          await fs.promises.unlink(source).catch(_=>{});
+          if(e.type == 'tg')
            return await e.editMessageText(msg.result.chat.id, msg.result.message_id, "something went wrong lol");
          return await e.reply("something went wrong lol");
        }

-        if (!Object.keys(cfg.mimes).includes(mime)) {
-          await fs.promises.unlink(source).catch(_ => { });
-          if (e.type == 'tg')
+        if(!Object.keys(cfg.mimes).includes(mime)) {
+          await fs.promises.unlink(source).catch(_=>{});
+          if(e.type == 'tg')
            return await e.editMessageText(msg.result.chat.id, msg.result.message_id, `lol, go f0ck yourself (${mime})`);
          return await e.reply(`lol, go f0ck yourself (${mime})`);
        }
@@ -250,9 +247,9 @@ export default async bot => {

        // check repost (checksum)
        repost = await queue.checkrepostsum(checksum);
-        if (repost) {
-          await fs.promises.unlink(source).catch(_ => { });
-          if (e.type == 'tg')
+        if(repost) {
+          await fs.promises.unlink(source).catch(_=>{});
+          if(e.type == 'tg')
            return await e.editMessageText(msg.result.chat.id, msg.result.message_id, `repost motherf0cker (checksum): ${cfg.main.url.full}/${repost}`);
          return await e.reply(`repost motherf0cker (checksum): ${cfg.main.url.full}/${repost}`);
        }
@@ -260,7 +257,7 @@ export default async bot => {
        const filename = path.basename(source);

        await fs.promises.copyFile(source, `./public/b/${filename}`);
-        await fs.promises.unlink(source).catch(_ => { });
+        await fs.promises.unlink(source).catch(_=>{});

        // user alias
        let username = e.user.nick || e.user.username;
@@ -271,42 +268,33 @@ export default async bot => {
          where lower(user_alias.alias) ilike ${username}
          limit 1
        `)?.[0]?.user;
-        if (alias) {
+        if(alias) {
          username = alias;
        }

        await db`
-          insert into items ${db({
-          src: e.media ? "" : link,
-          dest: filename,
-          mime: mime,
-          size: size,
-          checksum: checksum,
-          username: username,
-          userchannel: e.channel,
-          usernetwork: e.network,
-          stamp: ~~(new Date() / 1000),
-          active: true
-        }, 'src', 'dest', 'mime', 'size', 'checksum', 'username', 'userchannel', 'usernetwork', 'stamp', 'active')
+          insert into items ${
+            db({
+              src: e.media ? "" : link,
+              dest: filename,
+              mime: mime,
+              size: size,
+              checksum: checksum,
+              username: username,
+              userchannel: e.channel,
+              usernetwork: e.network,
+              stamp: ~~(new Date() / 1000),
+              active: true
+            }, 'src', 'dest', 'mime', 'size', 'checksum', 'username', 'userchannel', 'usernetwork', 'stamp', 'active')
          }
        `;

        const itemid = await queue.getItemID(filename);

-        // auto-tag sfw
-        await db`
-          insert into tags_assign ${db({
-          item_id: itemid,
-          tag_id: 1, // sfw
-          user_id: 2 // f0ck
-        }, 'item_id', 'tag_id', 'user_id')
-          }
-        `;
-
        // generate thumbnail
        try {
          await queue.genThumbnail(filename, mime, itemid, link);
-        } catch (err) {
+        } catch(err) {
          await queue.exec(`magick ./mugge.png ./public/t/${itemid}.webp`);
        }

@@ -327,13 +315,13 @@ export default async bot => {
        let outputmsgirc = `[f0cked] link: ${cfg.main.url.full}/${itemid} | size: ${lib.formatSize(size)} | speed: ${speed}`;
        let outputmsgtg = `[f0cked] size: ${lib.formatSize(size)} | speed: ${speed}`;

-        if (tags?.length > 0) {
+        if(tags?.length > 0) {
          const tagstr = tags.join(', ');
          outputmsgirc += ` | tags: ${tagstr}`;
          outputmsgtg += ` | tags: ${tagstr}`;
        }

-        if (e.type == 'tg') {
+        if(e.type == 'tg') {
          await e.deleteMessage(msg.result.chat.id, msg.result.message_id);
          await e.reply(outputmsgtg, {
            reply_markup: JSON.stringify({
@@ -351,7 +339,7 @@ export default async bot => {
        else {
          await e.reply(outputmsgirc);
        }
-      }
+      });
    }
  }];
 };
--- a/src/index.mjs
+++ b/src/index.mjs
@@ -4,8 +4,10 @@ import lib from "./inc/lib.mjs";
 import cuffeo from "cuffeo";
 import { promises as fs } from "fs";
 import flummpress from "flummpress";
+import { handleUpload } from "./upload_handler.mjs";

 process.on('unhandledRejection', err => {
+  if (err.code === 'ERR_HTTP_HEADERS_SENT') return;
  console.error(err);
  throw err;
 });
@@ -19,7 +21,7 @@ process.on('unhandledRejection', err => {
      this.level = args.level || 0;
      this.name = args.name;
      this.active = args.hasOwnProperty("active") ? args.active : true;
-      this.clients = args.clients || [ "irc", "tg", "slack" ];
+      this.clients = args.clients || ["irc", "tg", "slack"];
      this.f = args.f;
    },
    bot: await new cuffeo(cfg.clients)
@@ -27,7 +29,7 @@ process.on('unhandledRejection', err => {

  console.time("loading");
  const modules = {
-    events:  (await  fs.readdir("./src/inc/events")).filter(f => f.endsWith(".mjs")),
+    events: (await fs.readdir("./src/inc/events")).filter(f => f.endsWith(".mjs")),
    trigger: (await fs.readdir("./src/inc/trigger")).filter(f => f.endsWith(".mjs"))
  };

@@ -41,7 +43,7 @@ process.on('unhandledRejection', err => {
      console.timeLog("loading", `${dir}/${mod}`);
      return res;
    }))).flat(2)
-  })))).reduce((a, b) => ({...a, ...b}));
+  })))).reduce((a, b) => ({ ...a, ...b }));

  blah.events.forEach(event => {
    console.timeLog("loading", `registering event > ${event.name}`);
@@ -61,15 +63,16 @@ process.on('unhandledRejection', err => {
  const router = app.router;
  const tpl = app.tpl;

+
  app.use(async (req, res) => {
    // sessionhandler
    req.session = false;
-    if(req.url.pathname.match(/^\/(s|b|t|ca)\//))
+    if (req.url.pathname.match(/^\/(s|b|t|ca)\//))
      return;
    req.theme = req.cookies.theme || 'amoled';
    req.fullscreen = req.cookies.fullscreen || 0;

-    if(req.cookies.session) {
+    if (req.cookies.session) {
      const user = await db`
        select "user".id, "user".login, "user".user, "user".admin, "user_sessions".id as sess_id, "user_options".*
        from "user_sessions"
@@ -78,8 +81,8 @@ process.on('unhandledRejection', err => {
        where "user_sessions".session = ${lib.md5(req.cookies.session)}
        limit 1
      `;
-      
-      if(user.length === 0) {
+
+      if (user.length === 0) {
        return res.writeHead(307, { // delete session
          "Cache-Control": "no-cache, public",
          "Set-Cookie": "session=; Path=/;  expires=Thu, 01 Jan 1970 00:00:00 GMT",
@@ -91,28 +94,26 @@ process.on('unhandledRejection', err => {

      // log last action
      await db`
-        update "user_sessions" set ${
-          db({
-            last_used: ~~(Date.now() / 1e3),
-            last_action: req.url.pathname,
-            browser: req.headers['user-agent']
-          }, 'last_used', 'last_action', 'browser')
+        update "user_sessions" set ${db({
+        last_used: ~~(Date.now() / 1e3),
+        last_action: req.url.pathname,
+        browser: req.headers['user-agent']
+      }, 'last_used', 'last_action', 'browser')
        }
        where id = ${+user[0].sess_id}
      `;

      req.session.theme = req.cookies.theme;
      req.session.fullscreen = req.cookies.fullscreen;
-      
+
      // update userprofile
      await db`
-        insert into "user_options" ${
-          db({
-            user_id: +user[0].id,
-            mode: user[0].mode ?? 0,
-            theme: req.session.theme ?? 'amoled',
-            fullscreen: req.session.fullscreen || 0
-          }, 'user_id', 'mode', 'theme', 'fullscreen')
+        insert into "user_options" ${db({
+        user_id: +user[0].id,
+        mode: user[0].mode ?? 0,
+        theme: req.session.theme ?? 'amoled',
+        fullscreen: req.session.fullscreen || 0
+      }, 'user_id', 'mode', 'theme', 'fullscreen')
        }
        on conflict ("user_id") do update set
          mode = excluded.mode,
@@ -123,6 +124,15 @@ process.on('unhandledRejection', err => {
    }
  });

+  // Bypass middleware for direct upload handling
+  app.use(async (req, res) => {
+    if (req.method === 'POST' && req.url.pathname === '/api/v2/upload') {
+      await handleUpload(req, res);
+      // Modify URL to prevent router matching and double execution
+      req.url.pathname = '/handled_upload_bypass';
+    }
+  });
+
  tpl.views = "views";
  tpl.debug = true;
  tpl.cache = false;
--- a/src/upload_handler.mjs
+++ b/src/upload_handler.mjs
@@ -0,0 +1,254 @@
+import { promises as fs } from "fs";
+import db from "./inc/sql.mjs";
+import lib from "./inc/lib.mjs";
+import cfg from "./inc/config.mjs";
+import queue from "./inc/queue.mjs";
+import path from "path";
+
+// Native multipart form data parser
+const parseMultipart = (buffer, boundary) => {
+    const parts = {};
+    const boundaryBuffer = Buffer.from(`--${boundary}`);
+    const segments = [];
+
+    let start = 0;
+    let idx;
+
+    while ((idx = buffer.indexOf(boundaryBuffer, start)) !== -1) {
+        if (start !== 0) {
+            segments.push(buffer.slice(start, idx - 2)); // -2 for \r\n before boundary
+        }
+        start = idx + boundaryBuffer.length + 2; // +2 for \r\n after boundary
+    }
+
+    for (const segment of segments) {
+        const headerEnd = segment.indexOf('\r\n\r\n');
+        if (headerEnd === -1) continue;
+
+        const headers = segment.slice(0, headerEnd).toString();
+        const body = segment.slice(headerEnd + 4);
+
+        const nameMatch = headers.match(/name="([^"]+)"/);
+        const filenameMatch = headers.match(/filename="([^"]+)"/);
+        const contentTypeMatch = headers.match(/Content-Type:\s*([^\r\n]+)/i);
+
+        if (nameMatch) {
+            const name = nameMatch[1];
+            if (filenameMatch) {
+                parts[name] = {
+                    filename: filenameMatch[1],
+                    contentType: contentTypeMatch ? contentTypeMatch[1] : 'application/octet-stream',
+                    data: body
+                };
+            } else {
+                parts[name] = body.toString().trim();
+            }
+        }
+    }
+
+    return parts;
+};
+
+// Collect request body as buffer
+const collectBody = (req) => {
+    return new Promise((resolve, reject) => {
+        const chunks = [];
+        req.on('data', chunk => chunks.push(chunk));
+        req.on('end', () => resolve(Buffer.concat(chunks)));
+        req.on('error', reject);
+
+        // Ensure stream flows
+        if (req.isPaused()) req.resume();
+    });
+};
+
+// Helper for JSON response
+const sendJson = (res, data, code = 200) => {
+    res.writeHead(code, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify(data));
+};
+
+export const handleUpload = async (req, res) => {
+    console.log('[UPLOAD HANDLER] Started');
+
+    // Manual Session Lookup (because flummpress middleware might not have finished)
+    // We assume req.cookies is populated by framework or we need to parse it?
+    // index.mjs accesses req.cookies directly, so we assume it works.
+
+    let user = [];
+    if (req.cookies && req.cookies.session) {
+        user = await db`
+            select "user".id, "user".login, "user".user, "user".admin, "user_sessions".id as sess_id, "user_options".*
+            from "user_sessions"
+            left join "user" on "user".id = "user_sessions".user_id
+            left join "user_options" on "user_options".user_id = "user_sessions".user_id
+            where "user_sessions".session = ${lib.md5(req.cookies.session)}
+            limit 1
+          `;
+    }
+
+    if (user.length === 0) {
+        console.log('[UPLOAD HANDLER] Unauthorized - No valid session found');
+        return sendJson(res, { success: false, msg: 'Unauthorized' }, 401);
+    }
+
+    // Mock req.session for consistency if needed by other logic, though we use 'user[0]' here
+    req.session = user[0];
+    console.log('[UPLOAD HANDLER] Authorized:', req.session.user);
+
+    try {
+        const contentType = req.headers['content-type'] || '';
+        const boundaryMatch = contentType.match(/boundary=(.+)$/);
+
+        if (!boundaryMatch) {
+            console.log('[UPLOAD HANDLER] No boundary');
+            return sendJson(res, { success: false, msg: 'Invalid content type' }, 400);
+        }
+
+        console.log('[UPLOAD HANDLER] Collecting body...');
+        const body = await collectBody(req);
+        console.log('[UPLOAD HANDLER] Body collected, size:', body.length);
+
+        const parts = parseMultipart(body, boundaryMatch[1]);
+
+        // Validate required fields
+        const file = parts.file;
+        const rating = parts.rating;
+        const tagsRaw = parts.tags;
+
+        if (!file || !file.data) {
+            return sendJson(res, { success: false, msg: 'No file provided' }, 400);
+        }
+
+        if (!rating || !['sfw', 'nsfw'].includes(rating)) {
+            return sendJson(res, { success: false, msg: 'Rating (sfw/nsfw) is required' }, 400);
+        }
+
+        const tags = tagsRaw ? tagsRaw.split(',').map(t => t.trim()).filter(t => t.length > 0) : [];
+        if (tags.length < 3) {
+            return sendJson(res, { success: false, msg: 'At least 3 tags are required' }, 400);
+        }
+
+        // Validate MIME type
+        const allowedMimes = ['video/mp4', 'video/webm'];
+        let mime = file.contentType;
+
+        if (!allowedMimes.includes(mime)) {
+            return sendJson(res, { success: false, msg: `Invalid file type. Only mp4 and webm allowed. Got: ${mime}` }, 400);
+        }
+
+        // Validate file size
+        const maxfilesize = cfg.main.maxfilesize;
+        const size = file.data.length;
+
+        if (size > maxfilesize) {
+            return sendJson(res, {
+                success: false,
+                msg: `File too large. Max: ${lib.formatSize(maxfilesize)}, Got: ${lib.formatSize(size)}`
+            }, 400);
+        }
+
+        // Generate UUID
+        const uuid = await queue.genuuid();
+        const ext = mime === 'video/mp4' ? 'mp4' : 'webm';
+        const filename = `${uuid}.${ext}`;
+        const tmpPath = `./tmp/${filename}`;
+        const destPath = `./public/b/${filename}`;
+
+        // Ensure directories exist
+        await fs.mkdir('./tmp', { recursive: true });
+        await fs.mkdir('./public/b', { recursive: true });
+
+        // Save temporarily
+        await fs.writeFile(tmpPath, file.data);
+
+        // Verify MIME
+        const actualMime = (await queue.exec(`file --mime-type -b ${tmpPath}`)).stdout.trim();
+        if (!allowedMimes.includes(actualMime)) {
+            await fs.unlink(tmpPath).catch(() => { });
+            return sendJson(res, { success: false, msg: `Invalid file type detected: ${actualMime}` }, 400);
+        }
+
+        // Constants
+        const checksum = (await queue.exec(`sha256sum ${tmpPath}`)).stdout.trim().split(" ")[0];
+
+        // Check repost
+        const repost = await queue.checkrepostsum(checksum);
+        if (repost) {
+            await fs.unlink(tmpPath).catch(() => { });
+            return sendJson(res, {
+                success: false,
+                msg: `This file already exists`,
+                repost: repost
+            }, 409);
+        }
+
+        // Move to public
+        await fs.copyFile(tmpPath, destPath);
+        await fs.unlink(tmpPath).catch(() => { });
+
+        // Insert
+        await db`
+          insert into items ${db({
+            src: '',
+            dest: filename,
+            mime: actualMime,
+            size: size,
+            checksum: checksum,
+            username: req.session.user,
+            userchannel: 'web',
+            usernetwork: 'web',
+            stamp: ~~(Date.now() / 1000),
+            active: false
+        }, 'src', 'dest', 'mime', 'size', 'checksum', 'username', 'userchannel', 'usernetwork', 'stamp', 'active')
+            }
+        `;
+
+        const itemid = await queue.getItemID(filename);
+
+        // Thumbnail
+        try {
+            await queue.genThumbnail(filename, actualMime, itemid, '');
+        } catch (err) {
+            await queue.exec(`magick ./mugge.png ./public/t/${itemid}.webp`);
+        }
+
+        // Tags
+        const ratingTagId = rating === 'sfw' ? 1 : 2;
+        await db`
+          insert into tags_assign ${db({ item_id: itemid, tag_id: ratingTagId, user_id: req.session.id })}
+        `;
+
+        for (const tagName of tags) {
+            let tagRow = await db`
+            select id from tags where normalized = slugify(${tagName}) limit 1
+          `;
+
+            let tagId;
+            if (tagRow.length === 0) {
+                await db`
+              insert into tags ${db({ tag: tagName }, 'tag')}
+            `;
+                tagRow = await db`
+              select id from tags where normalized = slugify(${tagName}) limit 1
+            `;
+            }
+            tagId = tagRow[0].id;
+
+            await db`
+            insert into tags_assign ${db({ item_id: itemid, tag_id: tagId, user_id: req.session.id })}
+            on conflict do nothing
+          `;
+        }
+
+        return sendJson(res, {
+            success: true,
+            msg: 'Upload successful! Your upload is pending admin approval.',
+            itemid: itemid
+        });
+
+    } catch (err) {
+        console.error('[UPLOAD HANDLER ERROR]', err);
+        return sendJson(res, { success: false, msg: 'Upload failed: ' + err.message }, 500);
+    }
+};
--- a/views/admin.html
+++ b/views/admin.html
@@ -6,17 +6,18 @@
    <span>Hier entsteht eine Internetpräsenz!</span><br>
    <hr>
    <p>f0ck stats: @if(typeof totals !== "undefined")
-    total: {{ totals.total }} | tagged: {{ totals.tagged }} | untagged: {{ totals.untagged }} | sfw: {{ totals.sfw }} | nsfw: {{ totals.nsfw }}
-    @endif</p>
+      total: {{ totals.total }} | tagged: {{ totals.tagged }} | untagged: {{ totals.untagged }} | sfw: {{ totals.sfw }}
+      | nsfw: {{ totals.nsfw }}
+      @endif</p>
    <hr>
    <div class="admintools">
      <p>Adminwerkzeuge</p>
      <ul>
-        <!-- <li><a href="/admin/log">Logs</a></li>
-        <li><a href="/admin/recover">Recover f0cks</a></li> -->
+        <!-- <li><a href="/admin/log">Logs</a></li> -->
+        <li><a href="/admin/approve">Approval Queue</a></li>
        <li><a href="/admin/sessions">Sessions</a></li>
      </ul>
    </div>
  </div>
 </div>
-@include(snippets/footer)
+@include(snippets/footer)
--- a/views/admin/approve.html
+++ b/views/admin/approve.html
@@ -0,0 +1,84 @@
+@include(snippets/header)
+<div id="main">
+    <div class="container">
+        <h1>APPROVAL QUEUE</h1>
+        <p>Items here are pending approval.</p>
+        <table class="table" style="width: 100%">
+            <thead>
+                <tr>
+                    <td>Preview</td>
+                    <td>ID</td>
+                    <td>Uploader</td>
+                    <td>Type</td>
+                    <td>Action</td>
+                </tr>
+            </thead>
+            <tbody>
+                @each(posts as post)
+                <tr>
+                    <td>
+                        <video controls loop muted preload="metadata" style="max-height: 200px; max-width: 300px;">
+                            <source src="/b/{{ post.dest }}" type="{{ post.mime }}">
+                        </video>
+                    </td>
+                    <td>{{ post.id }}</td>
+                    <td>{{ post.username }}</td>
+                    <td>{{ post.mime }}</td>
+                    <td>
+                        <a href="/admin/approve/?id={{ post.id }}" class="badge badge-success">Approve</a>
+                        <a href="/admin/deny/?id={{ post.id }}" class="badge badge-danger btn-deny-async">Deny /
+                            Delete</a>
+                    </td>
+                </tr>
+                @endeach
+                @if(posts.length === 0)
+                <tr>
+                    <td colspan="5">No pending items.</td>
+                </tr>
+                @endif
+            </tbody>
+        </table>
+        <br>
+        @if(typeof pages !== 'undefined' && pages > 1)
+        <div class="pagination" style="display: flex; gap: 10px; align-items: center; justify-content: center;">
+            @if(page > 1)
+            <a href="/admin/approve?page={{ page - 1 }}" class="badge badge-secondary">&laquo; Prev</a>
+            @endif
+            <span>Page {{ page }} of {{ pages }}</span>
+            @if(page < pages) <a href="/admin/approve?page={{ page + 1 }}" class="badge badge-secondary">Next
+                &raquo;</a>
+                @endif
+        </div>
+        <br>
+        @endif
+        <a href="/admin">Back to Admin</a>
+    </div>
+</div>
+<script>
+    document.querySelectorAll('.btn-deny-async').forEach(btn => {
+        btn.addEventListener('click', async e => {
+            e.preventDefault();
+            if (!confirm('Permanently delete this item?')) return;
+
+            const url = btn.href;
+            const row = btn.closest('tr');
+            const originalText = btn.innerText;
+            btn.innerText = 'Deleting...';
+
+            try {
+                const res = await fetch(url);
+                if (res.ok) {
+                    row.style.opacity = '0';
+                    setTimeout(() => row.remove(), 500);
+                } else {
+                    alert('Delete request failed');
+                    btn.innerText = originalText;
+                }
+            } catch (err) {
+                alert('Error: ' + err);
+                btn.innerText = originalText;
+            }
+        });
+    });
+</script>
+@include(snippets/footer)
--- a/views/item.html
+++ b/views/item.html
@@ -1,5 +1,5 @@
@include(snippets/header)
-<canvas class="hidden-xs" id="bg"></canvas>
+
 <div class="wrapper">
  <div id="main">

--- a/views/snippets/footer.html
+++ b/views/snippets/footer.html
@@ -1,10 +1,32 @@
-  <script async src="/s/js/theme.js?v=@mtime(/public/s/js/theme.js)"></script>
-  <script src="/s/js/v0ck.js?v=@mtime(/public/s/js/v0ck.js)"></script>
-  <script src="/s/js/f0ck.js?v=@mtime(/public/s/js/f0ck.js)"></script>
-  @if(session && session.admin)
-    <script src="/s/js/admin.js?v=@mtime(/public/s/js/admin.js)"></script>
-  @elseif(session && !session.admin)
-    <script src="/s/js/user.js?v=@mtime(/public/s/js/user.js)"></script>
-  @endif
+<div id="delete-tag-modal" class="modal-overlay" style="display:none;">
+  <div class="modal-content">
+    <h3>Delete Tag?</h3>
+    <p>Are you sure you want to delete the tag <strong id="delete-tag-name"></strong>?</p>
+    <div class="modal-actions">
+      <button id="delete-tag-confirm" class="btn-danger">Delete</button>
+      <button id="delete-tag-cancel" class="btn-secondary">Cancel</button>
+    </div>
+  </div>
+</div>
+<div id="delete-item-modal" class="modal-overlay" style="display:none;">
+  <div class="modal-content">
+    <h3>Delete Item?</h3>
+    <p>Are you sure you want to delete item <strong id="delete-item-id"></strong> by <strong
+        id="delete-item-poster"></strong>?</p>
+    <div class="modal-actions">
+      <button id="delete-item-confirm" class="btn-danger">Delete</button>
+      <button id="delete-item-cancel" class="btn-secondary">Cancel</button>
+    </div>
+  </div>
+</div>
+<script async src="/s/js/theme.js?v=@mtime(/public/s/js/theme.js)"></script>
+<script src="/s/js/v0ck.js?v=@mtime(/public/s/js/v0ck.js)"></script>
+<script src="/s/js/f0ck.js?v=@mtime(/public/s/js/f0ck.js)"></script>
+@if(session && session.admin)
+<script src="/s/js/admin.js?v=@mtime(/public/s/js/admin.js)"></script>
+@elseif(session && !session.admin)
+<script src="/s/js/user.js?v=@mtime(/public/s/js/user.js)"></script>
+@endif
 </body>
-</html>
+
+</html>
--- a/views/snippets/header.html
+++ b/views/snippets/header.html
@@ -1,14 +1,19 @@
 <!doctype html>
-<html lang="en" theme="@if(typeof theme !== "undefined"){{ theme }}@endif" res="@if(typeof fullscreen !== "undefined"){{ fullscreen == 1 ? 'fullscreen' : '' }}@endif">
+<html lang="en" theme="@if(typeof theme !== 'undefined'){{ theme }}@endif"
+  res="@if(typeof fullscreen !== 'undefined'){{ fullscreen == 1 ? 'fullscreen' : '' }}@endif">
+
 <head>
-  @if(typeof item !== "undefined")<title>f0bm - {{ item.id }}</title>@else<title>f0bm</title>@endif
+  @if(typeof item !== 'undefined')<title>f0bm - {{ item.id }}</title>@else<title>f0bm</title>@endif
  <link rel="icon" type="image/gif" href="/s/img/favicon.png" />
  <link rel="stylesheet" href="/s/css/f0ck.css?v=@mtime(/public/s/css/f0ck.css)">
-  <link rel="stylesheet" href="/s/css/w0bm.css?v=@mtime(/public/s/css/w0bm.css)"> 
+  <link rel="stylesheet" href="/s/css/w0bm.css?v=@mtime(/public/s/css/w0bm.css)">
  <meta charset="utf-8" />
  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  @if(typeof item !== "undefined")<link rel="canonical" href="https://w0bm.com/{{ item.id }}" />@endif
+  @if(typeof item !== 'undefined')
+  <link rel="canonical" href="https://w0bm.com/{{ item.id }}" />@endif
 </head>
+
 <body>
  <!-- hier splitting betreiben  -->
-  @include(snippets/navbar)
+  <canvas class="hidden-xs" id="bg"></canvas>
+  @include(snippets/navbar)
--- a/views/snippets/navbar.html
+++ b/views/snippets/navbar.html
@@ -2,18 +2,38 @@
 <!-- logged in -->
 <nav class="navbar navbar-expand-lg">
  <a class="navbar-brand" href="/"><span class="f0ck" width="" height="">w0bm.com</span></a>
-
-  <div class="navigation-links-guest">
-    <ol>
+  <div class="nav-left-group">
+    <div class="nav-user-dropdown">
+      <button class="nav-user-btn" id="nav-user-toggle">
+        {{ session.user }} ▾
+      </button>
+      <div class="nav-user-menu" id="nav-user-menu">
+        <a href="/user/{{ session.user.toLowerCase() }}">profile</a>
+        <a href="/user/{{ session.user.toLowerCase() }}/favs">favs</a>
+        <a href="/upload">upload</a>
+        @if(session.admin)
+        <a href="/admin">admin</a>
+        @endif
+        <a href="/settings">settings</a>
+        <div class="nav-user-divider"></div>
+        <a href="/logout">logout</a>
+      </div>
+    </div>
+    <div class="nav-links">
      <a href="/tags">tags</a>
      <a href="/about">about</a>
      @if(!/^\/\d$/.test(url.pathname))
      <a href="/random" id="nav-random">rand</a>
      @endif
-    </ol>
+      <a href="#" id="nav-search-btn" title="Search"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
+          fill="currentColor" viewBox="0 0 16 16">
+          <path
+            d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z" />
+        </svg></a>
+    </div>
  </div>
  <!-- show pagination only for tags and main page -->
-  @if(!/^\/\d$/.test(url.pathname))
+  @if(!/^\/\d+$/.test(url.pathname))
  <div class="collapse navbar-collapse show" id="navbarSupportedContent">
    <div class="pagination-container-fluid">
      <div class="pagination-wrapper">
@@ -27,7 +47,6 @@
 <!-- not logged in -->
 <nav class="navbar navbar-expand-lg">
  <a class="navbar-brand" href="/"><span class="f0ck" width="" height="">w0bm.com</span></a>
-
  <div class="navigation-links-guest">
    <ol>
      <a href="/tags">tags</a>
@@ -35,10 +54,15 @@
      @if(!/^\/\d$/.test(url.pathname))
      <a href="/random" id="nav-random">rand</a>
      @endif
+      <a href="#" id="nav-search-btn-guest" title="Search"><svg xmlns="http://www.w3.org/2000/svg" width="16"
+          height="16" fill="currentColor" viewBox="0 0 16 16">
+          <path
+            d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z" />
+        </svg></a>
    </ol>
  </div>
  <!-- show pagination only for tags and main page -->
-  @if(!/^\/\d$/.test(url.pathname))
+  @if(!/^\/\d+$/.test(url.pathname))
  <div class="collapse navbar-collapse show" id="navbarSupportedContent">
    <div class="pagination-container-fluid">
      <div class="pagination-wrapper">
--- a/views/tags.html
+++ b/views/tags.html
@@ -2,27 +2,33 @@
 <div id="main">
  <div class="container">
    <h3 style="text-align: center;">☯</h3>
-    <div class="tags">
+    <div class="tags-grid">
      @if(session)
      @each(toptags_regged as toptag)
-      <div class="tag badge badge-light mr-2">
-        <div class="tagbox-body">
-          <span class="toptag_id">{!! toptag.tag !!}</span>
-          <span class="toptag_tag"><a href="/tag/{!! toptag.tag !!}">{{ toptag.total_items }}</a></span>
+      <a href="/tag/{!! toptag.tag !!}" class="tag-card">
+        <div class="tag-card-image">
+          <img src="/tag_image/{!! toptag.tag !!}" loading="lazy" alt="{!! toptag.tag !!}">
        </div>
-      </div>
+        <div class="tag-card-content">
+          <span class="tag-name">#{!! toptag.tag !!}</span>
+          <span class="tag-count">{{ toptag.total_items }} posts</span>
+        </div>
+      </a>
      @endeach
      @else
      @each(toptags as toptag)
-      <div class="tag badge badge-light mr-2">
-        <div class="tagbox-body">
-          <span class="toptag_id">{!! toptag.tag !!}</span>
-          <span class="toptag_tag"><a href="/tag/{!! toptag.tag !!}">{{ toptag.total_items }}</a></span>
+      <a href="/tag/{!! toptag.tag !!}" class="tag-card">
+        <div class="tag-card-image">
+          <img src="/tag_image/{!! toptag.tag !!}" loading="lazy" alt="{!! toptag.tag !!}">
        </div>
-      </div>
+        <div class="tag-card-content">
+          <span class="tag-name">#{!! toptag.tag !!}</span>
+          <span class="tag-count">{{ toptag.total_items }} posts</span>
+        </div>
+      </a>
      @endeach
      @endif
    </div>
  </div>
 </div>
-@include(snippets/footer)
+@include(snippets/footer)
--- a/views/upload.html
+++ b/views/upload.html
@@ -1,37 +1,440 @@
@include(snippets/header)
-<div class="upload">
-    <h5>Upload</h5>
-    <p>To add videos to the w0bm catalogue you must join our <a href="https://t.me/+w97TCd988ehkNWEy">Telegram</a> group</p>
-    <h5>Content Guideline</h5>
-    <p>w0bm follows strict principles when it comes to content, please keep this in mind.</p>
-    <p>We do not want content that</p>
-    <ul>
-        <li>glorifies Nazis</li>
-        <li>sexualizes children and minors</li>
-        <li>is political</li>
-        <li>glorifies military</li>
-        <li>depicts gore</li>
-        <li>depicts acts of terrorism</li>
-        <li>depicts violence and cruelty against animals</li>
-    </ul>
-    <p>We want content that</p>
-    <ul>
-        <li>is cool</li>
-        <li>has deeper value</li>
-        <li>is fun to watch</li>
-        <li>has a vibe to it</li>
-        <li>can be looped for 5000 times and doesnt get boring</li>
-    </ul>
-    <p>but in general we welcome content that has been curated beforehand by the uploader and believe that they understand the vibe.</p>
-    <p>Content that is deemed NSFW (Not Safe For Work) MUST be tagged with "nsfw"</p>
-    <p>This list is subject to change, please review it periodically.</p> 
-    <br>
-    <h5>How it works</h5>
-    <ul>
-        <li>The maximum filesize for direct file upload is 20MB and cannot be exceeded.</li>
-        <li>There is a much higher limit for non-direct uploads via sending a URL.</li>
-        <li>You can send a link to the group and put a !f behind it and the bot will pick it up and add it to w0bm.</li>
-        <li>In the menu below the bots message you can select the rating and additional tags.</li>
-    </ul>
+<div class="upload-container">
+    <h2>Upload</h2>
+
+    <div class="content-guidelines">
+        <h4>Content Guideline</h4>
+        <p>w0bm follows strict principles when it comes to content, please keep this in mind.</p>
+        <div class="guidelines-grid">
+            <div class="guidelines-dont">
+                <h5>We do not want</h5>
+                <ul>
+                    <li>Content glorifying Nazis</li>
+                    <li>Sexualization of children/minors</li>
+                    <li>Political content</li>
+                    <li>Military glorification</li>
+                    <li>Gore</li>
+                    <li>Acts of terrorism</li>
+                    <li>Violence against animals</li>
+                </ul>
+            </div>
+            <div class="guidelines-do">
+                <h5>We want</h5>
+                <ul>
+                    <li>Cool content</li>
+                    <li>Deeper value</li>
+                    <li>Fun to watch</li>
+                    <li>Has a vibe to it</li>
+                    <li>Can be looped 5000 times</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    @if(session)
+    <form id="upload-form" class="upload-form" enctype="multipart/form-data">
+        <div class="form-section">
+            <label>Video File <span class="required">*</span></label>
+            <div class="drop-zone" id="drop-zone">
+                <input type="file" id="file-input" name="file" accept="video/mp4,video/webm" required>
+                <div class="drop-zone-prompt">
+                    <svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                        <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path>
+                        <polyline points="17 8 12 3 7 8"></polyline>
+                        <line x1="12" y1="3" x2="12" y2="15"></line>
+                    </svg>
+                    <p>Drop your mp4 or webm here<br>or click to browse</p>
+                </div>
+                <div class="file-preview" id="file-preview" style="display: none;">
+                    <span class="file-name" id="file-name"></span>
+                    <span class="file-size" id="file-size"></span>
+                    <button type="button" class="btn-remove" id="remove-file">✕</button>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-section">
+            <label>Rating <span class="required">*</span></label>
+            <div class="rating-options">
+                <label class="rating-option">
+                    <input type="radio" name="rating" value="sfw" required>
+                    <span class="rating-label sfw">SFW</span>
+                </label>
+                <label class="rating-option">
+                    <input type="radio" name="rating" value="nsfw">
+                    <span class="rating-label nsfw">NSFW</span>
+                </label>
+            </div>
+        </div>
+
+        <div class="form-section">
+            <label>Tags <span class="required">*</span> <span class="tag-count" id="tag-count">(0/3
+                    minimum)</span></label>
+            <div class="tag-input-container">
+                <div class="tags-list" id="tags-list"></div>
+                <input type="text" id="tag-input" placeholder="Type a tag and press Enter" autocomplete="off">
+                <div class="tag-suggestions" id="tag-suggestions"></div>
+            </div>
+            <input type="hidden" name="tags" id="tags-hidden">
+        </div>
+
+        <div class="form-actions">
+            <button type="submit" id="submit-btn" class="btn-upload" disabled>
+                <span class="btn-text">3 tags required</span>
+                <span class="btn-loading" style="display: none;">Uploading...</span>
+            </button>
+        </div>
+
+        <div class="upload-progress" id="upload-progress" style="display: none;">
+            <div class="progress-bar">
+                <div class="progress-fill" id="progress-fill"></div>
+            </div>
+            <span class="progress-text" id="progress-text">0%</span>
+        </div>
+
+        <div class="upload-status" id="upload-status"></div>
+    </form>
+    @else
+    <div class="login-required">
+        <p>You must be logged in to upload content.</p>
+        <a href="/login" class="btn-login">Login</a>
+    </div>
+    @endif
 </div>
+
+<style>
+    .upload-container {
+        max-width: 700px;
+        margin: 2rem auto;
+        padding: 2rem;
+    }
+
+    .upload-container h2 {
+        margin-bottom: 1.5rem;
+        color: var(--accent);
+    }
+
+    .content-guidelines {
+        background: rgba(255, 255, 255, 0.03);
+        border: 1px solid rgba(255, 255, 255, 0.1);
+        border-radius: 8px;
+        padding: 1.5rem;
+        margin-bottom: 2rem;
+    }
+
+    .content-guidelines h4 {
+        margin-bottom: 0.5rem;
+        color: var(--accent);
+    }
+
+    .guidelines-grid {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 1.5rem;
+        margin-top: 1rem;
+    }
+
+    .guidelines-dont h5 {
+        color: #ff6b6b;
+    }
+
+    .guidelines-do h5 {
+        color: #51cf66;
+    }
+
+    .guidelines-grid ul {
+        list-style: none;
+        padding: 0;
+        margin: 0.5rem 0 0 0;
+    }
+
+    .guidelines-grid li {
+        padding: 0.3rem 0;
+        font-size: 0.9rem;
+        opacity: 0.8;
+    }
+
+    .upload-form {
+        display: flex;
+        flex-direction: column;
+        gap: 1.5rem;
+    }
+
+    .form-section label {
+        display: block;
+        margin-bottom: 0.5rem;
+        font-weight: 500;
+    }
+
+    .required {
+        color: #ff6b6b;
+    }
+
+    .drop-zone {
+        border: 2px dashed rgba(255, 255, 255, 0.2);
+        border-radius: 8px;
+        padding: 2rem;
+        text-align: center;
+        cursor: pointer;
+        transition: all 0.2s;
+        position: relative;
+    }
+
+    .drop-zone:hover,
+    .drop-zone.dragover {
+        border-color: var(--accent);
+        background: rgba(255, 255, 255, 0.02);
+    }
+
+    .drop-zone input[type="file"] {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        opacity: 0;
+        cursor: pointer;
+    }
+
+    .drop-zone-prompt {
+        color: rgba(255, 255, 255, 0.5);
+    }
+
+    .drop-zone-prompt svg {
+        margin-bottom: 0.5rem;
+    }
+
+    .file-preview {
+        display: flex;
+        align-items: center;
+        gap: 1rem;
+        padding: 1rem;
+        background: rgba(255, 255, 255, 0.05);
+        border-radius: 4px;
+    }
+
+    .file-name {
+        font-weight: 500;
+        flex: 1;
+    }
+
+    .file-size {
+        opacity: 0.6;
+        font-size: 0.9rem;
+    }
+
+    .btn-remove {
+        background: rgba(255, 107, 107, 0.2);
+        border: none;
+        color: #ff6b6b;
+        width: 28px;
+        height: 28px;
+        border-radius: 4px;
+        cursor: pointer;
+    }
+
+    .rating-options {
+        display: flex;
+        gap: 1rem;
+    }
+
+    .rating-option {
+        cursor: pointer;
+    }
+
+    .rating-option input {
+        display: none;
+    }
+
+    .rating-label {
+        display: inline-block;
+        padding: 0.75rem 1.5rem;
+        border-radius: 4px;
+        border: 2px solid transparent;
+        transition: all 0.2s;
+    }
+
+    .rating-label.sfw {
+        background: rgba(81, 207, 102, 0.1);
+        border-color: rgba(81, 207, 102, 0.3);
+    }
+
+    .rating-label.nsfw {
+        background: rgba(255, 107, 107, 0.1);
+        border-color: rgba(255, 107, 107, 0.3);
+    }
+
+    .rating-option input:checked+.rating-label.sfw {
+        background: rgba(81, 207, 102, 0.3);
+        border-color: #51cf66;
+    }
+
+    .rating-option input:checked+.rating-label.nsfw {
+        background: rgba(255, 107, 107, 0.3);
+        border-color: #ff6b6b;
+    }
+
+    .tag-input-container {
+        position: relative;
+        background: rgba(255, 255, 255, 0.05);
+        border: 1px solid rgba(255, 255, 255, 0.1);
+        border-radius: 4px;
+        padding: 0.5rem;
+        display: flex;
+        flex-wrap: wrap;
+        gap: 0.5rem;
+        align-items: center;
+    }
+
+    .tags-list {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 0.5rem;
+    }
+
+    .tag-chip {
+        display: inline-flex;
+        align-items: center;
+        gap: 0.3rem;
+        background: var(--accent);
+        color: #000;
+        padding: 0.3rem 0.6rem;
+        border-radius: 3px;
+        font-size: 0.9rem;
+    }
+
+    .tag-chip button {
+        background: none;
+        border: none;
+        color: inherit;
+        cursor: pointer;
+        padding: 0;
+        font-size: 1rem;
+        line-height: 1;
+    }
+
+    #tag-input {
+        flex: 1;
+        min-width: 120px;
+        background: transparent;
+        border: none;
+        color: inherit;
+        padding: 0.5rem;
+        outline: none;
+    }
+
+    .tag-count {
+        font-weight: normal;
+        font-size: 0.85rem;
+        opacity: 0.7;
+    }
+
+    .tag-count.valid {
+        color: #51cf66;
+    }
+
+    .tag-suggestions {
+        position: absolute;
+        top: 100%;
+        left: 0;
+        right: 0;
+        background: var(--background, #1a1a1a);
+        border: 1px solid rgba(255, 255, 255, 0.1);
+        border-radius: 0 0 4px 4px;
+        max-height: 200px;
+        overflow-y: auto;
+        display: none;
+        z-index: 100;
+    }
+
+    .tag-suggestions.show {
+        display: block;
+    }
+
+    .tag-suggestion {
+        padding: 0.5rem 1rem;
+        cursor: pointer;
+    }
+
+    .tag-suggestion:hover {
+        background: rgba(255, 255, 255, 0.05);
+    }
+
+    .btn-upload {
+        background: var(--accent);
+        color: #000;
+        border: none;
+        padding: 1rem 2rem;
+        border-radius: 4px;
+        font-size: 1rem;
+        font-weight: 600;
+        cursor: pointer;
+        transition: all 0.2s;
+    }
+
+    .btn-upload:disabled {
+        background: rgba(255, 255, 255, 0.1);
+        color: rgba(255, 255, 255, 0.4);
+        cursor: not-allowed;
+    }
+
+    .btn-upload:not(:disabled):hover {
+        transform: translateY(-1px);
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
+    }
+
+    .upload-progress {
+        display: flex;
+        align-items: center;
+        gap: 1rem;
+    }
+
+    .progress-bar {
+        flex: 1;
+        height: 8px;
+        background: rgba(255, 255, 255, 0.1);
+        border-radius: 4px;
+        overflow: hidden;
+    }
+
+    .progress-fill {
+        height: 100%;
+        background: var(--accent);
+        width: 0%;
+        transition: width 0.2s;
+    }
+
+    .upload-status {
+        text-align: center;
+        padding: 1rem;
+    }
+
+    .upload-status.success {
+        color: #51cf66;
+    }
+
+    .upload-status.error {
+        color: #ff6b6b;
+    }
+
+    .login-required {
+        text-align: center;
+        padding: 3rem;
+        background: rgba(255, 255, 255, 0.03);
+        border-radius: 8px;
+    }
+
+    .btn-login {
+        display: inline-block;
+        margin-top: 1rem;
+        padding: 0.75rem 2rem;
+        background: var(--accent);
+        color: #000;
+        text-decoration: none;
+        border-radius: 4px;
+        font-weight: 600;
+    }
+</style>
+
+<script src="/s/js/upload.js"></script>
@include(snippets/footer)
Author	SHA1	Message	Date
x	1a3514effa	more possible fixes for uploading	2026-01-23 23:44:50 +01:00
x	a439683caf	possible upload fix	2026-01-23 23:42:23 +01:00
x	577d73af11	realizing webupload with approval functionality	2026-01-23 23:35:12 +01:00
x	42f4e19897	remove debug output for fav randoming	2026-01-23 22:09:58 +01:00
x	0a5f57b5a9	another possible fix for fav randoming	2026-01-23 22:06:57 +01:00
x	03f2630090	potential fix for mixed random results when unathenticated	2026-01-23 22:00:49 +01:00
x	6692f32c4b	possible fix for random fav behaviour	2026-01-23 21:52:34 +01:00
x	8af49b6ec1	improving fav detection logic	2026-01-23 21:38:47 +01:00
x	9c25f89adc	adding a better navbar	2026-01-23 21:31:06 +01:00
x	ee6fda8f06	new modal for deleting tags and items	2026-01-23 20:52:49 +01:00
x	e9c377dc87	fixing random not working for user fav view	2026-01-23 20:28:03 +01:00
x	f5e386593d	fixing tag image encoding	2026-01-23 20:08:38 +01:00
x	1dd4b54b48	change how tags are displayed in tag image	2026-01-23 19:52:39 +01:00
x	4de2652ffe	adding cool search	2026-01-23 19:44:17 +01:00
Kibi Kelburton	7b1e0af0cb	Merge pull request 'fixing background visibility and states' (#5 ) from eins-f0bm into f0bm Reviewed-on: w0bm/f0bm#5	2026-01-23 17:38:20 +00:00
x	224064d0ca	fixing background visibility and states	2026-01-23 18:37:44 +01:00
Kibi Kelburton	52533486a2	Merge pull request 'eins-f0bm' (#4 ) from eins-f0bm into f0bm Reviewed-on: w0bm/f0bm#4	2026-01-23 16:05:04 +00:00
x	3ee28fd0b7	Merge branch 'f0bm' into eins-f0bm	2026-01-23 17:03:13 +01:00
x	9a03d5f697	adding generic tag cards	2026-01-23 16:53:19 +01:00
eins	4bc8b8f436	Merge pull request 'fixed issues with the random button and hotkeys' (#2 ) from eins/f0bm:f0bm into f0bm Reviewed-on: w0bm/f0bm#2	2026-01-23 14:53:20 +00:00
Kibi Kelburton	007cf3189c	Merge pull request 'added AJAX loading for videos' (#1 ) from eins/f0bm:eins-patch-1 into f0bm Reviewed-on: w0bm/f0bm#1 Reviewed-by: Kibi Kelburton <schrumpel@noreply.DOMAIN>	2026-01-23 13:33:59 +00:00
eins	4a2925b141	revert `a4f9c48e13` revert various fixes to get it working for myself	2026-01-23 13:24:43 +00:00