matthew/satyr
1
0
Fork 0
mirror of https://git.waldn.net/git/knotteye/satyr.git synced 2025-09-17 10:24:58 +00:00
Code Issues Projects Releases Wiki Activity

Handle temporary data from database better instead of modifying njkconf in place.

Browse Source
This commit is contained in:
knotteye
2019-11-25 11:38:12 -06:00
parent f7d9c78d09
commit cf71e663de
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/http.ts
View File

@ -39,37 +39,33 @@ async function init(satyr: any, port: number, ircconf: any){
});
app.get('/users', (req, res) => {
db.query('select username from users').then((result) => {
njkconf.list = result;
res.render('list.njk', njkconf);
njkconf.list = '';
res.render('list.njk', Object.assign({list: result}, njkconf));
});
});
app.get('/users/live', (req, res) => {
db.query('select username,title from user_meta where live=1;').then((result) => {
njkconf.list = result;
res.render('live.njk', njkconf);
njkconf.list = '';
res.render('live.njk', Object.assign({list: result}, njkconf));
});
});
app.get('/users/*', (req, res) => {
db.query('select username,title,about from user_meta where username='+db.raw.escape(req.url.split('/')[2].toLowerCase())).then((result) => {
if(result[0]){
njkconf.user = result[0].username;
/*njkconf.user = result[0].username;
njkconf.streamtitle = result[0].title;
njkconf.about = result[0].about;
res.render('user.njk', njkconf);
njkconf.about = result[0].about;*/
res.render('user.njk', Object.assign(result[0], njkconf));
}
else res.render('404.njk', njkconf);
});
});
app.get('/vods/*', (req, res) => {
njkconf.user = req.url.split('/')[2].toLowerCase();
db.query('select username from user_meta where username='+db.raw.escape(njkconf.user)).then((result) => {
db.query('select username from user_meta where username='+db.raw.escape(req.url.split('/')[2].toLowerCase())).then((result) => {
if(result[0]){
fs.readdir('./site/live/'+njkconf.user, {withFileTypes: true} , (err, files) => {
if(files) njkconf.list = files.filter(fn => fn.name.endsWith('.mp4'));
else njkconf.list = [];
res.render('vods.njk', njkconf);
//if(files) njkconf.list = files.filter(fn => fn.name.endsWith('.mp4'));
//else njkconf.list = [];
res.render('vods.njk', Object.assign({user: result[0].username, list: files.filter(fn => fn.name.endsWith('.mp4'))}, njkconf));
});
}
else res.render('404.njk', njkconf);