minor
This commit is contained in:
@@ -22,6 +22,5 @@
|
||||
"secure": true,
|
||||
"host": ""
|
||||
},
|
||||
"admin_email": "admin",
|
||||
"secret": "notsosecret"
|
||||
"admin_email": "admin"
|
||||
}
|
||||
|
||||
@@ -157,7 +157,8 @@
|
||||
"remove_recurrent_confirmation": "Are you sure you want to remove this recurring event?\nPast events will be maintained, but no further events will be created.",
|
||||
"import_URL": "Import from URL",
|
||||
"import_ICS": "Import from ICS",
|
||||
"ics": "ICS"
|
||||
"ics": "ICS",
|
||||
"import_description": "You can import events from other platforms and other instances through standard formats (ics and h-event)"
|
||||
},
|
||||
"admin": {
|
||||
"place_description": "If you have gotten the place or address wrong, you can change it.<br/>All current and past events associated with this place will change address.",
|
||||
|
||||
@@ -36,7 +36,7 @@ router.get('/m/:event_id', async (req, res) => {
|
||||
|
||||
const event = await Event.findByPk(req.params.event_id, { include: [User, Tag, Place] })
|
||||
if (!event) { return res.status(404).send('Not found') }
|
||||
return res.json(event.toAPNote(event.user.username, req.settings.locale))
|
||||
return res.json(event.toAPNote(settingsController.settings.instance_name, req.settings.locale))
|
||||
})
|
||||
|
||||
// get any message coming from federation
|
||||
|
||||
@@ -9,8 +9,8 @@ module.exports = {
|
||||
|
||||
async setup (config, config_path) {
|
||||
// generate a random salt
|
||||
consola.info('Generate random salt')
|
||||
config.secret = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15)
|
||||
// consola.info('Generate random salt')
|
||||
// config.secret = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15)
|
||||
|
||||
// do not save admin's password in config file
|
||||
const admin = { email: config.admin.email, password: config.admin.password }
|
||||
|
||||
Reference in New Issue
Block a user