revert a4f9c48e13

revert various fixes to get it working for myself

.gitignore

@@ -8,4 +8,3 @@ deleted/b
 deleted/ca
 deleted/t
 tmp/*
-tools

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);
-})();

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)
@@ -27,12 +26,9 @@ import { promises as fs } from "fs";
   try {
     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);
-    }
+    console.log(`triggered > ${trigger[0].name} (${_e.message})`);
+    await trigger[0].f(_e);
   } catch(err) {
     console.error(err);
   }
-  process.exit(0);
 })();

init.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-npm i
-npm start

public/s/js/admin.js

@@ -130,12 +130,12 @@
           return false;
         }
         renderTags(res.tags);
-        if (span.parentElement) span.parentElement.removeChild(span);
+        span.parentElement.removeChild(span);
         testList.innerText = "";
         addtagClick();
       }
       else if (e.key === "Escape") {
-        if (span.parentElement) span.parentElement.removeChild(span);
+        span.parentElement.removeChild(span);
         testList.innerText = "";
       }
       else {

public/s/js/f0ck.js

@@ -140,7 +140,7 @@ window.requestAnimFrame = (function () {
         html = rawText;
       }
 
-      let container = document.querySelector('#main .container');
+      let container = document.querySelector('.container');
 
       if (!container && document.querySelector('.index-container')) {
         // Transition from Index to Item View
@@ -148,11 +148,6 @@ window.requestAnimFrame = (function () {
         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');
-        if (tagsOverview) {
-          container.innerHTML = '';
-        } else {
         // Already in Item View, clear usage
         const oldContent = container.querySelector('.content');
         const oldMetadata = container.querySelector('.metadata');
@@ -161,7 +156,6 @@ window.requestAnimFrame = (function () {
         if (oldContent) oldContent.remove();
         if (oldMetadata) oldMetadata.remove();
       }
-      }
 
       container.insertAdjacentHTML('beforeend', html);
 
@@ -193,12 +187,13 @@ window.requestAnimFrame = (function () {
   };
 
   const changePage = (e, pbwork = true) => {
-    if (pbwork) {
-      const nav = document.querySelector("nav.navbar");
-      if (nav) nav.classList.add("pbwork");
+    if (e.tagName === 'A') {
+      e.preventDefault();
+      loadItemAjax(e.href);
+    } else {
+      pbwork && document.querySelector("nav.navbar").classList.add("pbwork");
+      !tt && (tt = setTimeout(() => e.click(), stimeout));
     }
-    // Trigger native click for navigation
-    e.click();
   };
 
   // Intercept clicks
@@ -213,10 +208,10 @@ window.requestAnimFrame = (function () {
       return;
     }
 
-    const link = e.target.closest('#next, #prev, #random, #nav-random, .id-link, .nav-next, .nav-prev');
+    const link = e.target.closest('#next, #prev, #random, .id-link, .nav-next, .nav-prev');
     if (link && link.href && link.hostname === window.location.hostname && !e.ctrlKey && !e.shiftKey && !e.altKey && !e.metaKey) {
       // Special check for random
-      if (link.id === 'random' || link.id === 'nav-random') {
+      if (link.id === 'random') {
         e.preventDefault();
         const nav = document.querySelector("nav.navbar");
         if (nav) nav.classList.add("pbwork");
@@ -245,10 +240,7 @@ window.requestAnimFrame = (function () {
               window.location.href = link.href;
             }
           })
-          .catch((err) => {
-            console.error("Random fetch failed:", err);
-            window.location.href = link.href;
-          });
+          .catch(() => window.location.href = link.href);
         return;
       }
 
@@ -269,7 +261,7 @@ window.requestAnimFrame = (function () {
     "a": clickOnElementBinding("#next"),
     "ArrowRight": clickOnElementBinding("#prev"),
     "d": clickOnElementBinding("#prev"),
-    "r": clickOnElementBinding("#random, #nav-random"),
+    "r": clickOnElementBinding("#random"),
     " ": clickOnElementBinding("#f0ck-image")
   };
   document.addEventListener("keydown", e => {
@@ -549,13 +541,10 @@ function init() {
 
 window.addEventListener('load', init);
 
-const sbtForm = document.getElementById('sbtForm');
-if (sbtForm) {
-  sbtForm.addEventListener('submit', (e) => {
+document.getElementById('sbtForm').addEventListener('submit', (e) => {
   e.preventDefault();
   const input = document.getElementById('sbtInput').value.trim();
   if (input) {
     window.location.href = `/tag/${encodeURIComponent(input)}`;
   }
 });
-}

public/s/js/theme.js

@@ -17,9 +17,6 @@ const Cookie = {
 (() => {
   const acttheme = Cookie.get('theme') ?? "w0bm";
   const themecontainer = document.querySelector("li#themes > ul.dropdown-menu");
-
-  if (!themecontainer) return; // Theme menu not present on this page
-
   const themes = [...themecontainer.querySelectorAll("li > a")].map(t => t.innerText.toLowerCase());
   if(acttheme !== document.documentElement.getAttribute("theme") && themes.includes(acttheme))
     document.documentElement.setAttribute("theme", acttheme);

src/inc/routes/apiv2/index.mjs

@@ -13,18 +13,14 @@ 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 tag = req.url.qs.tag || null;
   
       const rows = await db`
-        select "items".*
+        select *
         from "items"
-        left join tags_assign on tags_assign.item_id = items.id
-        left join tags on tags.id = tags_assign.tag_id
         where
           mime ilike ${mime} and
           username ilike ${user} and
           active = 'true'
-          ${tag ? db`and tags.normalized ilike ${'%' + tag + '%'}` : db``}
         order by random()
         limit 1
       `;
@@ -55,13 +51,15 @@ export default router => {
         where
           ${db.unsafe(modequery)} and
           active = 'true'
-          ${opt.older
+          ${
+            opt.older
               ? db`and id <= ${opt.older}`
               : opt.newer
                 ? db`and id >= ${opt.newer}`
                 : db``
           }
-        order by id ${opt.newer
+        order by id ${
+          opt.newer
             ? db`asc`
             : db`desc`
         }
@@ -177,7 +175,8 @@ export default router => {
       }
 
       const q = (await db`
-        update "tags" set ${db({
+        update "tags" set ${
+          db({
             tag: newtag
           }, 'tag')
         }
@@ -288,7 +287,8 @@ export default router => {
       else {
         // add fav
         await db`
-          insert into "favorites" ${db({
+          insert into "favorites" ${
+            db({
               item_id: +postid,
               user_id: +req.session.id
             }, 'item_id', 'user_id')

src/inc/trigger/parser.mjs

@@ -23,7 +23,7 @@ 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)
@@ -51,7 +51,7 @@ export default async bot => {
 
       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`);
 
@@ -73,12 +73,11 @@ export default async bot => {
 
         // read metadata
         let ext;
-        const proxyArgs = cfg.main.socks ? `--proxy ${cfg.main.socks}` : '';
         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) {
             const tmphead = (await fetch(link, { method: "HEAD" })).headers["content-type"];
@@ -93,10 +92,9 @@ export default async bot => {
         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);
             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];
@@ -105,7 +103,7 @@ export default async bot => {
         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) {
             const tmphead = (await fetch(link, { method: "HEAD" })).headers["content-type"];
@@ -120,10 +118,9 @@ export default async bot => {
             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?');
+            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];
           }
         }
 
@@ -142,7 +139,7 @@ export default async bot => {
         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();
+            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");
@@ -164,7 +161,7 @@ export default async bot => {
         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();
+            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");
@@ -174,7 +171,7 @@ export default async bot => {
         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();
+            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");
@@ -276,7 +273,8 @@ export default async bot => {
         }
 
         await db`
-          insert into items ${db({
+          insert into items ${
+            db({
               src: e.media ? "" : link,
               dest: filename,
               mime: mime,
@@ -293,16 +291,6 @@ export default async bot => {
 
         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);
@@ -351,7 +339,7 @@ export default async bot => {
         else {
           await e.reply(outputmsgirc);
         }
-      }
+      });
     }
   }];
 };

views/snippets/navbar.html

@@ -8,7 +8,7 @@
       <a href="/tags">tags</a>
       <a href="/about">about</a>
       @if(!/^\/\d$/.test(url.pathname))
-      <a href="/random" id="nav-random">rand</a>
+      <a href="/random">rand</a>
       @endif
     </ol>
   </div>
@@ -33,7 +33,7 @@
       <a href="/tags">tags</a>
       <a href="/about">about</a>
       @if(!/^\/\d$/.test(url.pathname))
-      <a href="/random" id="nav-random">rand</a>
+      <a href="/random">rand</a>
       @endif
     </ol>
   </div>