From 72022a6ecf80177a28883d7016790ea41646d396 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 3 Mar 2022 17:58:24 +0000 Subject: [PATCH] Return 404 if event given to `/context` was not found (#2245) --- syncapi/routing/context.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/syncapi/routing/context.go b/syncapi/routing/context.go index 59113971..d07fc0c6 100644 --- a/syncapi/routing/context.go +++ b/syncapi/routing/context.go @@ -17,6 +17,7 @@ package routing import ( "database/sql" "encoding/json" + "fmt" "net/http" "strconv" @@ -102,6 +103,12 @@ func Context( id, requestedEvent, err := syncDB.SelectContextEvent(ctx, roomID, eventID) if err != nil { + if err == sql.ErrNoRows { + return util.JSONResponse{ + Code: http.StatusNotFound, + JSON: jsonerror.NotFound(fmt.Sprintf("Event %s not found", eventID)), + } + } logrus.WithError(err).WithField("eventID", eventID).Error("unable to find requested event") return jsonerror.InternalServerError() }