f0ck/f0ckv2
3
4
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
Flummi 2022-05-21 16:43:27 +02:00
commit 53a0880c55
5 changed files with 101 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config_example.json
View File

@ -14,6 +14,7 @@
}, },
"allowedModes": [ "sfw", "nsfw", "untagged", "all" ], "allowedModes": [ "sfw", "nsfw", "untagged", "all" ],
"allowedMimes": [ "audio", "image", "video" ], "allowedMimes": [ "audio", "image", "video" ],
"nsfp": [],
"websrv": { "websrv": {
"port": "8080", "port": "8080",
"paths": { "paths": {

2
src/inc/lib.mjs
View File

@ -63,7 +63,7 @@ export default new class {
const link = []; const link = [];
if(env.tag) link.push("tag", env.tag); if(env.tag) link.push("tag", env.tag);
if(env.user) link.push("user", env.user, env.type ?? 'f0cks'); 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('/'); let tmp = link.length === 0 ? '/' : link.join('/');
if(!tmp.endsWith('/')) if(!tmp.endsWith('/'))

338
src/inc/routeinc/f0cklib.mjs
View File

@ -4,158 +4,72 @@ import cfg from "../config.mjs";
import fs from "fs"; import fs from "fs";
import url from "url"; import url from "url";
const globalfilter = cfg.nsfp.map(n => `tag_id = ${n}`).join(' or ');
export default { export default {
getf0cks: async (o = { user, tag, mime, page, mode, fav }) => { getf0cks: async (o = { user, tag, mime, page, mode, fav, session }) => {
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 ?? null;
const page = +(o.page ?? 1); const page = +(o.page ?? 1);
const smime = cfg.allowedMimes.includes(mime) ? mime + "/%" : mime === "" ? "%" : "%"; const smime = cfg.allowedMimes.includes(mime) ? mime + "/%" : mime === "" ? "%" : "%";
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); const modequery = mime == "audio" ? lib.getMode(0) : lib.getMode(o.mode ?? 0);
let data; const total = (await db`
let total; select distinct on (items.id)
count(items.id) as total
if(tag) {
if(tag.match(/sfw/) || tag.length <= 2)
return {
success: false,
message: "nope."
};
total = await db`
select count(*) as total
from items from items
inner join ( left join tags_assign on tags_assign.item_id = items.id
select tags_assign.item_id, tags.tag left join tags on tags.id = tags_assign.tag_id
from tags left join favorites on favorites.item_id = items.id
left join tags_assign on tags_assign.tag_id = tags.id left join "user" on "user".id = favorites.user_id
where tags.tag ilike ${'%' + (tag ? tag : '') + '%'} where
group by tags_assign.item_id, tags.tag ${ db.unsafe(modequery) }
) as st on st.item_id = items.id ${ tag ? db`and tags.normalized ilike ${'%'+tag+'%'}` : db`` }
where ${db.unsafe(modequery)} ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
group by st.tag, st.item_id`; ${ user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
${ mime ? db`and items.mime ilike ${smime}` : db`` }
${ !o.session ? 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 = total?.length; if(!total || total === 0) {
}
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 ?? 0;
}
}
if(!total || total.length === 0)
return { return {
success: false, success: false,
message: "404 - no f0cks given" message: "404 - no f0cks given"
}; };
}
const pages = +Math.ceil(total / cfg.websrv.eps); const pages = +Math.ceil(total / cfg.websrv.eps);
const act_page = Math.min(pages, page || 1); const act_page = Math.min(pages, page || 1);
const offset = Math.max(0, (act_page - 1) * cfg.websrv.eps); const offset = Math.max(0, (act_page - 1) * cfg.websrv.eps);
let rows; const rows = await db`
select distinct on (items.id)
if(!o.fav) { items.id,
rows = db` items.mime,
select "items".id, "items".mime, "tags_assign".tag_id tags.tag,
from "items" ta.tag_id
left join "tags_assign" on "tags_assign".item_id = "items".id and ("tags_assign".tag_id = 1 or "tags_assign".tag_id = 2) from items
${tag left join tags_assign on tags_assign.item_id = items.id
? db` left join tags on tags.id = tags_assign.tag_id
inner join ( left join favorites on favorites.item_id = items.id
select "tags_assign".item_id, "tags".tag left join "user" on "user".id = favorites.user_id
from "tags" left join tags_assign ta on ta.item_id = items.id and (ta.tag_id = 1 or ta.tag_id = 2)
left join "tags_assign" on "tags_assign".tag_id = "tags".id where
where "tags".tag ilike ${'%' + tag + '%'} ${ db.unsafe(modequery) }
group by "tags_assign".item_id, "tags".tag ${ tag ? db`and tags.normalized ilike ${'%'+tag+'%'}` : db`` }
) as st on st.item_id = "items".id ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
` ${ user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
: db`` ${ mime ? db`and items.mime ilike ${smime}` : db`` }
} ${ !o.session ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db`` }
where ${db.unsafe(modequery)} group by items.id, tags.tag, ta.tag_id
and "items".mime ilike ${smime} order by items.id desc
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} offset ${offset}
limit ${cfg.websrv.eps} 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 = []; const cheat = [];
for(let i = Math.max(1, act_page - 3); i <= Math.min(act_page + 3, pages); i++) for(let i = Math.max(1, act_page - 3); i <= Math.min(act_page + 3, pages); i++)
@ -163,7 +77,7 @@ export default {
const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks', path: 'p/' }); const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks', path: 'p/' });
data = { return {
success: true, success: true,
items: rows, items: rows,
pagination: { pagination: {
@ -177,9 +91,8 @@ export default {
link, link,
tmp 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 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 ?? "");
@ -197,74 +110,25 @@ 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 ${ tag ? db`and tags.normalized ilike ${'%'+tag+'%'}` : db`` }
from "tags" ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
left join "tags_assign" on "tags_assign".tag_id = "tags".id ${ user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
where "tags".tag ilike ${'%' + tag + '%'} ${ mime ? db`and items.mime ilike ${smime}` : db`` }
group by "tags_assign".item_id, "tags".tag ${ !o.session ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db`` }
) as st on st.item_id = "items".id` group by items.id, tags.tag, ta.tag_id
: db`` 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 item = items.findIndex(i => i.id === itemid);
const actitem = items[item]; const actitem = items[item];
@ -334,71 +198,33 @@ export default {
}; };
return data; return data;
}, },
getRandom: async (o = ({ user, tag, mime, mode })) => { getRandom: async (o = ({ user, tag, mime, mode, session })) => {
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); const modequery = mime == "audio" ? lib.getMode(0) : lib.getMode(o.mode ?? 0);
let item; const item = await db`
if(o.fav) { // dood lol select
item = db` items.id
select "items".* from items
from "favorites" left join tags_assign on tags_assign.item_id = items.id
left join "items" on "items".id = "favorites".item_id left join tags on tags.id = tags_assign.tag_id
left join "user" on "user".id = "favorites".user_id left join favorites on favorites.item_id = items.id
${ tag left join "user" on "user".id = favorites.user_id
? db` where
inner join ( ${ db.unsafe(modequery) }
select "tags_assign".item_id, "tags".tag ${ tag ? db`and tags.normalized ilike ${'%'+tag+'%'}` : db`` }
from "tags" ${ o.fav ? db`and "user".user ilike ${'%'+user+'%'}` : db`` }
left join "tags_assign" on "tags_assign".tag_id = "tags".id ${ user ? db`and items.username ilike ${'%'+user+'%'}` : db`` }
where "tags".tag ilike ${'%' + tag + '%'} ${ mime ? db`and items.mime ilike ${smime}` : db`` }
group by "tags_assign".item_id, "tags".tag ${ !o.session ? db`and items.id not in (select item_id from tags_assign where item_id = items.id and (${db.unsafe(globalfilter)}))` : db`` }
) as st on st.item_id = "items".id` group by items.id, tags.tag
: db``
}
where ${db.unsafe(modequery)}
and "user".user ilike ${user}
${ mime
? db`and "items".mime ilike ${mime + '/%'}`
: db``
}
order by random() order by random()
limit 1 limit 1
`; `;
}
else {
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
`;
}
item = await item;
if(item.length === 0) { if(item.length === 0) {
return { return {

9
src/inc/routes/index.mjs
View File

@ -34,12 +34,14 @@ export default (router, tpl) => {
const f0cks = await f0cklib.getf0cks({ const f0cks = await f0cklib.getf0cks({
user: user, user: user,
mode: req.session.mode, mode: req.session.mode,
fav: false fav: false,
session: !!req.session
}); });
const favs = await f0cklib.getf0cks({ const favs = await f0cklib.getf0cks({
user: user, user: user,
mode: req.session.mode, mode: req.session.mode,
fav: true fav: true,
session: !!req.session
}); });
if('items' in f0cks) if('items' in f0cks)
@ -66,7 +68,8 @@ export default (router, tpl) => {
page: req.params.page, page: req.params.page,
itemid: req.params.itemid, itemid: req.params.itemid,
fav: req.params.mode == 'favs', fav: req.params.mode == 'favs',
mode: req.session.mode mode: req.session.mode,
session: !!req.session
}); });
if(!data.success) { if(!data.success) {
return res.reply({ return res.reply({

3
src/inc/routes/random.mjs
View File

@ -19,7 +19,8 @@ export default (router, tpl) => {
mime: opts.mime, mime: opts.mime,
page: opts.page, 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) { if(!data.success) {