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

Fix postgres, fix lint

Browse source
This commit is contained in:
Neil Alexander 2020-05-19 13:43:31 +01:00
parent c5e3ac9537
commit 3b88b8fd3a
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
roomserver/internal/input_membership.go
View file

@ -57,7 +57,6 @@ func (r *RoomserverInternalAPI) updateMemberships(
var ae *gomatrixserverlib.Event var ae *gomatrixserverlib.Event
var re *gomatrixserverlib.Event var re *gomatrixserverlib.Event
targetUserNID := change.EventStateKeyNID targetUserNID := change.EventStateKeyNID
targetLocal := false
if change.removedEventNID != 0 { if change.removedEventNID != 0 {
ev, _ := eventMap(events).lookup(change.removedEventNID) ev, _ := eventMap(events).lookup(change.removedEventNID)
if ev != nil { if ev != nil {
@ -70,7 +69,7 @@ func (r *RoomserverInternalAPI) updateMemberships(
ae = &ev.Event ae = &ev.Event
} }
} }
if updates, err = r.updateMembership(updater, targetUserNID, targetLocal, re, ae, updates); err != nil { if updates, err = r.updateMembership(updater, targetUserNID, re, ae, updates); err != nil {
return nil, err return nil, err
} }
} }
@ -80,7 +79,6 @@ func (r *RoomserverInternalAPI) updateMemberships(
func (r *RoomserverInternalAPI) updateMembership( func (r *RoomserverInternalAPI) updateMembership(
updater types.RoomRecentEventsUpdater, updater types.RoomRecentEventsUpdater,
targetUserNID types.EventStateKeyNID, targetUserNID types.EventStateKeyNID,
targetLocal bool,
remove, add *gomatrixserverlib.Event, remove, add *gomatrixserverlib.Event,
updates []api.OutputEvent, updates []api.OutputEvent,
) ([]api.OutputEvent, error) { ) ([]api.OutputEvent, error) {
@ -114,13 +112,7 @@ func (r *RoomserverInternalAPI) updateMembership(
return updates, nil return updates, nil
} }
targetLocal = false mu, err := updater.MembershipUpdater(targetUserNID, r.isLocalTarget(add))
if statekey := add.StateKey(); statekey != nil {
_, domain, _ := gomatrixserverlib.SplitID('@', *statekey)
targetLocal = domain == r.Cfg.Matrix.ServerName
}
mu, err := updater.MembershipUpdater(targetUserNID, targetLocal)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -139,6 +131,15 @@ func (r *RoomserverInternalAPI) updateMembership(
} }
} }
func (r *RoomserverInternalAPI) isLocalTarget(event *gomatrixserverlib.Event) bool {
targetLocal := false
if statekey := event.StateKey(); statekey != nil {
_, domain, _ := gomatrixserverlib.SplitID('@', *statekey)
targetLocal = domain == r.Cfg.Matrix.ServerName
}
return targetLocal
}
func updateToInviteMembership( func updateToInviteMembership(
mu types.MembershipUpdater, add *gomatrixserverlib.Event, updates []api.OutputEvent, mu types.MembershipUpdater, add *gomatrixserverlib.Event, updates []api.OutputEvent,
roomVersion gomatrixserverlib.RoomVersion, roomVersion gomatrixserverlib.RoomVersion,

12
roomserver/storage/postgres/membership_table.go
View file

@ -166,7 +166,13 @@ func (s *membershipStatements) selectMembershipFromRoomAndTarget(
func (s *membershipStatements) selectMembershipsFromRoom( func (s *membershipStatements) selectMembershipsFromRoom(
ctx context.Context, roomNID types.RoomNID, localOnly bool, ctx context.Context, roomNID types.RoomNID, localOnly bool,
) (eventNIDs []types.EventNID, err error) { ) (eventNIDs []types.EventNID, err error) {
rows, err := s.selectMembershipsFromRoomStmt.QueryContext(ctx, roomNID) var stmt *sql.Stmt
if localOnly {
stmt = s.selectLocalMembershipsFromRoomStmt
} else {
stmt = s.selectMembershipsFromRoomStmt
}
rows, err := stmt.QueryContext(ctx, roomNID)
if err != nil { if err != nil {
return return
} }
@ -187,9 +193,11 @@ func (s *membershipStatements) selectMembershipsFromRoomAndMembership(
roomNID types.RoomNID, membership membershipState, localOnly bool, roomNID types.RoomNID, membership membershipState, localOnly bool,
) (eventNIDs []types.EventNID, err error) { ) (eventNIDs []types.EventNID, err error) {
var rows *sql.Rows var rows *sql.Rows
stmt := s.selectMembershipsFromRoomAndMembershipStmt var stmt *sql.Stmt
if localOnly { if localOnly {
stmt = s.selectLocalMembershipsFromRoomAndMembershipStmt stmt = s.selectLocalMembershipsFromRoomAndMembershipStmt
} else {
stmt = s.selectMembershipsFromRoomAndMembershipStmt
} }
rows, err = stmt.QueryContext(ctx, roomNID, membership) rows, err = stmt.QueryContext(ctx, roomNID, membership)
if err != nil { if err != nil {