change psql-lib from knex to postgres.js

src/inc/routes/admin.mjs

@@ -1,4 +1,4 @@
-import sql from "../sql.mjs";
+import db from "../sql.mjs";
 import lib from "../lib.mjs";
 import { exec } from "child_process";
 import search from "../routeinc/search.mjs";
@@ -24,20 +24,26 @@ export default (router, tpl) => {
   });
   
   router.post(/^\/login(\/)?$/, async (req, res) => {
-    const user = await sql("user").where("login", req.post.username.toLowerCase()).limit(1);
+    const user = await db`
+      select *
+      from "user"
+      where "login" = ${req.post.username.toLowerCase()}
+      limit 1
+    `;
     if(user.length === 0)
       return res.reply({ body: "user doesn't exist or wrong password" });
     if(!(await lib.verify(req.post.password, user[0].password)))
       return res.reply({ body: "user doesn't exist or wrong password" });
     const stamp = ~~(Date.now() / 1e3);
 
-    await sql("user_sessions") // delete unused sessions
-      .where('last_action', '<=', (Date.now() - 6048e5))
-      .andWhere('kmsi', 0)
-      .del();
+    await db`
+      delete from user_sessions
+      where last_action <= ${(Date.now() - 6048e5)}
+      and kmsi = 0
+    `;
   
     const session = lib.md5(lib.createID());
-    await sql("user_sessions").insert({
+    const blah = {
       user_id: user[0].id,
       session: lib.md5(session),
       browser: req.headers["user-agent"],
@@ -45,7 +51,13 @@ export default (router, tpl) => {
       last_used: stamp,
       last_action: "/login",
       kmsi: typeof req.post.kmsi !== 'undefined' ? 1 : 0
-    });
+    };
+
+    await db`
+      insert into "user_sessions" ${
+        db(blah, 'user_id', 'session', 'browser', 'created_at', 'last_used', 'last_action', 'kmsi')
+      }
+    `;
 
     return res.writeHead(301, {
       "Cache-Control": "no-cache, public",
@@ -55,11 +67,18 @@ export default (router, tpl) => {
   });
   
   router.get(/^\/logout$/, auth, async (req, res) => {
-    const usersession = await sql("user_sessions").where("id", req.session.sess_id);
+    const usersession = await db`
+      select *
+      from "user_sessions"
+      where id = ${+req.session.sess_id}
+    `;
     if(usersession.length === 0)
       return res.reply({ body: "nope 2" });
     
-    await sql("user_sessions").where("id", req.session.sess_id).del();
+    await db`
+      delete from "user_sessions"
+      where id = ${+req.session.sess_id}
+    `;
     return res.writeHead(301, {
       "Cache-Control": "no-cache, public",
       "Set-Cookie": "session=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT",
@@ -86,10 +105,12 @@ export default (router, tpl) => {
   });
   
   router.get(/^\/admin\/sessions(\/)?$/, auth, async (req, res) => {
-    const rows = await sql("user_sessions")
-      .leftJoin("user", "user.id", "user_sessions.user_id")
-      .select("user_sessions.*", "user.user")
-      .orderBy("user_sessions.last_used", "desc");
+    const rows = await db`
+      select "user_sessions".*, "user".user
+      from "user_sessions"
+      left join "user" on "user".id = "user_sessions".user_id
+      order by "user_sessions".last_used desc
+    `;
   
     res.reply({
       body: tpl.render("admin/sessions", {
@@ -108,17 +129,22 @@ export default (router, tpl) => {
 
       if(tag.startsWith('src:')) {
         tag = tag.substring(4);
-        ret = await sql('items')
-          .where('src', 'ilike', '%'+tag+'%')
-          .limit(500);
+        ret = await db`
+          select *
+          from "items"
+          where src ilike ${'%' + tag + '%'}
+          limit 500
+        `;
       }
       else {
-        rows = await sql("tags")
-          .select("items.id", "items.username", "tags.tag")
-          .leftJoin("tags_assign", "tags_assign.tag_id", "tags.id")
-          .leftJoin("items", "items.id", "tags_assign.item_id")
-          .where("tags.tag", "like", '%'+tag+'%')
-          .limit(500);
+        rows = await db`
+          select "items".id, "items".username, "tags".tag
+          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 + '%'}
+          limit 500
+        `;
         ret = search(rows, tag);
       }
     }