mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-10 16:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Using utils log reporting

Browse source
This commit is contained in:
Brendan Abolivier 2017-07-10 14:18:15 +01:00
parent 86606e68eb
commit eaa21e2a1d
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/github.com/matrix-org/dendrite/clientapi/readers/profile.go
View file

@ -49,19 +49,17 @@ func GetProfile(
}
}
localpart := getLocalPart(userID)
if profile, err := accountDB.GetProfileByLocalpart(localpart); err == nil {
res := profileResponse{
AvatarURL: profile.AvatarURL,
DisplayName: profile.DisplayName,
}
return util.JSONResponse{
Code: 200,
JSON: res,
}
profile, err := accountDB.GetProfileByLocalpart(localpart)
if err != nil {
return httputil.LogThenError(req, err)
}
res := profileResponse{
AvatarURL: profile.AvatarURL,
DisplayName: profile.DisplayName,
}
return util.JSONResponse{
Code: 500,
JSON: jsonerror.Unknown("Failed to load user profile"),
Code: 200,
JSON: res,
}
}
@ -112,10 +110,7 @@ func SetAvatarURL(
localpart := getLocalPart(userID)
if err := accountDB.SetAvatarURL(localpart, r.AvatarURL); err != nil {
return util.JSONResponse{
Code: 500,
JSON: jsonerror.Unknown("Failed to set avatar URL"),
}
return httputil.LogThenError(req, err)
}
return util.JSONResponse{
Code: 200,
@ -170,10 +165,7 @@ func SetDisplayName(
localpart := getLocalPart(userID)
if err := accountDB.SetDisplayName(localpart, r.DisplayName); err != nil {
return util.JSONResponse{
Code: 500,
JSON: jsonerror.Unknown("Failed to set display name"),
}
return httputil.LogThenError(req, err)
}
return util.JSONResponse{
Code: 200,