Merge branch 'f0ckdev' into 'master'

added mime and size

See merge request !101
This commit is contained in:
Flummi 2017-03-22 13:18:48 +00:00
commit 479e7d0c7f

View File

@ -23,10 +23,10 @@ module.exports = (lib) => {
params.inc = new Array(params.inc.length).fill('username LIKE ?'); params.inc = new Array(params.inc.length).fill('username LIKE ?');
params.exc = new Array(params.inc.length == 0 ? params.exc.length : 0).fill('username NOT LIKE ?'); params.exc = new Array(params.inc.length == 0 ? params.exc.length : 0).fill('username NOT LIKE ?');
let where = params.inc.concat(params.exc).join(' || '); let where = params.inc.concat(params.exc).join(' || ');
let query = `SELECT id, username FROM f0ck.items ${where.length > 0 ? `WHERE ${where}` : ''} ORDER BY rand() LIMIT 1`; let query = `SELECT id, username, mime, size FROM f0ck.items ${where.length > 0 ? `WHERE ${where}` : ''} ORDER BY rand() LIMIT 1`;
lib.sql.query(query, vars, (err, rows) => { lib.sql.query(query, vars, (err, rows) => {
e.reply(!err && rows.length > 0 ? `f0ckrnd: ${lib.cfg.main.url}/${rows[0].id} by: ${rows[0].username}` : 'nothing found, f0cker'); e.reply(!err && rows.length > 0 ? `f0ckrnd: ${lib.cfg.main.url}/${rows[0].id} by: ${rows[0].username} (${rows[0].mime}, ~${lib.formatSize(rows[0].size)})` : 'nothing found, f0cker');
}); });
}, },
desc: 'Random-f0ck' desc: 'Random-f0ck'