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

fix recurrent events

Browse Source
This commit is contained in:
les
2019-09-11 23:17:12 +02:00
parent 2bbb1805f3
commit 3bc9f63bd3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/api/controller/event.js
View File

@@ -6,6 +6,7 @@ const { event: Event, comment: Comment, tag: Tag, place: Place, user: User, noti
const Sequelize = require('sequelize') const Sequelize = require('sequelize')
const notifier = require('../../notifier') const notifier = require('../../notifier')
const federation = require('../../federation/helpers') const federation = require('../../federation/helpers')
const debug = require('debug')('controller:event')
const eventController = { const eventController = {
@@ -225,7 +226,7 @@ const eventController = {
// build singular events from a recurrent pattern // build singular events from a recurrent pattern
function createEventsFromRecurrent (e, dueTo = null) { function createEventsFromRecurrent (e, dueTo = null) {
const events = [] const events = []
const recurrent = JSON.parse(e.recurrent) const recurrent = e.recurrent
if (!recurrent.frequency) { return false } if (!recurrent.frequency) { return false }
let cursor = moment(start).startOf('week') let cursor = moment(start).startOf('week')
@@ -284,8 +285,8 @@ const eventController = {
return events return events
} }
let allEvents = events.filter(e => !e.recurrent) let allEvents = events.filter(e => !e.recurrent || e.recurrent.length === 0)
events.filter(e => e.recurrent).forEach(e => { events.filter(e => e.recurrent && e.recurrent.length).forEach(e => {
const events = createEventsFromRecurrent(e, end) const events = createEventsFromRecurrent(e, end)
if (events) { allEvents = allEvents.concat(events) } if (events) { allEvents = allEvents.concat(events) }
}) })