fixed issues with the random button and hotkeys

2026-01-23 14:07:52 +00:00
parent b72fcaa426
commit 6799ec1567
5 changed files with 85 additions and 76 deletions
--- a/public/s/js/admin.js
+++ b/public/s/js/admin.js
@@ -130,12 +130,12 @@
          return false;
        }
        renderTags(res.tags);
-        span.parentElement.removeChild(span);
+        if (span.parentElement) span.parentElement.removeChild(span);
        testList.innerText = "";
        addtagClick();
      }
      else if (e.key === "Escape") {
-        span.parentElement.removeChild(span);
+        if (span.parentElement) span.parentElement.removeChild(span);
        testList.innerText = "";
      }
      else {
--- a/public/s/js/f0ck.js
+++ b/public/s/js/f0ck.js
@@ -208,10 +208,10 @@ window.requestAnimFrame = (function () {
      return;
    }

-    const link = e.target.closest('#next, #prev, #random, .id-link, .nav-next, .nav-prev');
+    const link = e.target.closest('#next, #prev, #random, #nav-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') {
+      if (link.id === 'random' || link.id === 'nav-random') {
        e.preventDefault();
        const nav = document.querySelector("nav.navbar");
        if (nav) nav.classList.add("pbwork");
@@ -240,7 +240,10 @@ window.requestAnimFrame = (function () {
              window.location.href = link.href;
            }
          })
-          .catch(() => window.location.href = link.href);
+          .catch((err) => {
+            console.error("Random fetch failed:", err);
+            window.location.href = link.href;
+          });
        return;
      }

@@ -261,7 +264,7 @@ window.requestAnimFrame = (function () {
    "a": clickOnElementBinding("#next"),
    "ArrowRight": clickOnElementBinding("#prev"),
    "d": clickOnElementBinding("#prev"),
-    "r": clickOnElementBinding("#random"),
+    "r": clickOnElementBinding("#random, #nav-random"),
    " ": clickOnElementBinding("#f0ck-image")
  };
  document.addEventListener("keydown", e => {
@@ -541,10 +544,13 @@ function init() {

 window.addEventListener('load', init);

-document.getElementById('sbtForm').addEventListener('submit', (e) => {
+const sbtForm = document.getElementById('sbtForm');
+if (sbtForm) {
+  sbtForm.addEventListener('submit', (e) => {
    e.preventDefault();
    const input = document.getElementById('sbtInput').value.trim();
    if (input) {
      window.location.href = `/tag/${encodeURIComponent(input)}`;
    }
-});
+  });
+}
--- a/public/s/js/theme.js
+++ b/public/s/js/theme.js
@@ -1,10 +1,10 @@
 const Cookie = {
  get: name => {
    const c = document.cookie.match(`(?:(?:^|.*; *)${name} *= *([^;]*).*$)|^.*$`)[1];
-    if(c) return decodeURIComponent(c);
+    if (c) return decodeURIComponent(c);
  },
  set: (name, value, opts = {}) => {
-    if(opts.days) {
+    if (opts.days) {
      opts['max-age'] = opts.days * 60 * 60 * 24;
      delete opts.days;
    }
@@ -17,8 +17,11 @@ 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))
+  if (acttheme !== document.documentElement.getAttribute("theme") && themes.includes(acttheme))
    document.documentElement.setAttribute("theme", acttheme);
  [...themecontainer.querySelectorAll("li > a")].forEach(t => t.addEventListener("click", e => {
    e.preventDefault();
@@ -30,15 +33,15 @@ const Cookie = {
  }));

  document.addEventListener("keydown", e => {
-    if(e.target.tagName === "INPUT" ||  e.target.tagName === "TEXTAREA")
+    if (e.target.tagName === "INPUT" || e.target.tagName === "TEXTAREA")
      return;
    const acttheme = Cookie.get('theme') ?? "w0bm";
    const themes = [...themecontainer.querySelectorAll("li > a")].map(t => t.innerText.toLowerCase());
    const k = e.key;
-    if(k === "t") {
+    if (k === "t") {
      e.preventDefault();
      let i = themes.indexOf(acttheme);
-      if(++i >= themes.length)
+      if (++i >= themes.length)
        i = 0;
      document.documentElement.setAttribute("theme", themes[i]);
      document.querySelector("#themes > a").setAttribute("content", themes[i]);
@@ -46,10 +49,10 @@ const Cookie = {
    }
  });

-  if(tbuttonfull = document.querySelector('svg#a_tfull')) {
+  if (tbuttonfull = document.querySelector('svg#a_tfull')) {
    tbuttonfull.addEventListener('click', e => {
      let f = Cookie.get('fullscreen');
-      if(f == 1) {
+      if (f == 1) {
        Cookie.set('fullscreen', 0);
        document.querySelector('html').setAttribute('res', '');
        tbuttonfull.innerHTML = `<use href="/s/img/iconset.svg#window-maximize"></use>`;
--- a/src/inc/routes/apiv2/index.mjs
+++ b/src/inc/routes/apiv2/index.mjs
@@ -3,7 +3,7 @@ import db from '../../sql.mjs';
 import lib from '../../lib.mjs';
 import search from '../../routeinc/search.mjs';

-const allowedMimes = [ "audio", "image", "video", "%" ];
+const allowedMimes = ["audio", "image", "video", "%"];
 export default router => {
  router.group(/^\/api\/v2/, group => {
    group.get(/$/, (req, res) => {
@@ -13,14 +13,18 @@ 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 *
+        select "items".*
        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
      `;
@@ -51,15 +55,13 @@ 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`
        }
@@ -98,7 +100,7 @@ export default router => {
        limit 1
      `;

-      if(item.length === 0) {
+      if (item.length === 0) {
        return res.json({
          success: false,
          msg: 'no items found'
@@ -140,7 +142,7 @@ export default router => {
    // tags lol

    group.put(/\/admin\/tags\/(?<tagname>.*)/, lib.loggedin, async (req, res) => {
-      if(!req.params.tagname || !req.post.newtag) {
+      if (!req.params.tagname || !req.post.newtag) {
        return res.json({
          success: false,
          msg: 'missing tagname or newtag',
@@ -154,7 +156,7 @@ export default router => {
      const tagname = decodeURIComponent(req.params.tagname);
      const newtag = req.post.newtag;

-      if(['sfw', 'nsfw'].includes(tagname) || ['sfw', 'nsfw'].includes(newtag)) {
+      if (['sfw', 'nsfw'].includes(tagname) || ['sfw', 'nsfw'].includes(newtag)) {
        return res.json({
          msg: 'f0ck you'
        }, 405); // method not allowed
@@ -167,7 +169,7 @@ export default router => {
        limit 1
      `)[0];

-      if(!tmptag) {
+      if (!tmptag) {
        return res.json({
          success: false,
          msg: 'no tag found'
@@ -175,8 +177,7 @@ export default router => {
      }

      const q = (await db`
-        update "tags" set ${
-          db({
+        update "tags" set ${db({
        tag: newtag
      }, 'tag')
        }
@@ -195,7 +196,7 @@ export default router => {

      const searchString = req.url.qs.q;

-      if(searchString?.length <= 1) {
+      if (searchString?.length <= 1) {
        reply.error = 'too short lol';
        return res.json(reply);
      }
@@ -212,7 +213,7 @@ export default router => {
        `;
        reply.success = true;
        reply.suggestions = search(q, searchString);
-      } catch(err) {
+      } catch (err) {
        reply.error = err.msg;
      }

@@ -220,7 +221,7 @@ export default router => {
    });

    group.post(/\/admin\/deletepost$/, lib.auth, async (req, res) => {
-      if(!req.post.postid) {
+      if (!req.post.postid) {
        return res.json({
          success: false,
          msg: 'no postid'
@@ -228,7 +229,7 @@ export default router => {
      }
      const id = +req.post.postid;

-      if(id <= 1) {
+      if (id <= 1) {
        return res.json({
          success: false
        });
@@ -243,7 +244,7 @@ export default router => {
        limit 1
      `;

-      if(f0ck.length === 0) {
+      if (f0ck.length === 0) {
        return res.json({
          success: false,
          msg: `f0ck ${id}: f0ck not found`
@@ -252,14 +253,14 @@ export default router => {

      await db`update "items" set active = 'false' where id = ${id}`;

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

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

      res.json({
@@ -276,7 +277,7 @@ export default router => {
        where item_id = ${+postid}
      `;

-      if(Object.values(favs).filter(u => u.user_id === req.session.id)[0]) {
+      if (Object.values(favs).filter(u => u.user_id === req.session.id)[0]) {
        // del fav
        await db`
          delete from "favorites"
@@ -287,8 +288,7 @@ 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')
--- a/views/snippets/navbar.html
+++ b/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">rand</a>
+      <a href="/random" id="nav-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">rand</a>
+      <a href="/random" id="nav-random">rand</a>
      @endif
    </ol>
  </div>