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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
les
2020-11-04 00:42:41 +01:00
parent f3319cf59d 72662542b0
commit 7b19319866
4 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/docker/postgres/docker-compose.yml
View File

@@ -5,12 +5,13 @@ services:
image: postgres image: postgres
container_name: postgres container_name: postgres
volumes: volumes:
- db:/var/lib/postgres - ./postgres:/var/lib/postgresql/data
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
environment: environment:
- POSTGRES_USER=gancio - POSTGRES_USER=gancio
- POSTGRES_DB=gancio - POSTGRES_DB=gancio
- POSTGRES_PASSWORD=gancio - POSTGRES_PASSWORD=gancio
- PGDATA=/var/lib/postgresql/data
restart: always restart: always
ports: ports:
- 5432:5432 - 5432:5432
@@ -28,4 +29,8 @@ services:
depends_on: depends_on:
- db - db
ports: ports:
<<<<<<< HEAD
- "127.0.0.1:13120:13120" - "127.0.0.1:13120:13120"
=======
- 127.0.0.1:13120:13120
>>>>>>> master

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "gancio", "name": "gancio",
"version": "0.24.1", "version": "0.24.2",
"description": "A shared agenda for local communities", "description": "A shared agenda for local communities",
"author": "lesion", "author": "lesion",
"scripts": { "scripts": {

14
server/firstrun.js
View File

@@ -62,13 +62,15 @@ module.exports = {
// announcement: 'TODO: HTML First presentation post' // announcement: 'TODO: HTML First presentation post'
// }) // })
// send confirmed events to mastodon // try {
await Notification.create({ action: 'Create', type: 'ap', filters: { is_visible: true } })
await Notification.create({ action: 'Update', type: 'ap', filters: { is_visible: true } })
await Notification.create({ action: 'Delete', type: 'ap', filters: { is_visible: true } })
// send anon events to admin // // send confirmed events to mastodon
await Notification.create({ action: 'Create', type: 'admin_email', filters: { is_visible: false } }) await Notification.create({ action: 'Create', type: 'ap', filters: '{ "is_visible": true }' })
await Notification.create({ action: 'Update', type: 'ap', filters: '{ "is_visible": true }' })
await Notification.create({ action: 'Delete', type: 'ap', filters: '{ "is_visible": true }' })
// // send anon events to admin
await Notification.create({ action: 'Create', type: 'admin_email', filters: '{ "is_visible": false }' })
// }
// TODO email's notifications // TODO email's notifications
// await db.notification.create({ action: 'Create', type: 'email', filters: { is_visible: true } }) // await db.notification.create({ action: 'Create', type: 'email', filters: { is_visible: true } })

20
server/migrations/20201103161446-notification_queue.js Normal file
View File

@@ -0,0 +1,20 @@
'use strict'
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.bulkInsert('notifications', [
// send AP message
{ action: 'Create', type: 'ap', filters: '{ "is_visible": true }', createdAt: new Date(), updatedAt: new Date() },
{ action: 'Update', type: 'ap', filters: '{ "is_visible": true }', createdAt: new Date(), updatedAt: new Date() },
{ action: 'Delete', type: 'ap', filters: '{ "is_visible": true }', createdAt: new Date(), updatedAt: new Date() },
// send anon event to admin
{ action: 'Create', type: 'admin_email', filters: '{ "is_visible": false }', createdAt: new Date(), updatedAt: new Date() }
]).catch(e => { })
},
down: (queryInterface, Sequelize) => {
return queryInterface.bulkDelete('notification')
}
}