From 675db40c7347bc2413f1019da618c8829a1a91a7 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Mon, 7 Aug 2017 15:02:59 +0100 Subject: [PATCH] Rename senderID for consistency --- .../matrix-org/dendrite/roomserver/storage/storage.go | 8 ++++---- .../matrix-org/dendrite/roomserver/types/types.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/storage.go b/src/github.com/matrix-org/dendrite/roomserver/storage/storage.go index a7c8b29fe..08e746b94 100644 --- a/src/github.com/matrix-org/dendrite/roomserver/storage/storage.go +++ b/src/github.com/matrix-org/dendrite/roomserver/storage/storage.go @@ -446,9 +446,9 @@ func (u *membershipUpdater) SetToInvite(event gomatrixserverlib.Event) (bool, er } // 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. - senderUserNID, err := u.d.assignStateKeyNID(senderID) + senderUserNID, err := u.d.assignStateKeyNID(senderUserID) if err != nil { return nil, err } @@ -469,9 +469,9 @@ func (u *membershipUpdater) SetToJoin(senderID string) ([]string, error) { } // 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. - senderUserNID, err := u.d.assignStateKeyNID(senderID) + senderUserNID, err := u.d.assignStateKeyNID(senderUserID) if err != nil { return nil, err } diff --git a/src/github.com/matrix-org/dendrite/roomserver/types/types.go b/src/github.com/matrix-org/dendrite/roomserver/types/types.go index c908759b1..4ce14194a 100644 --- a/src/github.com/matrix-org/dendrite/roomserver/types/types.go +++ b/src/github.com/matrix-org/dendrite/roomserver/types/types.go @@ -192,10 +192,10 @@ type MembershipUpdater interface { // Returns whether this invite needs to be sent SetToInvite(event gomatrixserverlib.Event) (needsSending bool, err error) // Set the state to join. - SetToJoin(senderID string) (inviteEventIDs []string, err error) + SetToJoin(senderUserID string) (inviteEventIDs []string, err error) // Set the state to leave. // 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. Transaction }