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

fix random & search

Browse Source
This commit is contained in:
Flummi
2022-05-06 17:29:55 +02:00
parent f5737e6f49
commit 155d496592
7 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
import cfg from "../../inc/config.mjs";
import f0cklib from "../routeinc/f0cklib.mjs";
export default (router, tpl) => {
@ -5,8 +6,8 @@ export default (router, tpl) => {
let referer = req.headers.referer ?? '';
let opts = {};
if(referer.match(/f0ck\.me/)) { // parse referer
referer = referer.split("f0ck.me")[1];
if(referer.match(new RegExp(cfg.main.url.regex))) { // parse referer
referer = referer.split(cfg.main.url.domain)[1];
const tmp = referer.match(/^\/?(?:\/tag\/(?<tag>.+?))?(?:\/user\/(?<user>.+?)\/(?<mode>f0cks|favs))?(?:\/(?<mime>image|audio|video))?(?:\/p\/(?<page>\d+))?(?:\/(?<itemid>\d+))?$/);
if(tmp)
opts = tmp.groups;
@ -31,7 +32,7 @@ export default (router, tpl) => {
});
}
res.redirect(`/${data.link}${data.link.length != 0 ? "/" : ""}${data.itemid}`);
res.redirect(`${data.link.main}${data.link.path}${data.itemid}`);
});
return router;
};

5
src/inc/routes/search.mjs
View File

@ -18,7 +18,7 @@ export default (router, tpl) => {
select count(*) as total
from "items"
where src ilike ${'%' + tag.substring(4) + '%'}
group by "items".id, "tags".tag
group by "items".id
`).length;
}
else {
@ -41,7 +41,8 @@ export default (router, tpl) => {
select *
from "items"
where src ilike ${'%' + tag.substring(4) + '%'}
group by "items".id, "tags".tag
group by "items".id
order by "items".id desc
offset ${offset}
limit ${_eps}
`;