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

minor

Browse Source
This commit is contained in:
les
2021-06-20 23:50:22 +02:00
parent df8f1121ab
commit 6dc9f7d261
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/default.json
View File

@@ -22,6 +22,5 @@
"secure": true, "secure": true,
"host": "" "host": ""
}, },
"admin_email": "admin", "admin_email": "admin"
"secret": "notsosecret"
} }

3
locales/en.json
View File

@@ -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.", "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_URL": "Import from URL",
"import_ICS": "Import from ICS", "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": { "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.", "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.",

2
server/federation/index.js
View File

@@ -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] }) const event = await Event.findByPk(req.params.event_id, { include: [User, Tag, Place] })
if (!event) { return res.status(404).send('Not found') } 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 // get any message coming from federation

4
server/firstrun.js
View File

@@ -9,8 +9,8 @@ module.exports = {
async setup (config, config_path) { async setup (config, config_path) {
// generate a random salt // generate a random salt
consola.info('Generate random salt') // consola.info('Generate random salt')
config.secret = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15) // 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 // do not save admin's password in config file
const admin = { email: config.admin.email, password: config.admin.password } const admin = { email: config.admin.email, password: config.admin.password }