diff options
| author | devonh <devon.dmytro@gmail.com> | 2023-05-17 00:33:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 00:33:27 +0000 |
| commit | 67d68768574a234b733eb3e4061644fc098a69f6 (patch) | |
| tree | 819e9a0a150b68181d91112ffc7e0d6030412b77 /setup | |
| parent | 0489d16f95a3d9f1f5bc532e2060bd2482d7b156 (diff) | |
Move MakeJoin logic to GMSL (#3081)
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/mscs/msc2836/msc2836.go | 6 |
1 files changed, 4 insertions, 2 deletions
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 { |