Remove MemberShipStateAll

roomserver/storage/postgres/membership_table.go

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

roomserver/storage/shared/storage.go

@@ -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)
 	}

roomserver/storage/sqlite3/membership_table.go

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

roomserver/storage/tables/interface.go

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