sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Remove MemberShipStateAll

Browse source
This commit is contained in:
Till Faelligen 2022-03-07 09:42:02 +01:00
parent 699617ee4d
commit 7c6a162c0f
4 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -296,14 +296,8 @@ func (s *membershipStatements) SelectRoomsWithMembership(
rows *sql.Rows
err error
)
if membershipState == tables.MemberShipStateAll {
stmt := sqlutil.TxStmt(txn, s.selectRoomsForUserStmt)
rows, err = stmt.QueryContext(ctx, userID)
} else {
stmt := sqlutil.TxStmt(txn, s.selectRoomsWithMembershipStmt)
rows, err = stmt.QueryContext(ctx, membershipState, userID)
}
stmt := sqlutil.TxStmt(txn, s.selectRoomsWithMembershipStmt)
rows, err = stmt.QueryContext(ctx, membershipState, userID)
if err != nil {
return nil, err

2
roomserver/storage/shared/storage.go
View file

@ -1046,8 +1046,6 @@ func (d *Database) GetRoomsByMembership(ctx context.Context, userID, membership
membershipState = tables.MembershipStateLeaveOrBan
case "ban":
membershipState = tables.MembershipStateLeaveOrBan
case "all":
membershipState = tables.MemberShipStateAll
default:
return nil, fmt.Errorf("GetRoomsByMembership: invalid membership %s", membership)
}

9
roomserver/storage/sqlite3/membership_table.go
View file

@ -274,13 +274,8 @@ func (s *membershipStatements) SelectRoomsWithMembership(
err error
)
if membershipState == tables.MemberShipStateAll {
stmt := sqlutil.TxStmt(txn, s.selectRoomsForUserStmt)
rows, err = stmt.QueryContext(ctx, userID)
} else {
stmt := sqlutil.TxStmt(txn, s.selectRoomsWithMembershipStmt)
rows, err = stmt.QueryContext(ctx, membershipState, userID)
}
stmt := sqlutil.TxStmt(txn, s.selectRoomsWithMembershipStmt)
rows, err = stmt.QueryContext(ctx, membershipState, userID)
if err != nil {
return nil, err

1
roomserver/storage/tables/interface.go
View file

@ -113,7 +113,6 @@ type Invites interface {
type MembershipState int64
const (
MemberShipStateAll MembershipState = 0
MembershipStateLeaveOrBan MembershipState = 1
MembershipStateInvite MembershipState = 2
MembershipStateJoin MembershipState = 3