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

Rename senderID for consistency

Browse source
This commit is contained in:
Mark Haines 2017-08-07 15:02:59 +01:00
parent db3f3a9452
commit 675db40c73
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/github.com/matrix-org/dendrite/roomserver/storage/storage.go
View file

@ -446,9 +446,9 @@ func (u *membershipUpdater) SetToInvite(event gomatrixserverlib.Event) (bool, er
} }
// SetToJoin implements types.MembershipUpdater // SetToJoin implements types.MembershipUpdater
func (u *membershipUpdater) SetToJoin(senderID string) ([]string, error) { func (u *membershipUpdater) SetToJoin(senderUserID string) ([]string, error) {
// TODO: assign the state key inside the transaction. // TODO: assign the state key inside the transaction.
senderUserNID, err := u.d.assignStateKeyNID(senderID) senderUserNID, err := u.d.assignStateKeyNID(senderUserID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -469,9 +469,9 @@ func (u *membershipUpdater) SetToJoin(senderID string) ([]string, error) {
} }
// SetToLeave implements types.MembershipUpdater // SetToLeave implements types.MembershipUpdater
func (u *membershipUpdater) SetToLeave(senderID string) ([]string, error) { func (u *membershipUpdater) SetToLeave(senderUserID string) ([]string, error) {
// TODO: assign the state key inside the transaction. // TODO: assign the state key inside the transaction.
senderUserNID, err := u.d.assignStateKeyNID(senderID) senderUserNID, err := u.d.assignStateKeyNID(senderUserID)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
src/github.com/matrix-org/dendrite/roomserver/types/types.go
View file

@ -192,10 +192,10 @@ type MembershipUpdater interface {
// Returns whether this invite needs to be sent // Returns whether this invite needs to be sent
SetToInvite(event gomatrixserverlib.Event) (needsSending bool, err error) SetToInvite(event gomatrixserverlib.Event) (needsSending bool, err error)
// Set the state to join. // Set the state to join.
SetToJoin(senderID string) (inviteEventIDs []string, err error) SetToJoin(senderUserID string) (inviteEventIDs []string, err error)
// Set the state to leave. // Set the state to leave.
// Returns a list of invite event IDs that this state change retired. // Returns a list of invite event IDs that this state change retired.
SetToLeave(senderID string) (inviteEventIDs []string, err error) SetToLeave(senderUserID string) (inviteEventIDs []string, err error)
// Implements Transaction so it can be committed or rolledback. // Implements Transaction so it can be committed or rolledback.
Transaction Transaction
} }