change psql-lib from knex to postgres.js
This commit is contained in:
Flummi
@ -1,4 +1,4 @@
|
||||
import sql from "../sql.mjs";
|
||||
import db from "../sql.mjs";
|
||||
import lib from "../lib.mjs";
|
||||
import cfg from "../config.mjs";
|
||||
import fs from "fs";
|
||||
@ -18,51 +18,54 @@ export default {
|
||||
|
||||
let data;
|
||||
let total;
|
||||
|
||||
|
||||
if(tag) {
|
||||
if(tag.match(/sfw/) || tag.length <= 2)
|
||||
return {
|
||||
success: false,
|
||||
message: "nope."
|
||||
};
|
||||
|
||||
total = (await sql("items")
|
||||
.innerJoin(
|
||||
sql("tags")
|
||||
.select("tags_assign.item_id", "tags.tag")
|
||||
.leftJoin("tags_assign", "tags_assign.tag_id", "tags.id")
|
||||
.where("tags.tag", "ilike", "%"+tag+"%")
|
||||
.groupBy("tags_assign.item_id", "tags.tag")
|
||||
.as("st"),
|
||||
"st.item_id", "items.id"
|
||||
)
|
||||
.whereRaw(modequery)
|
||||
.groupBy('st.tag', 'st.item_id')
|
||||
.count("* as total")
|
||||
)?.length;
|
||||
|
||||
total = await db`
|
||||
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 sql("items")
|
||||
.whereRaw(modequery)
|
||||
.andWhere("items.mime", "ilike", smime)
|
||||
.andWhere("items.username", "ilike", user ? user : "%")
|
||||
.count("* as total")
|
||||
)[0]?.total;
|
||||
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 sql("favorites")
|
||||
.select('items.id', 'items.mime')
|
||||
.leftJoin('user', 'user.id', 'favorites.user_id')
|
||||
.leftJoin('tags_assign', 'tags_assign.item_id', 'favorites.item_id')
|
||||
.leftJoin('tags', 'tags.id', 'tags_assign.tag_id')
|
||||
.leftJoin('items', 'items.id', 'favorites.item_id')
|
||||
.whereRaw(modequery)
|
||||
.andWhere('items.mime', 'ilike', smime)
|
||||
.andWhere('user.user', 'ilike', user)
|
||||
.groupBy('items.id')
|
||||
.count('* as total')
|
||||
)[0]?.total;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -77,49 +80,70 @@ export default {
|
||||
const offset = Math.max(0, (act_page - 1) * cfg.websrv.eps);
|
||||
|
||||
let rows;
|
||||
|
||||
|
||||
if(!o.fav) {
|
||||
rows = sql("items")
|
||||
.select("items.id", "items.mime", "tags_assign.tag_id")
|
||||
.joinRaw("left join tags_assign on tags_assign.item_id = items.id and (tags_assign.tag_id = 1 or tags_assign.tag_id = 2)")
|
||||
.whereRaw(modequery)
|
||||
.andWhere("items.mime", "ilike", smime)
|
||||
.andWhere("items.username", "ilike", user ? user : "%")
|
||||
.orderBy("items.id", "desc")
|
||||
.offset(offset)
|
||||
.limit(cfg.websrv.eps);
|
||||
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 = sql("favorites")
|
||||
.select('items.id', 'items.mime', 'ta.tag_id')
|
||||
.leftJoin('user', 'user.id', 'favorites.user_id')
|
||||
.leftJoin('tags_assign', 'tags_assign.item_id', 'favorites.item_id')
|
||||
.leftJoin('tags', 'tags.id', 'tags_assign.tag_id')
|
||||
.leftJoin('items', 'items.id', 'favorites.item_id')
|
||||
.joinRaw("left join tags_assign as ta on ta.item_id = items.id and (ta.tag_id = 1 or ta.tag_id = 2)")
|
||||
.whereRaw(modequery)
|
||||
.andWhere('items.mime', 'ilike', smime)
|
||||
.andWhere('user.user', 'ilike', user)
|
||||
.orderBy('items.id', 'desc')
|
||||
.groupBy('items.id', 'ta.tag_id')
|
||||
.offset(offset)
|
||||
.limit(cfg.websrv.eps);
|
||||
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}
|
||||
`;
|
||||
}
|
||||
|
||||
if(tag) {
|
||||
rows = rows
|
||||
.innerJoin(
|
||||
sql("tags")
|
||||
.select("tags_assign.item_id", "tags.tag")
|
||||
.leftJoin("tags_assign", "tags_assign.tag_id", "tags.id")
|
||||
.where("tags.tag", "ilike", "%"+tag+"%")
|
||||
.groupBy("tags_assign.item_id", "tags.tag")
|
||||
.as("st"),
|
||||
"st.item_id", "items.id"
|
||||
)
|
||||
.groupBy('st.item_id', 'items.id', 'tags_assign.tag_id');
|
||||
}
|
||||
|
||||
|
||||
rows = await rows;
|
||||
|
||||
if(rows.length === 0)
|
||||
@ -177,39 +201,66 @@ export default {
|
||||
let items;
|
||||
|
||||
if(o.fav) {
|
||||
items = sql('favorites')
|
||||
.select('items.*')
|
||||
.leftJoin('items', 'items.id', 'favorites.item_id')
|
||||
.leftJoin('user', 'user.id', 'favorites.user_id')
|
||||
.whereRaw(modequery)
|
||||
.andWhere('user.user', 'ilike', user)
|
||||
items = db`
|
||||
select "items".*
|
||||
from "favorites"
|
||||
left join "items" on "items".id = "favorites".item_id
|
||||
left join "user" on "user".id = "favorites".user_id
|
||||
${ 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 "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`
|
||||
}
|
||||
`;
|
||||
}
|
||||
else {
|
||||
items = sql("items")
|
||||
.select("*")
|
||||
.orderBy("items.id", "desc")
|
||||
.whereRaw(modequery);
|
||||
items = db`
|
||||
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``
|
||||
}
|
||||
${ tag
|
||||
? db`group by st.item_id, "items".id, "tags_assign".tag_id`
|
||||
: db`group by "items".id`
|
||||
}
|
||||
order by "items".id desc
|
||||
`;
|
||||
}
|
||||
|
||||
if(tag) {
|
||||
items = items.innerJoin(
|
||||
sql("tags")
|
||||
.select("tags_assign.item_id", "tags.tag")
|
||||
.leftJoin("tags_assign", "tags_assign.tag_id", "tags.id")
|
||||
.where("tags.tag", "ilike", "%"+tag+"%")
|
||||
.groupBy("tags.tag", "tags_assign.item_id")
|
||||
.as("st"),
|
||||
"st.item_id", "items.id"
|
||||
)
|
||||
.groupBy('st.tag', 'st.item_id', 'items.id');
|
||||
}
|
||||
else
|
||||
items = items.groupBy('items.id');
|
||||
if(user && !o.fav)
|
||||
items = items.andWhere("items.username", "ilike", "%" + user + "%");
|
||||
if(mime)
|
||||
items = items.andWhere("items.mime", "ilike", mime + "/%");
|
||||
|
||||
items = await items;
|
||||
|
||||
if(tag)
|
||||
@ -228,11 +279,13 @@ export default {
|
||||
const tags = await lib.getTags(itemid);
|
||||
const cheat = [...new Set(items.slice(Math.max(0, item - 3), item + 4).map(i => i.id))];
|
||||
const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks' });
|
||||
const favorites = await sql('favorites')
|
||||
.select('user.user', 'user_options.avatar')
|
||||
.leftJoin('user', 'user.id', 'favorites.user_id')
|
||||
.leftJoin('user_options', 'user_options.user_id', 'favorites.user_id')
|
||||
.where('favorites.item_id', itemid);
|
||||
const favorites = await db`
|
||||
select "user".user, "user_options".avatar
|
||||
from "favorites"
|
||||
left join "user" on "user".id = "favorites".user_id
|
||||
left join "user_options" on "user_options".user_id = "favorites".user_id
|
||||
where "favorites".item_id = ${itemid}
|
||||
`;
|
||||
|
||||
let coverart = true;
|
||||
try {
|
||||
@ -286,45 +339,66 @@ export default {
|
||||
const user = o.user ? decodeURI(o.user) : null;
|
||||
const tag = lib.parseTag(o.tag ?? null);
|
||||
const mime = (o.mime ?? "");
|
||||
const itemid = +(o.itemid ?? 404);
|
||||
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) {
|
||||
item = sql("favorites")
|
||||
.select('items.*')
|
||||
.leftJoin('items', 'items.id', 'favorites.item_id')
|
||||
.leftJoin('user', 'user.id', 'favorites.user_id')
|
||||
.whereRaw(modequery)
|
||||
.orderByRaw("random()")
|
||||
.andWhere('user.user', 'ilike', user);
|
||||
if(o.fav) { // dood lol
|
||||
item = db`
|
||||
select "items".*
|
||||
from "favorites"
|
||||
left join "items" on "items".id = "favorites".item_id
|
||||
left join "user" on "user".id = "favorites".user_id
|
||||
${ 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 "user".user ilike ${user}
|
||||
${ mime
|
||||
? db`and "items".mime ilike ${mime + '/%'}`
|
||||
: db``
|
||||
}
|
||||
order by random()
|
||||
limit 1
|
||||
`;
|
||||
}
|
||||
else {
|
||||
item = sql("items")
|
||||
.select("*")
|
||||
.orderByRaw("random()")
|
||||
.whereRaw(modequery);
|
||||
item = db`
|
||||
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
|
||||
`;
|
||||
}
|
||||
|
||||
if(tag) {
|
||||
item = item.innerJoin(
|
||||
sql("tags")
|
||||
.select("tags_assign.item_id", "tags.tag")
|
||||
.leftJoin("tags_assign", "tags_assign.tag_id", "tags.id")
|
||||
.where("tags.tag", "ilike", "%"+tag+"%")
|
||||
.groupBy("tags_assign.item_id", "tags.tag")
|
||||
.as("st"),
|
||||
"st.item_id", "items.id"
|
||||
)
|
||||
.groupBy('st.item_id', 'st.tag', 'items.id');
|
||||
}
|
||||
if(user)
|
||||
item = item.andWhere("username", "ilike", "%" + user + "%");
|
||||
if(mime)
|
||||
item = item.andWhere("mime", "ilike", mime + "/%");
|
||||
|
||||
item = await item;
|
||||
|
||||
if(item.length === 0) {
|
||||
|
||||
Reference in New Issue
Block a user