Process membership updates in writers
MODIFY
roomserver/storage/shared/membership_updater.go
roomserver/storage/shared/membership_updater.go
@@ -79,33 +79,38 @@ func (u *MembershipUpdater) IsLeave() bool {
// SetToInvite implements types.MembershipUpdater
func (u *MembershipUpdater) SetToInvite(event gomatrixserverlib.Event) (bool, error) {
+ var inserted bool
+ err := u.d.Writer.Do(u.d.DB, u.txn, func(txn *sql.Tx) error {
senderUserNID, err := u.d.assignStateKeyNID(u.ctx, u.txn, event.Sender())
if err != nil {
- return false, fmt.Errorf("u.d.AssignStateKeyNID: %w", err)
+ return fmt.Errorf("u.d.AssignStateKeyNID: %w", err)
}
- inserted, err := u.d.InvitesTable.InsertInviteEvent(
+ inserted, err = u.d.InvitesTable.InsertInviteEvent(
u.ctx, u.txn, event.EventID(), u.roomNID, u.targetUserNID, senderUserNID, event.JSON(),
)
if err != nil {
- return false, fmt.Errorf("u.d.InvitesTable.InsertInviteEvent: %w", err)
+ return fmt.Errorf("u.d.InvitesTable.InsertInviteEvent: %w", err)
}
if u.membership != tables.MembershipStateInvite {
if err = u.d.MembershipTable.UpdateMembership(
u.ctx, u.txn, u.roomNID, u.targetUserNID, senderUserNID, tables.MembershipStateInvite, 0,
); err != nil {
- return false, fmt.Errorf("u.d.MembershipTable.UpdateMembership: %w", err)
+ return fmt.Errorf("u.d.MembershipTable.UpdateMembership: %w", err)
}
}
- return inserted, nil
+ return nil
+ })
+ return inserted, err
}
// SetToJoin implements types.MembershipUpdater
func (u *MembershipUpdater) SetToJoin(senderUserID string, eventID string, isUpdate bool) ([]string, error) {
var inviteEventIDs []string
+ err := u.d.Writer.Do(u.d.DB, u.txn, func(txn *sql.Tx) error {
senderUserNID, err := u.d.assignStateKeyNID(u.ctx, u.txn, senderUserID)
if err != nil {
- return nil, fmt.Errorf("u.d.AssignStateKeyNID: %w", err)
+ return fmt.Errorf("u.d.AssignStateKeyNID: %w", err)
}
// If this is a join event update, there is no invite to update
@@ -114,14 +119,14 @@ func (u *MembershipUpdater) SetToJoin(senderUserID string, eventID string, isUpd
u.ctx, u.txn, u.roomNID, u.targetUserNID,
)
if err != nil {
- return nil, fmt.Errorf("u.d.InvitesTables.UpdateInviteRetired: %w", err)
+ return fmt.Errorf("u.d.InvitesTables.UpdateInviteRetired: %w", err)
}
}
// Look up the NID of the new join event
nIDs, err := u.d.EventNIDs(u.ctx, []string{eventID})
if err != nil {
- return nil, fmt.Errorf("u.d.EventNIDs: %w", err)
+ return fmt.Errorf("u.d.EventNIDs: %w", err)
}
if u.membership != tables.MembershipStateJoin || isUpdate {
@@ -129,30 +134,36 @@ func (u *MembershipUpdater) SetToJoin(senderUserID string, eventID string, isUpd
u.ctx, u.txn, u.roomNID, u.targetUserNID, senderUserNID,
tables.MembershipStateJoin, nIDs[eventID],
); err != nil {
- return nil, fmt.Errorf("u.d.MembershipTable.UpdateMembership: %w", err)
+ return fmt.Errorf("u.d.MembershipTable.UpdateMembership: %w", err)
}
}
- return inviteEventIDs, nil
+ return nil
+ })
+
+ return inviteEventIDs, err
}
// SetToLeave implements types.MembershipUpdater
func (u *MembershipUpdater) SetToLeave(senderUserID string, eventID string) ([]string, error) {
+ var inviteEventIDs []string
+
+ err := u.d.Writer.Do(u.d.DB, u.txn, func(txn *sql.Tx) error {
senderUserNID, err := u.d.assignStateKeyNID(u.ctx, u.txn, senderUserID)
if err != nil {
- return nil, fmt.Errorf("u.d.AssignStateKeyNID: %w", err)
+ return fmt.Errorf("u.d.AssignStateKeyNID: %w", err)
}
- inviteEventIDs, err := u.d.InvitesTable.UpdateInviteRetired(
+ inviteEventIDs, err = u.d.InvitesTable.UpdateInviteRetired(
u.ctx, u.txn, u.roomNID, u.targetUserNID,
)
if err != nil {
- return nil, fmt.Errorf("u.d.InvitesTable.updateInviteRetired: %w", err)
+ return fmt.Errorf("u.d.InvitesTable.updateInviteRetired: %w", err)
}
// Look up the NID of the new leave event
nIDs, err := u.d.EventNIDs(u.ctx, []string{eventID})
if err != nil {
- return nil, fmt.Errorf("u.d.EventNIDs: %w", err)
+ return fmt.Errorf("u.d.EventNIDs: %w", err)
}
if u.membership != tables.MembershipStateLeaveOrBan {
@@ -160,8 +171,11 @@ func (u *MembershipUpdater) SetToLeave(senderUserID string, eventID string) ([]s
u.ctx, u.txn, u.roomNID, u.targetUserNID, senderUserNID,
tables.MembershipStateLeaveOrBan, nIDs[eventID],
); err != nil {
- return nil, fmt.Errorf("u.d.MembershipTable.UpdateMembership: %w", err)
+ return fmt.Errorf("u.d.MembershipTable.UpdateMembership: %w", err)
}
}
- return inviteEventIDs, nil
+
+ return nil
+ })
+ return inviteEventIDs, err
}

Process membership updates in writers (#1414)