From 86606e68eb3ccc7ea1b45e2554af8d478f6c2943 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <contact@brendanabolivier.com>
Date: Mon, 10 Jul 2017 12:04:24 +0100
Subject: [PATCH] Improved error handling/reporting

---
 .../dendrite/clientapi/readers/profile.go     | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/github.com/matrix-org/dendrite/clientapi/readers/profile.go b/src/github.com/matrix-org/dendrite/clientapi/readers/profile.go
index a52ef2730..8dff41541 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/readers/profile.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/readers/profile.go
@@ -76,18 +76,16 @@ func GetAvatarURL(
 		}
 	}
 	localpart := getLocalPart(userID)
-	if profile, err := accountDB.GetProfileByLocalpart(localpart); err == nil {
-		res := avatarURL{
-			AvatarURL: profile.AvatarURL,
-		}
-		return util.JSONResponse{
-			Code: 200,
-			JSON: res,
-		}
+	profile, err := accountDB.GetProfileByLocalpart(localpart)
+	if err != nil {
+		return httputil.LogThenError(req, err)
+	}
+	res := avatarURL{
+		AvatarURL: profile.AvatarURL,
 	}
 	return util.JSONResponse{
-		Code: 500,
-		JSON: jsonerror.Unknown("Failed to load avatar URL"),
+		Code: 200,
+		JSON: res,
 	}
 }
 
@@ -125,7 +123,7 @@ func SetAvatarURL(
 	}
 }
 
-// SetDisplayName implements GET /profile/{userID}/displayname
+// GetDisplayName implements GET /profile/{userID}/displayname
 func GetDisplayName(
 	req *http.Request, accountDB *accounts.Database, userID string,
 ) util.JSONResponse {
@@ -136,18 +134,16 @@ func GetDisplayName(
 		}
 	}
 	localpart := getLocalPart(userID)
-	if profile, err := accountDB.GetProfileByLocalpart(localpart); err == nil {
-		res := displayName{
-			DisplayName: profile.DisplayName,
-		}
-		return util.JSONResponse{
-			Code: 200,
-			JSON: res,
-		}
+	profile, err := accountDB.GetProfileByLocalpart(localpart)
+	if err != nil {
+		return httputil.LogThenError(req, err)
+	}
+	res := displayName{
+		DisplayName: profile.DisplayName,
 	}
 	return util.JSONResponse{
-		Code: 500,
-		JSON: jsonerror.Unknown("Failed to load display name"),
+		Code: 200,
+		JSON: res,
 	}
 }