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

Change the way buildMembershipEvents is called

Browse source
This commit is contained in:
Brendan Abolivier 2017-07-21 16:22:44 +01:00
parent 60c730148a
commit fa713e6876
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,13 @@ func SetAvatarURL(
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
events, err := buildMembershipEvents(memberships, accountDB, oldProfile, changedKey, r.AvatarURL, userID, cfg, queryAPI) newProfile := authtypes.Profile{
Localpart: localpart,
DisplayName: oldProfile.DisplayName,
AvatarURL: r.AvatarURL,
}
events, err := buildMembershipEvents(memberships, accountDB, newProfile, userID, cfg, queryAPI)
if err != nil { if err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
@ -213,7 +219,13 @@ func SetDisplayName(
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
events, err := buildMembershipEvents(memberships, accountDB, oldProfile, changedKey, r.DisplayName, userID, cfg, queryAPI) newProfile := authtypes.Profile{
Localpart: localpart,
DisplayName: r.DisplayName,
AvatarURL: oldProfile.AvatarURL,
}
events, err := buildMembershipEvents(memberships, accountDB, newProfile, userID, cfg, queryAPI)
if err != nil { if err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
@ -234,8 +246,8 @@ func SetDisplayName(
func buildMembershipEvents( func buildMembershipEvents(
memberships []authtypes.Membership, db *accounts.Database, memberships []authtypes.Membership, db *accounts.Database,
oldProfile *authtypes.Profile, changedKey string, newValue string, newProfile authtypes.Profile, userID string, cfg *config.Dendrite,
userID string, cfg *config.Dendrite, queryAPI api.RoomserverQueryAPI, queryAPI api.RoomserverQueryAPI,
) ([]gomatrixserverlib.Event, error) { ) ([]gomatrixserverlib.Event, error) {
evs := []gomatrixserverlib.Event{} evs := []gomatrixserverlib.Event{}
@ -251,13 +263,8 @@ func buildMembershipEvents(
Membership: "join", Membership: "join",
} }
if changedKey == "displayname" { content.DisplayName = newProfile.DisplayName
content.DisplayName = newValue content.AvatarURL = newProfile.AvatarURL
content.AvatarURL = oldProfile.AvatarURL
} else if changedKey == "avatar_url" {
content.DisplayName = oldProfile.DisplayName
content.AvatarURL = newValue
}
if err := builder.SetContent(content); err != nil { if err := builder.SetContent(content); err != nil {
return nil, err return nil, err