v2.1 lol

src/inc/routes/apiv2.mjs

@@ -0,0 +1,114 @@
+import router from "../router.mjs";
+import sql from "../sql.mjs";
+import { parse } from "url";
+import cfg from "../../../config.json";
+
+import { mimes, queries } from "./inc/apiv2.mjs";
+
+router.get("/api/v2", (req, res) => {
+  res.end("api lol");
+});
+
+router.get(/^\/api\/v2\/random(\/user\/.+|\/image|\/video|\/audio)?$/, async (req, res) => {
+  const args = [];
+  let q = queries.random.main;
+  
+  if(req.url.split[3] === "user") {
+    q += queries.random.where("username like ?");
+    args.push(req.url.split[4] || "flummi");
+  }
+  else
+    q += queries.random.where(mimes[req.url.split[3]] ? mimes[req.url.split[3]].map(mime => `mime = "${mime}"`).join(" or ") : null);
+
+  try {
+    const rows = await sql.query(q, args);
+    res
+      .writeHead(200, { "Content-Type": "application/json" })
+      .end(JSON.stringify(rows.length > 0 ? rows[0] : []), "utf-8");
+  } catch(err) {
+    res
+      .writeHead(500)
+      .end(JSON.stringify(err), "utf-8");
+  }
+});
+
+router.get("/api/v2/p", async (req, res) => {
+  let id = parseInt(req.url.qs.id) || 99999999;
+  const eps = Math.min(parseInt(req.url.qs.eps) || 100, 200);
+  let [ order, trend ] = req.url.qs.order === "asc" ? [ "asc", ">" ] : [ "desc", "<" ];
+
+  try {
+    const tmp = (await sql.query("select min(id) as min, max(id) as max from items limit 1"))[0];
+    if((id - 1 + eps) > tmp.max) {
+      id = tmp.max;
+      [ order, trend ] = [ "desc", "<=" ];
+    }
+    if((id + 1 - eps) < tmp.min) {
+      id = tmp.min;
+      [ order, trend ] = [ "asc", ">=" ];
+    }
+
+    const rows = await sql.query(queries.p(trend, order), [ id, eps ]);
+    const items = {
+      items: rows,
+      first: rows[0].id,
+      last: rows[rows.length - 1].id,
+      newest: tmp.max,
+      oldest: tmp.min
+    };
+    res
+      .writeHead(200, { "Content-Type": "application/json" })
+      .end(JSON.stringify(items), "utf-8");
+  } catch(err) {
+    console.error(err);
+    res
+      .writeHead(500)
+      .end(JSON.stringify(err), "utf-8");
+  }
+});
+
+router.get(/^\/api\/v2\/p\/([0-9]+)/, async (req, res) => { // legacy
+  let eps = 100;
+  let id = +req.url.split[3];
+
+  const query = await sql.query("select * from items where id < ? order by id desc limit ?", [ id, eps ]);
+  const items = {
+    items: query,
+    last: query[query.length - 1].id
+  };
+
+  res.writeHead(200, { "Content-Type": "application/json" });
+  res.end(JSON.stringify(items), "utf-8");
+});
+
+router.get(/^\/api\/v2\/item\/[0-9]+$/, async (req, res) => {
+  try {
+    const rows = await sql.query(queries.item, Array(3).fill(req.url.split[3]));
+    res.reply({
+      type: "application/json",
+      body: JSON.stringify(rows?.shift() || [])
+    });
+  } catch(err) {
+    res.reply({
+      code: 500,
+      body: JSON.stringify(err)
+    });
+  }
+});
+
+router.get(/^\/api\/v2\/user\/.*(\/[0-9]+)?$/, async (req, res) => { // auf qs umstellen
+  const user = req.url.split[3];
+  const eps = Math.min(req.url.split[4] || 50, 50);
+  try {
+    const rows = await sql.query(queries.user, [ user, eps ]);
+    res.reply({
+      type: "application/json",
+      body: JSON.stringify(rows.length > 0 ? rows : [])
+    });
+  } catch(err) {
+    res.reply({
+      code: 500,
+      body: JSON.stringify(err)
+    });
+  }
+});

src/inc/routes/inc/apiv2.mjs

@@ -0,0 +1,18 @@
+export const mimes = {
+  image: [ "image/png", "image/gif", "image/jpeg" ],
+  video: [ "video/webm", "video/mp4", "video/quicktime" ],
+  audio: [ "audio/mpeg", "audio/flac", "audio/x-flac", "audio/ogg" ]
+};
+
+export const queries = {
+  random: {
+    main: "select id, mime, size, username, userchannel, usernetwork, stamp, dest, src from items ",
+    where: where => `${where?`where ${where}`:""} order by rand() limit 1`
+  },
+  item: "select id, mime, dest, size, src, stamp, userchannel, username, usernetwork, "
+      + "(select id from items where id = (select min(id) from items where id > ?)) as next, "
+      + "(select id from items where id = (select max(id) from items where id < ?)) as prev "
+      + "from items where items.id = ? limit 1",
+  p: (trend, order) => `select id, mime from items where id ${trend} ? order by id ${order} limit ?`,
+  user: "select id, mime, size, src, stamp, userchannel, username, usernetwork from items where username = ? limit ?"
+};

src/inc/routes/inc/index.mjs

@@ -1,6 +1,12 @@
-export const queries = {
-  item: "select items.*, "
-      + "(select id from items where id = (select min(id) from items where id > ?)) as next, "
-      + "(select id from items where id = (select max(id) from items where id < ?)) as prev "
-      + "from items where items.id = ? limit 1"
+export const mimes = {
+  image: [ "image/png", "image/gif", "image/jpeg" ],
+  video: [ "video/webm", "video/mp4", "video/quicktime" ],
+  audio: [ "audio/mpeg", "audio/flac", "audio/x-flac", "audio/ogg" ]
+};
+
+export const queries = {
+  random: {
+    main: "select id, mime, size, username, userchannel, usernetwork, stamp, dest, src from items ",
+    where: where => `${where?`where ${where}`:""} order by rand() limit 1`
+  }
 };

src/inc/routes/index.mjs

@@ -2,22 +2,28 @@ import router from "../router.mjs";
 import cfg from "../../../config.json";
 import url from "url";
 import fs from "fs";
-import { queries } from "./inc/index.mjs";
+import { mimes } from "./inc/index.mjs";
 import sql from "../sql.mjs";
 import lib from "../lib.mjs";
 import tpl from "../tpl.mjs";
 
 tpl.readdir("views");
 
-router.get(/\/(p\/\d+)?$/, async (req, res) => {
+router.get(/^\/(audio\/?|image\/?|video\/?)?(p\/\d+)?$/, async (req, res) => {
   try {
-    const total = (await sql.query("select count(*) as total from items"))[0].total;
-    const limit = 299;
-    const pages = +Math.ceil(total / limit);
-    const page = Math.min(pages, +req.url.split[1] || 1);
-    const offset = (page - 1) * limit;
+    let mime = false;
+    let q = false;
+    if(['audio', 'image', 'video'].includes(req.url.split[0])) {
+      mime = req.url.split[0];
+      q = " where " + (mimes[mime] ? mimes[mime].map(_mime => `mime = "${_mime}"`).join(" or ") : null);
+    }
 
-    const query = await sql.query("select id, mime from items order by id desc limit ?, ?", [ offset, limit ]);
+    const total = (await sql.query("select count(*) as total from items" + (mime ? q : "")))[0].total;
+    const pages = +Math.ceil(total / cfg.websrv.eps);
+    const page = Math.min(pages, +req.url.split[mime ? 2 : 1] || 1);
+    const offset = (page - 1) * cfg.websrv.eps;
+
+    const query = await sql.query(`select id, mime from items ${mime ? q : ""} order by id desc limit ?, ?`, [ offset, cfg.websrv.eps ]);
 
     let cheat = [];
     for(let i = Math.max(1, page - 3); i <= Math.min(page + 3, pages); i++)
@@ -37,28 +43,50 @@ router.get(/\/(p\/\d+)?$/, async (req, res) => {
         next: (page < pages) ? page + 1 : null,
         page: page,
         cheat: cheat,
-        link: "/p/"
+        link: `/${mime ? mime + "/" : ""}p/`
       },
-      last: query[query.length - 1].id
+      last: query[query.length - 1].id,
+      filter: mime ? mime : undefined
     };
 
     res.reply({ body: tpl.render("views/index", data) });
   } catch(err) {
-    res.reply({ body: "error :(" });
+    console.log(err);
+    res.reply({ body: "sorry bald wieder da lol :(" });
   }
 });
 
-router.get(/^\/([0-9]+)$/, async (req, res) => {
-  const query = (await sql.query(queries.item, Array(3).fill(req.url.split[0])))?.shift();
-  const qmax = (await sql.query("select id from items order by id desc limit 1"))[0].id;
-  
+router.get(/^\/((audio\/|video\/|image\/)?[0-9]+)$/, async (req, res) => {
+  let id = false;
+  let mime = false;
+  let q = false;
+
+  if(['audio', 'video', 'image'].includes(req.url.split[0])) {
+    mime = req.url.split[0];
+    id = +req.url.split[1];
+    q = mimes[mime] ? mimes[mime].map(_mime => `mime = "${_mime}"`).join(" or ") : null;
+  }
+  else
+    id = +req.url.split[0];
+
+  const query = (await sql.query(`select items.* from items where items.id = ? ${mime ? "and ("+q+")" : ""} limit 1`, [ id ]))?.shift();
+
   if(!query?.id)
     return res.redirect("/404");
   
-  let cheat = [];
-  for(let i = Math.min(query.id + 3, qmax); i >= Math.max(1, query.id - 3); i--)
-    cheat.push(i);
-  
+  const tags = (await sql.query(`select tags.tag from tags_assign left join tags on tags.id = tags_assign.tag_id where tags_assign.item_id = ?`, [ id ]));
+
+  const qmin = (await sql.query(`select id from items ${mime ? "where "+q : ""} order by id asc limit 1`))[0].id;
+  const qmax = (await sql.query(`select id from items ${mime ? "where "+q : ""} order by id desc limit 1`))[0].id;
+
+  const qnext = (await sql.query(`select id from items where id > ? ${mime ? "and ("+q+")" : ""} order by id asc limit 3`, [ id ])).reverse();
+  const qprev = (await sql.query(`select id from items where id < ? ${mime ? "and ("+q+")" : ""} order by id desc limit 3`, [ id ]));
+
+  const cheat = qnext.concat([{ id: id }].concat(qprev)).map(e => +e.id);
+
+  const next = qnext[qnext.length - 1] ? qnext[qnext.length - 1].id : false;
+  const prev = qprev[0] ? qprev[0].id : false;
+
   const data = {
     user: {
       name: query.username,
@@ -72,23 +100,24 @@ router.get(/^\/([0-9]+)$/, async (req, res) => {
         short: url.parse(query.src).hostname,
       },
       thumbnail: `${cfg.websrv.paths.thumbnails}/${query.id}.png`,
+      coverart: `${cfg.websrv.paths.coverarts}/${query.id}.png`,
       dest: `${cfg.websrv.paths.images}/${query.dest}`,
       mime: query.mime,
       size: lib.formatSize(query.size),
-      timestamp: new Date(query.stamp * 1000).toISOString()
+      timestamp: lib.timeAgo(new Date(query.stamp * 1000).toISOString()),
+      tags: tags
     },
-    next: query.next ? query.next : null,
-    prev: query.prev ? query.prev : null,
     title: `${query.id} - f0ck.me`,
     pagination: {
       start: qmax,
-      end: 1,
-      prev: query.id + 1,
-      next: Math.max(query.id - 1, 1),
+      end: qmin,
+      prev: next,
+      next: prev,
       page: query.id,
       cheat: cheat,
-      link: "/"
-    }
+      link: `/${mime ? mime + "/" : ""}`
+    },
+    filter: mime ? mime : undefined
   };
   res.reply({ body: tpl.render("views/item", data) });
 });
@@ -96,7 +125,3 @@ router.get(/^\/([0-9]+)$/, async (req, res) => {
 router.get(/^\/(contact|help|about)$/, (req, res) => {
   res.reply({ body: tpl.render(`views/${req.url.split[0]}`) });
 });
-
-router.get("/random", async (req, res) => {
-  res.redirect("/" + (await sql.query("select id from items order by rand() limit 1"))[0].id)
-});

src/inc/routes/random.mjs

@@ -0,0 +1,19 @@
+import router from "../router.mjs";
+import { mimes, queries } from "./inc/index.mjs";
+import sql from "../sql.mjs";
+
+router.get(/^\/random(\/image|\/video|\/audio)?$/, async (req, res) => {
+  const args = [];
+  let q = queries.random.main;
+  
+  q += queries.random.where(mimes[req.url.split[1]] ? mimes[req.url.split[1]].map(mime => `mime = "${mime}"`).join(" or ") : null);
+
+  try {
+    const rows = await sql.query(q, args);
+    res.redirect(`/${req.url.split[1] ? req.url.split[1] + "/" : ""}${rows[0].id}`);
+  } catch(err) {
+    res
+      .writeHead(500)
+      .end(JSON.stringify(err), "utf-8");
+  }
+});

src/inc/routes/static.mjs

@@ -15,3 +15,8 @@ router.static({
   dir: path.resolve() + "/public/t",
   route: /^\/t\//
 });
+
+router.static({
+  dir: path.resolve() + "/public/ca",
+  route: /^\/ca\//
+});

src/inc/routes/tags.mjs

@@ -0,0 +1,51 @@
+import router from "../router.mjs";
+import sql from "../sql.mjs";
+import tpl from "../tpl.mjs";
+
+tpl.readdir("views");
+
+router.get(/^\/tags(\/\w+)?/, async (req, res) => {
+  try {
+    const tag = req.url;
+
+    console.log(tag);
+
+    return res.reply({ body: "wip" });
+    const total = (await sql.query("select count(*) as total from items" + (mime ? q : "")))[0].total;
+    const limit = 299;
+    const pages = +Math.ceil(total / limit);
+    const page = Math.min(pages, +req.url.split[mime ? 2 : 1] || 1);
+    const offset = (page - 1) * limit;
+
+    const query = await sql.query(`select id, mime from items ${mime ? q : ""} order by id desc limit ?, ?`, [ offset, limit ]);
+
+    let cheat = [];
+    for(let i = Math.max(1, page - 3); i <= Math.min(page + 3, pages); i++)
+      cheat.push(i);
+
+    query.forEach(e => {
+      if(!fs.existsSync(`public/t/${e.id}.png`))
+        fs.copyFileSync("public/s/img/broken.png", `public/t/${e.id}.png`);
+    });
+
+    const data = {
+      items: query,
+      pagination: {
+        start: 1,
+        end: pages,
+        prev: (page > 1) ? page - 1 : null,
+        next: (page < pages) ? page + 1 : null,
+        page: page,
+        cheat: cheat,
+        link: `/${mime ? mime + "/" : ""}p/`
+      },
+      last: query[query.length - 1].id,
+      filter: mime ? mime : undefined
+    };
+
+    res.reply({ body: tpl.render("views/index", data) });
+  } catch(err) {
+    console.log(err);
+    res.reply({ body: "sorry bald wieder da lol :(" });
+  }
+});