From bbd9a6c2647df00cf81df295ea796b26628999ce Mon Sep 17 00:00:00 2001
From: hobokenchicken <dustin@dustin.coffee>
Date: Thu, 9 Jul 2026 14:43:34 -0400
Subject: [PATCH] fix(calendar): nest routes under /channels for correct URL
 matching

---
 cmd/server/main.go           | 5 +++++
 internal/channel/calendar.go | 2 +-
 internal/channel/handlers.go | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmd/server/main.go b/cmd/server/main.go
index b723b2d..ff494a5 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -243,6 +243,11 @@ func main() {
 				notification.NewHandler(database.DB, logger).RegisterRoutes(r)
 			})
 
+			// Calendar events (top-level so frontend can reach /channels/{id}/events)
+			r.Route("/channels", func(r chi.Router) {
+				channel.NewHandler(database.DB, permissionsChecker).RegisterCalendarRoutes(r)
+			})
+
 			// Push notifications
 			pushHandler.RegisterRoutes(r)
 
diff --git a/internal/channel/calendar.go b/internal/channel/calendar.go
index c1b3725..69adb56 100644
--- a/internal/channel/calendar.go
+++ b/internal/channel/calendar.go
@@ -39,7 +39,7 @@ type createEventRequest struct {
 	Color          *string `json:"color"`
 }
 
-func (h *Handler) registerCalendarRoutes(r chi.Router) {
+func (h *Handler) RegisterCalendarRoutes(r chi.Router) {
 	r.Get("/{channelID}/events", h.ListEvents)
 	r.Post("/{channelID}/events", h.CreateEvent)
 	r.Patch("/events/{eventID}", h.UpdateEvent)
diff --git a/internal/channel/handlers.go b/internal/channel/handlers.go
index b870056..721c7db 100644
--- a/internal/channel/handlers.go
+++ b/internal/channel/handlers.go
@@ -31,7 +31,7 @@ func (h *Handler) RegisterRoutes(r chi.Router) {
 	r.Get("/{channelID}/threads", h.ListThreads)
 	r.Patch("/threads/{threadID}", h.UpdateThread)
 	h.registerForumRoutes(r)
-	h.registerCalendarRoutes(r)
+	h.RegisterCalendarRoutes(r)
 	h.registerDocRoutes(r)
 	h.registerListRoutes(r)
 	h.registerOverrideRoutes(r)