From 67d68768574a234b733eb3e4061644fc098a69f6 Mon Sep 17 00:00:00 2001
From: devonh <devon.dmytro@gmail.com>
Date: Wed, 17 May 2023 00:33:27 +0000
Subject: Move MakeJoin logic to GMSL (#3081)

---
 setup/mscs/msc2836/msc2836.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'setup')

diff --git a/setup/mscs/msc2836/msc2836.go b/setup/mscs/msc2836/msc2836.go
index e9d61fed..f468b048 100644
--- a/setup/mscs/msc2836/msc2836.go
+++ b/setup/mscs/msc2836/msc2836.go
@@ -427,8 +427,10 @@ func (rc *reqCtx) includeChildren(db Database, parentID string, limit int, recen
 	children, err := db.ChildrenForParent(rc.ctx, parentID, constRelType, recentFirst)
 	if err != nil {
 		util.GetLogger(rc.ctx).WithError(err).Error("failed to get ChildrenForParent")
-		resErr := spec.InternalServerError()
-		return nil, &resErr
+		return nil, &util.JSONResponse{
+			Code: http.StatusInternalServerError,
+			JSON: spec.InternalServerError{},
+		}
 	}
 	var childEvents []*types.HeaderedEvent
 	for _, child := range children {
-- 
cgit v1.2.3