From 7c317a6b6a86a7f6ec8e39052537deddf2ae5d1f Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Sun, 7 Apr 2024 02:52:53 +0200
Subject: [PATCH] update to new calendar json api
---
components/home/HomeNextEvents.vue | 6 +--
libs/api-forum.js | 12 ++---
yarn.lock | 81 +++++++++++++++++++-----------
3 files changed, 61 insertions(+), 38 deletions(-)
diff --git a/components/home/HomeNextEvents.vue b/components/home/HomeNextEvents.vue
index 379b315b..f814cb9e 100644
--- a/components/home/HomeNextEvents.vue
+++ b/components/home/HomeNextEvents.vue
@@ -35,7 +35,7 @@
<a
v-for="(event, index) in column"
:key="index"
- :href="`${$config.forum_url}/t/${event.slug}/${event.id}`"
+ :href="`${$config.forum_url}/${event.post.url}`"
target="_blank"
class="
block
@@ -49,10 +49,10 @@
rel="noopener noreferrer"
>
<div class="event-date text-sm text-gray-500">
- {{ prettyDate(event.event.start) }}
+ {{ prettyDate(event.starts_at) }}
<div v-for="(tag, i) in event.tag" :key="i">{{ tag }}</div>
</div>
- <div v-html="emojify(event.title)" />
+ <div v-html="emojify(event.post.topic.title)" />
</a>
</div>
</aside>
diff --git a/libs/api-forum.js b/libs/api-forum.js
index 58f46b2f..fc34fb41 100644
--- a/libs/api-forum.js
+++ b/libs/api-forum.js
@@ -28,17 +28,17 @@ export async function fetchCategories() {
*/
export async function fetchNextEvents(params) {
// Caches to avoid fetching each time it's mounted
- if (sessionStorage.getItem('events_forum')) {
+ if (sessionStorage.getItem('events_forum_nope')) {
return JSON.parse(sessionStorage.getItem('events_forum'))
} else {
- const events = await fetch(`${forumUrl}/calendar.json${params}`)
+ const events = await fetch(
+ `${forumUrl}/discourse-post-event/events.json?include_details=true${params}`
+ )
.then((response) => response.json())
.then((data) =>
- data.topic_list.topics.filter(
- (event) => Date.parse(event.event.start) > Date.now()
- )
+ data.events.filter((event) => Date.parse(event.starts_at) > Date.now())
)
-
+ // console.log(events)
sessionStorage.setItem('events_forum', JSON.stringify(events))
return events
}
diff --git a/yarn.lock b/yarn.lock
index 764eef23..c8a8f2f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1082,16 +1082,16 @@
js-yaml "^3.13.1"
json5 "^2.1.1"
-"@koa/router@^9.0.1":
- version "9.4.0"
- resolved "https://registry.yarnpkg.com/@koa/router/-/router-9.4.0.tgz#734b64c0ae566eb5af752df71e4143edc4748e48"
- integrity sha512-dOOXgzqaDoHu5qqMEPLKEgLz5CeIA7q8+1W62mCvFVCOqeC71UoTGJ4u1xUSOpIl2J1x2pqrNULkFteUeZW3/A==
+"@koa/router@^12.0.1":
+ version "12.0.1"
+ resolved "https://registry.yarnpkg.com/@koa/router/-/router-12.0.1.tgz#1a66f92a630c02832cf5bbf0db06c9e53e423468"
+ integrity sha512-ribfPYfHb+Uw3b27Eiw6NPqjhIhTpVFzEWLwyc/1Xp+DCdwRRyIlAUODX+9bPARF6aQtUu1+/PHzdNvRzcs/+Q==
dependencies:
- debug "^4.1.1"
- http-errors "^1.7.3"
+ debug "^4.3.4"
+ http-errors "^2.0.0"
koa-compose "^4.1.0"
methods "^1.1.2"
- path-to-regexp "^6.1.0"
+ path-to-regexp "^6.2.1"
"@lokidb/full-text-search@^2.1.0":
version "2.1.0"
@@ -4073,10 +4073,10 @@ cookie@^0.4.1:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-cookies@~0.8.0:
- version "0.8.0"
- resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90"
- integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==
+cookies@~0.9.0:
+ version "0.9.1"
+ resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.9.1.tgz#3ffed6f60bb4fb5f146feeedba50acc418af67e3"
+ integrity sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==
dependencies:
depd "~2.0.0"
keygrip "~1.1.0"
@@ -4518,6 +4518,13 @@ debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3
dependencies:
ms "2.1.2"
+debug@^4.3.4:
+ version "4.3.4"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+ integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+ dependencies:
+ ms "2.1.2"
+
decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -4668,7 +4675,7 @@ delegates@^1.0.0:
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-depd@^2.0.0, depd@~2.0.0:
+depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -6482,6 +6489,17 @@ http-errors@^1.6.3, http-errors@^1.7.3, http-errors@~1.8.0:
statuses ">= 1.5.0 < 2"
toidentifier "1.0.1"
+http-errors@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+ integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+ dependencies:
+ depd "2.0.0"
+ inherits "2.0.4"
+ setprototypeof "1.2.0"
+ statuses "2.0.1"
+ toidentifier "1.0.1"
+
http-errors@~1.6.2:
version "1.6.3"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
@@ -7493,16 +7511,16 @@ koa-static@^5.0.0:
debug "^3.1.0"
koa-send "^5.0.0"
-koa@^2.12.0:
- version "2.13.4"
- resolved "https://registry.yarnpkg.com/koa/-/koa-2.13.4.tgz#ee5b0cb39e0b8069c38d115139c774833d32462e"
- integrity sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==
+koa@^2.14.2:
+ version "2.15.2"
+ resolved "https://registry.yarnpkg.com/koa/-/koa-2.15.2.tgz#1e4afe1482d01bd24ed6e30f630a960411f5ebf2"
+ integrity sha512-MXTeZH3M6AJ8ukW2QZ8wqO3Dcdfh2WRRmjCBkEP+NhKNCiqlO5RDqHmSnsyNrbRJrdjyvIGSJho4vQiWgQJSVA==
dependencies:
accepts "^1.3.5"
cache-content-type "^1.0.0"
content-disposition "~0.5.2"
content-type "^1.0.4"
- cookies "~0.8.0"
+ cookies "~0.9.0"
debug "^4.3.2"
delegates "^1.0.0"
depd "^2.0.0"
@@ -9197,10 +9215,10 @@ path-parse@^1.0.6:
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-path-to-regexp@^6.1.0:
- version "6.2.0"
- resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.0.tgz#f7b3803336104c346889adece614669230645f38"
- integrity sha512-f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg==
+path-to-regexp@^6.2.1:
+ version "6.2.1"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.1.tgz#d54934d6798eb9e5ef14e7af7962c945906918e5"
+ integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==
path-type@^4.0.0:
version "4.0.0"
@@ -11504,6 +11522,11 @@ static-extend@^0.1.1:
define-property "^0.2.5"
object-copy "^0.1.0"
+statuses@2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+ integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@^1.5.0, statuses@~1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -11793,14 +11816,14 @@ table@^6.0.9:
strip-ansi "^6.0.1"
tailwind-config-viewer@^1.5.0:
- version "1.6.2"
- resolved "https://registry.yarnpkg.com/tailwind-config-viewer/-/tailwind-config-viewer-1.6.2.tgz#656df8e53718d7794599e9c0c7a93e732abba1df"
- integrity sha512-GEysLLUkHF/CW7idElDIsCUWwNfE5v4SpecNv5Z10KGtX8ez2ZUlHep/bJZ4E/Hk+IqJQt2hChFx43VkDN7WtQ==
+ version "1.7.3"
+ resolved "https://registry.yarnpkg.com/tailwind-config-viewer/-/tailwind-config-viewer-1.7.3.tgz#3e448cad29545aa31613a5d82c61798ee93c4e88"
+ integrity sha512-rgeFXe9vL4njtaSI1y2uUAD1aRx05RYHbReN72ARAVEVSlNmS0Zf46pj3/ORc3xQwLK/AzbaIs6UFcK7hJSIlA==
dependencies:
- "@koa/router" "^9.0.1"
+ "@koa/router" "^12.0.1"
commander "^6.0.0"
fs-extra "^9.0.1"
- koa "^2.12.0"
+ koa "^2.14.2"
koa-static "^5.0.0"
open "^7.0.4"
portfinder "^1.0.26"
@@ -12213,9 +12236,9 @@ ua-parser-js@^0.7.28:
integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
ufo@^0.6.9:
- version "0.6.11"
- resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.6.11.tgz#69311ed4abc8ab671c83754b79ce0d396fea1075"
- integrity sha512-Yu7TJThwlr23peOkX/+hm6LfkyBs+eDWV880468PTrjKBKjjsNWFFwIuOqDfmXngRo9TZ4+twFYueRH0OLl0Gw==
+ version "0.6.12"
+ resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.6.12.tgz#10a4c8875e5bbe19bf85250b47805d74f37350af"
+ integrity sha512-+Sg92qbu7XRaqO1y2DKEDuT83ggmYN/PhymUk6XrApJ0XOTs5LFODQt7aPqhRGB7jkKKhJatcOSi3OOxVAzRAw==
ufo@^0.7.4, ufo@^0.7.7:
version "0.7.9"
--
GitLab