From 33ff3095722d063673f7168dd63bb2aef8ca735d Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Fri, 14 Jul 2023 14:24:31 +0200
Subject: [PATCH] Don't HTTP500 if a profile does't exist

---
 federationapi/routing/profile.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/federationapi/routing/profile.go b/federationapi/routing/profile.go
index e6a488ba3..e8c7ff793 100644
--- a/federationapi/routing/profile.go
+++ b/federationapi/routing/profile.go
@@ -15,9 +15,11 @@
 package routing
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 
+	appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
 	"github.com/matrix-org/dendrite/internal/eventutil"
 	"github.com/matrix-org/dendrite/setup/config"
 	userapi "github.com/matrix-org/dendrite/userapi/api"
@@ -52,6 +54,12 @@ func GetProfile(
 
 	profile, err := userAPI.QueryProfile(httpReq.Context(), userID)
 	if err != nil {
+		if errors.Is(err, appserviceAPI.ErrProfileNotExists) {
+			return util.JSONResponse{
+				Code: http.StatusNotFound,
+				JSON: spec.NotFound("The user does not exist or does not have a profile."),
+			}
+		}
 		util.GetLogger(httpReq.Context()).WithError(err).Error("userAPI.QueryProfile failed")
 		return util.JSONResponse{
 			Code: http.StatusInternalServerError,