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

Better errors

Browse source 
Signed-off-by: Alex Chen <minecnly@gmail.com>
This commit is contained in:
Cnly 2019-07-12 17:08:33 +08:00
parent 3bb7e34e53
commit 03841a0121
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
clientapi/routing/profile.go
View file

@ -48,13 +48,6 @@ func GetProfile(
Code: http.StatusNotFound, Code: http.StatusNotFound,
JSON: jsonerror.NotFound("The user does not exist or does not have a profile"), JSON: jsonerror.NotFound("The user does not exist or does not have a profile"),
} }
} else if x, ok := err.(gomatrix.HTTPError); ok {
if x.Code == http.StatusNotFound {
return util.JSONResponse{
Code: http.StatusNotFound,
JSON: jsonerror.NotFound("The user does not exist or does not have a profile"),
}
}
} }
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
@ -82,13 +75,6 @@ func GetAvatarURL(
Code: http.StatusNotFound, Code: http.StatusNotFound,
JSON: jsonerror.NotFound("The user does not exist or does not have a profile"), JSON: jsonerror.NotFound("The user does not exist or does not have a profile"),
} }
} else if x, ok := err.(gomatrix.HTTPError); ok {
if x.Code == http.StatusNotFound {
return util.JSONResponse{
Code: http.StatusNotFound,
JSON: jsonerror.NotFound("The user does not exist or does not have a profile"),
}
}
} }
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
@ -195,13 +181,6 @@ func GetDisplayName(
Code: http.StatusNotFound, Code: http.StatusNotFound,
JSON: jsonerror.NotFound("The user does not exist or does not have a profile"), JSON: jsonerror.NotFound("The user does not exist or does not have a profile"),
} }
} else if x, ok := err.(gomatrix.HTTPError); ok {
if x.Code == http.StatusNotFound {
return util.JSONResponse{
Code: http.StatusNotFound,
JSON: jsonerror.NotFound("The user does not exist or does not have a profile"),
}
}
} }
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
@ -295,6 +274,10 @@ func SetDisplayName(
} }
} }
// getProfile gets the full profile of a user by querying the database or a
// remote homeserver.
// Returns an error when something goes wrong or specifically
// common.ErrProfileNoExists when the profile doesn't exist.
func getProfile( func getProfile(
ctx context.Context, accountDB *accounts.Database, cfg *config.Dendrite, ctx context.Context, accountDB *accounts.Database, cfg *config.Dendrite,
userID string, userID string,
@ -309,6 +292,12 @@ func getProfile(
if domain != cfg.Matrix.ServerName { if domain != cfg.Matrix.ServerName {
profile, fedErr := federation.LookupProfile(ctx, domain, userID, "") profile, fedErr := federation.LookupProfile(ctx, domain, userID, "")
if fedErr != nil { if fedErr != nil {
if x, ok := err.(gomatrix.HTTPError); ok {
if x.Code == http.StatusNotFound {
return nil, common.ErrProfileNoExists
}
}
return nil, fedErr return nil, fedErr
} }