remove hoster ranking

Reviewed-on: #76

debug/thumbnailer.mjs

@@ -19,7 +19,7 @@ let items;
 if(_itemid > 0)
   items = await sql('items').where('id', _itemid);
 else
-  items = await sql('items').orderBy('id', 'asc').where('src', 'like', '%soundcloud%').where('mime', 'like', 'audio/%');
+  items = await sql`select id, dest, mime, src from "items"`;
 let count = 1;
 let total = items.length;
 
@@ -32,7 +32,7 @@ for(let item of items) {
     if(mime.startsWith('video/') || mime == 'image/gif')
       await exec(`ffmpegthumbnailer -i./public/b/${filename} -s1024 -o./tmp/${itemid}.png`);
     else if(mime.startsWith('image/') && mime != 'image/gif')
-      await exec(`convert ./public/b/${filename} ./tmp/${itemid}.png`);
+      await exec(`magick ./public/b/${filename} ./tmp/${itemid}.png`);
     else if(mime.startsWith('audio/')) {
       if(link.match(/soundcloud/)) {
         let cover = (await exec(`yt-dlp --get-thumbnail "${link}"`)).stdout.trim();
@@ -42,8 +42,8 @@ for(let item of items) {
             await exec(`wget "${cover}" -O ./tmp/${itemid}.jpg`);
             const size = (await fs.promises.stat(`./tmp/${itemid}.jpg`)).size;
             if(size >= 0) {
-              await exec(`convert ./tmp/${itemid}.jpg ./tmp/${itemid}.png`);
+              await exec(`magick ./tmp/${itemid}.jpg ./tmp/${itemid}.png`);
-              await exec(`convert ./tmp/${itemid}.jpg ./public/ca/${itemid}.webp`);
+              await exec(`magick ./tmp/${itemid}.jpg ./public/ca/${itemid}.webp`);
             }
           } catch(err) {
             //console.log(err);
@@ -51,21 +51,21 @@ for(let item of items) {
         }
         else {
           await exec(`ffmpeg -i ./public/b/${filename} -update 1 -map 0:v -map 0:1 -c copy ./tmp/${itemid}.png`);
-          await exec(`convert ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
+          await exec(`magick ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
         }
       }
       else {
         await exec(`ffmpeg -i ./public/b/${filename} -update 1 -map 0:v -map 0:1 -c copy ./tmp/${itemid}.png`);
-        await exec(`convert ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
+        await exec(`magick ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
       }
     }
 
-    await exec(`convert "./tmp/${itemid}.png" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.webp`);
+    await exec(`magick "./tmp/${itemid}.png" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.webp`);
     await fs.promises.unlink(`./tmp/${itemid}.png`).catch(err => {});
     await fs.promises.unlink(`./tmp/${itemid}.jpg`).catch(err => {});
   } catch(err) {
     //console.log(err);
-    await exec(`convert ./mugge.png ./public/t/${itemid}.webp`);
+    await exec(`magick ./mugge.png ./public/t/${itemid}.webp`);
   }
   console.log(`current: ${itemid} (${count} / ${total})`);
   count++;
@@ -76,7 +76,7 @@ for(let item of items) {
     const itemid = item.id;
     const filename = item.dest;
     await exec(`ffmpegthumbnailer -i./public/b/${filename} -s1024 -o./debug/tmp/${itemid}`);
-    await exec(`convert "./debug/tmp/${itemid}" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.png`);
+    await exec(`magick "./debug/tmp/${itemid}" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.png`);
     await fs.unlink(`./debug/tmp/${itemid}`);
     console.log(`current: ${itemid} (${count} / ${total})`);
   } catch(err) {}

f0ck.sql

@@ -17,13 +17,13 @@ SET client_min_messages = warning;
 SET row_security = off;
 
 --
--- Name: public; Type: SCHEMA; Schema: -; Owner: postgres
+-- Name: public; Type: SCHEMA; Schema: -; Owner: f0ck
 --
 
 -- *not* creating schema, since initdb creates it
 
 
-ALTER SCHEMA public OWNER TO postgres;
+ALTER SCHEMA public OWNER TO f0ck;
 
 --
 -- Name: unaccent; Type: EXTENSION; Schema: -; Owner: -
@@ -664,7 +664,7 @@ ALTER TABLE ONLY public.user_sessions
 CREATE PUBLICATION alltables FOR ALL TABLES WITH (publish = 'insert, update, delete, truncate');
 
 
-ALTER PUBLICATION alltables OWNER TO postgres;
+ALTER PUBLICATION alltables OWNER TO f0ck;
 
 --
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: postgres

public/s/css/f0ck.css

@@ -72,7 +72,7 @@ html[theme='p1nk'] {
   --black: #000;
   --white: #fff;
   --gray: #262626;
-  --nav-bg: #2b2b2b;
+  --nav-bg: #201f1f;
   --nav-brand-border: inset 1px #242424;
   --nav-brand-bg: #171717;
   --navigation-links-bg: #201f1f;
@@ -494,7 +494,7 @@ html[theme="atmos"] {
   --posts-meta-bg: #000000b8;
   --badge-sfw: #68a728;
   --badge-nsfw: #a72828;
-  --badge-tag: #090909;
+  --badge-tag: #353535;
   --scrollbar-color: #2b2b2b;
   --footbar-color: #1fb2b0;
   --loading-indicator-color: #1fb2b0;
@@ -1618,9 +1618,10 @@ span.placeholder {
 }
 
 @media (max-width: 1325px) {
-  .ranking {
+/* ranking page - idea */
+  /* .ranking {
     grid-template-columns: 1fr 1fr !important;
-  }
+  } */
 
   .by-user,
   .by-stats,
@@ -2401,7 +2402,7 @@ table.table tbody tr:nth-of-type(odd) {
 .ranking {
   display: grid;
   grid-template-columns: auto;
-  justify-content: center;
+  /* justify-content: center; */
 }
 
 .ranking div {
@@ -2414,15 +2415,15 @@ table.table tbody tr:nth-of-type(odd) {
 }
 
 .by-user {
-  grid-column: 1;
+  grid-row: 1;
 }
 
 .by-stats {
-  grid-column: 3;
+  grid-row: 3;
 }
 
 .by-hoster {
-  grid-column: 2;
+  grid-row: 2;
 }
 
 /* tags */
@@ -3016,3 +3017,7 @@ input#s_avatar {
 #s_avatar:hover {
   background: #ffffff0f;
 }
+.theforceofthree {
+  display: grid;
+  grid-template-columns: 0.4fr 1fr 0.4fr;
+}

public/s/css/w0bm.css

@@ -0,0 +1,171 @@
+.navbar-brand {
+    display: grid;
+    grid-template-columns: 1fr auto;
+}
+
+.image-brand {
+    width: 5cm;
+}
+
+.kontrollelement {
+    grid-column: 2;
+}
+
+.metadata {
+    grid-template-columns: 0.4fr auto 0.4fr;
+    grid-template-rows: auto 1fr;
+    background-color: transparent !important;
+    border: none !important;
+}
+
+html[theme="f0ck95d"] .badge-dark {
+    border: none;
+    background-image: none;
+    box-shadow: none;
+}
+
+.steuerung {
+    font-size:x-large;
+    font-family: monospace;
+}
+
+.steuerung a {
+    color: white;
+}
+
+.blahlol {
+    grid-column: 2;
+}
+
+span#favs {
+    background: transparent !important;
+    border: none !important;
+}
+
+.badge-dark, #themeselector {
+    background-color: unset;
+    border: unset;
+}
+
+._204863 {
+    background: none;
+    border: none;
+    background-color: none;
+}
+
+html[theme="iced"] ._204863 {
+    background: none;
+  }
+
+.media-object {
+    border: none;
+}
+
+.v0ck {
+    background: transparent !important;
+}
+
+html[theme="f0ck95d"] .embed-responsive.embed-responsive-16by9 {
+  background:#0000008f !important;
+}
+
+html[theme="f0ck95"] .embed-responsive.embed-responsive-16by9 {
+  background:var(--nav-bg) !important;
+}
+
+.v0ck_overlay {
+    background-color: transparent;
+}
+
+.v0ck_player_controls {
+  background:rgba(0, 0, 0, 0.95) !important;
+}
+
+html[theme="term"] .image-brand {
+  filter: hue-rotate(-50deg);
+}
+
+html[theme="f0ck"]  .image-brand {
+  filter: hue-rotate(-50deg);
+}
+
+html[theme="p1nk"] .image-brand {
+  filter: hue-rotate(150deg);
+}
+
+html[theme="orange"] .image-brand {
+  filter: hue-rotate(-160deg);
+}
+
+.v0ck_overlay {
+  background-color: none !important;
+}
+
+.tags {
+  display: grid;
+}
+
+@media (min-width: 600px) {
+  .tags { grid-template-columns: repeat(2, 1fr); }
+}
+
+@media (min-width: 900px) {
+  .tags { grid-template-columns: repeat(3, 1fr); }
+}
+
+.tag {
+  box-shadow: 1px 1px 1px black;
+  display: grid;
+  margin: 5px;
+  grid-template-columns: auto;
+  grid-template-rows: 1fr;
+}
+
+.navigation-rechts {
+  display: flex;
+}
+
+.about {
+  background: none!important;
+}
+
+.login-image {
+  width: 300px;
+}
+
+.tos {
+  margin: 2em;
+}
+
+.nav-link[data-toggle="dropdown"]::after {
+  content: "" !important;
+}
+
+.dropdown-menu.shii {
+  width: auto;
+}
+
+@media (min-width: 900px) {
+  .tags {
+    grid-template-columns: repeat(auto-fill, 20em);
+    justify-content: center;
+  }
+}
+
+.tag img {
+  width: 100%;
+}
+
+@media (max-width: 1056px) {
+  html, body {
+    text-align: left;
+  }
+}
+
+html[theme="f0ck95d"] .embed-responsive.embed-responsive-16by9 {
+  border-bottom: outset 2px silver;
+}
+
+html[theme="f0ck95"] .embed-responsive.embed-responsive-16by9 {
+  border-bottom: outset 2px silver;
+}

public/s/js/admin.js

@@ -1,41 +1,3 @@
-let flashActive = false;
-const flashTypes = [ "error", "success", "warn" ];
-
-const flash = ({ type, msg }) => {
-  let flashContainer;
-  if(tmp = document.querySelector("div#flash"))
-    flashContainer = tmp;
-  else {
-    flashContainer = document.createElement("div");
-    flashContainer.id = "flash";
-    document.body.insertAdjacentElement("afterbegin", flashContainer);
-  }
-
-  flashContainer.innerHTML = msg;
-  if(flashTypes.includes(type)) {
-    flashContainer.className = "";
-    flashContainer.classList.add(type);
-  }
-  if(flashActive)
-    return false;
-
-  flashActive = true;
-  flashContainer.animate(
-    [ { bottom: "-28px" }, { bottom: 0 } ], {
-      duration: 500,
-      fill: "both"
-    }
-  ).onfinish = () => setTimeout(() => {
-    flashContainer.animate(
-      [ { bottom: 0 }, { bottom: "-28px" } ], {
-        duration: 500,
-        fill: "both"
-      }
-    ).onfinish = () => flashActive = false;
-  }, 4 * 1e3);
-  return true;
-};
-
 (async () => {
   if(_addtag = document.querySelector("a#a_addtag")) {
     const postid = +document.querySelector("a.id-link").innerText;
@@ -140,10 +102,8 @@ const flash = ({ type, msg }) => {
             tagname: tmptag
           });
           if(!res.success) {
-            return flash({
+            alert(res.msg);
-              type: "error",
+            return false;
-              msg: res.msg
-            });
           }
           tags = res.tags.map(t => t.tag);
           renderTags(res.tags);
@@ -202,12 +162,6 @@ const flash = ({ type, msg }) => {
       })).json();
 
       renderTags(res.tags);
-      tags = res.tags.map(t => t.tag);
-
-      flash({
-        type: "success",
-        msg: tags.join()
-      });
     };
 
     const deleteButtonEvent = async e => {
@@ -218,17 +172,8 @@ const flash = ({ type, msg }) => {
       const res = await post("/api/v2/admin/deletepost", {
         postid: postid
       });
-      if(res.success) {
+      if(!res.success) {
-        flash({
+        alert(res.msg);
-          type: "success",
-          msg: "post was successfully deleted"
-        });
-      }
-      else {
-        flash({
-          type: "error",
-          msg: res.msg
-        });
       }
     };
 
@@ -338,7 +283,7 @@ const flash = ({ type, msg }) => {
     document.querySelector("svg#a_favo").addEventListener("click", toggleFavEvent);
 
     document.addEventListener("keyup", e => {
-      if(e.target.tagName === "INPUT")
+      if(e.target.tagName === "INPUT" || e.target.tagName === "TEXTAREA")
         return;
       if(e.key === "p")
         toggleEvent();

public/s/js/f0ck.js

@@ -11,7 +11,7 @@ window.requestAnimFrame = (function(){
   if(elem = document.querySelector("#my-video")) {
     video = new v0ck(elem);
     document.addEventListener("keydown", e => {
-      if(e.key === " " && e.target.tagName !== "INPUT") {
+      if(e.key === " " && e.target.tagName !== "INPUT" &&  e.target.tagName !== "TEXTAREA") {
         video[video.paused ? 'play' : 'pause']();
         document.querySelector('.v0ck_overlay').classList[video.paused ? 'remove' : 'add']('v0ck_hidden');
       }
@@ -72,7 +72,7 @@ window.requestAnimFrame = (function(){
     " ": clickOnElementBinding("#f0ck-image")
   };
   document.addEventListener("keydown", e => {
-    if(e.key in keybindings && e.target.tagName !== "INPUT") {
+    if(e.key in keybindings && e.target.tagName !== "INPUT" &&  e.target.tagName !== "TEXTAREA") {
       if(e.shiftKey || e.ctrlKey || e.metaKey || e.altKey)
         return;
       e.preventDefault();

public/s/js/theme.js

@@ -15,7 +15,7 @@ const Cookie = {
 };
 
 (() => {
-  const acttheme = Cookie.get('theme') ?? "f0ck";
+  const acttheme = Cookie.get('theme') ?? "w0bm";
   const themecontainer = document.querySelector("li#themes > ul.dropdown-menu");
   const themes = [...themecontainer.querySelectorAll("li > a")].map(t => t.innerText.toLowerCase());
   if(acttheme !== document.documentElement.getAttribute("theme") && themes.includes(acttheme))
@@ -30,9 +30,9 @@ const Cookie = {
   }));
 
   document.addEventListener("keydown", e => {
-    if(e.target.tagName === "INPUT")
+    if(e.target.tagName === "INPUT" ||  e.target.tagName === "TEXTAREA")
       return;
-    const acttheme = Cookie.get('theme') ?? "f0ck";
+    const acttheme = Cookie.get('theme') ?? "w0bm";
     const themes = [...themecontainer.querySelectorAll("li > a")].map(t => t.innerText.toLowerCase());
     const k = e.key;
     if(k === "t") {

public/s/js/user.js

@@ -0,0 +1,229 @@
+(async () => {
+  if(_addtag = document.querySelector("a#a_addtag")) {
+    const postid = +document.querySelector("a.id-link").innerText;
+    const poster = document.querySelector("a#a_username").innerText;
+    let tags = [...document.querySelectorAll("#tags > .badge")].map(t => t.innerText.slice(0, -2));
+
+    const queryapi = async (url, data, method = 'GET') => {
+      let req;
+      if(method == 'POST') {
+        req = await fetch(url, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify(data)
+        });
+      }
+      else {
+        let s = [];
+        for(const [ key, val ] of Object.entries(data))
+          s.push(encodeURIComponent(key) + "=" + encodeURIComponent(val));
+        req = await fetch(url + '?' + s.join('&'));
+      }
+      return await req.json();
+    };
+
+    const get  = async (url, data) => queryapi(url, data, 'GET');
+    const post = async (url, data) => queryapi(url, data, 'POST');
+
+    const renderTags = _tags => {
+      [...document.querySelectorAll("#tags > .badge")].forEach(tag => tag.parentElement.removeChild(tag));
+      _tags.reverse().forEach(tag => {
+        const a = document.createElement("a");
+        a.href = `/tag/${tag.normalized}`;
+        a.style = "color: inherit !important";
+        a.innerHTML = tag.tag;
+
+        const span = document.createElement("span");
+        span.classList.add("badge", "mr-2");
+        span.setAttribute('tooltip', tag.user);
+
+        tag.badge.split(" ").forEach(b => span.classList.add(b));
+
+        span.insertAdjacentElement("beforeend", a);
+  
+        document.querySelector("#tags").insertAdjacentElement("afterbegin", span);
+      });
+    };
+
+    const addtagClick = (ae = false) => {
+      if(ae)
+        ae.preventDefault();
+
+      const insert = document.querySelector("a#a_addtag");
+      const span = document.createElement("span");
+      span.classList.add("badge", "badge-light", "mr-2");
+
+      const input = document.createElement("input");
+      input.size = "10";
+      input.value = "";
+      input.setAttribute("list", "testlist");
+      input.setAttribute("autoComplete", "off");
+
+      span.insertAdjacentElement("afterbegin", input);
+      insert.insertAdjacentElement("beforebegin", span);
+
+      input.focus();
+
+      let tt = null;
+      let lastInput = '';
+      const testList = document.querySelector('#testlist');
+
+      input.addEventListener("keyup", async e => {
+        if(e.key === "Enter") {
+          const tmptag = input.value?.trim();
+          if(tags.includes(tmptag))
+            return alert("tag already exists");
+          const res = await post("/api/v2/admin/" + postid + "/tags", {
+            tagname: tmptag
+          });
+          if(!res.success) {
+            alert(res.msg);
+            return false;
+          }
+          tags = res.tags.map(t => t.tag);
+          renderTags(res.tags);
+          addtagClick();
+          testList.innerText = "";
+        }
+        else if(e.key === "Escape") {
+          span.parentElement.removeChild(span);
+          testList.innerText = "";
+        }
+        else {
+          if(tt != null)
+            clearTimeout(tt);
+
+          tt = setTimeout(async () => {
+            tt = null;  
+
+            const tmptag = input.value?.trim();
+
+            if(tmptag == lastInput || tmptag.length <= 1)
+              return false;
+
+            testList.innerText = "";
+            lastInput = tmptag;
+  
+            const res = await get('/api/v2/admin/tags/suggest', {
+              q: tmptag
+            });
+  
+            for(const entry of res.suggestions) {
+              const option = document.createElement('option');
+              option.value = entry.tag;
+
+              if(!/fox/.test(navigator.userAgent))
+                option.innerText = `tagged ${entry.tagged} times (score: ${entry.score.toFixed(2)})`;
+
+              testList.insertAdjacentElement('beforeEnd', option);
+            };
+          }, 500);
+        }
+        return true;
+      });
+
+      input.addEventListener("focusout", ie => {
+        if(input.value.length === 0)
+          input.parentElement.parentElement.removeChild(input.parentElement);
+      });
+    };
+
+    const toggleEvent = async (e = false) => {
+      if(e)
+        e.preventDefault();
+
+      const res = await (await fetch('/api/v2/admin/' + encodeURIComponent(postid) + '/tags/toggle', {
+        method: 'PUT'
+      })).json();
+
+      renderTags(res.tags);
+    };
+
+    const toggleFavEvent = async e => {
+      const res = await post('/api/v2/admin/togglefav', {
+        postid: postid
+      });
+      if(res.success) {
+        const fav = document.querySelector("svg#a_favo > use").href;
+        fav.baseVal = '/s/img/iconset.svg#heart_' + (fav.baseVal.match(/heart_(regular|solid)$/)[1] == "solid" ? "regular" : "solid");
+
+        // span#favs
+        const favcontainer = document.querySelector('span#favs');
+        favcontainer.innerHTML = "";
+
+        favcontainer.hidden = !(favcontainer.hidden || res.favs.length > 0);
+
+        res.favs.forEach(f => {
+          const a = document.createElement('a');
+          a.href = `/user/${f.user}/favs`;
+          a.setAttribute('tooltip', f.user);
+          a.setAttribute('flow', 'up');
+
+          const img = document.createElement('img');
+          img.src = `/t/${f.avatar}.webp`;
+          img.style.height = "32px";
+          img.style.width = "32px";
+
+          a.insertAdjacentElement('beforeend', img);
+          favcontainer.insertAdjacentElement('beforeend', a);
+          favcontainer.innerHTML += "&nbsp;";
+        });
+      }
+      else {
+        // lul
+      }
+    };
+
+    _addtag.addEventListener("click", addtagClick);
+    document.querySelector("a#a_toggle").addEventListener("click", toggleEvent);
+    document.querySelector("svg#a_favo").addEventListener("click", toggleFavEvent);
+
+    document.addEventListener("keyup", e => {
+      if(e.target.tagName === "INPUT")
+        return;
+      if(e.key === "p")
+        toggleEvent();
+      else if(e.key === "i")
+        addtagClick();
+      else if(e.key === "x")
+        deleteButtonEvent();
+      else if(e.key === "f")
+        toggleFavEvent();
+    });
+  }
+
+  if(document.location.pathname === '/settings') {
+    const saveAvatar = async e => {
+      e.preventDefault();
+
+      const avatar = +document.querySelector('input[name="i_avatar"]').value;
+      let res = await fetch('/api/v2/settings/setAvatar', {
+        method: 'PUT',
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ avatar })
+      });
+      const code = res.status;
+      res = await res.json();
+
+      switch(code) {
+        case 200:
+          document.querySelector('#img_avatar').src = `/t/${avatar}.webp`;
+          document.querySelector('img.avatar').src = `/t/${avatar}.webp`;
+        break;
+        default:
+          console.log(res);
+        break;
+      }
+    };
+
+    document.querySelector('input#s_avatar').addEventListener('click', saveAvatar);
+    document.querySelector('input[name="i_avatar"]').addEventListener('keyup', async e => {
+      if(e.key === 'Enter')
+        await saveAvatar(e);
+    });
+  }
+})();

src/inc/queue.mjs

@@ -62,7 +62,7 @@ export default new class queue {
     if(mime.startsWith('video/') || mime == 'image/gif')
       await this.exec(`ffmpegthumbnailer -i./public/b/${filename} -s1024 -o./tmp/${itemid}.png`);
     else if(mime.startsWith('image/') && mime != 'image/gif')
-      await this.exec(`convert "./public/b/${filename}[0]" ./tmp/${itemid}.png`);
+      await this.exec(`magick "./public/b/${filename}[0]" ./tmp/${itemid}.png`);
     else if(mime.startsWith('audio/')) {
       if(link.match(/soundcloud/)) {
         let cover = (await this.exec(`yt-dlp -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' --get-thumbnail "${link}"`)).stdout.trim();
@@ -72,23 +72,23 @@ export default new class queue {
             await this.exec(`wget "${cover}" -O ./tmp/${itemid}.jpg`);
             const size = (await fs.promises.stat(`./tmp/${itemid}.jpg`)).size;
             if(size >= 0) {
-              await this.exec(`convert ./tmp/${itemid}.jpg ./tmp/${itemid}.png`);
+              await this.exec(`magick ./tmp/${itemid}.jpg ./tmp/${itemid}.png`);
-              await this.exec(`convert ./tmp/${itemid}.jpg ./public/ca/${itemid}.webp`);
+              await this.exec(`magick ./tmp/${itemid}.jpg ./public/ca/${itemid}.webp`);
             }
           } catch(err) {}
         }
         else {
           await this.exec(`ffmpeg -i ./public/b/${filename} -update 1 -map 0:v -map 0:1 -c copy ./tmp/${itemid}.png`);
-          await this.exec(`convert ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
+          await this.exec(`magick ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
         }
       }
       else {
         await this.exec(`ffmpeg -i ./public/b/${filename} -update 1 -map 0:v -map 0:1 -c copy ./tmp/${itemid}.png`);
-        await this.exec(`convert ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
+        await this.exec(`magick ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
       }
     }
 
-    await this.exec(`convert "./tmp/${itemid}.png" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.webp`);
+    await this.exec(`magick "./tmp/${itemid}.png" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.webp`);
     await fs.promises.unlink(`./tmp/${itemid}.png`).catch(_=>{});
     await fs.promises.unlink(`./tmp/${itemid}.jpg`).catch(_=>{});
     return true;

src/inc/routeinc/f0cklib.mjs

@@ -166,7 +166,7 @@ export default {
       success: true,
       user: {
         name: actitem.username,
-        channel: actitem.usernetwork == "Telegram" && actitem.userchannel !== "f0ck.me" ? "anonymous" : actitem.userchannel,
+        channel: actitem.usernetwork == "Telegram" && actitem.userchannel !== "w0bm.com" ? "anonymous" : actitem.userchannel,
         network: actitem.usernetwork
       },
       item: {
@@ -187,7 +187,7 @@ export default {
         favorites: favorites,
         tags: tags
       },
-      title: `${actitem.id} - f0ck.me`,
+      title: `${actitem.id} - w0bm.com`,
       pagination: {
         end: items[items.length - 1]?.id,
         start: items[0]?.id,
@@ -201,8 +201,7 @@ export default {
       tmp
     };
     return data;
-  },
+  },getRandom: async (o = ({ user, tag, mime, mode, fav, session })) => {
-  getRandom: async (o = ({ user, tag, mime, mode, session })) => {
     const user = o.user ? decodeURI(o.user) : null;
     const tag = lib.parseTag(o.tag ?? null);
     const mime = (o.mime ?? "");
@@ -210,28 +209,45 @@ export default {
   
     const modequery = mime == "audio" ? lib.getMode(0) : lib.getMode(o.mode ?? 0);
   
-    const item = await db`
+    let item;
+  
+    if (o.fav && user) {
+      // Special case: random from user's favorites
+      item = await db`
+        select
+          items.id
+        from favorites
+        inner join items on favorites.item_id = items.id
+        inner join "user" on "user".id = favorites.user_id
+        where
+          "user".user ilike ${'%' + user + '%'}
+          and items.active = 'true'
+          ${mime ? db`and items.mime ilike ${smime}` : db``}
+        order by random()
+        limit 1
+      `;
+    } else {
+      // Normal random logic
+      item = await db`
         select
           items.id
         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
         where
-        ${ db.unsafe(modequery) }
+          ${db.unsafe(modequery)}
           and items.active = 'true'
-        ${ tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db`` }
+          ${tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db``}
-        ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
+          ${user ? db`and items.username ilike ${'%' + user + '%'}` : db``}
-        ${ user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
+          ${mime ? db`and items.mime ilike ${smime}` : 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``}
-        ${ !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
         order by random()
         limit 1
       `;
+    }
   
-    if(item.length === 0) {
+    if (item.length === 0) {
       return {
         success: false,
         message: "no f0cks found :("
@@ -246,4 +262,4 @@ export default {
       itemid: item[0].id
     };
   }
-};
+  };

src/inc/routes/admin.mjs

@@ -121,77 +121,79 @@ export default (router, tpl) => {
     });
   });
 
-  router.get(/^\/admin\/log(\/)?$/, lib.auth, async (req, res) => {
+  // router.get(/^\/admin\/log(\/)?$/, lib.auth, async (req, res) => {
-    exec("journalctl -qeu f0ck --no-pager", (err, stdout) => {
+  //   // Funktioniert ohne systemd service natürlich nicht.
-      res.reply({
+  //   exec("journalctl -qeu f0ck --no-pager", (err, stdout) => {
-        body: tpl.render("admin/log", {
+  //     res.reply({
-          log: stdout.split("\n").slice(0, -1),
+  //       body: tpl.render("admin/log", {
-          tmp: null
+  //         log: stdout.split("\n").slice(0, -1),
-        }, req)
+  //         tmp: null
-      });
+  //       }, req)
-    });
+  //     });
-  });
+  //   });
+  // });
 
-  router.get(/^\/admin\/recover\/?/, lib.auth, async (req, res) => {
+  // router.get(/^\/admin\/recover\/?/, lib.auth, async (req, res) => {
-    if(req.url.qs?.id) {
+  //  Gelöschte Objekte werden nicht aufgehoben.
-      const id = +req.url.qs.id;
+  //   if(req.url.qs?.id) {
-      const f0ck = await db`
+  //     const id = +req.url.qs.id;
-        select dest, mime
+  //     const f0ck = await db`
-        from "items"
+  //       select dest, mime
-        where
+  //       from "items"
-          id = ${id} and
+  //       where
-          active = 'false'
+  //         id = ${id} and
-        limit 1
+  //         active = 'false'
-      `;
+  //       limit 1
-      if(f0ck.length === 0) {
+  //     `;
-        return res.reply({
+  //     if(f0ck.length === 0) {
-          body: `f0ck ${id}: f0ck not found`
+  //       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}`;
 
-      await fs.copyFile(`./deleted/b/${f0ck[0].dest}`, `./public/b/${f0ck[0].dest}`).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.copyFile(`./deleted/t/${id}.webp`, `./public/t/${id}.webp`).catch(_=>{});
-      await fs.unlink(`./deleted/b/${f0ck[0].dest}`).catch(_=>{});
+  //     await fs.unlink(`./deleted/b/${f0ck[0].dest}`).catch(_=>{});
-      await fs.unlink(`./deleted/t/${id}.webp`).catch(_=>{});
+  //     await fs.unlink(`./deleted/t/${id}.webp`).catch(_=>{});
 
-      if(f0ck[0].mime.startsWith('audio')) {
+  //     if(f0ck[0].mime.startsWith('audio')) {
-        await fs.copyFile(`./deleted/ca/${id}.webp`, `./public/ca/${id}.webp`).catch(_=>{});
+  //       await fs.copyFile(`./deleted/ca/${id}.webp`, `./public/ca/${id}.webp`).catch(_=>{});
-        await fs.unlink(`./deleted/ca/${id}.webp`).catch(_=>{});
+  //       await fs.unlink(`./deleted/ca/${id}.webp`).catch(_=>{});
-      }
+  //     }
 
-      return res.reply({
+  //     return res.reply({
-        body: `f0ck ${id} recovered. <a href="/admin/recover">back</a>`
+  //       body: `f0ck ${id} recovered. <a href="/admin/recover">back</a>`
-      });
+  //     });
-    }
+  //   }
 
-    const _posts = await db`
+  //   const _posts = await db`
-      select id, mime, username
+  //     select id, mime, username
-      from "items"
+  //     from "items"
-      where
+  //     where
-        active = 'false'
+  //       active = 'false'
-      order by id desc
+  //     order by id desc
-    `;
+  //   `;
 
-    if(_posts.length === 0) {
+  //   if(_posts.length === 0) {
-      return res.reply({
+  //     return res.reply({
-        body: 'blah'
+  //       body: 'blah'
-      });
+  //     });
-    }
+  //   }
 
-    const posts = await Promise.all(_posts.map(async p => ({
+  //   const posts = await Promise.all(_posts.map(async p => ({
-      ...p,
+  //     ...p,
-      thumbnail: (await fs.readFile(`./deleted/t/${p.id}.webp`)).toString('base64')
+  //     thumbnail: (await fs.readFile(`./deleted/t/${p.id}.webp`)).toString('base64')
-    })));
+  //   })));
 
-    res.reply({
+  //   res.reply({
-      body: tpl.render('admin/recover', {
+  //     body: tpl.render('admin/recover', {
-        posts,
+  //       posts,
-        tmp: null
+  //       tmp: null
-      }, req)
+  //     }, req)
-    });
+  //   });
-  });
+  // });
 
   return router;
 };

src/inc/routes/apiv2/tags.mjs

@@ -131,13 +131,13 @@ export default router => {
       const postid = +req.params.postid;
       const tagname = decodeURIComponent(req.params.tagname);
 
-      if(tagname == 'sfw' || tagname == 'nsfw' || tagname == 'hentai' || tagname == 'audio') {
+      // if(tagname == 'sfw' || tagname == 'nsfw' || tagname == 'hentai' || tagname == 'audio') {
-        return res.json({
+      //   return res.json({
-          success: false,
+      //     success: false,
-          msg: 'blacklisted',
+      //     msg: 'blacklisted',
-          tags: await lib.getTags(postid)
+      //     tags: await lib.getTags(postid)
-        });
+      //   });
-      }
+      // }
 
       const tags = await lib.getTags(postid);
 

src/inc/routes/index.mjs

@@ -111,6 +111,12 @@ export default (router, tpl) => {
     });
   });
 
+  router.get(/^\/(terms)$/, (req, res) => {
+    res.reply({
+      body: tpl.render(req.url.split[0], { tmp: null }, req)
+    });
+  });
+
   router.get(/^\/mode\/(\d)/, lib.loggedin, async (req, res) => {
     const mode = +req.url.split[1];
     let referertmp = req.headers.referer;

src/inc/routes/random.mjs

@@ -6,10 +6,14 @@ export default (router, tpl) => {
     let referer = req.headers.referer ?? '';
     let opts = {};
 
-    if(referer.match(new RegExp(cfg.main.url.regex))) { // parse referer
+    if (referer.match(new RegExp(cfg.main.url.regex))) { // parse referer
       referer = referer.split(cfg.main.url.domain)[1];
+      console.log("referer: ", referer);
+
       const tmp = referer.match(/^\/?(?:\/tag\/(?<tag>.+?))?(?:\/user\/(?<user>.+?)\/(?<mode>f0cks|favs))?(?:\/(?<mime>image|audio|video))?(?:\/p\/(?<page>\d+))?(?:\/(?<itemid>\d+))?$/);
-      if(tmp)
+      console.log("tmp: ", tmp);
+
+      if (tmp && tmp.groups)
         opts = tmp.groups;
     }
 
@@ -18,12 +22,14 @@ export default (router, tpl) => {
       tag: opts.tag,
       mime: opts.mime,
       page: opts.page,
-      fav: opts.mode == 'favs',
+      fav: opts.mode === 'favs',
       mode: req.session.mode,
       session: !!req.session
     });
 
-    if(!data.success) {
+    console.log("data", data);
+
+    if (!data.success) {
       return res.reply({
         code: 404,
         body: tpl.render('error', {
@@ -33,7 +39,8 @@ export default (router, tpl) => {
       });
     }
 
-    res.redirect(`${data.link.main}${data.link.path}${data.itemid}`);
+    res.redirect(encodeURI(`${data.link.main}${data.link.path}${data.itemid}`));
   });
+
   return router;
 };

src/inc/routes/toptags.mjs

@@ -0,0 +1,42 @@
+import db from "../../inc/sql.mjs";
+import cfg from "../../inc/config.mjs";
+
+export default (router, tpl) => {
+  router.get(/^\/tags$/, async (req, res) => {
+
+    const phrase = cfg.websrv.phrases[~~(Math.random() * cfg.websrv.phrases.length)];
+
+    const nsfp = cfg.nsfp.map(n => `${n}`);
+
+    const toptags = await db`
+      SELECT t.id, t.tag, COUNT(DISTINCT ta.item_id) AS total_items
+      FROM tags t
+      LEFT JOIN tags_assign ta ON t.id = ta.tag_id
+      WHERE t.id not in (${db.unsafe(nsfp)})
+      GROUP BY t.id, t.tag
+      ORDER BY total_items DESC
+      LIMIT 500
+      ;
+    `;
+
+    const toptags_regged = await db`
+      SELECT t.id, t.tag, COUNT(DISTINCT ta.item_id) AS total_items
+      FROM tags t
+      LEFT JOIN tags_assign ta ON t.id = ta.tag_id
+      GROUP BY t.id, t.tag
+      ORDER BY total_items DESC
+      LIMIT 500
+      ;
+    `;
+    
+    res.reply({
+      body: tpl.render('tags', {
+        toptags,
+        toptags_regged,
+        phrase,
+        tmp: null
+      }, req)
+    });
+  });
+  return router;
+};

src/inc/trigger/f0ckgag.mjs

@@ -2,7 +2,7 @@ import cfg from "../config.mjs";
 import db from "../sql.mjs";
 import lib from "../lib.mjs";
 
-const regex = /(https\:\/\/f0ck\.me|http\:\/\/fockmoonsb24iczs7odozzy5uktlzbcgp337nabrgffzxv5ihabgpvyd\.onion)(\/(video|image|audio))?\/(\d+|(?:b\/)(\w{8})\.(jpg|webm|gif|mp4|png|mov|mp3|ogg|flac))/gi;
+const regex = /(https\:\/\/w0bm\.com)(\/(video|image|audio))?\/(\d+|(?:b\/)(\w{8})\.(jpg|webm|gif|mp4|png|mov|mp3|ogg|flac))/gi;
 
 export default async bot => {
 

src/inc/trigger/parser.mjs

@@ -34,7 +34,7 @@ export default async bot => {
       if(e.message.match(/\!i(gnore)?\b/))
         return false;
 
-      if(!e.channel.includes("f0ck") && (!e.message.match(/\!f(0ck)?\b/i) && (typeof e.raw.forward_from == 'undefined')))
+      if(!e.channel.includes("f0bm") && (!e.message.match(/\!f(0ck)?\b/i) && (typeof e.raw.forward_from == 'undefined')))
         return false;
 
       if(e.type === 'tg' && // proto: tg
@@ -55,7 +55,10 @@ export default async bot => {
         //  return await e.reply(`fuck imgur... seriously`);
 
         if(regex.instagram.test(link))
-          await e.reply(`insta schminsta`);
+          await e.reply(`instagay`);
+
+        if(regex.yt.test(link))
+          await e.reply(`hi yt here, I am gay this is why I am not giving you the file`);
 
         // check repost (link)
         repost = await queue.checkrepostlink(link);
@@ -131,6 +134,16 @@ export default async bot => {
             return await e.reply('something went wrong lol');
           }
         }
+        else if(link.match(regex.yt)) {
+          try {
+            // add --cookies <path-to-cookies-file> on local instance if you want to avoid getting rate limited
+            source = (await queue.exec(`yt-dlp --cookies /tmp/cookies.txt -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);
+          }
+        }
         else {
           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();
@@ -138,7 +151,7 @@ export default async bot => {
             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');
+            return await e.reply('something went wrong lol / check maxfilesize?');
           }
         }
         // </download data>
@@ -247,7 +260,7 @@ export default async bot => {
         try {
           await queue.genThumbnail(filename, mime, itemid, link);
         } catch(err) {
-          await queue.exec(`convert ./mugge.png ./public/t/${itemid}.webp`);
+          await queue.exec(`magick ./mugge.png ./public/t/${itemid}.webp`);
         }
 
         let speed = lib.calcSpeed(size, end);

src/index.mjs

@@ -66,7 +66,7 @@ process.on('unhandledRejection', err => {
     req.session = false;
     if(req.url.pathname.match(/^\/(s|b|t|ca)\//))
       return;
-    req.theme = req.cookies.theme || 'f0ck';
+    req.theme = req.cookies.theme || 'atmos';
     req.fullscreen = req.cookies.fullscreen || 0;
 
     if(req.cookies.session) {
@@ -110,7 +110,7 @@ process.on('unhandledRejection', err => {
           db({
             user_id: +user[0].id,
             mode: user[0].mode ?? 0,
-            theme: req.session.theme ?? 'f0ck',
+            theme: req.session.theme ?? 'atmos',
             fullscreen: req.session.fullscreen || 0
           }, 'user_id', 'mode', 'theme', 'fullscreen')
         }

views/about.html

@@ -1,51 +1,13 @@
 @include(snippets/header)
 <div id="main">
-  <div class="about">
+<div class="about">
-    <div>
+    <p>Welcome stranger!</p>
-      <a href="//f0ck.me/48908"><img src="//f0ck.me/s/img/loool.webp" /></a>
+    <p>bringing you some of the greatest webms from the past, the present and the future!</p>
-      <p>thanks to our turkish fellow lol@n0xy/#f0ck for this gif &lt;3</p>
+    <p>Enjoy your stay.</p>
-    </div>
+    <img style="width: 200px" src="/s/img/cockfag.png" alt="cockfag">
-    <h5>f0ck Contact</h5>
+    <p>If you have any questions you can reach out via Mail.</p>
-    <p>Whatever it is, we might have a answer, even though it might not be the one you were looking for: <a href="mailto:admin@f0ck.me">admin@f0ck.me</a></p>
+    <p>mail: admin@w0bm.com</p>
-    <h5>About f0ck</h5>
+    <p>Please also make yourself familiar with the <a href="/terms">Terms Of Service</a></p>
-    <p>f0ck is your friendly IRC shitposting bot, it's built for catching urls that are passed to it and displays the content of passed urls on a simple and accessible web gallery reachable at <a href="/">f0ck.me</a></p>
+</div>
-    <h5>WTF is a f0ck?</h5>
-    <p>A f0ck is basically giving a fuck about some internet bullshit, like stupid images, videos and so on, but also for great things like good music taste and shit, it's basically "a f0ck was given" and f0ck and it's users gave a lot of f0cks over the past years, it's not hard to finally start giving a damn f0ck about something, just f0ck it dood!</p>
-    <h5>Where to f0ck?</h5>
-    <h4>#f0ck on n0xy.net</h4>
-    <p>You can invite f0ck to your channel on the following supported networks by simply typing<br><code>/invite f0ck</code></p>
-    <ul>
-      <li><a href="https://n0xy.net">n0xy.net</a></li>
-      <li><a href="https://www.rizon.net/">rizon.net</a></li>
-      <li><a href="https://libera.chat/">libera.chat</a></li>
-    </ul>
-    <p>To start f0cking the shit out of something simply add a <code>!f0ck</code> behind the url you want to f0ck, that's it</p>
-    <p>#f0ck specific: to have f0ck ignore a link add <code>!ignore</code> at the end <br>Example: <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ" target="_blank">https://www.youtube.com/watch?v=dQw4w9WgXcQ</a> !ignore</p>
-    <p>f0ck supports a variety of websites, in fact all websites supported by <code>yt-dlp</code> are supported by f0ck aswell!</p>
-    <h5>f0ck Rules</h5>
-    <ul>
-      <li>You must be 18 years or older to visit or post</li>
-      <li>You shall not post animal cruelty, we like our animals alive and well, living a happy life until they are ready for our Schnitzel!</li>
-      <li>You shall not post under <b>ANY</b> circumstances: Snuff, Beastiality, Rape, Terrorist stuff (Beheadings, First person shootings, warcrimes), Childporn, Childmodeling</li>
-    </ul>
-    <h5>f0cked up?</h5>
-    <p>To have something removed in case you accidentally f0cked something that actually shouldn't be f0cked you can always contact the admins either via IRC or Email</p>
-    <ul>
-      <li>irc.n0xy.net #f0ck</li>
-      <li>admin@f0ck.me</li>
-    </ul>
-    <h5>Compatibility</h5>
-    <p>f0ck is developed and tested for Firefox and Chromium in their latest versions</p>
-    <p>If you encounter bugs please report them so we can fix them.</p>
-    <p>Microsoft Edgy is not actively supported, but if it werks, great! Same for anything apple related.</p>
-    <h5>Tinfoil f0ckers listen!</h5>
-    <p>f0ck onions and moons, but fockulite!</p>
-    <p>http://fockmoonsb24iczs7odozzy5uktlzbcgp337nabrgffzxv5ihabgpvyd.onion</p>
-    <p>http://fockulite74atso2xsxxw6q2gzqrgck572tiwvkyf5vdxictjn2vmlyd.onion</p>
-    <p>f0ck is completely functional without javascript enabled, you can be the beardiest neckbeard of all, we got you m'gentleman, if you want to use a custom theme you gotta allow our style cookie.</p>
-    <h5>f0ck Privacy?</h5>
-    <p>Cookies: Yes, we set 1 cookie for your prefered stylesheet, this is a optional cookie and not required for the site to function, simply cosmetics, you can block this cookie and the site will still work as intended and will default to the default f0ck theme called "f0ck"</p>
-    <p>Logs: We do not log users accessing our website.</p>
-  </div>
 </div>
 @include(snippets/footer)

views/admin.html

@@ -12,8 +12,8 @@
     <div class="admintools">
       <p>Adminwerkzeuge</p>
       <ul>
-        <li><a href="/admin/log">Logs</a></li>
+        <!-- <li><a href="/admin/log">Logs</a></li>
-        <li><a href="/admin/recover">Recover f0cks</a></li>
+        <li><a href="/admin/recover">Recover f0cks</a></li> -->
         <li><a href="/admin/sessions">Sessions</a></li>
       </ul>
     </div>

views/item.html

@@ -2,14 +2,11 @@
 <canvas class="hidden-xs" id="bg"></canvas>
 <div class="wrapper">
   <div id="main">
+
     <div class="container">
       <div class="_204863">
-        <div class="imageDoor" style="--hover-image: url('/t/{{ item.id }}.webp');">
+        <div class="imageDoor"></div>
-          <img src="/t/{{ item.id }}.webp" alt="" />
+        <div class="gapLeft"></div>
-        </div>
-        <div class="gapLeft">
-          <span class="populateME"><b>f0ck</b> - {{ item.id }}</span>
-        </div>
         @if(session)
         <div class="gapRight">
           <svg class="iconset" id="a_favo"><use href="/s/img/iconset.svg#heart_{{ Object.values(item.favorites).filter(u => u.user == session.user)[0] ? 'solid' : 'regular' }}"></use></svg>
@@ -36,7 +33,7 @@
             <video id="my-video" class="embed-responsive-item" width="640" height="360" src="{{ item.dest }}" preload="auto" autoplay controls loop playsinline></video>
           </div>
           @elseif(item.mime.startsWith("audio"))
-          <div class="embed-responsive embed-responsive-16by9" style="background: url('@if(item.coverart)//f0ck.me{{ item.coverart }}@else/s/img/200.gif@endif') no-repeat center / contain black;">
+          <div class="embed-responsive embed-responsive-16by9" style="background: url('@if(item.coverart)//w0bm.com{{ item.coverart }}@else/s/img/200.gif@endif') no-repeat center / contain black;">
             <audio id="my-video" class="embed-responsive-item" autoplay controls loop src="{{ item.dest }}" data-setup="{}" poster="@if(item.coverart){{ item.coverart }}@else/s/img/200.gif@endif" type="{{ item.mime }}"></audio>
           </div>
           @elseif(item.mime.startsWith("image"))
@@ -62,23 +59,39 @@
         </div>
       </div>
       <div class="metadata">
+        <div class="kontrollelement">
+          <div class="einheit">
+              @if(typeof pagination !== "undefined")
+              <nav class="steuerung">
+                  @if(pagination.prev)
+                    <a id="" href="{{ link.main }}{{ pagination.prev }}">← next</a>
+                  @else
+                    <a id="" href="#" style="visibility: hidden">← next</a>
+                  @endif
+                  <span>|</span>
+                  <a id="random" class="" href="/random">
+                    <span>random</span>
+                  </a>
+                  <span>
+                    |
+                  </span>
+                  @if(pagination.next)
+                    <a id="" href="{{ link.main }}{{ pagination.next }}">prev →</a>
+                  @else
+                    <a id="" href="#" style="visibility: hidden">prev →</a>
+                  @endif     
+              </nav>
+              @endif
+          </div>
+        </div>
+        <div class="blahlol">
                   <span class="badge badge-dark">
           <a href="/{{ item.id }}" class="id-link">{{ item.id }}</a>
           @if(session)
           (<a id="a_username" href="/user/{{ user.name.toLowerCase() }}/f0cks@if(tmp.mime)/{{ tmp.mime }}@endif">{{ user.name }}</a>) 
           @endif
         </span>
-        <span class="badge badge-dark">{{ user.network }} / {{ user.channel }}</span>
-        <span class="badge badge-dark image-source">
-          @if(item.src.long.length)
-          <a href="{{ item.src.long }}" target="_blank">{{ item.src.short }}</a>
-          @else
-          hidden
-          @endif
-        </span>
-        <span class="badge badge-dark"><a class="dest-link" href="{{ item.dest }}" target="_blank">{{ item.mime }}</a> / {{ item.size }}</span>
         <span class="badge badge-dark"><time class="timeago" tooltip="{{ item.timestamp.timefull }}">{{ item.timestamp.timeago }}</time></span>
-        <span class="badge badge-dark">{{ phrase }}</span>
         <span class="badge badge-dark" id="tags">
         @if(typeof item.tags !== "undefined")
           @each(item.tags as tag)

views/login.html

@@ -3,12 +3,12 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>f0ck login</title>
+    <title>login</title>
     <link href="/s/css/f0ck.css" rel="stylesheet" />
   </head>
   <body type="login">
     <form class="login-form" method="post" action="/login">
-      <p><a href="/"><img src="/s/img/f0ck_small.png" /></a></p>
+      <img class="login-image" src="/s/img/w0bm_mosh_banner_by_marderchen.gif" alt="">
       <input type="text" name="username" placeholder="username" autocomplete="off" required />
       <input type="password" name="password" placeholder="password" autocomplete="off" required />
       <p><input type="checkbox" id="kmsi" name="kmsi" /> <label for="kmsi">stay signed in</label></p>

views/ranking.html

@@ -1,12 +1,21 @@
 @include(snippets/header)
 <div id="main">
   <div class="topf0ckers">
-    <h3>Top f0ckers of all time <br>- Ranking -</h3>
+    <h3>f0ck Rankings?</h3>
+  </div>
+  <div class="theforceofthree">
+    <div class="triin">
     </div>
     <div class="ranking">
       <div class="by-user">
         <h3>Biggest taggers</h3>
         <table class="table">
+          <tr>
+            <th>Rank</th>
+            <th>Avatar</th>
+            <th>Username</th>
+            <th>Tagged</th>
+          </tr>
           <tbody>
           @for(let i = 0; i < list.length; i++)
             <tr>
@@ -19,14 +28,6 @@
           </tbody>
         </table>
       </div>
-    <div class="by-hoster">
-      <h3>Top {{ hoster.length }} hoster</h3>
-      <table class="table">
-        @each(hoster as host)
-        <tr><td>{{ host.part.length ? host.part : "Telegram" }}</td><td>{{ host.c }}</td></tr>
-        @endeach
-      </table>
-    </div>
       <div class="by-stats">
         <h3>Tag stats</h3>
         <table class="table">
@@ -47,5 +48,8 @@
         </table>
       </div>
     </div>
+    <div class="triout">
+    </div>
+</div>
 </div>
 @include(snippets/footer)

views/search.html

@@ -2,13 +2,7 @@
 <div id="main">
   <div class="f0ckgle">
     <div class="search-title">
-        <span style="color:#4285F4;">f</span>
+      <span>search</span>
-        <span style="color:#EA4335;">0</span>
-        <span style="color:#FBBC05;">c</span>
-        <span style="color:#4285F4;">k</span>
-        <span style="color:#34A853;">g</span>
-        <span style="color:#EA4335;">l</span>
-        <span style="color:#4285F4;">e</span>
     </div>
     <form action="/search" class="admin-search">
       <input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit">🔍</button>

views/snippets/footer.html

@@ -1,7 +1,10 @@
-  @if(session)<!--<div style="position: fixed; bottom: 0; z-index: 998; background-color: var(--bg); width: 100%; height: 29px; border-top: 1px solid var(--accent)">{{ JSON.stringify(session) }}</div>-->@endif
   <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)<script src="/s/js/admin.js?v=@mtime(/public/s/js/admin.js)"></script>@endif
+  @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>

views/snippets/header.html

@@ -1,14 +1,13 @@
 <!doctype html>
 <html lang="en" theme="@if(typeof theme !== "undefined"){{ theme }}@endif" res="@if(typeof fullscreen !== "undefined"){{ fullscreen == 1 ? 'fullscreen' : '' }}@endif">
 <head>
-  <title>f0ck!</title>
+  <title>f0bm</title>
-  <meta name="description" content="Welcome to the internet"/>
+  <link rel="icon" type="image/gif" href="/s/img/favicon.png" />
-  <meta property="og:image" content="/s/img/favicon.gif">
-  <link rel="icon" type="image/gif" href="/s/img/favicon.gif" />
   <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)">
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  @if(typeof item !== "undefined")<link rel="canonical" href="https://f0ck.me/{{ item.id }}" />@endif
+  @if(typeof item !== "undefined")<link rel="canonical" href="https://w0bm.com/{{ item.id }}" />@endif
 </head>
 <body>
   @include(snippets/navbar)

views/snippets/navbar.html

@@ -1,7 +1,8 @@
 @if(session)
 <nav class="navbar navbar-expand-lg">
-    <a class="navbar-brand" href="/"><span class="f0ck" width="" height="">F0CK</span></a>
+    <a class="navbar-brand" href="/"><img class="image-brand" src="/s/img/w0bm_mosh_banner_by_marderchen.gif" alt="w...?"><span class="f0ck" width="" height=""></span></a>
     <div class="navigation-links">
+      <div class="pagination-container-fluid">
         <ul class="navbar-nav">
           <li class="nav-item dropdown">
             <a class="nav-link user" href="#" content="{{ session.user }}" data-toggle="dropdown">
@@ -20,22 +21,13 @@
             </ul>
           </li>
           <li class="nav-item dropdown" id="themes">
-          <a class="nav-link ddcontent" href="#" content="{{ theme }}" data-toggle="dropdown">Themes</a>
+            <a class="nav-link ddcontent" href="#" content="{{ theme }}" data-toggle="dropdown">𐂧</a>
-          <ul class="dropdown-menu">
+            <ul class="dropdown-menu shii">
               @each(themes as t)
               <li><a href="/theme/{{ t }}">{{ t }}</a></li>
               @endeach
             </ul>
           </li>
-        <li class="nav-item dropdown">
-          <a class="nav-link ddcontent" href="#"@if(tmp?.mime) content="{{ tmp?.mime }}" data-toggle="dropdown"@endif>Filter@if(!tmp?.mime)&nbsp;&#9660;@endif</a>
-          <ul class="dropdown-menu">
-            <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endif">All</a></li>
-            <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endifaudio">Audio</a></li>
-            <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endifvideo">Video</a></li>
-            <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endifimage">Image</a></li>
-          </ul>
-        </li>
           <li class="nav-item @if(session)dropdown@endif">
             <a class="nav-link ddcontent" href="#"@if(typeof session.mode !== "undefined") content="{{ modes[session.mode] ?? 'sfw' }}" data-toggle="dropdown"@endif>Mode</a>
             <ul class="dropdown-menu">
@@ -44,6 +36,11 @@
               @endfor
             </ul>
           </li>
+          <li class="nav-item">
+            <a id="explore-tags" class="nav-link" href="/tags">
+              <span class="nav-link-identifier">Tags</span>
+            </a>
+          </li>
           <li class="nav-item">
             <a id="random" class="nav-link" href="/random">
               <span class="nav-link-identifier">Random</span>
@@ -51,8 +48,8 @@
           </li>
         </ul>
     </div>
+    </div>
     <div class="collapse navbar-collapse show" id="navbarSupportedContent">
-      <div class="pagination-container-fluid">
       <div class="pagination-wrapper">
         @if(typeof pagination !== "undefined")
         <nav class="pagination">
@@ -70,20 +67,19 @@
         </nav>
         @endif
       </div>
+
     </div>
   </div>
 </nav>
 @else
+<!-- not logged in -->
 <nav class="navbar navbar-expand-lg">
-  <a class="navbar-brand" href="/"><span class="f0ck" width="" height="">F0CK</span></a>
+  <a class="navbar-brand" href="/"><img class="image-brand" src="/s/img/w0bm_mosh_banner_by_marderchen.gif" alt="w...?"><span class="f0ck" width="" height=""></span></a>
 
   <div class="navigation-links-guest">
     <ul class="navbar-nav-guests">
-      <li class="nav-item dropdown">
+      <li class="nav-item">
-        <a class="nav-link" href="/about" data-toggle="dropdown">About</a>
+        <a class="nav-link" href="/about">About</a>
-        <ul class="dropdown-menu">
-          <li><a href="/login">login</a></li>
-        </ul>
       </li>
       <li class="nav-item dropdown" id="themes">
         <a class="nav-link ddcontent" href="#" content="{{ theme }}" data-toggle="dropdown">Themes</a>
@@ -93,14 +89,10 @@
           @endeach
         </ul>
       </li>
-      <li class="nav-item dropdown">
+      <li class="nav-item">
-        <a class="nav-link ddcontent" href="#"@if(tmp?.mime) content="{{ tmp?.mime }}" data-toggle="dropdown"@endif>Filter@if(!tmp?.mime)&nbsp;&#9660;@endif</a>
+        <a id="explore-tags" class="nav-link" href="/tags">
-        <ul class="dropdown-menu">
+          <span class="nav-link-identifier">Tags</span>
-          <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endif">All</a></li>
+        </a>
-          <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endifaudio">Audio</a></li>
-          <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endifvideo">Video</a></li>
-          <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endifimage">Image</a></li>
-        </ul>
       </li>
       <li class="nav-item">
         <a id="random" class="nav-link" href="/random">
@@ -109,6 +101,7 @@
       </li>
     </ul>
   </div>
+  <!-- rechte seite -->
   <div class="collapse navbar-collapse show" id="navbarSupportedContent">
     <div class="pagination-container-fluid">
       <div class="pagination-wrapper">

views/tags.html

@@ -0,0 +1,28 @@
+@include(snippets/header)
+<div id="main">
+  <div class="container">
+    <h3 style="text-align: center;">☯</h3>
+    <div class="tags">
+      @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>
+        </div>
+      </div>
+      @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>
+        </div>
+      </div>
+      @endeach
+      @endif
+    </div>
+  </div>
+</div>
+@include(snippets/footer)

views/terms.html

@@ -0,0 +1,40 @@
+@include(snippets/header)
+<div id="main">
+<div class="tos">
+    <p>Terms of Service</p>
+    <ol>
+        <li>Acceptance of Terms</li>
+        <p>By accessing and using this website, you acknowledge that your access is a privilege, not a right. If you do not agree with these terms, you are free to leave at any time.</p>
+        <li>No Claims</li>
+        <p>Visitors to this website have no claims whatsoever against the website owner or operators. Access to the website and its content is provided as-is, with no guarantees, warranties, or entitlements of any kind.</p>
+        <li>No Liability</li>
+        <p>This website and its operators assume no liability for any errors, omissions, inaccuracies, or any other issues that may arise from the use of this site. Use of this website is entirely at your own risk.</p>
+        <li>No Warranty</li>
+        <p>There is no warranty regarding the completeness, accuracy, reliability, or availability of the content provided on this website. The content may change at any time without notice.</p>
+        <li>Compliance with Requests</li>
+        <p>The website owner reserves the right to remove content, restrict access, or comply with any valid legal or personal requests at their sole discretion.</p>
+        <li>Changes to Terms</li>
+        <p>These terms may be updated at any time without prior notice. It is your responsibility to review them periodically.</p>
+    </ol>
+    <p>Data Privacy</p>
+    <ol>
+        <li>No Data Logging</li>
+        <p>This website does not collect, store, or log any personal data, including IP addresses or other identifying information. No server-side logs are maintained.</p>
+        
+        <li>Use of Cookies</li>
+        <p>Upon changing the theme, a single cookie is set. This cookie solely stores the name of the currently active theme to enhance the visual experience. It does not contain any personal data, tracking information, or other identifiers.</p>
+        
+        <li>Cookie Control</li>
+        <p>The cookie is purely of cosmetic nature and not essential for the website's functionality. Users can disable cookies for this website entirely via their browser settings without affecting their ability to access and use the site.</p>
+        
+        <li>No Third-Party Tracking</li>
+        <p>This website does not use third-party tracking services, analytics tools, or embedded content that collects user data.</p>
+        
+        <li>Changes to This Policy</li>
+        <p>This privacy policy may be updated from time to time. Users are encouraged to review it periodically to stay informed about any changes.</p>
+        
+        <p>By using this website, you acknowledge and accept the terms of service and the data privacy policy.</p>
+    </ol>
+</div>
+</div>
+@include(snippets/footer)

views/top10.html

@@ -4,8 +4,8 @@
 <table class="table">
   @each(f0cks as f0ck)
   <tr>
-    <td><a href="//f0ck.me/{{ f0ck.id }}"><img src="//f0ck.me/t/{{ f0ck.id }}.webp" /></a></td>
+    <td><a href="//w0bm.com/{{ f0ck.id }}"><img src="//w0bm.com/t/{{ f0ck.id }}.webp" /></a></td>
-    <td><a href="//f0ck.me/{{ f0ck.id }}">{{ f0ck.id }}</a></td>
+    <td><a href="//w0bm.com/{{ f0ck.id }}">{{ f0ck.id }}</a></td>
     <td>{{ f0ck.username }}</td>
   </tr>
   @endeach