diff --git a/models/bot.js b/models/bot.js index c04fc30..98a9c13 100644 --- a/models/bot.js +++ b/models/bot.js @@ -23,6 +23,7 @@ let hm = new mongoose.Schema({ analytics_invites: Number, vanity: String, invite: String, + prefix: String, }); module.exports = mongoose.model("bots", hm); \ No newline at end of file diff --git a/website/routers/bot/index.js b/website/routers/bot/index.js index fe223b7..8716b82 100644 --- a/website/routers/bot/index.js +++ b/website/routers/bot/index.js @@ -59,7 +59,8 @@ router.post('/add', async function (req, res) { description: req.body.bot_short, tags: req.body.tags, token: makeid(64), - invite: req.body.bot_invite + invite: req.body.bot_invite, + prefix: req.body.bot_prefix }); bot.save(function (err) { @@ -283,6 +284,8 @@ router.post('/:botID/settings', async function (req, res) { bot.long_description = req.body.bot_description; bot.vanity = req.body.bot_vanity.toLowerCase(); bot.owners = owners; + bot.prefix = req.body.bot_prefix; + bot.save(function (err) { if (err) { console.log(err); @@ -313,6 +316,7 @@ router.post('/:botID/settings', async function (req, res) { bot.long_description = req.body.bot_description; bot.vanity = req.body.bot_vanity.toLowerCase(); bot.owners = owners; + bot.prefix = req.body.bot_prefix; bot.save(function (err) { if (err) { console.log(err); diff --git a/website/routers/user/index.js b/website/routers/user/index.js index 6cf8fd3..aeadbb6 100644 --- a/website/routers/user/index.js +++ b/website/routers/user/index.js @@ -4,16 +4,15 @@ var servers = require('../../../models/server'); var votes = require('../../../models/votes'); var bots = require('../../../models/bot'); var users = require('../../../models/user'); -const user = require('../../../models/user'); router.get('/', function (req, res) { res.redirect('/user/me') }) router.get('/me', async function (req, res) { - if(!req.user){ + if (!req.user) { req.session.backURL = req.originalUrl; return res.redirect('/auth'); } - var bot = await bots.find({ owners: req.user.id }); + var bot = await bots.find().or([{ owners: req.user.id }, { owner: req.user.id }]); var user = await users.findOne({ id: req.user.id }); res.render('user/index', { user: req.user, @@ -25,7 +24,7 @@ router.get('/me', async function (req, res) { }) router.get('/me/edit', async function (req, res) { - if(!req.user){ + if (!req.user) { req.session.backURL = req.originalUrl; return res.redirect('/auth'); } @@ -37,7 +36,7 @@ router.get('/me/edit', async function (req, res) { }); }) router.post('/me/edit', async function (req, res) { - if(!req.user){ + if (!req.user) { req.session.backURL = req.originalUrl; return res.redirect('/auth'); } @@ -52,9 +51,9 @@ router.post('/me/edit', async function (req, res) { res.redirect('/user/me'); }) router.get('/:id', async function (req, res) { - var bot = await bots.find({ owners: req.params.id }); + var bot = await bots.find().or([{ owners: req.params.id }, { owner: req.params.id }]); var user = await users.findOne({ id: req.params.id }); - if(!user){ + if (!user) { req.session.error = 'No user found'; return res.redirect('/'); } diff --git a/website/views/bot/add.ejs b/website/views/bot/add.ejs index 1a1515f..d5299d7 100644 --- a/website/views/bot/add.ejs +++ b/website/views/bot/add.ejs @@ -25,6 +25,10 @@ +
Prefix: <%= bot.prefix %>
+ +Votes: <%= bot.votes || 0 %>