encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
lesion
2019-03-14 11:12:56 +01:00
parent c9c7db2f46
commit df2e1e0363
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controller/user.js
View File

@@ -7,7 +7,6 @@ const settingsController = require('./settings')
const eventController = require('./event') const eventController = require('./event')
const config = require('../config') const config = require('../config')
const mail = require('../mail') const mail = require('../mail')
const bot = require('./bot')
const { Op } = require('sequelize') const { Op } = require('sequelize')
const userController = { const userController = {
@@ -44,8 +43,8 @@ const userController = {
}, },
async delEvent (req, res) { async delEvent (req, res) {
// check if event is mine
const event = await Event.findByPk(req.params.id) const event = await Event.findByPk(req.params.id)
// check if event is mine (or user is admin)
if (event && (req.user.is_admin || req.user.id === event.userId)) { if (event && (req.user.is_admin || req.user.id === event.userId)) {
await event.destroy() await event.destroy()
res.sendStatus(200) res.sendStatus(200)

2
app/cron.js
View File

@@ -21,7 +21,7 @@ async function sendNotification (notification, event, eventNotification) {
break break
case 'mastodon': case 'mastodon':
// instance publish // instance publish
if (settings.mastodon_auth.instance) { if (settings.mastodon_auth.instance && settings.mastodon_auth.access_token) {
const b = bot.post(settings.mastodon_auth, event) const b = bot.post(settings.mastodon_auth, event)
promises.push(b) promises.push(b)
} }