mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 03:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix linter issues

Browse source
This commit is contained in:
Till Faelligen 2022-03-24 15:54:58 +01:00
parent 5db0cdbb6a
commit 615e3b085e
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clientapi/routing/profile.go
View file

@ -141,7 +141,7 @@ func SetAvatarURL(
} }
setRes := &userapi.PerformSetAvatarURLResponse{} setRes := &userapi.PerformSetAvatarURLResponse{}
if err := profileAPI.SetAvatarURL(req.Context(), &userapi.PerformSetAvatarURLRequest{ if err = profileAPI.SetAvatarURL(req.Context(), &userapi.PerformSetAvatarURLRequest{
Localpart: localpart, Localpart: localpart,
AvatarURL: r.AvatarURL, AvatarURL: r.AvatarURL,
}, setRes); err != nil { }, setRes); err != nil {
@ -259,7 +259,10 @@ func SetDisplayName(
err = profileAPI.QueryProfile(req.Context(), &userapi.QueryProfileRequest{ err = profileAPI.QueryProfile(req.Context(), &userapi.QueryProfileRequest{
UserID: userID, UserID: userID,
}, pRes) }, pRes)
if err != nil {
util.GetLogger(req.Context()).WithError(err).Error("profileAPI.QueryProfile failed")
return jsonerror.InternalServerError()
}
oldProfile := &authtypes.Profile{ oldProfile := &authtypes.Profile{
Localpart: localpart, Localpart: localpart,
DisplayName: pRes.DisplayName, DisplayName: pRes.DisplayName,

2
clientapi/threepid/invites.go
View file

@ -217,7 +217,7 @@ func queryIDServerStoreInvite(
var profile *authtypes.Profile var profile *authtypes.Profile
if serverName == cfg.Matrix.ServerName { if serverName == cfg.Matrix.ServerName {
res := &userapi.QueryProfileResponse{} res := &userapi.QueryProfileResponse{}
err := db.QueryProfile(ctx, &userapi.QueryProfileRequest{UserID: device.UserID}, res) err = db.QueryProfile(ctx, &userapi.QueryProfileRequest{UserID: device.UserID}, res)
if err != nil { if err != nil {
return nil, err return nil, err
} }