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

Pass in membership state

Browse source
This commit is contained in:
Neil Alexander 2022-06-27 11:52:11 +01:00
parent 285d063827
commit f9e885025e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roomserver/internal/helpers/helpers.go
View file

@ -12,6 +12,7 @@ import (
"github.com/matrix-org/dendrite/roomserver/state" "github.com/matrix-org/dendrite/roomserver/state"
"github.com/matrix-org/dendrite/roomserver/storage" "github.com/matrix-org/dendrite/roomserver/storage"
"github.com/matrix-org/dendrite/roomserver/storage/shared" "github.com/matrix-org/dendrite/roomserver/storage/shared"
"github.com/matrix-org/dendrite/roomserver/storage/tables"
"github.com/matrix-org/dendrite/roomserver/types" "github.com/matrix-org/dendrite/roomserver/types"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util" "github.com/matrix-org/util"
@ -28,7 +29,7 @@ func UpdateToInviteMembership(
// reprocessing this event, or because the we received this invite from a // reprocessing this event, or because the we received this invite from a
// remote server via the federation invite API. In those cases we don't need // remote server via the federation invite API. In those cases we don't need
// to send the event. // to send the event.
needsSending, _, err := mu.Update(add) needsSending, _, err := mu.Update(tables.MembershipStateInvite, add)
if err != nil { if err != nil {
return nil, err return nil, err
} }

7
roomserver/internal/input/input_membership.go
View file

@ -21,6 +21,7 @@ import (
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/dendrite/roomserver/internal/helpers" "github.com/matrix-org/dendrite/roomserver/internal/helpers"
"github.com/matrix-org/dendrite/roomserver/storage/shared" "github.com/matrix-org/dendrite/roomserver/storage/shared"
"github.com/matrix-org/dendrite/roomserver/storage/tables"
"github.com/matrix-org/dendrite/roomserver/types" "github.com/matrix-org/dendrite/roomserver/types"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go"
@ -152,7 +153,7 @@ func updateToJoinMembership(
// are active for that user. We notify the consumers that the invites have // are active for that user. We notify the consumers that the invites have
// been retired using a special event, even though they could infer this // been retired using a special event, even though they could infer this
// by studying the state changes in the room event stream. // by studying the state changes in the room event stream.
_, retired, err := mu.Update(add) _, retired, err := mu.Update(tables.MembershipStateJoin, add)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -179,7 +180,7 @@ func updateToLeaveMembership(
// are active for that user. We notify the consumers that the invites have // are active for that user. We notify the consumers that the invites have
// been retired using a special event, even though they could infer this // been retired using a special event, even though they could infer this
// by studying the state changes in the room event stream. // by studying the state changes in the room event stream.
_, retired, err := mu.Update(add) _, retired, err := mu.Update(tables.MembershipStateLeaveOrBan, add)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -201,7 +202,7 @@ func updateToLeaveMembership(
func updateToKnockMembership( func updateToKnockMembership(
mu *shared.MembershipUpdater, add *gomatrixserverlib.Event, updates []api.OutputEvent, mu *shared.MembershipUpdater, add *gomatrixserverlib.Event, updates []api.OutputEvent,
) ([]api.OutputEvent, error) { ) ([]api.OutputEvent, error) {
if _, _, err := mu.Update(add); err != nil { if _, _, err := mu.Update(tables.MembershipStateKnock, add); err != nil {
return nil, err return nil, err
} }
return updates, nil return updates, nil

3
roomserver/internal/perform/perform_leave.go
View file

@ -30,6 +30,7 @@ import (
"github.com/matrix-org/dendrite/roomserver/internal/helpers" "github.com/matrix-org/dendrite/roomserver/internal/helpers"
"github.com/matrix-org/dendrite/roomserver/internal/input" "github.com/matrix-org/dendrite/roomserver/internal/input"
"github.com/matrix-org/dendrite/roomserver/storage" "github.com/matrix-org/dendrite/roomserver/storage"
"github.com/matrix-org/dendrite/roomserver/storage/tables"
"github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/setup/config"
userapi "github.com/matrix-org/dendrite/userapi/api" userapi "github.com/matrix-org/dendrite/userapi/api"
) )
@ -228,7 +229,7 @@ func (r *Leaver) performFederatedRejectInvite(
util.GetLogger(ctx).WithError(err).Errorf("failed to get MembershipUpdater, still retiring invite event") util.GetLogger(ctx).WithError(err).Errorf("failed to get MembershipUpdater, still retiring invite event")
} }
if updater != nil { if updater != nil {
if _, _, err = updater.Update(leaveRes.Event.Unwrap()); err != nil { if _, _, err = updater.Update(tables.MembershipStateLeaveOrBan, leaveRes.Event.Unwrap()); err != nil {
util.GetLogger(ctx).WithError(err).Errorf("failed to set membership to leave, still retiring invite event") util.GetLogger(ctx).WithError(err).Errorf("failed to set membership to leave, still retiring invite event")
if err = updater.Rollback(); err != nil { if err = updater.Rollback(); err != nil {
util.GetLogger(ctx).WithError(err).Errorf("failed to rollback membership leave, still retiring invite event") util.GetLogger(ctx).WithError(err).Errorf("failed to rollback membership leave, still retiring invite event")

19
roomserver/storage/shared/membership_updater.go
View file

@ -90,31 +90,14 @@ func (u *MembershipUpdater) IsKnock() bool {
return u.oldMembership == tables.MembershipStateKnock return u.oldMembership == tables.MembershipStateKnock
} }
func (u *MembershipUpdater) Update(event *gomatrixserverlib.Event) (bool, []string, error) { func (u *MembershipUpdater) Update(newMembership tables.MembershipState, event *gomatrixserverlib.Event) (bool, []string, error) {
var inserted bool var inserted bool
var retired []string var retired []string
return inserted, retired, u.d.Writer.Do(u.d.DB, u.txn, func(txn *sql.Tx) error { return inserted, retired, u.d.Writer.Do(u.d.DB, u.txn, func(txn *sql.Tx) error {
membership, err := event.Membership()
if err != nil {
return fmt.Errorf("event.Membership: %w", err)
}
senderUserNID, err := u.d.assignStateKeyNID(u.ctx, event.Sender()) senderUserNID, err := u.d.assignStateKeyNID(u.ctx, event.Sender())
if err != nil { if err != nil {
return fmt.Errorf("u.d.AssignStateKeyNID: %w", err) return fmt.Errorf("u.d.AssignStateKeyNID: %w", err)
} }
var newMembership tables.MembershipState
switch membership {
case gomatrixserverlib.Join:
newMembership = tables.MembershipStateJoin
case gomatrixserverlib.Leave, gomatrixserverlib.Ban:
newMembership = tables.MembershipStateLeaveOrBan
case gomatrixserverlib.Invite:
newMembership = tables.MembershipStateInvite
case gomatrixserverlib.Knock:
newMembership = tables.MembershipStateKnock
default:
return fmt.Errorf("unrecognised membership %q", membership)
}
eventID := event.EventID() eventID := event.EventID()
eventNIDs, err := u.d.eventNIDs(u.ctx, u.txn, []string{eventID}, false) eventNIDs, err := u.d.eventNIDs(u.ctx, u.txn, []string{eventID}, false)
if err != nil { if err != nil {