diff options
| author | Raphael <mail@raphaelkabo.com> | 2024-02-26 15:06:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-26 15:06:01 +0000 |
| commit | de688444d167fdb80c6e88b8ba837405ba7651a6 (patch) | |
| tree | 051fa37a2fe30052254bf79a60bd870667fcc0b7 /src/routes/group.ts | |
| parent | afd9fc4477fff90e5db917f350d99c3d01fba2bd (diff) | |
| parent | 1275280a9e3a31f6080079d564a8fb9e1847db8b (diff) | |
Merge pull request #135 from lowercasename/rk/public-events
Events and groups optionally visible on front page
Diffstat (limited to 'src/routes/group.ts')
| -rw-r--r-- | src/routes/group.ts | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/routes/group.ts b/src/routes/group.ts index 34377b0..8afd766 100644 --- a/src/routes/group.ts +++ b/src/routes/group.ts @@ -1,5 +1,4 @@ import { Router, Response, Request } from "express"; -import getConfig from "../lib/config.js"; import multer from "multer"; import { generateEditToken, generateEventID } from "../util/generator.js"; import { validateGroupData } from "../util/validation.js"; @@ -9,9 +8,7 @@ import EventGroup from "../models/EventGroup.js"; import { sendEmailFromTemplate } from "../lib/email.js"; import { marked } from "marked"; import { renderPlain } from "../util/markdown.js"; -import { checkMagicLink } from "../lib/middleware.js"; - -const config = getConfig(); +import { checkMagicLink, getConfigMiddleware } from "../lib/middleware.js"; const storage = multer.memoryStorage(); // Accept only JPEG, GIF or PNG images, up to 10MB @@ -30,6 +27,8 @@ const upload = multer({ const router = Router(); +router.use(getConfigMiddleware); + router.post( "/group", upload.single("imageUpload"), @@ -81,6 +80,7 @@ router.post( hostName: groupData.hostName, editToken: editToken, firstLoad: true, + showOnPublicList: groupData.publicBoolean, }); await eventGroup.save(); @@ -100,9 +100,9 @@ router.post( { eventGroupID: eventGroup.id, editToken: eventGroup.editToken, - siteName: config.general.site_name, - siteLogo: config.general.email_logo_url, - domain: config.general.domain, + siteName: res.locals.config?.general.site_name, + siteLogo: res.locals.config?.general.email_logo_url, + domain: res.locals.config?.general.domain, }, req, ); @@ -206,6 +206,7 @@ router.put( url: req.body.eventGroupURL, hostName: req.body.hostName, image: eventGroupImageFilename, + showOnPublicList: groupData.publicBoolean, }; await EventGroup.findOneAndUpdate( |