adding new stuff to the terms page, also privacy policy change

Reviewed-on: #76

.gitea/workflows/build.yaml

@@ -0,0 +1,43 @@
+name: fetch npm modules
+run-name: fetch npm modules
+on: [push]
+jobs:
+  f0ck the f0cker:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:15.2
+        env:
+          POSTGRES_USER: f0ck
+          POSTGRES_PASSWORD: f0ck
+          POSTGRES_DB: f0ck
+          POSTGRES_PORT: 5432
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 19
+      - run: npm ci
+
+      - name: Install PostgreSQL client
+        run: |
+          apt-get update
+          apt-get install --yes postgresql-client
+
+      - name: import f0ck database
+        run: psql -h postgres -d f0ck -U f0ck < f0ck.sql
+        env:
+          PGPASSWORD: f0ck
+
+      - name: create directories
+        run: mkdir -p tmp public/ca deleted/{ca,b,t}
+
+      - name: copy config
+        run: cp config_example.json config.json

.gitignore

@@ -1,7 +1,10 @@
 node_modules/
 logs/*.log
 config.json
-public/b/*
+public/b
-public/ca/*
+public/ca
-public/t/*
+public/t
+deleted/b
+deleted/ca
+deleted/t
 tmp/*

README.md

@@ -0,0 +1,30 @@
+# how to install:
+## dependencies
+```bash
+sudo pacman -S nodejs npm ffmpeg yt-dlp ffmpegthumbnailer postgresql imagemagick git mime-types
+```
+## postgres
+```bash
+sudo -u postgres initdb --locale en_US.UTF-8 -D '/var/lib/postgres/data'
+ #(if it fails: sudo localectl set-locale en_US.UTF-8)
+sudo systemctl enable --now postgresql
+ #(if you're retarded or lazy, append postgresql and postgresql-libs to your ignorepkg)
+sudo -u postgres createuser -S -D -R -e f0ck
+sudo -u postgres createdb f0ck -O f0ck
+```
+## install f0ck
+```bash
+sudo useradd f0ck -m
+sudo -iu f0ck
+cd ~
+git clone https://git.lat/f0ck/f0ckv2.git
+cd f0ckv2
+ #(for developers: git checkout dev)
+npm i
+psql f0ck < f0ck.sql
+mkdir -p public/ca deleted/{ca,b,t}
+cp config_example.json config.json
+  - edit config.json
+  - set up clients, as described here: https://git.lat/keinBot/cuffeo
+npm start
+```

config_example.json

@@ -0,0 +1,76 @@
+{
+  "main": {
+    "url": {
+      "full": "https://f0ck.dev",
+      "domain": "f0ck.dev",
+      "regex": "f0ck\\.dev"
+    },
+    "maxfilesize": 83886080,
+    "adminmultiplier": 3.5,
+    "ignored": [
+      "f0ck.dev",
+      "f0ck.me"
+    ]
+  },
+  "allowedModes": [ "sfw", "nsfw", "untagged", "all" ],
+  "allowedMimes": [ "audio", "image", "video" ],
+  "nsfp": [],
+  "websrv": {
+    "port": "8080",
+    "paths": {
+      "images": "/b",
+      "thumbnails": "/t",
+      "coverarts": "/ca"
+    },
+    "themes": [ "f0ck", "p1nk", "orange", "atmos", "amoled", "paper", "term", "iced", "f0ck95", "f0ck95d" ],
+    "eps": 300,
+    "cache": false,
+    "phrases": [
+      "<img src=\"/s/img/crap/nyancat.gif\" style=\"margin-top: 5px\" />"
+    ]
+  },
+  "clients": [{
+    "type": "irc",
+    "enabled": true,
+    "network": "n0xy",
+    "host": "irc.n0xy.net",
+    "port": 6697,
+    "ssl": true,
+    "selfSigned": false,
+    "sasl": false,
+    "nickname": "f0ckci",
+    "username": "f0ckci",
+    "realname": "f0ckci",
+    "channels": [
+      "#f0ck-dev"
+    ]
+  }],
+  "sql": {
+    "host": "localhost",
+    "user": "f0ck",
+    "password": "f0ck",
+    "database": "f0ck",
+    "schema": "public",
+    "multipleStatements": true
+  },
+  "admins": [
+    
+  ],
+  "mimes": {
+    "image/png": "png",
+    "video/webm": "webm",
+    "image/gif": "gif",
+    "image/jpeg": "jpg",
+    "image/webp": "webp",
+    "video/mp4": "mp4",
+    "video/quicktime": "mp4",
+    "audio/mpeg": "mpg",
+    "audio/mp3": "mp3",
+    "audio/ogg": "ogg",
+    "audio/opus": "opus",
+    "audio/flac": "flac",
+    "audio/x-flac": "flac",
+    "video/x-m4v": "mp4",
+    "video/x-matroska": "mkv"
+  }
+}

debug/autotagger.mjs

@@ -36,7 +36,7 @@ import lib from "../src/inc/lib.mjs";
         db({
           item_id: f.id,
           tag_id: tmp.nsfw ? 2 : 1,
-          user_id: 7
+          user_id: 1
         })
       }
     `;
@@ -46,8 +46,8 @@ import lib from "../src/inc/lib.mjs";
         insert into "tags_assign" ${
           db({
             item_id: f.id,
-            tag_id: 8, // hentai
+            tag_id: 4, // hentai
-            user_id: 7 // autotagger
+            user_id: 1 // autotagger
           })
         }
       `;

debug/clean.mjs

@@ -1,33 +1,95 @@
-import sql from "../src/inc/sql.mjs";
+import cfg from "../src/inc/config.mjs";
-import { promises as fs } from "fs";
+import db from "../src/inc/sql.mjs";
+import fs from "node:fs";
+import readline from 'node:readline/promises';
 
-const opts = {
+const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  b: "public/b",
-  t: "public/t",
-  tmp: "tmp"
-};
-const count = {
-  b: 0, t: 0, tmp: 0
-};
 
-const rows = await sql('items').select('id', 'dest');
+// npm run clean -- --dry-run
-const ids = rows.map(r => r.id.toString() + ".webp");
+const dry = !!process.argv.filter(a => a == '--dry-run').length;
-const dests = rows.map(r => r.dest);
+console.log(`dry run? ${dry}`);
+
+const dirs = {
+  b:   "./public/b",
+  t:   "./public/t",
+  tmp: "./tmp"
+};
 const files = {
-  b: (await fs.readdir(opts.b)).filter(f => f !== '.empty'),
+  b:   (await fs.promises.readdir(dirs.b))  .filter(f => f !== '.empty'),
-  t: await fs.readdir(opts.t)
+  t:   (await fs.promises.readdir(dirs.t))  .filter(f => f !== '.empty'),
+  tmp: (await fs.promises.readdir(dirs.tmp)).filter(f => f !== '.empty')
+};
+const extensions = [ ...Object.values(cfg.mimes), 'mov' ];
+const count = {
+  missing: { b: [], t: [] },
+  invalid: { b: [], t: [] },
+  spare:   { b: [], t: [] },
+  tmp:     files.tmp
+};
+const rows = await db`select id, dest from items where active = true`;
+const f0cks = {
+  b: rows.flatMap(f => f.dest),
+  t: rows.flatMap(f => `${f.id}.webp`)
 };
 
-const unused = {
+// missing
-  b: files.b.filter(f => !dests.includes(f)),
+for(const row of rows) {
-  t: files.t.filter(f => !ids.includes(f))
+  if(!fs.existsSync(`${dirs.b}/${row.dest}`))
+    count.missing.b.push(row.id);
+  if(!fs.existsSync(`${dirs.t}/${row.id}.webp`))
+    count.missing.t.push(row.id);
 }
 
-count.b = (await Promise.all(unused.b.map(f => fs.rm(`${opts.b}/${f}`)))).length;
+// invalid
-count.t = (await Promise.all(unused.t.map(f => fs.rm(`${opts.t}/${f}`)))).length;
+count.invalid.b = files.b.filter(f => !extensions.includes(f.toLowerCase().split('.')[1]));
+count.invalid.t = files.t.filter(f => !f.endsWith('.webp'));
 
-// clear tmp
+// spare
-const tmp = (await fs.readdir(opts.tmp)).filter(f => f !== '.empty');
+for(const file of files.b)
-count.tmp = (await Promise.all(tmp.map(f => fs.rm(`${opts.tmp}/${f}`)))).length;
+  if(!f0cks.b.includes(file))
+    count.spare.b.push(`${dirs.b}/${file}`);
 
-console.log(count, unused);
+for(const file of files.t)
+  if(!f0cks.t.includes(file))
+    count.spare.t.push(`${dirs.t}/${file}`);
+
+// show confusing summary
+console.log(count);
+
+// delete spare if --dry-run
+if(!dry) {
+  let q;
+  if(count.spare.b.length > 0) {
+    q = (await rl.question(`delete ${count.spare.b.length} unnecessary files in ${dirs.b}? [y/N] `)) == 'y';
+    if(q) {
+      await Promise.all(count.spare.b.map(f => fs.promises.unlink(f)));
+      console.log(`deleted ${count.spare.b.length} files`);
+    }
+    else
+      console.log('abort...');
+  }
+
+  if(count.spare.t.length > 0) {
+    q = (await rl.question(`delete ${count.spare.t.length} unnecessary files in ${dirs.t}? [y/N] `)) == 'y';
+    if(q) {
+      await Promise.all(count.spare.t.map(f => fs.promises.unlink(f)));
+      console.log(`deleted ${count.spare.t.length} files`);
+    }
+    else
+      console.log('abort...');
+  }
+
+  if(files.tmp.length > 0) {
+    q = (await rl.question(`delete ${files.tmp.length} files in ${dirs.tmp}? [y/N] `)) == 'y';
+    if(q) {
+      await Promise.all(files.tmp.map(f => fs.promises.unlink(`${dirs.tmp}/${f}`)));
+      console.log(`deleted ${files.tmp.length} files`);
+    }
+    else
+      console.log('abort...');
+  }
+}
+
+// close connection
+await db.end();
+process.exit();

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

@@ -0,0 +1,680 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 16.2
+-- Dumped by pg_dump version 16.2
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+--
+-- Name: public; Type: SCHEMA; Schema: -; Owner: f0ck
+--
+
+-- *not* creating schema, since initdb creates it
+
+
+ALTER SCHEMA public OWNER TO f0ck;
+
+--
+-- Name: unaccent; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS unaccent WITH SCHEMA public;
+
+
+--
+-- Name: EXTENSION unaccent; Type: COMMENT; Schema: -; Owner: 
+--
+
+COMMENT ON EXTENSION unaccent IS 'text search dictionary that removes accents';
+
+
+--
+-- Name: delete_unused_tags(); Type: FUNCTION; Schema: public; Owner: f0ck
+--
+
+CREATE FUNCTION public.delete_unused_tags() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+begin
+  delete from tags
+  where
+    tags.id not in (select tag_id from tags_assign) and
+    tags.id = OLD.tag_id and
+    tags.tag != 'sfw' and
+    tags.tag != 'nsfw';
+  return OLD;
+end $$;
+
+
+ALTER FUNCTION public.delete_unused_tags() OWNER TO f0ck;
+
+--
+-- Name: fill_normalized(); Type: FUNCTION; Schema: public; Owner: f0ck
+--
+
+CREATE FUNCTION public.fill_normalized() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+begin
+  NEW.normalized = slugify(NEW.tag);
+  return NEW;
+end$$;
+
+
+ALTER FUNCTION public.fill_normalized() OWNER TO f0ck;
+
+--
+-- Name: slugify(text); Type: FUNCTION; Schema: public; Owner: f0ck
+--
+
+CREATE FUNCTION public.slugify(v text) RETURNS text
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+  RETURN trim(BOTH '-' FROM regexp_replace(lower(unaccent(trim(v))), '[\u0000-\u002f \u003a-\u0040\u005b-\u0060\u007b-\u00bf]+', '', 'gi'));
+END;
+$$;
+
+
+ALTER FUNCTION public.slugify(v text) OWNER TO f0ck;
+
+--
+-- Name: unaccent_text(text); Type: FUNCTION; Schema: public; Owner: f0ck
+--
+
+CREATE FUNCTION public.unaccent_text(text) RETURNS text
+    LANGUAGE sql IMMUTABLE COST 1
+    AS $_$
+  -- unaccent is STABLE, but the indexes must use IMMUTABLE functions.
+  -- comment this line out when calling pg_dump.
+  SELECT unaccent($1);
+
+  -- Uncomment this line when calling pg_dump.
+  --SELECT ''::text;
+$_$;
+
+
+ALTER FUNCTION public.unaccent_text(text) OWNER TO f0ck;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- Name: favorites; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public.favorites (
+    user_id integer NOT NULL,
+    item_id integer NOT NULL
+);
+
+
+ALTER TABLE public.favorites OWNER TO f0ck;
+
+--
+-- Name: items_id_seq; Type: SEQUENCE; Schema: public; Owner: f0ck
+--
+
+CREATE SEQUENCE public.items_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE public.items_id_seq OWNER TO f0ck;
+
+--
+-- Name: items; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public.items (
+    id integer DEFAULT nextval('public.items_id_seq'::regclass) NOT NULL,
+    src character varying(255) NOT NULL,
+    dest character varying(40) NOT NULL,
+    mime character varying(100) NOT NULL,
+    size integer NOT NULL,
+    checksum character varying(255) NOT NULL,
+    username character varying(40) NOT NULL,
+    userchannel character varying(255) NOT NULL,
+    usernetwork character varying(40) NOT NULL,
+    stamp integer NOT NULL,
+    active boolean NOT NULL,
+    thumb character varying(100)
+);
+
+
+ALTER TABLE public.items OWNER TO f0ck;
+
+--
+-- Name: COLUMN items.src; Type: COMMENT; Schema: public; Owner: f0ck
+--
+
+COMMENT ON COLUMN public.items.src IS 'src-Link';
+
+
+--
+-- Name: COLUMN items.dest; Type: COMMENT; Schema: public; Owner: f0ck
+--
+
+COMMENT ON COLUMN public.items.dest IS 'filename';
+
+
+--
+-- Name: items_li; Type: VIEW; Schema: public; Owner: f0ck
+--
+
+CREATE VIEW public.items_li AS
+SELECT
+    NULL::integer AS id,
+    NULL::character varying(255) AS src,
+    NULL::character varying(40) AS dest,
+    NULL::character varying(100) AS mime,
+    NULL::integer AS size,
+    NULL::character varying(255) AS checksum,
+    NULL::character varying(40) AS username,
+    NULL::character varying(255) AS userchannel,
+    NULL::character varying(40) AS usernetwork,
+    NULL::integer AS stamp;
+
+
+ALTER VIEW public.items_li OWNER TO f0ck;
+
+--
+-- Name: tags_assign; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public.tags_assign (
+    item_id integer NOT NULL,
+    tag_id integer NOT NULL,
+    user_id integer DEFAULT 10 NOT NULL
+);
+
+
+ALTER TABLE public.tags_assign OWNER TO f0ck;
+
+--
+-- Name: tags_nsfp; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public.tags_nsfp (
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.tags_nsfp OWNER TO f0ck;
+
+--
+-- Name: items_sfw; Type: VIEW; Schema: public; Owner: f0ck
+--
+
+CREATE VIEW public.items_sfw AS
+ SELECT ( SELECT
+                CASE
+                    WHEN (tags_assign.tag_id > 0) THEN tags_assign.tag_id
+                    ELSE 0
+                END AS "case"
+           FROM public.tags_assign
+          WHERE ((tags_assign.tag_id = ANY (ARRAY[1, 2])) AND (tags_assign.item_id = items.id))) AS sfw,
+    ( SELECT
+                CASE
+                    WHEN (tags_assign.tag_id > 0) THEN 1
+                    ELSE 0
+                END AS "case"
+           FROM public.tags_assign
+          WHERE ((tags_assign.tag_id IN ( SELECT tags_nsfp.id
+                   FROM public.tags_nsfp)) AND (tags_assign.item_id = items.id))
+         LIMIT 1) AS nsfp,
+    id,
+    src,
+    dest,
+    mime,
+    size,
+    checksum,
+    username,
+    userchannel,
+    usernetwork,
+    stamp,
+    active
+   FROM public.items;
+
+
+ALTER VIEW public.items_sfw OWNER TO f0ck;
+
+--
+-- Name: tags_id_seq; Type: SEQUENCE; Schema: public; Owner: f0ck
+--
+
+CREATE SEQUENCE public.tags_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE public.tags_id_seq OWNER TO f0ck;
+
+--
+-- Name: tags; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public.tags (
+    id integer DEFAULT nextval('public.tags_id_seq'::regclass) NOT NULL,
+    tag character varying(70) NOT NULL,
+    normalized character varying(70) NOT NULL
+);
+
+
+ALTER TABLE public.tags OWNER TO f0ck;
+
+--
+-- Name: user_id_seq; Type: SEQUENCE; Schema: public; Owner: f0ck
+--
+
+CREATE SEQUENCE public.user_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE public.user_id_seq OWNER TO f0ck;
+
+--
+-- Name: user; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public."user" (
+    id integer DEFAULT nextval('public.user_id_seq'::regclass) NOT NULL,
+    login character varying(255) NOT NULL,
+    "user" character varying(255) NOT NULL,
+    password character varying(167) NOT NULL,
+    admin boolean NOT NULL,
+    created_at timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+ALTER TABLE public."user" OWNER TO f0ck;
+
+--
+-- Name: items_tags; Type: VIEW; Schema: public; Owner: f0ck
+--
+
+CREATE VIEW public.items_tags AS
+ SELECT ( SELECT
+                CASE
+                    WHEN (tags_assign.tag_id > 0) THEN tags_assign.tag_id
+                    ELSE 0
+                END AS "case"
+           FROM public.tags_assign
+          WHERE ((tags_assign.tag_id = ANY (ARRAY[1, 2])) AND (tags_assign.item_id = items.id))) AS sfw,
+    ( SELECT
+                CASE
+                    WHEN (tags_assign.tag_id > 0) THEN 1
+                    ELSE 0
+                END AS "case"
+           FROM public.tags_assign
+          WHERE ((tags_assign.tag_id IN ( SELECT tags_nsfp.id
+                   FROM public.tags_nsfp)) AND (tags_assign.item_id = items.id))
+         LIMIT 1) AS nsfp,
+    ( SELECT jsonb_agg(jsonb_build_object('id', tags.id, 'normalized', tags.normalized)) AS jsonb_agg
+           FROM (public.tags_assign
+             LEFT JOIN public.tags ON ((tags.id = tags_assign.tag_id)))
+          WHERE (tags_assign.item_id = items.id)) AS tags,
+    ( SELECT jsonb_agg(jsonb_build_object('id', favorites.user_id, 'user', "user"."user")) AS jsonb_agg
+           FROM (public.favorites
+             LEFT JOIN public."user" ON (("user".id = favorites.user_id)))
+          WHERE (favorites.item_id = items.id)) AS favs,
+    id,
+    src,
+    dest,
+    mime,
+    size,
+    checksum,
+    username,
+    userchannel,
+    usernetwork,
+    stamp,
+    active
+   FROM public.items;
+
+
+ALTER VIEW public.items_tags OWNER TO f0ck;
+
+--
+-- Name: tags_alias; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public.tags_alias (
+    tag_orig_id integer NOT NULL,
+    tag_alias character varying NOT NULL
+);
+
+
+ALTER TABLE public.tags_alias OWNER TO f0ck;
+
+--
+-- Name: user_alias; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public.user_alias (
+    userid integer NOT NULL,
+    alias character varying(255) NOT NULL
+);
+
+ALTER TABLE ONLY public.user_alias REPLICA IDENTITY FULL;
+
+
+ALTER TABLE public.user_alias OWNER TO f0ck;
+
+--
+-- Name: user_options; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public.user_options (
+    user_id integer NOT NULL,
+    mode integer NOT NULL,
+    theme character varying(50) NOT NULL,
+    avatar integer DEFAULT 56660 NOT NULL,
+    fullscreen smallint DEFAULT '0'::smallint NOT NULL
+);
+
+
+ALTER TABLE public.user_options OWNER TO f0ck;
+
+--
+-- Name: user_sessions_id_seq; Type: SEQUENCE; Schema: public; Owner: f0ck
+--
+
+CREATE SEQUENCE public.user_sessions_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE public.user_sessions_id_seq OWNER TO f0ck;
+
+--
+-- Name: user_sessions; Type: TABLE; Schema: public; Owner: f0ck
+--
+
+CREATE TABLE public.user_sessions (
+    id integer DEFAULT nextval('public.user_sessions_id_seq'::regclass) NOT NULL,
+    user_id integer NOT NULL,
+    session character varying(32) NOT NULL,
+    browser character varying(255) NOT NULL,
+    created_at integer NOT NULL,
+    last_used integer NOT NULL,
+    last_action character varying(255) NOT NULL,
+    kmsi smallint DEFAULT '0'::smallint NOT NULL
+);
+
+
+ALTER TABLE public.user_sessions OWNER TO f0ck;
+
+--
+-- Name: favorites idx_16521_primary; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.favorites
+    ADD CONSTRAINT idx_16521_primary PRIMARY KEY (user_id, item_id);
+
+
+--
+-- Name: items idx_16526_primary; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.items
+    ADD CONSTRAINT idx_16526_primary PRIMARY KEY (id);
+
+
+--
+-- Name: user idx_16554_primary; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public."user"
+    ADD CONSTRAINT idx_16554_primary PRIMARY KEY (id);
+
+
+--
+-- Name: user_options idx_16567_user_id; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.user_options
+    ADD CONSTRAINT idx_16567_user_id UNIQUE (user_id);
+
+
+--
+-- Name: user_sessions idx_16572_primary; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.user_sessions
+    ADD CONSTRAINT idx_16572_primary PRIMARY KEY (id);
+
+
+--
+-- Name: items items_checksum; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.items
+    ADD CONSTRAINT items_checksum UNIQUE (checksum);
+
+
+--
+-- Name: tags_alias tags_alias_tag_alias_tag_orig_id; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags_alias
+    ADD CONSTRAINT tags_alias_tag_alias_tag_orig_id UNIQUE (tag_alias, tag_orig_id);
+
+
+--
+-- Name: tags_alias tags_alias_tag_orig_id; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags_alias
+    ADD CONSTRAINT tags_alias_tag_orig_id PRIMARY KEY (tag_orig_id);
+
+
+--
+-- Name: tags_assign tags_assign_item_id_tag_id_primary; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags_assign
+    ADD CONSTRAINT tags_assign_item_id_tag_id_primary PRIMARY KEY (item_id, tag_id);
+
+
+--
+-- Name: tags_assign tags_assign_item_id_tag_id_unique; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags_assign
+    ADD CONSTRAINT tags_assign_item_id_tag_id_unique UNIQUE (item_id, tag_id);
+
+
+--
+-- Name: tags tags_id; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags
+    ADD CONSTRAINT tags_id PRIMARY KEY (id);
+
+
+--
+-- Name: tags tags_normalized; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags
+    ADD CONSTRAINT tags_normalized UNIQUE (normalized);
+
+
+--
+-- Name: tags tags_tag; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags
+    ADD CONSTRAINT tags_tag UNIQUE (tag);
+
+
+--
+-- Name: user_options user_options_user_id; Type: CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.user_options
+    ADD CONSTRAINT user_options_user_id PRIMARY KEY (user_id);
+
+
+--
+-- Name: items_li _RETURN; Type: RULE; Schema: public; Owner: f0ck
+--
+
+CREATE OR REPLACE VIEW public.items_li AS
+ SELECT items.id,
+    items.src,
+    items.dest,
+    items.mime,
+    items.size,
+    items.checksum,
+    items.username,
+    items.userchannel,
+    items.usernetwork,
+    items.stamp
+   FROM ((public.items
+     JOIN public.tags_assign ta1 ON (((ta1.tag_id = 1) AND (ta1.item_id = items.id))))
+     JOIN public.tags_assign ta2 ON (((NOT (ta2.tag_id IN ( SELECT tags_nsfp.id
+           FROM public.tags_nsfp))) AND (ta2.item_id = items.id))))
+  WHERE items.active
+  GROUP BY items.id;
+
+
+--
+-- Name: tags_assign tags_assign_ad; Type: TRIGGER; Schema: public; Owner: f0ck
+--
+
+CREATE TRIGGER tags_assign_ad AFTER DELETE ON public.tags_assign FOR EACH ROW EXECUTE FUNCTION public.delete_unused_tags();
+
+
+--
+-- Name: tags tags_bi; Type: TRIGGER; Schema: public; Owner: f0ck
+--
+
+CREATE TRIGGER tags_bi BEFORE INSERT ON public.tags FOR EACH ROW EXECUTE FUNCTION public.fill_normalized();
+
+
+--
+-- Name: tags tags_bu; Type: TRIGGER; Schema: public; Owner: f0ck
+--
+
+CREATE TRIGGER tags_bu BEFORE UPDATE ON public.tags FOR EACH ROW EXECUTE FUNCTION public.fill_normalized();
+
+
+--
+-- Name: favorites favorites_item_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.favorites
+    ADD CONSTRAINT favorites_item_id_fkey FOREIGN KEY (item_id) REFERENCES public.items(id) ON DELETE CASCADE;
+
+
+--
+-- Name: favorites favorites_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.favorites
+    ADD CONSTRAINT favorites_user_id_fkey FOREIGN KEY (user_id) REFERENCES public."user"(id) ON DELETE CASCADE;
+
+
+--
+-- Name: tags_alias tags_alias_tag_orig_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags_alias
+    ADD CONSTRAINT tags_alias_tag_orig_id_fkey FOREIGN KEY (tag_orig_id) REFERENCES public.tags(id) ON DELETE CASCADE;
+
+
+--
+-- Name: tags_assign tags_assign_item_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags_assign
+    ADD CONSTRAINT tags_assign_item_id_fkey FOREIGN KEY (item_id) REFERENCES public.items(id) ON DELETE CASCADE;
+
+
+--
+-- Name: tags_assign tags_assign_tag_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags_assign
+    ADD CONSTRAINT tags_assign_tag_id_fkey FOREIGN KEY (tag_id) REFERENCES public.tags(id) ON DELETE CASCADE;
+
+
+--
+-- Name: tags_assign tags_assign_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.tags_assign
+    ADD CONSTRAINT tags_assign_user_id_fkey FOREIGN KEY (user_id) REFERENCES public."user"(id) ON DELETE SET DEFAULT;
+
+
+--
+-- Name: user_options user_options_avatar_fkey; Type: FK CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.user_options
+    ADD CONSTRAINT user_options_avatar_fkey FOREIGN KEY (avatar) REFERENCES public.items(id) ON DELETE SET DEFAULT;
+
+
+--
+-- Name: user_options user_options_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.user_options
+    ADD CONSTRAINT user_options_user_id_fkey FOREIGN KEY (user_id) REFERENCES public."user"(id) ON DELETE CASCADE;
+
+
+--
+-- Name: user_sessions user_sessions_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: f0ck
+--
+
+ALTER TABLE ONLY public.user_sessions
+    ADD CONSTRAINT user_sessions_user_id_fkey FOREIGN KEY (user_id) REFERENCES public."user"(id) ON DELETE CASCADE;
+
+
+--
+-- Name: alltables; Type: PUBLICATION; Schema: -; Owner: postgres
+--
+
+CREATE PUBLICATION alltables FOR ALL TABLES WITH (publish = 'insert, update, delete, truncate');
+
+
+ALTER PUBLICATION alltables OWNER TO f0ck;
+
+--
+-- Name: SCHEMA public; Type: ACL; Schema: -; Owner: postgres
+--
+
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
+GRANT ALL ON SCHEMA public TO PUBLIC;
+
+
+--
+-- PostgreSQL database dump complete
+--
+

package-lock.json

@@ -1,26 +1,26 @@
 {
   "name": "f0ckv2",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "f0ckv2",
-      "version": "2.2.0",
+      "version": "2.2.1",
       "license": "MIT",
       "dependencies": {
-        "cuffeo": "^1.0.7-3",
+        "cuffeo": "^1.2.2",
         "flumm-fetch": "^1.0.1",
         "flummpress": "^2.0.5",
-        "postgres": "^3.0.1"
+        "postgres": "^3.3.4"
       }
     },
     "node_modules/cuffeo": {
-      "version": "1.0.7-3",
+      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cuffeo/-/cuffeo-1.0.7-3.tgz",
+      "resolved": "https://registry.npmjs.org/cuffeo/-/cuffeo-1.2.2.tgz",
-      "integrity": "sha512-Lz8AlLdFWeLLGsf6KBXTHnpseeMbuQH69BamhZr8O9Se9pzuHQgv/ed13n2XWreN0RTyRa49YPtsNVwoQnNrLw==",
+      "integrity": "sha512-Pd2AL/Zp5RCAbaSbT7rLUOyxSEVCFovihaIaje7uYzpQMzIwPbFapQ/mn2d2iz+Tbkjs9LF+FD5JzAvANh9Wzw==",
       "dependencies": {
-        "flumm-fetch-cookies": "^1.4.0"
+        "flumm-fetch": "^1.0.1"
       }
     },
     "node_modules/flumm-fetch": {
@@ -28,26 +28,15 @@
       "resolved": "https://registry.npmjs.org/flumm-fetch/-/flumm-fetch-1.0.1.tgz",
       "integrity": "sha512-pZ5U0hheCSW43vfGZQMunr03U7rUOX+iy2y13Tu4nc3iRL+E/Qfeo5nZ2B2JMYKOGIx1A1anUYOz+ulyhouyjg=="
     },
-    "node_modules/flumm-fetch-cookies": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/flumm-fetch-cookies/-/flumm-fetch-cookies-1.4.0.tgz",
-      "integrity": "sha512-OHGUak5iHl9GoDdbkAMsrL9ONkFQ8opd0jYQ9lMUuGVqIP+JPbyzQqElhpwJxLaV/WSE4LR/2dnHoguFHFSLFA==",
-      "dependencies": {
-        "flumm-fetch": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=11.14.0"
-      }
-    },
     "node_modules/flummpress": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/flummpress/-/flummpress-2.0.5.tgz",
       "integrity": "sha512-C/8Im6OvoZw67q9DvYIXKjKr28zHYLJdH4DucQ6zpVbN1eWPySmxkJTURbkq3uEwABXLngXLifS6mjxAC++umQ=="
     },
     "node_modules/postgres": {
-      "version": "3.1.0",
+      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.3.4.tgz",
-      "integrity": "sha512-yQbJtA7z6SsQuFiF01rmHlkG2gU5IEv9D/Pn2fu8Tz6x3/suNWZs4fIPd59rkL+dfVfhDqYQ7DU3YnUqzEDB5Q==",
+      "integrity": "sha512-XVu0+d/Y56pl2lSaf0c7V19AhAEfpVrhID1IENWN8nf0xch6hFq6dAov5dtUX6ZD46wfr1TxvLhxLtV8WnNsOg==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/porsager"
@@ -56,11 +45,11 @@
   },
   "dependencies": {
     "cuffeo": {
-      "version": "1.0.7-3",
+      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cuffeo/-/cuffeo-1.0.7-3.tgz",
+      "resolved": "https://registry.npmjs.org/cuffeo/-/cuffeo-1.2.2.tgz",
-      "integrity": "sha512-Lz8AlLdFWeLLGsf6KBXTHnpseeMbuQH69BamhZr8O9Se9pzuHQgv/ed13n2XWreN0RTyRa49YPtsNVwoQnNrLw==",
+      "integrity": "sha512-Pd2AL/Zp5RCAbaSbT7rLUOyxSEVCFovihaIaje7uYzpQMzIwPbFapQ/mn2d2iz+Tbkjs9LF+FD5JzAvANh9Wzw==",
       "requires": {
-        "flumm-fetch-cookies": "^1.4.0"
+        "flumm-fetch": "^1.0.1"
       }
     },
     "flumm-fetch": {
@@ -68,23 +57,15 @@
       "resolved": "https://registry.npmjs.org/flumm-fetch/-/flumm-fetch-1.0.1.tgz",
       "integrity": "sha512-pZ5U0hheCSW43vfGZQMunr03U7rUOX+iy2y13Tu4nc3iRL+E/Qfeo5nZ2B2JMYKOGIx1A1anUYOz+ulyhouyjg=="
     },
-    "flumm-fetch-cookies": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/flumm-fetch-cookies/-/flumm-fetch-cookies-1.4.0.tgz",
-      "integrity": "sha512-OHGUak5iHl9GoDdbkAMsrL9ONkFQ8opd0jYQ9lMUuGVqIP+JPbyzQqElhpwJxLaV/WSE4LR/2dnHoguFHFSLFA==",
-      "requires": {
-        "flumm-fetch": "^1.0.1"
-      }
-    },
     "flummpress": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/flummpress/-/flummpress-2.0.5.tgz",
       "integrity": "sha512-C/8Im6OvoZw67q9DvYIXKjKr28zHYLJdH4DucQ6zpVbN1eWPySmxkJTURbkq3uEwABXLngXLifS6mjxAC++umQ=="
     },
     "postgres": {
-      "version": "3.1.0",
+      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.3.4.tgz",
-      "integrity": "sha512-yQbJtA7z6SsQuFiF01rmHlkG2gU5IEv9D/Pn2fu8Tz6x3/suNWZs4fIPd59rkL+dfVfhDqYQ7DU3YnUqzEDB5Q=="
+      "integrity": "sha512-XVu0+d/Y56pl2lSaf0c7V19AhAEfpVrhID1IENWN8nf0xch6hFq6dAov5dtUX6ZD46wfr1TxvLhxLtV8WnNsOg=="
     }
   }
 }

package.json

@@ -1,22 +1,23 @@
 {
   "name": "f0ckv2",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "f0ck, kennste?",
   "main": "index.mjs",
+  "type": "module",
   "scripts": {
-    "start": "node --experimental-json-modules src/index.mjs",
+    "start": "node --trace-uncaught src/index.mjs",
-    "trigger": "node --experimental-json-modules debug/trigger.mjs",
+    "trigger": "node debug/trigger.mjs",
-    "autotagger": "node --experimental-json-modules debug/autotagger.mjs",
+    "autotagger": "node debug/autotagger.mjs",
-    "thumbnailer": "node --experimental-json-modules debug/thumbnailer.mjs",
+    "thumbnailer": "node debug/thumbnailer.mjs",
-    "test": "node --experimental-json-modules debug/test.mjs",
+    "test": "node debug/test.mjs",
-    "clean": "node --experimental-json-modules debug/clean.mjs"
+    "clean": "node debug/clean.mjs"
   },
   "author": "Flummi",
   "license": "MIT",
   "dependencies": {
-    "cuffeo": "^1.0.7-3",
+    "cuffeo": "^1.2.2",
     "flumm-fetch": "^1.0.1",
     "flummpress": "^2.0.5",
-    "postgres": "^3.0.1"
+    "postgres": "^3.3.4"
   }
 }

public/s/css/v0ck.css

@@ -72,7 +72,7 @@
   display: none;
 }
 
-svg {
+.v0ck_player_controls svg {
   width: 20px;
   height: 20px;
   fill: #fff;

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/img/iconset.svg

@@ -3,8 +3,10 @@
 <svg xmlns="http://www.w3.org/2000/svg">
   <!-- Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
   <defs>
-    <symbol style="fill: var(--accent)" id="heart_regular" viewBox="0 0 512 512"><path d="M458.4 64.3C400.6 15.7 311.3 23 256 79.3 200.7 23 111.4 15.6 53.6 64.3-21.6 127.6-10.6 230.8 43 285.5l175.4 178.7c10 10.2 23.4 15.9 37.6 15.9 14.3 0 27.6-5.6 37.6-15.8L469 285.6c53.5-54.7 64.7-157.9-10.6-221.3zm-23.6 187.5L259.4 430.5c-2.4 2.4-4.4 2.4-6.8 0L77.2 251.8c-36.5-37.2-43.9-107.6 7.3-150.7 38.9-32.7 98.9-27.8 136.5 10.5l35 35.7 35-35.7c37.8-38.5 97.8-43.2 136.5-10.6 51.1 43.1 43.5 113.9 7.3 150.8z"/></symbol>
+    <symbol id="heart_regular" viewBox="0 0 512 512"><path d="M458.4 64.3C400.6 15.7 311.3 23 256 79.3 200.7 23 111.4 15.6 53.6 64.3-21.6 127.6-10.6 230.8 43 285.5l175.4 178.7c10 10.2 23.4 15.9 37.6 15.9 14.3 0 27.6-5.6 37.6-15.8L469 285.6c53.5-54.7 64.7-157.9-10.6-221.3zm-23.6 187.5L259.4 430.5c-2.4 2.4-4.4 2.4-6.8 0L77.2 251.8c-36.5-37.2-43.9-107.6 7.3-150.7 38.9-32.7 98.9-27.8 136.5 10.5l35 35.7 35-35.7c37.8-38.5 97.8-43.2 136.5-10.6 51.1 43.1 43.5 113.9 7.3 150.8z"/></symbol>
-    <symbol style="fill: var(--accent)" id="heart_solid" viewBox="0 0 512 512"><path d="M462.3 62.6C407.5 15.9 326 24.3 275.7 76.2L256 96.5l-19.7-20.3C186.1 24.3 104.5 15.9 49.7 62.6c-62.8 53.6-66.1 149.8-9.9 207.9l193.5 199.8c12.5 12.9 32.8 12.9 45.3 0l193.5-199.8c56.3-58.1 53-154.3-9.8-207.9z"/></symbol>
+    <symbol id="heart_solid" viewBox="0 0 512 512"><path d="M462.3 62.6C407.5 15.9 326 24.3 275.7 76.2L256 96.5l-19.7-20.3C186.1 24.3 104.5 15.9 49.7 62.6c-62.8 53.6-66.1 149.8-9.9 207.9l193.5 199.8c12.5 12.9 32.8 12.9 45.3 0l193.5-199.8c56.3-58.1 53-154.3-9.8-207.9z"/></symbol>
-    <symbol id="cross" viewBox="0 0 512 512"><path d="M53.6,62.3 L458.4,458.4 M458.4,62.3 L53.6,458.4" style="stroke-linecap: round;stroke-width: 60;stroke: var(--accent);"/></symbol>
+    <symbol id="cross" viewBox="0 0 512 512"><path d="M53.6,62.3 L458.4,458.4 M458.4,62.3 L53.6,458.4" style="stroke-linecap: round;stroke-width: 60;"/></symbol>
+    <symbol id="window-maximize" viewBox="0 0 512 512"><path d="M464 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h416c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm0 394c0 3.3-2.7 6-6 6H54c-3.3 0-6-2.7-6-6V192h416v234z" style="fill: var(--maximize_button);"/></symbol>
+    <symbol id="window-minimize" viewBox="0 0 512 512"><path d="M464 0H144c-26.5 0-48 21.5-48 48v48H48c-26.5 0-48 21.5-48 48v320c0 26.5 21.5 48 48 48h320c26.5 0 48-21.5 48-48v-48h48c26.5 0 48-21.5 48-48V48c0-26.5-21.5-48-48-48zm-96 464H48V256h320v208zm96-96h-48V144c0-26.5-21.5-48-48-48H144V48h320v320z" style="fill: var(--maximize_button);"/></symbol>
   </defs>
 </svg>

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;
@@ -85,7 +47,7 @@ const flash = ({ type, msg }) => {
       [...document.querySelectorAll("#tags > .badge")].forEach(tag => tag.parentElement.removeChild(tag));
       _tags.reverse().forEach(tag => {
         const a = document.createElement("a");
-        a.href = `/tag/${tag.tag}`;
+        a.href = `/tag/${tag.normalized}`;
         a.style = "color: inherit !important";
         a.innerHTML = tag.tag;
         a.addEventListener("click", editTagEvent); // tmp
@@ -101,6 +63,7 @@ const flash = ({ type, msg }) => {
         delbutton.href = "#";
         delbutton.addEventListener("click", deleteEvent);
         span.insertAdjacentElement("beforeend", a);
+        span.innerHTML += ' ';
         span.insertAdjacentElement("beforeend", delbutton);
   
         document.querySelector("#tags").insertAdjacentElement("afterbegin", span);
@@ -139,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);
@@ -201,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 => {
@@ -217,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
-        });
       }
     };
 
@@ -287,6 +233,7 @@ const flash = ({ type, msg }) => {
 
         textfield.addEventListener("keyup", async e => {
           if(e.key === 'Enter') {
+            parent.removeChild(textfield);
             // send
             let res = await fetch('/api/v2/admin/tags/' + encodeURIComponent(oldtag), {
               method: 'PUT',
@@ -303,7 +250,7 @@ const flash = ({ type, msg }) => {
             switch(status) {
               case 200: // success, change
               case 201:
-                parent.removeChild(textfield);
+                //parent.removeChild(textfield);
                 parent.insertAdjacentElement('afterbegin', old);
                 parent.querySelector('a:last-child').style.display = '';
                 old.href = `/tag/${res.tag}`;
@@ -331,11 +278,12 @@ const flash = ({ type, msg }) => {
     document.querySelector("a#a_toggle").addEventListener("click", toggleEvent);
     [...document.querySelectorAll("#tags > .badge > a:first-child")].map(t => t.addEventListener("click", editTagEvent));
     [...document.querySelectorAll("#tags > .badge > a:last-child")].map(t => t.addEventListener("click", deleteEvent));
-    document.querySelector("svg#a_delete").addEventListener("click", deleteButtonEvent);
+    if(document.querySelector("svg#a_delete"))
+      document.querySelector("svg#a_delete").addEventListener("click", deleteButtonEvent);
     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

@@ -1,13 +1,57 @@
+
+window.requestAnimFrame = (function(){
+  return window.requestAnimationFrame
+          || window.webkitRequestAnimationFrame
+          || window.mozRequestAnimationFrame
+          || function(callback) { window.setTimeout(callback, 1000 / 60);};
+})();
+
 (() => {
   let video;
   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');
       }
     });
+
+    document.getElementById('togglebg').addEventListener('click', function (e) {
+      e.preventDefault();
+      background = !background;
+      localStorage.setItem('background', background.toString());
+      var canvas = document.getElementById('bg');
+      if (background) {
+          canvas.classList.add('fader-in');
+          canvas.classList.remove('fader-out');
+      } else {
+          canvas.classList.add('fader-out');
+          canvas.classList.remove('fader-in');
+      }
+      animationLoop();
+    });
+
+  if(elem !== null) {
+    if(localStorage.getItem('background') == undefined) {
+      localStorage.setItem('background', 'true');
+    }
+    
+    var background = localStorage.getItem('background') === 'true';
+    var canvas = document.getElementById('bg');
+    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)
+          return;
+      context.drawImage(video, 0, 0, cw, ch);
+      window.requestAnimFrame(animationLoop);
+  }
+
+    elem.addEventListener('play', animationLoop);
+  }
   }
 
   let tt = false;
@@ -28,7 +72,9 @@
     " ": 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();
       keybindings[e.key]();
     }
@@ -44,19 +90,44 @@
     i.src = e.src;
   });
 
+  // <wheeler>
+  const wheelEventListener = function(event) {
+    if (event.target.closest('.media-object')) {
+      if (event.deltaY < 0) {
+        document.getElementById('next').click();
+      } else if (event.deltaY > 0) {
+        document.getElementById('prev').click();
+      }
+    }
+  };
+
+  window.addEventListener('wheel', wheelEventListener);
+  // </wheeler>
+
+
   if(f0ckimage = document.querySelector("img#f0ck-image")) {
     const f0ckimagescroll = document.querySelector("#image-scroll");
+
+    let isImageExpanded = false;
+    console.log("entry point - image unclicked")
+
     f0ckimage.addEventListener("click", async e => {
       e.preventDefault();
       const img = await imgSize(f0ckimage);
-      if(img.width > img.height)
+      console.log("img clicked");
-        return;
+      if (isImageExpanded) {
-      f0ckimagescroll.hasAttribute("style")
+        isImageExpanded = false;
-        ? f0ckimagescroll.removeAttribute("style")
+        f0ckimagescroll.removeAttribute("style");
-        : f0ckimagescroll.setAttribute("style", "overflow-y: scroll");
+        f0ckimage.removeAttribute("style");
-      f0ckimage.hasAttribute("style")
+        console.log("image is not expanded")
-        ? f0ckimage.removeAttribute("style")
+        window.addEventListener('wheel', wheelEventListener);
-        : f0ckimage.setAttribute("style", "max-height: none; height: auto; width: 100%; position: absolute; left: 0;");
+      } else {
+        if (img.width > img.height) return;
+        isImageExpanded = true;
+        window.removeEventListener('wheel', wheelEventListener);
+        f0ckimagescroll.setAttribute("style", "overflow-y: scroll");
+        f0ckimage.setAttribute("style", "max-height: none; height: auto; width: 100%; position: absolute; left: 0; border: var(--img-border-width) solid var(--img-border-color); border-top: none; border-bottom: none;");
+      }
     });
   }
   // </image-responsive>
@@ -64,13 +135,13 @@
   // <scroller>
   let tts = 0;
   const scroll_treshold = 1;
-  if(document.querySelector("div#posts")) {
+  if([...document.querySelectorAll("div.posts")].length === 1) {
     document.addEventListener("wheel", e => {
-      if(Math.ceil(window.innerHeight + window.scrollY) >= document.body.offsetHeight && e.deltaY > 0) { // down
+      if(Math.ceil(window.innerHeight + window.scrollY) >= document.querySelector('#main').offsetHeight && e.deltaY > 0) { // down
         if(elem = document.querySelector(".pagination > .next:not(.disabled)")) {
           if(tts < scroll_treshold) {
-            document.querySelector("div#footbar").style.boxShadow = "inset 0px 4px 0px var(--accent)";
+            document.querySelector("div#footbar").style.boxShadow = "inset 0px 4px 0px var(--footbar-color)";
-            document.querySelector("div#footbar").style.color = "var(--accent)";
+            document.querySelector("div#footbar").style.color = "var(--footbar-color)";
             tts++;
           }
           else
@@ -80,7 +151,7 @@
       else if(window.scrollY <= 0 && e.deltaY < 0) { // up
         if(elem = document.querySelector(".pagination > .prev:not(.disabled)")) {
           if(tts < scroll_treshold) {
-            document.querySelector("nav.navbar").style.boxShadow = "0px 2px 0px var(--accent)";
+            document.querySelector("nav.navbar").style.boxShadow = "0px 2px 0px var(--loading-indicator-color)";
             document.querySelector("nav.navbar").style.transition = ".2s ease-in-out";
             tts++;
           }
@@ -150,10 +221,10 @@
     }
     else {
       if(Math.abs(swipeRT.yDiff) > swipeOpt.treshold && timeDiff < swipeOpt.timeout) {
-        if(navbar = document.querySelector("nav.navbar") && document.querySelector("div#posts")) {
+        if(navbar = document.querySelector("nav.navbar") && document.querySelector("div.posts")) {
           if(swipeRT.yDiff > 0 && (window.innerHeight + window.scrollY) >= document.body.offsetHeight) // up
             elem = document.querySelector(".pagination > .next:not(.disabled)");
-          else if(swipeRT.yDiff <= 0 && window.scrollY <= 0 && document.querySelector("div#posts")) // down
+          else if(swipeRT.yDiff <= 0 && window.scrollY <= 0 && document.querySelector("div.posts")) // down
             elem = document.querySelector(".pagination > .prev:not(.disabled)");
         }
       }
@@ -232,4 +303,8 @@
     });
   }
   // </mediakeys>
-})();
+
+  // <scroller>
+
+  // </scroller>
+})();

public/s/js/theme.js

@@ -8,13 +8,14 @@ const Cookie = {
       opts['max-age'] = opts.days * 60 * 60 * 24;
       delete opts.days;
     }
+    opts.SameSite = 'Strict';
     opts = Object.entries(opts).reduce((accumulatedStr, [k, v]) => `${accumulatedStr}; ${k}=${v}`, '');
     document.cookie = name + '=' + encodeURIComponent(value) + opts
   }
 };
 
 (() => {
-  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))
@@ -29,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") {
@@ -44,4 +45,21 @@ const Cookie = {
       Cookie.set("theme", themes[i], { path: "/", days: 360 });
     }
   });
+
+  if(tbuttonfull = document.querySelector('svg#a_tfull')) {
+    tbuttonfull.addEventListener('click', e => {
+      let f = Cookie.get('fullscreen');
+      if(f == 1) {
+        Cookie.set('fullscreen', 0);
+        document.querySelector('html').setAttribute('res', '');
+        tbuttonfull.innerHTML = `<use href="/s/img/iconset.svg#window-maximize"></use>`;
+      }
+      else {
+        Cookie.set('fullscreen', 1);
+        document.querySelector('html').setAttribute('res', 'fullscreen');
+        tbuttonfull.innerHTML = `<use href="/s/img/iconset.svg#window-minimize"></use>`;
+      }
+      return true;
+    });
+  }
 })();

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

public/s/js/v0ck.js

@@ -18,6 +18,7 @@ const tpl_player = svg => `<div class="v0ck_player_controls">
   <input type="range" name="volume" min="0" max="1" step="0.01" value="1" />
   <button class="v0ck_player_button v0ck_playtime">00:00 / 00:00</button>
   <span style="flex: 30"></span>
+  <button id="togglebg">&#128161;</button>
   <button data-skip="-10" class="v0ck_player_button">
     <svg style="width: 20px; height: 20px;"><use id="v0ck_svg_backward" href="${svg}#backward"></use></svg>
   </button>

src/inc/autotagger.mjs

@@ -0,0 +1,32 @@
+import fetch from 'flumm-fetch';
+import cfg from './config.mjs';
+
+export default new class autotagger {
+  async isNSFW(filename, filesize) {
+    let opts = {
+      method: 'POST',
+    };
+    let apiurl;
+    if(filesize < 4194304) {
+      apiurl = cfg.apis.nsfw1.url;
+      opts.headers = cfg.apis.nsfw1.headers;
+      opts.body = JSON.stringify({
+        DataRepresentation: "URL",
+        Value: `${cfg.main.url.full}/b/${filename}`
+      });
+    }
+    else {
+      apiurl = cfg.apis.nsfw2.url;
+      opts.headers = cfg.apis.nsfw2.headers;
+      opts.body = JSON.stringify({
+        url: `${cfg.main.url.full}/b/${filename}`
+      })
+    }
+    const res = await (await fetch(apiurl, opts)).json();
+
+    if(filesize < 4194304)
+      return res.IsImageAdultClassified || res.RacyClassificationScore > 0.6;
+    else
+      return res.unsafe;
+  };
+};

src/inc/config.mjs

@@ -1,4 +1,4 @@
-import _config from "../../config.json" assert { type: "json" };
+import _config from "../../config.json" with { type: "json" };
 
 let config = JSON.parse(JSON.stringify(_config));
 

src/inc/events/callback_query.mjs

@@ -0,0 +1,318 @@
+import logger from "../log.mjs";
+import { getLevel } from "../../inc/admin.mjs";
+import { promises as fs } from "fs";
+import cfg from "../config.mjs";
+import db from "../sql.mjs";
+import lib from "../lib.mjs";
+
+const tagkeyboard = id => {
+  const tags = [{
+    tag: 'music',
+    id: 115
+  }, {
+    tag: 'german',
+    id: 329
+  }, {
+    tag: 'cat',
+    id: 217
+  }, {
+    tag: 'doggo',
+    id: 5
+  }];
+  return Promise.all(tags.map(async t => ({ text: `${await lib.hasTag(id, t.id) ? '✓ ' : ''}${t.tag}`, callback_data: `b_settag_${t.id}:${id}` })));
+};
+
+export default async bot => {
+
+  return [{
+    name: "callback_query",
+    listener: "callback_query",
+    f: async e => {
+      logger.info(`${e.network} -> ${e.channel} -> ${e.user.nick}: ${e.message}`);
+
+      let [ cmd, id ] = e.opt.data.split(':');
+      let f0ck;
+      id = +id;
+
+      if(cmd.startsWith('b_settag_')) {
+        const tagid = +cmd.replace('b_settag_', '');
+
+        if(!(await lib.getTags(id)).filter(tag => tag.id == tagid).length) {
+          // insert
+          await db`
+            insert into "tags_assign" ${
+              db({
+                item_id: id,
+                tag_id: tagid,
+                user_id: 1
+              })
+            }
+          `;
+        }
+        else {
+          // delete
+          await db`
+            delete from "tags_assign"
+            where tag_id = ${tagid}
+            and item_id = ${id}
+          `;
+        }
+
+        const keyboard = await tagkeyboard(id);
+
+        return await e.editMessageText(e.raw.chat.id, e.raw.message_id, e.message, {
+          reply_markup: JSON.stringify({
+            inline_keyboard: [[
+              ...keyboard
+            ], [
+              { text: 'back', callback_data: `b_back:${id}` }
+            ]]
+          })
+        });
+      }
+
+      switch(cmd) {
+        case "b_tags":
+          if(!id)
+            return;
+
+          const keyboard = await tagkeyboard(id);
+
+          await e.editMessageText(e.raw.chat.id, e.raw.message_id, e.message, {
+            reply_markup: JSON.stringify({
+              inline_keyboard: [[
+                ...keyboard
+              ], [
+                { text: 'back', callback_data: `b_back:${id}` }
+              ]]
+            })
+          });
+        break;
+        case "b_back":
+          if(!id)
+            return;
+
+          await e.editMessageText(e.raw.chat.id, e.raw.message_id, e.message, {
+            reply_markup: JSON.stringify({
+              inline_keyboard: [[
+                { text: (await lib.hasTag(id, 1) ? '✓ ' : '') + 'sfw', callback_data: `b_sfw:${id}` },
+                { text: (await lib.hasTag(id, 2) ? '✓ ' : '') + 'nsfw', callback_data: `b_nsfw:${id}` },
+                { text: 'tags', callback_data: `b_tags:${id}` },
+                { text: '❌ delete', callback_data: `b_delete:${id}` }
+              ], [
+                { text: `open f0ck #${id}`, url: `${cfg.main.url.full}/${id}` }
+              ]]
+            })
+          });
+        break;
+        case "b_sfw":
+          
+          if(!id)
+            return;
+
+          if(!await lib.hasTag(id, 1)) {
+            // insert
+            await db`
+              insert into "tags_assign" ${
+                db({
+                  item_id: id,
+                  tag_id: 1, // sfw
+                  user_id: 1
+                })
+              }
+            `;
+            if(await lib.hasTag(id, 2)) {
+              await db`
+                delete from "tags_assign"
+                where tag_id = 2
+                and item_id = ${id}
+              `;
+            }
+          }
+          else {
+            // delete
+            await db`
+              delete from "tags_assign"
+              where tag_id = 1
+              and item_id = ${id}
+            `;
+          }
+
+          return await e.editMessageText(e.raw.chat.id, e.raw.message_id, e.message, {
+            reply_markup: JSON.stringify({
+              inline_keyboard: [[
+                { text: (await lib.hasTag(id, 1) ? '✓ ' : '') + 'sfw', callback_data: `b_sfw:${id}` },
+                { text: (await lib.hasTag(id, 2) ? '✓ ' : '') + 'nsfw', callback_data: `b_nsfw:${id}` },
+                { text: 'tags', callback_data: `b_tags:${id}` },
+                { text: '❌ delete', callback_data: `b_delete:${id}` }
+              ], [
+                { text: `open f0ck #${id}`, url: `${cfg.main.url.full}/${id}` }
+              ]]
+            })
+          });
+
+        break;
+        case "b_nsfw":
+          if(!id)
+            return;
+
+          if(!await lib.hasTag(id, 2)) {
+            // insert
+            await db`
+              insert into "tags_assign" ${
+                db({
+                  item_id: id,
+                  tag_id: 2, // nsfw
+                  user_id: 1
+                })
+              }
+            `;
+            if(await lib.hasTag(id, 1)) {
+              await db`
+                delete from "tags_assign"
+                where tag_id = 1
+                and item_id = ${id}
+              `;
+            }
+          }
+          else {
+            // delete
+            await db`
+              delete from "tags_assign"
+              where tag_id = 2
+              and item_id = ${id}
+            `;
+          }
+
+          return await e.editMessageText(e.raw.chat.id, e.raw.message_id, e.message, {
+            reply_markup: JSON.stringify({
+              inline_keyboard: [[
+                { text: (await lib.hasTag(id, 1) ? '✓ ' : '') + 'sfw', callback_data: `b_sfw:${id}` },
+                { text: (await lib.hasTag(id, 2) ? '✓ ' : '') + 'nsfw', callback_data: `b_nsfw:${id}` },
+                { text: 'tags', callback_data: `b_tags:${id}` },
+                { text: '❌ delete', callback_data: `b_delete:${id}` }
+              ], [
+                { text: `open f0ck #${id}`, url: `${cfg.main.url.full}/${id}` }
+              ]]
+            })
+          });
+        break;
+        case "b_delete":
+          if(id <= 1)
+            return;
+
+          e.user = {
+            prefix: `${e.raw.reply_to_message.from.username}!${e.raw.reply_to_message.from.id}@${e.network}`,
+            nick: e.raw.reply_to_message.from.first_name,
+            username: e.raw.reply_to_message.from.username,
+            account: e.raw.reply_to_message.from.id.toString()
+          };
+
+          f0ck = await db`
+            select dest, mime, username, userchannel, usernetwork
+            from "items"
+            where
+              id = ${id} and
+              active = 'true'
+            limit 1
+          `;
+          const level = getLevel(e.user).level;
+
+          if(f0ck.length === 0) {
+            return await e.reply(`f0ck ${id}: f0ck not found`);
+          }
+          
+          if(
+            (f0ck[0].username !== (e.user.nick || e.user.username) ||
+            f0ck[0].userchannel !== e.channel ||
+            f0ck[0].usernetwork !== e.network) &&
+            level < 100
+          ) {
+            return await e.reply(`f0ck ${id}: insufficient permissions`);
+          }
+
+          if(~~(new Date() / 1e3) >= (f0ck[0].stamp + 600) && level < 100) {
+            return await e.reply(`f0ck ${id}: too late lol`);
+          }
+
+          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(_=>{});
+
+          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(_=>{});
+          }
+
+          await e.editMessageText(e.raw.chat.id, e.raw.message_id, e.message, {
+            reply_markup: JSON.stringify({
+              inline_keyboard: [[
+                { text: (await lib.hasTag(id, 1) ? '✓ ' : '') + 'sfw', callback_data: `b_sfw:${id}` },
+                { text: (await lib.hasTag(id, 2) ? '✓ ' : '') + 'nsfw', callback_data: `b_nsfw:${id}` },
+                { text: 'tags', callback_data: `b_tags:${id}` },
+                { text: 'recover', callback_data: `b_recover:${id}` }
+              ], [
+                { text: `open f0ck #${id}`, url: `${cfg.main.url.full}/${id}` }
+              ]]
+            })
+          });
+        break;
+        case "b_recover":
+          if(id <= 1)
+            return;
+
+          e.user = {
+            prefix: `${e.raw.reply_to_message.from.username}!${e.raw.reply_to_message.from.id}@${e.network}`,
+            nick: e.raw.reply_to_message.from.first_name,
+            username: e.raw.reply_to_message.from.username,
+            account: e.raw.reply_to_message.from.id.toString()
+          };
+          
+          f0ck = await db`
+            select dest, mime
+            from "items"
+            where
+              id = ${id} and
+              active = 'false'
+            limit 1
+          `;
+  
+          if(f0ck.length === 0) {
+            return await e.reply(`f0ck ${id}: f0ck not found`);
+          }
+  
+          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(_=>{});
+          }
+  
+          await db`update "items" set active = 'true' where id = ${id}`;
+          
+          await e.editMessageText(e.raw.chat.id, e.raw.message_id, e.message, {
+            reply_markup: JSON.stringify({
+              inline_keyboard: [[
+                { text: (await lib.hasTag(id, 1) ? '✓ ' : '') + 'sfw', callback_data: `b_sfw:${id}` },
+                { text: (await lib.hasTag(id, 2) ? '✓ ' : '') + 'nsfw', callback_data: `b_nsfw:${id}` },
+                { text: 'tags', callback_data: `b_tags:${id}` },
+                { text: '❌ delete', callback_data: `b_delete:${id}` }
+              ], [
+                { text: `open f0ck #${id}`, url: `${cfg.main.url.full}/${id}` }
+              ]]
+            })
+          });
+        break;
+        default:
+          await e.reply('lol');
+      }
+    }
+  }];
+
+};

src/inc/events/message.mjs

@@ -20,7 +20,7 @@ export default async bot => {
 
       let trigger;
 
-      if(e.photo) {
+      if(e.media) {
         trigger = [...bot._trigger.entries()].filter(t => t[1].name === "parser");
         if(!e.message)
           e.message = "";
@@ -40,7 +40,7 @@ export default async bot => {
         }
         catch(err) {
           console.error(err);
-          e.reply(`${t[0]}: An error occured.`);
+          await e.reply(`${t[0]}: An error occured.`);
           logger.error(`${e.network} -> ${e.channel} -> ${e.user.nick}: ${err.toString ? err : JSON.stringify(err)}`);
         }
       });

src/inc/lib.mjs

@@ -63,7 +63,7 @@ export default new class {
     const link = [];
     if(env.tag) link.push("tag", env.tag);
     if(env.user) link.push("user", env.user, env.type ?? 'f0cks');
-    if(env.mime.length > 2) link.push(env.mime);
+    if(env.mime?.length > 2) link.push(env.mime);
 
     let tmp = link.length === 0 ? '/' : link.join('/');
     if(!tmp.endsWith('/'))
@@ -84,32 +84,43 @@ export default new class {
 
   // async funcs
   async countf0cks() {
-    const tagged = (await db`
+    const tagged = +(await db`
       select count(*) as total
       from "items"
-      where id in (select item_id from tags_assign group by item_id)
+      where id in (select item_id from tags_assign group by item_id) and active = true
     `)[0].total;
-    const untagged = (await db`
+    const untagged = +(await db`
       select count(*) as total
       from "items"
-      where id not in (select item_id from tags_assign group by item_id)
+      where id not in (select item_id from tags_assign group by item_id) and active = true
     `)[0].total;
-    const sfw = (await db`
+    const sfw = +(await db`
       select count(*) as total
       from "items"
-      where id in (select item_id from tags_assign where tag_id = 1 group by item_id)
+      where id in (select item_id from tags_assign where tag_id = 1 group by item_id) and active = true
     `)[0].total;
-    const nsfw = (await db`
+    const nsfw = +(await db`
       select count(*) as total
       from "items"
-      where id in (select item_id from tags_assign where tag_id = 2 group by item_id)
+      where id in (select item_id from tags_assign where tag_id = 2 group by item_id) and active = true
     `)[0].total;
+    const deleted = +(await db`
+      select count(*) as total
+      from "items"
+      where active = false
+    `)[0].total;
+    const lastf0ck = +(await db`
+      select max(id) as id
+      from "items"
+    `)[0].id;
     return {
       tagged,
       untagged,
-      total: +tagged + +untagged,
+      total: tagged + untagged,
+      deleted,
+      untracked: lastf0ck - (tagged + untagged + deleted),
       sfw,
-      nsfw
+      nsfw,
     };
   };
   async hash(str) {
@@ -123,15 +134,6 @@ export default new class {
     const derivedKey = await scrypt(str, salt, 64);
     return crypto.timingSafeEqual(keyBuffer, derivedKey);
   };
-  async auth(req, res, next) {
-    if(!req.session) {
-      return res.reply({
-        code: 401,
-        body: "401 - Unauthorized"
-      });
-    }
-    return next();
-  };
   async getTags(itemid) {
     const tags = await db`
       select "tags".id, "tags".tag, "tags".normalized, "user".user
@@ -161,15 +163,25 @@ export default new class {
     }
     return tags;
   };
+  async hasTag(itemid, tagid) {
+    const tag = (await db`
+      select *
+      from "tags_assign"
+      where
+        item_id = ${+itemid} and
+        tag_id = ${+tagid}
+      limit 1
+    `).length;
+    return !!tag;
+  };
   async detectNSFW(dest) {
+    return false;
     const { stdout, stderr } = await exec(
       `python -c "import sys\nfrom nsfw_detector import predict\nmodel = predict.load_model('./nsfw_model.h5')\nprint(predict.classify(model, './public/b/${dest}'))"`
     );
     const res = JSON.parse(stdout.replace(/\'/g, '"').split('\n').slice(1, -1));
     const tmp = Object.values(res)[0];
 
-    tmp.sexy = tmp.sexy / 2;
-
     let nsfw = false;
     if(tmp.neutral >= .7)
       nsfw = false;
@@ -187,5 +199,36 @@ export default new class {
     };
   
   };
+  async getDefaultAvatar() {
+    return (await db`
+      select column_default as avatar
+      from "information_schema"."columns"
+      where
+        TABLE_SCHEMA='public' and
+        TABLE_NAME='user_options' and
+        COLUMN_NAME = 'avatar'
+    `)[0].avatar;
+  };
+
+  // meddlware
+  async auth(req, res, next) {
+    if(!req.session || !req.session.admin) {
+      return res.reply({
+        code: 401,
+        body: "401 - Unauthorized"
+      });
+    }
+    return next();
+  };
+
+   async loggedin(req, res, next) {
+     if(!req.session) {
+       return res.reply({
+         code: 401,
+         body: "401 - Unauthorized"
+       });
+     }
+     return next();
+  };
 
 };

src/inc/queue.mjs

@@ -0,0 +1,122 @@
+import fetch from "flumm-fetch";
+import { exec as _exec } from "child_process";
+import fs from "fs";
+import db from "./sql.mjs";
+
+export default new class queue {
+
+  constructor() {
+
+  };
+
+  addqueue(e, link) {
+    //this.#queue.push(e, link);
+  };
+
+  exec(cmd) {
+    return new Promise((resolve, reject) => {
+      _exec(cmd, { maxBuffer: 5e3 * 1024 }, (err, stdout, stderr) => {
+        if(err)
+          return reject(err);
+        if(stderr)
+          console.error(stderr);
+        resolve({ stdout: stdout });
+      });
+    });
+  };
+
+  async genuuid() {
+    return (await db`
+      select gen_random_uuid() as uuid
+    `)[0].uuid.substring(0, 8);
+  };
+
+  async checkrepostlink(link) {
+    const q_repost = await db`
+      select id
+      from "items"
+      where src = ${link}
+    `;
+    return q_repost.length > 0 ? q_repost[0].id : false;
+  };
+
+  async checkrepostsum(checksum) {
+    const q_repost = await db`
+      select id
+      from "items"
+      where checksum = ${checksum}
+    `;
+    return q_repost.length > 0 ? q_repost[0].id : false;
+  };
+
+  async getItemID(filename) {
+    return (await db`
+      select *
+      from "items"
+      where dest = ${filename}
+      limit 1
+    `)[0].id;
+  };
+
+  async genThumbnail(filename, mime, itemid, link) {
+    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(`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();
+        if(!cover.match(/default_avatar/)) {
+          cover = cover.replace(/-(large|original)\./, '-t500x500.');
+          try {
+            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(`magick ./tmp/${itemid}.jpg ./tmp/${itemid}.png`);
+              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(`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(`magick ./tmp/${itemid}.png ./public/ca/${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;
+  };
+
+  // tags
+  async tagSFW(itemid) {
+    return await db`
+      insert into "tags_assign" ${
+        db({
+          item_id: itemid,
+          tag_id: 1,
+          user_id: 1
+        })
+      }
+    `;
+  };
+
+  async tagNSFW(itemid) {
+    return await db`
+      insert into "tags_assign" ${
+        db({
+          item_id: itemid,
+          tag_id: 2,
+          user_id: 1
+        })
+      }
+    `;
+  };
+
+};

src/inc/routeinc/f0cklib.mjs

@@ -4,166 +4,83 @@ import cfg from "../config.mjs";
 import fs from "fs";
 import url from "url";
 
+const globalfilter = cfg.nsfp.map(n => `tag_id = ${n}`).join(' or ');
+
 export default {
-  getf0cks: async (o = { user, tag, mime, page, mode, fav }) => {
+  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 ?? "");
+    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 };
+    const tmp = { user, tag, mime, smime, page, mode: o.mode };
-  
     const modequery = mime == "audio" ? lib.getMode(0) : lib.getMode(o.mode ?? 0);
-  
-    let data;
-    let total;
 
-    if(tag) {
+    const total = (await db`
-      if(tag.match(/sfw/) || tag.length <= 2)
+      select distinct on (items.id)
-        return {
+        count(items.id) as total
-          success: false,
+      from items
-          message: "nope."
+      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) }
+        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`` }
+      group by items.id, tags.tag
+    `)?.length || 0;
 
-      total = await db`
+    if(!total || total === 0) {
-        select count(*) as total
-        from items
-        inner join (
-          select tags_assign.item_id, tags.tag
-          from tags
-          left join tags_assign on tags_assign.tag_id = tags.id
-          where tags.tag ilike ${'%' + (tag ? tag : '') + '%'}
-          group by tags_assign.item_id, tags.tag
-        ) as st on st.item_id = items.id
-        where ${db.unsafe(modequery)}
-        group by st.tag, st.item_id`;
-
-      total = total?.length;
-    }
-    else {
-      if(!o.fav) {
-        total = await db`
-          select count(*) as total
-          from items
-          where ${db.unsafe(modequery)}
-            and items.mime ilike ${smime}
-            and items.username ilike ${user ? user : '%'}
-        `;
-        total = total[0].total;
-      }
-      else {
-        total = await db`
-          select count(*) as total
-          from "favorites"
-          left join "user" on "user".id = "favorites".user_id
-          left join "tags_assign" on "tags_assign".item_id = "favorites".item_id
-          left join "tags" on "tags".id = "tags_assign".tag_id
-          left join "items" on "items".id = "favorites".item_id
-          where ${db.unsafe(modequery)}
-            and "items".mime ilike ${smime}
-            and "user".user ilike ${user}
-          group by "items".id
-        `;
-        total = total[0].total;
-      }
-    }
-
-    if(!total || total.length === 0)
       return {
         success: false,
         message: "404 - no f0cks given"
       };
-  
+    }
+
     const pages = +Math.ceil(total / cfg.websrv.eps);
     const act_page = Math.min(pages, page || 1);
     const offset = Math.max(0, (act_page - 1) * cfg.websrv.eps);
 
-    let rows;
+    const rows = await db`
+      select distinct on (items.id)
+        items.id,
+        items.mime,
+        tags.tag,
+        ta.tag_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
+      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) }
+        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`` }
+      group by items.id, tags.tag, ta.tag_id
+      order by items.id desc
+      offset ${offset}
+      limit ${eps}
+    `;
 
-    if(!o.fav) {
-      rows = db`
-        select "items".id, "items".mime, "tags_assign".tag_id
-        from "items"
-        left join "tags_assign" on "tags_assign".item_id = "items".id and ("tags_assign".tag_id = 1 or "tags_assign".tag_id = 2)
-        ${tag
-          ? db`
-            inner join (
-              select "tags_assign".item_id, "tags".tag
-              from "tags"
-              left join "tags_assign" on "tags_assign".tag_id = "tags".id
-              where "tags".tag ilike ${'%' + tag + '%'}
-              group by "tags_assign".item_id, "tags".tag
-            ) as st on st.item_id = "items".id
-            `
-          : db``
-        }
-        where ${db.unsafe(modequery)}
-          and "items".mime ilike ${smime}
-          and "items".username ilike ${user ? user : '%'}
-        ${tag
-          ? db`group by st.item_id, "items".id, "tags_assign".tag_id`
-          : db``
-        }
-        order by "items".id desc
-        offset ${offset}
-        limit ${cfg.websrv.eps}
-      `;
-    }
-    else {
-      rows = db`
-        select "items".id, "items".mime, ta.tag_id
-        from "favorites"
-        left join "user" on "user".id = "favorites".user_id
-        left join "tags_assign" on "tags_assign".item_id = "favorites".item_id
-        left join "tags" on "tags".id = "tags_assign".tag_id
-        left join "items" on "items".id = "favorites".item_id
-        left join "tags_assign" as ta on ta.item_id = "items".id and (ta.tag_id = 1 or ta.tag_id = 2)
-        ${ tag
-          ? db`
-            inner join (
-              select "tags_assign".item_id, "tags".tag
-              from "tags"
-              left join "tags_assign" on "tags_assign".tag_id = "tags".id
-              where "tags".tag ilike ${'%' + tag + '%'}
-              group by "tags_assign".item_id, "tags".tag
-            ) as st on st.item_id = "items".id`
-          : db``
-        }
-        where ${db.unsafe(modequery)}
-          and "items".mime ilike ${smime}
-          and "user".user ilike ${user}
-        ${tag
-          ? db`group by st.item_id, "items".id, "tags_assign".tag_id`
-          : db``
-        }
-        group by "items".id, ta.tag_id
-        order by "items".id desc
-        offset ${offset}
-        limit ${cfg.websrv.eps}
-      `;
-    }
-
-    rows = await rows;
-
-    if(rows.length === 0)
-      return {
-        success: false,
-        message: "oopsi woopsi"
-      };
-  
-    /*rows.forEach(e => {
-      if(!fs.existsSync(`public/t/${e.id}.png`))
-        fs.copyFileSync("public/s/img/broken.png", `public/t/${e.id}.png`);
-    });*/
-  
     const cheat = [];
     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/' });
   
-    data = {
+    return {
       success: true,
       items: rows,
       pagination: {
@@ -177,9 +94,8 @@ export default {
       link,
       tmp
     };
-    return data;
   },
-  getf0ck: async (o = ({ user, tag, mime, itemid, mode })) => {
+  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 ?? "");
@@ -197,75 +113,27 @@ export default {
       };
     }
   
-    let items;
+    const items = await db`
-    
+      select distinct on (items.id)
-    if(o.fav) {
+        items.*
-      items = db`
+      from items
-        select "items".*
+      left join tags_assign on tags_assign.item_id = items.id
-        from "favorites"
+      left join tags on tags.id = tags_assign.tag_id
-        left join "items" on "items".id = "favorites".item_id
+      left join favorites on favorites.item_id = items.id
-        left join "user" on "user".id = "favorites".user_id
+      left join "user" on "user".id = favorites.user_id
-        ${ tag
+      left join tags_assign ta on ta.item_id = items.id and (ta.tag_id = 1 or ta.tag_id = 2)
-          ? db`
+      where
-            inner join (
+        ${ db.unsafe(modequery) }
-              select "tags_assign".item_id, "tags".tag
+        and items.active = 'true'
-              from "tags"
+        ${ tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db`` }
-              left join "tags_assign" on "tags_assign".tag_id = "tags".id
+        ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
-              where "tags".tag ilike ${'%' + tag + '%'}
+        ${ !o.fav && user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
-              group by "tags_assign".item_id, "tags".tag
+        ${ mime ? db`and items.mime ilike ${smime}` : db`` }
-            ) as st on st.item_id = "items".id`
+        ${ !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`` }
-          : db``
+      group by items.id, tags.tag, ta.tag_id
-        }
+      order by items.id desc
-        where ${db.unsafe(modequery)}
+    `;
-        and "user".user ilike ${user}
-        ${ mime
-          ? db`and "items".mime ilike ${mime + '/%'}`
-          : db``
-        }
-        ${ tag
-          ? db`group by st.tag, st.item_id, "items".id`
-          : db`group by "items".id, "favorites".user_id, "favorites".item_id, "user".id`
-        }
-        order by "items".id desc
-      `;
-    }
-    else {
-      items = db`
-        select "items".*
-        from "items"
-        ${ tag
-          ? db`
-            inner join (
-              select "tags_assign".item_id, "tags_assign".tag_id, "tags".tag
-              from "tags"
-              left join "tags_assign" on "tags_assign".tag_id = "tags".id
-              where "tags".tag ilike ${'%' + tag + '%'}
-              group by "tags_assign".item_id, "tags".tag, "tags_assign".tag_id
-            ) as st on st.item_id = "items".id`
-          : db``
-        }
-        where ${db.unsafe(modequery)}
-        ${ user
-          ? db`and "items".username ilike ${'%' + user + '%'}`
-          : db``
-        }
-        ${ mime
-          ? db`and "items".mime ilike ${mime + '/%'}`
-          : db``
-        }
-        ${ tag
-          ? db`group by st.item_id, "items".id, st.tag_id`
-          : db`group by "items".id`
-        }
-        order by "items".id desc
-      `;
-    }
 
-    items = await items;
-
-    if(tag)
-      items = items.filter((v, i, s) => i === s.findIndex(t => t.id === v.id));
-  
     const item = items.findIndex(i => i.id === itemid);
     const actitem = items[item];
   
@@ -298,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: {
@@ -319,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,
@@ -333,86 +201,65 @@ export default {
       tmp
     };
     return data;
-  },
+  },getRandom: async (o = ({ user, tag, mime, mode, fav, session })) => {
-  getRandom: async (o = ({ user, tag, mime, mode })) => {
+    const user = o.user ? decodeURI(o.user) : null;
-    const user    = o.user ? decodeURI(o.user) : null;
+    const tag = lib.parseTag(o.tag ?? null);
-    const tag     = lib.parseTag(o.tag ?? null);
+    const mime = (o.mime ?? "");
-    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) { // dood lol
+  
-      item = db`
+    if (o.fav && user) {
-        select "items".*
+      // Special case: random from user's favorites
-        from "favorites"
+      item = await db`
-        left join "items" on "items".id = "favorites".item_id
+        select
-        left join "user" on "user".id = "favorites".user_id
+          items.id
-        ${ tag
+        from favorites
-          ? db`
+        inner join items on favorites.item_id = items.id
-            inner join (
+        inner join "user" on "user".id = favorites.user_id
-              select "tags_assign".item_id, "tags".tag
+        where
-              from "tags"
+          "user".user ilike ${'%' + user + '%'}
-              left join "tags_assign" on "tags_assign".tag_id = "tags".id
+          and items.active = 'true'
-              where "tags".tag ilike ${'%' + tag + '%'}
+          ${mime ? db`and items.mime ilike ${smime}` : db``}
-              group by "tags_assign".item_id, "tags".tag
+        order by random()
-            ) as st on st.item_id = "items".id`
+        limit 1
-          : db``
+      `;
-        }
+    } else {
-        where ${db.unsafe(modequery)}
+      // Normal random logic
-        and "user".user ilike ${user}
+      item = await db`
-        ${ mime
+        select
-          ? db`and "items".mime ilike ${mime + '/%'}`
+          items.id
-          : db``
+        from items
-        }
+        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 items.active = 'true'
+          ${tag ? db`and tags.normalized ilike '%' || slugify(${tag}) || '%'` : db``}
+          ${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
         order by random()
         limit 1
       `;
     }
-    else {
+  
-      item = db`
+    if (item.length === 0) {
-        select *
-        from "items"
-        ${ tag
-          ? db`
-            inner join (
-              select "tags_assign".item_id, "tags".tag
-              from "tags"
-              left join "tags_assign" on "tags_assign".tag_id = "tags".id
-              where "tags".tag ilike ${'%' + tag + '%'}
-              group by "tags_assign".item_id, "tags".tag
-            ) as st on st.item_id = "items".id`
-          : db``
-        }
-        where ${db.unsafe(modequery)}
-        ${ user
-          ? db`and "items".username ilike ${'%' + user + '%'}`
-          : db``
-        }
-        ${ mime
-          ? db`and "items".mime ilike ${mime + '/%'}`
-          : db``
-        }
-        order by random()
-        limit 1
-      `;
-    }
-
-    item = await item;
-
-    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
     };
   }
-};
+  };

src/inc/routes/admin.mjs

@@ -1,22 +1,18 @@
 import db from "../sql.mjs";
 import lib from "../lib.mjs";
 import { exec } from "child_process";
-
+import { promises as fs } from "fs";
-const auth = async (req, res, next) => {
-  if(!req.session) {
-    return res.reply({
-      code: 401,
-      body: "401 - Unauthorized"
-    });
-  }
-  return next();
-};
 
 export default (router, tpl) => {
-
   router.get(/^\/login(\/)?$/, async (req, res) => {
-    if(req.cookies.session)
+    if(req.cookies.session) {
-      return res.reply({ body: "du bist schon eingeloggt lol" });
+      return res.reply({
+        body: tpl.render('error', {
+          message: "you're already logged in lol",
+          tmp: null
+        }, req)
+      });
+    }
     res.reply({
       body: tpl.render("login", { theme: req.cookies.theme ?? "f0ck" })
     });
@@ -65,7 +61,7 @@ export default (router, tpl) => {
     }).end();
   });
   
-  router.get(/^\/logout$/, auth, async (req, res) => {
+  router.get(/^\/logout$/, lib.loggedin, async (req, res) => {
     const usersession = await db`
       select *
       from "user_sessions"
@@ -96,14 +92,18 @@ export default (router, tpl) => {
     });
   });
 
-  router.get(/^\/admin(\/)?$/, auth, async (req, res) => { // frontpage
+  router.get(/^\/admin(\/)?$/, lib.auth, async (req, res) => { // frontpage
 
     res.reply({
-      body: tpl.render("admin", { totals: await lib.countf0cks(), session: req.session }, req)
+      body: tpl.render("admin", {
+        totals: await lib.countf0cks(),
+        session: req.session,
+        tmp: null
+      }, req)
     });
   });
   
-  router.get(/^\/admin\/sessions(\/)?$/, auth, async (req, res) => {
+  router.get(/^\/admin\/sessions(\/)?$/, lib.auth, async (req, res) => {
     const rows = await db`
       select "user_sessions".*, "user".user
       from "user_sessions"
@@ -115,20 +115,85 @@ export default (router, tpl) => {
       body: tpl.render("admin/sessions", {
         session: req.session,
         sessions: rows,
-        totals: await lib.countf0cks()
+        totals: await lib.countf0cks(),
+        tmp: null
       }, req)
     });
   });
 
-  router.get(/^\/admin\/log(\/)?$/, 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", {
-        }, req)
+  //         log: stdout.split("\n").slice(0, -1),
-      });
+  //         tmp: null
-    });
+  //       }, req)
-  });
+  //     });
+  //   });
+  // });
+
+  // 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 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(_=>{});
+  //     }
+
+  //     return res.reply({
+  //       body: `f0ck ${id} recovered. <a href="/admin/recover">back</a>`
+  //     });
+  //   }
+
+  //   const _posts = await db`
+  //     select id, mime, username
+  //     from "items"
+  //     where
+  //       active = 'false'
+  //     order by id desc
+  //   `;
+
+  //   if(_posts.length === 0) {
+  //     return res.reply({
+  //       body: 'blah'
+  //     });
+  //   }
+
+  //   const posts = await Promise.all(_posts.map(async p => ({
+  //     ...p,
+  //     thumbnail: (await fs.readFile(`./deleted/t/${p.id}.webp`)).toString('base64')
+  //   })));
+
+  //   res.reply({
+  //     body: tpl.render('admin/recover', {
+  //       posts,
+  //       tmp: null
+  //     }, req)
+  //   });
+  // });
 
   return router;
 };

src/inc/routes/apiv2/index.mjs

@@ -1,3 +1,4 @@
+import { promises as fs } from "fs";
 import db from '../../sql.mjs';
 import lib from '../../lib.mjs';
 import search from '../../routeinc/search.mjs';
@@ -16,8 +17,10 @@ export default router => {
       const rows = await db`
         select *
         from "items"
-        where mime ilike ${mime}
+        where
-        and username ilike ${user}
+          mime ilike ${mime} and
+          username ilike ${user} and
+          active = 'true'
         order by random()
         limit 1
       `;
@@ -28,27 +31,47 @@ export default router => {
       });
     });
   
-    group.get(/\/p\/([0-9]+)/, async (req, res) => { // legacy
+    group.get(/\/items\/get/, async (req, res) => {
-      let eps = 100;
+      let eps = 150;
-      let id = +req.url.split[3];
+
-  
+      const opt = {
-      const rows = await db`
+        older: req.url.qs.older ?? null,
-        select *
+        newer: req.url.qs.newer ?? null,
-        from "items"
+        mode: +req.url.qs.mode ?? 0 // 0 sfw, 1 nsfw, 2 untagged, 3 all
-        where id < ${+id}
-        order by id desc
-        limit ${+eps}
-      `;
-  
-      const items = {
-        items: rows,
-        last: rows[rows.length - 1].id
       };
-  
+
+      const newest = (await db`select max(id) as id from "items"`)[0].id;
+      const oldest = (await db`select min(id) as id from "items"`)[0].id;
+      const modequery = lib.getMode(opt.mode);
+
+      const rows = (await db`
+        select "items".id, "items".mime, coalesce("tags_assign".tag_id, 0) as tag_id
+        from "items"
+        left join "tags_assign" on "tags_assign".item_id = "items".id and ("tags_assign".tag_id = 1 or "tags_assign".tag_id = 2)
+        where
+          ${db.unsafe(modequery)} and
+          active = 'true'
+          ${
+            opt.older
+              ? db`and id <= ${opt.older}`
+              : opt.newer
+                ? db`and id >= ${opt.newer}`
+                : db``
+          }
+        order by id ${
+          opt.newer
+            ? db`asc`
+            : db`desc`
+        }
+        limit ${eps}
+      `).sort((a, b) => b.id - a.id);
+
       return res.json({
+        atEnd: rows[0].id === newest,
+        atStart: rows[rows.length - 1].id === oldest,
         success: true,
-        items
+        items: rows
-      });
+      }, 200);
     });
   
     group.get(/\/item\/[0-9]+$/, async (req, res) => {
@@ -57,20 +80,20 @@ export default router => {
       const item = await db`
         select *
         from "items"
-        where id = ${+id}
+        where id = ${+id} and active = 'true'
         limit 1
       `;
       const next = await db`
         select id
         from "items"
-        where id > ${+id}
+        where id > ${+id} and active = 'true'
         order by id
         limit 1
       `;
       const prev = await db`
         select id
         from "items"
-        where id < ${+id}
+        where id < ${+id} and active = 'true'
         order by id desc
         limit 1
       `;
@@ -103,7 +126,7 @@ export default router => {
       const rows = db`
         select id, mime, size, src, stamp, userchannel, username, usernetwork
         from "items"
-        where username = ${user}
+        where username = ${user} and active = 'true'
         order by stamp desc
         limit ${+eps}
       `;
@@ -116,7 +139,7 @@ export default router => {
 
     // tags lol
 
-    group.put(/\/admin\/tags\/(?<tagname>.*)/, lib.auth, async (req, res) => {
+    group.put(/\/admin\/tags\/(?<tagname>.*)/, lib.loggedin, async (req, res) => {
       if(!req.params.tagname || !req.post.newtag) {
         return res.json({
           success: false,
@@ -152,19 +175,19 @@ export default router => {
       }
 
       const q = (await db`
-          update "tags" set ${
+        update "tags" set ${
-            db({
+          db({
-              tag: newtag
+            tag: newtag
-            }, 'tag')
+          }, 'tag')
-          }
+        }
-          where tag = ${tagname}
+        where tag = ${tagname}
-          returning *
+        returning *
       `)?.[0];
 
       return res.json(q, tagname === newtag ? 200 : 201); // created (modified)
     });
 
-    group.get(/\/admin\/tags\/suggest$/, lib.auth, async (req, res) => {
+    group.get(/\/admin\/tags\/suggest$/, lib.loggedin, async (req, res) => {
       const reply = {
         success: false,
         suggestions: {}
@@ -203,19 +226,48 @@ export default router => {
           msg: 'no postid'
         });
       }
-      const postid = +req.post.postid;
+      const id = +req.post.postid;
-  
+
-      await db`
+      if(id <= 1) {
-        delete from "items"
+        return res.json({
-        where id = ${+postid}
+          success: false
+        });
+      }
+
+      const f0ck = await db`
+        select dest, mime
+        from "items"
+        where
+          id = ${id} and
+          active = 'true'
+        limit 1
       `;
 
+      if(f0ck.length === 0) {
+        return res.json({
+          success: false,
+          msg: `f0ck ${id}: f0ck not found`
+        });
+      }
+
+      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(_=>{});
+
+      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({
         success: true
       });
     });
 
-    group.post(/\/admin\/togglefav$/, lib.auth, async (req, res) => {
+    group.post(/\/admin\/togglefav$/, lib.loggedin, async (req, res) => {
       const postid = +req.post.postid;
       
       let favs = await db`

src/inc/routes/apiv2/settings.mjs

@@ -3,7 +3,7 @@ import lib from '../../lib.mjs';
 
 export default router => {
   router.group(/^\/api\/v2\/settings/, group => {
-    group.put(/\/setAvatar/, lib.auth, async (req, res) => {
+    group.put(/\/setAvatar/, lib.loggedin, async (req, res) => {
       if(!req.post.avatar) {
         return res.json({
           msg: 'no avatar provided',
@@ -16,7 +16,7 @@ export default router => {
       const itemid = (await db`
         select id
         from "items"
-        where id = ${+avatar}
+        where id = ${+avatar} and active = 'true'
       `)?.[0]?.id;
       
       if(!itemid) {

src/inc/routes/apiv2/tags.mjs

@@ -3,7 +3,7 @@ import lib from '../../lib.mjs';
 
 export default router => {
   router.group(/^\/api\/v2\/admin\/(?<postid>\d+)\/tags/, group => {
-    group.get(/$/, lib.auth, async (req, res) => {
+    group.get(/$/, lib.loggedin, async (req, res) => {
       // get tags
       if(!req.params.postid) {
         return res.json({
@@ -18,7 +18,7 @@ export default router => {
       });
     });
 
-    group.post(/$/, lib.auth, async (req, res) => {
+    group.post(/$/, lib.loggedin, async (req, res) => {
       // assign and/or create tag
       if(!req.params.postid || !req.post.tagname) {
         return res.json({
@@ -30,7 +30,7 @@ export default router => {
       const postid = +req.params.postid;
       const tagname = req.post.tagname?.trim();
   
-      if(tagname.length >= 45) {
+      if(tagname.length > 70) {
         return res.json({
           success: false,
           msg: 'tag is too long!'
@@ -80,7 +80,7 @@ export default router => {
       });
     });
 
-    group.put(/\/toggle$/, lib.auth, async (req, res) => {
+    group.put(/\/toggle$/, lib.loggedin, async (req, res) => {
       // xD
       if(!req.params.postid) {
         return res.json({
@@ -131,6 +131,14 @@ export default router => {
       const postid = +req.params.postid;
       const tagname = decodeURIComponent(req.params.tagname);
 
+      // if(tagname == 'sfw' || tagname == 'nsfw' || tagname == 'hentai' || tagname == 'audio') {
+      //   return res.json({
+      //     success: false,
+      //     msg: 'blacklisted',
+      //     tags: await lib.getTags(postid)
+      //   });
+      // }
+
       const tags = await lib.getTags(postid);
 
       const tagid = tags.filter(t => t.tag === tagname)[0]?.id ?? null;

src/inc/routes/index.mjs

@@ -10,6 +10,76 @@ const auth = async (req, res, next) => {
 };
 
 export default (router, tpl) => {
+  router.get(/\/user\/(?<user>.*)/, async (req, res) => {
+    const user = decodeURIComponent(req.params.user);
+
+    const query = await db`
+      select "user".user, "user".admin, "user".created_at, user_options.*
+      from user_options
+      left join "user" on "user".id = user_options.user_id
+      where "user".user ilike ${user}
+      limit 1
+    `;
+
+    if(!query.length) {
+      return res.reply({
+        code: 404,
+        body: tpl.render('error', {
+          message: 'this user does not exists',
+          tmp: null
+        }, req)
+      });
+    }
+
+    let f0cks, favs;
+    const count = {
+      f0cks: 0,
+      favs: 0
+    };
+    try {
+      f0cks = await f0cklib.getf0cks({
+        user: user,
+        mode: req.session.mode,
+        fav: false,
+        session: !!req.session,
+        limit: 99999999
+      });
+      if('items' in f0cks) {
+        count.f0cks = f0cks.items.length;
+        f0cks.items = f0cks.items.slice(0, 50);
+      }
+    } catch(err) {
+      f0cks = false;
+      count.f0cks = 0;
+    }
+    try {
+      favs = await f0cklib.getf0cks({
+        user: user,
+        mode: req.session.mode,
+        fav: true,
+        session: !!req.session,
+        limit: 99999999
+      });
+      if('items' in favs) {
+        count.favs = favs.items.length;
+        favs.items = favs.items.slice(0, 50);
+      }
+    } catch(err) {
+      favs = false;
+      count.favs = 0;
+    }
+
+    const data = {
+      user: query[0],
+      f0cks,
+      count,
+      favs,
+      tmp: null
+    };
+
+    return res.reply({ body: tpl.render('user', data, req) });
+  });
+
   router.get(/^\/?(?:\/tag\/(?<tag>.+?))?(?:\/user\/(?<user>.+?)\/(?<mode>f0cks|favs))?(?:\/(?<mime>image|audio|video))?(?:\/p\/(?<page>\d+))?(?:\/(?<itemid>\d+))?$/, async (req, res) => {
     const mode = req.params.itemid ? 'item' : 'index';
     const data = await (req.params.itemid ? f0cklib.getf0ck : f0cklib.getf0cks)({
@@ -19,7 +89,8 @@ export default (router, tpl) => {
       page: req.params.page,
       itemid: req.params.itemid,
       fav: req.params.mode == 'favs',
-      mode: req.session.mode
+      mode: req.session.mode,
+      session: !!req.session
     });
     if(!data.success) {
       return res.reply({
@@ -40,11 +111,17 @@ export default (router, tpl) => {
     });
   });
 
-  router.get(/^\/mode\/(\d)/, auth, async (req, res) => {
+  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;
     let referer = "";
-    
+
     if(referertmp?.match(/f0ck\.me/))
       referer = referertmp.split("/").slice(3).join("/");
 
@@ -68,46 +145,5 @@ export default (router, tpl) => {
     res.redirect(`/${referer}`);
   });
 
-  router.get(/^\/ranking$/, async (req, res) => {
-    try {
-      const list = await db`
-      select
-        "user".user,
-        coalesce("user_options".avatar, 47319) as avatar,
-        count(distinct(tag_id, item_id)) as count
-      from "tags_assign"
-      left join "user" on "user".id = "tags_assign".user_id
-      left join "user_options" on "user_options".user_id = "user".id
-      group by "user".user, "user_options".avatar
-      order by count desc
-      `;
-      const stats = await lib.countf0cks();
-
-      const hoster = await db`
-        with t as (
-          select
-            split_part(substring(src, position('//' in src)+2), '/', 1) part
-          from items
-        )
-        select t.part, count(t.part) as c
-        from t
-        group by t.part
-        order by c desc
-        limit 20
-      `;
-
-      res.reply({
-        body: tpl.render('ranking', {
-          list,
-          stats,
-          hoster,
-          tmp: null
-        }, req)
-      });
-    } catch(err) {
-      res.end(JSON.stringify(err.message));
-    }
-  });
-
   return router;
 };

src/inc/routes/picdump.mjs

@@ -0,0 +1,26 @@
+import db from "../../inc/sql.mjs";
+import cfg from "../../inc/config.mjs";
+import f0cklib from "../routeinc/f0cklib.mjs";
+
+export default (router, tpl) => {
+  router.get(/^\/picdump$/, async (req, res) => {
+    const dump = await db`
+      SELECT *
+      FROM items
+      WHERE (
+        to_timestamp(stamp) >= date_trunc('week', CURRENT_TIMESTAMP - interval '1 week') AND
+        to_timestamp(stamp) < date_trunc('week', CURRENT_TIMESTAMP)
+      ) AND
+      mime LIKE 'image/%'
+      ORDER BY stamp DESC
+    `;
+
+    res.reply({
+      body: tpl.render('picdump', {
+        dump,
+        tmp: null
+      }, req)
+    });
+  });
+  return router;
+};

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,11 +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
+      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', {
@@ -32,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/ranking.mjs

@@ -0,0 +1,97 @@
+import db from "../../inc/sql.mjs";
+import lib from "../lib.mjs";
+import config from "../config.mjs";
+import fetch from "flumm-fetch";
+
+export default (router, tpl) => {
+  router.get(/^\/ranking$/, async (req, res) => {
+    try {
+      const list = await db`
+        select
+          "user".user, "user".admin,
+          coalesce("user_options".avatar, ${await lib.getDefaultAvatar()}) as avatar,
+          count(distinct(tag_id, item_id)) as count
+        from "tags_assign"
+        left join "user" on "user".id = "tags_assign".user_id
+        left join "user_options" on "user_options".user_id = "user".id
+        group by "user".user, "user_options".avatar, "user".admin
+        order by count desc
+      `;
+      const stats = await lib.countf0cks();
+
+      const hoster = await db`
+        with t as (
+          select
+            split_part(substring(src, position('//' in src)+2), '/', 1) part
+          from items
+        )
+        select t.part, count(t.part) as c
+        from t
+        group by t.part
+        order by c desc
+        limit 20
+      `;
+
+      const favotop = await db`
+        select item_id, count(*) favs
+        from favorites
+        group by item_id
+        having count(*) > 1
+        order by favs desc
+        limit 10
+      `;
+
+      res.reply({
+        body: tpl.render('ranking', {
+          list,
+          stats,
+          hoster,
+          favotop,
+          tmp: null
+        }, req)
+      });
+    } catch(err) {
+      res.end(JSON.stringify(err.message));
+    }
+  });
+
+  router.get(/^\/top10$/, async (req, res) => {
+    const d = new Date();
+    d.setMonth(d.getMonth() - 1);
+    const month = (d.getMonth() + 1).toString().padStart(2, '0');
+    const year = d.getFullYear();
+
+    const url = `${config.apis.stats.url1}/${year}-${month}/${config.apis.stats.url2}`;
+    const options = {
+      method: 'GET',
+      headers: {
+        Authorization: config.apis.stats.auth
+      }
+    };
+
+    const topres = await (await fetch(url, options)).text();
+    const list = topres.match(/(f0ck.me\/b\/)(?<link>.{8}\.\w*)/g).slice(0, 10).map(e => e.split('/')[2]);
+
+    const f0cks = [];
+    for(const l of list) {
+      const f = await db`
+        select id, username
+        from items
+        where dest = ${l}
+        limit 1
+      `;
+      f0cks.push(f[0]);
+    }
+
+    res.reply({
+      body: tpl.render('top10', {
+        f0cks,
+        year,
+        month,
+        tmp: null
+      }, req)
+    });
+  });
+
+  return router;
+};

src/inc/routes/search.mjs

@@ -5,7 +5,7 @@ import search from "../routeinc/search.mjs";
 const _eps = 20;
 
 export default (router, tpl) => {
-  router.get(/^\/search(\/)?$/, lib.auth, async (req, res) => {
+  router.get(/^\/search(\/)?$/, lib.loggedin, async (req, res) => {
     let ret;
     let tag = req.url.qs.tag ?? [];
     let page = req.url.qs.page ?? 1;
@@ -17,7 +17,7 @@ export default (router, tpl) => {
         total = (await db`
           select count(*) as total
           from "items"
-          where src ilike ${'%' + tag.substring(4) + '%'}
+          where src ilike ${'%' + tag.substring(4) + '%'} and active = 'true'
           group by "items".id
         `).length;
       }
@@ -40,7 +40,9 @@ export default (router, tpl) => {
         ret = await db`
           select *
           from "items"
-          where src ilike ${'%' + tag.substring(4) + '%'}
+          where
+            src ilike ${'%' + tag.substring(4) + '%'} and
+            active = 'true'
           group by "items".id
           order by "items".id desc
           offset ${offset}
@@ -53,7 +55,7 @@ export default (router, tpl) => {
           from "tags"
           left join "tags_assign" on "tags_assign".tag_id = "tags".id
           left join "items" on "items".id = "tags_assign".item_id
-          where "tags".tag ilike ${'%' + tag + '%'}
+          where "tags".tag ilike ${'%' + tag + '%'} and "items".active = 'true'
           group by "items".id, "tags".tag
           offset ${offset}
           limit ${_eps}

src/inc/routes/theme.mjs

@@ -12,5 +12,19 @@ export default (router, tpl) => {
       "Location": req.headers.referer ?? "/"
     }).end();
   });
+
+  router.get(/^\/tfull\//, async (req, res) => {
+    let full = req.session.fullscreen;
+    if(full == 1)
+      full = 0;
+    else
+      full = 1;
+    
+    return res.writeHead(301, {
+      "Cache-Control": "no-cache, public",
+      "Set-Cookie": `theme=${full}; Path=/`,
+      "Location": req.headers.referer ?? "/"
+    }).end();
+  });
   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/sql.mjs

@@ -1,4 +1,3 @@
-//import knex from "knex";
 import postgres from "postgres";
 import cfg from "./config.mjs";
 

src/inc/trigger/debug.mjs

@@ -1,4 +1,5 @@
 import { getLevel } from "../admin.mjs";
+import lib from "../lib.mjs";
 import fetch from "flumm-fetch";
 import vm from "vm";
 
@@ -7,7 +8,9 @@ let context = vm.createContext({
   e: null,
   bot: null,
   admins: null,
-  fetch: fetch,
+  fetch,
+  lib,
+  console,
 
   a: null,
   resolve: null
@@ -19,16 +22,16 @@ export default async bot => {
     name: "level",
     call: /^!level (.*)/i,
     active: true,
-    f: e => {
+    f: async e => {
       const user = e.message.trim().substring(7);
-      e.reply( JSON.stringify( getLevel( e.self.user.get(user) || {} ) ) );
+      await e.reply( JSON.stringify( getLevel( e.self.user.get(user) || {} ) ) );
     }
   }, {
     name: "self",
     call: /^!self$/i,
     active: true,
-    f: e => {
+    f: async e => {
-      e.reply( JSON.stringify( e.user ) );
+      await e.reply( JSON.stringify( e.user ) );
     }
   }, {
     name: "sandbox_debug",
@@ -41,6 +44,7 @@ export default async bot => {
       context.e = e;
       context.bot = bot;
       context.level = getLevel;
+      context.hasTag = lib.hasTag;
       context.a = null;
 
       await new Promise(resolve => {
@@ -52,9 +56,9 @@ export default async bot => {
 
       let output = JSON.stringify(context.a);
       if(output.length > maxoutput)
-        return e.reply(`fuggg, Ausgabe wäre viel zu lang! (${output.length} Zeichen :DDDDDD)`);
+        return await e.reply(`fuggg, Ausgabe wäre viel zu lang! (${output.length} Zeichen :DDDDDD)`);
       else
-        return e.reply(output);
+        return await e.reply(output);
     }
   }];
 };

src/inc/trigger/delete.mjs

@@ -1,5 +1,6 @@
 import { promises as fs } from "fs";
 import db from "../sql.mjs";
+import { getLevel } from "../../inc/admin.mjs";
 
 export default async bot => {
 
@@ -7,37 +8,104 @@ export default async bot => {
     name: "delete",
     call: /^\!(del|rm) .*/i,
     active: true,
-    level: 100,
     f: async e => {
-      const ret = (await Promise.all(e.args.map(async id => {
+      let deleted = [];
-        id = +id;
-        if(id <= 0)
-          return false;
 
+      for(let id of e.args) {
+        id = +id;
+        if(id <= 1)
+          continue;
+        
         const f0ck = await db`
-          select dest
+          select dest, mime, username, userchannel, usernetwork
           from "items"
-          where id = ${+id}
+          where
+            id = ${id} and
+            active = 'true'
           limit 1
         `;
-        if(f0ck.length === 0)
+        const level = getLevel(e.user).level;
-          return false;
-        
-        await fs.unlink(`./public/b/${f0ck[0].dest}`).catch(_=>{});
-        await fs.unlink(`./public/t/${id}`).catch(_=>{});
 
-        await db`
+        if(f0ck.length === 0) {
-          delete from "items"
+          await e.reply(`f0ck ${id}: f0ck not found`);
-          where id = ${+id}
+          continue;
+        }
+        
+        if(
+          (f0ck[0].username !== (e.user.nick || e.user.username) ||
+          f0ck[0].userchannel !== e.channel ||
+          f0ck[0].usernetwork !== e.network) &&
+          level < 100
+        ) {
+          await e.reply(`f0ck ${id}: insufficient permissions`);
+          continue;
+        }
+
+        if(~~(new Date() / 1e3) >= (f0ck[0].stamp + 600) && level < 100) {
+          await e.reply(`f0ck ${id}: too late lol`);
+          continue;
+        }
+
+        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(_=>{});
+
+        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(_=>{});
+        }
+
+        deleted.push(id);
+      }
+
+      await e.reply(`deleted ${deleted.length}/${e.args.length} f0cks (${deleted.join(",")})`);
+    }
+  }, {
+    name: "recover",
+    call: /^\!(recover) .*/i,
+    active: true,
+    level: 100,
+    f: async e => {
+      let recovered = [];
+
+      for(let id of e.args) {
+        id = +id;
+        if(id <= 1)
+          continue;
+        
+        const f0ck = await db`
+          select dest, mime
+          from "items"
+          where
+            id = ${id} and
+            active = 'false'
+          limit 1
         `;
 
-        return id;
+        if(f0ck.length === 0) {
-      }))).filter(d => d);
+          await e.reply(`f0ck ${id}: f0ck not found`);
-      
+          continue;
-      if(ret.length > 0)
+        }
-        e.reply(`deleted ${ret.length}/${e.args.length} (${ret.join(",")}) f0cks`);
+
-      else
+        await fs.copyFile(`./deleted/b/${f0ck[0].dest}`, `./public/b/${f0ck[0].dest}`).catch(_=>{});
-        e.reply(`oof`);
+        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(_=>{});
+        }
+
+        await db`update "items" set active = 'true' where id = ${id}`;
+
+        recovered.push(id);
+      }
+
+      await e.reply(`recovered ${recovered.length}/${e.args.length} f0cks (${recovered.join(",")})`);
     }
   }]
 };

src/inc/trigger/f0ck.mjs

@@ -5,29 +5,6 @@ import cfg from "../config.mjs";
 import db from "../sql.mjs";
 import lib from "../lib.mjs";
 
-/*const cleanTags = async () => {
-  const tags = await db`
-    select *
-    from "tags"
-    left join "tags_assign" on "tags_assign".tag_id = "tags".id
-    where "tags_assign".item_id is null
-  `;
-
-  if(tags.length === 0)
-    return 0;
-  
-  let deleteTag = sql("tags");
-  let dtags = 0;
-  tags.forEach(tag => {
-    if(["sfw", "nsfw"].includes(tag.tag.toLowerCase()))
-      return dtags;
-    deleteTag = deleteTag.orWhere("id", tag.id);
-    dtags++;
-  });
-  await deleteTag.del();
-  return dtags;
-};*/
-
 export default async bot => {
 
   return [{
@@ -48,60 +25,56 @@ export default async bot => {
             t:  lib.formatSize((await Promise.all(dirs.t.map( async file => (await fs.stat(`./public/t/${file}`)).size)) ).reduce((a, b) => b + a)),
             ca: lib.formatSize((await Promise.all(dirs.ca.map(async file => (await fs.stat(`./public/ca/${file}`)).size))).reduce((a, b) => b + a)),
           };
-          return e.reply(`${dirs.b.length} f0cks: ${sizes.b}, ${dirs.t.length} thumbnails: ${sizes.t}, ${dirs.ca.length} coverarts: ${sizes.ca}`);
+          return await e.reply(`${dirs.b.length} f0cks: ${sizes.b}, ${dirs.t.length} thumbnails: ${sizes.t}, ${dirs.ca.length} coverarts: ${sizes.ca}`);
         case "limit":
-          return e.reply(`up to ${lib.formatSize(cfg.main.maxfilesize)} (${lib.formatSize(cfg.main.maxfilesize * cfg.main.adminmultiplier)} for admins)`);
+          return await e.reply(`up to ${lib.formatSize(cfg.main.maxfilesize)} (${lib.formatSize(cfg.main.maxfilesize * cfg.main.adminmultiplier)} for admins)`);
         case "thumb":
           const rows = await db`
             select id
             from "items"
           `;
-          const dir = (await fs.readdir("./public/t")).filter(d => d.endsWith(".png")).map(e => +e.split(".")[0]);
+          const dir = (await fs.readdir("./public/t")).filter(d => d.endsWith(".webp")).map(e => +e.split(".")[0]);
           const tmp = [];
           for(let row of rows)
             !dir.includes(row.id) ? tmp.push(row.id) : null;
-          e.reply(`${tmp.length}, ${rows.length}, ${dir.length}`);
+          await e.reply(`${tmp.length}, ${rows.length}, ${dir.length}`);
         break;
         case "cache":
           cfg.websrv.cache = !cfg.websrv.cache;
-          return e.reply(`Cache is ${cfg.websrv.cache ? "enabled" : "disabled"}`);
+          return await e.reply(`Cache is ${cfg.websrv.cache ? "enabled" : "disabled"}`);
         case "uptime":
-          exec('sudo systemctl status f0ck', (err, stdout) => {
+          exec('sudo systemctl status f0ck', async (err, stdout) => {
             if(!err)
-              return e.reply(stdout.split('\n')[2].trim().replace("Active: active (running)", "i'm active"));
+              return await e.reply(stdout.split('\n')[2].trim().replace("Active: active (running)", "i'm active"));
           });
         break;
         case "restart":
-          e.reply("hay hay patron, hemen!");
+          await e.reply("hay hay patron, hemen!");
           exec("sudo systemctl restart f0ck");
         break;
-        /*case "cleanTags":
-          const tags = await cleanTags();
-          e.reply(tags + " tags removed");
-        break;*/
         case "clearTmp":
           await Promise.all((await fs.readdir("./tmp")).filter(d => d !== ".empty").map(async d => fs.unlink(`./tmp/${d}`)));
-          e.reply("cleared lol");
+          await e.reply("cleared lol");
         break;
         case "status":
           const tmpc = await lib.countf0cks();
-          e.reply(`tagged: ${tmpc.tagged}; untagged: ${tmpc.untagged}; sfw: ${tmpc.sfw}; nsfw: ${tmpc.nsfw}; total: ${tmpc.total}`);
+          await e.reply(`tagged: ${tmpc.tagged}; untagged: ${tmpc.untagged}; sfw: ${tmpc.sfw}; nsfw: ${tmpc.nsfw}; total: ${tmpc.total}`);
         break;
-        case "autotagger":
+        /*case "autotagger":
           const body = { headers: { Authorization: `Basic ${cfg.tagger.btoa}` } };
           const res = await (await fetch(`${cfg.tagger.endpoint}/usage`, body)).json();
           if(res) {
             const processed = res.result.monthly_processed;
             const limit = res.result.monthly_limit;
-            return e.reply(`autotagger: usage/limit: ${processed}/${limit}`);
+            return await e.reply(`autotagger: usage/limit: ${processed}/${limit}`);
           }
           return;
-        break;
+        break;*/
         /*case "renameTag":
           const origTag = e.args.slice(1).join(' ');
 
           if(origTag.length <= 1)
-            return e.reply("absichtliche Provokation!");
+            return await e.reply("absichtliche Provokation!");
 
           const origTagID = (await sql('tags').where('tag', origTag))[0].id;
 
@@ -116,10 +89,10 @@ export default async bot => {
             .del()
           );
 
-          e.reply(JSON.stringify({ affected, deleted }));
+          await e.reply(JSON.stringify({ affected, deleted }));
         break;*/
         case "help":
-          e.reply("cmds: stats, limit, thumb, cache, uptime, restart, cleanTags, clearTmp, status");
+          await e.reply("cmds: stats, limit, thumb, cache, uptime, restart, cleanTags, clearTmp, status");
         break;
         default:
           return;

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 => {
 
@@ -22,9 +22,9 @@ export default async bot => {
       `;
 
       if(rows.length === 0)
-        return e.reply("no f0cks given! lol D:");
+        return await e.reply("no f0cks given! lol D:");
       
-      e.reply([
+      await e.reply([
         `${cfg.main.url.full}/${rows[0].id}`,
         `user: ${rows[0].username} @ ${rows[0].usernetwork} ${rows[0].userchannel}`,
         `~${lib.formatSize(rows[0].size)}`,

src/inc/trigger/f0ckrand.mjs

@@ -10,6 +10,7 @@ export default async bot => {
     active: false,
     f: async e => {
       let args = e.args.slice(1);
+
       /*let rows = sql("items").select("id", "username", "mime", "size");
 
       for(let i = 0; i < args.length; i++) {
@@ -21,10 +22,21 @@ export default async bot => {
 
       rows = await rows.orderByRaw("random()").limit(1);*/
 
-      if(rows.length === 0)
+      const rows = await db`
-        return e.reply("nothing found, f0cker");
+        select id, mime, username, size
+        from "items"
+        where
+        ${ args.map(a => a.charAt(0) === "!"
+          ? db`username not ilike ${a.slice(1)}`
+          : db`username ilike ${a}`
+        ).join(' and ')}
+        order by random()
+      `;
 
-      return e.reply(`f0ckrnd: ${cfg.main.url.full}/${rows[0].id} by: ${rows[0].username} (${rows[0].mime}, ~${lib.formatSize(rows[0].size)})`);
+      if(rows.length === 0)
+        return await e.reply("nothing found, f0cker");
+
+      return await e.reply(`f0ckrnd: ${cfg.main.url.full}/${rows[0].id} by: ${rows[0].username} (${rows[0].mime}, ~${lib.formatSize(rows[0].size)})`);
     }
   }];
 };

src/inc/trigger/parser.mjs

@@ -2,189 +2,265 @@ import cfg from "../config.mjs";
 import db from "../sql.mjs";
 import lib from "../lib.mjs";
 import { getLevel } from "../admin.mjs";
+import queue from "../queue.mjs";
+import autotagger from "../autotagger.mjs";
 import fetch from "flumm-fetch";
-
 import fs from "fs";
-import { exec as _exec } from "child_process";
+import path from "path";
 
-const exec = cmd => new Promise((resolve, reject) => {
+const regex = {
-  _exec(cmd, { maxBuffer: 5e3 * 1024 }, (err, stdout, stderr) => {
+  all:   /https?:\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?/gi,
-    if(err)
+  yt:    /(?:youtube\.com\/\S*(?:(?:\/e(?:mbed))?\/|watch\/?\?(?:\S*?&?v\=))|youtu\.be\/)([a-zA-Z0-9_-]{6,11})/gi,
-      return reject(err);
+  imgur: /(?:https?:)?\/\/(\w+\.)?imgur\.com\/(\S*)(\..{3,4})/i,
-    if(stderr)
+  instagram: /(?:https?:\/\/www\.)?instagram\.com\S*?\/(?:p|reel)\/(\w{11})\/?/im
-      console.error(stderr);
+};
-    resolve({ stdout: stdout });
+const mediagroupids = new Set();
-  });
-});
-
-//const regex = /https?:\/\/[\w\S(\.|:|/)]+/gi;
-const regex = /https?:\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?/gi;
 
 export default async bot => {
 
   return [{
     name: "parser",
-    call: regex,
+    call: regex.all,
     active: true,
     f: e => {
-      const links = e.message.match(regex)?.filter(link => !link.includes("f0ck.me")) || [];
+      const links = e.message.match(regex.all)?.filter(link => !link.includes(cfg.main.url.domain)) || [];
-
+      let repost;
-      if(e.photo)
+      if(e.media)
-        links.push(e.photo);
+        links.push(e.media);
-
+      
       if(links.length === 0)
         return false;
-      
+
-      if(e.message.match(/(!|-)ignore/))
+      if(e.message.match(/\!i(gnore)?\b/))
         return false;
 
-      if(!e.channel.includes("f0ck") && !e.message.match(/(!|-)f0ck/i))
+      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
+        !e.message.match(/\!f(0ck)?\b/i) && // !f / !f0ck
+        !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(/\!f(0ck)?\b/i)) {
+        mediagroupids.add(e.raw.media_group_id);
+      }
+
       console.log(`parsing ${links.length} link${links.length > 1 ? "s" : ""}...`);
 
       links.forEach(async link => {
+        //if(regex.imgur.test(link))
+        //  return await e.reply(`fuck imgur... seriously`);
+
+        if(regex.instagram.test(link))
+          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)
-        const q_repost = await db`
+        repost = await queue.checkrepostlink(link);
-          select id
+        if(repost)
-          from "items"
+          return await e.reply(`repost motherf0cker (link): ${cfg.main.url.full}/${repost}`);
-          where src = ${link}
-        `;
-        if(q_repost.length > 0)
-          return e.reply(`repost motherf0cker (link): ${cfg.main.url.full}/${q_repost[0].id}`);
 
         // generate uuid
-        const uuid = (await db`
+        const uuid = await queue.genuuid();
-          select gen_random_uuid() as uuid
-        `)[0].uuid.substring(0, 8);
 
-        const maxfilesize = (getLevel(e.user).level > 50 ? cfg.main.maxfilesize * cfg.main.adminmultiplier : cfg.main.maxfilesize) / 1024;
+        const maxfilesize = (getLevel(e.user).level > 50 ? cfg.main.maxfilesize * cfg.main.adminmultiplier : cfg.main.maxfilesize);
 
-        let meta;
         // read metadata
-        try {
+        let ext;
-          meta = JSON.parse((await exec(`yt-dlp -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' --skip-download --dump-json "${link}"`)).stdout);
+        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 -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"];
+            // this can be undefined for unsupported mime types, but will be caught in the general mime check below
+            ext = cfg.mimes[tmphead];
+          }
         }
-        catch(err) {
+        else if(link.match(regex.imgur)) {
-          //e.reply("[error] f0ck has no bock :(");
+          // imghure
-          //console.error(err);
+          ext = link.split('.').pop();
-          return;
-        }
-
-        if(!Object.values(cfg.mimes).includes(meta.ext.toLowerCase())) {
-          const tmphead = (await fetch(link, { method: "HEAD" })).headers["content-type"];
-          if(!Object.keys(cfg.mimes).includes(tmphead))
-            return;
-          meta.ext = cfg.mimes[tmphead];
-        }
-
-        let filename = `${uuid}.${meta.ext}`;
-
-        e.reply(`[charging the f0cker] downloading: ${uuid}`);
-
-        // download data
-        const start = new Date();
-        let source;
-        if(meta.ext === "mp4") {
-          source = (await exec(`yt-dlp -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' "${link}" --max-filesize ${maxfilesize}k --merge-output-format mp4 -o ./tmp/${filename}`)).stdout.trim();
-          //change 720 to any other available resolution, higher = better quality but bigger filesize
         }
         else {
-          source = (await exec(`yt-dlp -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' "${link}" --max-filesize ${maxfilesize}k -o ./tmp/${filename}`)).stdout.trim();
+          // is not instagram
-          //change 720 to any other available resolution, higher = better quality but bigger filesize
+          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) {
+            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(source.match(/larger than/))
+        if(!Object.values(cfg.mimes).includes(ext?.toLowerCase())) {
-          return e.reply("too large lol");
+          return console.log('mime schmime ' + ext);
+        }
+
+        const msg = await e.reply(`[charging the f0cker] downloading: ${uuid}`, {
+          disable_notification: true
+        });
+
+        // <download data>
+        const start = new Date();
+        let source;
+
+        if(link.match(regex.instagram)) {
+          try {
+            // add --cookies <path-to-cookies-file> on local instance if you want to avoid getting rate limited
+            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) {
+            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)) {
+          // imghure via torsocks
+          try {
+            await queue.exec(`torsocks wget ${link} -O ./tmp/${uuid}.${ext}`);
+            source = `./tmp/${uuid}.${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');
+          }
+        }
+        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();
+          } 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?');
+          }
+        }
+        // </download data>
+
+        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')
+            return await e.editMessageText(msg.result.chat.id, msg.result.message_id, "too large lol");
+          return await e.reply("too large lol");
+        }
         const end = ~~((new Date() - start) / 1e3);
-        
-        // generate checksum
-        const checksum = (await exec(`sha256sum ./tmp/${filename}`)).stdout.trim().split(" ")[0];
-        const size = fs.statSync(`./tmp/${filename}`).size;
 
-        // mime check
+        // filesize check
-        const mime = (await exec(`file --mime-type -b ./tmp/${filename}`)).stdout.trim();
+        const size = fs.statSync(source).size;
-        if(!Object.keys(cfg.mimes).includes(mime))
+        if(size > maxfilesize) {
-          return e.reply(`lol, go f0ck yourself (${mime})`);
+          await fs.promises.unlink(source).catch(_=>{});
-        
+          if(e.type == 'tg')
-        if(!Object.values(cfg.mimes).includes(meta.ext.toLowerCase())) {
+            return await e.editMessageText(msg.result.chat.id, msg.result.message_id, `too large lol. (${lib.formatSize(size)} / ${lib.formatSize(maxfilesize)})`);
-          let tmpext = cfg.mimes[meta.ext.toLowerCase()];
+          return await e.reply(`too large lol. (${lib.formatSize(size)} / ${lib.formatSize(maxfilesize)})`);
-          fs.renameSync(`./tmp/${filename}`, `./tmp/${uuid}.${tmpext}`);
-          filename = `${uuid}.${tmpext}`;
         }
+        
+        // mime check
+        let mime = (await queue.exec(`file --mime-type -b ${source}`)).stdout.trim();
+        try {
+          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(_=>{});
+            source = source.replace(/\.mkv$/, '.mp4');
+            mime = 'video/mp4';
+          }
+          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')
+            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')
+            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})`);
+        }
+
+        // generate checksum
+        const checksum = (await queue.exec(`sha256sum ${source}`)).stdout.trim().split(" ")[0];
 
         // check repost (checksum)
-        const q_repostc = await db`
+        repost = await queue.checkrepostsum(checksum);
-          select id
+        if(repost) {
-          from "items"
+          await fs.promises.unlink(source).catch(_=>{});
-          where checksum = ${checksum}
+          if(e.type == 'tg')
-        `;
+            return await e.editMessageText(msg.result.chat.id, msg.result.message_id, `repost motherf0cker (checksum): ${cfg.main.url.full}/${repost}`);
-        if(q_repostc.length > 0)
+          return await e.reply(`repost motherf0cker (checksum): ${cfg.main.url.full}/${repost}`);
-          return e.reply(`repost motherf0cker (checksum): ${cfg.main.url.full}/${q_repostc[0].id}`);
+        }
 
-        await fs.promises.copyFile(`./tmp/${filename}`, `./public/b/${filename}`);
+        const filename = path.basename(source);
-        await fs.promises.unlink(`./tmp/${filename}`).catch(_=>{});
+
+        await fs.promises.copyFile(source, `./public/b/${filename}`);
+        await fs.promises.unlink(source).catch(_=>{});
+
+        // user alias
+        let username = e.user.nick || e.user.username;
+        const alias = (await db`
+          select "user"."user"
+          from "user_alias"
+          join "user" on "user".id = user_alias.userid
+          where lower(user_alias.alias) ilike ${username}
+          limit 1
+        `)?.[0]?.user;
+        if(alias) {
+          username = alias;
+        }
 
         await db`
           insert into items ${
             db({
-              src: e.photo ? "" : link,
+              src: e.media ? "" : link,
               dest: filename,
               mime: mime,
               size: size,
               checksum: checksum,
-              username: e.user.nick || e.user.username,
+              username: username,
               userchannel: e.channel,
               usernetwork: e.network,
               stamp: ~~(new Date() / 1000),
-              active: 1
+              active: true
             }, 'src', 'dest', 'mime', 'size', 'checksum', 'username', 'userchannel', 'usernetwork', 'stamp', 'active')
           }
         `;
 
-        const itemid = (await db`
+        const itemid = await queue.getItemID(filename);
-          select *
-          from "items"
-          where dest = ${filename}
-          limit 1
-        `)[0].id;
 
         // generate thumbnail
         try {
-          if(mime.startsWith('video/') || mime == 'image/gif')
+          await queue.genThumbnail(filename, mime, itemid, link);
-            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`);
-          else if(mime.startsWith('audio/')) {
-            if(link.match(/soundcloud/)) {
-              let cover = (await exec(`yt-dlp -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' --get-thumbnail "${link}"`)).stdout.trim();
-              if(!cover.match(/default_avatar/)) {
-                cover = cover.replace(/-(large|original)\./, '-t500x500.');
-                try {
-                  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(`convert ./tmp/${itemid}.jpg ./public/ca/${itemid}.webp`);
-                  }
-                } catch(err) {}
-              }
-              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`);
-              }
-            }
-            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(`convert "./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) {
-          await exec(`convert ./mugge.png ./public/t/${itemid}.webp`);
+          await queue.exec(`magick ./mugge.png ./public/t/${itemid}.webp`);
         }
 
         let speed = lib.calcSpeed(size, end);
@@ -192,58 +268,42 @@ export default async bot => {
 
         // autotagger
         let tags = [];
-        try {
+        /*if(cfg.apis?.nsfw1 && mime.startsWith('image')) {
-          if(mime.startsWith('image')) {
+          const nsfw = await autotagger.isNSFW(filename, size);
-            const res = await lib.detectNSFW(filename);
+          tags.push(nsfw ? 'nsfw' : 'sfw');
+          if(nsfw)
+            await queue.tagNSFW(itemid);
+          else
+            await queue.tagSFW(itemid);
+        }*/
 
-            await db`
+        let outputmsgirc = `[f0cked] link: ${cfg.main.url.full}/${itemid} | size: ${lib.formatSize(size)} | speed: ${speed}`;
-              insert into "tags_assign" ${
+        let outputmsgtg = `[f0cked] size: ${lib.formatSize(size)} | speed: ${speed}`;
-                db({
-                  item_id: itemid,
-                  tag_id: res.nsfw ? 2 : 1,
-                  user_id: 7
-                })
-              }
-            `;
-            tags.push(res.nsfw ? 'nsfw' : 'sfw');
 
-            if(res.hentai >= .7) {
+        if(tags?.length > 0) {
-              await db`
+          const tagstr = tags.join(', ');
-                insert into "tags_assign" ${
+          outputmsgirc += ` | tags: ${tagstr}`;
-                  db({
+          outputmsgtg += ` | tags: ${tagstr}`;
-                    item_id: f.id,
-                    tag_id: 8, // hentai
-                    user_id: 7 // autotagger
-                  })
-                }
-              `;
-              tags.push('hentai');
-            }
-          }
-          else if(mime.startsWith('audio')) {
-            await db`
-              insert into "tags_assign" ${
-                db([{
-                  item_id: itemid,
-                  tag_id: 1,
-                  user_id: 7
-                }, {
-                  item_id: itemid,
-                  tag_id: 7178,
-                  user_id: 7
-                }])
-              }
-            `;
-            tags.push('sfw', 'audio');
-          }
-        } catch(err) {
-          console.error(err);
         }
 
-        e.reply([
+        if(e.type == 'tg') {
-          `[f0cked] link: ${cfg.main.url.full}/${itemid} | size: ${lib.formatSize(size)} | speed: ${speed}` + (tags.length > 0 ? ` | tags: ${tags.join(', ')}` : '')
+          await e.deleteMessage(msg.result.chat.id, msg.result.message_id);
-        ]);
+          await e.reply(outputmsgtg, {
-
+            reply_markup: JSON.stringify({
+              inline_keyboard: [[
+                { text: (await lib.hasTag(itemid, 1) ? '✓ ' : '') + 'sfw', callback_data: `b_sfw:${itemid}` },
+                { text: (await lib.hasTag(itemid, 2) ? '✓ ' : '') + 'nsfw', callback_data: `b_nsfw:${itemid}` },
+                { text: 'tags', callback_data: `b_tags:${itemid}` },
+                { text: '❌ delete', callback_data: `b_delete:${itemid}` }
+              ], [
+                { text: `open f0ck #${itemid}`, url: `${cfg.main.url.full}/${itemid}` }
+              ]]
+            })
+          });
+        }
+        else {
+          await e.reply(outputmsgirc);
+        }
       });
     }
   }];

src/inc/trigger/tags.mjs

@@ -12,11 +12,11 @@ export default async bot => {
     f: async e => {
       const id = +e.args[1];
       if(!id)
-        return e.reply("lol no");
+        return await e.reply("lol no");
       const tags = (await lib.getTags(id)).map(t => t.tag);
       if(tags.length === 0)
-        return e.reply(`item ${cfg.main.url.full}/${id} has no tags!`);
+        return await e.reply(`item ${cfg.main.url.full}/${id} has no tags!`);
-      return e.reply(`item ${cfg.main.url.full}/${id} is tagged as: ${tags.join(', ')}`);
+      return await e.reply(`item ${cfg.main.url.full}/${id} is tagged as: ${tags.join(', ')}`);
     }
   }, {
     name: "tags add",
@@ -26,7 +26,7 @@ export default async bot => {
     f: async e => {
       const id = +e.args[1];
       if(!id)
-        return e.reply("lol no");
+        return await e.reply("lol no");
 
       const tags = (await lib.getTags(id)).map(t => t.tag);
       
@@ -35,7 +35,7 @@ export default async bot => {
         : e.args.splice(2)).filter(t => !tags.includes(t) && t.length > 0);
 
       if(newtags.length === 0)
-        return e.reply("no (new) tags provided");
+        return await e.reply("no (new) tags provided");
 
       await Promise.all(newtags.map(async ntag => {
         try {
@@ -73,8 +73,8 @@ export default async bot => {
 
       const ntags = (await lib.getTags(id)).map(t => t.tag);
       if(ntags.length === 0)
-        return e.reply(`item ${cfg.main.url.full}/${id} has no tags!`);
+        return await e.reply(`item ${cfg.main.url.full}/${id} has no tags!`);
-      return e.reply(`item ${cfg.main.url.full}/${id} is now tagged as: ${ntags.join(', ')}`);
+      return await e.reply(`item ${cfg.main.url.full}/${id} is now tagged as: ${ntags.join(', ')}`);
     }
   }, {
     name: "tags remove",
@@ -84,7 +84,7 @@ export default async bot => {
     f: async e => {
       const id = +e.args[1];
       if(!id)
-        return e.reply("lol no");
+        return await e.reply("lol no");
       
       const tags = await lib.getTags(id);
 
@@ -93,7 +93,7 @@ export default async bot => {
         : e.args.splice(2)).filter(t => t.length > 0);
       
       if(removetags.length === 0)
-        return e.reply("no tags provided");
+        return await e.reply("no tags provided");
 
       const res = await Promise.all(removetags.map(async rtag => {
         const tagid = tags.filter(t => t.tag === rtag)[0]?.id ?? null;
@@ -122,12 +122,12 @@ export default async bot => {
         };
       }));
 
-      e.reply(JSON.stringify(res));
+      await e.reply(JSON.stringify(res));
 
       const ntags = (await lib.getTags(id)).map(t => t.tag);
       if(ntags.length === 0)
-        return e.reply(`item ${cfg.main.url.full}/${id} has no tags!`);
+        return await e.reply(`item ${cfg.main.url.full}/${id} has no tags!`);
-      return e.reply(`item ${cfg.main.url.full}/${id} is now tagged as: ${ntags.join(', ')}`);
+      return await e.reply(`item ${cfg.main.url.full}/${id} is now tagged as: ${ntags.join(', ')}`);
     }
   }]
 };

src/inc/trigger/thumbnails.mjs

@@ -0,0 +1,42 @@
+import queue from '../queue.mjs';
+import db from '../sql.mjs';
+
+export default async bot => {
+
+  return [{
+    name: "thumbnailer",
+    call: /^\!thumb .*/i,
+    active: true,
+    level: 100,
+    f: async e => {
+      let processed = [];
+
+      for(let id of e.args) {
+        id = +id;
+        if(id <= 1)
+          continue;
+
+        const f0ck = await db`
+          select id, dest, mime, src
+          from "items"
+          where
+            id = ${id} and
+            active = 'true'
+          limit 1
+        `;
+
+        if(f0ck.length === 0) {
+          await e.reply(`f0ck ${id}: f0ck not found`);
+          continue;
+        }
+
+        // gen thumb
+        await queue.genThumbnail(f0ck[0].dest, f0ck[0].mime, f0ck[0].id, f0ck[0].src);
+
+        processed.push(id);
+      }
+
+      return await e.reply(`thumbnails: ${processed.length}/${e.args.length} (${processed.join(",")})`);
+    }
+  }];
+};

src/index.mjs

@@ -5,6 +5,11 @@ import cuffeo from "cuffeo";
 import { promises as fs } from "fs";
 import flummpress from "flummpress";
 
+process.on('unhandledRejection', err => {
+  console.error(err);
+  throw err;
+});
+
 (async () => {
   const self = {
     _trigger: new Map(),
@@ -61,11 +66,12 @@ import flummpress from "flummpress";
     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) {
       const user = await db`
-        select "user".id, "user".login, "user".user, "user".level, "user_sessions".id as sess_id, "user_options".*
+        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
@@ -95,18 +101,23 @@ import flummpress from "flummpress";
         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 ?? 'f0ck'
+            theme: req.session.theme ?? 'atmos',
-          }, 'user_id', 'mode', 'theme')
+            fullscreen: req.session.fullscreen || 0
+          }, 'user_id', 'mode', 'theme', 'fullscreen')
         }
         on conflict ("user_id") do update set
           mode = excluded.mode,
           theme = excluded.theme,
+          fullscreen = excluded.fullscreen,
           user_id = excluded.user_id
       `;
     }

views/about.html

@@ -1,49 +1,13 @@
 @include(snippets/header)
-    <div class="about">
+<div id="main">
-      <div>
+<div class="about">
-        <a href="/48908"><img src="/s/img/loool.webp" /></a>
+    <p>Welcome stranger!</p>
-        <p>thanks to our turkish fellow lol@n0xy/#f0ck for this gif &lt;3</p>
+    <p>bringing you some of the greatest webms from the past, the present and the future!</p>
-      </div>
+    <p>Enjoy your stay.</p>
-      <h5>f0ck Contact</h5>
+    <img style="width: 200px" src="/s/img/cockfag.png" alt="cockfag">
-      <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>If you have any questions you can reach out via Mail.</p>
-      <h5>About f0ck</h5>
+    <p>mail: admin@w0bm.com</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>
+    <p>Please also make yourself familiar with the <a href="/terms">Terms Of Service</a></p>
-      <h5>WTF is a f0ck?</h5>
+</div>
-      <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>
+</div>
-      <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: No for Tor - Yes for cloudflare and cloudflare probably sells your soul to the devil, however our webserver doesn't log cloudflare connecting to our webserver, if you want to lurk without being flared by the cloud, see the above tor section my man</p>
-    </div>
 @include(snippets/footer)

views/admin.html

@@ -1,3 +1,22 @@
-@include(snippets/header_admin)
+@include(snippets/header)
-
+<div id="main">
-@include(snippets/footer)
+  <div class="container">
+    <h1>ADMINBEREICH</h1>
+    <h5>Hallo, {{ session.user }}</h5>
+    <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>
+    <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/sessions">Sessions</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
+@include(snippets/footer)

views/admin/log.html

@@ -1,16 +1,18 @@
-@include(snippets/header_admin)
+@include(snippets/header)
-@if(log)
+<div id="main">
-<h1>last {{ log.length }} entries:</h1>
+  @if(log)
-<div class="logwrap">
+  <h1>last {{ log.length }} entries:</h1>
-@each(log as line)
+  <div class="logwrap">
-  <p>{{ line }}</p>
+  @each(log as line)
-@endeach
+    <p>{{ line }}</p>
+  @endeach
+  </div>
+  <script>
+    (() => {
+      const d = document.querySelector("div.logwrap");
+      d.scrollTop = d.scrollHeight;
+    })();
+  </script>
+  @endif
 </div>
-<script>
-  (() => {
-    const d = document.querySelector("div.logwrap");
-    d.scrollTop = d.scrollHeight;
-  })();
-</script>
-@endif
 @include(snippets/footer)

views/admin/recover.html

@@ -0,0 +1,26 @@
+@include(snippets/header)
+<div id="main">
+  <table class="table" style="width: 100%">
+  <thead>
+  <tr>
+    <td></td>
+    <td>ID</td>
+    <td>f0cker</td>
+    <td>mime</td>
+    <td></td>
+  </tr>
+  </thead>
+  <tbody>
+  @each(posts as post)
+  <tr>
+    <td><img src="data:image/webp;base64,{{ post.thumbnail }}" /></td>
+    <td>{{ post.id }}</td>
+    <td>{{ post.username }}</td>
+    <td>{{ post.mime }}</td>
+    <td><a href="/admin/recover/?id={{ post.id }}">recover</a></td>
+  </tr>
+  @endeach
+  </tbody>
+  </table>
+</div>
+@include(snippets/footer)

views/admin/sessions.html

@@ -1,26 +1,32 @@
-@include(snippets/header_admin)
+@include(snippets/header)
-<table style="width: 100%;">
+<div id="main">
-<tr>
+  <table class="table" style="width: 100%">
-  <td></td>
+  <thead>
-  <td>ID</td>
+  <tr>
-  <td>userid</td>
+    <td></td>
-  <td>user</td>
+    <td>ID</td>
-  <td>browser</td>
+    <td>userid</td>
-  <td>created_at</td>
+    <td>user</td>
-  <td>last_used</td>
+    <td>browser</td>
-  <td>last_action</td>
+    <td>created_at</td>
-</tr>
+    <td>last_used</td>
-@each(sessions as session)
+    <td>last_action</td>
-<tr>
+  </tr>
-  <td>{{ session.kmsi ? '&#9875;' : '' }}</td>
+  </thead>
-  <td>{{ session.id }}</td>
+  <tbody>
-  <td>{{ session.user_id }}</td>
+  @each(sessions as session)
-  <td>{{ session.user }}</td>
+  <tr>
-  <td>{{ session.browser }}</td>
+    <td>{{ session.kmsi ? '&#9875;' : '' }}</td>
-  <td>{{ new Date(session.created_at * 1e3).toLocaleString("de-DE") }}</td>
+    <td>{{ session.id }}</td>
-  <td>{{ new Date(session.last_used * 1e3).toLocaleString("de-DE") }}</td>
+    <td>{{ session.user_id }}</td>
-  <td>{{ session.last_action }}</td>
+    <td>{{ session.user }}</td>
-</tr>
+    <td>{{ session.browser }}</td>
-@endeach
+    <td>{{ new Date(session.created_at * 1e3).toLocaleString("de-DE") }}</td>
-</table>
+    <td>{{ new Date(session.last_used * 1e3).toLocaleString("de-DE") }}</td>
-@include(snippets/footer)
+    <td>{{ session.last_action }}</td>
+  </tr>
+  @endeach
+  </tbody>
+  </table>
+</div>
+@include(snippets/footer)

views/error.html

@@ -1,8 +1,20 @@
 @include(snippets/header)
-<div class="container">
+<div id="main">
-    <div class="err">
+  <div class="container">
-        <span>{{ message }}</span>
+    <div class="_error_wrapper">
-        <img src="https://f0ck.me/s/img/favicon.gif" alt="f0ck?!">
+      <div class="err">
+        <div class="_error_topbar">
+          <span>x.x</span>
+        </div>
+        <div class="_error_content">
+          <img src="/s/img/favicon.gif" alt="f0ck?!">
+          <div class="_error_message">
+            <span>Error</span>
+            <code>{{ message }}</code>
+          </div>
+        </div>
+      </div>
     </div>
+  </div>
 </div>
-@include(snippets/footer)
+@include(snippets/footer)

views/index.html

@@ -1,14 +1,18 @@
 @include(snippets/header)
-  <div class="index-container">
+<div class="pagewrapper">
-    @if(tmp.user)<h2>user: {!! tmp.user.toLowerCase() !!}@if(tmp.mime) ({{ tmp.mime }}s)@else (all)@endif</h2>@endif
+  <div id="main">
-    @if(tmp.tag)<h2>tag: @if(session)<a href="/search?tag={!! tmp.tag.toLowerCase() !!}" target="_blank">{!! tmp.tag.toLowerCase() !!}</a>@else{!! tmp.tag.toLowerCase() !!}@endif@if(tmp.mime) ({{ tmp.mime }}s)@else (all)@endif</h2>@endif
+    <div class="index-container">
-    <div id="posts">
+      @if(tmp.user)<h2>user: <a href="/user/{{ tmp.user.toLowerCase() }}">{!! tmp.user.toLowerCase() !!}</a>@if(tmp.mime) ({{ tmp.mime }}s)@else (all)@endif</h2>@endif
-      @each(items as item)
+      @if(tmp.tag)<h2>tag: @if(session)<a href="/search?tag={!! tmp.tag.toLowerCase() !!}" target="_blank">{!! tmp.tag.toLowerCase() !!}</a>@else{!! tmp.tag.toLowerCase() !!}@endif@if(tmp.mime) ({{ tmp.mime }}s)@else (all)@endif</h2>@endif
-      <a href="{{ link.main }}{{ item.id }}" data-mime="{{ item.mime }}" data-mode="{{ item.tag_id ? ['','sfw','nsfw'][item.tag_id] : 'null' }}" style="background-image: url('/t/{{ item.id }}.webp')"><p></p></a>
+      <div class="posts">
-      @endeach
+        @each(items as item)
-    </div>
+        <a href="{{ link.main }}{{ item.id }}" data-mime="{{ item.mime }}" data-mode="{{ item.tag_id ? ['','sfw','nsfw'][item.tag_id] : 'null' }}" style="background-image: url('/t/{{ item.id }}.webp')"><p></p></a>
-    <div id="footbar">
+        @endeach
-      &#9660;
+      </div>
+      <div id="footbar">
+        &#9660;
+      </div>
     </div>
   </div>
+</div>
 @include(snippets/footer)

views/item.html

@@ -1,88 +1,119 @@
 @include(snippets/header)
-  <div class="container">
+<canvas class="hidden-xs" id="bg"></canvas>
-    <div class="content">
+<div class="wrapper">
-      <div class="next-post">
+  <div id="main">
-        @if(pagination.prev)
+
-        <div class="arrow-next">
+    <div class="container">
-          <a id="next" href="{{ link.main }}{{ pagination.prev }}"></a>
+      <div class="_204863">
-        </div>
+        <div class="imageDoor"></div>
-        @else
+        <div class="gapLeft"></div>
-        <div class="arrow-next">
+        @if(session)
-          <a id="next" href="#" style="color: #ccc !important;"></a>
+        <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>
+          <svg class="iconset" id="a_tfull"><use href="/s/img/iconset.svg#window-{{ fullscreen == 1 ? 'minimize' : 'maximize' }}"></use></svg>
+          @if(session.admin)<svg class="iconset" id="a_delete"><use href="/s/img/iconset.svg#cross"></use></svg>@endif
         </div>
         @endif
       </div>
-      <div class="media-object">
+      <div class="content">
-        @if(item.mime.startsWith("video"))
+        <div class="next-post">
-        <div class="embed-responsive embed-responsive-16by9">
+          @if(pagination.prev)
-          <video id="my-video" class="embed-responsive-item" width="640" height="360" src="{{ item.dest }}" preload="auto" autoplay controls loop playsinline></video>
+          <div class="arrow-next">
+            <a id="next" href="{{ link.main }}{{ pagination.prev }}"></a>
+          </div>
+          @else
+          <div class="arrow-next">
+            <a id="next" href="#" style="color: #ccc !important;"></a>
+          </div>
+          @endif
         </div>
-        @elseif(item.mime.startsWith("audio"))
+        <div class="media-object">
-        <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;">
+          @if(item.mime.startsWith("video"))
-          <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 class="embed-responsive embed-responsive-16by9">
+            <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)//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"))
+          <div class="embed-responsive embed-responsive-16by9">
+            <div class="embed-responsive-image" id="image-scroll">
+              <a href="{{ item.dest }}" id="elfe" target="_blank"><img id="f0ck-image" class="img-fluid" src="{{ item.dest }}" loading="lazy" decoding="async"/></a>
+            </div>
+          </div>
+          @else
+          <h1>404 - Not f0cked</h1>
+          @endif
         </div>
-        @elseif(item.mime.startsWith("image"))
+        <div class="previous-post">
-        <div class="embed-responsive embed-responsive-16by9">
+          @if(pagination.next)
-          <div class="embed-responsive-image" id="image-scroll">
+          <div class="arrow-prev">
-            <a href="{{ item.dest }}" id="elfe" target="_blank"><img id="f0ck-image" class="img-fluid" src="{{ item.dest }}" loading="lazy" decoding="async"/></a>
+            <a id="prev" href="{{ link.main }}{{ pagination.next }}"></a>
+          </div>
+          @else
+          <div class="arrow-prev">
+            <a id="prev" href="#" style="color: #ccc !important;"></a>
+          </div>
+          @endif
+        </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>
-        @else
+        <div class="blahlol">
-        <h1>404 - Not f0cked</h1>
+                  <span class="badge badge-dark">
-        @endif
+          <a href="/{{ item.id }}" class="id-link">{{ item.id }}</a>
-      </div>
+          @if(session)
-      <div class="previous-post">
+          (<a id="a_username" href="/user/{{ user.name.toLowerCase() }}/f0cks@if(tmp.mime)/{{ tmp.mime }}@endif">{{ user.name }}</a>) 
-        @if(pagination.next)
+          @endif
-        <div class="arrow-prev">
-          <a id="prev" href="{{ link.main }}{{ pagination.next }}"></a>
-        </div>
-        @else
-        <div class="arrow-prev">
-          <a id="prev" href="#" style="color: #ccc !important;"></a>
-        </div>
-        @endif
-      </div>
-    </div>
-    <div class="metadata">
-      <span class="badge badge-dark">
-        <a href="/{{ item.id }}" style="--hover-image: url('/t/{{ item.id }}.webp');" 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>) 
-        <svg class="iconset" id="a_delete"><use href="/s/img/iconset.svg#cross"></use></svg> 
-        <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>
-        @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)
-        <span @if(session)tooltip="{{ tag.user }}"@endif class="badge {{ tag.badge }} mr-2">
-          <a href="/tag/{{ tag.tag }}">{!! tag.tag !!}</a>@if(session)&nbsp;<a class="removetag" href="#">&#215;</a>@endif
         </span>
+        <span class="badge badge-dark"><time class="timeago" tooltip="{{ item.timestamp.timefull }}">{{ item.timestamp.timeago }}</time></span>
+        <span class="badge badge-dark" id="tags">
+        @if(typeof item.tags !== "undefined")
+          @each(item.tags as tag)
+          <span @if(session)tooltip="{{ tag.user }}"@endif class="badge {{ tag.badge }} mr-2">
+            <a href="/tag/{{ tag.normalized }}">{!! tag.tag !!}</a>@if(session.admin)&nbsp;<a class="removetag" href="#">&#215;</a>@endif
+          </span>
+          @endeach
+        @endif
+        @if(session)
+          <a href="#" id="a_addtag">add tag</a>&nbsp;-&nbsp;<a href="#" id="a_toggle">toggle</a>
+          <datalist id="testlist"></datalist>
+        @endif
+        </span>
+        <span class="badge" id="favs"@if(!item.favorites.length || !session) hidden@endif>
+        @if(item.favorites.length && session)
+        @each(item.favorites as fav)
+        <a href="/user/{{ fav.user.toLowerCase() }}/favs" tooltip="{{ fav.user }}" flow="up"><img src="@if(fav.avatar)/t/{{ fav.avatar }}.webp@else/s/img/default.png@endif" style="height: 32px; width: 32px" /></a>
         @endeach
-      @endif
+        @endif
-      @if(session)
+        </span>
-        <a href="#" id="a_addtag">add tag</a>&nbsp;-&nbsp;<a href="#" id="a_toggle">toggle</a>
+        </div>
-        <datalist id="testlist"></datalist>
+      </div>
-      @endif
-      </span>
-      <span class="badge" id="favs"@if(!item.favorites.length || !session) hidden@endif>
-      @if(item.favorites.length && session)
-      @each(item.favorites as fav)
-      <a href="/user/{{ fav.user.toLowerCase() }}/favs" tooltip="{{ fav.user }}" flow="up"><img src="@if(fav.avatar)/t/{{ fav.avatar }}.webp@else/s/img/default.png@endif" style="height: 32px; width: 32px" /></a>
-      @endeach
-      @endif
-      </span>
-    </div>
   </div>
-@include(snippets/footer)
+</div>
+@include(snippets/footer)

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/picdump.html

@@ -0,0 +1,22 @@
+@include(snippets/header)
+<div id="main">
+  <h2>Picdump (last week)</h2>
+  <div class="picdump">
+  @each(dump as line)
+    <a href="/{{ line.id }}"><img src="/t/{{ line.id }}.webp"></a>
+  @endeach
+  </div>
+</div>
+<style>
+  .picdump {
+    width: 100%;
+    padding: 10px;
+  }
+  .picdump > a {
+    margin-top: 12px;
+  }
+  .picdump > a > img {
+    width: 100%;
+  }
+</style>
+@include(snippets/footer)

views/ranking.html

@@ -1,40 +1,55 @@
 @include(snippets/header)
-<div class="topf0ckers">
+<div id="main">
-  <h3>Top f0ckers of all time <br>- Ranking -</h3>
+  <div class="topf0ckers">
+    <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>
+              <td>{{ i + 1 }}</td>
+              <td><a href="/{{ list[i].avatar }}"><img class="avatar" src="/t/{{ list[i].avatar }}.webp"></a></td>
+              <td>@if(list[i].admin)&#11088;&nbsp;@endif<a href="/user/{!! list[i].user !!}">{!! list[i].user !!}</a></td>
+              <td>{{ list[i].count }}</td>
+            </tr>
+          @endfor
+          </tbody>
+        </table>
+      </div>
+      <div class="by-stats">
+        <h3>Tag stats</h3>
+        <table class="table">
+          <tr><td>total</td><td>{{ stats.total }}</td></tr>
+          <tr><td>tagged</td><td>{{ stats.tagged }}</td></tr>
+          <tr><td>untagged</td><td>{{ stats.untagged }}</td></tr>
+          <tr><td>SFW</td><td>{{ stats.sfw }}</td></tr>
+          <tr><td>NSFW</td><td>{{ stats.nsfw }}</td></tr>
+          <tr><td>deleted</td><td>{{ stats.deleted }}</td></tr>
+          <tr><td>missing ids</td><td>{{ stats.untracked }}</td></tr>
+        </table>
+
+        <h3>Top f0cks</h3>
+        <table class="table">
+          @each(favotop as favo)
+          <tr><td><a href="/{{ favo.item_id }}">{{ favo.item_id }}</a></td><td>{{ favo.favs }}</td></tr>
+          @endeach
+        </table>
+      </div>
+    </div>
+    <div class="triout">
+    </div>
 </div>
-<div class="ranking">
-  <div class="by-user">
-    <h3>Biggest taggers</h3>
-    <table class="table">
-      <tbody>
-      @for(let i = 0; i < list.length; i++)
-        <tr>
-          <td>{{ i + 1 }}</td>
-          <td><a href="/{{ list[i].avatar }}"><img class="avatar" src="/t/{{ list[i].avatar }}.webp" /></a></td>
-          <td><a href="/user/{!! list[i].user !!}">{!! list[i].user !!}</a></td>
-          <td>{{ list[i].count }}</td>
-        </tr>
-      @endfor
-      </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">
-      <tr><td>total</td><td>{{ stats.total }}</td></tr>
-      <tr><td>tagged</td><td>{{ stats.tagged }}</td></tr>
-      <tr><td>untagged</td><td>{{ stats.untagged }}</td></tr>
-      <tr><td>SFW</td><td>{{ stats.sfw }}</td></tr>
-      <tr><td>NSFW</td><td>{{ stats.nsfw }}</td></tr>
-    </table>
-  </div>
 </div>
 @include(snippets/footer)

views/search.html

@@ -1,35 +1,41 @@
 @include(snippets/header)
-<h1 style="text-align: center">f0ckgle</h1>
+<div id="main">
-<form action="/search" class="admin-search">
+  <div class="f0ckgle">
-  <input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit"><b>f0ck</b></button>
+    <div class="search-title">
-</form>
+      <span>search</span>
-<div class="results">
+    </div>
-  @if(result)
+    <form action="/search" class="admin-search">
-  <h1>{{ count }} f0cks given (page {{ pagination.page }} of {{ pagination.end }}):</h1>
+      <input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit">🔍</button>
-  <table style="width: 100%" class="table">
+    </form>
-    <thead>
+    <div class="results">
-      <tr>
+      @if(result)
-        <th>Thumbnail</th>
+      <h2>{{ count }} f0cks given (page {{ pagination.page }} of {{ pagination.end }}):</h2>
-        <th>ID</th>
+      <table style="width: 100%" class="table">
-        <th>Tag</th>
+        <thead>
-        <th>Mime</th>
+          <tr>
-        <th>Username</th>
+            <th>Thumbnail</th>
-        <th>Score</th>
+            <th>ID</th>
-      </tr>
+            <th>Tag</th>
-    </thead>
+            <th>Mime</th>
-    <tbody>
+            <th>Username</th>
-  @each(result as line)
+            <th>Score</th>
-      <tr>
+          </tr>
-        <td style="width: 128px;"><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank"><img src="/t/{{ line.id }}.webp" /></a></td>
+        </thead>
-        <td><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank">{{ line.id }}</a></td>
+        <tbody>
-        <td><a href="/tag/{!! line.tag !!}">{!! line.tag !!}</a></td>
+      @each(result as line)
-        <td>{{ line.mime }}</td>
+          <tr>
-        <td><a href="/user/{!! line.username !!}/f0cks/{{ line.id }}">{!! line.username !!}</a></td>
+            <td style="width: 128px;"><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank"><img src="/t/{{ line.id }}.webp" /></a></td>
-        <td>{{ line.score?.toFixed(2) }}</td>
+            <td><span class="mview_desc">ID:</span><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank">{{ line.id }}</a></td>
-      </tr>
+            <td><span class="mview_desc">Tag:</span><a href="/tag/{!! line.tag !!}">{!! line.tag !!}</a></td>
-  @endeach
+            <td><span class="mview_desc">Mime:</span>{{ line.mime }}</td>
-    </tbody>
+            <td><span class="mview_desc">User:</span><a href="/user/{!! line.username !!}/f0cks/{{ line.id }}">{!! line.username !!}</a></td>
-  </table>
+            <td><span class="mview_desc">Score:</span>{{ line.score?.toFixed(2) }}</td>
-  @endif
+          </tr>
+      @endeach
+        </tbody>
+      </table>
+      @endif
+    </div>
+  </div>
 </div>
-@include(snippets/footer)
+@include(snippets/footer)

views/settings.html

@@ -1,52 +1,60 @@
 @include(snippets/header)
-<h1>Settings</h1>
+<div class="settings">
-@if(session.avatar)<a href="//f0ck.me/{{ session.avatar }}"><img id="img_avatar" src="/t/{{ session.avatar }}.webp" /></a>@endif
+  <h1>Settings</h1>
-<h2>Account</h2>
+  <h2>Account</h2>
-<table class="table">
+  <table class="table">
-  <tbody>
+    <tbody>
-    <tr>
+      <tr>
-      <td>UserID</td>
+        <td>UserID</td>
-      <td>{{ session.id }}</td>
+        <td>{{ session.id }}</td>
-    </tr>
+      </tr>
-    <tr>
+      <tr>
-      <td>level</td>
+        <td>admin</td>
-      <td>{{ session.level }}/100</td>
+        <td>{{ !!session.admin }}</td>
-    </tr>
+      </tr>
-    <tr>
+      <tr>
-      <td>username</td>
+        <td>username</td>
-      <td>{!! session.user !!}</td>
+        <td>{!! session.user !!}</td>
-    </tr>
+      </tr>
-    <tr>
+      <tr>
-      <td>avatar</td>
+        <td>@if(session.avatar)<a href="/{{ session.avatar }}"><img id="img_avatar" src="/t/{{ session.avatar }}.webp"></a>@endif</td>
-      <td><input type="text" class="input" name="i_avatar" value="{{ session.avatar }}" /><input type="submit" id="s_avatar" value="save" /></td>
+        <td><input type="text" class="input" name="i_avatar" value="{{ session.avatar }}"></td>
-    </tr>
+      </tr>
-  </tbody>
+      <tr>
-</table>
+        <td>mail</td>
-<h2>Sessions</h2>
+        <td><input type="text" class="input" name="i_mail" placeholder="hashed" disabled></td>
-<table class="table">
+      </tr>
-  <thead>
+      <tr>
-    <tr>
+        <td colspan="2"><input type="submit" id="s_avatar" value="save"></td>
-      <th>&nbsp;</th>
+      </tr>
-      <th>id</th>
+    </tbody>
-      <th>&nbsp;</th>
+  </table>
-      <th>last action</th>
+  <h2>Sessions</h2>
-    </tr>
+  <table class="table">
-  </thead>
+    <thead>
-  <tbody>
+      <tr>
-    @each(sessions as sess)
+        <th>&nbsp;</th>
-    <tr@if(sess.id === session.sess_id) style="background-color: rgb(0, 89, 0)"@endif>
+        <th>id</th>
-      <td>{{ sess.kmsi ? '&#9875;' : '' }}</td>
+        <th>&nbsp;</th>
-      <td tooltip="{{ sess.browser }}" flow="right">
+        <th>last action</th>
-        <p>{{ sess.id }}</p>
+      </tr>
-        <p><a href="#" onclick="alert('not yet implemented!');">logout</a></p>
+    </thead>
-      </td>
+    <tbody>
-      <td>
+      @each(sessions as sess)
-        <p>last_used: {{ new Date(sess.last_used * 1e3).toLocaleString("de-DE") }}</p>
+      <tr@if(sess.id === session.sess_id) style="background-color: rgb(0, 89, 0)"@endif>
-        <p>created_at: {{ new Date(sess.created_at * 1e3).toLocaleString("de-DE") }}</p>
+        <td>{{ sess.kmsi ? '&#9875;' : '' }}</td>
-      </td>
+        <td tooltip="{{ sess.browser }}" flow="right">
-      <td><a href="{{ sess.last_action }}" target="_blank">{{ sess.last_action }}</a></td>
+          <p>{{ sess.id }}</p>
-    </tr>
+          <p><a href="#" onclick="alert('not yet implemented!');">logout</a></p>
-    @endeach
+        </td>
-  </tbody>
+        <td>
-</table>
+          <p>last_used: {{ new Date(sess.last_used * 1e3).toLocaleString("de-DE") }}</p>
+          <p>created_at: {{ new Date(sess.created_at * 1e3).toLocaleString("de-DE") }}</p>
+        </td>
+        <td><a href="{{ sess.last_action }}" target="_blank">{{ sess.last_action }}</a></td>
+      </tr>
+      @endeach
+    </tbody>
+  </table>
+</div>
 @include(snippets/footer)

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">
+<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/header_admin.html

@@ -1,18 +0,0 @@
-<!doctype html>
-<html lang="en" theme="@if(typeof theme !== "undefined"){{ theme }}@endif">
-<head>
-  <title>@if(typeof data !== "undefined" && data.title){{ data.title }}@elsef0ck!@endif</title>
-  <link rel="icon" type="image/gif" href="/s/img/favicon.gif" />
-  <link rel="stylesheet" href="/s/css/f0ck.css">
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="description" content="f0ck.me is the place where internet purists gather to celebrate content of all kinds">
-  @if(typeof data !== "undefined" && data.item)
-  <meta property="og:site_name" content="f0ck.me" />
-  <meta property="og:description"/>
-  <meta name="Description"/>
-  <meta property="og:image" content="{{ item.thumbnail }}" />
-  @endif
-</head>
-<body>
-  @include(snippets/navbar_admin)

views/snippets/navbar.html

@@ -1,83 +1,127 @@
-<nav class="navbar navbar-expand-lg">
+@if(session)
-  <a class="navbar-brand" href="/"><span class="f0ck" width="" height="">F0CK</span></a>
+<nav class="navbar navbar-expand-lg">
-  <div class="navigation-links">
+    <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>
-    <ul class="navbar-nav">
+    <div class="navigation-links">
-      <li class="nav-item dropdown">
+      <div class="pagination-container-fluid">
-        @if(session)
+        <ul class="navbar-nav">
-        <a class="nav-link" href="#" content="{{ session.user }}" data-toggle="dropdown">
+          <li class="nav-item dropdown">
-          <img src="@if(session.avatar)/t/{{ session.avatar }}.webp@else/s/img/ava/default.png@endif" class="avatar" />&nbsp;{{ session.user }}
+            <a class="nav-link user" href="#" content="{{ session.user }}" data-toggle="dropdown">
-        </a>
+              <img src="@if(session.avatar)/t/{{ session.avatar }}.webp@else/s/img/ava/default.png@endif" class="avatar"><span>@if(session.admin)&#11088;&nbsp;@endif{{ session.user }}</span>
-        <ul class="dropdown-menu">
+            </a>
-          <li><a href="/admin">adminpanel</a></li>
+            <ul class="dropdown-menu">
-          <li><a href="/user/{{ session.user.toLowerCase() }}/f0cks">my f0cks</a></li>
+              <li><a href="/user/{{ session.user.toLowerCase() }}">my profile</a></li>
-          <li><a href="/user/{{ session.user.toLowerCase() }}/favs">my favs</a></li>
+              <li><a href="/user/{{ session.user.toLowerCase() }}/f0cks">my f0cks</a></li>
-          <li><a href="/settings">settings</a></li>
+              <li><a href="/user/{{ session.user.toLowerCase() }}/favs">my favs</a></li>
-          <li><a href="/search">search</a></li>
+              <li><a href="/search">search</a></li>
-          <li><a href="/about">About</a></li>
+              @if(session.admin)<li><a href="/admin">Admin</a></li>@endif
-          <li><a href="/ranking">Ranking</a></li>
+              <li><a href="/about">About</a></li>
-          <li><a href="/logout">logout</a></li>
+              <li><a href="/ranking">ranking</a></li>
-        </ul>
+              <li><a href="/settings">settings</a></li>
-        @else
+              <li><a href="/logout">logout</a></li>
-        <a class="nav-link" href="/about" data-toggle="dropdown">About</a>
+            </ul>
-        <ul class="dropdown-menu">
+          </li>
-          <li><a href="/login">login</a></li>
+          <li class="nav-item dropdown" id="themes">
-        </ul>
+            <a class="nav-link ddcontent" href="#" content="{{ theme }}" data-toggle="dropdown">𐂧</a>
-        @endif
+            <ul class="dropdown-menu shii">
-      </li>
+              @each(themes as t)
-      <li class="nav-item dropdown" id="themes">
+              <li><a href="/theme/{{ t }}">{{ t }}</a></li>
-        <a class="nav-link ddcontent" href="#" content="{{ theme }}" data-toggle="dropdown">Theme</a>
+              @endeach
-        <ul class="dropdown-menu">
+            </ul>
-          @each(themes as t)
+          </li>
-          <li><a href="/theme/{{ t }}">{{ t }}</a></li>
+          <li class="nav-item @if(session)dropdown@endif">
-          @endeach
+            <a class="nav-link ddcontent" href="#"@if(typeof session.mode !== "undefined") content="{{ modes[session.mode] ?? 'sfw' }}" data-toggle="dropdown"@endif>Mode</a>
-        </ul>
+            <ul class="dropdown-menu">
-      </li>
+              @for(let i = 0; i < modes.length; i++)
-      <span class="placeholder">&nbsp;</span>
+              <li><a class="dropdown-item" href="/mode/{{ i }}">{{ modes[i] }}</a></li>
-      <li class="nav-item dropdown">
+              @endfor
-        <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>
-        <ul class="dropdown-menu">
+          </li>
-          <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endif">All</a></li>
+          <li class="nav-item">
-          <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endifaudio">Audio</a></li>
+            <a id="explore-tags" class="nav-link" href="/tags">
-          <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endifvideo">Video</a></li>
+              <span class="nav-link-identifier">Tags</span>
-          <li><a class="dropdown-item" href="/@if(tmp?.user)user/{{ tmp?.user }}/@endifimage">Image</a></li>
+            </a>
-        </ul>
+          </li>
-      </li>
+          <li class="nav-item">
-      @if(session)
+            <a id="random" class="nav-link" href="/random">
-      <li class="nav-item @if(session)dropdown@endif">
+              <span class="nav-link-identifier">Random</span>
-        <a class="nav-link ddcontent" href="#"@if(typeof session.mode !== "undefined") content="{{ modes[session.mode] ?? 'sfw' }}" data-toggle="dropdown"@endif>Mode</a>
+            </a>
-        <ul class="dropdown-menu">
+          </li>
-          @for(let i = 0; i < modes.length; i++)
+        </ul>
-          <li><a class="dropdown-item" href="/mode/{{ i }}">{{ modes[i] }}</a></li>
+    </div>
-          @endfor
+    </div>
-        </ul>
+    <div class="collapse navbar-collapse show" id="navbarSupportedContent">
-      </li>
+      <div class="pagination-wrapper">
-      @endif
+        @if(typeof pagination !== "undefined")
-      <li class="nav-item">
+        <nav class="pagination">
-        <a id="random" class="nav-link" href="/random">
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.start }}" class="page-item-1 btn start@if(!pagination.prev) disabled@endif">&laquo;</a>
-          <span class="nav-link-identifier">Random</span>
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.prev }}" class="page-item-2 btn prev@if(!pagination.prev) disabled@endif">&lsaquo;</a>
-        </a>
+          @each(pagination.cheat as i)
-      </li>
+            @if(i == pagination.page)
-    </ul>
+              <span class="btn disabled">{{ i }}</span>
-  </div>
+            @else
-  <div class="collapse navbar-collapse show" id="navbarSupportedContent">
+              <a href="{{ link.main }}{{ link.path }}{{ i }}" class="pagination-int-item btn">{{ i }}</a>
-    <div class="pagination-container-fluid">
+            @endif
-      <div class="pagination-wrapper">
+          @endeach
-        @if(typeof pagination !== "undefined")
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.next }}" class="page-item-3 btn next@if(!pagination.next) disabled@endif">&rsaquo;</a>
-        <nav class="pagination">
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.end }}" class="page-item-4 btn start@if(!pagination.next) disabled@endif">&raquo;</a>
-          <a href="{{ link.main }}{{ link.path }}{{ pagination.start }}" class="page-item-1 btn start@if(!pagination.prev) disabled@endif">&laquo;</a>
+        </nav>
-          <a href="{{ link.main }}{{ link.path }}{{ pagination.prev }}" class="page-item-2 btn prev@if(!pagination.prev) disabled@endif">&lsaquo;</a>
+        @endif
-          @each(pagination.cheat as i)
+      </div>
-            @if(i == pagination.page)
+
-              <span class="btn disabled">{{ i }}</span>
+    </div>
-            @else
+  </div>
-              <a href="{{ link.main }}{{ link.path }}{{ i }}" class="pagination-int-item btn">{{ i }}</a>
+</nav>
-            @endif
+@else
-          @endeach
+<!-- not logged in -->
-          <a href="{{ link.main }}{{ link.path }}{{ pagination.next }}" class="page-item-3 btn next@if(!pagination.next) disabled@endif">&rsaquo;</a>
+<nav class="navbar navbar-expand-lg">
-          <a href="{{ link.main }}{{ link.path }}{{ pagination.end }}" class="page-item-4 btn start@if(!pagination.next) disabled@endif">&raquo;</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>
-        </nav>
+
-        @endif
+  <div class="navigation-links-guest">
-      </div>
+    <ul class="navbar-nav-guests">
-    </div>
+      <li class="nav-item">
-  </div>
+        <a class="nav-link" href="/about">About</a>
-</nav>
+      </li>
+      <li class="nav-item dropdown" id="themes">
+        <a class="nav-link ddcontent" href="#" content="{{ theme }}" data-toggle="dropdown">Themes</a>
+        <ul class="dropdown-menu">
+          @each(themes as t)
+          <li><a href="/theme/{{ t }}">{{ t }}</a></li>
+          @endeach
+        </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>
+        </a>
+      </li>
+    </ul>
+  </div>
+  <!-- rechte seite -->
+  <div class="collapse navbar-collapse show" id="navbarSupportedContent">
+    <div class="pagination-container-fluid">
+      <div class="pagination-wrapper">
+        @if(typeof pagination !== "undefined")
+        <nav class="pagination">
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.start }}" class="page-item-1 btn start@if(!pagination.prev) disabled@endif">&laquo;</a>
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.prev }}" class="page-item-2 btn prev@if(!pagination.prev) disabled@endif">&lsaquo;</a>
+          @each(pagination.cheat as i)
+            @if(i == pagination.page)
+              <span class="btn disabled">{{ i }}</span>
+            @else
+              <a href="{{ link.main }}{{ link.path }}{{ i }}" class="pagination-int-item btn">{{ i }}</a>
+            @endif
+          @endeach
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.next }}" class="page-item-3 btn next@if(!pagination.next) disabled@endif">&rsaquo;</a>
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.end }}" class="page-item-4 btn start@if(!pagination.next) disabled@endif">&raquo;</a>
+        </nav>
+        @endif
+      </div>
+    </div>
+  </div>
+</nav>
+@endif

views/snippets/navbar_admin.html

@@ -1,37 +0,0 @@
-<nav class="navbar navbar-expand-lg">
-  <a class="navbar-brand" href="/"><span class="f0ck">F0CK</span></a>
-  <div class="navigation-links">
-    <ul class="navbar-nav">
-      <li class="nav-item dropdown" id="themes">
-        <a class="nav-link" href="#" content="{{ theme }}" data-toggle="dropdown">Theme</a>
-        <ul class="dropdown-menu">
-          @each(themes as t)
-            <li><a href="/theme/{{ t }}">{{ t }}</a></li>
-          @endeach
-        </ul>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" href="/admin/sessions">
-          <span class="nav-link-identifier">sessions</span>
-        </a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" href="/admin/log">
-          <span class="nav-link-identifier">Log</span>
-        </a>
-      </li>
-      @if(typeof totals !== "undefined")
-      <li class="nav-item" style="width: 100%; text-align: center">
-        total:&nbsp;{{ totals.total }}&nbsp;|&nbsp;tagged:&nbsp;{{ totals.tagged }}&nbsp;|&nbsp;untagged:&nbsp;{{ totals.untagged }}&nbsp;|&nbsp;sfw:&nbsp;{{ totals.sfw }}&nbsp;|&nbsp;nsfw:&nbsp;{{ totals.nsfw }}
-      </li>
-      @endif
-    </ul>
-  </div>
-  <div class="collapse navbar-collapse show" id="navbarSupportedContent">
-    <div class="pagination-container-fluid">
-      <div class="pagination-wrapper">
-        Henlo, {{ session.user }}&nbsp;&nbsp;<a href="/logout">Logout</a>
-      </div>
-    </div>
-  </div>
-</nav>

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,56 @@
+@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 of its visitors. 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>User Accounts</li>
+        <p>When a former visitor is granted access with an account, the following data is collected:</p>
+        <ul>
+            <li>The User Agent</li>
+            <li>The Timestamp of the first login</li>
+            <li>The Timestamp of the account's last usage</li>
+            <li>The User's last recorded action</li>
+        </ul>
+
+        <li>Email Communication</li>
+        <p>If you send me an email your mail is stored on our server, we can make a connection to your Email-Address and your user account if you contact us this way.</p>
+        <p>The Emails are not deleted after being answered.</p>
+
+        <li>Fully complying with Art. 15 GDPR</li>
+        <p>You can ask anytime what data we have of you and how we use it, see Email Communication too.</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

@@ -0,0 +1,14 @@
+@include(snippets/header)
+
+<h3>Top10 ({{ year }}-{{ month }})</h3>
+<table class="table">
+  @each(f0cks as f0ck)
+  <tr>
+    <td><a href="//w0bm.com/{{ f0ck.id }}"><img src="//w0bm.com/t/{{ f0ck.id }}.webp" /></a></td>
+    <td><a href="//w0bm.com/{{ f0ck.id }}">{{ f0ck.id }}</a></td>
+    <td>{{ f0ck.username }}</td>
+  </tr>
+  @endeach
+</table>
+
+@include(snippets/footer)

views/user.html

@@ -0,0 +1,49 @@
+@include(snippets/header)
+<div id="main">
+  <div class="profile_head">
+    @if(user.avatar)
+      <div class="profile_head_avatar">
+        <img src="/t/{{ user.avatar }}.webp" style="display: grid;width: 55px" />
+      </div>
+    @endif
+    <div class="layersoffear">
+      <div class="profile_head_username">
+        <span>@if(user.admin)&#11088;&nbsp;@endif{{ user.user }}</span>
+      </div>
+      <div class="profile_head_user_stats">
+        ID: {{ user.user_id }} – Joined: {{ user.created_at }}
+      </div>
+    </div>
+  </div>
+  <div class="user_content_wrapper">
+    <div class="f0cks">
+      <div class="f0cks-header">
+        f0ck{{ count.f0cks == 1 ? '' : 's' }}: {{ count.f0cks }} <a href="{{ f0cks.link?.main }}">view all</a>
+      </div>
+      @if(count.f0cks)
+      <div class="posts">
+        @each(f0cks.items as item)
+        <a href="{{ f0cks.link.main }}{{ item.id }}" data-mime="{{ item.mime }}" data-mode="{{ item.tag_id ? ['','sfw','nsfw'][item.tag_id] : 'null' }}" style="background-image: url('/t/{{ item.id }}.webp')"><p></p></a>
+        @endeach
+      </div>
+      @else
+        no f0cks given
+      @endif
+    </div>
+    <div class="favs">
+      <div class="favs-header">
+        fav{{ count.favs == 1 ? '' : 's' }}: {{ count.favs }} <a href="{{ favs.link?.main }}">view all</a>
+      </div>
+        @if(count.favs)
+      <div class="posts">
+        @each(favs.items as item)
+          <a href="{{ favs.link.main }}{{ item.id }}" data-mime="{{ item.mime }}" data-mode="{{ item.tag_id ? ['','sfw','nsfw'][item.tag_id] : 'null' }}" style="background-image: url('/t/{{ item.id }}.webp')"><p></p></a>
+        @endeach
+      </div>
+      @else
+        no favorites
+      @endif
+    </div>
+  </div>
+</div>
+@include(snippets/footer)