From 88145867ae1da6bd9d2662f1855a7dd2c871dd5d Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Sun, 27 Nov 2022 03:38:05 +0100
Subject: [PATCH 01/38] feat/add_user_theme_view_controls: yarn add
 cookie-universal-nuxt , to allow users to choose the lightness of the theme
 and the compactness of the view on events

---
 components/Event.vue     | 11 +++++---
 components/ThemeView.vue | 54 ++++++++++++++++++++++++++++++++++++++++
 layouts/default.vue      |  7 +++++-
 nuxt.config.js           |  6 +++--
 package.json             |  1 +
 pages/index.vue          | 19 ++++++++++----
 yarn.lock                | 23 +++++++++++++++--
 7 files changed, 108 insertions(+), 13 deletions(-)
 create mode 100644 components/ThemeView.vue

diff --git a/components/Event.vue b/components/Event.vue
index 905e34fb..72b7f211 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 v-card.h-event.event.d-flex(itemscope itemtype="https://schema.org/Event")
   nuxt-link(:to='`/event/${event.slug || event.id}`' itemprop="url")
-    MyPicture(v-if='!settings.hide_thumbs' :event='event' thumb :lazy='lazy')
+    MyPicture(v-if='!hide_thumbs' :event='event' thumb :lazy='lazy')
     v-icon.float-right.mr-1(v-if='event.parentId' color='success' v-text='mdiRepeat')
     .title.p-name(itemprop="name") {{ event.title }}
 
@@ -22,8 +22,13 @@ import MyPicture from '~/components/MyPicture'
 import { mdiRepeat, mdiCalendar, mdiMapMarker } from '@mdi/js'
 
 export default {
-  data() {
-    return { mdiRepeat, mdiMapMarker, mdiCalendar }
+  data({ $store }) {
+    return { mdiRepeat, mdiMapMarker, mdiCalendar,
+      // user can't see hidden thumbs
+      hide_thumbs: this.$cookies.get('theme.hide_thumbs') || $store.state.settings.hide_thumbs
+      // user can override
+      // hide_thumbs: this.$cookies.get('theme.hide_thumbs')
+    }
   },
   components: {
     MyPicture
diff --git a/components/ThemeView.vue b/components/ThemeView.vue
new file mode 100644
index 00000000..af66fe92
--- /dev/null
+++ b/components/ThemeView.vue
@@ -0,0 +1,54 @@
+<template lang="pug">
+div.p-0.m-0.d-flex.justify-end(:key='reload')
+  v-icon.ml-5(@click='_is_dark()' v-text='mdiContrastCircle')
+  v-icon.ml-5(@click='_hide_thumbs()' v-text='!hide_thumbs ?  mdiViewList : mdiViewModule')
+
+</template>
+
+<script>
+import { mapActions, mapState } from 'vuex'
+import { mdiViewModule, mdiViewList, mdiContrastCircle } from '@mdi/js'
+
+export default {
+  name: 'ThemeView',
+  data ({ $store }) {
+    return {
+      mdiViewModule, mdiViewList, mdiContrastCircle,
+      reload: 0
+    }
+  },
+  methods: {
+    ...mapState(['settings']),
+    async _is_dark() {
+      this.$vuetify.theme.dark = !this.$vuetify.theme.dark
+      await this.$cookies.set('theme.is_dark', this.$vuetify.theme.dark, {
+        path: '/',
+        maxAge: 60 * 60 * 24 * 7
+      })
+    },
+    async _hide_thumbs() {
+      const theme_hide_thumbs = await this.$cookies.get('theme.hide_thumbs')
+      if (theme_hide_thumbs != null) {
+        this.hide_thumbs = !theme_hide_thumbs
+      } else {
+        this.hide_thumbs = !$store.state.settings.hide_thumbs
+      }
+      await this.$cookies.set('theme.hide_thumbs', this.hide_thumbs, {
+        path: '/',
+        maxAge: 60 * 60 * 24 * 7
+      })
+      await this.reload++
+      this.$root.$emit('layout_loaded', true)
+    },
+    async hide_thumbs () {
+      const hide_thumbs = await this.$cookies.get('theme.hide_thumbs')
+      if (hide_thumbs != null) {
+        this.hide_thumbs = hide_thumbs
+      } else {
+        this.hide_thumbs = $store.state.settings.hide_thumbs
+      }
+      return hide_thumbs
+    }
+  }
+}
+</script>
diff --git a/layouts/default.vue b/layouts/default.vue
index a8d5dad1..54e41b8d 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -32,7 +32,12 @@ export default {
   components: { Appbar, Snackbar, Footer, Confirm },
   computed: mapState(['settings']),
   created () {
-    this.$vuetify.theme.dark = this.settings['theme.is_dark']
+    const theme_is_dark = this.$cookies.get('theme.is_dark')
+    if ( theme_is_dark != null ) {
+      this.$vuetify.theme.dark = theme_is_dark
+    } else {
+      this.$vuetify.theme.dark = this.settings['theme.is_dark']
+    }
   }
 }
 </script>
diff --git a/nuxt.config.js b/nuxt.config.js
index ca906ce0..fe7478ef 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -54,7 +54,8 @@ module.exports = {
     'nuxt-i18n',
     '@nuxtjs/axios',
     '@nuxtjs/auth',
-    '@nuxtjs/sitemap'
+    '@nuxtjs/sitemap',
+    ['cookie-universal-nuxt', { alias: 'cookies' }],
   ],
 
   sitemap: {
@@ -89,7 +90,7 @@ module.exports = {
     })),
     vueI18n: {
       fallbackLocale: 'en'
-    },    
+    },
     langDir: 'locales',
     lazy: true,
     strategy: 'no_prefix',
@@ -135,6 +136,7 @@ module.exports = {
       }
     }
   },
+
   buildModules: ['@nuxtjs/vuetify'],
   vuetify: {
     treeShake: true,
diff --git a/package.json b/package.json
index d27de491..23292f49 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.0",
     "cookie-parser": "^1.4.6",
+    "cookie-universal-nuxt": "^2.2.2",
     "cors": "^2.8.5",
     "dayjs": "^1.11.5",
     "dompurify": "^2.4.1",
diff --git a/pages/index.vue b/pages/index.vue
index b127c77a..21703139 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,12 +1,16 @@
 <template lang="pug">
 v-container.px-2.px-sm-6.pt-0
 
+  //- View
+  #themeview.mt-sm-4.mt-2
+    ThemeView
+
   //- Announcements
   #announcements.mt-2.mt-sm-4(v-if='announcements.length')
     Announcement(v-for='announcement in announcements' :key='`a_${announcement.id}`' :announcement='announcement')
 
   //- Events
-  #events.mt-sm-4.mt-2
+  #events.mt-sm-4.mt-2(:key="reload_events")
     Event(:event='event' v-for='(event, idx) in visibleEvents' :lazy='idx>2' :key='event.id')
 </template>
 
@@ -16,11 +20,12 @@ import debounce from 'lodash/debounce'
 import dayjs from 'dayjs'
 import Event from '@/components/Event'
 import Announcement from '@/components/Announcement'
+import ThemeView from '@/components/ThemeView'
 import { mdiMagnify, mdiCloseCircle } from '@mdi/js'
 
 export default {
   name: 'Index',
-  components: { Event, Announcement },
+  components: { Event, Announcement, ThemeView },
   middleware: 'setup',
   async fetch () {
     return this.getEvents()
@@ -29,7 +34,7 @@ export default {
     if (this.$fetchState.timestamp <= Date.now() - 60000) {
       this.$fetch();
     }
-  },  
+  },
   data ({ $store }) {
     return {
       mdiMagnify, mdiCloseCircle,
@@ -42,7 +47,8 @@ export default {
       tmpEvents: [],
       selectedDay: null,
       show_recurrent: $store.state.settings.recurrent_event_visible,
-    }
+      reload_events: 0
+      }
   },
   head () {
     return {
@@ -84,6 +90,9 @@ export default {
     this.$root.$on('dayclick', this.dayChange)
     this.$root.$on('monthchange', this.monthChange)
     this.$root.$on('search', debounce(this.search, 100))
+    this.$root.$on('layout_loaded', () => {
+        this.reload_events++
+    })
   },
   destroyed () {
     this.$root.$off('dayclick')
@@ -137,4 +146,4 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/yarn.lock b/yarn.lock
index 60c7b702..584c36f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1861,6 +1861,11 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/cookie@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
+  integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==
+
 "@types/debug@^4.1.7":
   version "4.1.7"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
@@ -3810,6 +3815,22 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
+cookie-universal-nuxt@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.2.2.tgz#107815f03f5b769de7018670d6370368205387bb"
+  integrity sha512-Pr6P5UCzl1EAvPh7z7jFkknBw0KTdykm6gFmPHrH4LV9s3flVmAH0ZP/ZqUXcp6b0SKZfizkn+XR1cO+QinGhQ==
+  dependencies:
+    "@types/cookie" "^0.3.3"
+    cookie-universal "^2.2.2"
+
+cookie-universal@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.2.2.tgz#415a4d67b6f7f0819c4914cd69b8c2f496111d30"
+  integrity sha512-nUXF6HH2YKbn8vGcdSzWJhjRkDHbnbekuVu2nsRu00zYsX7o/H3xGJRlPVoM4wX/8cpJYpyi9nDt+boER0Wjug==
+  dependencies:
+    "@types/cookie" "^0.3.3"
+    cookie "^0.4.0"
+
 cookie@0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
@@ -12622,10 +12643,8 @@ watchpack@^1.7.4:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
   integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
-    chokidar "^3.4.1"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
-    watchpack-chokidar2 "^2.0.1"
   optionalDependencies:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"

From a535e9c2159be3f437c8775ff6a5aad02557a1c3 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Tue, 29 Nov 2022 17:59:40 +0100
Subject: [PATCH 02/38] feat/add_user_theme_view_controls: do not display icon
 if thumbs are disabled

---
 components/Event.vue     |  3 ---
 components/ThemeView.vue | 24 +++++++++---------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/components/Event.vue b/components/Event.vue
index 72b7f211..0f253f72 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -24,10 +24,7 @@ import { mdiRepeat, mdiCalendar, mdiMapMarker } from '@mdi/js'
 export default {
   data({ $store }) {
     return { mdiRepeat, mdiMapMarker, mdiCalendar,
-      // user can't see hidden thumbs
       hide_thumbs: this.$cookies.get('theme.hide_thumbs') || $store.state.settings.hide_thumbs
-      // user can override
-      // hide_thumbs: this.$cookies.get('theme.hide_thumbs')
     }
   },
   components: {
diff --git a/components/ThemeView.vue b/components/ThemeView.vue
index af66fe92..b75da049 100644
--- a/components/ThemeView.vue
+++ b/components/ThemeView.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 div.p-0.m-0.d-flex.justify-end(:key='reload')
   v-icon.ml-5(@click='_is_dark()' v-text='mdiContrastCircle')
-  v-icon.ml-5(@click='_hide_thumbs()' v-text='!hide_thumbs ?  mdiViewList : mdiViewModule')
+  v-icon.ml-5(@click='_hide_thumbs()' v-if="!hide_thumbs" v-text='!hide_thumbs_icon ?  mdiViewList : mdiViewModule')
 
 </template>
 
@@ -14,6 +14,8 @@ export default {
   data ({ $store }) {
     return {
       mdiViewModule, mdiViewList, mdiContrastCircle,
+      hide_thumbs: $store.state.settings.hide_thumbs,
+      hide_thumbs_icon: $store.state.settings.hide_thumbs,
       reload: 0
     }
   },
@@ -27,28 +29,20 @@ export default {
       })
     },
     async _hide_thumbs() {
-      const theme_hide_thumbs = await this.$cookies.get('theme.hide_thumbs')
+      let theme_hide_thumbs = await this.$cookies.get('theme.hide_thumbs')
       if (theme_hide_thumbs != null) {
-        this.hide_thumbs = !theme_hide_thumbs
+        theme_hide_thumbs = !theme_hide_thumbs
       } else {
-        this.hide_thumbs = !$store.state.settings.hide_thumbs
+        theme_hide_thumbs = !this.settings.hide_thumbs
       }
-      await this.$cookies.set('theme.hide_thumbs', this.hide_thumbs, {
+      await this.$cookies.set('theme.hide_thumbs', theme_hide_thumbs, {
         path: '/',
         maxAge: 60 * 60 * 24 * 7
       })
-      await this.reload++
+      this.hide_thumbs_icon = theme_hide_thumbs
+      this.reload++
       this.$root.$emit('layout_loaded', true)
     },
-    async hide_thumbs () {
-      const hide_thumbs = await this.$cookies.get('theme.hide_thumbs')
-      if (hide_thumbs != null) {
-        this.hide_thumbs = hide_thumbs
-      } else {
-        this.hide_thumbs = $store.state.settings.hide_thumbs
-      }
-      return hide_thumbs
-    }
   }
 }
 </script>

From 8f07147ca9b7eef374d9244087831858ed2768a7 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Tue, 29 Nov 2022 20:21:27 +0100
Subject: [PATCH 03/38] feat/add_user_theme_view_controls: minor on
 compact/list icon

---
 components/ThemeView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ThemeView.vue b/components/ThemeView.vue
index b75da049..ff34e658 100644
--- a/components/ThemeView.vue
+++ b/components/ThemeView.vue
@@ -15,7 +15,7 @@ export default {
     return {
       mdiViewModule, mdiViewList, mdiContrastCircle,
       hide_thumbs: $store.state.settings.hide_thumbs,
-      hide_thumbs_icon: $store.state.settings.hide_thumbs,
+      hide_thumbs_icon: $store.state.settings.hide_thumbs || this.$cookies.get('theme.hide_thumbs'),
       reload: 0
     }
   },

From ca94c730a6eb3011ac4e5f6bd0d319ab23973f2f Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 10 Jan 2023 17:58:03 +0100
Subject: [PATCH 04/38] add nodejs v18 compatibility

---
 CHANGELOG         | 10 +++++++---
 package.json      |  7 ++++---
 tests/app.test.js | 30 +++++++++++++++++++++++++++++-
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5b72fad8..5e3f721a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,12 @@
 All notable changes to this project will be documented in this file.
 
-### 
-
-  - models initialization refactored, better dev xperience as backend hmr is working
+### UNRELEASED
+  - models initialization refactored, better dev experience as backend hmr is working
+  - add swipe gesture to move to next/prev event
+  - fix refresh collections, fix #219
+  - add russian translation (thanks @drunkod)
+  - refactor search / filter / selection fix #225, 227, #224
+  - add nodejs v18 compatibility
 
 ### 1.6.1 - 15 dec '22
   - allow edit tags in admin panel, fix #170
diff --git a/package.json b/package.json
index 461ab87a..cb8ff930 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,9 @@
   "description": "A shared agenda for local communities",
   "author": "lesion",
   "scripts": {
-    "build": "nuxt build --modern",
+    "build": "export NODE_OPTIONS=--openssl-legacy-provider; nuxt build --modern",
     "start:inspect": "NODE_ENV=production node --inspect node_modules/.bin/nuxt start --modern",
-    "dev": "nuxt dev",
+    "dev": "export NODE_OPTIONS=--openssl-legacy-provider; nuxt dev",
     "test-sqlite": "export NODE_ENV=test; export DB=sqlite; jest --testEnvironment=jest-environment-node --bail=1",
     "test-mariadb": "export NODE_ENV=test; export DB=mariadb; jest --testEnvironment=jest-environment-node --bail=1",
     "test-postgresql": "export NODE_ENV=test; export DB=postgresql; jest --testEnvironment=jest-environment-node --bail=1",
@@ -27,10 +27,11 @@
     "locales/",
     "store/",
     ".nuxt/",
+    "gancio_plugins",
     "yarn.lock"
   ],
   "engines": {
-    "node": ">=14 <=16"
+    "node": ">=14 <=18"
   },
   "dependencies": {
     "@mdi/js": "^7.1.96",
diff --git a/tests/app.test.js b/tests/app.test.js
index b55656f9..0a008d04 100644
--- a/tests/app.test.js
+++ b/tests/app.test.js
@@ -415,5 +415,33 @@ describe('Collection', () => {
     expect(response.body.length).toBe(1)
 
   })
-
+})
+
+describe('Geocoding', () => {
+  test('should not be enabled by default', async () => {
+    await request(app)
+      .post('/api/settings')
+      .send({ key: 'allow_geolocation', value: false })
+      .auth(token.access_token, { type: 'bearer' })
+      .expect(200)
+
+    const response = await request(app).get('/api/placeOSM/Nominatim/test')
+      .expect(403)
+
+    expect(response.body).toBeDefined()
+
+  })
+
+  test('should geocode when enabled', async () => {
+    await request(app)
+      .post('/api/settings')
+      .send({ key: 'allow_geolocation', value: true })
+      .auth(token.access_token, { type: 'bearer' })
+      .expect(200)
+
+    const response = await request(app).get('/api/placeOSM/Nominatim/test')
+      .expect(200)
+
+    expect(response.body).toBeDefined()
+  })
 })

From 8b9a07c4e9b0215f693803047fb754cdb87a8f32 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 10 Jan 2023 17:58:19 +0100
Subject: [PATCH 05/38] minor on calendar

---
 components/Calendar.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/Calendar.vue b/components/Calendar.vue
index 397fb635..cee0d865 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -66,6 +66,16 @@ export default {
 </script>
 
 <style>
+.vc-container.vc-is-dark {
+  --gray-900: #111;
+  --gray-700: #333;
+}
+
+.vc-container {
+  --gray-400: #999 !important;
+  --rounded-lg: 4px !important;
+}
+
 .vc-opacity-0 {
   opacity: 0.3 !important;
 }

From 2a59e45a3cfacd201908180ff6dd2e636b874f5a Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 10 Jan 2023 18:07:56 +0100
Subject: [PATCH 06/38] revert

---
 CHANGELOG    | 1 -
 package.json | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5e3f721a..9a944f1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,6 @@ All notable changes to this project will be documented in this file.
   - fix refresh collections, fix #219
   - add russian translation (thanks @drunkod)
   - refactor search / filter / selection fix #225, 227, #224
-  - add nodejs v18 compatibility
 
 ### 1.6.1 - 15 dec '22
   - allow edit tags in admin panel, fix #170
diff --git a/package.json b/package.json
index cb8ff930..1fc5f708 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,9 @@
   "description": "A shared agenda for local communities",
   "author": "lesion",
   "scripts": {
-    "build": "export NODE_OPTIONS=--openssl-legacy-provider; nuxt build --modern",
+    "build": "nuxt build --modern",
     "start:inspect": "NODE_ENV=production node --inspect node_modules/.bin/nuxt start --modern",
-    "dev": "export NODE_OPTIONS=--openssl-legacy-provider; nuxt dev",
+    "dev": "nuxt dev",
     "test-sqlite": "export NODE_ENV=test; export DB=sqlite; jest --testEnvironment=jest-environment-node --bail=1",
     "test-mariadb": "export NODE_ENV=test; export DB=mariadb; jest --testEnvironment=jest-environment-node --bail=1",
     "test-postgresql": "export NODE_ENV=test; export DB=postgresql; jest --testEnvironment=jest-environment-node --bail=1",
@@ -31,7 +31,7 @@
     "yarn.lock"
   ],
   "engines": {
-    "node": ">=14 <=18"
+    "node": ">=14 <=16"
   },
   "dependencies": {
     "@mdi/js": "^7.1.96",

From ded3c2fd98c97e984067822cf472822c27c37746 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 10 Jan 2023 18:15:33 +0100
Subject: [PATCH 07/38] isGeocodingEnabled

---
 server/api/index.js         |  6 ++++--
 server/api/models/models.js | 18 ++++++++++++++++++
 server/helpers.js           | 14 ++++++++++----
 server/taskManager.js       |  2 +-
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/server/api/index.js b/server/api/index.js
index a9a53ce9..49d0e61d 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -170,9 +170,11 @@ module.exports = () => {
     api.get('/places', isAdmin, placeController.getAll)
     api.get('/place/:placeName', cors, placeController.getEvents)
     api.get('/place', cors, placeController.search)
-    api.get('/placeOSM/Nominatim/:place_details', cors, placeController._nominatim)
-    api.get('/placeOSM/Photon/:place_details', cors, placeController._photon)
     api.put('/place', isAdmin, placeController.updatePlace)
+
+    // - GEOCODING
+    api.get('/placeOSM/Nominatim/:place_details', helpers.isGeocodingEnabled, placeController._nominatim)
+    api.get('/placeOSM/Photon/:place_details', helpers.isGeocodingEnabled, placeController._photon)
   
     // - TAGS
     api.get('/tags', isAdmin, tagController.getAll)
diff --git a/server/api/models/models.js b/server/api/models/models.js
index 0b46a05d..791c124b 100644
--- a/server/api/models/models.js
+++ b/server/api/models/models.js
@@ -1,2 +1,20 @@
 // export default models
+
+// Announcement: require('./announcement'),
+// APUser: require('./ap_user'),
+// Collection: require('./collection'),
+// Event: require('./event'),
+// EventNotification: require('./eventnotification'),
+// Filter: require('./filter'),
+// Instance: require('./instance'),
+// Notification: require('./notification'),
+// OAuthClient: require('./oauth_client'),
+// OAuthCode: require('./oauth_code'),
+// OAuthToken: require('./oauth_token'),
+// Place: require('./place'),
+// Resource: require('./resource'),
+// Setting: require('./setting'),
+// Tag: require('./tag'),
+// User: require('./user'),
+
 module.exports = {}
\ No newline at end of file
diff --git a/server/helpers.js b/server/helpers.js
index 17f6a289..fbd41bf5 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -1,6 +1,5 @@
 const ical = require('ical.js')
 const settingsController = require('./api/controller/settings')
-const acceptLanguage = require('accept-language')
 const express = require('express')
 const dayjs = require('dayjs')
 const timezone = require('dayjs/plugin/timezone')
@@ -15,7 +14,6 @@ const axios = require('axios')
 const crypto = require('crypto')
 const Microformats = require('microformat-node')
 const get = require('lodash/get')
-const cloneDeep = require('lodash/cloneDeep')
 
 const DOMPurify = require('dompurify')
 const { JSDOM } = require('jsdom')
@@ -119,9 +117,9 @@ module.exports = {
             log.warn(err)
           } else {
             res.status(404).send('Not found (but nice try 😊)')
-          // }
+          }
         }
-      }})
+      })
     })
 
     router.use('/fallbackimage.png', (req, res, next) => {
@@ -287,5 +285,13 @@ module.exports = {
       return res.redirect((accepted === 'application/rss+xml' ? '/feed/rss' : '/feed/ics') + req.path)
     }
     next()
+  },
+
+  async isGeocodingEnabled(req, res, next) {
+    if (res.locals.settings.allow_geolocation) {
+      next()
+    } else {
+      res.sendStatus(403)
+    }
   }
 }
diff --git a/server/taskManager.js b/server/taskManager.js
index 20e010db..c0385c70 100644
--- a/server/taskManager.js
+++ b/server/taskManager.js
@@ -1,5 +1,4 @@
 const log = require('./log')
-const eventController = require('./api/controller/event')
 const placeHelpers = require('./helpers/place')
 const tagHelpers = require('./helpers/tag')
 // const notifier = require('./notifier')
@@ -54,6 +53,7 @@ class TaskManager {
   }
 
   start (interval = loopInterval) {
+    const eventController = require('./api/controller/event')
 
     // create and clean recurrent events
     this.add(new Task({

From cd5c4fae29983e771bda10be2ae87f381c935d1c Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 10 Jan 2023 18:15:48 +0100
Subject: [PATCH 08/38] embed plugins

---
 server/api/controller/plugins.js | 55 ++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/server/api/controller/plugins.js b/server/api/controller/plugins.js
index 49833366..ea7ca532 100644
--- a/server/api/controller/plugins.js
+++ b/server/api/controller/plugins.js
@@ -84,32 +84,39 @@ const pluginController = {
     }
   },
 
+  _loadPlugin (pluginFile) {
+    try {
+      const plugin = require(pluginFile)
+      const name = plugin.configuration.name
+      console.log(`Found plugin '${name}'`)
+      pluginController.plugins.push(plugin)
+      if (settingsController.settings['plugin_' + name]) {
+        const pluginSetting = settingsController.settings['plugin_' + name]
+        if (pluginSetting.enable) {
+          pluginController.loadPlugin(name)
+        }
+      } else {
+        settingsController.set('plugin_' + name, { enable: false })
+      }
+    } catch (e) {
+      log.warn(`Unable to load plugin ${pluginFile}: ${String(e)}`)
+    }    
+  },
+
   _load() {
     // load custom plugins
-    const plugins_path = config.plugins_path || path.resolve(process.env.cwd || '', 'plugins')
-    log.info(`Loading plugin  ${plugins_path}`)
-    if (fs.existsSync(plugins_path)) {
-      const plugins = fs.readdirSync(plugins_path)
-        .map(e => path.resolve(plugins_path, e, 'index.js'))
-        .filter(index => fs.existsSync(index))
-      plugins.forEach(pluginFile => {
-        try {
-          const plugin = require(pluginFile)
-          const name = plugin.configuration.name
-          console.log(`Found plugin '${name}'`)
-          pluginController.plugins.push(plugin)
-          if (settingsController.settings['plugin_' + name]) {
-            const pluginSetting = settingsController.settings['plugin_' + name]
-            if (pluginSetting.enable) {
-              pluginController.loadPlugin(name)
-            }
-          } else {
-            settingsController.set('plugin_' + name, { enable: false })
-          }
-        } catch (e) {
-          log.warn(`Unable to load plugin ${pluginFile}: ${String(e)}`)
-        }
-      })
+    const system_plugins_path = path.resolve(__dirname || '', '../../../gancio_plugins')
+    const custom_plugins_path = config.plugins_path || path.resolve(process.env.cwd || '', 'plugins')
+    const plugins_paths = custom_plugins_path === system_plugins_path ? [custom_plugins_path] : [custom_plugins_path, system_plugins_path]
+
+    log.info(`Loading plugins from ${plugins_paths.join(' and ')}`)
+    for (const plugins_path of plugins_paths) {
+      if (fs.existsSync(plugins_path)) {
+        fs.readdirSync(plugins_path)
+          .map(e => path.resolve(plugins_path, e, 'index.js'))
+          .filter(index => fs.existsSync(index))
+          .forEach(pluginController._loadPlugin)
+      }
     }
   }
 }

From c3741238fc70958c2a2d0122e0fd09529cf4acf9 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 10 Jan 2023 18:16:11 +0100
Subject: [PATCH 09/38] minor with new models

---
 server/cli/accounts.js         | 6 +++---
 server/federation/ego.js       | 2 +-
 server/federation/index.js     | 6 ++----
 server/federation/resources.js | 4 +---
 server/federation/users.js     | 6 ++----
 server/federation/webfinger.js | 4 +---
 server/helpers/place.js        | 3 +--
 server/helpers/tag.js          | 6 +++---
 8 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/server/cli/accounts.js b/server/cli/accounts.js
index c1c9bca6..c248eee6 100644
--- a/server/cli/accounts.js
+++ b/server/cli/accounts.js
@@ -33,7 +33,7 @@ async function modify (args) {
 
 async function create (args) {
   await _initializeDB()
-  const User = require('../api/models/user')  
+  const { User } = require('../api/models/models')
   const user = await User.create({
     email: args.email,
     is_active: true,
@@ -46,7 +46,7 @@ async function create (args) {
 
 async function remove (args) {
   await _initializeDB()
-  const User = require('../api/models/user')  
+  const { User } = require('../api/models/models')
   const user = await User.findOne({
     where: { email: args.email }
   })
@@ -58,7 +58,7 @@ async function remove (args) {
 
 async function list () {
   await _initializeDB()
-  const User = require('../api/models/user')
+  const { User } = require('../api/models/models')
   const users = await User.findAll()
   console.log()
   users.forEach(u => console.log(`${u.id}\tadmin: ${u.is_admin}\tenabled: ${u.is_active}\temail: ${u.email}`))
diff --git a/server/federation/ego.js b/server/federation/ego.js
index 7c31182f..44ab0684 100644
--- a/server/federation/ego.js
+++ b/server/federation/ego.js
@@ -1,4 +1,4 @@
-const Event = require('../api/models/event')
+const { Event } = require('../api/models/models')
 const config = require('../config')
 const log = require('../log')
 
diff --git a/server/federation/index.js b/server/federation/index.js
index 0c00ece4..7a27a062 100644
--- a/server/federation/index.js
+++ b/server/federation/index.js
@@ -2,10 +2,8 @@ const express = require('express')
 const router = express.Router()
 const cors = require('cors')
 const Users = require('./users')
-const Event = require('../api/models/event')
-const User = require('../api/models/user')
-const Tag = require('../api/models/tag')
-const Place = require('../api/models/place')
+const { Event, User, Tag, Place } = require('../api/models/models')
+
 const settingsController =  require('../api/controller/settings')
 
 const Helpers = require('./helpers')
diff --git a/server/federation/resources.js b/server/federation/resources.js
index 195716c7..4c497635 100644
--- a/server/federation/resources.js
+++ b/server/federation/resources.js
@@ -1,6 +1,4 @@
-const Event = require('../api/models/event')
-const Resource = require('../api/models/resource')
-const APUser = require('../api/models/ap_user')
+const { Event, Resource, APUser } = require('../api/models/models')
 
 const log = require('../log')
 const helpers = require('../helpers')
diff --git a/server/federation/users.js b/server/federation/users.js
index 074ea0b3..b8ac73f4 100644
--- a/server/federation/users.js
+++ b/server/federation/users.js
@@ -1,7 +1,5 @@
-const Event = require('../api/models/event')
-const Place = require('../api/models/place')
-const APUser = require('../api/models/ap_user')
-const Tag = require('../api/models/tag')
+const { Event, Place, APUser, Tag } = require('../api/models/models')
+
 const escape = require('lodash/escape')
 const config = require('../config')
 const log = require('../log')
diff --git a/server/federation/webfinger.js b/server/federation/webfinger.js
index e6e4a091..a2869da9 100644
--- a/server/federation/webfinger.js
+++ b/server/federation/webfinger.js
@@ -1,8 +1,6 @@
 const express = require('express')
 const router = express.Router()
-const Event = require('../api/models/event')
-const Resource = require('../api/models/resource')
-const User = require('../api/models/user')
+const { Event, Resource, User } = require('../api/models/models')
 
 const cors = require('cors')
 const settingsController = require('../api/controller/settings')
diff --git a/server/helpers/place.js b/server/helpers/place.js
index ff87797a..d4260924 100644
--- a/server/helpers/place.js
+++ b/server/helpers/place.js
@@ -1,5 +1,4 @@
-const Place = require('../api/models/place')
-const Event = require('../api/models/event')
+const { Event, Place } = require('../api/models/models')
 const Sequelize = require('sequelize')
 const log = require('../log')
 
diff --git a/server/helpers/tag.js b/server/helpers/tag.js
index 63f31627..35d44746 100644
--- a/server/helpers/tag.js
+++ b/server/helpers/tag.js
@@ -1,5 +1,5 @@
-const Tag = require('../api/models/tag')
-const Event = require('../api/models/event')
+const { Event, Tag } = require('../api/models/models')
+
 const Sequelize = require('sequelize')
 const log = require('../log')
 
@@ -13,7 +13,7 @@ module.exports = {
     })
 
     if (!tags.length) { return }
-    log.info(`Remove ${tags.length} unrelated tags`)
+    log.info(`Remove ${tags.length} orphan tags (${tags.join(', ')})`)
 
     await Tag.destroy({
       where: { tag: { [Sequelize.Op.in]: tags.map(p => p.tag) } }

From 9dc0d3ce16541b71e5d447dc7a13d9446cd60483 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 12 Jan 2023 11:14:34 +0100
Subject: [PATCH 10/38] keep-alive index page

---
 layouts/default.vue |  2 +-
 pages/index.vue     | 73 +++++++++++++++++++++++----------------------
 store/index.js      |  5 ++--
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index a8d5dad1..06b7747c 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -4,7 +4,7 @@
     <v-main>
       <Snackbar/>
       <Confirm/>
-        <nuxt :keep-alive='$route.name === "index"'/>
+      <nuxt keep-alive :keep-alive-props="{include: ['Index']}"/>
     </v-main>
     <Footer/>
 
diff --git a/pages/index.vue b/pages/index.vue
index 58c44fca..57c9c519 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -21,27 +21,35 @@ export default {
   name: 'Index',
   components: { Event, Announcement },
   middleware: 'setup',
-  async fetch () {
-    return this.getEvents()
+  fetch () {
+    return this.getEvents({
+      start: this.start,
+      end: this.end
+    })
   },
   activated() {
-    if (this.$fetchState.timestamp <= Date.now() - 60000) {
-      this.$fetch();
+    if (!this.isCurrentMonth) {
+      this.start = dayjs().startOf('month').unix()
+      this.end = null
+      this.$fetch()
+      this.isCurrentMonth = true
+      return
     }
-  },  
-  data ({ $store }) {
+    if (this.$fetchState.timestamp <= (Date.now() - 60000)) {
+      this.$fetch()
+    }
+  },
+  data () {
     return {
       mdiMagnify, mdiCloseCircle,
       isCurrentMonth: true,
       now: dayjs().unix(),
-      date: dayjs.tz().format('YYYY-MM-DD'),
+      // date: dayjs.tz().format('YYYY-MM-DD'),
       start: dayjs().startOf('month').unix(),
       end: null,
-      searching: false,
       tmpEvents: [],
       selectedDay: null,
       storeUnsubscribe: null
-
     }
   },
   head () {
@@ -80,7 +88,7 @@ export default {
       }
     }
   },
-  mounted () {
+  created () {
     this.$root.$on('dayclick', this.dayChange)
     this.$root.$on('monthchange', this.monthChange)
     this.storeUnsubscribe = this.$store.subscribeAction( { after: (action, state) => {
@@ -88,7 +96,8 @@ export default {
         if (this.filter.query && this.filter.query.length > 2) {
           this.search()
         } else {
-          this.updateEvents()
+          this.tmpEvents = []
+          this.$fetch()
         }
       }
     }})
@@ -109,34 +118,28 @@ export default {
         show_multidate: this.filter.show_multidate,
         query: this.filter.query
       })
-    }, 100),
-    updateEvents () {
-      return this.getEvents({
-        start: this.start,
-        end: this.end
-      })
-    },
+    }, 200),
     async monthChange ({ year, month }) {
       this.$nuxt.$loading.start()
-      this.$nextTick( async () => {
+      let isCurrentMonth
 
-        // unselect current selected day
-        this.selectedDay = null
+      // unselect current selected day
+      this.selectedDay = null
 
-        // check if current month is selected
-        if (month - 1 === dayjs.tz().month() && year === dayjs.tz().year()) {
-          this.isCurrentMonth = true
-          this.start = dayjs().startOf('month').unix()
-          this.date = dayjs.tz().format('YYYY-MM-DD')
-        } else {
-          this.isCurrentMonth = false
-          this.date = ''
-          this.start = dayjs().year(year).month(month - 1).startOf('month').unix() // .startOf('week').unix()
-        }
-        this.end = dayjs().year(year).month(month).endOf('month').unix() // .endOf('week').unix()
-        await this.updateEvents()
-        this.$nuxt.$loading.finish()
-      })
+      // check if current month is selected
+      if (month - 1 === dayjs.tz().month() && year === dayjs.tz().year()) {
+        isCurrentMonth = true
+        this.start = dayjs().startOf('month').unix()
+        // this.date = dayjs.tz().format('YYYY-MM-DD')
+      } else {
+        isCurrentMonth = false
+        // this.date = ''
+        this.start = dayjs().year(year).month(month - 1).startOf('month').unix() // .startOf('week').unix()
+      }
+      this.end = dayjs().year(year).month(month).endOf('month').unix() // .endOf('week').unix()
+      await this.$fetch()
+      this.$nuxt.$loading.finish()
+      this.$nextTick( () => this.isCurrentMonth = isCurrentMonth)
 
     },
     dayChange (day) {
diff --git a/store/index.js b/store/index.js
index b9586bb1..cd0262bb 100644
--- a/store/index.js
+++ b/store/index.js
@@ -26,7 +26,7 @@ export const state = () => ({
   filter: {
     query: '',
     show_recurrent: null,
-    show_multidate: null
+    show_multidate: null,
   },
   announcements: [],
   events: []
@@ -43,7 +43,7 @@ export const mutations = {
     state.announcements = announcements
   },
   setEvents (state, events) {
-    state.events = events
+    state.events = Object.freeze(events)
   },
   setFilter (state, { type, value }) {
     state.filter[type] = value
@@ -84,6 +84,5 @@ export const actions = {
       show_multidate: state.filter.show_multidate
     })
     commit('setEvents', events)
-    return events
   }
 }

From c963cd60757421696f749b327dd8580491a40222 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 12 Jan 2023 11:39:05 +0100
Subject: [PATCH 11/38] v1.6.2

---
 CHANGELOG         |   4 +-
 docs/changelog.md |   7 +++
 package.json      |   2 +-
 yarn.lock         | 118 +++++++++++++++++++++++++++++++++++++++-------
 4 files changed, 110 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9a944f1e..a4046f3e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,11 @@
 All notable changes to this project will be documented in this file.
 
-### UNRELEASED
-  - models initialization refactored, better dev experience as backend hmr is working
+### 1.6.2 - 12 jan '23'
   - add swipe gesture to move to next/prev event
   - fix refresh collections, fix #219
   - add russian translation (thanks @drunkod)
   - refactor search / filter / selection fix #225, 227, #224
+  - models initialization refactored, better dev experience, fix backend HMR
 
 ### 1.6.1 - 15 dec '22
   - allow edit tags in admin panel, fix #170
diff --git a/docs/changelog.md b/docs/changelog.md
index 660cfaa4..a9b36d39 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -8,6 +8,13 @@ nav_order: 10
 
 All notable changes to this project will be documented in this file.
 
+### 1.6.2 - 12 jan '23'
+  - add swipe gesture to move to next/prev event
+  - fix refresh collections, fix #219
+  - add russian translation (thanks @drunkod)
+  - refactor search / filter / selection fix #225, 227, #224
+  - models initialization refactored, better dev experience, fix backend HMR
+
 ### 1.6.1 - 15 dec '22
   - allow edit tags in admin panel, fix #170
   - fix header / fallback image upload, fix #222
diff --git a/package.json b/package.json
index 1fc5f708..e2c0d2fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gancio",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "A shared agenda for local communities",
   "author": "lesion",
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index bc6cebae..7de9e8e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -43,7 +43,16 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.20.1", "@babel/generator@^7.20.2", "@babel/generator@^7.7.2":
+"@babel/generator@^7.20.1", "@babel/generator@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
+  integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==
+  dependencies:
+    "@babel/types" "^7.20.7"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
+
+"@babel/generator@^7.20.2", "@babel/generator@^7.7.2":
   version "7.20.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.4.tgz#4d9f8f0c30be75fd90a0562099a26e5839602ab8"
   integrity sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==
@@ -262,11 +271,16 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.4", "@babel/parser@^7.20.1", "@babel/parser@^7.20.2", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.4", "@babel/parser@^7.20.2", "@babel/parser@^7.6.0":
   version "7.20.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2"
   integrity sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==
 
+"@babel/parser@^7.18.10", "@babel/parser@^7.20.1", "@babel/parser@^7.20.7", "@babel/parser@^7.9.6":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
+  integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -924,7 +938,16 @@
   dependencies:
     regenerator-runtime "^0.13.10"
 
-"@babel/template@^7.18.10", "@babel/template@^7.3.3":
+"@babel/template@^7.18.10":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+
+"@babel/template@^7.3.3":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
   integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
@@ -933,7 +956,23 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.18.10", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.7.2":
+"@babel/traverse@^7.18.10":
+  version "7.20.12"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5"
+  integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.7"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.7.2":
   version "7.20.1"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8"
   integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==
@@ -949,7 +988,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
+"@babel/types@^7.0.0", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
   integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==
@@ -958,6 +997,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
+  integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -1634,6 +1682,24 @@
     ua-parser-js "^1.0.2"
     ufo "^0.8.5"
 
+"@nuxt/utils@2.x":
+  version "2.15.8"
+  resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.15.8.tgz#0c3594f01be63ab521583904cafd32215b719d4c"
+  integrity sha512-e0VBarUbPiQ4ZO1T58puoFIuXme7L5gk1QfwyxOONlp2ryE7aRyZ8X/mryuOiIeyP64c4nwSUtN7q9EUWRb7Lg==
+  dependencies:
+    consola "^2.15.3"
+    create-require "^1.1.1"
+    fs-extra "^9.1.0"
+    hash-sum "^2.0.0"
+    jiti "^1.9.2"
+    lodash "^4.17.21"
+    proper-lockfile "^4.1.2"
+    semver "^7.3.5"
+    serialize-javascript "^5.0.1"
+    signal-exit "^3.0.3"
+    ua-parser-js "^0.7.28"
+    ufo "^0.7.4"
+
 "@nuxt/vue-app-edge@2.16.0-27720022.54e852f":
   version "2.16.0-27720022.54e852f"
   resolved "https://registry.yarnpkg.com/@nuxt/vue-app-edge/-/vue-app-edge-2.16.0-27720022.54e852f.tgz#d7b6ae4a25e6b5e46d331e674ae525cc68a4a74b"
@@ -1745,14 +1811,15 @@
     defu "^5.0.0"
 
 "@nuxtjs/i18n@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/i18n/-/i18n-7.3.0.tgz#49ddaaf5c39a0eb60e59515bbdebb0a94845cc06"
-  integrity sha512-KBmFzgHjaJ/b+I/nISWUkAxcigjc5FiR1ScRzq/eC8Ahxi5zIulfF8vRROmYbW1gP6B2yYBblOuWemW/T/YM0A==
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/i18n/-/i18n-7.3.1.tgz#b8654783cced280899697458186a0bf38be4d4b8"
+  integrity sha512-DZP6xR8zZA1ApcNjLnukH3BhMRCfi3r236epuXVuPWWOObPf5vkp+VamewnPiSU+zs0Age+PbaaIUryFv/6pDA==
   dependencies:
     "@babel/parser" "^7.18.10"
     "@babel/traverse" "^7.18.10"
     "@intlify/vue-i18n-extensions" "^1.0.2"
     "@intlify/vue-i18n-loader" "^1.1.0"
+    "@nuxt/utils" "2.x"
     cookie "^0.5.0"
     devalue "^2.0.1"
     is-https "^4.0.0"
@@ -4588,9 +4655,9 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
     domelementtype "^2.2.0"
 
 dompurify@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631"
-  integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.3.tgz#f4133af0e6a50297fc8874e2eaedc13a3c308c03"
+  integrity sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ==
 
 domutils@1.5.1:
   version "1.5.1"
@@ -7244,7 +7311,12 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.1, json5@^2.1.2, json5@^2.2.1:
+json5@^2.1.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
+json5@^2.1.2, json5@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
@@ -7440,9 +7512,9 @@ lines-and-columns@^1.1.6:
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 linkify-html@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/linkify-html/-/linkify-html-4.0.2.tgz#f55e58ee27b4e34793f03a0bf81910c8a92151e5"
-  integrity sha512-YcN3tsyutK2Y/uSuoG0zne8FQdoqzrAgNU5ko0DWE7M2oQ3ms4z/202f2W4TvRm9uxKdrsWAullfynANLaVMqw==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/linkify-html/-/linkify-html-4.1.0.tgz#c7881090a21020e06d956039450c239b3ca06536"
+  integrity sha512-cQSNN4i5V1xRjdSUEnXgn855xsl+usD7zBSsNyMSFBf4NlaZFocn7cExJA217azxODeqea79b6fDPXLa7jdkcA==
 
 linkify-it@4.0.0:
   version "4.0.0"
@@ -9908,9 +9980,9 @@ prepend-http@^1.0.0:
   integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
 prettier@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc"
-  integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.2.tgz#c4ea1b5b454d7c4b59966db2e06ed7eec5dfd160"
+  integrity sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw==
 
 pretty-bytes@^5.6.0:
   version "5.6.0"
@@ -12079,6 +12151,11 @@ typegram@^4.1.0:
   resolved "https://registry.yarnpkg.com/typegram/-/typegram-4.1.0.tgz#fb1c8f59d387c5b4966be9aac745aa9fcedc0a2d"
   integrity sha512-OejXXNRh3bb6TQKbUM0k1p1wnEYCrZd66TNLeZeV2S6s4XWkCmVHONXqBTPtWpaq+IUxSyQwKJ1XXyN17Lr0+w==
 
+ua-parser-js@^0.7.28:
+  version "0.7.32"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211"
+  integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==
+
 ua-parser-js@^1.0.2:
   version "1.0.32"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.32.tgz#786bf17df97de159d5b1c9d5e8e9e89806f8a030"
@@ -12089,6 +12166,11 @@ uc.micro@^1.0.1:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
+ufo@^0.7.4:
+  version "0.7.11"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.7.11.tgz#17defad497981290383c5d26357773431fdbadcb"
+  integrity sha512-IT3q0lPvtkqQ8toHQN/BkOi4VIqoqheqM1FnkNWT9y0G8B3xJhwnoKBu5OHx8zHDOvveQzfKuFowJ0VSARiIDg==
+
 ufo@^0.8.5:
   version "0.8.6"
   resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.8.6.tgz#c0ec89bc0e0c9fa59a683680feb0f28b55ec323b"

From 6e54383d51054e537953e345f31d21c2bfac5659 Mon Sep 17 00:00:00 2001
From: fadelkon <fadelkon@posteo.net>
Date: Tue, 10 Jan 2023 18:42:42 +0000
Subject: [PATCH 12/38] Translated using Weblate (Catalan)

Currently translated at 100.0% (312 of 312 strings)

Translation: Gancio/Web
Translate-URL: https://hosted.weblate.org/projects/gancio/web/ca/
---
 locales/ca.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/locales/ca.json b/locales/ca.json
index fe0b29f7..49f027dc 100644
--- a/locales/ca.json
+++ b/locales/ca.json
@@ -301,7 +301,8 @@
         "allow_multidate_event": "Permet activitats de diversos dies",
         "delete_tag_confirm": "Segur que vols eliminar l'etiqueta \"{tag}\"? S'esborrarà del sistema i de {n} activitats.",
         "edit_tag": "Canvia l'etiqueta",
-        "tilelayer_provider_attribution": "Atribució"
+        "tilelayer_provider_attribution": "Atribució",
+        "geolocation_description": "<b>1. Defineix una proveïdora de geocodificació</b>.<br>Actualment, de totes les llistades en <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim#Alternatives_.2F_Third-party_providers\">la wiki d'OpenStreetMap</a>, són compatibles amb Gancio <a href=\"https://github.com/osm-search/Nominatim\">Nominatim</a> i <a href=\"https://github.com/komoot/photon\">Photon</a>.<br>Pots fer servir les instaŀlacions d'aquestes proveïdores copiant l'adreça de la instaŀlació al camp de 'Proveïdora de geolocodificació'<ul><li>https://nominatim.openstreetmap.org/search (<a href=\"https://operations.osmfoundation.org/policies/nominatim/\">Condicions del servei</a>)</li><li>https://photon.komoot.io/api/ (<a href=\"https://photon.komoot.io/\">Condicions del servei</a>)</li></ul><br><b>2. Defineix una proveïdora per mapes base.</b><br>Pots trobar-ne una llista aquí: <a href=\"https://leaflet-extras.github.io/leaflet-providers/preview/\">https://leaflet-extras.github.io/leaflet-providers/preview/</a>"
     },
     "auth": {
         "not_confirmed": "Encara no s'ha confirmat…",

From 76bb959a80a7e23013c053f6c78997a92153e69e Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 12 Jan 2023 14:19:49 +0100
Subject: [PATCH 13/38] minor on filters

---
 plugins/filters.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/filters.js b/plugins/filters.js
index 165eab6d..24b71533 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -58,7 +58,7 @@ export default ({ app, store }) => {
     return ''
   })
 
-  Vue.filter('from', timestamp => dayjs.unix(timestamp).tz().fromNow())
+  Vue.filter('from', timestamp => dayjs.unix(timestamp).tz().locale(app.i18n.locale || store.state.settings.instance_locale).fromNow())
 
   Vue.filter('recurrentDetail', event => {
     const parent = event.parent

From 1f0cacb119c4ca40d7b9702a303cf80080d5b46d Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 12 Jan 2023 14:40:14 +0100
Subject: [PATCH 14/38] minor

---
 layouts/default.vue |  4 +++-
 pages/index.vue     | 15 ---------------
 store/index.js      |  4 +++-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index 06b7747c..d53ba92d 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -4,7 +4,9 @@
     <v-main>
       <Snackbar/>
       <Confirm/>
-      <nuxt keep-alive :keep-alive-props="{include: ['Index']}"/>
+      <v-fade-transition hide-on-leave>
+        <nuxt />
+      </v-fade-transition>
     </v-main>
     <Footer/>
 
diff --git a/pages/index.vue b/pages/index.vue
index 57c9c519..f7bced1b 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -27,24 +27,11 @@ export default {
       end: this.end
     })
   },
-  activated() {
-    if (!this.isCurrentMonth) {
-      this.start = dayjs().startOf('month').unix()
-      this.end = null
-      this.$fetch()
-      this.isCurrentMonth = true
-      return
-    }
-    if (this.$fetchState.timestamp <= (Date.now() - 60000)) {
-      this.$fetch()
-    }
-  },
   data () {
     return {
       mdiMagnify, mdiCloseCircle,
       isCurrentMonth: true,
       now: dayjs().unix(),
-      // date: dayjs.tz().format('YYYY-MM-DD'),
       start: dayjs().startOf('month').unix(),
       end: null,
       tmpEvents: [],
@@ -130,10 +117,8 @@ export default {
       if (month - 1 === dayjs.tz().month() && year === dayjs.tz().year()) {
         isCurrentMonth = true
         this.start = dayjs().startOf('month').unix()
-        // this.date = dayjs.tz().format('YYYY-MM-DD')
       } else {
         isCurrentMonth = false
-        // this.date = ''
         this.start = dayjs().year(year).month(month - 1).startOf('month').unix() // .startOf('week').unix()
       }
       this.end = dayjs().year(year).month(month).endOf('month').unix() // .endOf('week').unix()
diff --git a/store/index.js b/store/index.js
index cd0262bb..a0179aa2 100644
--- a/store/index.js
+++ b/store/index.js
@@ -54,7 +54,9 @@ export const actions = {
   // this method is called server side only for each request for nuxt
   // we use it to get configuration from db, set locale, etc...
   nuxtServerInit ({ commit }, { _req, res }) {
-    commit('setSettings', res.locals.settings)
+    if (res.locals && res.locals.settings) {
+      commit('setSettings', res.locals.settings)
+    }
     commit('setFilter', {  type: 'show_recurrent',
         value: res.locals.settings.allow_recurrent_event && res.locals.settings.recurrent_event_visible })
 

From 749c6567848e4412ed2fd0c56d73aea20eb2851e Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 12 Jan 2023 14:50:43 +0100
Subject: [PATCH 15/38] typo

---
 CHANGELOG         | 2 +-
 docs/changelog.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a4046f3e..61c3a8a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 All notable changes to this project will be documented in this file.
 
-### 1.6.2 - 12 jan '23'
+### 1.6.2 - 12 jan '23
   - add swipe gesture to move to next/prev event
   - fix refresh collections, fix #219
   - add russian translation (thanks @drunkod)
diff --git a/docs/changelog.md b/docs/changelog.md
index a9b36d39..e7d46a58 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -8,7 +8,7 @@ nav_order: 10
 
 All notable changes to this project will be documented in this file.
 
-### 1.6.2 - 12 jan '23'
+### 1.6.2 - 12 jan '23
   - add swipe gesture to move to next/prev event
   - fix refresh collections, fix #219
   - add russian translation (thanks @drunkod)

From e3a99498658bd02a56bc0b3873e4c306d668f1cc Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Fri, 13 Jan 2023 22:17:43 +0100
Subject: [PATCH 16/38] fix event api path

---
 docs/assets/js/gancio-events.es.js   | 208 +++++++++++++--------------
 pages/add/_edit.vue                  |   2 +-
 pages/embed/_event_id.vue            |   2 +-
 pages/event/_slug.vue                |   2 +-
 server/api/index.js                  |   2 +-
 static/gancio-events.es.js           | 208 +++++++++++++--------------
 webcomponents/src/GancioEvent.svelte |   2 +-
 wp-plugin/js/gancio-events.es.js     | 208 +++++++++++++--------------
 8 files changed, 317 insertions(+), 317 deletions(-)

diff --git a/docs/assets/js/gancio-events.es.js b/docs/assets/js/gancio-events.es.js
index a0a2adee..7376dcbb 100644
--- a/docs/assets/js/gancio-events.es.js
+++ b/docs/assets/js/gancio-events.es.js
@@ -117,9 +117,9 @@ const Ce = /* @__PURE__ */ new Set();
 function Ae(t, e) {
   t && t.i && (Ce.delete(t), t.i(e));
 }
-function Me(t, e, i, n) {
-  const { fragment: l, on_mount: o, on_destroy: r, after_update: f } = t.$$;
-  l && l.m(e, i), n || Q(() => {
+function Me(t, e, i, l) {
+  const { fragment: n, on_mount: o, on_destroy: r, after_update: f } = t.$$;
+  n && n.m(e, i), l || Q(() => {
     const c = o.map(W).filter(_e);
     r ? r.push(...c) : O(c), t.$$.on_mount = [];
   }), f.forEach(Q);
@@ -131,7 +131,7 @@ function Ne(t, e) {
 function Te(t, e) {
   t.$$.dirty[0] === -1 && (H.push(t), Se(), t.$$.dirty.fill(0)), t.$$.dirty[e / 31 | 0] |= 1 << e % 31;
 }
-function ye(t, e, i, n, l, o, r, f = [-1]) {
+function ye(t, e, i, l, n, o, r, f = [-1]) {
   const c = I;
   R(t);
   const s = t.$$ = {
@@ -139,7 +139,7 @@ function ye(t, e, i, n, l, o, r, f = [-1]) {
     ctx: null,
     props: o,
     update: L,
-    not_equal: l,
+    not_equal: n,
     bound: ee(),
     on_mount: [],
     on_destroy: [],
@@ -156,8 +156,8 @@ function ye(t, e, i, n, l, o, r, f = [-1]) {
   let k = !1;
   if (s.ctx = i ? i(t, e.props || {}, (m, _, ...C) => {
     const w = C.length ? C[0] : _;
-    return s.ctx && l(s.ctx[m], s.ctx[m] = w) && (!s.skip_bound && s.bound[m] && s.bound[m](w), k && Te(t, m)), _;
-  }) : [], s.update(), k = !0, O(s.before_update), s.fragment = n ? n(s.ctx) : !1, e.target) {
+    return s.ctx && n(s.ctx[m], s.ctx[m] = w) && (!s.skip_bound && s.bound[m] && s.bound[m](w), k && Te(t, m)), _;
+  }) : [], s.update(), k = !0, O(s.before_update), s.fragment = l ? l(s.ctx) : !1, e.target) {
     if (e.hydrate) {
       const m = $e(e.target);
       s.fragment && s.fragment.l(m), m.forEach(x);
@@ -190,8 +190,8 @@ typeof HTMLElement == "function" && (X = class extends HTMLElement {
   $on(t, e) {
     const i = this.$$.callbacks[t] || (this.$$.callbacks[t] = []);
     return i.push(e), () => {
-      const n = i.indexOf(e);
-      n !== -1 && i.splice(n, 1);
+      const l = i.indexOf(e);
+      l !== -1 && i.splice(l, 1);
     };
   }
   $set(t) {
@@ -211,13 +211,13 @@ function F(t, e = "long") {
 function V(t) {
   return t.multidate ? F(t.start_datetime) + " - " + F(t.end_datetime) : F(t.start_datetime) + (t.end_datetime ? "-" + F(t.end_datetime, "short") : "");
 }
-function ne(t, e, i) {
-  const n = t.slice();
-  return n[12] = e[i], n;
-}
 function le(t, e, i) {
-  const n = t.slice();
-  return n[15] = e[i], n;
+  const l = t.slice();
+  return l[12] = e[i], l;
+}
+function ne(t, e, i) {
+  const l = t.slice();
+  return l[15] = e[i], l;
 }
 function re(t) {
   let e;
@@ -225,11 +225,11 @@ function re(t) {
     c() {
       e = g("link"), a(e, "rel", "stylesheet"), a(e, "href", t[4]);
     },
-    m(i, n) {
-      v(i, e, n);
+    m(i, l) {
+      v(i, e, l);
     },
-    p(i, n) {
-      n & 16 && a(e, "href", i[4]);
+    p(i, l) {
+      l & 16 && a(e, "href", i[4]);
     },
     d(i) {
       i && x(e);
@@ -237,51 +237,51 @@ function re(t) {
   };
 }
 function oe(t) {
-  let e, i, n = t[1] && t[3] === "true" && ae(t), l = t[5], o = [];
-  for (let r = 0; r < l.length; r += 1)
-    o[r] = ue(ne(t, l, r));
+  let e, i, l = t[1] && t[3] === "true" && ae(t), n = t[5], o = [];
+  for (let r = 0; r < n.length; r += 1)
+    o[r] = ue(le(t, n, r));
   return {
     c() {
-      e = g("div"), n && n.c(), i = z();
+      e = g("div"), l && l.c(), i = z();
       for (let r = 0; r < o.length; r += 1)
         o[r].c();
       a(e, "id", "gancioEvents"), T(e, "dark", t[2] === "dark"), T(e, "light", t[2] === "light"), T(e, "sidebar", t[3] === "true"), T(e, "nosidebar", t[3] !== "true");
     },
     m(r, f) {
-      v(r, e, f), n && n.m(e, null), u(e, i);
+      v(r, e, f), l && l.m(e, null), u(e, i);
       for (let c = 0; c < o.length; c += 1)
         o[c].m(e, null);
     },
     p(r, f) {
-      if (r[1] && r[3] === "true" ? n ? n.p(r, f) : (n = ae(r), n.c(), n.m(e, i)) : n && (n.d(1), n = null), f & 41) {
-        l = r[5];
+      if (r[1] && r[3] === "true" ? l ? l.p(r, f) : (l = ae(r), l.c(), l.m(e, i)) : l && (l.d(1), l = null), f & 41) {
+        n = r[5];
         let c;
-        for (c = 0; c < l.length; c += 1) {
-          const s = ne(r, l, c);
+        for (c = 0; c < n.length; c += 1) {
+          const s = le(r, n, c);
           o[c] ? o[c].p(s, f) : (o[c] = ue(s), o[c].c(), o[c].m(e, null));
         }
         for (; c < o.length; c += 1)
           o[c].d(1);
-        o.length = l.length;
+        o.length = n.length;
       }
       f & 4 && T(e, "dark", r[2] === "dark"), f & 4 && T(e, "light", r[2] === "light"), f & 8 && T(e, "sidebar", r[3] === "true"), f & 8 && T(e, "nosidebar", r[3] !== "true");
     },
     d(r) {
-      r && x(e), n && n.d(), pe(o, r);
+      r && x(e), l && l.d(), pe(o, r);
     }
   };
 }
 function ae(t) {
-  let e, i, n, l, o, r, f;
+  let e, i, l, n, o, r, f;
   return {
     c() {
-      e = g("a"), i = g("div"), n = g("div"), l = j(t[1]), o = z(), r = g("img"), a(n, "class", "title"), a(r, "id", "logo"), a(r, "alt", "logo"), G(r.src, f = t[0] + "/logo.png") || a(r, "src", f), a(i, "class", "content"), a(e, "href", t[0]), a(e, "target", "_blank"), a(e, "id", "header");
+      e = g("a"), i = g("div"), l = g("div"), n = j(t[1]), o = z(), r = g("img"), a(l, "class", "title"), a(r, "id", "logo"), a(r, "alt", "logo"), G(r.src, f = t[0] + "/logo.png") || a(r, "src", f), a(i, "class", "content"), a(e, "href", t[0]), a(e, "target", "_blank"), a(e, "id", "header");
     },
     m(c, s) {
-      v(c, e, s), u(e, i), u(i, n), u(n, l), u(i, o), u(i, r);
+      v(c, e, s), u(e, i), u(i, l), u(l, n), u(i, o), u(i, r);
     },
     p(c, s) {
-      s & 2 && N(l, c[1]), s & 1 && !G(r.src, f = c[0] + "/logo.png") && a(r, "src", f), s & 1 && a(e, "href", c[0]);
+      s & 2 && N(n, c[1]), s & 1 && !G(r.src, f = c[0] + "/logo.png") && a(r, "src", f), s & 1 && a(e, "href", c[0]);
     },
     d(c) {
       c && x(e);
@@ -293,50 +293,50 @@ function se(t) {
   function i(o, r) {
     return o[12].media.length ? Ge : Le;
   }
-  let n = i(t), l = n(t);
+  let l = i(t), n = l(t);
   return {
     c() {
-      e = g("div"), l.c(), a(e, "class", "img");
+      e = g("div"), n.c(), a(e, "class", "img");
     },
     m(o, r) {
-      v(o, e, r), l.m(e, null);
+      v(o, e, r), n.m(e, null);
     },
     p(o, r) {
-      n === (n = i(o)) && l ? l.p(o, r) : (l.d(1), l = n(o), l && (l.c(), l.m(e, null)));
+      l === (l = i(o)) && n ? n.p(o, r) : (n.d(1), n = l(o), n && (n.c(), n.m(e, null)));
     },
     d(o) {
-      o && x(e), l.d();
+      o && x(e), n.d();
     }
   };
 }
 function Le(t) {
-  let e, i, n;
+  let e, i, l;
   return {
     c() {
-      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/fallbackimage.png") || a(e, "src", n), a(e, "loading", "lazy");
+      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, l = t[0] + "/fallbackimage.png") || a(e, "src", l), a(e, "loading", "lazy");
     },
-    m(l, o) {
-      v(l, e, o);
+    m(n, o) {
+      v(n, e, o);
     },
-    p(l, o) {
-      o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/fallbackimage.png") && a(e, "src", n);
+    p(n, o) {
+      o & 32 && i !== (i = n[12].title) && a(e, "alt", i), o & 1 && !G(e.src, l = n[0] + "/fallbackimage.png") && a(e, "src", l);
     },
-    d(l) {
-      l && x(e);
+    d(n) {
+      n && x(e);
     }
   };
 }
 function Ge(t) {
-  let e, i, n, l;
+  let e, i, l, n;
   return {
     c() {
-      e = g("img"), a(e, "style", i = "object-position: " + de(t[12]) + "; aspect-ratio=1.7778;"), a(e, "alt", n = t[12].media[0].name), G(e.src, l = t[0] + "/media/thumb/" + t[12].media[0].url) || a(e, "src", l), a(e, "loading", "lazy");
+      e = g("img"), a(e, "style", i = "object-position: " + de(t[12]) + "; aspect-ratio=1.7778;"), a(e, "alt", l = t[12].media[0].name), G(e.src, n = t[0] + "/media/thumb/" + t[12].media[0].url) || a(e, "src", n), a(e, "loading", "lazy");
     },
     m(o, r) {
       v(o, e, r);
     },
     p(o, r) {
-      r & 32 && i !== (i = "object-position: " + de(o[12]) + "; aspect-ratio=1.7778;") && a(e, "style", i), r & 32 && n !== (n = o[12].media[0].name) && a(e, "alt", n), r & 33 && !G(e.src, l = o[0] + "/media/thumb/" + o[12].media[0].url) && a(e, "src", l);
+      r & 32 && i !== (i = "object-position: " + de(o[12]) + "; aspect-ratio=1.7778;") && a(e, "style", i), r & 32 && l !== (l = o[12].media[0].name) && a(e, "alt", l), r & 33 && !G(e.src, n = o[0] + "/media/thumb/" + o[12].media[0].url) && a(e, "src", n);
     },
     d(o) {
       o && x(e);
@@ -344,50 +344,50 @@ function Ge(t) {
   };
 }
 function ce(t) {
-  let e, i = t[12].tags, n = [];
-  for (let l = 0; l < i.length; l += 1)
-    n[l] = fe(le(t, i, l));
+  let e, i = t[12].tags, l = [];
+  for (let n = 0; n < i.length; n += 1)
+    l[n] = fe(ne(t, i, n));
   return {
     c() {
       e = g("div");
-      for (let l = 0; l < n.length; l += 1)
-        n[l].c();
+      for (let n = 0; n < l.length; n += 1)
+        l[n].c();
       a(e, "class", "tags");
     },
-    m(l, o) {
-      v(l, e, o);
-      for (let r = 0; r < n.length; r += 1)
-        n[r].m(e, null);
+    m(n, o) {
+      v(n, e, o);
+      for (let r = 0; r < l.length; r += 1)
+        l[r].m(e, null);
     },
-    p(l, o) {
+    p(n, o) {
       if (o & 32) {
-        i = l[12].tags;
+        i = n[12].tags;
         let r;
         for (r = 0; r < i.length; r += 1) {
-          const f = le(l, i, r);
-          n[r] ? n[r].p(f, o) : (n[r] = fe(f), n[r].c(), n[r].m(e, null));
+          const f = ne(n, i, r);
+          l[r] ? l[r].p(f, o) : (l[r] = fe(f), l[r].c(), l[r].m(e, null));
         }
-        for (; r < n.length; r += 1)
-          n[r].d(1);
-        n.length = i.length;
+        for (; r < l.length; r += 1)
+          l[r].d(1);
+        l.length = i.length;
       }
     },
-    d(l) {
-      l && x(e), pe(n, l);
+    d(n) {
+      n && x(e), pe(l, n);
     }
   };
 }
 function fe(t) {
-  let e, i, n = t[15] + "", l;
+  let e, i, l = t[15] + "", n;
   return {
     c() {
-      e = g("span"), i = j("#"), l = j(n), a(e, "class", "tag");
+      e = g("span"), i = j("#"), n = j(l), a(e, "class", "tag");
     },
     m(o, r) {
-      v(o, e, r), u(e, i), u(e, l);
+      v(o, e, r), u(e, i), u(e, n);
     },
     p(o, r) {
-      r & 32 && n !== (n = o[15] + "") && N(l, n);
+      r & 32 && l !== (l = o[15] + "") && N(n, l);
     },
     d(o) {
       o && x(e);
@@ -395,16 +395,16 @@ function fe(t) {
   };
 }
 function ue(t) {
-  let e, i, n, l, o = V(t[12]) + "", r, f, c, s = t[12].title + "", k, m, _, C, w = t[12].place.name + "", d, S, h, b = t[12].place.address + "", A, Y, Z, U, q, $ = t[3] !== "true" && se(t), E = t[12].tags.length && ce(t);
+  let e, i, l, n, o = V(t[12]) + "", r, f, c, s = t[12].title + "", k, m, _, C, w = t[12].place.name + "", d, S, h, b = t[12].place.address + "", A, Y, Z, U, q, $ = t[3] !== "true" && se(t), E = t[12].tags.length && ce(t);
   return {
     c() {
-      e = g("a"), $ && $.c(), i = z(), n = g("div"), l = g("div"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("span"), C = j("@"), d = j(w), S = z(), h = g("span"), A = j(b), Y = z(), E && E.c(), Z = z(), a(l, "class", "subtitle"), a(c, "class", "title"), a(h, "class", "subtitle"), a(_, "class", "place"), a(n, "class", "content"), a(e, "href", U = t[0] + "/event/" + (t[12].slug || t[12].id)), a(e, "class", "event"), a(e, "title", q = t[12].title), a(e, "target", "_blank");
+      e = g("a"), $ && $.c(), i = z(), l = g("div"), n = g("div"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("span"), C = j("@"), d = j(w), S = z(), h = g("span"), A = j(b), Y = z(), E && E.c(), Z = z(), a(n, "class", "subtitle"), a(c, "class", "title"), a(h, "class", "subtitle"), a(_, "class", "place"), a(l, "class", "content"), a(e, "href", U = t[0] + "/event/" + (t[12].slug || t[12].id)), a(e, "class", "event"), a(e, "title", q = t[12].title), a(e, "target", "_blank");
     },
     m(p, M) {
-      v(p, e, M), $ && $.m(e, null), u(e, i), u(e, n), u(n, l), u(l, r), u(n, f), u(n, c), u(c, k), u(n, m), u(n, _), u(_, C), u(_, d), u(_, S), u(_, h), u(h, A), u(n, Y), E && E.m(n, null), u(e, Z);
+      v(p, e, M), $ && $.m(e, null), u(e, i), u(e, l), u(l, n), u(n, r), u(l, f), u(l, c), u(c, k), u(l, m), u(l, _), u(_, C), u(_, d), u(_, S), u(_, h), u(h, A), u(l, Y), E && E.m(l, null), u(e, Z);
     },
     p(p, M) {
-      p[3] !== "true" ? $ ? $.p(p, M) : ($ = se(p), $.c(), $.m(e, i)) : $ && ($.d(1), $ = null), M & 32 && o !== (o = V(p[12]) + "") && N(r, o), M & 32 && s !== (s = p[12].title + "") && N(k, s), M & 32 && w !== (w = p[12].place.name + "") && N(d, w), M & 32 && b !== (b = p[12].place.address + "") && N(A, b), p[12].tags.length ? E ? E.p(p, M) : (E = ce(p), E.c(), E.m(n, null)) : E && (E.d(1), E = null), M & 33 && U !== (U = p[0] + "/event/" + (p[12].slug || p[12].id)) && a(e, "href", U), M & 32 && q !== (q = p[12].title) && a(e, "title", q);
+      p[3] !== "true" ? $ ? $.p(p, M) : ($ = se(p), $.c(), $.m(e, i)) : $ && ($.d(1), $ = null), M & 32 && o !== (o = V(p[12]) + "") && N(r, o), M & 32 && s !== (s = p[12].title + "") && N(k, s), M & 32 && w !== (w = p[12].place.name + "") && N(d, w), M & 32 && b !== (b = p[12].place.address + "") && N(A, b), p[12].tags.length ? E ? E.p(p, M) : (E = ce(p), E.c(), E.m(l, null)) : E && (E.d(1), E = null), M & 33 && U !== (U = p[0] + "/event/" + (p[12].slug || p[12].id)) && a(e, "href", U), M & 32 && q !== (q = p[12].title) && a(e, "title", q);
     },
     d(p) {
       p && x(e), $ && $.d(), E && E.d();
@@ -412,21 +412,21 @@ function ue(t) {
   };
 }
 function He(t) {
-  let e, i, n = t[4] && re(t), l = t[5].length && oe(t);
+  let e, i, l = t[4] && re(t), n = t[5].length && oe(t);
   return {
     c() {
-      n && n.c(), e = z(), l && l.c(), i = ve(), this.c = L;
+      l && l.c(), e = z(), n && n.c(), i = ve(), this.c = L;
     },
     m(o, r) {
-      n && n.m(o, r), v(o, e, r), l && l.m(o, r), v(o, i, r);
+      l && l.m(o, r), v(o, e, r), n && n.m(o, r), v(o, i, r);
     },
     p(o, [r]) {
-      o[4] ? n ? n.p(o, r) : (n = re(o), n.c(), n.m(e.parentNode, e)) : n && (n.d(1), n = null), o[5].length ? l ? l.p(o, r) : (l = oe(o), l.c(), l.m(i.parentNode, i)) : l && (l.d(1), l = null);
+      o[4] ? l ? l.p(o, r) : (l = re(o), l.c(), l.m(e.parentNode, e)) : l && (l.d(1), l = null), o[5].length ? n ? n.p(o, r) : (n = oe(o), n.c(), n.m(i.parentNode, i)) : n && (n.d(1), n = null);
     },
     i: L,
     o: L,
     d(o) {
-      n && n.d(o), o && x(e), l && l.d(o), o && x(i);
+      l && l.d(o), o && x(e), n && n.d(o), o && x(i);
     }
   };
 }
@@ -438,12 +438,12 @@ function de(t) {
   return "center center";
 }
 function Re(t, e, i) {
-  let { baseurl: n = "" } = e, { title: l = "" } = e, { maxlength: o = !1 } = e, { tags: r = "" } = e, { places: f = "" } = e, { theme: c = "light" } = e, { show_recurrent: s = !1 } = e, { sidebar: k = "true" } = e, { external_style: m = "" } = e, _ = !1, C = [];
+  let { baseurl: l = "" } = e, { title: n = "" } = e, { maxlength: o = !1 } = e, { tags: r = "" } = e, { places: f = "" } = e, { theme: c = "light" } = e, { show_recurrent: s = !1 } = e, { sidebar: k = "true" } = e, { external_style: m = "" } = e, _ = !1, C = [];
   function w(d) {
     if (!_)
       return;
     const S = [];
-    o && S.push(`max=${o}`), r && S.push(`tags=${r}`), f && S.push(`places=${f}`), S.push(`show_recurrent=${s ? "true" : "false"}`), fetch(`${n}/api/events?${S.join("&")}`).then((h) => h.json()).then((h) => {
+    o && S.push(`max=${o}`), r && S.push(`tags=${r}`), f && S.push(`places=${f}`), S.push(`show_recurrent=${s ? "true" : "false"}`), fetch(`${l}/api/events?${S.join("&")}`).then((h) => h.json()).then((h) => {
       i(5, C = h);
     }).catch((h) => {
       console.error("Error loading Gancio API -> ", h);
@@ -452,12 +452,12 @@ function Re(t, e, i) {
   return we(() => {
     _ = !0, w();
   }), t.$$set = (d) => {
-    "baseurl" in d && i(0, n = d.baseurl), "title" in d && i(1, l = d.title), "maxlength" in d && i(6, o = d.maxlength), "tags" in d && i(7, r = d.tags), "places" in d && i(8, f = d.places), "theme" in d && i(2, c = d.theme), "show_recurrent" in d && i(9, s = d.show_recurrent), "sidebar" in d && i(3, k = d.sidebar), "external_style" in d && i(4, m = d.external_style);
+    "baseurl" in d && i(0, l = d.baseurl), "title" in d && i(1, n = d.title), "maxlength" in d && i(6, o = d.maxlength), "tags" in d && i(7, r = d.tags), "places" in d && i(8, f = d.places), "theme" in d && i(2, c = d.theme), "show_recurrent" in d && i(9, s = d.show_recurrent), "sidebar" in d && i(3, k = d.sidebar), "external_style" in d && i(4, m = d.external_style);
   }, t.$$.update = () => {
     t.$$.dirty & 975 && w();
   }, [
-    n,
     l,
+    n,
     c,
     k,
     m,
@@ -570,13 +570,13 @@ class Ie extends X {
 }
 customElements.define("gancio-events", Ie);
 function he(t) {
-  let e, i, n, l, o = t[1].title + "", r, f, c, s = V(t[1]) + "", k, m, _, C, w = t[1].place.name + "", d, S, h = t[1].media.length && ge(t);
+  let e, i, l, n, o = t[1].title + "", r, f, c, s = V(t[1]) + "", k, m, _, C, w = t[1].place.name + "", d, S, h = t[1].media.length && ge(t);
   return {
     c() {
-      e = g("a"), h && h.c(), i = z(), n = g("div"), l = g("strong"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("div"), C = j("@"), d = j(w), a(_, "class", "place"), a(n, "class", "container"), a(e, "href", S = t[0] + "/event/" + (t[1].slug || t[1].id)), a(e, "class", "card"), a(e, "target", "_blank");
+      e = g("a"), h && h.c(), i = z(), l = g("div"), n = g("strong"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("div"), C = j("@"), d = j(w), a(_, "class", "place"), a(l, "class", "container"), a(e, "href", S = t[0] + "/event/" + (t[1].slug || t[1].id)), a(e, "class", "card"), a(e, "target", "_blank");
     },
     m(b, A) {
-      v(b, e, A), h && h.m(e, null), u(e, i), u(e, n), u(n, l), u(l, r), u(n, f), u(n, c), u(c, k), u(n, m), u(n, _), u(_, C), u(_, d);
+      v(b, e, A), h && h.m(e, null), u(e, i), u(e, l), u(l, n), u(n, r), u(l, f), u(l, c), u(c, k), u(l, m), u(l, _), u(_, C), u(_, d);
     },
     p(b, A) {
       b[1].media.length ? h ? h.p(b, A) : (h = ge(b), h.c(), h.m(e, i)) : h && (h.d(1), h = null), A & 2 && o !== (o = b[1].title + "") && N(r, o), A & 2 && s !== (s = V(b[1]) + "") && N(k, s), A & 2 && w !== (w = b[1].place.name + "") && N(d, w), A & 3 && S !== (S = b[0] + "/event/" + (b[1].slug || b[1].id)) && a(e, "href", S);
@@ -587,16 +587,16 @@ function he(t) {
   };
 }
 function ge(t) {
-  let e, i, n, l;
+  let e, i, l, n;
   return {
     c() {
-      e = g("img"), G(e.src, i = t[2](t[1])) || a(e, "src", i), a(e, "alt", n = t[1].media[0].name), a(e, "style", l = "object-position: " + me(t[1]) + "; aspect-ratio=1.7778;");
+      e = g("img"), G(e.src, i = t[2](t[1])) || a(e, "src", i), a(e, "alt", l = t[1].media[0].name), a(e, "style", n = "object-position: " + me(t[1]) + "; aspect-ratio=1.7778;");
     },
     m(o, r) {
       v(o, e, r);
     },
     p(o, r) {
-      r & 2 && !G(e.src, i = o[2](o[1])) && a(e, "src", i), r & 2 && n !== (n = o[1].media[0].name) && a(e, "alt", n), r & 2 && l !== (l = "object-position: " + me(o[1]) + "; aspect-ratio=1.7778;") && a(e, "style", l);
+      r & 2 && !G(e.src, i = o[2](o[1])) && a(e, "src", i), r & 2 && l !== (l = o[1].media[0].name) && a(e, "alt", l), r & 2 && n !== (n = "object-position: " + me(o[1]) + "; aspect-ratio=1.7778;") && a(e, "style", n);
     },
     d(o) {
       o && x(e);
@@ -609,16 +609,16 @@ function Oe(t) {
     c() {
       i && i.c(), e = ve(), this.c = L;
     },
-    m(n, l) {
-      i && i.m(n, l), v(n, e, l);
+    m(l, n) {
+      i && i.m(l, n), v(l, e, n);
     },
-    p(n, [l]) {
-      n[1] ? i ? i.p(n, l) : (i = he(n), i.c(), i.m(e.parentNode, e)) : i && (i.d(1), i = null);
+    p(l, [n]) {
+      l[1] ? i ? i.p(l, n) : (i = he(l), i.c(), i.m(e.parentNode, e)) : i && (i.d(1), i = null);
     },
     i: L,
     o: L,
-    d(n) {
-      i && i.d(n), n && x(e);
+    d(l) {
+      i && i.d(l), l && x(e);
     }
   };
 }
@@ -630,21 +630,21 @@ function me(t) {
   return "center center";
 }
 function Ue(t, e, i) {
-  let { baseurl: n = "https://demo.gancio.org" } = e, { id: l } = e, o = !1, r;
+  let { baseurl: l = "https://demo.gancio.org" } = e, { id: n } = e, o = !1, r;
   function f(s, k) {
-    o && fetch(`${k}/api/event/${s}`).then((m) => m.json()).then((m) => i(1, r = m));
+    o && fetch(`${k}/api/event/detail/${s}`).then((m) => m.json()).then((m) => i(1, r = m));
   }
   we(() => {
-    o = !0, f(l, n);
+    o = !0, f(n, l);
   });
   function c(s) {
-    return `${n}/media/thumb/${s.media[0].url}`;
+    return `${l}/media/thumb/${s.media[0].url}`;
   }
   return t.$$set = (s) => {
-    "baseurl" in s && i(0, n = s.baseurl), "id" in s && i(3, l = s.id);
+    "baseurl" in s && i(0, l = s.baseurl), "id" in s && i(3, n = s.id);
   }, t.$$.update = () => {
-    t.$$.dirty & 9 && f(l, n);
-  }, [n, r, c, l];
+    t.$$.dirty & 9 && f(n, l);
+  }, [l, r, c, n];
 }
 class qe extends X {
   constructor(e) {
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 8132de1a..f1de17ad 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -113,7 +113,7 @@ export default {
       data.edit = true
       let event
       try {
-        event = await $axios.$get('/event/' + data.id)
+        event = await $axios.$get('/event/detail/' + data.id)
         if (!$auth.user.is_admin && $auth.user.id !== event.userId) {
           error({ statusCode: 401, message: 'Not allowed' })
           return {}
diff --git a/pages/embed/_event_id.vue b/pages/embed/_event_id.vue
index cd8a4d56..2fc5b436 100644
--- a/pages/embed/_event_id.vue
+++ b/pages/embed/_event_id.vue
@@ -17,7 +17,7 @@ export default {
   layout: 'iframe',
   async asyncData ({ $axios, params, error }) {
     try {
-      const event = await $axios.$get(`/event/${params.event_id}`)
+      const event = await $axios.$get(`/event/detail/${params.event_id}`)
       return { event }
     } catch (e) {
       error({ statusCode: 404, message: 'Event not found' })
diff --git a/pages/event/_slug.vue b/pages/event/_slug.vue
index bfd2957b..168c5240 100644
--- a/pages/event/_slug.vue
+++ b/pages/event/_slug.vue
@@ -185,7 +185,7 @@ export default {
   },
   async asyncData ({ $axios, params, error }) {
     try {
-      const event = await $axios.$get(`/event/${params.slug}`)
+      const event = await $axios.$get(`/event/detail/${params.slug}`)
       return { event }
     } catch (e) {
       error({ statusCode: 404, message: 'Event not found' })
diff --git a/server/api/index.js b/server/api/index.js
index 49d0e61d..2abd999c 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -160,7 +160,7 @@ module.exports = () => {
     api.put('/event/unconfirm/:event_id', isAuth, eventController.unconfirm)
   
     // get event
-    api.get('/event/:event_slug.:format?', cors, eventController.get)
+    api.get('/event/detail/:event_slug.:format?', cors, eventController.get)
   
     // export events (rss/ics)
     api.get('/export/:type', cors, exportController.export)
diff --git a/static/gancio-events.es.js b/static/gancio-events.es.js
index a0a2adee..7376dcbb 100644
--- a/static/gancio-events.es.js
+++ b/static/gancio-events.es.js
@@ -117,9 +117,9 @@ const Ce = /* @__PURE__ */ new Set();
 function Ae(t, e) {
   t && t.i && (Ce.delete(t), t.i(e));
 }
-function Me(t, e, i, n) {
-  const { fragment: l, on_mount: o, on_destroy: r, after_update: f } = t.$$;
-  l && l.m(e, i), n || Q(() => {
+function Me(t, e, i, l) {
+  const { fragment: n, on_mount: o, on_destroy: r, after_update: f } = t.$$;
+  n && n.m(e, i), l || Q(() => {
     const c = o.map(W).filter(_e);
     r ? r.push(...c) : O(c), t.$$.on_mount = [];
   }), f.forEach(Q);
@@ -131,7 +131,7 @@ function Ne(t, e) {
 function Te(t, e) {
   t.$$.dirty[0] === -1 && (H.push(t), Se(), t.$$.dirty.fill(0)), t.$$.dirty[e / 31 | 0] |= 1 << e % 31;
 }
-function ye(t, e, i, n, l, o, r, f = [-1]) {
+function ye(t, e, i, l, n, o, r, f = [-1]) {
   const c = I;
   R(t);
   const s = t.$$ = {
@@ -139,7 +139,7 @@ function ye(t, e, i, n, l, o, r, f = [-1]) {
     ctx: null,
     props: o,
     update: L,
-    not_equal: l,
+    not_equal: n,
     bound: ee(),
     on_mount: [],
     on_destroy: [],
@@ -156,8 +156,8 @@ function ye(t, e, i, n, l, o, r, f = [-1]) {
   let k = !1;
   if (s.ctx = i ? i(t, e.props || {}, (m, _, ...C) => {
     const w = C.length ? C[0] : _;
-    return s.ctx && l(s.ctx[m], s.ctx[m] = w) && (!s.skip_bound && s.bound[m] && s.bound[m](w), k && Te(t, m)), _;
-  }) : [], s.update(), k = !0, O(s.before_update), s.fragment = n ? n(s.ctx) : !1, e.target) {
+    return s.ctx && n(s.ctx[m], s.ctx[m] = w) && (!s.skip_bound && s.bound[m] && s.bound[m](w), k && Te(t, m)), _;
+  }) : [], s.update(), k = !0, O(s.before_update), s.fragment = l ? l(s.ctx) : !1, e.target) {
     if (e.hydrate) {
       const m = $e(e.target);
       s.fragment && s.fragment.l(m), m.forEach(x);
@@ -190,8 +190,8 @@ typeof HTMLElement == "function" && (X = class extends HTMLElement {
   $on(t, e) {
     const i = this.$$.callbacks[t] || (this.$$.callbacks[t] = []);
     return i.push(e), () => {
-      const n = i.indexOf(e);
-      n !== -1 && i.splice(n, 1);
+      const l = i.indexOf(e);
+      l !== -1 && i.splice(l, 1);
     };
   }
   $set(t) {
@@ -211,13 +211,13 @@ function F(t, e = "long") {
 function V(t) {
   return t.multidate ? F(t.start_datetime) + " - " + F(t.end_datetime) : F(t.start_datetime) + (t.end_datetime ? "-" + F(t.end_datetime, "short") : "");
 }
-function ne(t, e, i) {
-  const n = t.slice();
-  return n[12] = e[i], n;
-}
 function le(t, e, i) {
-  const n = t.slice();
-  return n[15] = e[i], n;
+  const l = t.slice();
+  return l[12] = e[i], l;
+}
+function ne(t, e, i) {
+  const l = t.slice();
+  return l[15] = e[i], l;
 }
 function re(t) {
   let e;
@@ -225,11 +225,11 @@ function re(t) {
     c() {
       e = g("link"), a(e, "rel", "stylesheet"), a(e, "href", t[4]);
     },
-    m(i, n) {
-      v(i, e, n);
+    m(i, l) {
+      v(i, e, l);
     },
-    p(i, n) {
-      n & 16 && a(e, "href", i[4]);
+    p(i, l) {
+      l & 16 && a(e, "href", i[4]);
     },
     d(i) {
       i && x(e);
@@ -237,51 +237,51 @@ function re(t) {
   };
 }
 function oe(t) {
-  let e, i, n = t[1] && t[3] === "true" && ae(t), l = t[5], o = [];
-  for (let r = 0; r < l.length; r += 1)
-    o[r] = ue(ne(t, l, r));
+  let e, i, l = t[1] && t[3] === "true" && ae(t), n = t[5], o = [];
+  for (let r = 0; r < n.length; r += 1)
+    o[r] = ue(le(t, n, r));
   return {
     c() {
-      e = g("div"), n && n.c(), i = z();
+      e = g("div"), l && l.c(), i = z();
       for (let r = 0; r < o.length; r += 1)
         o[r].c();
       a(e, "id", "gancioEvents"), T(e, "dark", t[2] === "dark"), T(e, "light", t[2] === "light"), T(e, "sidebar", t[3] === "true"), T(e, "nosidebar", t[3] !== "true");
     },
     m(r, f) {
-      v(r, e, f), n && n.m(e, null), u(e, i);
+      v(r, e, f), l && l.m(e, null), u(e, i);
       for (let c = 0; c < o.length; c += 1)
         o[c].m(e, null);
     },
     p(r, f) {
-      if (r[1] && r[3] === "true" ? n ? n.p(r, f) : (n = ae(r), n.c(), n.m(e, i)) : n && (n.d(1), n = null), f & 41) {
-        l = r[5];
+      if (r[1] && r[3] === "true" ? l ? l.p(r, f) : (l = ae(r), l.c(), l.m(e, i)) : l && (l.d(1), l = null), f & 41) {
+        n = r[5];
         let c;
-        for (c = 0; c < l.length; c += 1) {
-          const s = ne(r, l, c);
+        for (c = 0; c < n.length; c += 1) {
+          const s = le(r, n, c);
           o[c] ? o[c].p(s, f) : (o[c] = ue(s), o[c].c(), o[c].m(e, null));
         }
         for (; c < o.length; c += 1)
           o[c].d(1);
-        o.length = l.length;
+        o.length = n.length;
       }
       f & 4 && T(e, "dark", r[2] === "dark"), f & 4 && T(e, "light", r[2] === "light"), f & 8 && T(e, "sidebar", r[3] === "true"), f & 8 && T(e, "nosidebar", r[3] !== "true");
     },
     d(r) {
-      r && x(e), n && n.d(), pe(o, r);
+      r && x(e), l && l.d(), pe(o, r);
     }
   };
 }
 function ae(t) {
-  let e, i, n, l, o, r, f;
+  let e, i, l, n, o, r, f;
   return {
     c() {
-      e = g("a"), i = g("div"), n = g("div"), l = j(t[1]), o = z(), r = g("img"), a(n, "class", "title"), a(r, "id", "logo"), a(r, "alt", "logo"), G(r.src, f = t[0] + "/logo.png") || a(r, "src", f), a(i, "class", "content"), a(e, "href", t[0]), a(e, "target", "_blank"), a(e, "id", "header");
+      e = g("a"), i = g("div"), l = g("div"), n = j(t[1]), o = z(), r = g("img"), a(l, "class", "title"), a(r, "id", "logo"), a(r, "alt", "logo"), G(r.src, f = t[0] + "/logo.png") || a(r, "src", f), a(i, "class", "content"), a(e, "href", t[0]), a(e, "target", "_blank"), a(e, "id", "header");
     },
     m(c, s) {
-      v(c, e, s), u(e, i), u(i, n), u(n, l), u(i, o), u(i, r);
+      v(c, e, s), u(e, i), u(i, l), u(l, n), u(i, o), u(i, r);
     },
     p(c, s) {
-      s & 2 && N(l, c[1]), s & 1 && !G(r.src, f = c[0] + "/logo.png") && a(r, "src", f), s & 1 && a(e, "href", c[0]);
+      s & 2 && N(n, c[1]), s & 1 && !G(r.src, f = c[0] + "/logo.png") && a(r, "src", f), s & 1 && a(e, "href", c[0]);
     },
     d(c) {
       c && x(e);
@@ -293,50 +293,50 @@ function se(t) {
   function i(o, r) {
     return o[12].media.length ? Ge : Le;
   }
-  let n = i(t), l = n(t);
+  let l = i(t), n = l(t);
   return {
     c() {
-      e = g("div"), l.c(), a(e, "class", "img");
+      e = g("div"), n.c(), a(e, "class", "img");
     },
     m(o, r) {
-      v(o, e, r), l.m(e, null);
+      v(o, e, r), n.m(e, null);
     },
     p(o, r) {
-      n === (n = i(o)) && l ? l.p(o, r) : (l.d(1), l = n(o), l && (l.c(), l.m(e, null)));
+      l === (l = i(o)) && n ? n.p(o, r) : (n.d(1), n = l(o), n && (n.c(), n.m(e, null)));
     },
     d(o) {
-      o && x(e), l.d();
+      o && x(e), n.d();
     }
   };
 }
 function Le(t) {
-  let e, i, n;
+  let e, i, l;
   return {
     c() {
-      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/fallbackimage.png") || a(e, "src", n), a(e, "loading", "lazy");
+      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, l = t[0] + "/fallbackimage.png") || a(e, "src", l), a(e, "loading", "lazy");
     },
-    m(l, o) {
-      v(l, e, o);
+    m(n, o) {
+      v(n, e, o);
     },
-    p(l, o) {
-      o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/fallbackimage.png") && a(e, "src", n);
+    p(n, o) {
+      o & 32 && i !== (i = n[12].title) && a(e, "alt", i), o & 1 && !G(e.src, l = n[0] + "/fallbackimage.png") && a(e, "src", l);
     },
-    d(l) {
-      l && x(e);
+    d(n) {
+      n && x(e);
     }
   };
 }
 function Ge(t) {
-  let e, i, n, l;
+  let e, i, l, n;
   return {
     c() {
-      e = g("img"), a(e, "style", i = "object-position: " + de(t[12]) + "; aspect-ratio=1.7778;"), a(e, "alt", n = t[12].media[0].name), G(e.src, l = t[0] + "/media/thumb/" + t[12].media[0].url) || a(e, "src", l), a(e, "loading", "lazy");
+      e = g("img"), a(e, "style", i = "object-position: " + de(t[12]) + "; aspect-ratio=1.7778;"), a(e, "alt", l = t[12].media[0].name), G(e.src, n = t[0] + "/media/thumb/" + t[12].media[0].url) || a(e, "src", n), a(e, "loading", "lazy");
     },
     m(o, r) {
       v(o, e, r);
     },
     p(o, r) {
-      r & 32 && i !== (i = "object-position: " + de(o[12]) + "; aspect-ratio=1.7778;") && a(e, "style", i), r & 32 && n !== (n = o[12].media[0].name) && a(e, "alt", n), r & 33 && !G(e.src, l = o[0] + "/media/thumb/" + o[12].media[0].url) && a(e, "src", l);
+      r & 32 && i !== (i = "object-position: " + de(o[12]) + "; aspect-ratio=1.7778;") && a(e, "style", i), r & 32 && l !== (l = o[12].media[0].name) && a(e, "alt", l), r & 33 && !G(e.src, n = o[0] + "/media/thumb/" + o[12].media[0].url) && a(e, "src", n);
     },
     d(o) {
       o && x(e);
@@ -344,50 +344,50 @@ function Ge(t) {
   };
 }
 function ce(t) {
-  let e, i = t[12].tags, n = [];
-  for (let l = 0; l < i.length; l += 1)
-    n[l] = fe(le(t, i, l));
+  let e, i = t[12].tags, l = [];
+  for (let n = 0; n < i.length; n += 1)
+    l[n] = fe(ne(t, i, n));
   return {
     c() {
       e = g("div");
-      for (let l = 0; l < n.length; l += 1)
-        n[l].c();
+      for (let n = 0; n < l.length; n += 1)
+        l[n].c();
       a(e, "class", "tags");
     },
-    m(l, o) {
-      v(l, e, o);
-      for (let r = 0; r < n.length; r += 1)
-        n[r].m(e, null);
+    m(n, o) {
+      v(n, e, o);
+      for (let r = 0; r < l.length; r += 1)
+        l[r].m(e, null);
     },
-    p(l, o) {
+    p(n, o) {
       if (o & 32) {
-        i = l[12].tags;
+        i = n[12].tags;
         let r;
         for (r = 0; r < i.length; r += 1) {
-          const f = le(l, i, r);
-          n[r] ? n[r].p(f, o) : (n[r] = fe(f), n[r].c(), n[r].m(e, null));
+          const f = ne(n, i, r);
+          l[r] ? l[r].p(f, o) : (l[r] = fe(f), l[r].c(), l[r].m(e, null));
         }
-        for (; r < n.length; r += 1)
-          n[r].d(1);
-        n.length = i.length;
+        for (; r < l.length; r += 1)
+          l[r].d(1);
+        l.length = i.length;
       }
     },
-    d(l) {
-      l && x(e), pe(n, l);
+    d(n) {
+      n && x(e), pe(l, n);
     }
   };
 }
 function fe(t) {
-  let e, i, n = t[15] + "", l;
+  let e, i, l = t[15] + "", n;
   return {
     c() {
-      e = g("span"), i = j("#"), l = j(n), a(e, "class", "tag");
+      e = g("span"), i = j("#"), n = j(l), a(e, "class", "tag");
     },
     m(o, r) {
-      v(o, e, r), u(e, i), u(e, l);
+      v(o, e, r), u(e, i), u(e, n);
     },
     p(o, r) {
-      r & 32 && n !== (n = o[15] + "") && N(l, n);
+      r & 32 && l !== (l = o[15] + "") && N(n, l);
     },
     d(o) {
       o && x(e);
@@ -395,16 +395,16 @@ function fe(t) {
   };
 }
 function ue(t) {
-  let e, i, n, l, o = V(t[12]) + "", r, f, c, s = t[12].title + "", k, m, _, C, w = t[12].place.name + "", d, S, h, b = t[12].place.address + "", A, Y, Z, U, q, $ = t[3] !== "true" && se(t), E = t[12].tags.length && ce(t);
+  let e, i, l, n, o = V(t[12]) + "", r, f, c, s = t[12].title + "", k, m, _, C, w = t[12].place.name + "", d, S, h, b = t[12].place.address + "", A, Y, Z, U, q, $ = t[3] !== "true" && se(t), E = t[12].tags.length && ce(t);
   return {
     c() {
-      e = g("a"), $ && $.c(), i = z(), n = g("div"), l = g("div"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("span"), C = j("@"), d = j(w), S = z(), h = g("span"), A = j(b), Y = z(), E && E.c(), Z = z(), a(l, "class", "subtitle"), a(c, "class", "title"), a(h, "class", "subtitle"), a(_, "class", "place"), a(n, "class", "content"), a(e, "href", U = t[0] + "/event/" + (t[12].slug || t[12].id)), a(e, "class", "event"), a(e, "title", q = t[12].title), a(e, "target", "_blank");
+      e = g("a"), $ && $.c(), i = z(), l = g("div"), n = g("div"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("span"), C = j("@"), d = j(w), S = z(), h = g("span"), A = j(b), Y = z(), E && E.c(), Z = z(), a(n, "class", "subtitle"), a(c, "class", "title"), a(h, "class", "subtitle"), a(_, "class", "place"), a(l, "class", "content"), a(e, "href", U = t[0] + "/event/" + (t[12].slug || t[12].id)), a(e, "class", "event"), a(e, "title", q = t[12].title), a(e, "target", "_blank");
     },
     m(p, M) {
-      v(p, e, M), $ && $.m(e, null), u(e, i), u(e, n), u(n, l), u(l, r), u(n, f), u(n, c), u(c, k), u(n, m), u(n, _), u(_, C), u(_, d), u(_, S), u(_, h), u(h, A), u(n, Y), E && E.m(n, null), u(e, Z);
+      v(p, e, M), $ && $.m(e, null), u(e, i), u(e, l), u(l, n), u(n, r), u(l, f), u(l, c), u(c, k), u(l, m), u(l, _), u(_, C), u(_, d), u(_, S), u(_, h), u(h, A), u(l, Y), E && E.m(l, null), u(e, Z);
     },
     p(p, M) {
-      p[3] !== "true" ? $ ? $.p(p, M) : ($ = se(p), $.c(), $.m(e, i)) : $ && ($.d(1), $ = null), M & 32 && o !== (o = V(p[12]) + "") && N(r, o), M & 32 && s !== (s = p[12].title + "") && N(k, s), M & 32 && w !== (w = p[12].place.name + "") && N(d, w), M & 32 && b !== (b = p[12].place.address + "") && N(A, b), p[12].tags.length ? E ? E.p(p, M) : (E = ce(p), E.c(), E.m(n, null)) : E && (E.d(1), E = null), M & 33 && U !== (U = p[0] + "/event/" + (p[12].slug || p[12].id)) && a(e, "href", U), M & 32 && q !== (q = p[12].title) && a(e, "title", q);
+      p[3] !== "true" ? $ ? $.p(p, M) : ($ = se(p), $.c(), $.m(e, i)) : $ && ($.d(1), $ = null), M & 32 && o !== (o = V(p[12]) + "") && N(r, o), M & 32 && s !== (s = p[12].title + "") && N(k, s), M & 32 && w !== (w = p[12].place.name + "") && N(d, w), M & 32 && b !== (b = p[12].place.address + "") && N(A, b), p[12].tags.length ? E ? E.p(p, M) : (E = ce(p), E.c(), E.m(l, null)) : E && (E.d(1), E = null), M & 33 && U !== (U = p[0] + "/event/" + (p[12].slug || p[12].id)) && a(e, "href", U), M & 32 && q !== (q = p[12].title) && a(e, "title", q);
     },
     d(p) {
       p && x(e), $ && $.d(), E && E.d();
@@ -412,21 +412,21 @@ function ue(t) {
   };
 }
 function He(t) {
-  let e, i, n = t[4] && re(t), l = t[5].length && oe(t);
+  let e, i, l = t[4] && re(t), n = t[5].length && oe(t);
   return {
     c() {
-      n && n.c(), e = z(), l && l.c(), i = ve(), this.c = L;
+      l && l.c(), e = z(), n && n.c(), i = ve(), this.c = L;
     },
     m(o, r) {
-      n && n.m(o, r), v(o, e, r), l && l.m(o, r), v(o, i, r);
+      l && l.m(o, r), v(o, e, r), n && n.m(o, r), v(o, i, r);
     },
     p(o, [r]) {
-      o[4] ? n ? n.p(o, r) : (n = re(o), n.c(), n.m(e.parentNode, e)) : n && (n.d(1), n = null), o[5].length ? l ? l.p(o, r) : (l = oe(o), l.c(), l.m(i.parentNode, i)) : l && (l.d(1), l = null);
+      o[4] ? l ? l.p(o, r) : (l = re(o), l.c(), l.m(e.parentNode, e)) : l && (l.d(1), l = null), o[5].length ? n ? n.p(o, r) : (n = oe(o), n.c(), n.m(i.parentNode, i)) : n && (n.d(1), n = null);
     },
     i: L,
     o: L,
     d(o) {
-      n && n.d(o), o && x(e), l && l.d(o), o && x(i);
+      l && l.d(o), o && x(e), n && n.d(o), o && x(i);
     }
   };
 }
@@ -438,12 +438,12 @@ function de(t) {
   return "center center";
 }
 function Re(t, e, i) {
-  let { baseurl: n = "" } = e, { title: l = "" } = e, { maxlength: o = !1 } = e, { tags: r = "" } = e, { places: f = "" } = e, { theme: c = "light" } = e, { show_recurrent: s = !1 } = e, { sidebar: k = "true" } = e, { external_style: m = "" } = e, _ = !1, C = [];
+  let { baseurl: l = "" } = e, { title: n = "" } = e, { maxlength: o = !1 } = e, { tags: r = "" } = e, { places: f = "" } = e, { theme: c = "light" } = e, { show_recurrent: s = !1 } = e, { sidebar: k = "true" } = e, { external_style: m = "" } = e, _ = !1, C = [];
   function w(d) {
     if (!_)
       return;
     const S = [];
-    o && S.push(`max=${o}`), r && S.push(`tags=${r}`), f && S.push(`places=${f}`), S.push(`show_recurrent=${s ? "true" : "false"}`), fetch(`${n}/api/events?${S.join("&")}`).then((h) => h.json()).then((h) => {
+    o && S.push(`max=${o}`), r && S.push(`tags=${r}`), f && S.push(`places=${f}`), S.push(`show_recurrent=${s ? "true" : "false"}`), fetch(`${l}/api/events?${S.join("&")}`).then((h) => h.json()).then((h) => {
       i(5, C = h);
     }).catch((h) => {
       console.error("Error loading Gancio API -> ", h);
@@ -452,12 +452,12 @@ function Re(t, e, i) {
   return we(() => {
     _ = !0, w();
   }), t.$$set = (d) => {
-    "baseurl" in d && i(0, n = d.baseurl), "title" in d && i(1, l = d.title), "maxlength" in d && i(6, o = d.maxlength), "tags" in d && i(7, r = d.tags), "places" in d && i(8, f = d.places), "theme" in d && i(2, c = d.theme), "show_recurrent" in d && i(9, s = d.show_recurrent), "sidebar" in d && i(3, k = d.sidebar), "external_style" in d && i(4, m = d.external_style);
+    "baseurl" in d && i(0, l = d.baseurl), "title" in d && i(1, n = d.title), "maxlength" in d && i(6, o = d.maxlength), "tags" in d && i(7, r = d.tags), "places" in d && i(8, f = d.places), "theme" in d && i(2, c = d.theme), "show_recurrent" in d && i(9, s = d.show_recurrent), "sidebar" in d && i(3, k = d.sidebar), "external_style" in d && i(4, m = d.external_style);
   }, t.$$.update = () => {
     t.$$.dirty & 975 && w();
   }, [
-    n,
     l,
+    n,
     c,
     k,
     m,
@@ -570,13 +570,13 @@ class Ie extends X {
 }
 customElements.define("gancio-events", Ie);
 function he(t) {
-  let e, i, n, l, o = t[1].title + "", r, f, c, s = V(t[1]) + "", k, m, _, C, w = t[1].place.name + "", d, S, h = t[1].media.length && ge(t);
+  let e, i, l, n, o = t[1].title + "", r, f, c, s = V(t[1]) + "", k, m, _, C, w = t[1].place.name + "", d, S, h = t[1].media.length && ge(t);
   return {
     c() {
-      e = g("a"), h && h.c(), i = z(), n = g("div"), l = g("strong"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("div"), C = j("@"), d = j(w), a(_, "class", "place"), a(n, "class", "container"), a(e, "href", S = t[0] + "/event/" + (t[1].slug || t[1].id)), a(e, "class", "card"), a(e, "target", "_blank");
+      e = g("a"), h && h.c(), i = z(), l = g("div"), n = g("strong"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("div"), C = j("@"), d = j(w), a(_, "class", "place"), a(l, "class", "container"), a(e, "href", S = t[0] + "/event/" + (t[1].slug || t[1].id)), a(e, "class", "card"), a(e, "target", "_blank");
     },
     m(b, A) {
-      v(b, e, A), h && h.m(e, null), u(e, i), u(e, n), u(n, l), u(l, r), u(n, f), u(n, c), u(c, k), u(n, m), u(n, _), u(_, C), u(_, d);
+      v(b, e, A), h && h.m(e, null), u(e, i), u(e, l), u(l, n), u(n, r), u(l, f), u(l, c), u(c, k), u(l, m), u(l, _), u(_, C), u(_, d);
     },
     p(b, A) {
       b[1].media.length ? h ? h.p(b, A) : (h = ge(b), h.c(), h.m(e, i)) : h && (h.d(1), h = null), A & 2 && o !== (o = b[1].title + "") && N(r, o), A & 2 && s !== (s = V(b[1]) + "") && N(k, s), A & 2 && w !== (w = b[1].place.name + "") && N(d, w), A & 3 && S !== (S = b[0] + "/event/" + (b[1].slug || b[1].id)) && a(e, "href", S);
@@ -587,16 +587,16 @@ function he(t) {
   };
 }
 function ge(t) {
-  let e, i, n, l;
+  let e, i, l, n;
   return {
     c() {
-      e = g("img"), G(e.src, i = t[2](t[1])) || a(e, "src", i), a(e, "alt", n = t[1].media[0].name), a(e, "style", l = "object-position: " + me(t[1]) + "; aspect-ratio=1.7778;");
+      e = g("img"), G(e.src, i = t[2](t[1])) || a(e, "src", i), a(e, "alt", l = t[1].media[0].name), a(e, "style", n = "object-position: " + me(t[1]) + "; aspect-ratio=1.7778;");
     },
     m(o, r) {
       v(o, e, r);
     },
     p(o, r) {
-      r & 2 && !G(e.src, i = o[2](o[1])) && a(e, "src", i), r & 2 && n !== (n = o[1].media[0].name) && a(e, "alt", n), r & 2 && l !== (l = "object-position: " + me(o[1]) + "; aspect-ratio=1.7778;") && a(e, "style", l);
+      r & 2 && !G(e.src, i = o[2](o[1])) && a(e, "src", i), r & 2 && l !== (l = o[1].media[0].name) && a(e, "alt", l), r & 2 && n !== (n = "object-position: " + me(o[1]) + "; aspect-ratio=1.7778;") && a(e, "style", n);
     },
     d(o) {
       o && x(e);
@@ -609,16 +609,16 @@ function Oe(t) {
     c() {
       i && i.c(), e = ve(), this.c = L;
     },
-    m(n, l) {
-      i && i.m(n, l), v(n, e, l);
+    m(l, n) {
+      i && i.m(l, n), v(l, e, n);
     },
-    p(n, [l]) {
-      n[1] ? i ? i.p(n, l) : (i = he(n), i.c(), i.m(e.parentNode, e)) : i && (i.d(1), i = null);
+    p(l, [n]) {
+      l[1] ? i ? i.p(l, n) : (i = he(l), i.c(), i.m(e.parentNode, e)) : i && (i.d(1), i = null);
     },
     i: L,
     o: L,
-    d(n) {
-      i && i.d(n), n && x(e);
+    d(l) {
+      i && i.d(l), l && x(e);
     }
   };
 }
@@ -630,21 +630,21 @@ function me(t) {
   return "center center";
 }
 function Ue(t, e, i) {
-  let { baseurl: n = "https://demo.gancio.org" } = e, { id: l } = e, o = !1, r;
+  let { baseurl: l = "https://demo.gancio.org" } = e, { id: n } = e, o = !1, r;
   function f(s, k) {
-    o && fetch(`${k}/api/event/${s}`).then((m) => m.json()).then((m) => i(1, r = m));
+    o && fetch(`${k}/api/event/detail/${s}`).then((m) => m.json()).then((m) => i(1, r = m));
   }
   we(() => {
-    o = !0, f(l, n);
+    o = !0, f(n, l);
   });
   function c(s) {
-    return `${n}/media/thumb/${s.media[0].url}`;
+    return `${l}/media/thumb/${s.media[0].url}`;
   }
   return t.$$set = (s) => {
-    "baseurl" in s && i(0, n = s.baseurl), "id" in s && i(3, l = s.id);
+    "baseurl" in s && i(0, l = s.baseurl), "id" in s && i(3, n = s.id);
   }, t.$$.update = () => {
-    t.$$.dirty & 9 && f(l, n);
-  }, [n, r, c, l];
+    t.$$.dirty & 9 && f(n, l);
+  }, [l, r, c, n];
 }
 class qe extends X {
   constructor(e) {
diff --git a/webcomponents/src/GancioEvent.svelte b/webcomponents/src/GancioEvent.svelte
index d347cedc..0c7ba725 100644
--- a/webcomponents/src/GancioEvent.svelte
+++ b/webcomponents/src/GancioEvent.svelte
@@ -11,7 +11,7 @@
 
   function update(id, baseurl) {
     if (mounted) {
-      fetch(`${baseurl}/api/event/${id}`)
+      fetch(`${baseurl}/api/event/detail/${id}`)
         .then((res) => res.json())
         .then((e) => (event = e))
     }
diff --git a/wp-plugin/js/gancio-events.es.js b/wp-plugin/js/gancio-events.es.js
index a0a2adee..7376dcbb 100644
--- a/wp-plugin/js/gancio-events.es.js
+++ b/wp-plugin/js/gancio-events.es.js
@@ -117,9 +117,9 @@ const Ce = /* @__PURE__ */ new Set();
 function Ae(t, e) {
   t && t.i && (Ce.delete(t), t.i(e));
 }
-function Me(t, e, i, n) {
-  const { fragment: l, on_mount: o, on_destroy: r, after_update: f } = t.$$;
-  l && l.m(e, i), n || Q(() => {
+function Me(t, e, i, l) {
+  const { fragment: n, on_mount: o, on_destroy: r, after_update: f } = t.$$;
+  n && n.m(e, i), l || Q(() => {
     const c = o.map(W).filter(_e);
     r ? r.push(...c) : O(c), t.$$.on_mount = [];
   }), f.forEach(Q);
@@ -131,7 +131,7 @@ function Ne(t, e) {
 function Te(t, e) {
   t.$$.dirty[0] === -1 && (H.push(t), Se(), t.$$.dirty.fill(0)), t.$$.dirty[e / 31 | 0] |= 1 << e % 31;
 }
-function ye(t, e, i, n, l, o, r, f = [-1]) {
+function ye(t, e, i, l, n, o, r, f = [-1]) {
   const c = I;
   R(t);
   const s = t.$$ = {
@@ -139,7 +139,7 @@ function ye(t, e, i, n, l, o, r, f = [-1]) {
     ctx: null,
     props: o,
     update: L,
-    not_equal: l,
+    not_equal: n,
     bound: ee(),
     on_mount: [],
     on_destroy: [],
@@ -156,8 +156,8 @@ function ye(t, e, i, n, l, o, r, f = [-1]) {
   let k = !1;
   if (s.ctx = i ? i(t, e.props || {}, (m, _, ...C) => {
     const w = C.length ? C[0] : _;
-    return s.ctx && l(s.ctx[m], s.ctx[m] = w) && (!s.skip_bound && s.bound[m] && s.bound[m](w), k && Te(t, m)), _;
-  }) : [], s.update(), k = !0, O(s.before_update), s.fragment = n ? n(s.ctx) : !1, e.target) {
+    return s.ctx && n(s.ctx[m], s.ctx[m] = w) && (!s.skip_bound && s.bound[m] && s.bound[m](w), k && Te(t, m)), _;
+  }) : [], s.update(), k = !0, O(s.before_update), s.fragment = l ? l(s.ctx) : !1, e.target) {
     if (e.hydrate) {
       const m = $e(e.target);
       s.fragment && s.fragment.l(m), m.forEach(x);
@@ -190,8 +190,8 @@ typeof HTMLElement == "function" && (X = class extends HTMLElement {
   $on(t, e) {
     const i = this.$$.callbacks[t] || (this.$$.callbacks[t] = []);
     return i.push(e), () => {
-      const n = i.indexOf(e);
-      n !== -1 && i.splice(n, 1);
+      const l = i.indexOf(e);
+      l !== -1 && i.splice(l, 1);
     };
   }
   $set(t) {
@@ -211,13 +211,13 @@ function F(t, e = "long") {
 function V(t) {
   return t.multidate ? F(t.start_datetime) + " - " + F(t.end_datetime) : F(t.start_datetime) + (t.end_datetime ? "-" + F(t.end_datetime, "short") : "");
 }
-function ne(t, e, i) {
-  const n = t.slice();
-  return n[12] = e[i], n;
-}
 function le(t, e, i) {
-  const n = t.slice();
-  return n[15] = e[i], n;
+  const l = t.slice();
+  return l[12] = e[i], l;
+}
+function ne(t, e, i) {
+  const l = t.slice();
+  return l[15] = e[i], l;
 }
 function re(t) {
   let e;
@@ -225,11 +225,11 @@ function re(t) {
     c() {
       e = g("link"), a(e, "rel", "stylesheet"), a(e, "href", t[4]);
     },
-    m(i, n) {
-      v(i, e, n);
+    m(i, l) {
+      v(i, e, l);
     },
-    p(i, n) {
-      n & 16 && a(e, "href", i[4]);
+    p(i, l) {
+      l & 16 && a(e, "href", i[4]);
     },
     d(i) {
       i && x(e);
@@ -237,51 +237,51 @@ function re(t) {
   };
 }
 function oe(t) {
-  let e, i, n = t[1] && t[3] === "true" && ae(t), l = t[5], o = [];
-  for (let r = 0; r < l.length; r += 1)
-    o[r] = ue(ne(t, l, r));
+  let e, i, l = t[1] && t[3] === "true" && ae(t), n = t[5], o = [];
+  for (let r = 0; r < n.length; r += 1)
+    o[r] = ue(le(t, n, r));
   return {
     c() {
-      e = g("div"), n && n.c(), i = z();
+      e = g("div"), l && l.c(), i = z();
       for (let r = 0; r < o.length; r += 1)
         o[r].c();
       a(e, "id", "gancioEvents"), T(e, "dark", t[2] === "dark"), T(e, "light", t[2] === "light"), T(e, "sidebar", t[3] === "true"), T(e, "nosidebar", t[3] !== "true");
     },
     m(r, f) {
-      v(r, e, f), n && n.m(e, null), u(e, i);
+      v(r, e, f), l && l.m(e, null), u(e, i);
       for (let c = 0; c < o.length; c += 1)
         o[c].m(e, null);
     },
     p(r, f) {
-      if (r[1] && r[3] === "true" ? n ? n.p(r, f) : (n = ae(r), n.c(), n.m(e, i)) : n && (n.d(1), n = null), f & 41) {
-        l = r[5];
+      if (r[1] && r[3] === "true" ? l ? l.p(r, f) : (l = ae(r), l.c(), l.m(e, i)) : l && (l.d(1), l = null), f & 41) {
+        n = r[5];
         let c;
-        for (c = 0; c < l.length; c += 1) {
-          const s = ne(r, l, c);
+        for (c = 0; c < n.length; c += 1) {
+          const s = le(r, n, c);
           o[c] ? o[c].p(s, f) : (o[c] = ue(s), o[c].c(), o[c].m(e, null));
         }
         for (; c < o.length; c += 1)
           o[c].d(1);
-        o.length = l.length;
+        o.length = n.length;
       }
       f & 4 && T(e, "dark", r[2] === "dark"), f & 4 && T(e, "light", r[2] === "light"), f & 8 && T(e, "sidebar", r[3] === "true"), f & 8 && T(e, "nosidebar", r[3] !== "true");
     },
     d(r) {
-      r && x(e), n && n.d(), pe(o, r);
+      r && x(e), l && l.d(), pe(o, r);
     }
   };
 }
 function ae(t) {
-  let e, i, n, l, o, r, f;
+  let e, i, l, n, o, r, f;
   return {
     c() {
-      e = g("a"), i = g("div"), n = g("div"), l = j(t[1]), o = z(), r = g("img"), a(n, "class", "title"), a(r, "id", "logo"), a(r, "alt", "logo"), G(r.src, f = t[0] + "/logo.png") || a(r, "src", f), a(i, "class", "content"), a(e, "href", t[0]), a(e, "target", "_blank"), a(e, "id", "header");
+      e = g("a"), i = g("div"), l = g("div"), n = j(t[1]), o = z(), r = g("img"), a(l, "class", "title"), a(r, "id", "logo"), a(r, "alt", "logo"), G(r.src, f = t[0] + "/logo.png") || a(r, "src", f), a(i, "class", "content"), a(e, "href", t[0]), a(e, "target", "_blank"), a(e, "id", "header");
     },
     m(c, s) {
-      v(c, e, s), u(e, i), u(i, n), u(n, l), u(i, o), u(i, r);
+      v(c, e, s), u(e, i), u(i, l), u(l, n), u(i, o), u(i, r);
     },
     p(c, s) {
-      s & 2 && N(l, c[1]), s & 1 && !G(r.src, f = c[0] + "/logo.png") && a(r, "src", f), s & 1 && a(e, "href", c[0]);
+      s & 2 && N(n, c[1]), s & 1 && !G(r.src, f = c[0] + "/logo.png") && a(r, "src", f), s & 1 && a(e, "href", c[0]);
     },
     d(c) {
       c && x(e);
@@ -293,50 +293,50 @@ function se(t) {
   function i(o, r) {
     return o[12].media.length ? Ge : Le;
   }
-  let n = i(t), l = n(t);
+  let l = i(t), n = l(t);
   return {
     c() {
-      e = g("div"), l.c(), a(e, "class", "img");
+      e = g("div"), n.c(), a(e, "class", "img");
     },
     m(o, r) {
-      v(o, e, r), l.m(e, null);
+      v(o, e, r), n.m(e, null);
     },
     p(o, r) {
-      n === (n = i(o)) && l ? l.p(o, r) : (l.d(1), l = n(o), l && (l.c(), l.m(e, null)));
+      l === (l = i(o)) && n ? n.p(o, r) : (n.d(1), n = l(o), n && (n.c(), n.m(e, null)));
     },
     d(o) {
-      o && x(e), l.d();
+      o && x(e), n.d();
     }
   };
 }
 function Le(t) {
-  let e, i, n;
+  let e, i, l;
   return {
     c() {
-      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/fallbackimage.png") || a(e, "src", n), a(e, "loading", "lazy");
+      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, l = t[0] + "/fallbackimage.png") || a(e, "src", l), a(e, "loading", "lazy");
     },
-    m(l, o) {
-      v(l, e, o);
+    m(n, o) {
+      v(n, e, o);
     },
-    p(l, o) {
-      o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/fallbackimage.png") && a(e, "src", n);
+    p(n, o) {
+      o & 32 && i !== (i = n[12].title) && a(e, "alt", i), o & 1 && !G(e.src, l = n[0] + "/fallbackimage.png") && a(e, "src", l);
     },
-    d(l) {
-      l && x(e);
+    d(n) {
+      n && x(e);
     }
   };
 }
 function Ge(t) {
-  let e, i, n, l;
+  let e, i, l, n;
   return {
     c() {
-      e = g("img"), a(e, "style", i = "object-position: " + de(t[12]) + "; aspect-ratio=1.7778;"), a(e, "alt", n = t[12].media[0].name), G(e.src, l = t[0] + "/media/thumb/" + t[12].media[0].url) || a(e, "src", l), a(e, "loading", "lazy");
+      e = g("img"), a(e, "style", i = "object-position: " + de(t[12]) + "; aspect-ratio=1.7778;"), a(e, "alt", l = t[12].media[0].name), G(e.src, n = t[0] + "/media/thumb/" + t[12].media[0].url) || a(e, "src", n), a(e, "loading", "lazy");
     },
     m(o, r) {
       v(o, e, r);
     },
     p(o, r) {
-      r & 32 && i !== (i = "object-position: " + de(o[12]) + "; aspect-ratio=1.7778;") && a(e, "style", i), r & 32 && n !== (n = o[12].media[0].name) && a(e, "alt", n), r & 33 && !G(e.src, l = o[0] + "/media/thumb/" + o[12].media[0].url) && a(e, "src", l);
+      r & 32 && i !== (i = "object-position: " + de(o[12]) + "; aspect-ratio=1.7778;") && a(e, "style", i), r & 32 && l !== (l = o[12].media[0].name) && a(e, "alt", l), r & 33 && !G(e.src, n = o[0] + "/media/thumb/" + o[12].media[0].url) && a(e, "src", n);
     },
     d(o) {
       o && x(e);
@@ -344,50 +344,50 @@ function Ge(t) {
   };
 }
 function ce(t) {
-  let e, i = t[12].tags, n = [];
-  for (let l = 0; l < i.length; l += 1)
-    n[l] = fe(le(t, i, l));
+  let e, i = t[12].tags, l = [];
+  for (let n = 0; n < i.length; n += 1)
+    l[n] = fe(ne(t, i, n));
   return {
     c() {
       e = g("div");
-      for (let l = 0; l < n.length; l += 1)
-        n[l].c();
+      for (let n = 0; n < l.length; n += 1)
+        l[n].c();
       a(e, "class", "tags");
     },
-    m(l, o) {
-      v(l, e, o);
-      for (let r = 0; r < n.length; r += 1)
-        n[r].m(e, null);
+    m(n, o) {
+      v(n, e, o);
+      for (let r = 0; r < l.length; r += 1)
+        l[r].m(e, null);
     },
-    p(l, o) {
+    p(n, o) {
       if (o & 32) {
-        i = l[12].tags;
+        i = n[12].tags;
         let r;
         for (r = 0; r < i.length; r += 1) {
-          const f = le(l, i, r);
-          n[r] ? n[r].p(f, o) : (n[r] = fe(f), n[r].c(), n[r].m(e, null));
+          const f = ne(n, i, r);
+          l[r] ? l[r].p(f, o) : (l[r] = fe(f), l[r].c(), l[r].m(e, null));
         }
-        for (; r < n.length; r += 1)
-          n[r].d(1);
-        n.length = i.length;
+        for (; r < l.length; r += 1)
+          l[r].d(1);
+        l.length = i.length;
       }
     },
-    d(l) {
-      l && x(e), pe(n, l);
+    d(n) {
+      n && x(e), pe(l, n);
     }
   };
 }
 function fe(t) {
-  let e, i, n = t[15] + "", l;
+  let e, i, l = t[15] + "", n;
   return {
     c() {
-      e = g("span"), i = j("#"), l = j(n), a(e, "class", "tag");
+      e = g("span"), i = j("#"), n = j(l), a(e, "class", "tag");
     },
     m(o, r) {
-      v(o, e, r), u(e, i), u(e, l);
+      v(o, e, r), u(e, i), u(e, n);
     },
     p(o, r) {
-      r & 32 && n !== (n = o[15] + "") && N(l, n);
+      r & 32 && l !== (l = o[15] + "") && N(n, l);
     },
     d(o) {
       o && x(e);
@@ -395,16 +395,16 @@ function fe(t) {
   };
 }
 function ue(t) {
-  let e, i, n, l, o = V(t[12]) + "", r, f, c, s = t[12].title + "", k, m, _, C, w = t[12].place.name + "", d, S, h, b = t[12].place.address + "", A, Y, Z, U, q, $ = t[3] !== "true" && se(t), E = t[12].tags.length && ce(t);
+  let e, i, l, n, o = V(t[12]) + "", r, f, c, s = t[12].title + "", k, m, _, C, w = t[12].place.name + "", d, S, h, b = t[12].place.address + "", A, Y, Z, U, q, $ = t[3] !== "true" && se(t), E = t[12].tags.length && ce(t);
   return {
     c() {
-      e = g("a"), $ && $.c(), i = z(), n = g("div"), l = g("div"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("span"), C = j("@"), d = j(w), S = z(), h = g("span"), A = j(b), Y = z(), E && E.c(), Z = z(), a(l, "class", "subtitle"), a(c, "class", "title"), a(h, "class", "subtitle"), a(_, "class", "place"), a(n, "class", "content"), a(e, "href", U = t[0] + "/event/" + (t[12].slug || t[12].id)), a(e, "class", "event"), a(e, "title", q = t[12].title), a(e, "target", "_blank");
+      e = g("a"), $ && $.c(), i = z(), l = g("div"), n = g("div"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("span"), C = j("@"), d = j(w), S = z(), h = g("span"), A = j(b), Y = z(), E && E.c(), Z = z(), a(n, "class", "subtitle"), a(c, "class", "title"), a(h, "class", "subtitle"), a(_, "class", "place"), a(l, "class", "content"), a(e, "href", U = t[0] + "/event/" + (t[12].slug || t[12].id)), a(e, "class", "event"), a(e, "title", q = t[12].title), a(e, "target", "_blank");
     },
     m(p, M) {
-      v(p, e, M), $ && $.m(e, null), u(e, i), u(e, n), u(n, l), u(l, r), u(n, f), u(n, c), u(c, k), u(n, m), u(n, _), u(_, C), u(_, d), u(_, S), u(_, h), u(h, A), u(n, Y), E && E.m(n, null), u(e, Z);
+      v(p, e, M), $ && $.m(e, null), u(e, i), u(e, l), u(l, n), u(n, r), u(l, f), u(l, c), u(c, k), u(l, m), u(l, _), u(_, C), u(_, d), u(_, S), u(_, h), u(h, A), u(l, Y), E && E.m(l, null), u(e, Z);
     },
     p(p, M) {
-      p[3] !== "true" ? $ ? $.p(p, M) : ($ = se(p), $.c(), $.m(e, i)) : $ && ($.d(1), $ = null), M & 32 && o !== (o = V(p[12]) + "") && N(r, o), M & 32 && s !== (s = p[12].title + "") && N(k, s), M & 32 && w !== (w = p[12].place.name + "") && N(d, w), M & 32 && b !== (b = p[12].place.address + "") && N(A, b), p[12].tags.length ? E ? E.p(p, M) : (E = ce(p), E.c(), E.m(n, null)) : E && (E.d(1), E = null), M & 33 && U !== (U = p[0] + "/event/" + (p[12].slug || p[12].id)) && a(e, "href", U), M & 32 && q !== (q = p[12].title) && a(e, "title", q);
+      p[3] !== "true" ? $ ? $.p(p, M) : ($ = se(p), $.c(), $.m(e, i)) : $ && ($.d(1), $ = null), M & 32 && o !== (o = V(p[12]) + "") && N(r, o), M & 32 && s !== (s = p[12].title + "") && N(k, s), M & 32 && w !== (w = p[12].place.name + "") && N(d, w), M & 32 && b !== (b = p[12].place.address + "") && N(A, b), p[12].tags.length ? E ? E.p(p, M) : (E = ce(p), E.c(), E.m(l, null)) : E && (E.d(1), E = null), M & 33 && U !== (U = p[0] + "/event/" + (p[12].slug || p[12].id)) && a(e, "href", U), M & 32 && q !== (q = p[12].title) && a(e, "title", q);
     },
     d(p) {
       p && x(e), $ && $.d(), E && E.d();
@@ -412,21 +412,21 @@ function ue(t) {
   };
 }
 function He(t) {
-  let e, i, n = t[4] && re(t), l = t[5].length && oe(t);
+  let e, i, l = t[4] && re(t), n = t[5].length && oe(t);
   return {
     c() {
-      n && n.c(), e = z(), l && l.c(), i = ve(), this.c = L;
+      l && l.c(), e = z(), n && n.c(), i = ve(), this.c = L;
     },
     m(o, r) {
-      n && n.m(o, r), v(o, e, r), l && l.m(o, r), v(o, i, r);
+      l && l.m(o, r), v(o, e, r), n && n.m(o, r), v(o, i, r);
     },
     p(o, [r]) {
-      o[4] ? n ? n.p(o, r) : (n = re(o), n.c(), n.m(e.parentNode, e)) : n && (n.d(1), n = null), o[5].length ? l ? l.p(o, r) : (l = oe(o), l.c(), l.m(i.parentNode, i)) : l && (l.d(1), l = null);
+      o[4] ? l ? l.p(o, r) : (l = re(o), l.c(), l.m(e.parentNode, e)) : l && (l.d(1), l = null), o[5].length ? n ? n.p(o, r) : (n = oe(o), n.c(), n.m(i.parentNode, i)) : n && (n.d(1), n = null);
     },
     i: L,
     o: L,
     d(o) {
-      n && n.d(o), o && x(e), l && l.d(o), o && x(i);
+      l && l.d(o), o && x(e), n && n.d(o), o && x(i);
     }
   };
 }
@@ -438,12 +438,12 @@ function de(t) {
   return "center center";
 }
 function Re(t, e, i) {
-  let { baseurl: n = "" } = e, { title: l = "" } = e, { maxlength: o = !1 } = e, { tags: r = "" } = e, { places: f = "" } = e, { theme: c = "light" } = e, { show_recurrent: s = !1 } = e, { sidebar: k = "true" } = e, { external_style: m = "" } = e, _ = !1, C = [];
+  let { baseurl: l = "" } = e, { title: n = "" } = e, { maxlength: o = !1 } = e, { tags: r = "" } = e, { places: f = "" } = e, { theme: c = "light" } = e, { show_recurrent: s = !1 } = e, { sidebar: k = "true" } = e, { external_style: m = "" } = e, _ = !1, C = [];
   function w(d) {
     if (!_)
       return;
     const S = [];
-    o && S.push(`max=${o}`), r && S.push(`tags=${r}`), f && S.push(`places=${f}`), S.push(`show_recurrent=${s ? "true" : "false"}`), fetch(`${n}/api/events?${S.join("&")}`).then((h) => h.json()).then((h) => {
+    o && S.push(`max=${o}`), r && S.push(`tags=${r}`), f && S.push(`places=${f}`), S.push(`show_recurrent=${s ? "true" : "false"}`), fetch(`${l}/api/events?${S.join("&")}`).then((h) => h.json()).then((h) => {
       i(5, C = h);
     }).catch((h) => {
       console.error("Error loading Gancio API -> ", h);
@@ -452,12 +452,12 @@ function Re(t, e, i) {
   return we(() => {
     _ = !0, w();
   }), t.$$set = (d) => {
-    "baseurl" in d && i(0, n = d.baseurl), "title" in d && i(1, l = d.title), "maxlength" in d && i(6, o = d.maxlength), "tags" in d && i(7, r = d.tags), "places" in d && i(8, f = d.places), "theme" in d && i(2, c = d.theme), "show_recurrent" in d && i(9, s = d.show_recurrent), "sidebar" in d && i(3, k = d.sidebar), "external_style" in d && i(4, m = d.external_style);
+    "baseurl" in d && i(0, l = d.baseurl), "title" in d && i(1, n = d.title), "maxlength" in d && i(6, o = d.maxlength), "tags" in d && i(7, r = d.tags), "places" in d && i(8, f = d.places), "theme" in d && i(2, c = d.theme), "show_recurrent" in d && i(9, s = d.show_recurrent), "sidebar" in d && i(3, k = d.sidebar), "external_style" in d && i(4, m = d.external_style);
   }, t.$$.update = () => {
     t.$$.dirty & 975 && w();
   }, [
-    n,
     l,
+    n,
     c,
     k,
     m,
@@ -570,13 +570,13 @@ class Ie extends X {
 }
 customElements.define("gancio-events", Ie);
 function he(t) {
-  let e, i, n, l, o = t[1].title + "", r, f, c, s = V(t[1]) + "", k, m, _, C, w = t[1].place.name + "", d, S, h = t[1].media.length && ge(t);
+  let e, i, l, n, o = t[1].title + "", r, f, c, s = V(t[1]) + "", k, m, _, C, w = t[1].place.name + "", d, S, h = t[1].media.length && ge(t);
   return {
     c() {
-      e = g("a"), h && h.c(), i = z(), n = g("div"), l = g("strong"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("div"), C = j("@"), d = j(w), a(_, "class", "place"), a(n, "class", "container"), a(e, "href", S = t[0] + "/event/" + (t[1].slug || t[1].id)), a(e, "class", "card"), a(e, "target", "_blank");
+      e = g("a"), h && h.c(), i = z(), l = g("div"), n = g("strong"), r = j(o), f = z(), c = g("div"), k = j(s), m = z(), _ = g("div"), C = j("@"), d = j(w), a(_, "class", "place"), a(l, "class", "container"), a(e, "href", S = t[0] + "/event/" + (t[1].slug || t[1].id)), a(e, "class", "card"), a(e, "target", "_blank");
     },
     m(b, A) {
-      v(b, e, A), h && h.m(e, null), u(e, i), u(e, n), u(n, l), u(l, r), u(n, f), u(n, c), u(c, k), u(n, m), u(n, _), u(_, C), u(_, d);
+      v(b, e, A), h && h.m(e, null), u(e, i), u(e, l), u(l, n), u(n, r), u(l, f), u(l, c), u(c, k), u(l, m), u(l, _), u(_, C), u(_, d);
     },
     p(b, A) {
       b[1].media.length ? h ? h.p(b, A) : (h = ge(b), h.c(), h.m(e, i)) : h && (h.d(1), h = null), A & 2 && o !== (o = b[1].title + "") && N(r, o), A & 2 && s !== (s = V(b[1]) + "") && N(k, s), A & 2 && w !== (w = b[1].place.name + "") && N(d, w), A & 3 && S !== (S = b[0] + "/event/" + (b[1].slug || b[1].id)) && a(e, "href", S);
@@ -587,16 +587,16 @@ function he(t) {
   };
 }
 function ge(t) {
-  let e, i, n, l;
+  let e, i, l, n;
   return {
     c() {
-      e = g("img"), G(e.src, i = t[2](t[1])) || a(e, "src", i), a(e, "alt", n = t[1].media[0].name), a(e, "style", l = "object-position: " + me(t[1]) + "; aspect-ratio=1.7778;");
+      e = g("img"), G(e.src, i = t[2](t[1])) || a(e, "src", i), a(e, "alt", l = t[1].media[0].name), a(e, "style", n = "object-position: " + me(t[1]) + "; aspect-ratio=1.7778;");
     },
     m(o, r) {
       v(o, e, r);
     },
     p(o, r) {
-      r & 2 && !G(e.src, i = o[2](o[1])) && a(e, "src", i), r & 2 && n !== (n = o[1].media[0].name) && a(e, "alt", n), r & 2 && l !== (l = "object-position: " + me(o[1]) + "; aspect-ratio=1.7778;") && a(e, "style", l);
+      r & 2 && !G(e.src, i = o[2](o[1])) && a(e, "src", i), r & 2 && l !== (l = o[1].media[0].name) && a(e, "alt", l), r & 2 && n !== (n = "object-position: " + me(o[1]) + "; aspect-ratio=1.7778;") && a(e, "style", n);
     },
     d(o) {
       o && x(e);
@@ -609,16 +609,16 @@ function Oe(t) {
     c() {
       i && i.c(), e = ve(), this.c = L;
     },
-    m(n, l) {
-      i && i.m(n, l), v(n, e, l);
+    m(l, n) {
+      i && i.m(l, n), v(l, e, n);
     },
-    p(n, [l]) {
-      n[1] ? i ? i.p(n, l) : (i = he(n), i.c(), i.m(e.parentNode, e)) : i && (i.d(1), i = null);
+    p(l, [n]) {
+      l[1] ? i ? i.p(l, n) : (i = he(l), i.c(), i.m(e.parentNode, e)) : i && (i.d(1), i = null);
     },
     i: L,
     o: L,
-    d(n) {
-      i && i.d(n), n && x(e);
+    d(l) {
+      i && i.d(l), l && x(e);
     }
   };
 }
@@ -630,21 +630,21 @@ function me(t) {
   return "center center";
 }
 function Ue(t, e, i) {
-  let { baseurl: n = "https://demo.gancio.org" } = e, { id: l } = e, o = !1, r;
+  let { baseurl: l = "https://demo.gancio.org" } = e, { id: n } = e, o = !1, r;
   function f(s, k) {
-    o && fetch(`${k}/api/event/${s}`).then((m) => m.json()).then((m) => i(1, r = m));
+    o && fetch(`${k}/api/event/detail/${s}`).then((m) => m.json()).then((m) => i(1, r = m));
   }
   we(() => {
-    o = !0, f(l, n);
+    o = !0, f(n, l);
   });
   function c(s) {
-    return `${n}/media/thumb/${s.media[0].url}`;
+    return `${l}/media/thumb/${s.media[0].url}`;
   }
   return t.$$set = (s) => {
-    "baseurl" in s && i(0, n = s.baseurl), "id" in s && i(3, l = s.id);
+    "baseurl" in s && i(0, l = s.baseurl), "id" in s && i(3, n = s.id);
   }, t.$$.update = () => {
-    t.$$.dirty & 9 && f(l, n);
-  }, [n, r, c, l];
+    t.$$.dirty & 9 && f(n, l);
+  }, [l, r, c, n];
 }
 class qe extends X {
   constructor(e) {

From 7fa2e1aa0ccc49efac2933e83eca84a45bc53a62 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Fri, 13 Jan 2023 22:28:38 +0100
Subject: [PATCH 17/38] init api rate-limit on geolocation api routes

---
 package.json                         |  1 +
 server/api/controller/geolocation.js | 38 ++++++++++++++++++++++++++++
 server/api/index.js                  |  6 ++---
 yarn.lock                            |  7 +++--
 4 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 server/api/controller/geolocation.js

diff --git a/package.json b/package.json
index e2c0d2fc..437e4b93 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "dompurify": "^2.4.1",
     "email-templates": "^10.0.1",
     "express": "^4.18.1",
+    "express-rate-limit": "^6.7.0",
     "http-signature": "^1.3.6",
     "https-proxy-agent": "^5.0.1",
     "ical.js": "^1.5.0",
diff --git a/server/api/controller/geolocation.js b/server/api/controller/geolocation.js
new file mode 100644
index 00000000..fd0aa220
--- /dev/null
+++ b/server/api/controller/geolocation.js
@@ -0,0 +1,38 @@
+const rateLimit = require('express-rate-limit');
+const log = require('../../log')
+let curReq
+
+const geolocationController = {
+  rateLimiter: rateLimit({
+    windowMs: 15 * 60 * 1000, // 15 minutes
+    max: 100, // Limit each IP to 100 requests per `window` (here, per 15 minutes)
+    standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
+    legacyHeaders: false, // Disable the `X-RateLimit-*` headers
+  }),
+
+  /** 
+   * Limit api usage
+   * From https://operations.osmfoundation.org/policies/nominatim/
+   * [Requirements] No heavy uses (an absolute maximum of 1 request per second).
+   * [Websites and Apps] Note that the usage limits above apply per website/application: the sum of traffic by all your users should not exceed the limits.
+   */
+  apiLimit (req, res, next) {
+    prevReq = curReq
+    curReq = Date.now()
+    deltaTime = (curReq - prevReq)
+
+    if (typeof prevReq === 'undefined' || deltaTime > 1000) {
+      geolocationController.rateLimiter(req, res, next)
+    } else {
+      log.warn('More than 1 request per second to geolocation api come from ' + req.ip)
+
+      setTimeout(() => {
+        geolocationController.rateLimiter(req, res, next)
+      }, 1000 - deltaTime)
+    }
+    
+  }
+  
+}
+
+module.exports = geolocationController
\ No newline at end of file
diff --git a/server/api/index.js b/server/api/index.js
index 49d0e61d..32e15198 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -19,6 +19,7 @@ const resourceController = require('./controller/resource')
 const oauthController = require('./controller/oauth')
 const announceController = require('./controller/announce')
 const pluginController = require('./controller/plugins')
+const geolocationController = require('./controller/geolocation')
 const helpers = require('../helpers')
 const storage = require('./storage')
 
@@ -65,7 +66,6 @@ module.exports = () => {
     api.get('/ping', (_req, res) => res.sendStatus(200))
     api.get('/user', isAuth, (req, res) => res.json(req.user))
   
-  
     api.post('/user/recover', userController.forgotPassword)
     api.post('/user/check_recover_code', userController.checkRecoverCode)
     api.post('/user/recover_password', userController.updatePasswordWithRecoverCode)
@@ -173,8 +173,8 @@ module.exports = () => {
     api.put('/place', isAdmin, placeController.updatePlace)
 
     // - GEOCODING
-    api.get('/placeOSM/Nominatim/:place_details', helpers.isGeocodingEnabled, placeController._nominatim)
-    api.get('/placeOSM/Photon/:place_details', helpers.isGeocodingEnabled, placeController._photon)
+    api.get('/placeOSM/Nominatim/:place_details', helpers.isGeocodingEnabled, geolocationController.apiLimit, placeController._nominatim)
+    api.get('/placeOSM/Photon/:place_details', helpers.isGeocodingEnabled, geolocationController.apiLimit, placeController._photon)
   
     // - TAGS
     api.get('/tags', isAdmin, tagController.getAll)
diff --git a/yarn.lock b/yarn.lock
index 7de9e8e5..2445ccf5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5160,6 +5160,11 @@ expect@^29.3.1:
     jest-message-util "^29.3.1"
     jest-util "^29.3.1"
 
+express-rate-limit@^6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-6.7.0.tgz#6aa8a1bd63dfe79702267b3af1161a93afc1d3c2"
+  integrity sha512-vhwIdRoqcYB/72TK3tRZI+0ttS8Ytrk24GfmsxDXK9o9IhHNO5bXRiXQSExPQ4GbaE5tvIS7j1SGrxsuWs+sGA==
+
 express@^4.18.1:
   version "4.18.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
@@ -12636,10 +12641,8 @@ watchpack@^1.7.4:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
   integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
-    chokidar "^3.4.1"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
-    watchpack-chokidar2 "^2.0.1"
   optionalDependencies:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"

From e8a18bcd3a6e82efffaa395a1b4a7a43ff567ab7 Mon Sep 17 00:00:00 2001
From: Nacho <nacho@nucleartesuji.com>
Date: Fri, 13 Jan 2023 12:03:14 +0000
Subject: [PATCH 18/38] Translated using Weblate (Spanish)

Currently translated at 100.0% (313 of 313 strings)

Translation: Gancio/Web
Translate-URL: https://hosted.weblate.org/projects/gancio/web/es/
---
 locales/es.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/es.json b/locales/es.json
index d22539d9..4eab849b 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -64,7 +64,7 @@
         "embed": "Incorporar",
         "embed_title": "Publica este evento en tu página web",
         "embed_help": "Copiando el siguiente código en tu página web, el evento será incluido como puedes ver aquí al lado",
-        "feed": "RSS Feed",
+        "feed": "Canal RSS",
         "feed_url_copied": "Copiada feed url, pegala en tu lector de feeds",
         "follow_me_title": "Sigue las actualizaciones en el fediverso",
         "follow": "Sigue",

From 4972156c7c5d48c814800199880fb1cd5975a39e Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 12 Jan 2023 14:09:04 +0000
Subject: [PATCH 19/38] Translated using Weblate (Spanish)

Currently translated at 100.0% (313 of 313 strings)

Translation: Gancio/Web
Translate-URL: https://hosted.weblate.org/projects/gancio/web/es/
---
 locales/es.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/locales/es.json b/locales/es.json
index 4eab849b..2d4f33d6 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -183,7 +183,8 @@
         "address_description": "¿Cuál es la dirección?",
         "alt_text_description": "Descripción para personas con baja visión",
         "download_flyer": "Descargar folleto",
-        "remove_media_confirmation": "¿Confirmas la eliminación de la imagen?"
+        "remove_media_confirmation": "¿Confirmas la eliminación de la imagen?",
+        "show_multidate": "eventos de varios días"
     },
     "admin": {
         "place_description": "En el caso de que un lugar sea incorrecto o cambie de dirección, puedes cambiarlo. <br/> Todos los eventos presentes y pasados asociados con este lugar cambiarán de dirección.",

From c72efd192f76d73c066e387fce41470cc78c9846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jos=C3=A9=20m?= <correoxm@disroot.org>
Date: Thu, 12 Jan 2023 14:30:17 +0000
Subject: [PATCH 20/38] Translated using Weblate (Galician)

Currently translated at 100.0% (313 of 313 strings)

Translation: Gancio/Web
Translate-URL: https://hosted.weblate.org/projects/gancio/web/gl/
---
 locales/gl.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/locales/gl.json b/locales/gl.json
index eed85faa..99dc26b8 100644
--- a/locales/gl.json
+++ b/locales/gl.json
@@ -174,7 +174,8 @@
         "remove_media_confirmation": "Confirmas a eliminación da imaxe?",
         "download_flyer": "Descargar folleto",
         "address_description": "Cal é o enderezo?",
-        "address_description_osm": "Cal é o enderezo? (Contribuíntes a <a href='http://osm.org/copyright'>OpenStreetMap</a>)"
+        "address_description_osm": "Cal é o enderezo? (Contribuíntes a <a href='http://osm.org/copyright'>OpenStreetMap</a>)",
+        "show_multidate": "eventos con varias datas"
     },
     "admin": {
         "place_description": "Se escribiches mal o lugar ou enderezo, podes cambialo.<br/>Cambiará o enderezo de tódolos eventos actuais e pasados asociados a este lugar.",

From ebb3fcbd93b4b5290684c8805fc7a1f4a596af7b Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Sat, 14 Jan 2023 14:53:51 +0100
Subject: [PATCH 21/38] geolocation api rate-limit: add a delay of at least 1s
 between requests

---
 server/api/controller/geolocation.js | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/server/api/controller/geolocation.js b/server/api/controller/geolocation.js
index fd0aa220..9ff07ead 100644
--- a/server/api/controller/geolocation.js
+++ b/server/api/controller/geolocation.js
@@ -1,6 +1,6 @@
 const rateLimit = require('express-rate-limit');
 const log = require('../../log')
-let curReq
+let d // departure time
 
 const geolocationController = {
   rateLimiter: rateLimit({
@@ -17,18 +17,26 @@ const geolocationController = {
    * [Websites and Apps] Note that the usage limits above apply per website/application: the sum of traffic by all your users should not exceed the limits.
    */
   apiLimit (req, res, next) {
-    prevReq = curReq
-    curReq = Date.now()
-    deltaTime = (curReq - prevReq)
+    let dprev = d // departure time of previous
+    let a = Date.now() // arrival time
 
-    if (typeof prevReq === 'undefined' || deltaTime > 1000) {
-      geolocationController.rateLimiter(req, res, next)
-    } else {
-      log.warn('More than 1 request per second to geolocation api come from ' + req.ip)
+    if (typeof dprev !== 'undefined') {
+      d = dprev + 1000
 
-      setTimeout(() => {
+      if (a > d) {
+        d = a + 10
         geolocationController.rateLimiter(req, res, next)
-      }, 1000 - deltaTime)
+      } else {
+        let wait = d - a
+        log.warn('More than 1 request per second to geolocation api. This from ' + req.ip)
+
+        setTimeout(() => {
+          geolocationController.rateLimiter(req, res, next)
+        }, wait)
+      }
+    } else {
+      d = a + 10 // add 10ms
+      geolocationController.rateLimiter(req, res, next)
     }
     
   }

From 6ee96fb07c1357cdeee4df3d3bfc3b53d221d7a9 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Thu, 19 Jan 2023 01:29:24 +0100
Subject: [PATCH 22/38] geolocation api rate-limit: improve the delay mechanism
 to be sure to don't hit provider more than 1 time/s, add memory-cache to save
 response data.

---
 package.json                         |   1 +
 server/api/controller/geolocation.js | 128 ++++++++++++++++++++++-----
 server/api/controller/place.js       |  44 +--------
 server/api/index.js                  |   4 +-
 yarn.lock                            |   5 ++
 5 files changed, 115 insertions(+), 67 deletions(-)

diff --git a/package.json b/package.json
index 437e4b93..7046e50a 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "linkifyjs": "4.0.2",
     "lodash": "^4.17.21",
     "mariadb": "^3.0.1",
+    "memory-cache": "^0.2.0",
     "microformat-node": "^2.0.1",
     "minify-css-string": "^1.0.0",
     "mkdirp": "^1.0.4",
diff --git a/server/api/controller/geolocation.js b/server/api/controller/geolocation.js
index 9ff07ead..0233e919 100644
--- a/server/api/controller/geolocation.js
+++ b/server/api/controller/geolocation.js
@@ -1,9 +1,18 @@
 const rateLimit = require('express-rate-limit');
 const log = require('../../log')
-let d // departure time
+const NOMINATIM_URL = 'https://nominatim.openstreetmap.org/search'
+const PHOTON_URL = 'https://photon.komoot.io/api/'
+const axios = require('axios')
+const { version } = require('../../../package.json')
+const cache = require('memory-cache');
+let d = 0 // departure time
+let h = 0 // hit geocoding provider time (aka Latency)
 
 const geolocationController = {
-  rateLimiter: rateLimit({
+  /**
+   * TODO: replace/merge with a general 'instance rate-limiter' or 'instance api-related rate-limiter' when this will be defined
+   */  
+  instanceApiRateLimiter: rateLimit({
     windowMs: 15 * 60 * 1000, // 15 minutes
     max: 100, // Limit each IP to 100 requests per `window` (here, per 15 minutes)
     standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
@@ -14,33 +23,108 @@ const geolocationController = {
    * Limit api usage
    * From https://operations.osmfoundation.org/policies/nominatim/
    * [Requirements] No heavy uses (an absolute maximum of 1 request per second).
-   * [Websites and Apps] Note that the usage limits above apply per website/application: the sum of traffic by all your users should not exceed the limits.
+   * [Websites and Apps] 
+   * - Note that the usage limits above apply per website/application: the sum of traffic by all your users should not exceed the limits.
+   * - If at all possible, set up a proxy and also enable caching of requests. 
    */
-  apiLimit (req, res, next) {
-    let dprev = d // departure time of previous
-    let a = Date.now() // arrival time
+  providerRateLimit (req, res, next) {
+    let a = Date.now(); // arrival time
+    let dprev = d
+    d = dprev + 1000 + h
 
-    if (typeof dprev !== 'undefined') {
-      d = dprev + 1000
+    console.log('a: ' + a)
+    console.log('dprev: ' + dprev)
+    console.log('d: ' + d)
 
-      if (a > d) {
-        d = a + 10
-        geolocationController.rateLimiter(req, res, next)
-      } else {
-        let wait = d - a
-        log.warn('More than 1 request per second to geolocation api. This from ' + req.ip)
-
-        setTimeout(() => {
-          geolocationController.rateLimiter(req, res, next)
-        }, wait)
+    // if the same request was already cached skip the delay mechanism
+    if (cache.get(req.params.place_details)) {
+      if (a < d) {
+        log.warn('More than 1 request per second to geolocation api. This from ' + req.ip + ' . The response data is served from memory-cache')
       }
+      // reset departure time because there is no need to ask provider
+      d = dprev
+      return next()
+    }
+
+    if (d === 0 || a > d) {
+      // no-queue or old-queue
+      console.log('No queue or Old queue')
+      // arrival time + 10ms estimated computing time
+      d = a + 10 
+      next()
     } else {
-      d = a + 10 // add 10ms
-      geolocationController.rateLimiter(req, res, next)
+      // fresh queue
+      console.log('Fresh queue')
+      let wait = d - a
+      console.log('Waiting '+ wait)
+      log.warn('More than 1 request per second to geolocation api. This from ' + req.ip + ' . Applying ToS padding before asking to provider. The response data is now cached.')
+      
+      setTimeout(() => {
+        next()
+      }, wait)
     }
     
-  }
-  
+  },
+
+  async _nominatim (req, res) {
+    const details = req.params.place_details
+    const countrycodes = res.locals.settings.geocoding_countrycodes || []
+    const geocoding_provider = res.locals.settings.geocoding_provider || NOMINATIM_URL
+    // ?limit=3&format=json&namedetails=1&addressdetails=1&q=
+
+    const ret = await axios.get(`${geocoding_provider}`, {
+      params: {
+        countrycodes: countrycodes.join(','),
+        q: details,
+        limit: 3,
+        format: 'json',
+        addressdetails: 1,
+        namedetails: 1,
+      },
+      headers: { 'User-Agent': `gancio ${version}` }
+    })
+
+    return res.json(ret.data)
+
+  },
+
+  async _photon (req, res) {
+    const details = req.params.place_details
+    const geocoding_provider = res.locals.settings.geocoding_provider || PHOTON_URL
+
+    if (cache.get(details)) { 
+      console.log('Retrieving data from cache')
+      const ret = {
+        data: await cache.get(details) 
+      }
+      return res.json(ret.data) 
+    } else {
+      let RTTstart = Date.now()
+
+      console.log('Asking Provider: ' + RTTstart)
+      const ret = await axios.get(`${geocoding_provider}`, {
+        params: {
+          q: details,
+          limit: 3,
+        },
+        headers: { 'User-Agent': `gancio ${version}` }
+      })
+
+      if (ret) { 
+        let RTTend = Date.now()
+        console.log('Response arrived: ' + RTTend)
+        // Save the hit time (aka Latency)
+        h = (RTTend - RTTstart) / 2
+        console.log('Saving latency h: ' + h)
+      }
+
+      console.log('Caching results')
+      cache.put(details, ret.data);
+      return res.json(ret.data)
+    }
+ 
+  },
+
 }
 
 module.exports = geolocationController
\ No newline at end of file
diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index 8fd1aa3b..47f71b34 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -7,9 +7,6 @@ const { version } = require('../../../package.json')
 
 const log = require('../../log')
 const { Op, where, col, fn, cast } = require('sequelize')
-const NOMINATIM_URL = 'https://nominatim.openstreetmap.org/search'
-const PHOTON_URL = 'https://photon.komoot.io/api/'
-const axios = require('axios')
 
 module.exports = {
 
@@ -75,45 +72,6 @@ module.exports = {
 
     // TOFIX: don't know why limit does not work
     return res.json(places.slice(0, 10))
-  },
-
-  async _nominatim (req, res) {
-    const details = req.params.place_details
-    const countrycodes = res.locals.settings.geocoding_countrycodes || []
-    const geocoding_provider = res.locals.settings.geocoding_provider || NOMINATIM_URL
-    // ?limit=3&format=json&namedetails=1&addressdetails=1&q=
-
-    const ret = await axios.get(`${geocoding_provider}`, {
-      params: {
-        countrycodes: countrycodes.join(','),
-        q: details,
-        limit: 3,
-        format: 'json',
-        addressdetails: 1,
-        namedetails: 1,
-      },
-      headers: { 'User-Agent': `gancio ${version}` }
-    })
-
-    return res.json(ret.data)
-
-  },
-
-  async _photon (req, res) {
-    const details = req.params.place_details
-    const geocoding_provider = res.locals.settings.geocoding_provider || PHOTON_URL
-
-    const ret = await axios.get(`${geocoding_provider}`, {
-      params: {
-        q: details,
-        limit: 3,
-      },
-      headers: { 'User-Agent': `gancio ${version}` }
-    })
-
-    // console.log(ret)
-    return res.json(ret.data)
-
-  },
+  }
 
 }
diff --git a/server/api/index.js b/server/api/index.js
index 32e15198..a2cecb4f 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -173,8 +173,8 @@ module.exports = () => {
     api.put('/place', isAdmin, placeController.updatePlace)
 
     // - GEOCODING
-    api.get('/placeOSM/Nominatim/:place_details', helpers.isGeocodingEnabled, geolocationController.apiLimit, placeController._nominatim)
-    api.get('/placeOSM/Photon/:place_details', helpers.isGeocodingEnabled, geolocationController.apiLimit, placeController._photon)
+    api.get('/placeOSM/Nominatim/:place_details', helpers.isGeocodingEnabled, geolocationController.instanceApiRateLimiter, geolocationController.providerRateLimit, geolocationController._nominatim)
+    api.get('/placeOSM/Photon/:place_details', helpers.isGeocodingEnabled, geolocationController.instanceApiRateLimiter, geolocationController.providerRateLimit, geolocationController._photon)
   
     // - TAGS
     api.get('/tags', isAdmin, tagController.getAll)
diff --git a/yarn.lock b/yarn.lock
index 2445ccf5..a5d03c8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7950,6 +7950,11 @@ memoizee@^0.4.15:
     next-tick "^1.1.0"
     timers-ext "^0.1.7"
 
+memory-cache@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/memory-cache/-/memory-cache-0.2.0.tgz#7890b01d52c00c8ebc9d533e1f8eb17e3034871a"
+  integrity sha512-OcjA+jzjOYzKmKS6IQVALHLVz+rNTMPoJvCztFaZxwG14wtAW7VRZjwTQu06vKCYOxh4jVnik7ya0SXTB0W+xA==
+
 memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"

From cc4bb69667ea9ab905532fd5856ac10e7312187e Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Thu, 19 Jan 2023 12:06:23 +0100
Subject: [PATCH 23/38] geolocation api rate-limit: add per-provider prefix to
 cached response, refactor geocoding provider code

---
 server/api/controller/geocoding.js     | 135 +++++++++++++++++++++++++
 server/api/controller/geolocation.js   | 130 ------------------------
 server/api/index.js                    |   6 +-
 server/services/geocoding/nominatim.js |  23 +++++
 server/services/geocoding/photon.js    |  18 ++++
 5 files changed, 179 insertions(+), 133 deletions(-)
 create mode 100644 server/api/controller/geocoding.js
 delete mode 100644 server/api/controller/geolocation.js
 create mode 100644 server/services/geocoding/nominatim.js
 create mode 100644 server/services/geocoding/photon.js

diff --git a/server/api/controller/geocoding.js b/server/api/controller/geocoding.js
new file mode 100644
index 00000000..5e382640
--- /dev/null
+++ b/server/api/controller/geocoding.js
@@ -0,0 +1,135 @@
+const rateLimit = require('express-rate-limit');
+const log = require('../../log')
+const nominatim = require('../../services/geocoding/nominatim')
+const photon = require('../../services/geocoding/photon')
+const axios = require('axios')
+const { version } = require('../../../package.json')
+const cache = require('memory-cache');
+let d = 0 // departure time
+let h = 0 // hit geocoding provider time (aka Latency)
+
+const geocodingController = {
+  /**
+   * TODO: replace/merge with a general 'instance rate-limiter' or 'instance api-related rate-limiter' when this will be defined
+   */  
+  instanceApiRateLimiter: rateLimit({
+    windowMs: 15 * 60 * 1000, // 15 minutes
+    max: 100, // Limit each IP to 100 requests per `window` (here, per 15 minutes)
+    standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
+    legacyHeaders: false, // Disable the `X-RateLimit-*` headers
+  }),
+
+  /** 
+   * Limit provider api usage.
+   * From https://operations.osmfoundation.org/policies/nominatim/
+   * [Requirements] No heavy uses (an absolute maximum of 1 request per second).
+   * [Websites and Apps] 
+   * - Note that the usage limits above apply per website/application: the sum of traffic by all your users should not exceed the limits.
+   * - If at all possible, set up a proxy and also enable caching of requests. 
+   */
+  providerRateLimit (req, res, next, providerCommonName) {
+    let a = Date.now(); // arrival time
+    let dprev = d
+    d = dprev + 1000 + h
+
+    console.log('a: ' + a)
+    console.log('dprev: ' + dprev)
+    console.log('d: ' + d)
+
+    // if the same request was already cached skip the delay mechanism
+    if (cache.get(providerCommonName + '_' + req.params.place_details)) {
+      if (a < d) {
+        log.warn('More than 1 request per second to geocoding api. This from ' + req.ip + ' . The response data is served from memory-cache')
+      }
+      console.log('yet cached')
+      // reset departure time because there is no need to ask provider
+      d = dprev
+      return next()
+    }
+
+    if (d === 0 || a > d) {
+      // no-queue or old-queue
+      console.log('No queue or Old queue')
+      // arrival time + 10ms estimated computing time
+      d = a + 10 
+      next()
+    } else {
+      // fresh queue
+      console.log('Fresh queue')
+      let wait = d - a
+      console.log('Waiting '+ wait)
+      log.warn('More than 1 request per second to geocoding api. This from ' + req.ip + ' . Applying ToS padding before asking to provider. The response data is now cached.')
+      
+      setTimeout(() => {
+        next()
+      }, wait)
+    }
+    
+  },
+
+  async nominatimRateLimit(req, res, next) {
+    geocodingController.providerRateLimit(req, res, next, nominatim.commonName)
+  },
+
+  async photonRateLimit(req, res, next) {
+    geocodingController.providerRateLimit(req, res, next, photon.commonName)
+  },
+
+  async checkInCache (req, res, details, providerCommonName) {
+    if (cache.get(providerCommonName + '_' + details)) { 
+      const ret = await cache.get(providerCommonName + '_' + details) 
+      return ret
+    } else {
+      console.log('Not in cache')
+      return
+    }
+  },
+
+  async queryProvider(req, res, details, provider) {
+    let RTTstart = Date.now()
+    console.log('Asking Provider: ' + RTTstart)
+
+    const ret = await axios.get(`${provider.endpoint(req, res)}`, { 
+      params: provider.getParams(req, res),
+      headers: { 'User-Agent': `gancio ${version}` }
+    })
+
+    if (ret) {
+      let RTTend = Date.now()
+      console.log('Asking Provider: ' + RTTend)
+      // Save the hit time (aka Latency)
+      console.log('Saving latency h: ' + h)
+      h = (RTTend - RTTstart) / 2
+    }
+
+    // Cache the response data
+    cache.put(provider.commonName + '_' + details, ret.data, 1000 * 60 * 60 * 24);
+    console.log(cache.keys())
+    console.log(cache.exportJson())
+    return ret.data
+  },
+
+
+  async _nominatim (req, res) {
+    const details = req.params.place_details
+
+    const ret = await geocodingController.checkInCache(req, res, details, nominatim.commonName) ||
+      await geocodingController.queryProvider(req, res, details, nominatim)
+
+    return res.json(ret)
+
+  },
+
+  async _photon (req, res) {
+    const details = req.params.place_details
+
+    const ret = await geocodingController.checkInCache(req, res, details, photon.commonName) ||
+      await geocodingController.queryProvider(req, res, details, photon)
+
+    return res.json(ret)
+
+  },
+
+}
+
+module.exports = geocodingController
\ No newline at end of file
diff --git a/server/api/controller/geolocation.js b/server/api/controller/geolocation.js
deleted file mode 100644
index 0233e919..00000000
--- a/server/api/controller/geolocation.js
+++ /dev/null
@@ -1,130 +0,0 @@
-const rateLimit = require('express-rate-limit');
-const log = require('../../log')
-const NOMINATIM_URL = 'https://nominatim.openstreetmap.org/search'
-const PHOTON_URL = 'https://photon.komoot.io/api/'
-const axios = require('axios')
-const { version } = require('../../../package.json')
-const cache = require('memory-cache');
-let d = 0 // departure time
-let h = 0 // hit geocoding provider time (aka Latency)
-
-const geolocationController = {
-  /**
-   * TODO: replace/merge with a general 'instance rate-limiter' or 'instance api-related rate-limiter' when this will be defined
-   */  
-  instanceApiRateLimiter: rateLimit({
-    windowMs: 15 * 60 * 1000, // 15 minutes
-    max: 100, // Limit each IP to 100 requests per `window` (here, per 15 minutes)
-    standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
-    legacyHeaders: false, // Disable the `X-RateLimit-*` headers
-  }),
-
-  /** 
-   * Limit api usage
-   * From https://operations.osmfoundation.org/policies/nominatim/
-   * [Requirements] No heavy uses (an absolute maximum of 1 request per second).
-   * [Websites and Apps] 
-   * - Note that the usage limits above apply per website/application: the sum of traffic by all your users should not exceed the limits.
-   * - If at all possible, set up a proxy and also enable caching of requests. 
-   */
-  providerRateLimit (req, res, next) {
-    let a = Date.now(); // arrival time
-    let dprev = d
-    d = dprev + 1000 + h
-
-    console.log('a: ' + a)
-    console.log('dprev: ' + dprev)
-    console.log('d: ' + d)
-
-    // if the same request was already cached skip the delay mechanism
-    if (cache.get(req.params.place_details)) {
-      if (a < d) {
-        log.warn('More than 1 request per second to geolocation api. This from ' + req.ip + ' . The response data is served from memory-cache')
-      }
-      // reset departure time because there is no need to ask provider
-      d = dprev
-      return next()
-    }
-
-    if (d === 0 || a > d) {
-      // no-queue or old-queue
-      console.log('No queue or Old queue')
-      // arrival time + 10ms estimated computing time
-      d = a + 10 
-      next()
-    } else {
-      // fresh queue
-      console.log('Fresh queue')
-      let wait = d - a
-      console.log('Waiting '+ wait)
-      log.warn('More than 1 request per second to geolocation api. This from ' + req.ip + ' . Applying ToS padding before asking to provider. The response data is now cached.')
-      
-      setTimeout(() => {
-        next()
-      }, wait)
-    }
-    
-  },
-
-  async _nominatim (req, res) {
-    const details = req.params.place_details
-    const countrycodes = res.locals.settings.geocoding_countrycodes || []
-    const geocoding_provider = res.locals.settings.geocoding_provider || NOMINATIM_URL
-    // ?limit=3&format=json&namedetails=1&addressdetails=1&q=
-
-    const ret = await axios.get(`${geocoding_provider}`, {
-      params: {
-        countrycodes: countrycodes.join(','),
-        q: details,
-        limit: 3,
-        format: 'json',
-        addressdetails: 1,
-        namedetails: 1,
-      },
-      headers: { 'User-Agent': `gancio ${version}` }
-    })
-
-    return res.json(ret.data)
-
-  },
-
-  async _photon (req, res) {
-    const details = req.params.place_details
-    const geocoding_provider = res.locals.settings.geocoding_provider || PHOTON_URL
-
-    if (cache.get(details)) { 
-      console.log('Retrieving data from cache')
-      const ret = {
-        data: await cache.get(details) 
-      }
-      return res.json(ret.data) 
-    } else {
-      let RTTstart = Date.now()
-
-      console.log('Asking Provider: ' + RTTstart)
-      const ret = await axios.get(`${geocoding_provider}`, {
-        params: {
-          q: details,
-          limit: 3,
-        },
-        headers: { 'User-Agent': `gancio ${version}` }
-      })
-
-      if (ret) { 
-        let RTTend = Date.now()
-        console.log('Response arrived: ' + RTTend)
-        // Save the hit time (aka Latency)
-        h = (RTTend - RTTstart) / 2
-        console.log('Saving latency h: ' + h)
-      }
-
-      console.log('Caching results')
-      cache.put(details, ret.data);
-      return res.json(ret.data)
-    }
- 
-  },
-
-}
-
-module.exports = geolocationController
\ No newline at end of file
diff --git a/server/api/index.js b/server/api/index.js
index a2cecb4f..1dfae154 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -19,7 +19,7 @@ const resourceController = require('./controller/resource')
 const oauthController = require('./controller/oauth')
 const announceController = require('./controller/announce')
 const pluginController = require('./controller/plugins')
-const geolocationController = require('./controller/geolocation')
+const geocodingController = require('./controller/geocoding')
 const helpers = require('../helpers')
 const storage = require('./storage')
 
@@ -173,8 +173,8 @@ module.exports = () => {
     api.put('/place', isAdmin, placeController.updatePlace)
 
     // - GEOCODING
-    api.get('/placeOSM/Nominatim/:place_details', helpers.isGeocodingEnabled, geolocationController.instanceApiRateLimiter, geolocationController.providerRateLimit, geolocationController._nominatim)
-    api.get('/placeOSM/Photon/:place_details', helpers.isGeocodingEnabled, geolocationController.instanceApiRateLimiter, geolocationController.providerRateLimit, geolocationController._photon)
+    api.get('/placeOSM/Nominatim/:place_details', helpers.isGeocodingEnabled, geocodingController.instanceApiRateLimiter, geocodingController.nominatimRateLimit, geocodingController._nominatim)
+    api.get('/placeOSM/Photon/:place_details', helpers.isGeocodingEnabled, geocodingController.instanceApiRateLimiter, geocodingController.photonRateLimit, geocodingController._photon)
   
     // - TAGS
     api.get('/tags', isAdmin, tagController.getAll)
diff --git a/server/services/geocoding/nominatim.js b/server/services/geocoding/nominatim.js
new file mode 100644
index 00000000..8b55153a
--- /dev/null
+++ b/server/services/geocoding/nominatim.js
@@ -0,0 +1,23 @@
+
+module.exports = {
+  commonName: 'Nominatim',
+  DEFAULT_ENDPOINT: 'https://nominatim.openstreetmap.org/search',
+  endpoint: (req, res) => { 
+    return res.locals.settings.geocoding_provider || this.DEFAULT_ENDPOINT
+  },
+
+  getParams (req, res) {
+    const countrycodes = res.locals.settings.geocoding_countrycodes || []
+    const details = req.params.place_details
+
+    return {
+      countrycodes: countrycodes.join(','),
+      q: details,
+      limit: 3,
+      format: 'json',
+      addressdetails: 1,
+      namedetails: 1,
+    }
+  },
+
+}
\ No newline at end of file
diff --git a/server/services/geocoding/photon.js b/server/services/geocoding/photon.js
new file mode 100644
index 00000000..29a4dfda
--- /dev/null
+++ b/server/services/geocoding/photon.js
@@ -0,0 +1,18 @@
+
+module.exports = {
+  commonName: 'Photon',
+  DEFAULT_ENDPOINT: 'https://photon.komoot.io/api/',
+  endpoint: (req, res) => {
+    return res.locals.settings.geocoding_provider || this.DEFAULT_ENDPOINT
+  },
+
+  getParams (req, res) {
+    const details = req.params.place_details
+
+    return {
+      q: details,
+      limit: 3,
+    }
+  }
+
+}
\ No newline at end of file

From c50d369de9132b14da75a4a6312a5b9493c8cb7d Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Thu, 19 Jan 2023 12:20:52 +0100
Subject: [PATCH 24/38] geolocation api rate-limit: commented debug messages

---
 server/api/controller/geocoding.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/server/api/controller/geocoding.js b/server/api/controller/geocoding.js
index 5e382640..c7b9fd9a 100644
--- a/server/api/controller/geocoding.js
+++ b/server/api/controller/geocoding.js
@@ -32,16 +32,15 @@ const geocodingController = {
     let dprev = d
     d = dprev + 1000 + h
 
-    console.log('a: ' + a)
-    console.log('dprev: ' + dprev)
-    console.log('d: ' + d)
+    // console.log('a: ' + a)
+    // console.log('dprev: ' + dprev)
+    // console.log('d: ' + d)
 
     // if the same request was already cached skip the delay mechanism
     if (cache.get(providerCommonName + '_' + req.params.place_details)) {
       if (a < d) {
-        log.warn('More than 1 request per second to geocoding api. This from ' + req.ip + ' . The response data is served from memory-cache')
+        log.warn('More than 1 request per second to geocoding api. This from ' + req.ip + ' . The response data is served from memory-cache.')
       }
-      console.log('yet cached')
       // reset departure time because there is no need to ask provider
       d = dprev
       return next()
@@ -49,15 +48,15 @@ const geocodingController = {
 
     if (d === 0 || a > d) {
       // no-queue or old-queue
-      console.log('No queue or Old queue')
+      // console.log('No queue or Old queue')
       // arrival time + 10ms estimated computing time
       d = a + 10 
       next()
     } else {
       // fresh queue
-      console.log('Fresh queue')
+      // console.log('Fresh queue')
       let wait = d - a
-      console.log('Waiting '+ wait)
+      // console.log('Waiting '+ wait)
       log.warn('More than 1 request per second to geocoding api. This from ' + req.ip + ' . Applying ToS padding before asking to provider. The response data is now cached.')
       
       setTimeout(() => {
@@ -80,14 +79,14 @@ const geocodingController = {
       const ret = await cache.get(providerCommonName + '_' + details) 
       return ret
     } else {
-      console.log('Not in cache')
+      // console.log('Not in cache')
       return
     }
   },
 
   async queryProvider(req, res, details, provider) {
     let RTTstart = Date.now()
-    console.log('Asking Provider: ' + RTTstart)
+    // console.log('Asking Provider: ' + RTTstart)
 
     const ret = await axios.get(`${provider.endpoint(req, res)}`, { 
       params: provider.getParams(req, res),
@@ -96,16 +95,16 @@ const geocodingController = {
 
     if (ret) {
       let RTTend = Date.now()
-      console.log('Asking Provider: ' + RTTend)
+      // console.log('Asking Provider: ' + RTTend)
       // Save the hit time (aka Latency)
-      console.log('Saving latency h: ' + h)
+      // console.log('Saving latency h: ' + h)
       h = (RTTend - RTTstart) / 2
     }
 
     // Cache the response data
     cache.put(provider.commonName + '_' + details, ret.data, 1000 * 60 * 60 * 24);
-    console.log(cache.keys())
-    console.log(cache.exportJson())
+    // console.log(cache.keys())
+    // console.log(cache.exportJson())
     return ret.data
   },
 

From ad3ace1e7e77a3c867b00a9c7363c11d1c651a83 Mon Sep 17 00:00:00 2001
From: sedum <sedum@oziosi.org>
Date: Sat, 21 Jan 2023 01:18:16 +0100
Subject: [PATCH 25/38] geolocation api rate-limit: split cache instance, one
 for each provider

---
 server/api/controller/geocoding.js     | 22 ++++++++++------------
 server/services/geocoding/nominatim.js | 11 ++++++++---
 server/services/geocoding/photon.js    | 11 ++++++++---
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/server/api/controller/geocoding.js b/server/api/controller/geocoding.js
index c7b9fd9a..a86b1ca3 100644
--- a/server/api/controller/geocoding.js
+++ b/server/api/controller/geocoding.js
@@ -4,7 +4,6 @@ const nominatim = require('../../services/geocoding/nominatim')
 const photon = require('../../services/geocoding/photon')
 const axios = require('axios')
 const { version } = require('../../../package.json')
-const cache = require('memory-cache');
 let d = 0 // departure time
 let h = 0 // hit geocoding provider time (aka Latency)
 
@@ -27,7 +26,7 @@ const geocodingController = {
    * - Note that the usage limits above apply per website/application: the sum of traffic by all your users should not exceed the limits.
    * - If at all possible, set up a proxy and also enable caching of requests. 
    */
-  providerRateLimit (req, res, next, providerCommonName) {
+  providerRateLimit (req, res, next, providerCache) {
     let a = Date.now(); // arrival time
     let dprev = d
     d = dprev + 1000 + h
@@ -37,7 +36,7 @@ const geocodingController = {
     // console.log('d: ' + d)
 
     // if the same request was already cached skip the delay mechanism
-    if (cache.get(providerCommonName + '_' + req.params.place_details)) {
+    if (providerCache.get(req.params.place_details)) {
       if (a < d) {
         log.warn('More than 1 request per second to geocoding api. This from ' + req.ip + ' . The response data is served from memory-cache.')
       }
@@ -67,19 +66,18 @@ const geocodingController = {
   },
 
   async nominatimRateLimit(req, res, next) {
-    geocodingController.providerRateLimit(req, res, next, nominatim.commonName)
+    geocodingController.providerRateLimit(req, res, next, nominatim.cache)
   },
 
   async photonRateLimit(req, res, next) {
-    geocodingController.providerRateLimit(req, res, next, photon.commonName)
+    geocodingController.providerRateLimit(req, res, next, photon.cache)
   },
 
-  async checkInCache (req, res, details, providerCommonName) {
-    if (cache.get(providerCommonName + '_' + details)) { 
-      const ret = await cache.get(providerCommonName + '_' + details) 
+  async checkInCache (req, res, details, providerCache) {
+    const ret = await providerCache.get(details)
+    if (ret) {
       return ret
     } else {
-      // console.log('Not in cache')
       return
     }
   },
@@ -102,7 +100,7 @@ const geocodingController = {
     }
 
     // Cache the response data
-    cache.put(provider.commonName + '_' + details, ret.data, 1000 * 60 * 60 * 24);
+    provider.cache.put(details, ret.data, 1000 * 60 * 60 * 24);
     // console.log(cache.keys())
     // console.log(cache.exportJson())
     return ret.data
@@ -112,7 +110,7 @@ const geocodingController = {
   async _nominatim (req, res) {
     const details = req.params.place_details
 
-    const ret = await geocodingController.checkInCache(req, res, details, nominatim.commonName) ||
+    const ret = await geocodingController.checkInCache(req, res, details, nominatim.cache) ||
       await geocodingController.queryProvider(req, res, details, nominatim)
 
     return res.json(ret)
@@ -122,7 +120,7 @@ const geocodingController = {
   async _photon (req, res) {
     const details = req.params.place_details
 
-    const ret = await geocodingController.checkInCache(req, res, details, photon.commonName) ||
+    const ret = await geocodingController.checkInCache(req, res, details, photon.cache) ||
       await geocodingController.queryProvider(req, res, details, photon)
 
     return res.json(ret)
diff --git a/server/services/geocoding/nominatim.js b/server/services/geocoding/nominatim.js
index 8b55153a..9e8b09fd 100644
--- a/server/services/geocoding/nominatim.js
+++ b/server/services/geocoding/nominatim.js
@@ -1,10 +1,13 @@
+const cache = require('memory-cache')
+const providerCache = new cache.Cache()
 
-module.exports = {
+const nominatim = {
   commonName: 'Nominatim',
   DEFAULT_ENDPOINT: 'https://nominatim.openstreetmap.org/search',
   endpoint: (req, res) => { 
-    return res.locals.settings.geocoding_provider || this.DEFAULT_ENDPOINT
+    return res.locals.settings.geocoding_provider || nominatim.DEFAULT_ENDPOINT
   },
+  cache: providerCache,
 
   getParams (req, res) {
     const countrycodes = res.locals.settings.geocoding_countrycodes || []
@@ -20,4 +23,6 @@ module.exports = {
     }
   },
 
-}
\ No newline at end of file
+}
+
+module.exports = nominatim
\ No newline at end of file
diff --git a/server/services/geocoding/photon.js b/server/services/geocoding/photon.js
index 29a4dfda..4eced7db 100644
--- a/server/services/geocoding/photon.js
+++ b/server/services/geocoding/photon.js
@@ -1,10 +1,13 @@
+const cache = require('memory-cache')
+const providerCache = new cache.Cache()
 
-module.exports = {
+const photon = {
   commonName: 'Photon',
   DEFAULT_ENDPOINT: 'https://photon.komoot.io/api/',
   endpoint: (req, res) => {
-    return res.locals.settings.geocoding_provider || this.DEFAULT_ENDPOINT
+    return res.locals.settings.geocoding_provider || photon.DEFAULT_ENDPOINT
   },
+  cache: providerCache,
 
   getParams (req, res) {
     const details = req.params.place_details
@@ -15,4 +18,6 @@ module.exports = {
     }
   }
 
-}
\ No newline at end of file
+}
+
+module.exports = photon
\ No newline at end of file

From 9439a085d97cfb154ebe6052e29b3033e3aa8a1e Mon Sep 17 00:00:00 2001
From: rammar <romobing43@protonmail.com>
Date: Wed, 25 Jan 2023 21:39:01 +0000
Subject: [PATCH 26/38] rimosso "gancio"

---
 locales/it.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/it.json b/locales/it.json
index 2776497a..aaef8d29 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -136,7 +136,7 @@
     "saved": "Evento salvato",
     "added_anon": "Evento aggiunto, verrà confermato quanto prima.",
     "updated": "Evento aggiornato",
-    "where_description": "Dov'è il gancio? Se il posto non è presente potrai crearlo.",
+    "where_description": "Dov'è l'evento? Se il posto non è presente potrai crearlo.",
     "address_description": "A che indirizzo?",
     "address_description_osm": "A che indirizzo? (<a href='http://osm.org/copyright'>OpenStreetMap</a>)",
     "coordinates_search_description": "Puoi ricercare il posto per nome, o incollare la coppia di coordinate.",

From 0df2b4b951c727db1a54c195ff272070bcce96d4 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 26 Jan 2023 09:12:18 +0100
Subject: [PATCH 27/38] hide search filters when none is allowed

---
 components/NavSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/NavSearch.vue b/components/NavSearch.vue
index 9eaf2973..8dafbb47 100644
--- a/components/NavSearch.vue
+++ b/components/NavSearch.vue
@@ -8,7 +8,7 @@
             v-text-field(hide-details outlined
               :placeholder='$t("common.search")'
               @input="v => setFilter(['query', v])" clearable :clear-icon='mdiClose')
-              template(v-slot:append)
+              template(v-slot:append v-if='settings.allow_recurrent_event || settings.allow_multidate_event')
                 v-icon(v-text='mdiCog' v-bind='attrs' v-on='on')
           v-card(outlined :rounded='"0"')
             v-card-text

From d640d296f143cd2171e162e916ffd01bedb0aa33 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 26 Jan 2023 09:16:34 +0100
Subject: [PATCH 28/38] cleaning

---
 server/federation/nodeinfo.js | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 server/federation/nodeinfo.js

diff --git a/server/federation/nodeinfo.js b/server/federation/nodeinfo.js
deleted file mode 100644
index 08321968..00000000
--- a/server/federation/nodeinfo.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const express = require('express')
-const router = express.Router()
-const cors = require('cors')
-const settingsController = require('../api/controller/settings')
-const config = require('../config')
-const version = require('../../package.json').version
-
-router.use(cors())
-
-router.get('/', (req, res) => {
-  const ret = {
-    version: '1.0',
-    server: {
-      baseUrl: config.baseurl,
-      name: config.title,
-      software: 'Gancio',
-      version
-    },
-    protocols: ['activitypub'],
-    openRegistrations: settingsController.settings.allow_registration,
-    usage: {
-      users: {
-        total: 10
-      }
-    },
-    localPost: 3,
-    localComments: 0
-  }
-  res.json(ret)
-})
-
-module.exports = router

From 1ce7e693c58c883a33d92a7a9cae2e0d339c612a Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 26 Jan 2023 09:18:40 +0100
Subject: [PATCH 29/38] update deps

---
 yarn.lock | 923 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 498 insertions(+), 425 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7de9e8e5..231181ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,12 +17,38 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.13", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1":
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.13", "@babel/compat-data@^7.20.1":
   version "7.20.1"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
   integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
 
-"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.13":
+"@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.5":
+  version "7.20.10"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec"
+  integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==
+
+"@babel/core@^7.11.6", "@babel/core@^7.12.3":
+  version "7.20.12"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d"
+  integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.7"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helpers" "^7.20.7"
+    "@babel/parser" "^7.20.7"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.12"
+    "@babel/types" "^7.20.7"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.0"
+
+"@babel/core@^7.18.13":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.2.tgz#8dc9b1620a673f92d3624bd926dc49a52cf25b92"
   integrity sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==
@@ -43,7 +69,7 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.20.1", "@babel/generator@^7.20.7":
+"@babel/generator@^7.20.1", "@babel/generator@^7.20.2", "@babel/generator@^7.20.7", "@babel/generator@^7.7.2":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
   integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==
@@ -52,15 +78,6 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.20.2", "@babel/generator@^7.7.2":
-  version "7.20.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.4.tgz#4d9f8f0c30be75fd90a0562099a26e5839602ab8"
-  integrity sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==
-  dependencies:
-    "@babel/types" "^7.20.2"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -76,7 +93,7 @@
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0":
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9":
   version "7.20.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
   integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
@@ -86,6 +103,17 @@
     browserslist "^4.21.3"
     semver "^6.3.0"
 
+"@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
+  integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==
+  dependencies:
+    "@babel/compat-data" "^7.20.5"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
+    lru-cache "^5.1.1"
+    semver "^6.3.0"
+
 "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.2":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz#3c08a5b5417c7f07b5cf3dfb6dc79cbec682e8c2"
@@ -160,7 +188,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
   integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
@@ -174,6 +202,20 @@
     "@babel/traverse" "^7.20.1"
     "@babel/types" "^7.20.2"
 
+"@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.20.2":
+  version "7.20.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
+  integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.10"
+    "@babel/types" "^7.20.7"
+
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
@@ -253,14 +295,14 @@
     "@babel/traverse" "^7.19.0"
     "@babel/types" "^7.19.0"
 
-"@babel/helpers@^7.20.1":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.1.tgz#2ab7a0fcb0a03b5bf76629196ed63c2d7311f4c9"
-  integrity sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==
+"@babel/helpers@^7.20.1", "@babel/helpers@^7.20.7":
+  version "7.20.13"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.13.tgz#e3cb731fb70dc5337134cadc24cbbad31cc87ad2"
+  integrity sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==
   dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.0"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.13"
+    "@babel/types" "^7.20.7"
 
 "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -271,12 +313,17 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.4", "@babel/parser@^7.20.2", "@babel/parser@^7.6.0":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.20.1", "@babel/parser@^7.20.13", "@babel/parser@^7.20.2", "@babel/parser@^7.20.7":
+  version "7.20.13"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.13.tgz#ddf1eb5a813588d2fb1692b70c6fce75b945c088"
+  integrity sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw==
+
+"@babel/parser@^7.18.4", "@babel/parser@^7.6.0":
   version "7.20.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2"
   integrity sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==
 
-"@babel/parser@^7.18.10", "@babel/parser@^7.20.1", "@babel/parser@^7.20.7", "@babel/parser@^7.9.6":
+"@babel/parser@^7.9.6":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
   integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
@@ -938,7 +985,7 @@
   dependencies:
     regenerator-runtime "^0.13.10"
 
-"@babel/template@^7.18.10":
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
   integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
@@ -947,15 +994,6 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/template@^7.3.3":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
-  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.10"
-    "@babel/types" "^7.18.10"
-
 "@babel/traverse@^7.18.10":
   version "7.20.12"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5"
@@ -972,7 +1010,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.7.2":
+"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1":
   version "7.20.1"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8"
   integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==
@@ -988,19 +1026,35 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
-  integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==
+"@babel/traverse@^7.20.1", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.13", "@babel/traverse@^7.7.2":
+  version "7.20.13"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.13.tgz#817c1ba13d11accca89478bd5481b2d168d07473"
+  integrity sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.7"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.13"
+    "@babel/types" "^7.20.7"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
+  integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
   dependencies:
     "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
-  integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
+"@babel/types@^7.18.9", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
+  integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==
   dependencies:
     "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"
@@ -1089,109 +1143,109 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz#3e3f876e4e47616ea3b1464b9fbda981872e9583"
-  integrity sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg==
+"@jest/console@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.4.0.tgz#ed2e5bc783791c4be75d0054d1bdf66a46deb163"
+  integrity sha512-xpXud7e/8zo4syxQlAMDz+EQiFsf8/zXDPslBYm+UaSJ5uGTKQHhbSHfECp7Fw1trQtopjYumeved0n3waijhQ==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^29.3.1"
-    jest-util "^29.3.1"
+    jest-message-util "^29.4.0"
+    jest-util "^29.4.0"
     slash "^3.0.0"
 
-"@jest/core@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz#bff00f413ff0128f4debec1099ba7dcd649774a1"
-  integrity sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw==
+"@jest/core@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.4.0.tgz#23cf275372c51d1191a8cd9f36f8d5a47a4e9041"
+  integrity sha512-E7oCMcENobBFwQXYjnN2IsuUSpRo5jSv7VYk6O9GyQ5kVAfVSS8819I4W5iCCYvqD6+1TzyzLpeEdZEik81kNw==
   dependencies:
-    "@jest/console" "^29.3.1"
-    "@jest/reporters" "^29.3.1"
-    "@jest/test-result" "^29.3.1"
-    "@jest/transform" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/console" "^29.4.0"
+    "@jest/reporters" "^29.4.0"
+    "@jest/test-result" "^29.4.0"
+    "@jest/transform" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     exit "^0.1.2"
     graceful-fs "^4.2.9"
-    jest-changed-files "^29.2.0"
-    jest-config "^29.3.1"
-    jest-haste-map "^29.3.1"
-    jest-message-util "^29.3.1"
+    jest-changed-files "^29.4.0"
+    jest-config "^29.4.0"
+    jest-haste-map "^29.4.0"
+    jest-message-util "^29.4.0"
     jest-regex-util "^29.2.0"
-    jest-resolve "^29.3.1"
-    jest-resolve-dependencies "^29.3.1"
-    jest-runner "^29.3.1"
-    jest-runtime "^29.3.1"
-    jest-snapshot "^29.3.1"
-    jest-util "^29.3.1"
-    jest-validate "^29.3.1"
-    jest-watcher "^29.3.1"
+    jest-resolve "^29.4.0"
+    jest-resolve-dependencies "^29.4.0"
+    jest-runner "^29.4.0"
+    jest-runtime "^29.4.0"
+    jest-snapshot "^29.4.0"
+    jest-util "^29.4.0"
+    jest-validate "^29.4.0"
+    jest-watcher "^29.4.0"
     micromatch "^4.0.4"
-    pretty-format "^29.3.1"
+    pretty-format "^29.4.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz#eb039f726d5fcd14698acd072ac6576d41cfcaa6"
-  integrity sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag==
+"@jest/environment@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.4.0.tgz#b15d7bfc873d6348dfd7323e50083d2c1e067750"
+  integrity sha512-ocl1VGDcZHfHnYLTqkBY7yXme1bF4x0BevJ9wb6y0sLOSyBCpp8L5fEASChB+wU53WMrIK6kBfGt+ZYoM2kcdw==
   dependencies:
-    "@jest/fake-timers" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/fake-timers" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
-    jest-mock "^29.3.1"
+    jest-mock "^29.4.0"
 
-"@jest/expect-utils@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6"
-  integrity sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g==
+"@jest/expect-utils@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.4.0.tgz#97819d0da7027792888d9d2f1a41443be0baef80"
+  integrity sha512-w/JzTYIqjmPFIM5OOQHF9CawFx2daw1256Nzj4ZqWX96qRKbCq9WYRVqdySBKHHzuvsXLyTDIF6y61FUyrhmwg==
   dependencies:
     jest-get-type "^29.2.0"
 
-"@jest/expect@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz#456385b62894349c1d196f2d183e3716d4c6a6cd"
-  integrity sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg==
+"@jest/expect@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.4.0.tgz#3d47dbb1c650a0833b8263ca354818ca0665adbe"
+  integrity sha512-IiDZYQ/Oi94aBT0nKKKRvNsB5JTyHoGb+G3SiGoDxz90JfL7SLx/z5IjB0fzBRzy7aLFQOCbVJlaC2fIgU6Y9Q==
   dependencies:
-    expect "^29.3.1"
-    jest-snapshot "^29.3.1"
+    expect "^29.4.0"
+    jest-snapshot "^29.4.0"
 
-"@jest/fake-timers@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz#b140625095b60a44de820876d4c14da1aa963f67"
-  integrity sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A==
+"@jest/fake-timers@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.4.0.tgz#9a2409cae63eb1d0122edc21783ef88c67e6face"
+  integrity sha512-8sitzN2QrhDwEwH3kKcMMgrv/UIkmm9AUgHixmn4L++GQ0CqVTIztm3YmaIQooLmW3O4GhizNTTCyq3iLbWcMw==
   dependencies:
-    "@jest/types" "^29.3.1"
-    "@sinonjs/fake-timers" "^9.1.2"
+    "@jest/types" "^29.4.0"
+    "@sinonjs/fake-timers" "^10.0.2"
     "@types/node" "*"
-    jest-message-util "^29.3.1"
-    jest-mock "^29.3.1"
-    jest-util "^29.3.1"
+    jest-message-util "^29.4.0"
+    jest-mock "^29.4.0"
+    jest-util "^29.4.0"
 
-"@jest/globals@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz#92be078228e82d629df40c3656d45328f134a0c6"
-  integrity sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q==
+"@jest/globals@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.4.0.tgz#b3dd853af92bb6b6156e246475f46fb8f3831785"
+  integrity sha512-Q64ZRgGMVL40RcYTfD2GvyjK7vJLPSIvi8Yp3usGPNPQ3SCW+UCY9KEH6+sVtBo8LzhcjtCXuZEd7avnj/T0mQ==
   dependencies:
-    "@jest/environment" "^29.3.1"
-    "@jest/expect" "^29.3.1"
-    "@jest/types" "^29.3.1"
-    jest-mock "^29.3.1"
+    "@jest/environment" "^29.4.0"
+    "@jest/expect" "^29.4.0"
+    "@jest/types" "^29.4.0"
+    jest-mock "^29.4.0"
 
-"@jest/reporters@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz#9a6d78c109608e677c25ddb34f907b90e07b4310"
-  integrity sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA==
+"@jest/reporters@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.4.0.tgz#ec17751cc687fb845fa1978c03fdbc69d34ac462"
+  integrity sha512-FjJwrD1XOQq/AXKrvnOSf0RgAs6ziUuGKx8+/R53Jscc629JIhg7/m241gf1shUm/fKKxoHd7aCexcg7kxvkWQ==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^29.3.1"
-    "@jest/test-result" "^29.3.1"
-    "@jest/transform" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/console" "^29.4.0"
+    "@jest/test-result" "^29.4.0"
+    "@jest/transform" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@jridgewell/trace-mapping" "^0.3.15"
     "@types/node" "*"
     chalk "^4.0.0"
@@ -1204,20 +1258,20 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.1.3"
-    jest-message-util "^29.3.1"
-    jest-util "^29.3.1"
-    jest-worker "^29.3.1"
+    jest-message-util "^29.4.0"
+    jest-util "^29.4.0"
+    jest-worker "^29.4.0"
     slash "^3.0.0"
     string-length "^4.0.1"
     strip-ansi "^6.0.0"
     v8-to-istanbul "^9.0.1"
 
-"@jest/schemas@^29.0.0":
-  version "29.0.0"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a"
-  integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==
+"@jest/schemas@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.0.tgz#0d6ad358f295cc1deca0b643e6b4c86ebd539f17"
+  integrity sha512-0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ==
   dependencies:
-    "@sinclair/typebox" "^0.24.1"
+    "@sinclair/typebox" "^0.25.16"
 
 "@jest/source-map@^29.2.0":
   version "29.2.0"
@@ -1228,53 +1282,53 @@
     callsites "^3.0.0"
     graceful-fs "^4.2.9"
 
-"@jest/test-result@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz#92cd5099aa94be947560a24610aa76606de78f50"
-  integrity sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw==
+"@jest/test-result@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.4.0.tgz#64f7bd518d6d2a6662c40569e208e030a370f351"
+  integrity sha512-EtRklzjpddZU/aBVxJqqejfzfOcnehmjNXufs6u6qwd05kkhXpAPhZdt8bLlQd7cA2nD+JqZQ5Dx9NX5Jh6mjA==
   dependencies:
-    "@jest/console" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/console" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz#fa24b3b050f7a59d48f7ef9e0b782ab65123090d"
-  integrity sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA==
+"@jest/test-sequencer@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.4.0.tgz#8041176fccae0f7b86055950461d158833a79b76"
+  integrity sha512-pEwIgdfvEgF2lBOYX3DVn3SrvsAZ9FXCHw7+C6Qz87HnoDGQwbAselhWLhpgbxDjs6RC9QUJpFnrLmM5uwZV+g==
   dependencies:
-    "@jest/test-result" "^29.3.1"
+    "@jest/test-result" "^29.4.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.3.1"
+    jest-haste-map "^29.4.0"
     slash "^3.0.0"
 
-"@jest/transform@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d"
-  integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==
+"@jest/transform@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.4.0.tgz#73ddd9bf8599d285af09e7e3fef730c17a2fd965"
+  integrity sha512-hDjw3jz4GnvbyLMgcFpC9/34QcUhVIzJkBqz7o+3AhgfhGRzGuQppuLf5r/q7lDAAyJ6jzL+SFG7JGsScHOcLQ==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.0"
     "@jridgewell/trace-mapping" "^0.3.15"
     babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
     convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.3.1"
+    jest-haste-map "^29.4.0"
     jest-regex-util "^29.2.0"
-    jest-util "^29.3.1"
+    jest-util "^29.4.0"
     micromatch "^4.0.4"
     pirates "^4.0.4"
     slash "^3.0.0"
-    write-file-atomic "^4.0.1"
+    write-file-atomic "^5.0.0"
 
-"@jest/types@^29.3.1":
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3"
-  integrity sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==
+"@jest/types@^29.4.0":
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.0.tgz#569115f2438cacf3cff92521c7d624fbb683de3d"
+  integrity sha512-1S2Dt5uQp7R0bGY/L2BpuwCSji7v12kY3o8zqwlkbYBmOY956SKk+zOWqmfhHSINegiAVqOXydAYuWpzX6TYsQ==
   dependencies:
-    "@jest/schemas" "^29.0.0"
+    "@jest/schemas" "^29.4.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
@@ -1884,24 +1938,24 @@
     domhandler "^4.2.0"
     selderee "^0.6.0"
 
-"@sinclair/typebox@^0.24.1":
-  version "0.24.51"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
-  integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
+"@sinclair/typebox@^0.25.16":
+  version "0.25.21"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz#763b05a4b472c93a8db29b2c3e359d55b29ce272"
+  integrity sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==
 
-"@sinonjs/commons@^1.7.0":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.5.tgz#e280c94c95f206dcfd5aca00a43f2156b758c764"
-  integrity sha512-rTpCA0wG1wUxglBSFdMMY0oTrKYvgf4fNgv/sXbfCVAdf+FnPBdKJR/7XbpTCwbCrvCbdPYnlWaUUYz4V2fPDA==
+"@sinonjs/commons@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3"
+  integrity sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
-  integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
+"@sinonjs/fake-timers@^10.0.2":
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz#d10549ed1f423d80639c528b6c7f5a1017747d0c"
+  integrity sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==
   dependencies:
-    "@sinonjs/commons" "^1.7.0"
+    "@sinonjs/commons" "^2.0.0"
 
 "@tootallnate/once@1":
   version "1.1.2"
@@ -1914,12 +1968,12 @@
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
 "@types/babel__core@^7.1.14":
-  version "7.1.20"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.20.tgz#e168cdd612c92a2d335029ed62ac94c95b362359"
-  integrity sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891"
+  integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==
   dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
     "@types/babel__generator" "*"
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
@@ -1940,9 +1994,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.18.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.2.tgz#235bf339d17185bdec25e024ca19cce257cc7309"
-  integrity sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d"
+  integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1959,9 +2013,9 @@
   integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==
 
 "@types/graceful-fs@^4.1.3":
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
-  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae"
+  integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==
   dependencies:
     "@types/node" "*"
 
@@ -2017,9 +2071,9 @@
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
 "@types/node@*":
-  version "18.11.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
-  integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
+  version "18.11.18"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f"
+  integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==
 
 "@types/node@^12.0.2":
   version "12.20.55"
@@ -2032,9 +2086,9 @@
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
 "@types/prettier@^2.1.5":
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e"
-  integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0"
+  integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==
 
 "@types/q@^1.5.1":
   version "1.5.5"
@@ -2102,9 +2156,9 @@
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
 "@types/yargs@^17.0.8":
-  version "17.0.13"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76"
-  integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==
+  version "17.0.20"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.20.tgz#107f0fcc13bd4a524e352b41c49fe88aab5c54d5"
+  integrity sha512-eknWrTHofQuPk2iuqDm1waA7V6xPlbgBoaaXEgYkClhLOnB0TtbW+srJaOToAgawPxPlHQzwypFA2bhZaUGP5A==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -2580,7 +2634,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -2588,6 +2642,14 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+anymatch@^3.0.3, anymatch@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 append-field@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56"
@@ -2813,15 +2875,15 @@ axios@^0.27.2:
     follow-redirects "^1.14.9"
     form-data "^4.0.0"
 
-babel-jest@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz#05c83e0d128cd48c453eea851482a38782249f44"
-  integrity sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==
+babel-jest@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.4.0.tgz#20b18b69a321125429ff67a383b94c6bf552d1ec"
+  integrity sha512-M61cGPg4JBashDvIzKoIV/y95mSF6x3ome7CMEaszUTHD4uo6dtC6Nln+fvRTspYNtwy8lDHl5lmoTBSNY/a+g==
   dependencies:
-    "@jest/transform" "^29.3.1"
+    "@jest/transform" "^29.4.0"
     "@types/babel__core" "^7.1.14"
     babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^29.2.0"
+    babel-preset-jest "^29.4.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     slash "^3.0.0"
@@ -2847,10 +2909,10 @@ babel-plugin-istanbul@^6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094"
-  integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==
+babel-plugin-jest-hoist@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.0.tgz#3fd3dfcedf645932df6d0c9fc3d9a704dd860248"
+  integrity sha512-a/sZRLQJEmsmejQ2rPEUe35nO1+C9dc9O1gplH1SXmJxveQSRUYdBk8yGZG/VOUuZs1u2aHZJusEGoRMbhhwCg==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
@@ -2899,12 +2961,12 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc"
-  integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==
+babel-preset-jest@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.4.0.tgz#c2b03c548b02dea0a18ae21d5759c136f9251ee4"
+  integrity sha512-fUB9vZflUSM3dO/6M2TCAepTzvA4VkOvl67PjErcrQMGt9Eve7uazaeyCZ2th3UtI7ljpiBJES0F7A1vBRsLZA==
   dependencies:
-    babel-plugin-jest-hoist "^29.2.0"
+    babel-plugin-jest-hoist "^29.4.0"
     babel-preset-current-node-syntax "^1.0.0"
 
 babel-walk@3.0.0-canary-5:
@@ -3395,11 +3457,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001390, caniuse-lite@^1.0.30001400:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001390:
   version "1.0.30001431"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz#e7c59bd1bc518fae03a4656be442ce6c4887a795"
   integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==
 
+caniuse-lite@^1.0.30001400:
+  version "1.0.30001448"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001448.tgz#ca7550b1587c92a392a2b377cd9c508b3b4395bf"
+  integrity sha512-tq2YI+MJnooG96XpbTRYkBxLxklZPOdLmNIOdIhvf7SNJan6u5vCKum8iT7ZfCt70m1GPkuC7P3TtX6UuhupuA==
+
 chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -3529,11 +3596,16 @@ chrome-trace-event@^1.0.2:
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-ci-info@^3.1.1, ci-info@^3.2.0, ci-info@^3.3.2, ci-info@^3.6.1:
+ci-info@^3.1.1, ci-info@^3.3.2, ci-info@^3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.6.1.tgz#7594f1c95cb7fdfddee7af95a13af7dbc67afdcf"
   integrity sha512-up5ggbaDqOqJ4UqLKZ2naVkyqSJQgJi5lwD6b6mM748ysrghDBX0bx/qJTUHzw7zu6Mq4gycviSF5hJnwceD8w==
 
+ci-info@^3.2.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f"
+  integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -5149,16 +5221,16 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
-expect@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz#92877aad3f7deefc2e3f6430dd195b92295554a6"
-  integrity sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA==
+expect@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.4.0.tgz#e2d58a73bf46399deac7db6ec16842827525ce35"
+  integrity sha512-pzaAwjBgLEVxBh6ZHiqb9Wv3JYuv6m8ntgtY7a48nS+2KbX0EJkPS3FQlKiTZNcqzqJHNyQsfjqN60w1hPUBfQ==
   dependencies:
-    "@jest/expect-utils" "^29.3.1"
+    "@jest/expect-utils" "^29.4.0"
     jest-get-type "^29.2.0"
-    jest-matcher-utils "^29.3.1"
-    jest-message-util "^29.3.1"
-    jest-util "^29.3.1"
+    jest-matcher-utils "^29.4.0"
+    jest-message-util "^29.4.0"
+    jest-util "^29.4.0"
 
 express@^4.18.1:
   version "4.18.2"
@@ -5792,9 +5864,9 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.7, glob@^7.2.0, glob@^7.2.3:
     path-is-absolute "^1.0.0"
 
 glob@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -6274,9 +6346,9 @@ ignore@^5.2.0:
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
 immutable@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
-  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.2.tgz#2da9ff4384a4330c36d4d1bc88e90f9e0b0ccd16"
+  integrity sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==
 
 import-cwd@^2.0.0:
   version "2.1.0"
@@ -6819,94 +6891,94 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^29.2.0:
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz#b6598daa9803ea6a4dce7968e20ab380ddbee289"
-  integrity sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA==
+jest-changed-files@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.4.0.tgz#ac2498bcd394228f7eddcadcf928b3583bf2779d"
+  integrity sha512-rnI1oPxgFghoz32Y8eZsGJMjW54UlqT17ycQeCEktcxxwqqKdlj9afl8LNeO0Pbu+h2JQHThQP0BzS67eTRx4w==
   dependencies:
     execa "^5.0.0"
     p-limit "^3.1.0"
 
-jest-circus@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz#177d07c5c0beae8ef2937a67de68f1e17bbf1b4a"
-  integrity sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg==
+jest-circus@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.4.0.tgz#08fec87eb15632fba74e93cf069ef85559acd813"
+  integrity sha512-/pFBaCeLzCavRWyz14JwFgpZgPpEZdS6nPnREhczbHl2wy2UezvYcVp5akVFfUmBaA4ThAUp0I8cpgkbuNOm3g==
   dependencies:
-    "@jest/environment" "^29.3.1"
-    "@jest/expect" "^29.3.1"
-    "@jest/test-result" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/environment" "^29.4.0"
+    "@jest/expect" "^29.4.0"
+    "@jest/test-result" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
     dedent "^0.7.0"
     is-generator-fn "^2.0.0"
-    jest-each "^29.3.1"
-    jest-matcher-utils "^29.3.1"
-    jest-message-util "^29.3.1"
-    jest-runtime "^29.3.1"
-    jest-snapshot "^29.3.1"
-    jest-util "^29.3.1"
+    jest-each "^29.4.0"
+    jest-matcher-utils "^29.4.0"
+    jest-message-util "^29.4.0"
+    jest-runtime "^29.4.0"
+    jest-snapshot "^29.4.0"
+    jest-util "^29.4.0"
     p-limit "^3.1.0"
-    pretty-format "^29.3.1"
+    pretty-format "^29.4.0"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-cli@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz#e89dff427db3b1df50cea9a393ebd8640790416d"
-  integrity sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==
+jest-cli@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.4.0.tgz#63f34fc3b6f499a69337b2e5964661d22cead9e0"
+  integrity sha512-YUkICcxjUd864VOzbfQEi2qd2hIIOd9bRF7LJUNyhWb3Khh3YKrbY0LWwoZZ4WkvukiNdvQu0Z4s6zLsY4hYfg==
   dependencies:
-    "@jest/core" "^29.3.1"
-    "@jest/test-result" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/core" "^29.4.0"
+    "@jest/test-result" "^29.4.0"
+    "@jest/types" "^29.4.0"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.9"
     import-local "^3.0.2"
-    jest-config "^29.3.1"
-    jest-util "^29.3.1"
-    jest-validate "^29.3.1"
+    jest-config "^29.4.0"
+    jest-util "^29.4.0"
+    jest-validate "^29.4.0"
     prompts "^2.0.1"
     yargs "^17.3.1"
 
-jest-config@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz#0bc3dcb0959ff8662957f1259947aedaefb7f3c6"
-  integrity sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==
+jest-config@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.4.0.tgz#08065bcfc7c2ccfd3ca9f8bb412eb366d73fd5a2"
+  integrity sha512-jtgd72nN4Mob4Oego3N/pLRVfR2ui1hv+yO6xR/SUi5G7NtZ/grr95BJ1qRSDYZshuA0Jw57fnttZHZKb04+CA==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^29.3.1"
-    "@jest/types" "^29.3.1"
-    babel-jest "^29.3.1"
+    "@jest/test-sequencer" "^29.4.0"
+    "@jest/types" "^29.4.0"
+    babel-jest "^29.4.0"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     deepmerge "^4.2.2"
     glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-circus "^29.3.1"
-    jest-environment-node "^29.3.1"
+    jest-circus "^29.4.0"
+    jest-environment-node "^29.4.0"
     jest-get-type "^29.2.0"
     jest-regex-util "^29.2.0"
-    jest-resolve "^29.3.1"
-    jest-runner "^29.3.1"
-    jest-util "^29.3.1"
-    jest-validate "^29.3.1"
+    jest-resolve "^29.4.0"
+    jest-runner "^29.4.0"
+    jest-util "^29.4.0"
+    jest-validate "^29.4.0"
     micromatch "^4.0.4"
     parse-json "^5.2.0"
-    pretty-format "^29.3.1"
+    pretty-format "^29.4.0"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz#d8215b72fed8f1e647aed2cae6c752a89e757527"
-  integrity sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw==
+jest-diff@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.0.tgz#9c75dcef5872c8889bfcb78bc9571a0e4e9bd8f6"
+  integrity sha512-s8KNvFx8YgdQ4fn2YLDQ7N6kmVOP68dUDVJrCHNsTc3UM5jcmyyFeYKL8EPWBQbJ0o0VvDGbWp8oYQ1nsnqnWw==
   dependencies:
     chalk "^4.0.0"
     diff-sequences "^29.3.1"
     jest-get-type "^29.2.0"
-    pretty-format "^29.3.1"
+    pretty-format "^29.4.0"
 
 jest-docblock@^29.2.0:
   version "29.2.0"
@@ -6915,94 +6987,94 @@ jest-docblock@^29.2.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz#bc375c8734f1bb96625d83d1ca03ef508379e132"
-  integrity sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA==
+jest-each@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.4.0.tgz#1b6f018529b26f52851123075df4fa297b5b859b"
+  integrity sha512-LTOvB8JDVFjrwXItyQiyLuDYy5PMApGLLzbfIYR79QLpeohS0bcS6j2HjlWuRGSM8QQQyp+ico59Blv+Jx3fMw==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.0"
     chalk "^4.0.0"
     jest-get-type "^29.2.0"
-    jest-util "^29.3.1"
-    pretty-format "^29.3.1"
+    jest-util "^29.4.0"
+    pretty-format "^29.4.0"
 
-jest-environment-node@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz#5023b32472b3fba91db5c799a0d5624ad4803e74"
-  integrity sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag==
+jest-environment-node@^29.3.1, jest-environment-node@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.4.0.tgz#b19ae4cbf71199ed077a399de1e2cb0e52dbd936"
+  integrity sha512-WVveE3fYSH6FhDtZdvXhFKeLsDRItlQgnij+HQv6ZKxTdT1DB5O0sHXKCEC3K5mHraMs1Kzn4ch9jXC7H4L4wA==
   dependencies:
-    "@jest/environment" "^29.3.1"
-    "@jest/fake-timers" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/environment" "^29.4.0"
+    "@jest/fake-timers" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
-    jest-mock "^29.3.1"
-    jest-util "^29.3.1"
+    jest-mock "^29.4.0"
+    jest-util "^29.4.0"
 
 jest-get-type@^29.2.0:
   version "29.2.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
   integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
 
-jest-haste-map@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843"
-  integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==
+jest-haste-map@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.4.0.tgz#139d6bd262f3f74894f23933ee4046af7e770ab0"
+  integrity sha512-m/pIEfoK0HoJz4c9bkgS5F9CXN2AM22eaSmUcmqTpadRlNVBOJE2CwkgaUzbrNn5MuAqTV1IPVYwWwjHNnk8eA==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.0"
     "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.9"
     jest-regex-util "^29.2.0"
-    jest-util "^29.3.1"
-    jest-worker "^29.3.1"
+    jest-util "^29.4.0"
+    jest-worker "^29.4.0"
     micromatch "^4.0.4"
     walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-leak-detector@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz#95336d020170671db0ee166b75cd8ef647265518"
-  integrity sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA==
+jest-leak-detector@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.4.0.tgz#5f1079556c244cf6f5f281f5c5134ea2a07ad28e"
+  integrity sha512-fEGHS6ijzgSv5exABkCecMHNmyHcV52+l39ZsxuwfxmQMp43KBWJn2/Fwg8/l4jTI9uOY9jv8z1dXGgL0PHFjA==
   dependencies:
     jest-get-type "^29.2.0"
-    pretty-format "^29.3.1"
+    pretty-format "^29.4.0"
 
-jest-matcher-utils@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz#6e7f53512f80e817dfa148672bd2d5d04914a572"
-  integrity sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ==
+jest-matcher-utils@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.4.0.tgz#c2f804f95152216c8b80afbe73d82ae0ba89f652"
+  integrity sha512-pU4OjBn96rDdRIaPUImbPiO2ETyRVzkA1EZVu9AxBDv/XPDJ7JWfkb6IiDT5jwgicaPHMrB/fhVa6qjG6potfA==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^29.3.1"
+    jest-diff "^29.4.0"
     jest-get-type "^29.2.0"
-    pretty-format "^29.3.1"
+    pretty-format "^29.4.0"
 
-jest-message-util@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb"
-  integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA==
+jest-message-util@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.4.0.tgz#60d3f3dd6b5ef08ec9b698f434fbbafdb0af761d"
+  integrity sha512-0FvobqymmhE9pDEifvIcni9GeoKLol8eZspzH5u41g1wxYtLS60a9joT95dzzoCgrKRidNz64eaAXyzaULV8og==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.0"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^29.3.1"
+    pretty-format "^29.4.0"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz#60287d92e5010979d01f218c6b215b688e0f313e"
-  integrity sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA==
+jest-mock@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.4.0.tgz#efb5d99da5e4548ea02d505c89aafdd06d899cb8"
+  integrity sha512-+ShT5i+hcu/OFQRV0f/V/YtwpdFcHg64JZ9A8b40JueP+X9HNrZAYGdkupGIzsUK8AucecxCt4wKauMchxubLQ==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
-    jest-util "^29.3.1"
+    jest-util "^29.4.0"
 
 jest-pnp-resolver@^1.2.2:
   version "1.2.3"
@@ -7014,88 +7086,89 @@ jest-regex-util@^29.2.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b"
   integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==
 
-jest-resolve-dependencies@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz#a6a329708a128e68d67c49f38678a4a4a914c3bf"
-  integrity sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA==
+jest-resolve-dependencies@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.0.tgz#d8c9dce9ad8b193375b4993c4a659adf2d379b84"
+  integrity sha512-hxfC84trREyULSj1Cm+fMjnudrrI2dVQ04COjZRcjCZ97boJlPtfJ+qrl/pN7YXS2fnu3wTHEc3LO094pngL6A==
   dependencies:
     jest-regex-util "^29.2.0"
-    jest-snapshot "^29.3.1"
+    jest-snapshot "^29.4.0"
 
-jest-resolve@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz#9a4b6b65387a3141e4a40815535c7f196f1a68a7"
-  integrity sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw==
+jest-resolve@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.4.0.tgz#dbf00b2fb992d37e4954feb7ee6b5391ca8fc6a9"
+  integrity sha512-g7k7l53T+uC9Dp1mbHyDNkcCt0PMku6Wcfpr1kcMLwOHmM3vucKjSM5+DSa1r4vlDZojh8XH039J3z4FKmtTSw==
   dependencies:
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.3.1"
+    jest-haste-map "^29.4.0"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^29.3.1"
-    jest-validate "^29.3.1"
+    jest-util "^29.4.0"
+    jest-validate "^29.4.0"
     resolve "^1.20.0"
-    resolve.exports "^1.1.0"
+    resolve.exports "^2.0.0"
     slash "^3.0.0"
 
-jest-runner@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz#a92a879a47dd096fea46bb1517b0a99418ee9e2d"
-  integrity sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA==
+jest-runner@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.4.0.tgz#9f83f20e9e88d2c5e9b7db1526cef901c1c0fe98"
+  integrity sha512-4zpcv0NOiJleqT0NAs8YcVbK8MhVRc58CBBn9b0Exc8VPU9GKI+DbzDUZqJYdkJhJSZFy2862l/F6hAqIow1hg==
   dependencies:
-    "@jest/console" "^29.3.1"
-    "@jest/environment" "^29.3.1"
-    "@jest/test-result" "^29.3.1"
-    "@jest/transform" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/console" "^29.4.0"
+    "@jest/environment" "^29.4.0"
+    "@jest/test-result" "^29.4.0"
+    "@jest/transform" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
     chalk "^4.0.0"
     emittery "^0.13.1"
     graceful-fs "^4.2.9"
     jest-docblock "^29.2.0"
-    jest-environment-node "^29.3.1"
-    jest-haste-map "^29.3.1"
-    jest-leak-detector "^29.3.1"
-    jest-message-util "^29.3.1"
-    jest-resolve "^29.3.1"
-    jest-runtime "^29.3.1"
-    jest-util "^29.3.1"
-    jest-watcher "^29.3.1"
-    jest-worker "^29.3.1"
+    jest-environment-node "^29.4.0"
+    jest-haste-map "^29.4.0"
+    jest-leak-detector "^29.4.0"
+    jest-message-util "^29.4.0"
+    jest-resolve "^29.4.0"
+    jest-runtime "^29.4.0"
+    jest-util "^29.4.0"
+    jest-watcher "^29.4.0"
+    jest-worker "^29.4.0"
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz#21efccb1a66911d6d8591276a6182f520b86737a"
-  integrity sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A==
+jest-runtime@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.4.0.tgz#d4f3300e65888ea8e045bc13c5a96edd01cf9f49"
+  integrity sha512-2zumwaGXsIuSF92Ui5Pn5hZV9r7AHMclfBLikrXSq87/lHea9anQ+mC+Cjz/DYTbf/JMjlK1sjZRh8K3yYNvWg==
   dependencies:
-    "@jest/environment" "^29.3.1"
-    "@jest/fake-timers" "^29.3.1"
-    "@jest/globals" "^29.3.1"
+    "@jest/environment" "^29.4.0"
+    "@jest/fake-timers" "^29.4.0"
+    "@jest/globals" "^29.4.0"
     "@jest/source-map" "^29.2.0"
-    "@jest/test-result" "^29.3.1"
-    "@jest/transform" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/test-result" "^29.4.0"
+    "@jest/transform" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
     chalk "^4.0.0"
     cjs-module-lexer "^1.0.0"
     collect-v8-coverage "^1.0.0"
     glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.3.1"
-    jest-message-util "^29.3.1"
-    jest-mock "^29.3.1"
+    jest-haste-map "^29.4.0"
+    jest-message-util "^29.4.0"
+    jest-mock "^29.4.0"
     jest-regex-util "^29.2.0"
-    jest-resolve "^29.3.1"
-    jest-snapshot "^29.3.1"
-    jest-util "^29.3.1"
+    jest-resolve "^29.4.0"
+    jest-snapshot "^29.4.0"
+    jest-util "^29.4.0"
+    semver "^7.3.5"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz#17bcef71a453adc059a18a32ccbd594b8cc4e45e"
-  integrity sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA==
+jest-snapshot@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.4.0.tgz#c839f6b84d50b917691ddf6a3cef9f0852b3d0e7"
+  integrity sha512-UnK3MhdEWrQ2J6MnlKe51tvN5FjRUBQnO4m1LPlDx61or3w9+cP/U0x9eicutgunu/QzE4WC82jj6CiGIAFYzw==
   dependencies:
     "@babel/core" "^7.11.6"
     "@babel/generator" "^7.7.2"
@@ -7103,61 +7176,61 @@ jest-snapshot@^29.3.1:
     "@babel/plugin-syntax-typescript" "^7.7.2"
     "@babel/traverse" "^7.7.2"
     "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^29.3.1"
-    "@jest/transform" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/expect-utils" "^29.4.0"
+    "@jest/transform" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@types/babel__traverse" "^7.0.6"
     "@types/prettier" "^2.1.5"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^29.3.1"
+    expect "^29.4.0"
     graceful-fs "^4.2.9"
-    jest-diff "^29.3.1"
+    jest-diff "^29.4.0"
     jest-get-type "^29.2.0"
-    jest-haste-map "^29.3.1"
-    jest-matcher-utils "^29.3.1"
-    jest-message-util "^29.3.1"
-    jest-util "^29.3.1"
+    jest-haste-map "^29.4.0"
+    jest-matcher-utils "^29.4.0"
+    jest-message-util "^29.4.0"
+    jest-util "^29.4.0"
     natural-compare "^1.4.0"
-    pretty-format "^29.3.1"
+    pretty-format "^29.4.0"
     semver "^7.3.5"
 
-jest-util@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1"
-  integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==
+jest-util@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.0.tgz#1f3743c3dda843049623501c7e6f8fa5efdc2c2f"
+  integrity sha512-lCCwlze7UEV8TpR9ArS8w0cTbcMry5tlBkg7QSc5og5kNyV59dnY2aKHu5fY2k5aDJMQpCUGpvL2w6ZU44lveA==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz#d56fefaa2e7d1fde3ecdc973c7f7f8f25eea704a"
-  integrity sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g==
+jest-validate@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.4.0.tgz#5090be16531051edc21bc0892553f7f7fab99bf0"
+  integrity sha512-EXS7u594nX3aAPBnARxBdJ1eZ1cByV6MWrK0Qpt9lt/BcY0p0yYGp/EGJ8GhdLDQh+RFf8qMt2wzbbVzpj5+Vg==
   dependencies:
-    "@jest/types" "^29.3.1"
+    "@jest/types" "^29.4.0"
     camelcase "^6.2.0"
     chalk "^4.0.0"
     jest-get-type "^29.2.0"
     leven "^3.1.0"
-    pretty-format "^29.3.1"
+    pretty-format "^29.4.0"
 
-jest-watcher@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz#3341547e14fe3c0f79f9c3a4c62dbc3fc977fd4a"
-  integrity sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg==
+jest-watcher@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.4.0.tgz#4f51e6fba4341d965279a5a646adde5104d414f0"
+  integrity sha512-PnnfLygNKelWOJwpAYlcsQjB+OxRRdckD0qiGmYng4Hkz1ZwK3jvCaJJYiywz2msQn4rBNLdriasJtv7YpWHpA==
   dependencies:
-    "@jest/test-result" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/test-result" "^29.4.0"
+    "@jest/types" "^29.4.0"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     emittery "^0.13.1"
-    jest-util "^29.3.1"
+    jest-util "^29.4.0"
     string-length "^4.0.1"
 
 jest-worker@^26.5.0:
@@ -7169,25 +7242,25 @@ jest-worker@^26.5.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b"
-  integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==
+jest-worker@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.4.0.tgz#fbf6d700c3366c555765938da75990c1e7fdcdcd"
+  integrity sha512-dICMQ+Q4W0QVMsaQzWlA1FVQhKNz7QcDCOGtbk1GCAd0Lai+wdkQvfmQwL4MjGumineh1xz+6M5oMj3rfWS02A==
   dependencies:
     "@types/node" "*"
-    jest-util "^29.3.1"
+    jest-util "^29.4.0"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
 jest@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz#c130c0d551ae6b5459b8963747fed392ddbde122"
-  integrity sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.4.0.tgz#c476b3d0c58af77f276f53f81d4d97e16105ae37"
+  integrity sha512-Zfd4UzNxPkSoHRBkg225rBjQNa6pVqbh20MGniAzwaOzYLd+pQUcAwH+WPxSXxKFs+QWYfPYIq9hIVSmdVQmPA==
   dependencies:
-    "@jest/core" "^29.3.1"
-    "@jest/types" "^29.3.1"
+    "@jest/core" "^29.4.0"
+    "@jest/types" "^29.4.0"
     import-local "^3.0.2"
-    jest-cli "^29.3.1"
+    jest-cli "^29.4.0"
 
 jiti@^1.14.0, jiti@^1.9.2:
   version "1.16.0"
@@ -7311,12 +7384,12 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.1:
+json5@^2.1.1, json5@^2.2.1, json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-json5@^2.1.2, json5@^2.2.1:
+json5@^2.1.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
@@ -8103,9 +8176,9 @@ minimatch@^3.0.4, minimatch@^3.1.1:
     brace-expansion "^1.1.7"
 
 minimatch@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
-  integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -8508,9 +8581,9 @@ node-object-hash@^1.2.0:
   integrity sha512-UdS4swXs85fCGWWf6t6DMGgpN/vnlKeSGEQ7hJcrs7PBFoxoKLmibc3QRb7fwiYsjdL7PX8iI/TMSlZ90dgHhQ==
 
 node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae"
+  integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==
 
 node-res@^5.0.1:
   version "5.0.1"
@@ -9980,9 +10053,9 @@ prepend-http@^1.0.0:
   integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
 prettier@^2.8.1:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.2.tgz#c4ea1b5b454d7c4b59966db2e06ed7eec5dfd160"
-  integrity sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw==
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.3.tgz#ab697b1d3dd46fb4626fbe2f543afe0cc98d8632"
+  integrity sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==
 
 pretty-bytes@^5.6.0:
   version "5.6.0"
@@ -9997,12 +10070,12 @@ pretty-error@^2.1.1:
     lodash "^4.17.20"
     renderkid "^2.0.4"
 
-pretty-format@^29.3.1:
-  version "29.3.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da"
-  integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg==
+pretty-format@^29.4.0:
+  version "29.4.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.0.tgz#766f071bb1c53f1ef8000c105bbeb649e86eb993"
+  integrity sha512-J+EVUPXIBHCdWAbvGBwXs0mk3ljGppoh/076g1S8qYS8nVG4u/yrhMvyTFHYYYKWnDdgRLExx0vA7pzxVGdlNw==
   dependencies:
-    "@jest/schemas" "^29.0.0"
+    "@jest/schemas" "^29.4.0"
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
@@ -10679,10 +10752,10 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve.exports@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
-  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
+resolve.exports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.0.tgz#c1a0028c2d166ec2fbf7d0644584927e76e7400e"
+  integrity sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==
 
 resolve@^1.1.7, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.9.0:
   version "1.22.1"
@@ -10856,9 +10929,9 @@ sass-loader@^10.2.0:
     semver "^7.3.2"
 
 sass@^1.56.2:
-  version "1.56.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.2.tgz#9433b345ab3872996c82a53a58c014fd244fd095"
-  integrity sha512-ciEJhnyCRwzlBCB+h5cCPM6ie/6f8HrhZMQOf5vlU60Y1bI1rx5Zb0vlDZvaycHsg/MqFfF1Eq2eokAa32iw8w==
+  version "1.57.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.1.tgz#dfafd46eb3ab94817145e8825208ecf7281119b5"
+  integrity sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -10974,9 +11047,9 @@ seq-queue@^0.0.5:
   integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==
 
 sequelize-cli@^6.3.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.5.2.tgz#8c0b061a213a550ba812029c0fabeb5a38843d2c"
-  integrity sha512-ltXvQOxFFb9pVuDqPJYOS3/X32OVni9zK1S0d0JfloSjmCKZmMDFBWndZbcbJH0QBfyxTt7FLt/kSmKwTRlbsQ==
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-6.6.0.tgz#f11588c93b53321637f8aedd5b10ed57d6d06482"
+  integrity sha512-FwTClhGRvXKanFRHMZbgfXOBV8UC2B3VkE0WOdW1n39/36PF4lWyurF95f246une/V4eaO3a7/Ywvy++3r+Jmg==
   dependencies:
     cli-color "^2.0.3"
     fs-extra "^9.1.0"
@@ -12947,10 +13020,10 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
+write-file-atomic@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.0.tgz#54303f117e109bf3d540261125c8ea5a7320fab0"
+  integrity sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w==
   dependencies:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"

From c54630a2f4bac771b40ee2c212c433d570bd0fce Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 26 Jan 2023 23:30:18 +0100
Subject: [PATCH 30/38] minor

---
 components/WhereInput.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/WhereInput.vue b/components/WhereInput.vue
index 75eb3615..1baea189 100644
--- a/components/WhereInput.vue
+++ b/components/WhereInput.vue
@@ -139,7 +139,7 @@ export default {
       if (!matches && search) {
         this.places.unshift({ create: true, name: ev.target.value.trim() })
       }
-    }, 100),
+    }, 200),
     loadCoordinatesResultIcon(item) {
       if (this.geocoding_provider_type == "Nominatim") {
         if ( this.nominatim_class.includes(item.class)) {

From a9c9fd38a535be36e9794821fad51622475cedba Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 26 Jan 2023 23:30:53 +0100
Subject: [PATCH 31/38] introduce a new instance api rate limiter

---
 server/api/controller/event.js     |  2 +-
 server/api/controller/geocoding.js | 10 ----------
 server/api/controller/place.js     |  2 --
 server/api/index.js                | 23 ++++++++++++---------
 server/api/limiter.js              | 32 ++++++++++++++++++++++++++++++
 5 files changed, 47 insertions(+), 22 deletions(-)
 create mode 100644 server/api/limiter.js

diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index e84f03dc..8bc5fe24 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -689,7 +689,7 @@ const eventController = {
       ...pagination,
       replacements
     }).catch(e => {
-      log.error('[EVENT]', e)
+      log.error('[EVENT]' + String(e))
       return []
     })
 
diff --git a/server/api/controller/geocoding.js b/server/api/controller/geocoding.js
index a86b1ca3..b30d166b 100644
--- a/server/api/controller/geocoding.js
+++ b/server/api/controller/geocoding.js
@@ -1,4 +1,3 @@
-const rateLimit = require('express-rate-limit');
 const log = require('../../log')
 const nominatim = require('../../services/geocoding/nominatim')
 const photon = require('../../services/geocoding/photon')
@@ -8,15 +7,6 @@ let d = 0 // departure time
 let h = 0 // hit geocoding provider time (aka Latency)
 
 const geocodingController = {
-  /**
-   * TODO: replace/merge with a general 'instance rate-limiter' or 'instance api-related rate-limiter' when this will be defined
-   */  
-  instanceApiRateLimiter: rateLimit({
-    windowMs: 15 * 60 * 1000, // 15 minutes
-    max: 100, // Limit each IP to 100 requests per `window` (here, per 15 minutes)
-    standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
-    legacyHeaders: false, // Disable the `X-RateLimit-*` headers
-  }),
 
   /** 
    * Limit provider api usage.
diff --git a/server/api/controller/place.js b/server/api/controller/place.js
index 47f71b34..cf217bf7 100644
--- a/server/api/controller/place.js
+++ b/server/api/controller/place.js
@@ -3,8 +3,6 @@ const { Place, Event } = require('../models/models')
 const eventController = require('./event')
 const exportController = require('./export')
 
-const { version } = require('../../../package.json')
-
 const log = require('../../log')
 const { Op, where, col, fn, cast } = require('sequelize')
 
diff --git a/server/api/index.js b/server/api/index.js
index f6c8bf6b..a44f231d 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -20,6 +20,7 @@ const oauthController = require('./controller/oauth')
 const announceController = require('./controller/announce')
 const pluginController = require('./controller/plugins')
 const geocodingController = require('./controller/geocoding')
+const { DDOSProtectionApiRateLimiter, SPAMProtectionApiRateLimiter } = require('./limiter')
 const helpers = require('../helpers')
 const storage = require('./storage')
 
@@ -30,6 +31,10 @@ module.exports = () => {
   api.use(express.urlencoded({ extended: false }))
   api.use(express.json())
   
+  if (process.env.NODE_ENV !== 'test') {
+    api.use(DDOSProtectionApiRateLimiter)
+  }
+  
   
   if (config.status !== 'READY') {
   
@@ -66,12 +71,12 @@ module.exports = () => {
     api.get('/ping', (_req, res) => res.sendStatus(200))
     api.get('/user', isAuth, (req, res) => res.json(req.user))
   
-    api.post('/user/recover', userController.forgotPassword)
+    api.post('/user/recover', SPAMProtectionApiRateLimiter, userController.forgotPassword)
     api.post('/user/check_recover_code', userController.checkRecoverCode)
-    api.post('/user/recover_password', userController.updatePasswordWithRecoverCode)
+    api.post('/user/recover_password', SPAMProtectionApiRateLimiter, userController.updatePasswordWithRecoverCode)
   
     // register and add users
-    api.post('/user/register', userController.register)
+    api.post('/user/register', SPAMProtectionApiRateLimiter, userController.register)
     api.post('/user', isAdmin, userController.create)
   
     // update user
@@ -127,7 +132,7 @@ module.exports = () => {
      */
   
     // allow anyone to add an event (anon event has to be confirmed, TODO: flood protection)
-    api.post('/event', eventController.isAnonEventAllowed, upload.single('image'), eventController.add)
+    api.post('/event', eventController.isAnonEventAllowed, SPAMProtectionApiRateLimiter, upload.single('image'), eventController.add)
   
     // api.get('/event/search', eventController.search)
   
@@ -141,8 +146,8 @@ module.exports = () => {
     api.get('/event/meta', eventController.searchMeta)
   
     // add event notification TODO
-    api.post('/event/notification', eventController.addNotification)
-    api.delete('/event/notification/:code', eventController.delNotification)
+    // api.post('/event/notification', eventController.addNotification)
+    // api.delete('/event/notification/:code', eventController.delNotification)
   
     api.post('/settings', isAdmin, settingsController.setRequest)
     api.get('/settings', isAdmin, settingsController.getAll)
@@ -173,8 +178,8 @@ module.exports = () => {
     api.put('/place', isAdmin, placeController.updatePlace)
 
     // - GEOCODING
-    api.get('/placeOSM/Nominatim/:place_details', helpers.isGeocodingEnabled, geocodingController.instanceApiRateLimiter, geocodingController.nominatimRateLimit, geocodingController._nominatim)
-    api.get('/placeOSM/Photon/:place_details', helpers.isGeocodingEnabled, geocodingController.instanceApiRateLimiter, geocodingController.photonRateLimit, geocodingController._photon)
+    api.get('/placeOSM/Nominatim/:place_details', helpers.isGeocodingEnabled, geocodingController.nominatimRateLimit, geocodingController._nominatim)
+    api.get('/placeOSM/Photon/:place_details', helpers.isGeocodingEnabled, geocodingController.photonRateLimit, geocodingController._photon)
   
     // - TAGS
     api.get('/tags', isAdmin, tagController.getAll)
@@ -215,7 +220,7 @@ module.exports = () => {
     // OAUTH
     api.get('/clients', isAuth, oauthController.getClients)
     api.get('/client/:client_id', isAuth, oauthController.getClient)
-    api.post('/client', oauthController.createClient)
+    api.post('/client', SPAMProtectionApiRateLimiter, oauthController.createClient)
   }
   
   api.use((_req, res) => res.sendStatus(404))
diff --git a/server/api/limiter.js b/server/api/limiter.js
new file mode 100644
index 00000000..1f417402
--- /dev/null
+++ b/server/api/limiter.js
@@ -0,0 +1,32 @@
+const rateLimit = require('express-rate-limit')
+const log = require('../log')
+
+const next = (req, res, next) => next()
+
+const instanceApiRateLimiter = {
+
+  DDOSProtectionApiRateLimiter: (process.env.NODE_ENV === 'test' ? next : rateLimit({
+    windowMs: 60 * 1000, // 5 minutes
+    max: 100, // Limit each IP to 100 requests per `window` (here, per 5 minutes)
+    standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
+    legacyHeaders: false, // Disable the `X-RateLimit-*` headers
+    handler: (request, response, next, options) => {
+      log.warn(`DDOS protection api rate limiter: > 100req/minute/ip ${request.ip}`)
+      return response.status(options.statusCode).send(options.message)    
+    }
+  })),
+  
+  SPAMProtectionApiRateLimiter: (process.env.NODE_ENV === 'test' ? next : rateLimit({
+    windowMs: 5 * 60 * 1000, // 10 minutes
+    max: 3, // Limit each IP to 3 requests per `window` (here, per 15 minutes)
+    standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers
+    legacyHeaders: false, // Disable the `X-RateLimit-*` headers
+    handler: (request, response, next, options) => {
+      log.warn(`SPAM protection api rate limiter: 3req/5min/ip ${request.ip}`)
+      return response.status(options.statusCode).send(options.message)    
+    }
+  }))
+
+}
+
+module.exports = instanceApiRateLimiter
\ No newline at end of file

From 7cb9530414e5d408f96c6c27644b48c8653d0a43 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Fri, 3 Feb 2023 15:12:12 +0100
Subject: [PATCH 32/38] add timezone and actor to nodeinfo

---
 server/federation/webfinger.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/federation/webfinger.js b/server/federation/webfinger.js
index a2869da9..779dbc97 100644
--- a/server/federation/webfinger.js
+++ b/server/federation/webfinger.js
@@ -63,7 +63,9 @@ router.get('/nodeinfo/:nodeinfo_version', async (req, res) => {
     metadata: {
       nodeDescription: settings.description,
       nodeName: settings.title,
-      nodeLabel: settings.instance_place
+      nodeLabel: settings.instance_place,
+      nodeTimezone: settings.instance_timezone,
+      nodeActor: settings.instance_name
     },
     openRegistrations: settings.allow_registration,
     protocols: ['activitypub'],

From f2376997b837634b40f14f8798d3ef64d2241111 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Fri, 3 Feb 2023 21:55:33 +0100
Subject: [PATCH 33/38] use localSetting to store a global state of user
 choices

---
 components/Calendar.vue  | 11 +++-------
 components/Event.vue     |  8 +++----
 components/ThemeView.vue | 47 +++++++++++++---------------------------
 layouts/default.vue      | 14 +++++-------
 pages/index.vue          |  7 +-----
 store/index.js           | 34 +++++++++++++++++++++++++++--
 6 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/components/Calendar.vue b/components/Calendar.vue
index cee0d865..a0de2f25 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -4,7 +4,7 @@
       ref='cal'
       v-model='selectedDate'
       title-position='left'
-      :is-dark="settings['theme.is_dark']"
+      :is-dark="is_dark"
       :columns="!$vuetify.breakpoint.smAndDown ? 2 : 1"
       @input='click'
       @update:from-page='updatePage'
@@ -15,20 +15,14 @@
       aria-label='Calendar'
       is-expanded
       is-inline)
-      //- template(v-slot="{ inputValue, inputEvents }")
-        v-btn#calendarButton(v-on='inputEvents' text tile :color='selectedDate ? "primary" : "" ') {{inputValue || $t('common.calendar')}} 
-          v-icon(v-if='selectedDate' v-text='mdiClose' right small icon @click.prevent.stop='selectedDate = null')
-          v-icon(v-else v-text='mdiChevronDown' right small icon)
     .calh.d-flex.justify-center.align-center(slot='placeholder')
       v-progress-circular(indeterminate)
-    //-   v-btn#calendarButton(text tile) {{$t('common.calendar')}} 
-    //-     v-icon(v-text='mdiChevronDown' right small icon)
 
   </template>
 
 </template>
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 import dayjs from 'dayjs'
 import { mdiChevronDown, mdiClose } from '@mdi/js'
 import { attributesFromEvents } from '../assets/helper'
@@ -46,6 +40,7 @@ export default {
   },
   computed: {
     ...mapState(['settings', 'events']),
+    ...mapGetters(['is_dark']),
     attributes () {
       return attributesFromEvents(this.events)
     }
diff --git a/components/Event.vue b/components/Event.vue
index 0f253f72..06d8540e 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -17,15 +17,13 @@ v-card.h-event.event.d-flex(itemscope itemtype="https://schema.org/Event")
 
 </template>
 <script>
-import { mapState } from 'vuex'
+import { mapGetters } from 'vuex'
 import MyPicture from '~/components/MyPicture'
 import { mdiRepeat, mdiCalendar, mdiMapMarker } from '@mdi/js'
 
 export default {
   data({ $store }) {
-    return { mdiRepeat, mdiMapMarker, mdiCalendar,
-      hide_thumbs: this.$cookies.get('theme.hide_thumbs') || $store.state.settings.hide_thumbs
-    }
+    return { mdiRepeat, mdiMapMarker, mdiCalendar }
   },
   components: {
     MyPicture
@@ -34,6 +32,6 @@ export default {
     event: { type: Object, default: () => ({}) },
     lazy: Boolean
   },
-  computed: mapState(['settings'])
+  computed: mapGetters(['hide_thumbs'])
 }
 </script>
diff --git a/components/ThemeView.vue b/components/ThemeView.vue
index ff34e658..712efc9a 100644
--- a/components/ThemeView.vue
+++ b/components/ThemeView.vue
@@ -1,48 +1,31 @@
 <template lang="pug">
-div.p-0.m-0.d-flex.justify-end(:key='reload')
-  v-icon.ml-5(@click='_is_dark()' v-text='mdiContrastCircle')
-  v-icon.ml-5(@click='_hide_thumbs()' v-if="!hide_thumbs" v-text='!hide_thumbs_icon ?  mdiViewList : mdiViewModule')
+div.p-0.m-0.d-flex.justify-end
+  v-icon.ml-5(@click='toggleDark' v-text='mdiContrastCircle')
+  v-icon.ml-5(@click='toggleHideThumbs' v-text='hide_thumbs ?  mdiViewList : mdiViewModule')
 
 </template>
 
 <script>
-import { mapActions, mapState } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 import { mdiViewModule, mdiViewList, mdiContrastCircle } from '@mdi/js'
 
 export default {
   name: 'ThemeView',
-  data ({ $store }) {
-    return {
-      mdiViewModule, mdiViewList, mdiContrastCircle,
-      hide_thumbs: $store.state.settings.hide_thumbs,
-      hide_thumbs_icon: $store.state.settings.hide_thumbs || this.$cookies.get('theme.hide_thumbs'),
-      reload: 0
-    }
+  data () {
+    return { mdiViewModule, mdiViewList, mdiContrastCircle }
+  },
+  computed: {
+    ...mapGetters(['hide_thumbs', 'is_dark']),
   },
   methods: {
-    ...mapState(['settings']),
-    async _is_dark() {
+    ...mapActions(['setLocalSetting']),
+    async toggleDark() {
       this.$vuetify.theme.dark = !this.$vuetify.theme.dark
-      await this.$cookies.set('theme.is_dark', this.$vuetify.theme.dark, {
-        path: '/',
-        maxAge: 60 * 60 * 24 * 7
-      })
-    },
-    async _hide_thumbs() {
-      let theme_hide_thumbs = await this.$cookies.get('theme.hide_thumbs')
-      if (theme_hide_thumbs != null) {
-        theme_hide_thumbs = !theme_hide_thumbs
-      } else {
-        theme_hide_thumbs = !this.settings.hide_thumbs
-      }
-      await this.$cookies.set('theme.hide_thumbs', theme_hide_thumbs, {
-        path: '/',
-        maxAge: 60 * 60 * 24 * 7
-      })
-      this.hide_thumbs_icon = theme_hide_thumbs
-      this.reload++
-      this.$root.$emit('layout_loaded', true)
+      this.setLocalSetting({ key: 'theme.is_dark', value: !this.is_dark })
     },
+    async toggleHideThumbs() {
+      this.setLocalSetting({ key: 'hide_thumbs', value: !this.hide_thumbs })
+    }
   }
 }
 </script>
diff --git a/layouts/default.vue b/layouts/default.vue
index 2227c6ca..29e5e22e 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -19,7 +19,7 @@ import Appbar from '../components/Appbar.vue'
 import Snackbar from '../components/Snackbar'
 import Footer from '../components/Footer'
 import Confirm from '../components/Confirm'
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 
 export default {
   head () {
@@ -32,14 +32,12 @@ export default {
   },
   name: 'Default',
   components: { Appbar, Snackbar, Footer, Confirm },
-  computed: mapState(['settings']),
+  computed: {
+    ...mapState(['settings']),
+    ...mapGetters(['is_dark'])
+  },
   created () {
-    const theme_is_dark = this.$cookies.get('theme.is_dark')
-    if ( theme_is_dark != null ) {
-      this.$vuetify.theme.dark = theme_is_dark
-    } else {
-      this.$vuetify.theme.dark = this.settings['theme.is_dark']
-    }
+    this.$vuetify.theme.dark = this.is_dark
   }
 }
 </script>
diff --git a/pages/index.vue b/pages/index.vue
index 3d7cd736..e02c2fa7 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -10,7 +10,7 @@ v-container.px-2.px-sm-6.pt-0
     Announcement(v-for='announcement in announcements' :key='`a_${announcement.id}`' :announcement='announcement')
 
   //- Events
-  #events.mt-sm-4.mt-2(:key="reload_events")
+  #events.mt-sm-4.mt-2
     Event(:event='event' v-for='(event, idx) in visibleEvents' :lazy='idx>2' :key='event.id')
 </template>
 
@@ -48,7 +48,6 @@ export default {
       tmpEvents: [],
       selectedDay: null,
       storeUnsubscribe: null,
-      reload_events: 0
     }
   },
   head () {
@@ -100,10 +99,6 @@ export default {
         }
       }
     }})
-    // this.$root.$on('search', debounce(this.search, 100))
-    // this.$root.$on('layout_loaded', () => {
-    //     this.reload_events++
-    // })
   },
   destroyed () {
     this.$root.$off('dayclick')
diff --git a/store/index.js b/store/index.js
index a0179aa2..09a7b07e 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,6 +1,10 @@
 import dayjs from 'dayjs'
 
 export const state = () => ({
+  localSettings : {
+    hide_thumbs: null,
+    'theme.is_dark': null
+  },
   settings: {
     instance_timezone: 'Europe/Rome',
     instance_name: '',
@@ -21,7 +25,10 @@ export const state = () => ({
     enable_trusted_instances: true,
     trusted_instances: [],
     trusted_instances_label: '',
-    footerLinks: []
+    footerLinks: [],
+    hide_thumbs: false,
+    'theme.is_dark': true,
+    hide_calendar: false
   },
   filter: {
     query: '',
@@ -32,6 +39,15 @@ export const state = () => ({
   events: []
 })
 
+export const getters = {
+  hide_thumbs (state) {
+    return (state.localSettings['hide_thumbs'] === null) ? state.settings.hide_thumbs : state.localSettings.hide_thumbs
+  },
+  is_dark (state) {
+    return (state.localSettings['theme.is_dark'] === null) ? state.settings['theme.is_dark'] : state.localSettings['theme.is_dark']
+  }
+}
+
 export const mutations = {
   setSettings (state, settings) {
     state.settings = settings
@@ -39,6 +55,9 @@ export const mutations = {
   setSetting (state, setting) {
     state.settings[setting.key] = setting.value
   },
+  setLocalSetting(state, setting) {
+    state.localSettings[setting.key] = setting.value
+  },
   setAnnouncements (state, announcements) {
     state.announcements = announcements
   },
@@ -53,13 +72,17 @@ export const mutations = {
 export const actions = {
   // this method is called server side only for each request for nuxt
   // we use it to get configuration from db, set locale, etc...
-  nuxtServerInit ({ commit }, { _req, res }) {
+  nuxtServerInit ({ commit }, { res, app }) {
+
     if (res.locals && res.locals.settings) {
       commit('setSettings', res.locals.settings)
     }
     commit('setFilter', {  type: 'show_recurrent',
         value: res.locals.settings.allow_recurrent_event && res.locals.settings.recurrent_event_visible })
 
+    commit('setLocalSetting', { key: 'hide_thumbs', value: app.$cookies.get('hide_thumbs') })
+    commit('setLocalSetting', { key: 'theme.is_dark', value: app.$cookies.get('theme.is_dark') })
+
     if (res.locals.status === 'READY') {
       commit('setAnnouncements', res.locals.announcements)
     }
@@ -75,6 +98,13 @@ export const actions = {
     await this.$axios.$post('/settings', setting)
     commit('setSetting', setting)
   },
+  async setLocalSetting ({ commit }, setting) {
+    this.$cookies.set(setting.key, setting.value, {
+      path: '/',
+      maxAge: 60 * 60 * 24 * 7
+    })
+    commit('setLocalSetting', setting)
+  },
   setFilter ({ commit }, [type, value]) {
     commit('setFilter', { type, value })
   },

From 6951627d8e49dcb2a8c76fc0fd4d0327391c429b Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Sat, 4 Feb 2023 10:17:24 +0100
Subject: [PATCH 34/38] minor

---
 components/DateInput.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/DateInput.vue b/components/DateInput.vue
index 2b45b374..f9ddfd86 100644
--- a/components/DateInput.vue
+++ b/components/DateInput.vue
@@ -20,7 +20,7 @@ v-col(cols=12)
             @input="date => change('date', date)"
             :attributes='attributes'
             :locale='$i18n.locale'
-            :is-dark="settings['theme.is_dark']"
+            :is-dark="is_dark"
             is-inline
             is-expanded
             :min-date='type !== "recurrent" && new Date()')
@@ -95,7 +95,7 @@ v-col(cols=12)
 </template>
 <script>
 import dayjs from 'dayjs'
-import { mapState, mapActions } from 'vuex'
+import { mapState, mapActions, mapGetters } from 'vuex'
 import List from '@/components/List'
 import { attributesFromEvents } from '../assets/helper'
 import { mdiClockTimeFourOutline, mdiClockTimeEightOutline, mdiClose } from '@mdi/js'
@@ -123,6 +123,7 @@ export default {
   },
   computed: {
     ...mapState(['settings', 'events']),
+    ...mapGetters(['is_dark']),
     fromDate () {
       if (this.value.from) {
         if (this.value.multidate) {

From 9d17770c3d51f9a87bc477a5b63fa5ea6e667206 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Sat, 4 Feb 2023 10:25:41 +0100
Subject: [PATCH 35/38] fix ics link

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

diff --git a/pages/event/_slug.vue b/pages/event/_slug.vue
index 168c5240..244a2010 100644
--- a/pages/event/_slug.vue
+++ b/pages/event/_slug.vue
@@ -65,7 +65,7 @@ v-container#event.pa-0.pa-sm-2
                     v-list-item-title(v-text="$t('common.embed')")
                 
                 //- calendar
-                v-list-item(:href='`/api/event/${event.slug || event.id}.ics`')
+                v-list-item(:href='`/api/event/detail/${event.slug || event.id}.ics`')
                   v-list-item-icon
                     v-icon(v-text='mdiCalendarExport')
                   v-list-item-content

From a36c8c29cb6e912955df0243889ead05abbd90a8 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Sat, 4 Feb 2023 10:42:06 +0100
Subject: [PATCH 36/38] do not use end time when not used, fix #233

---
 server/api/controller/export.js | 15 +++++++++++----
 server/api/models/event.js      |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/server/api/controller/export.js b/server/api/controller/export.js
index 2aa410b1..08cfe1ef 100644
--- a/server/api/controller/export.js
+++ b/server/api/controller/export.js
@@ -81,14 +81,13 @@ const exportController = {
   ics (_req, res, events, alarms = []) {
     const settings = res.locals.settings
     const eventsMap = events.map(e => {
+
       const tmpStart = moment.unix(e.start_datetime)
-      const tmpEnd = moment.unix(e.end_datetime)
       const start = tmpStart.utc(true).format('YYYY-M-D-H-m').split('-').map(Number)
-      const end = tmpEnd.utc(true).format('YYYY-M-D-H-m').split('-').map(Number)
-      return {
+
+      const ret = {
         uid: `${e.id}@${settings.hostname}`,
         start,
-        end,
         title: `[${settings.title}] ${e.title}`,
         description: htmlToText(e.description),
         htmlContent: e.description,
@@ -98,6 +97,14 @@ const exportController = {
         categories: e.tags.map(t => t.tag),
         alarms
       }
+
+      if (e.end_datetime) {
+        const tmpEnd = moment.unix(e.end_datetime)
+        const end = tmpEnd.utc(true).format('YYYY-M-D-H-m').split('-').map(Number)
+        ret.end = end
+      }
+
+      return ret
     })
     res.type('text/calendar; charset=UTF-8')
     ics.createEvents(eventsMap, (err, value) => {
diff --git a/server/api/models/event.js b/server/api/models/event.js
index c0e6c7d5..362d9134 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -69,7 +69,7 @@ module.exports = (sequelize, DataTypes) => {
       url: `${config.baseurl}/event/${this.slug || this.id}`,
       type: 'Event',
       startTime: dayjs.unix(this.start_datetime).tz().locale(locale).format(),
-      endTime: this.end_datetime ? dayjs.unix(this.end_datetime).tz().locale(locale).format() : null,
+      ...( this.end_datetime ? { endTime : dayjs.unix(this.end_datetime).tz().locale(locale).format() } : {} ),
       location: {
         name: this.place.name,
         address: this.place.address,

From 98f6b9618c4d2fbe49e6af337a67bdeacce48abb Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 7 Feb 2023 17:44:23 +0100
Subject: [PATCH 37/38] i18n refactoring, locale loaders, custom strings, fix
 #231

---
 locales/loader.js               | 13 ++++++++++++
 nuxt.config.js                  |  3 +--
 pages/index.vue                 |  2 +-
 plugins/axios.js                |  5 ++++-
 plugins/i18n.js                 | 32 ++---------------------------
 server/api/controller/locale.js | 36 +++++++++++++++++++++++++++++++++
 server/api/index.js             |  4 ++++
 7 files changed, 61 insertions(+), 34 deletions(-)
 create mode 100644 locales/loader.js
 create mode 100644 server/api/controller/locale.js

diff --git a/locales/loader.js b/locales/loader.js
new file mode 100644
index 00000000..e289830a
--- /dev/null
+++ b/locales/loader.js
@@ -0,0 +1,13 @@
+export default async (context, locale) => {
+  try {
+    if (process.server) {
+      return context.$axios.$get(`locale/${locale}`)
+    } else {
+      return fetch(`${window.location.origin}/api/locale/${locale}`).then(ret => ret.json())
+    }
+  } catch (e) {
+    console.error(`Error loading locale ${locale}`, e)
+  }
+
+  return localeMessages
+}
\ No newline at end of file
diff --git a/nuxt.config.js b/nuxt.config.js
index 214f9377..72eb06d1 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -89,6 +89,7 @@ module.exports = {
       code: key,
       name: locales[key],
       file: `${key}.json`,
+      file: 'loader.js',
       iso: key
     })),
     vueI18n: {
@@ -98,9 +99,7 @@ module.exports = {
     langDir: 'locales',
     lazy: true,
     strategy: 'no_prefix',
-    baseUrl: config.baseurl,
     skipSettingLocaleOnNavigate: true,
-    skipNuxtState: true
   },
 
   serverMiddleware: ['server/routes'],
diff --git a/pages/index.vue b/pages/index.vue
index e02c2fa7..5a01f421 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -35,7 +35,7 @@ export default {
   },
   activated() {
     if (this.$fetchState.timestamp <= Date.now() - 60000) {
-      this.$fetch();
+      this.$fetch()
     }
   },
   data ({ $store }) {
diff --git a/plugins/axios.js b/plugins/axios.js
index dba773fc..6be21654 100644
--- a/plugins/axios.js
+++ b/plugins/axios.js
@@ -1,5 +1,8 @@
 export default function ({ $axios, store }) {
   if (process.client) {
-    $axios.defaults.baseURL = window.location.origin + '/api'
+    $axios.setBaseURL(window.location.origin + '/api')
+  } else {
+    const config = require('../server/config')
+    $axios.setBaseURL(config.baseurl + '/api')
   }
 }
diff --git a/plugins/i18n.js b/plugins/i18n.js
index 0b45be42..88ad4536 100644
--- a/plugins/i18n.js
+++ b/plugins/i18n.js
@@ -1,36 +1,8 @@
-export default async ({ app, store, res, $vuetify }) => {
+export default async ({ app, $vuetify }) => {
 
   $vuetify.lang.current = app.i18n.locale
 
   app.i18n.onLanguageSwitched = (oldLocale, newLocale) => {
     $vuetify.lang.current = newLocale
   }
-
-  // const messages = {}
-  // if (process.server) {
-  //   if (res.locals) {
-  //     store.commit('setLocale', res.locals.acceptedLocale)
-  //     if (res.locals.user_locale) {
-  //       store.commit('setUserLocale', res.locals.user_locale)
-  //     }
-  //   }
-  // }
-
-  // messages[store.state.locale] = await import(/* webpackChunkName: "lang-[request]" */`../locales/${store.state.locale}.json`)
-
-  // always include en fallback locale
-  // if (store.state.locale !== 'en') {
-  //   messages.en = await import('../locales/en.json')
-  // }
-
-  // if (store.state.user_locale) {
-  //   merge(messages[store.state.locale], store.state.user_locale)
-  // }
-
-  // Set i18n instance on app
-  // app.i18n = new VueI18n({
-  //   locale: store.state.locale,
-  //   fallbackLocale: 'en',
-  //   messages
-  // })
-}
+}
\ No newline at end of file
diff --git a/server/api/controller/locale.js b/server/api/controller/locale.js
new file mode 100644
index 00000000..865b3723
--- /dev/null
+++ b/server/api/controller/locale.js
@@ -0,0 +1,36 @@
+const merge = require('lodash/merge')
+const config = require('../../config')
+const path = require('path')
+const fs = require('fs')
+const log = require('../../log')
+
+const localeController = {
+  async get (req, res) {
+    const locale = req.params.locale
+    const locales = require('../../../locales/index')
+
+    // check if this locale exists
+    if (!locales[locale]) {
+      return res.sendStatus(404)
+    }
+
+    const defaultLocaleMessages = require(`../../../locales/${locale}.json`)
+
+    // check if we have a user custom messages
+    let customLocaleMessages = {}
+    const customLocalePath = path.resolve(config.user_locale, `${locale}.json`)
+    if (config.user_locale && fs.existsSync(customLocalePath)) {
+      try {
+        customLocaleMessages = require(customLocalePath)
+      } catch (e) {
+        log.error(`Error reading custom locale messages: ${e}`)
+      }
+    }
+
+    const ret = merge(defaultLocaleMessages, customLocaleMessages)
+    return res.json(ret)
+
+  }     
+}
+
+module.exports = localeController
\ No newline at end of file
diff --git a/server/api/index.js b/server/api/index.js
index a44f231d..9fb8ca52 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -20,6 +20,7 @@ const oauthController = require('./controller/oauth')
 const announceController = require('./controller/announce')
 const pluginController = require('./controller/plugins')
 const geocodingController = require('./controller/geocoding')
+const localeController = require('./controller/locale')
 const { DDOSProtectionApiRateLimiter, SPAMProtectionApiRateLimiter } = require('./limiter')
 const helpers = require('../helpers')
 const storage = require('./storage')
@@ -221,6 +222,9 @@ module.exports = () => {
     api.get('/clients', isAuth, oauthController.getClients)
     api.get('/client/:client_id', isAuth, oauthController.getClient)
     api.post('/client', SPAMProtectionApiRateLimiter, oauthController.createClient)
+
+    // CUSTOM LOCALE
+    api.get('/locale/:locale', localeController.get)
   }
   
   api.use((_req, res) => res.sendStatus(404))

From 87dd1791225057328307ba33fb24d1bb8c3c6f0a Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 7 Feb 2023 17:44:44 +0100
Subject: [PATCH 38/38] minor

---
 locales/loader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/loader.js b/locales/loader.js
index e289830a..4159451e 100644
--- a/locales/loader.js
+++ b/locales/loader.js
@@ -3,6 +3,7 @@ export default async (context, locale) => {
     if (process.server) {
       return context.$axios.$get(`locale/${locale}`)
     } else {
+      // cannot use $axios here as plugins have not yet been loaded
       return fetch(`${window.location.origin}/api/locale/${locale}`).then(ret => ret.json())
     }
   } catch (e) {