From c68e42ad329fe673eb3d88c815b1a1b03d5c5c4d Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Tue, 27 Jul 2021 22:01:34 +0200
Subject: [PATCH] fix show_recurrent in embed list

---
 pages/embed/list.vue            | 2 ++
 server/api/controller/export.js | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/pages/embed/list.vue b/pages/embed/list.vue
index 78f698f6..ad54fc5c 100644
--- a/pages/embed/list.vue
+++ b/pages/embed/list.vue
@@ -11,10 +11,12 @@ export default {
     const title = query.title
     const tags = query.tags
     const places = query.places
+    const show_recurrent = !!query.show_recurrent
 
     let params = []
     if (places) { params.push(`places=${places}`) }
     if (tags) { params.push(`tags=${tags}`) }
+    if (show_recurrent) { params.push('show_recurrent=1') }
 
     params = params.length ? `?${params.join('&')}` : ''
     const events = await $axios.$get(`/export/json${params}`)
diff --git a/server/api/controller/export.js b/server/api/controller/export.js
index 30768f8a..b8616557 100644
--- a/server/api/controller/export.js
+++ b/server/api/controller/export.js
@@ -12,6 +12,7 @@ const exportController = {
     const type = req.params.type
     const tags = req.query.tags
     const places = req.query.places
+    const show_recurrent = !!req.query.show_recurrent
 
     const where = {}
     const yesterday = moment().subtract('1', 'day').unix()
@@ -25,6 +26,10 @@ const exportController = {
       where.placeId = places.split(',')
     }
 
+    if (!show_recurrent) {
+      where.parentId = null
+    }
+
     const events = await Event.findAll({
       order: ['start_datetime'],
       attributes: { exclude: ['is_visible', 'recurrent', 'createdAt', 'likes', 'boost', 'userId', 'placeId'] },