forked from f0ck/f0ckv2
f
This commit is contained in:
parent
a905b8817e
commit
76f1a3ddbb
@ -19,7 +19,7 @@ let items;
|
||||
if(_itemid > 0)
|
||||
items = await sql('items').where('id', _itemid);
|
||||
else
|
||||
items = await sql('items').orderBy('id', 'asc').where('src', 'like', '%soundcloud%').where('mime', 'like', 'audio/%');
|
||||
items = await sql`select id, dest, mime, src from "items"`;
|
||||
let count = 1;
|
||||
let total = items.length;
|
||||
|
||||
|
@ -99,4 +99,8 @@ html[theme="f0ck"] .image-brand {
|
||||
|
||||
html[theme="orange"] .image-brand {
|
||||
filter: hue-rotate(-160deg);
|
||||
}
|
||||
|
||||
.v0ck_overlay {
|
||||
background-color: none !important;
|
||||
}
|
@ -221,14 +221,14 @@ export default new class {
|
||||
return next();
|
||||
};
|
||||
|
||||
async loggedin(req, res, next) {
|
||||
if(!req.session) {
|
||||
return res.reply({
|
||||
code: 401,
|
||||
body: "401 - Unauthorized"
|
||||
});
|
||||
}
|
||||
return next();
|
||||
};
|
||||
// async loggedin(req, res, next) {
|
||||
// if(!req.session) {
|
||||
// return res.reply({
|
||||
// code: 401,
|
||||
// body: "401 - Unauthorized"
|
||||
// });
|
||||
// }
|
||||
// return next();
|
||||
// };
|
||||
|
||||
};
|
||||
|
@ -1,14 +1,17 @@
|
||||
import cfg from "../../inc/config.mjs";
|
||||
import lib from "../lib.mjs";
|
||||
import f0cklib from "../routeinc/f0cklib.mjs";
|
||||
|
||||
export default (router, tpl) => {
|
||||
router.get(/^\/random$/, async (req, res) => {
|
||||
router.get(/^\/random$/, lib.loggedin, async (req, res) => {
|
||||
let referer = req.headers.referer ?? '';
|
||||
let opts = {};
|
||||
|
||||
if(referer.match(new RegExp(cfg.main.url.regex))) { // parse referer
|
||||
referer = referer.split(cfg.main.url.domain)[1];
|
||||
console.log("referer: ", referer);
|
||||
const tmp = referer.match(/^\/?(?:\/tag\/(?<tag>.+?))?(?:\/user\/(?<user>.+?)\/(?<mode>f0cks|favs))?(?:\/(?<mime>image|audio|video))?(?:\/p\/(?<page>\d+))?(?:\/(?<itemid>\d+))?$/);
|
||||
console.log("tmp: ", tmp);
|
||||
if(tmp)
|
||||
opts = tmp.groups;
|
||||
}
|
||||
@ -22,6 +25,8 @@ export default (router, tpl) => {
|
||||
mode: req.session.mode,
|
||||
session: !!req.session
|
||||
});
|
||||
|
||||
console.log("data", data);
|
||||
|
||||
if(!data.success) {
|
||||
return res.reply({
|
||||
|
@ -4,11 +4,8 @@
|
||||
<div id="main">
|
||||
<div class="container">
|
||||
<div class="_204863">
|
||||
<div class="imageDoor">
|
||||
|
||||
</div>
|
||||
<div class="gapLeft">
|
||||
</div>
|
||||
<div class="imageDoor"></div>
|
||||
<div class="gapLeft"></div>
|
||||
@if(session)
|
||||
<div class="gapRight">
|
||||
<svg class="iconset" id="a_favo"><use href="/s/img/iconset.svg#heart_{{ Object.values(item.favorites).filter(u => u.user == session.user)[0] ? 'solid' : 'regular' }}"></use></svg>
|
||||
@ -98,6 +95,9 @@
|
||||
<a href="#" id="a_addtag">add tag</a> - <a href="#" id="a_toggle">toggle</a>
|
||||
<datalist id="testlist"></datalist>
|
||||
@endif
|
||||
@if(session)
|
||||
{{phrase}}
|
||||
@endif
|
||||
</span>
|
||||
<span class="badge" id="favs"@if(!item.favorites.length || !session) hidden@endif>
|
||||
@if(item.favorites.length && session)
|
||||
|
@ -2,13 +2,7 @@
|
||||
<div id="main">
|
||||
<div class="f0ckgle">
|
||||
<div class="search-title">
|
||||
<span style="color:#4285F4;">f</span>
|
||||
<span style="color:#EA4335;">0</span>
|
||||
<span style="color:#FBBC05;">c</span>
|
||||
<span style="color:#4285F4;">k</span>
|
||||
<span style="color:#34A853;">g</span>
|
||||
<span style="color:#EA4335;">l</span>
|
||||
<span style="color:#4285F4;">e</span>
|
||||
<span>search</span>
|
||||
</div>
|
||||
<form action="/search" class="admin-search">
|
||||
<input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit">🔍</button>
|
||||
|
@ -93,6 +93,9 @@
|
||||
<span class="nav-link-identifier">Random</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="/search">search</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse show" id="navbarSupportedContent">
|
||||
|
Loading…
x
Reference in New Issue
Block a user