From 8bc226eb4cee47e82ad6c8117fc78a01d616332e Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jan 2020 18:37:52 +0100
Subject: [PATCH 01/14] holy shit

https://github.com/sequelize/sequelize/issues/10360
---
 .../20200129173454-user_email_index.js        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 server/migrations/20200129173454-user_email_index.js

diff --git a/server/migrations/20200129173454-user_email_index.js b/server/migrations/20200129173454-user_email_index.js
new file mode 100644
index 00000000..009386d4
--- /dev/null
+++ b/server/migrations/20200129173454-user_email_index.js
@@ -0,0 +1,19 @@
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addIndex('users', {
+      unique: true,
+      fields: ['email']
+    }).catch(e => {})
+  },
+
+  down: (queryInterface, Sequelize) => {
+    /*
+      Add reverting commands here.
+      Return a promise to correctly handle asynchronicity.
+
+      Example:
+      return queryInterface.dropTable('users');
+    */
+  }
+};

From ba1bf9e51c29a6584830de0b99f1d085b3728f00 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jan 2020 18:50:45 +0100
Subject: [PATCH 02/14] email field autofocus during registration

---
 pages/Register.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/Register.vue b/pages/Register.vue
index 3c5ba777..30d9ff16 100644
--- a/pages/Register.vue
+++ b/pages/Register.vue
@@ -42,10 +42,12 @@ export default {
       return !this.user.password || !this.user.email || !this.user.description
     }
   },
+  mounted () {
+    this.$refs.email.focus()
+  },
   methods: {
     close () {
       this.$router.replace('/')
-      this.$emit('close')
     },
     async register () {
       this.loading = true

From 2658827314ed0cc5e29e2d598c3149f77af33407 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jan 2020 18:51:33 +0100
Subject: [PATCH 03/14] fix login error msg

---
 locales/it.json | 2 +-
 pages/Login.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/locales/it.json b/locales/it.json
index c9813891..a42ae061 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -79,7 +79,7 @@
     "check_email": "Controlla la tua posta (anche lo spam)",
     "not_registered": "Non sei registrata?",
     "forgot_password": "Dimenticato la password?",
-    "error": "Errore: ",
+    "error": "Errore durante il login, controlla i dati.",
     "insert_email": "Inserisci la mail",
     "ok": "Tutto rego"
   },
diff --git a/pages/Login.vue b/pages/Login.vue
index a6aecf5f..bb3637e5 100644
--- a/pages/Login.vue
+++ b/pages/Login.vue
@@ -24,7 +24,6 @@
 <script>
 import { mapState } from 'vuex'
 import { Message } from 'element-ui'
-import get from 'lodash/get'
 
 export default {
   name: 'Login',
@@ -71,7 +70,7 @@ export default {
         Message({ message: this.$t('login.ok'), showClose: true, type: 'success' })
         this.$router.replace('/')
       } catch (e) {
-        Message({ message: this.$t('login.error') + this.$t(get(e, 'response.data.message', e)), showClose: true, type: 'error' })
+        Message({ message: this.$t('login.error'), showClose: true, type: 'error' })
         this.loading = false
         return
       }

From 5c19bb227aa86717a612032757eb79b7a62f4aa5 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jan 2020 18:51:58 +0100
Subject: [PATCH 04/14] clean user:model debug

---
 server/api/models/user.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/api/models/user.js b/server/api/models/user.js
index f0f70259..e9945d41 100644
--- a/server/api/models/user.js
+++ b/server/api/models/user.js
@@ -1,5 +1,4 @@
 const bcrypt = require('bcryptjs')
-const debug = require('debug')('model:user')
 
 module.exports = (sequelize, DataTypes) => {
   const User = sequelize.define('user', {
@@ -38,7 +37,6 @@ module.exports = (sequelize, DataTypes) => {
 
   User.beforeSave(async (user, options) => {
     if (user.changed('password')) {
-      debug('Password for %s modified', user.email)
       const salt = await bcrypt.genSalt(10)
       const hash = await bcrypt.hash(user.password, salt)
       user.password = hash

From cc9785290c01ddc82ea983e14f865cddf93757be Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jan 2020 20:09:30 +0100
Subject: [PATCH 05/14] search switch display block

---
 components/Search.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/Search.vue b/components/Search.vue
index 7f4f01b2..46775551 100644
--- a/components/Search.vue
+++ b/components/Search.vue
@@ -1,11 +1,11 @@
 <template lang="pug">
   el-main
-    el-switch.mt-1.mb-2.ml-2(
+    el-switch.mt-1.mb-2.ml-2.d-block(
       v-if='recurrentFilter && settings.allow_recurrent_event'
       :active-text="$t('event.show_recurrent')"
       v-model='showRecurrent')
 
-    el-switch.mt-1.mb-2.ml-2(
+    el-switch.mt-1.mb-2.ml-2.d-block(
       v-if='pastFilter'
       :active-text="$t('event.show_past')"
       v-model='showPast')

From 0f18212abda1b9f1995bf917def59d456a61b419 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jan 2020 21:39:02 +0100
Subject: [PATCH 06/14] fix #68

handle lot of different smtp configuration during setup
---
 server/cli.js      | 57 ++++++++++++++++++++++++++++++++++++++++------
 server/firstrun.js | 10 +++++++-
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/server/cli.js b/server/cli.js
index 986422b5..1d2d5012 100755
--- a/server/cli.js
+++ b/server/cli.js
@@ -133,6 +133,7 @@ async function setupQuestionnaire (is_docker, db) {
           consola.warn(`"${p}" does not exists, trying to create it`)
           try {
             mkdirp.sync(p)
+            consola.info(`${p} succesfully created`)
           } catch (e) {
             console.error(String(e))
             return false
@@ -144,7 +145,7 @@ async function setupQuestionnaire (is_docker, db) {
   }
   questions.push({
     name: 'admin.email',
-    message: `Admin email (a first user with this username will be created)`,
+    message: 'Admin email (a first user with this username will be created, also used as sender address)',
     default: options => {
       const baseurl = new url.URL(options.baseurl)
       return (
@@ -161,24 +162,66 @@ async function setupQuestionnaire (is_docker, db) {
     validate: notEmpty
   })
 
+  questions.push({
+    name: 'smtp_type',
+    message: 'How should we send the emails ?',
+    type: 'list',
+    choices: ['sendmail', 'SMTP']
+  })
+
+  questions.push({
+    name: 'smtp.path',
+    message: 'Where sendmail binary is ?',
+    default: '/usr/sbin/sendmail',
+    when: answers => answers.smtp_type === 'sendmail',
+    validate: sendmail_path => sendmail_path.length > 0 && fs.existsSync(path.resolve(sendmail_path))
+  })
+
   questions.push({
     name: 'smtp.host',
     message: 'SMTP Host',
-    validate: notEmpty
+    default: 'localhost',
+    validate: notEmpty,
+    when: answers => answers.smtp_type !== 'sendmail'
+  })
+
+  questions.push({
+    name: 'smtp.secure',
+    message: 'Does SMTP server support TLS?',
+    when: answers => answers.smtp_type !== 'sendmail' && !['localhost', '127.0.0.1'].includes(answers.smtp.host),
+    default: true,
+    type: 'confirm'
+  })
+
+  questions.push({
+    name: 'smtp.port',
+    message: 'SMTP Port',
+    default: answers => ['localhost', '127.0.0.1'].includes(answers.smtp.host) ? 25 : (answers.smtp.secure ? 465 : 587),
+    when: answers => answers.smtp_type !== 'sendmail'
+  })
+
+  questions.push({
+    name: 'smtp_need_auth',
+    message: 'is SMTP authentication needed?',
+    type: 'confirm',
+    default: answers => !['localhost', '127.0.0.1'].includes(answers.smtp.host),
+    when: answers => answers.smtp_type !== 'sendmail'
   })
 
   questions.push({
     name: 'smtp.auth.user',
     message: 'SMTP User',
     validate: notEmpty,
-    default: answers => answers.admin.email
+    default: answers => answers.admin.email,
+    when: answers => answers.smtp_type !== 'sendmail' && answers.smtp_need_auth
   })
 
   questions.push({
     name: 'smtp.auth.pass',
     message: 'SMTP Password',
     type: 'password',
-    validate: notEmpty
+    validate: notEmpty,
+    when: answers => answers.smtp_type !== 'sendmail' && answers.smtp_need_auth
   })
 
   const answers = await inquirer.prompt(questions)
@@ -243,7 +286,7 @@ If this is your first run use 'gancio setup --config <CONFIG_FILE.json>' `)
 }
 
 async function setup (options) {
-  consola.info(`You're going to setup gancio on this machine.`)
+  consola.info('You\'re going to setup gancio on this machine.')
   const config = await setupQuestionnaire(options.docker, options.db)
   await run_migrations(config.db)
   const ret = await firstrun.setup(config, options.config)
@@ -251,8 +294,8 @@ async function setup (options) {
     process.exit(-1)
   }
   if (options.docker) {
-    consola.info(`You can edit ./config.json to modify your configuration.`)
-    consola.info(`Start the server with "docker-compose up"`)
+    consola.info('You can edit ./config.json to modify your configuration.')
+    consola.info('Start the server with "docker-compose up"')
   } else {
     consola.info(
       `You can edit '${options.config}' to modify your configuration. `
diff --git a/server/firstrun.js b/server/firstrun.js
index cbdcee27..23b00561 100644
--- a/server/firstrun.js
+++ b/server/firstrun.js
@@ -16,7 +16,15 @@ module.exports = {
     const admin = { email: config.admin.email, password: config.admin.password }
     delete config.admin
 
-    config.smtp.secure = true
+    if (config.smtp_type === 'sendmail') {
+      config.smtp = {
+        sendmail: true,
+        newline: 'unix',
+        path: config.smtp.path
+      }
+    }
+    delete config.smtp_type
+    delete config.smtp_need_auth
     config.admin_email = admin.email
     config.db.logging = false
     consola.info(`Save configuration to ${config_path}`)

From 80da0aafa2eadb985fb15f85aba154251fd49f46 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jan 2020 21:52:08 +0100
Subject: [PATCH 07/14] minor

---
 pages/recover/_code.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/recover/_code.vue b/pages/recover/_code.vue
index 24293b8b..74be70d4 100644
--- a/pages/recover/_code.vue
+++ b/pages/recover/_code.vue
@@ -3,7 +3,7 @@
     h4(slot='header')
       nuxt-link(to='/')
         img(src='/favicon.ico')
-      span  {{settings.title}} - {{$t('common.authorize')}}
+      span  {{settings.title}} - {{$t('common.recover_password')}}
     div(v-if='valid')
       el-input(type='password', :placeholder='$t("common.new_password")' v-model='new_password' prefix-icon='el-icon-lock')
     div(v-else) {{$t('recover.not_valid_code')}}

From 2784294e36e2657a3c43060eda36bf726fe537a8 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jan 2020 22:16:11 +0100
Subject: [PATCH 08/14] error handling while adding events

---
 server/api/controller/user.js | 98 ++++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 47 deletions(-)

diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index 27ffa992..eed5c81f 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -37,66 +37,70 @@ const userController = {
    * add event
    */
   async addEvent (req, res) {
+    // req.err comes from multer streaming error
     if (req.err) {
       debug(req.err)
       return res.status(400).json(req.err.toString())
     }
-    const body = req.body
-    const eventDetails = {
-      title: body.title,
-      // remove html tags
-      description: sanitizeHtml(body.description),
-      multidate: body.multidate,
-      start_datetime: body.start_datetime,
-      end_datetime: body.end_datetime,
-      recurrent: body.recurrent,
-      // publish this event only if authenticated
-      is_visible: !!req.user
-    }
 
-    if (req.file) {
-      eventDetails.image_path = req.file.filename
-    }
-
-    const event = await Event.create(eventDetails)
-
-    // create place if needed
-    let place
     try {
-      place = await Place.findOrCreate({
+      const body = req.body
+      const recurrent = body.recurrent ? JSON.parse(body.recurrent) : null
+
+      const eventDetails = {
+        title: body.title,
+        // remove html tags
+        description: sanitizeHtml(body.description),
+        multidate: body.multidate,
+        start_datetime: body.start_datetime,
+        end_datetime: body.end_datetime,
+        recurrent,
+        // publish this event only if authenticated
+        is_visible: !!req.user
+      }
+
+      if (req.file) {
+        eventDetails.image_path = req.file.filename
+      }
+
+      const event = await Event.create(eventDetails)
+
+      // create place if needed
+      const place = await Place.findOrCreate({
         where: { name: body.place_name },
         defaults: { address: body.place_address }
       })
         .spread((place, created) => place)
       await event.setPlace(place)
       event.place = place
+
+      // create/assign tags
+      if (body.tags) {
+        await Tag.bulkCreate(body.tags.map(t => ({ tag: t })), { ignoreDuplicates: true })
+        const tags = await Tag.findAll({ where: { tag: { [Op.in]: body.tags } } })
+        await Promise.all(tags.map(t => t.update({ weigth: Number(t.weigth) + 1 })))
+        await event.addTags(tags)
+        event.tags = tags
+      }
+
+      // associate user to event and reverse
+      if (req.user) {
+        await req.user.addEvent(event)
+        await event.setUser(req.user)
+      }
+
+      // return created event to the client
+      res.json(event)
+
+      // send notification (mastodon/email)
+      // only if user is authenticated
+      if (req.user) {
+        const notifier = require('../../notifier')
+        notifier.notifyEvent('Create', event.id)
+      }
     } catch (e) {
-      debug(e)
-    }
-
-    // create/assign tags
-    if (body.tags) {
-      await Tag.bulkCreate(body.tags.map(t => ({ tag: t })), { ignoreDuplicates: true })
-      const tags = await Tag.findAll({ where: { tag: { [Op.in]: body.tags } } })
-      await Promise.all(tags.map(t => t.update({ weigth: Number(t.weigth) + 1 })))
-      await event.addTags(tags)
-      event.tags = tags
-    }
-
-    // associate user to event and reverse
-    if (req.user) {
-      await req.user.addEvent(event)
-      await event.setUser(req.user)
-    }
-
-    // return created event to the client
-    res.json(event)
-
-    // send notification (mastodon/email)
-    // only if user is authenticated
-    if (req.user) {
-      const notifier = require('../../notifier')
-      notifier.notifyEvent('Create', event.id)
+      res.sendStatus(400)
+      debug(e.toString())
     }
   },
 

From 0d83a48452dec44ef71d94d1397eff56cc1511b1 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jan 2020 22:16:57 +0100
Subject: [PATCH 09/14] use Taskmanager to send email with correct locale

---
 server/api/controller/user.js | 22 ++++++----------------
 server/api/mail.js            | 20 ++++++++++++++------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index eed5c81f..d661bca8 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -209,7 +209,7 @@ const userController = {
     if (!req.body.password) { delete req.body.password }
 
     if (!user.is_active && req.body.is_active && user.recover_code) {
-      mail.send(user.email, 'confirm', { user, config })
+      mail.send(user.email, 'confirm', { user, config }, req.settings.locale)
     }
 
     await user.update(req.body)
@@ -230,20 +230,10 @@ const userController = {
       req.body.recover_code = crypto.randomBytes(16).toString('hex')
       debug('Register user ', req.body.email)
       const user = await User.create(req.body)
-      try {
-        debug(`Sending registration email to ${user.email}`)
-        mail.send(user.email, 'register', { user, config })
-        mail.send(config.admin_email, 'admin_register', { user, config })
-      } catch (e) {
-        return res.status(400).json(e)
-      }
-      const payload = {
-        id: user.id,
-        email: user.email,
-        scope: [user.is_admin ? 'admin' : 'user']
-      }
-      const token = jwt.sign(payload, config.secret)
-      res.json({ token, user })
+      debug(`Sending registration email to ${user.email}`)
+      mail.send(user.email, 'register', { user, config }, req.settings.locale)
+      mail.send(config.admin_email, 'admin_register', { user, config }, req.settings.locale)
+      res.sendStatus(200)
     } catch (e) {
       res.status(404).json(e)
     }
@@ -254,7 +244,7 @@ const userController = {
       req.body.is_active = true
       req.body.recover_code = crypto.randomBytes(16).toString('hex')
       const user = await User.create(req.body)
-      mail.send(user.email, 'user_confirm', { user, config })
+      mail.send(user.email, 'user_confirm', { user, config }, req.settings.locale)
       res.json(user)
     } catch (e) {
       res.status(404).json(e)
diff --git a/server/api/mail.js b/server/api/mail.js
index 252e5086..69fdec69 100644
--- a/server/api/mail.js
+++ b/server/api/mail.js
@@ -4,12 +4,20 @@ const moment = require('moment')
 const config = require('config')
 const settings = require('./controller/settings')
 const debug = require('debug')('email')
-
-// TOFIX
-moment.locale('it')
+const { Task, TaskManager } = require('../taskManager')
 
 const mail = {
-  send (addresses, template, locals) {
+  send (addresses, template, locals, locale) {
+    const task = new Task({
+      name: 'MAIL',
+      removable: true,
+      method: mail._send,
+      args: [addresses, template, locals, locale]
+    })
+    TaskManager.add(task)
+  },
+
+  _send (addresses, template, locales, locale) {
     debug(`Send ${template} email to ${addresses}`)
     const email = new Email({
       views: { root: path.join(__dirname, '..', 'emails') },
@@ -43,8 +51,8 @@ const mail = {
         bcc: config.admin_email
       },
       locals: {
-        ...locals,
-        locale: 'it', // TOFIX
+        ...locales,
+        locale,
         config: { title: config.title, baseurl: config.baseurl, description: config.description },
         datetime: datetime => moment.unix(datetime).format('ddd, D MMMM HH:mm')
       }

From 6ad7fd1d79ad0665aecb2912575612377245e4e7 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 30 Jan 2020 12:37:19 +0100
Subject: [PATCH 10/14] taskManager & recurrent events generation

---
 components/Event.vue                          |  15 +-
 components/List.vue                           |  19 +-
 locales/it.json                               |   4 +-
 package.json                                  |   6 +-
 pages/Register.vue                            |   4 +-
 pages/add/_edit.vue                           |   9 +-
 pages/embed/_event_id.vue                     |  48 +---
 pages/event/_id.vue                           |  25 +-
 pages/event/eventAdmin.vue                    |  51 ++--
 plugins/filters.js                            |   3 +-
 server/api/controller/event.js                | 269 ++++++++----------
 server/api/controller/user.js                 |   9 +-
 server/api/mail.js                            |   2 +-
 server/api/models/event.js                    |   6 +-
 server/api/models/notification.js             |   1 -
 server/index.js                               |  11 +-
 .../migrations/20200127101541-event_parent.js |  19 ++
 .../20200127113535-fix_recurrent.js           |  19 ++
 .../20200129173454-user_email_index.js        |  10 +-
 server/taskManager.js                         | 123 ++++++++
 store/index.js                                |   4 +-
 21 files changed, 366 insertions(+), 291 deletions(-)
 create mode 100644 server/migrations/20200127101541-event_parent.js
 create mode 100644 server/migrations/20200127113535-fix_recurrent.js
 create mode 100644 server/taskManager.js

diff --git a/components/Event.vue b/components/Event.vue
index ee145dcc..cb17151a 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  nuxt-link.event(:to='`/event/${link}`' :class='{ withImg: event.image_path }')
+  nuxt-link.event(:to='`/event/${event.id}`' :class='{ withImg: event.image_path }')
 
     //- image
     el-image(v-if='showImage && event.image_path' lazy :src='`/media/thumb/${event.image_path}`')
@@ -24,7 +24,7 @@ import { mapState } from 'vuex'
 
 export default {
   props: {
-    event: Object,
+    event: { type: Object, default: () => ({}) },
     showTags: {
       type: Boolean,
       default: true
@@ -35,16 +35,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(['settings']),
-    date () {
-      return new Date(this.event.start_datetime).getDate()
-    },
-    link () {
-      if (this.event.recurrent) {
-        return `${this.event.id}_${this.event.start_datetime}`
-      }
-      return this.event.id
-    }
+    ...mapState(['settings'])
   }
 }
 </script>
diff --git a/components/List.vue b/components/List.vue
index 32821651..c9fc6b89 100644
--- a/components/List.vue
+++ b/components/List.vue
@@ -1,4 +1,4 @@
-<template lang="pug">
+<template lang='pug'>
 div#list
   el-divider(v-if='title') {{title}}
   el-timeline
@@ -6,17 +6,15 @@ div#list
       v-for='event in events'
       :key='`${event.id}_${event.start_datetime}`'
       :timestamp='event|when'
-      placement='top' icon='el-icon-arrow-down' size='large'
-    )
+      placement='top' icon='el-icon-arrow-down' size='large')
 
       div.float-right
         small @{{event.place.name}}
 
-      a(:href='"/event/" + link(event)' target='_blank') {{event.title}}
+      a(:href='`/event/${event.id}`' target='_blank') {{event.title}}
       hr
 </template>
 <script>
-import { mapGetters } from 'vuex'
 
 export default {
   name: 'List',
@@ -51,17 +49,6 @@ export default {
       type: Boolean,
       default: true
     }
-  },
-  data () {
-    return { }
-  },
-  methods: {
-    link (event) {
-      if (event.recurrent) {
-        return `${event.id}_${event.start_datetime}`
-      }
-      return event.id
-    }
   }
 }
 </script>
diff --git a/locales/it.json b/locales/it.json
index a42ae061..c4b93dee 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -72,7 +72,9 @@
     "title": "Titolo",
     "user": "Utente",
     "filter": "Filtra",
-    "event": "Evento"
+    "event": "Evento",
+    "pause": "Pausa",
+    "start": "Avvia"
   },
   "login": {
     "description": "Entrando puoi pubblicare nuovi eventi.",
diff --git a/package.json b/package.json
index 9f3a9c4e..0b6c7326 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "author": "lesion",
   "scripts": {
     "dev:nuxt": "cross-env NODE_ENV=development nuxt dev",
-    "dev": "cross-env DEBUG=*,-babel*,-follow-redirects,-send,-body-parser:*,-express:*,-connect:*,-sequelize:* NODE_ENV=development node server/index.js",
+    "dev": "cross-env DEBUG=*,-babel*,-preview-email,-i18n:debug,-email-templates,-follow-redirects,-send,-body-parser:*,-express:*,-connect:*,-sequelize:* NODE_ENV=development node server/index.js",
     "build": "nuxt build",
-    "start": "cross-env DEBUG=*,-babel*,-follow-redirects,-send,-body-parser:*,-express:*,-connect:*,-sequelize:* NODE_ENV=production node server/cli.js",
+    "start": "cross-env DEBUG=*,-babel*,-preview-email,-i18n:debug,-email-templates,-follow-redirects,-send,-body-parser:*,-express:*,-connect:*,-sequelize:* NODE_ENV=production node server/cli.js",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
     "doc": "cd docs && bundle exec jekyll b",
     "doc:dev": "cd docs && bundle exec jekyll s --drafts",
@@ -82,7 +82,7 @@
     "multer": "^1.4.2",
     "nuxt": "^2.11.0",
     "nuxt-express-module": "^0.0.11",
-    "pg": "^7.17.1",
+    "pg": "^7.18.1",
     "sanitize-html": "^1.21.1",
     "sequelize": "^5.21.3",
     "sequelize-cli": "^5.5.1",
diff --git a/pages/Register.vue b/pages/Register.vue
index 30d9ff16..6daf0bdb 100644
--- a/pages/Register.vue
+++ b/pages/Register.vue
@@ -52,10 +52,10 @@ export default {
     async register () {
       this.loading = true
       try {
-        const { user } = await this.$axios.$post('/user/register', this.user)
+        await this.$axios.$post('/user/register', this.user)
         Message({
           showClose: true,
-          message: this.$t(`register.${user.is_admin ? 'admin_' : ''}complete`),
+          message: this.$t('register.complete'),
           type: 'success'
         })
         this.close()
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index de63ed12..fc08d41e 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -135,7 +135,7 @@ export default {
         data.event.type = 'multidate'
       } else if (event.recurrent) {
         data.event.type = 'recurrent'
-        data.event.recurrent = JSON.parse(event.recurrent)
+        data.event.recurrent = event.recurrent
       } else {
         data.event.type = 'normal'
         data.date = moment.unix(event.start_datetime)
@@ -184,15 +184,15 @@ export default {
       if (!dates || !dates.length) { return '' }
 
       const freq = this.event.recurrent.frequency
-      const weekDays = _(dates).map(date => moment(date).format('dddd')).uniq()
+      const weekDays = _(dates).map(date => moment(date).format('dddd')).uniq().value()
       if (freq === '1w' || freq === '2w') {
         return this.$t(`event.recurrent_${freq}_days`, { days: weekDays.join(', ') })
       } else if (freq === '1m' || freq === '2m') {
-        const days = _(dates).map(date => moment(date).date()).uniq()
+        const days = _(dates).map(date => moment(date).date()).uniq().value()
         const n = Math.floor((days[0] - 1) / 7) + 1
         return [
           { label: this.$tc(`event.recurrent_${freq}_days`, days.length, { days }), key: 'ordinal' },
-          { label: this.$tc(`event.recurrent_${freq}_ordinal`, days.length, { n: this.$t(`ordinal.${n}`), days: weekDays.join(', ') }), key: 'weekday' }
+          { label: this.$tc(`event.recurrent_${freq}_ordinal`, days.length, { n, days: weekDays.join(', ') }), key: 'weekday' }
         ]
       } else if (freq === '1d') {
         return this.$t('event.recurrent_each_day')
@@ -231,7 +231,6 @@ export default {
         .filter(e => !e.multidate && (!e.recurrent || this.event.type === 'recurrent'))
         .map(e => ({ key: e.id, dot: { color: this.event.type === 'recurrent' ? 'orange' : 'green' }, dates: moment.unix(e.start_datetime).toDate() })))
 
-      console.error(this.event.type)
       if (this.event.type === 'recurrent' && this.date && this.date.length) {
         attributes.push({
           key: 'recurrent',
diff --git a/pages/embed/_event_id.vue b/pages/embed/_event_id.vue
index 0c9b19fd..478b0e1b 100644
--- a/pages/embed/_event_id.vue
+++ b/pages/embed/_event_id.vue
@@ -1,20 +1,19 @@
 <template lang="pug">
-    nuxt-link.embed_event(:to='`/event/${link}`' target='_blank' :class='{ withImg: event.image_path }')
+  nuxt-link.embed_event(:to='`/event/${id}`' target='_blank' :class='{ withImg: event.image_path }')
 
-      //- image
-      img.float-left(v-if='event.image_path' :src='`/media/thumb/${event.image_path}`')
-      .event-info
+    //- image
+    img.float-left(v-if='event.image_path' :src='`/media/thumb/${event.image_path}`')
+    .event-info
 
-        //-  title
-        .date {{event|when('home')}}<br/>
-        h4 {{event.title}}
+      //-  title
+      .date {{event|when('home')}}<br/>
+      h4 {{event.title}}
 
-        //- date / place
-        .date {{event.place.name}}<br/> {{event.place.address}}
+      //- date / place
+      .date {{event.place.name}}<br/> {{event.place.address}}
 
 </template>
 <script>
-import { mapState } from 'vuex'
 import Event from '../../components/Event'
 
 export default {
@@ -22,10 +21,8 @@ export default {
   components: { Event },
   async asyncData ({ $axios, params, error, store }) {
     try {
-      const [id, start_datetime] = params.event_id.split('_')
-      const event = await $axios.$get(`/event/${id}`)
-      event.start_datetime = start_datetime ? Number(start_datetime) : event.start_datetime
-      return { event, id: Number(id) }
+      const event = await $axios.$get(`/event/${params.event_id}`)
+      return { event, id: Number(params.event_id) }
     } catch (e) {
       error({ statusCode: 404, message: 'Event not found' })
     }
@@ -34,31 +31,10 @@ export default {
     return {
       loading: true
     }
-  },
-  computed: {
-    ...mapState(['settings']),
-    date () {
-      return new Date(this.event.start_datetime).getDate()
-    },
-    link () {
-      if (this.event.recurrent) {
-        return `${this.event.id}_${this.event.start_datetime}`
-      }
-      return this.event.id
-    }
   }
 }
 
-/**
- * <style>
-.embedded_gancio {
-  border: none;
-  width: 450px;
-  height: 220px;
-  float: left;
-}</style>
-<iframe src='http://localhost:13120/embed/1' class='embedded_gancio'></iframe>
- */
+// <iframe src='http://localhost:13120/embed/1' class='embedded_gancio'></iframe>
 </script>
 <style lang='less'>
 .embed_event {
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 5c6bd1d6..2df22e47 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -29,8 +29,8 @@
         //- info & actions for desktop
         el-col.menu(:sm='6' :xs='24')
           el-menu.menu.mt-2(router)
-            p <i class='el-icon-time'></i>  <b>{{event|when}}</b> <br/><small>{{event|to}}</small>
-            p <i class='el-icon-map-location'></i>  <b>{{event.place.name}}</b> - {{event.place.address}}
+            p <i class='el-icon-date'></i>  <b>{{event|when}}</b> <br/><small>{{event|to}}</small>
+            p <i class='el-icon-location-outline'></i>  <b>{{event.place.name}}</b> - {{event.place.address}}
             el-divider {{$t('common.actions')}}
             el-menu-item(
               v-clipboard:success='copyLink'
@@ -80,7 +80,7 @@ import EmbedEvent from './embedEvent'
 import FollowMe from './followMe'
 import { Message, MessageBox } from 'element-ui'
 
-import moment from 'dayjs'
+import moment from 'moment-timezone'
 
 export default {
   name: 'Event',
@@ -88,17 +88,8 @@ export default {
   components: { EventAdmin, EmbedEvent, FollowMe },
   async asyncData ({ $axios, params, error, store }) {
     try {
-      const [id, start_datetime] = params.id.split('_')
-      const event = await $axios.$get(`/event/${id}`)
-      event.start_datetime = start_datetime
-        ? Number(start_datetime)
-        : event.start_datetime
-      // const now = new Date()
-      // const events = await $axios.$get(
-      // `/event/${now.getMonth()}/${now.getFullYear()}`
-      // )
-      // store.commit('setEvents', events)
-      return { event, id: Number(id) }
+      const event = await $axios.$get(`/event/${params.id}`)
+      return { event, id: Number(params.id) }
     } catch (e) {
       error({ statusCode: 404, message: 'Event not found' })
     }
@@ -201,9 +192,6 @@ export default {
       if (!event) {
         return false
       }
-      if (event.recurrent) {
-        return `${event.id}_${event.start_datetime}`
-      }
       return event.id
     },
     prev () {
@@ -220,9 +208,6 @@ export default {
       if (!event) {
         return false
       }
-      if (event.recurrent) {
-        return `${event.id}_${event.start_datetime}`
-      }
       return event.id
     },
     imgPath () {
diff --git a/pages/event/eventAdmin.vue b/pages/event/eventAdmin.vue
index 6995b204..f0294398 100644
--- a/pages/event/eventAdmin.vue
+++ b/pages/event/eventAdmin.vue
@@ -1,11 +1,19 @@
 <template lang='pug'>
-el-menu.menu
+div
   el-divider {{$t('common.admin')}}
-  el-menu-item
-    div(@click.prevents='toggle') {{$t(event.is_visible?'common.hide':'common.confirm')}}
-  el-menu-item
-    div(@click.prevent='remove') {{$t('common.remove')}}
-  el-menu-item(@click='$router.replace(`/add/${event.id}`)') {{$t('common.edit')}}
+  el-menu.menu
+    el-menu-item
+      div(v-if='event.is_visible' @click='toggle(false)') <i class='el-icon-open'/> {{$t('common.hide')}}
+      div(v-else @click='toggle(false)') <i class='el-icon-turn-off'/> {{$t('common.confirm')}}
+    el-menu-item
+      div(@click='remove(false)') <i class='el-icon-delete'/> {{$t('common.remove')}}
+    el-menu-item(@click='$router.replace(`/add/${event.id}`)') <i class='el-icon-edit'/> {{$t('common.edit')}}
+    div(v-if='event.parentId')
+      el-divider  {{$t('event.recurrent')}}
+      el-menu-item(v-if='event.parent.is_visible' @click='toggle(true)') <i class='el-icon-video-pause'/> {{$t('common.pause')}}
+      el-menu-item(v-else @click='toggle(true)') <i class='el-icon-video-play'/> {{$t('common.start')}}
+      el-menu-item(@click='remove(true)') <i class='el-icon-delete'/> {{$t('common.remove')}}
+      el-menu-item(@click='$router.replace(`/add/${event.parentId}`)') <i class='el-icon-edit'/> {{$t('common.edit')}}
 </template>
 <script>
 import { MessageBox } from 'element-ui'
@@ -13,30 +21,39 @@ import { mapActions } from 'vuex'
 
 export default {
   name: 'EventAdmin',
-  props: ['event'],
+  props: {
+    event: {
+      type: Object,
+      default: () => ({})
+    }
+  },
   methods: {
     ...mapActions(['delEvent']),
-    async remove () {
+    async remove (parent = false) {
       try {
         await MessageBox.confirm(this.$t('event.remove_confirmation'), this.$t('common.confirm'), {
           confirmButtonText: this.$t('common.ok'),
           cancelButtonText: this.$t('common.cancel'),
-          type: 'error' })
-        await this.$axios.delete(`/user/event/${this.event.id}`)
-        this.delEvent(Number(this.event.id))
+          type: 'error'
+        })
+        const id = parent ? this.event.parentId : this.event.id
+        await this.$axios.delete(`/user/event/${id}`)
+        this.delEvent(Number(id))
         this.$router.replace('/')
       } catch (e) {
         console.error(e)
       }
     },
-    async toggle () {
+    async toggle (parent = false) {
+      const id = parent ? this.event.parentId : this.event.id
+      const is_visible = parent ? this.event.parent.is_visible : this.event.is_visible
+      const method = is_visible ? 'unconfirm' : 'confirm'
       try {
-        if (this.event.is_visible) {
-          await this.$axios.$get(`/event/unconfirm/${this.event.id}`)
-          this.event.is_visible = false
+        await this.$axios.$get(`/event/${method}/${id}`)
+        if (parent) {
+          this.event.parent.is_visible = !is_visible
         } else {
-          await this.$axios.$get(`/event/confirm/${this.event.id}`)
-          this.event.is_visible = true
+          this.event.is_visible = !is_visible
         }
       } catch (e) {
         console.error(e)
diff --git a/plugins/filters.js b/plugins/filters.js
index 26305cf0..217d5f66 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -1,6 +1,5 @@
 import Vue from 'vue'
 import moment from 'moment-timezone'
-import url from 'url'
 
 export default ({ app, store }) => {
   // set timezone to instance_timezone!!
@@ -28,7 +27,7 @@ export default ({ app, store }) => {
     const normal = `${start.format('dddd, D MMMM (HH:mm-')}${end.format('HH:mm) ')}`
     // recurrent event
     if (event.recurrent && where !== 'home') {
-      const { frequency, days, type } = JSON.parse(event.recurrent)
+      const { frequency, days, type } = event.recurrent
       if (frequency === '1w' || frequency === '2w') {
         const recurrent = app.i18n.tc(`event.recurrent_${frequency}_days`, days.length, { days: days.map(d => moment().day(d - 1).format('dddd')) })
         return `${normal} - ${recurrent}`
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index f9ccd41b..70cd427f 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -6,6 +6,7 @@ const { event: Event, resource: Resource, tag: Tag, place: Place, notification:
 const Sequelize = require('sequelize')
 const exportController = require('./export')
 const debug = require('debug')('controller:event')
+// const { Task, TaskManager } = require('../../taskManager')
 
 const eventController = {
 
@@ -76,17 +77,23 @@ const eventController = {
     const format = req.params.format || 'json'
     const is_admin = req.user && req.user.is_admin
     const id = Number(req.params.event_id)
-    let event = await Event.findByPk(id, {
-      attributes: {
-        exclude: ['createdAt', 'updatedAt']
-      },
-      include: [
-        { model: Tag, attributes: ['tag', 'weigth'], through: { attributes: [] } },
-        { model: Place, attributes: ['name', 'address'] },
-        { model: Resource, where: !is_admin && { hidden: false }, required: false }
-      ],
-      order: [[Resource, 'id', 'DESC']]
-    })
+    let event
+    try {
+      event = await Event.findByPk(id, {
+        attributes: {
+          exclude: ['createdAt', 'updatedAt']
+        },
+        include: [
+          { model: Tag, attributes: ['tag', 'weigth'], through: { attributes: [] } },
+          { model: Place, attributes: ['name', 'address'] },
+          { model: Resource, where: !is_admin && { hidden: false }, required: false },
+          { model: Event, required: false, as: 'parent' }
+        ],
+        order: [[Resource, 'id', 'DESC']]
+      })
+    } catch (e) {
+      return res.sendStatus(400)
+    }
 
     if (event && (event.is_visible || is_admin)) {
       event = event.toJSON()
@@ -139,8 +146,7 @@ const eventController = {
     }
 
     try {
-      event.is_visible = false
-      await event.save()
+      await event.update({ is_visible: false })
       res.sendStatus(200)
     } catch (e) {
       res.sendStatus(404)
@@ -185,112 +191,14 @@ const eventController = {
     res.sendStatus(200)
   },
 
-  // async addRecurrent (start, places, where_tags, limit) {
-  //   const where = {
-  //     is_visible: true,
-  //     recurrent: { [Op.ne]: null }
-  //     // placeId: places
-  //   }
-
-  //   const events = await Event.findAll({
-  //     where,
-  //     limit,
-  //     attributes: {
-  //       exclude: ['slug', 'likes', 'boost', 'userId', 'is_visible', 'description', 'createdAt', 'updatedAt', 'placeId']
-  //     },
-  //     order: ['start_datetime', [Tag, 'weigth', 'DESC']],
-  //     include: [
-  //       { model: Resource, required: false, attributes: ['id'] },
-  //       { model: Tag, ...where_tags, attributes: ['tag'], through: { attributes: [] } },
-  //       { model: Place, required: false, attributes: ['id', 'name', 'address'] }
-  //     ]
-  //   })
-
-  //   let allEvents = []
-  //   _.forEach(events, e => {
-  //     allEvents = allEvents.concat(eventController.createEventsFromRecurrent(e.get(), start))
-  //   })
-
-  //   return allEvents
-  // },
-
-  // // build singular events from a recurrent pattern
-  // createEventsFromRecurrent (e, start, dueTo = null) {
-  //   const events = []
-  //   const recurrent = JSON.parse(e.recurrent)
-  //   if (!recurrent.frequency) { return false }
-  //   if (!dueTo) {
-  //     dueTo = start.add(2, 'month')
-  //   }
-  //   let cursor = start.startOf('week')
-  //   const start_date = moment.unix(e.start_datetime)
-  //   const duration = moment.unix(e.end_datetime).diff(start_date, 's')
-  //   const frequency = recurrent.frequency
-  //   const days = recurrent.days
-  //   const type = recurrent.type
-
-  //   // default frequency is '1d' => each day
-  //   const toAdd = { n: 1, unit: 'day' }
-
-  //   // each week or 2 (search for the first specified day)
-  //   if (frequency === '1w' || frequency === '2w') {
-  //     cursor.add(days[0] - 1, 'day')
-  //     if (frequency === '2w') {
-  //       const nWeeks = cursor.diff(e.start_datetime, 'w') % 2
-  //       if (!nWeeks) { cursor.add(1, 'week') }
-  //     }
-  //     toAdd.n = Number(frequency[0])
-  //     toAdd.unit = 'week'
-  //     // cursor.set('hour', start_date.hour()).set('minute', start_date.minutes())
-  //   }
-
-  //   cursor.set('hour', start_date.hour()).set('minute', start_date.minutes())
-
-  //   // each month or 2
-  //   if (frequency === '1m' || frequency === '2m') {
-  //     // find first match
-  //     toAdd.n = 1
-  //     toAdd.unit = 'month'
-  //     if (type === 'weekday') {
-
-  //     } else if (type === 'ordinal') {
-
-  //     }
-  //   }
-
-  //   // add event at specified frequency
-  //   while (true) {
-  //     const first_event_of_week = cursor.clone()
-  //     days.forEach(d => {
-  //       if (type === 'ordinal') {
-  //         cursor.date(d)
-  //       } else {
-  //         cursor.day(d - 1)
-  //       }
-  //       if (cursor.isAfter(dueTo) || cursor.isBefore(start)) { return }
-  //       e.start_datetime = cursor.unix()
-  //       e.end_datetime = e.start_datetime + duration
-  //       events.push(Object.assign({}, e))
-  //     })
-  //     if (cursor.isAfter(dueTo)) { break }
-  //     cursor = first_event_of_week.add(toAdd.n, toAdd.unit)
-  //     cursor.set('hour', start_date.hour()).set('minute', start_date.minutes())
-  //   }
-
-  //   return events
-  // },
-
-  async _select (start = moment.unix(), limit = 100, show_recurrent = true) {
+  async _select (start = moment.unix(), limit = 100) {
     const where = {
       // confirmed event only
+      recurrent: null,
       is_visible: true,
       start_datetime: { [Op.gt]: start }
     }
 
-    if (!show_recurrent) {
-      where.recurrent = null
-    }
-
     const events = await Event.findAll({
       where,
       limit,
@@ -319,59 +227,104 @@ const eventController = {
   async select (req, res) {
     const start = req.query.start || moment().unix()
     const limit = req.query.limit || 100
-    const show_recurrent = req.query.show_recurrent || true
-    res.json(await eventController._select(start, limit, show_recurrent))
-    // const filter_tags = req.query.tags || ''
-    // const filter_places = req.query.places || ''
+    res.json(await eventController._select(start, limit))
+  },
 
-    // debug(`select limit:${limit} rec:${show_recurrent} tags:${filter_tags} places:${filter_places}`)
-    // let where_tags = {}
-    // const where = {
-    //   // confirmed event only
-    //   is_visible: true,
-    //   start_datetime: { [Op.gt]: start },
-    //   recurrent: null
-    // }
+  /**
+   * Ensure we have at least 3 instances of recurrent events
+   */
+  _createRecurrentOccurrence (e) {
+    const event = {
+      parentId: e.id,
+      title: e.title,
+      description: e.description,
+      image_path: e.image_path,
+      is_visible: e.is_visible,
+      userId: e.userId,
+      placeId: e.placeId
+    }
 
-    // if (filter_tags) {
-    //   where_tags = { where: { tag: filter_tags.split(',') } }
-    // }
+    const recurrent = e.recurrent
+    let left = 3 - e.child.length
+    const start = e.child.length ? moment.unix(e.child[e.child.length - 1].start_datetime) : moment()
+    let cursor = start.startOf('week')
+    const start_date = moment.unix(e.start_datetime)
+    const duration = moment.unix(e.end_datetime).diff(start_date, 's')
+    const frequency = recurrent.frequency
+    const days = recurrent.days
+    const type = recurrent.type
 
-    // if (filter_places) {
-    //   where.placeId = filter_places.split(',')
-    // }
+    // default frequency is '1d' => each day
+    const toAdd = { n: 1, unit: 'day' }
 
-    // let events = await Event.findAll({
-    //   where,
-    //   limit,
-    //   attributes: {
-    //     exclude: ['slug', 'likes', 'boost', 'userId', 'is_visible', 'description', 'createdAt', 'updatedAt', 'placeId']
-    //     // include: [[Sequelize.fn('COUNT', Sequelize.col('activitypub_id')), 'ressources']]
-    //   },
-    //   order: ['start_datetime', [Tag, 'weigth', 'DESC']],
-    //   include: [
-    //     { model: Resource, required: false, attributes: ['id'] },
-    //     { model: Tag, ...where_tags, attributes: ['tag'], through: { attributes: [] } },
-    //     { model: Place, required: false, attributes: ['id', 'name', 'address'] }
-    //   ]
-    // })
+    // each week or 2 (search for the first specified day)
+    if (frequency === '1w' || frequency === '2w') {
+      cursor.add(days[0] - 1, 'day')
+      if (frequency === '2w') {
+        const nWeeks = cursor.diff(e.start_datetime, 'w') % 2
+        if (!nWeeks) { cursor.add(1, 'week') }
+      }
+      toAdd.n = Number(frequency[0])
+      toAdd.unit = 'week'
+    }
 
-    // let recurrentEvents = []
-    // events = _.map(events, e => e.get())
-    // if (show_recurrent) {
-    //   recurrentEvents = await eventController.addRecurrent(moment.unix(start), where.placeId, where_tags, limit)
-    //   events = _.concat(events, recurrentEvents)
-    // }
+    cursor.set('hour', start_date.hour()).set('minute', start_date.minutes())
 
-    // // flat tags
-    // events = _(events).map(e => {
-    //   e.tags = e.tags.map(t => t.tag)
-    //   return e
-    // })
+    // each month or 2
+    if (frequency === '1m' || frequency === '2m') {
+      // find first match
+      toAdd.n = 1
+      toAdd.unit = 'month'
+      if (type === 'weekday') {
 
-    // res.json(events.sort((a, b) => a.start_datetime - b.start_datetime))
+      } else if (type === 'ordinal') {
+
+      }
+    }
+
+    // add event at specified frequency
+    while (true) {
+      if (!left) { break }
+      left -= 1
+      const first_event_of_week = cursor.clone()
+      days.forEach(d => {
+        debug(cursor)
+        if (type === 'ordinal') {
+          cursor.date(d)
+        } else {
+          cursor.day(d - 1)
+        }
+        event.start_datetime = cursor.unix()
+        event.end_datetime = event.start_datetime + duration
+        Event.create(event)
+        cursor.set('hour', start_date.hour()).set('minute', start_date.minutes())
+      })
+      cursor = first_event_of_week.add(toAdd.n, toAdd.unit)
+    }
+  },
+
+  /**
+   * Create instances of recurrent events
+   * Remove old
+   * @param {*} start_datetime
+   */
+  async _createRecurrent (start_datetime = moment().unix()) {
+    // select recurrent events
+    const events = await Event.findAll({
+      where: { is_visible: true, recurrent: { [Op.ne]: null } },
+      include: [{ model: Event, as: 'child', required: false, where: { start_datetime: { [Op.gt]: start_datetime } } }],
+      order: ['start_datetime']
+    })
+
+    const creations = []
+    events
+      .filter(e => e.child && e.child.length < 3)
+      .forEach(e => {
+        eventController._createRecurrentOccurrence(e)
+      })
+
+    return Promise.all(creations)
   }
-
 }
 
 module.exports = eventController
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index d661bca8..172a2b7f 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -7,6 +7,7 @@ const config = require('config')
 const mail = require('../mail')
 const { user: User, event: Event, tag: Tag, place: Place } = require('../models')
 const settingsController = require('./settings')
+const eventController = require('./event')
 const debug = require('debug')('user:controller')
 
 const userController = {
@@ -89,6 +90,12 @@ const userController = {
         await event.setUser(req.user)
       }
 
+      // create recurrent instances of event if needed
+      // without waiting for the task manager
+      if (event.recurrent) {
+        eventController._createRecurrent()
+      }
+
       // return created event to the client
       res.json(event)
 
@@ -155,7 +162,7 @@ const userController = {
     if (!user) { return res.sendStatus(200) }
 
     user.recover_code = crypto.randomBytes(16).toString('hex')
-    mail.send(user.email, 'recover', { user, config })
+    mail.send(user.email, 'recover', { user, config }, req.settings.locale)
 
     await user.save()
     res.sendStatus(200)
diff --git a/server/api/mail.js b/server/api/mail.js
index 69fdec69..2837c8a3 100644
--- a/server/api/mail.js
+++ b/server/api/mail.js
@@ -1,6 +1,6 @@
 const Email = require('email-templates')
 const path = require('path')
-const moment = require('moment')
+const moment = require('moment-timezone')
 const config = require('config')
 const settings = require('./controller/settings')
 const debug = require('debug')('email')
diff --git a/server/api/models/event.js b/server/api/models/event.js
index d8883308..d86d389f 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -1,5 +1,5 @@
 const config = require('config')
-const moment = require('moment')
+const moment = require('moment-timezone')
 
 module.exports = (sequelize, DataTypes) => {
   const Event = sequelize.define('event', {
@@ -24,7 +24,7 @@ module.exports = (sequelize, DataTypes) => {
     image_path: DataTypes.STRING,
     is_visible: DataTypes.BOOLEAN,
     recurrent: DataTypes.JSON,
-    // parent: DataTypes.INTEGER
+    // parent: DataTypes.INTEGER,
     likes: { type: DataTypes.JSON, defaultValue: [] },
     boost: { type: DataTypes.JSON, defaultValue: [] }
   }, {})
@@ -35,6 +35,8 @@ module.exports = (sequelize, DataTypes) => {
     Event.belongsToMany(models.tag, { through: 'event_tags' })
     Event.belongsToMany(models.notification, { through: 'event_notification' })
     Event.hasMany(models.resource)
+    Event.hasMany(Event, { as: 'child', foreignKey: 'parentId' })
+    Event.belongsTo(models.event, { as: 'parent' })
   }
 
   Event.prototype.toNoteAP = function (username, follower = []) {
diff --git a/server/api/models/notification.js b/server/api/models/notification.js
index e8c06643..65645327 100644
--- a/server/api/models/notification.js
+++ b/server/api/models/notification.js
@@ -21,7 +21,6 @@ module.exports = (sequelize, DataTypes) => {
 
   Notification.associate = function (models) {
     Notification.belongsToMany(models.event, { through: 'event_notification' })
-    // associations can be defined here
   }
   return Notification
 }
diff --git a/server/index.js b/server/index.js
index 5195231c..fe0ca2ca 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,18 +1,19 @@
 const { Nuxt, Builder } = require('nuxt')
 
 // Import and Set Nuxt.js options
-const nuxt_config = require('../nuxt.config.js')
+const nuxtConfig = require('../nuxt.config.js')
 const config = require('config')
 const consola = require('consola')
+const { TaskManager } = require('./taskManager')
 
 async function main () {
-  nuxt_config.server = config.server
+  nuxtConfig.server = config.server
 
   // Init Nuxt.js
-  const nuxt = new Nuxt(nuxt_config)
+  const nuxt = new Nuxt(nuxtConfig)
 
   // Build only in dev mode
-  if (nuxt_config.dev) {
+  if (nuxtConfig.dev) {
     const builder = new Builder(nuxt)
     await builder.build()
   } else {
@@ -20,9 +21,11 @@ async function main () {
   }
   nuxt.listen()
   consola.info('Listen on %s:%d , visit me here => %s', config.server.host, config.server.port, config.baseurl)
+  TaskManager.start()
 
   // close connections/port/unix socket
   function shutdown () {
+    TaskManager.stop()
     nuxt.close(async () => {
       const db = require('./api/models')
       await db.sequelize.close()
diff --git a/server/migrations/20200127101541-event_parent.js b/server/migrations/20200127101541-event_parent.js
new file mode 100644
index 00000000..f2e4fc1d
--- /dev/null
+++ b/server/migrations/20200127101541-event_parent.js
@@ -0,0 +1,19 @@
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    // return Promise.resolve(1)
+    return queryInterface.addColumn('events', 'parentId', {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'events',
+        key: 'id'
+      },
+      onUpdate: 'CASCADE',
+      onDelete: 'SET NULL'
+    })
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.removeColumn('events', 'parentId')
+  }
+}
diff --git a/server/migrations/20200127113535-fix_recurrent.js b/server/migrations/20200127113535-fix_recurrent.js
new file mode 100644
index 00000000..691e6103
--- /dev/null
+++ b/server/migrations/20200127113535-fix_recurrent.js
@@ -0,0 +1,19 @@
+const { event: Event } = require('../api/models')
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    const events = await Event.findAll({})
+    const promises = events.map(e => {
+      return e.update({ recurrent: JSON.parse(e.recurrent) })
+    })
+    return Promise.all(promises)
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    const events = await Event.findAll({})
+    const promises = events.map(e => {
+      return e.update({ recurrent: JSON.stringify(e.recurrent) })
+    })
+    return Promise.all(promises)
+  }
+}
diff --git a/server/migrations/20200129173454-user_email_index.js b/server/migrations/20200129173454-user_email_index.js
index 009386d4..5d61f58a 100644
--- a/server/migrations/20200129173454-user_email_index.js
+++ b/server/migrations/20200129173454-user_email_index.js
@@ -8,12 +8,6 @@ module.exports = {
   },
 
   down: (queryInterface, Sequelize) => {
-    /*
-      Add reverting commands here.
-      Return a promise to correctly handle asynchronicity.
-
-      Example:
-      return queryInterface.dropTable('users');
-    */
+    return queryInterface.removeIndex('users', ['email'])
   }
-};
+}
diff --git a/server/taskManager.js b/server/taskManager.js
new file mode 100644
index 00000000..6b56df5c
--- /dev/null
+++ b/server/taskManager.js
@@ -0,0 +1,123 @@
+const debug = require('debug')('TaskManager')
+const eventController = require('./api/controller/event')
+// const notifier = require('./notifier')
+
+class Task {
+  constructor ({ name, removable = false, repeatEach = 1, method, args = [] }) {
+    this.name = name
+    this.removable = removable
+    this.repeatEach = repeatEach
+    this.processInNTick = repeatEach
+    this.method = method
+    this.args = args
+  }
+
+  process () {
+    --this.processInNTick
+    if (this.processInNTick > 0) {
+      return
+    }
+    this.processInNTick = this.repeatEach
+    try {
+      const ret = this.method.apply(this, this.args)
+      if (ret && typeof ret.then === 'function') {
+        ret.catch(e => debug('TASK ERROR ', this.name, e))
+      }
+    } catch (e) {
+      debug('TASK ERROR ', this.name, e)
+    }
+  }
+}
+
+/**
+ * Manage tasks:
+ * - Send emails
+ * - Send AP notifications
+ * - Create recurrent events
+ * - Sync AP federation profiles
+ */
+
+class TaskManager {
+  constructor () {
+    this.interval = 60 * 100
+    this.tasks = []
+  }
+
+  start (interval = 60 * 100) {
+    this.interval = interval
+    this.timeout = setTimeout(this.tick.bind(this), interval)
+  }
+
+  stop () {
+    if (this.timeout) {
+      debug('STOP')
+      clearTimeout(this.timeout)
+      this.timeout = false
+    }
+  }
+
+  add (task) {
+    debug('ADD TASK ', task.name)
+    this.tasks.push(task)
+  }
+
+  process () {
+    if (!this.tasks.length) {
+      return
+    }
+
+    this.tasks = this.tasks
+      .filter(async task => {
+        if (task.removable) {
+          await task.process()
+        } else {
+          return task
+        }
+      })
+
+    return Promise.all(this.tasks.map(task => task.process()))
+  }
+
+  async tick () {
+    debug('TICK')
+    await this.process()
+    this.timeout = setTimeout(this.tick.bind(this), this.interval)
+  }
+}
+
+const TS = new TaskManager()
+
+// create and clean recurrent events
+TS.add(new Task({
+  name: 'RECURRENT_EVENT',
+  method: eventController._createRecurrent,
+  repeatEach: 10
+}))
+
+// daily morning notification
+// TS.add(new Task({
+//   name: 'NOTIFICATION',
+//   method: notifier._daily,
+//   repeatEach: 1
+// }))
+
+// AP users profile sync
+// TaskManager.add(new Task({
+//   name: 'AP_PROFILE_SYNC',
+//   method: federation._sync,
+//   repeatEach: 60 * 24
+// }))
+
+// Search for places position via nominatim
+// TaskManager.add(new Task({
+//   name: 'NOMINATIM_QUERY',
+//   method: places._nominatimQuery,
+//   repeatEach: 60
+// }))
+
+// TS.start()
+// TS.add(new Task({ name: 'removable #1', method: daje, args: ['removable #1'], removable: true }))
+// TS.add(new Task({ name: 'non removable #2', method: daje, args: ['non removable #2'] }))
+// TS.add(new Task({ name: 'non removable and repeat each #2', method: daje, args: ['nn rm and rpt #5'], repeatEach: 5 }))
+
+module.exports = { Task, TaskManager: TS }
diff --git a/store/index.js b/store/index.js
index bdc16268..f29e9982 100644
--- a/store/index.js
+++ b/store/index.js
@@ -44,7 +44,7 @@ export const getters = {
       if (!state.filters.show_past_events && e.past) { return false }
 
       // filter recurrent events
-      if (!state.filters.show_recurrent_events && e.recurrent) { return false }
+      if (!state.filters.show_recurrent_events && e.parentId) { return false }
 
       if (search_for_places) {
         if (search_place_ids.includes(e.place.id)) {
@@ -72,7 +72,7 @@ export const getters = {
       const match = false
 
       // filter recurrent events
-      if (!state.filters.show_recurrent_events && e.recurrent) { return false }
+      if (!state.filters.show_recurrent_events && e.parentId) { return false }
 
       if (!match && search_for_places) {
         if (find(state.filters.places, p => p.id === e.place.id)) { return true }

From 00c35650d03224a1cbd4570b0724a104bc879413 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 30 Jan 2020 12:39:32 +0100
Subject: [PATCH 11/14] oauth fillUser

---
 server/api/auth.js  | 7 +++++++
 server/api/index.js | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/server/api/auth.js b/server/api/auth.js
index a1a82a87..a138aedc 100644
--- a/server/api/auth.js
+++ b/server/api/auth.js
@@ -10,6 +10,13 @@ const Auth = {
     return oauth.oauthServer.authenticate()(req, res, next)
   },
 
+  fillUser (req, res, next) {
+    oauth.oauthServer.authenticate()(req, res, () => {
+      req.user = res.locals.oauth.token.user
+      next()
+    })
+  },
+
   /** isAdmin middleware */
   isAdmin (req, res, next) {
     oauth.oauthServer.authenticate()(req, res, () => {
diff --git a/server/api/index.js b/server/api/index.js
index b9cc31ff..af481a81 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -2,7 +2,7 @@ const express = require('express')
 const multer = require('multer')
 const cors = require('cors')()
 
-const { isAuth, isAdmin, hasPerm } = require('./auth')
+const { isAuth, isAdmin, hasPerm, fillUser } = require('./auth')
 const eventController = require('./controller/event')
 const exportController = require('./controller/export')
 const userController = require('./controller/user')
@@ -46,7 +46,7 @@ api.get('/users', isAdmin, userController.getAll)
 api.put('/place', isAdmin, eventController.updatePlace)
 
 // add event
-api.post('/user/event', upload.single('image'), userController.addEvent)
+api.post('/user/event', fillUser, upload.single('image'), userController.addEvent)
 
 // update event
 api.put('/user/event', hasPerm('event:write'), upload.single('image'), userController.updateEvent)

From 53e7a31c97a17c9ad73fb708ef7390f01cb97093 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 30 Jan 2020 14:51:34 +0100
Subject: [PATCH 12/14] minor

---
 pages/event/_id.vue   | 7 +++++--
 server/taskManager.js | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 2df22e47..16047b39 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -341,8 +341,11 @@ export default {
 
   .menu {
     border-right: none;
-    border-left: 1px solid #e6e6e6;
     background-color: transparent;
+  }
+
+  div.menu {
+    border-left: 1px solid #e6e6e6;
     p {
       margin-left: 10px;
     }
@@ -416,7 +419,7 @@ export default {
 @media only screen and (max-width: 768px) {
   #eventDetail {
     .menu {
-      border: 0px;
+      border: 0px !important;
     }
 
     .title {
diff --git a/server/taskManager.js b/server/taskManager.js
index 6b56df5c..cc07bd14 100644
--- a/server/taskManager.js
+++ b/server/taskManager.js
@@ -39,11 +39,11 @@ class Task {
 
 class TaskManager {
   constructor () {
-    this.interval = 60 * 100
+    this.interval = 60 * 1000
     this.tasks = []
   }
 
-  start (interval = 60 * 100) {
+  start (interval = 60 * 1000) {
     this.interval = interval
     this.timeout = setTimeout(this.tick.bind(this), interval)
   }

From d5ccd686405381bbfbf90c5638719d19e415775c Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 30 Jan 2020 14:55:32 +0100
Subject: [PATCH 13/14] recurrent event instance could not be removed but
 disabled

---
 pages/event/eventAdmin.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pages/event/eventAdmin.vue b/pages/event/eventAdmin.vue
index f0294398..d2bbb9ce 100644
--- a/pages/event/eventAdmin.vue
+++ b/pages/event/eventAdmin.vue
@@ -5,8 +5,7 @@ div
     el-menu-item
       div(v-if='event.is_visible' @click='toggle(false)') <i class='el-icon-open'/> {{$t('common.hide')}}
       div(v-else @click='toggle(false)') <i class='el-icon-turn-off'/> {{$t('common.confirm')}}
-    el-menu-item
-      div(@click='remove(false)') <i class='el-icon-delete'/> {{$t('common.remove')}}
+    el-menu-item(v-if='!event.parentId' @click='remove(false)') <i class='el-icon-delete'/> {{$t('common.remove')}}
     el-menu-item(@click='$router.replace(`/add/${event.id}`)') <i class='el-icon-edit'/> {{$t('common.edit')}}
     div(v-if='event.parentId')
       el-divider  {{$t('event.recurrent')}}

From 493d2c6c527ac0751d32ca56e4a59ee149b0381a Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 30 Jan 2020 15:03:33 +0100
Subject: [PATCH 14/14] update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0b6c7326..d0a304c8 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "@nuxtjs/eslint-config": "^2.0.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.9.0",
+    "eslint-config-prettier": "^6.10.0",
     "eslint-config-standard": ">=14.1.0",
     "eslint-loader": "^3.0.3",
     "eslint-plugin-import": ">=2.20.0",