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

Clean up changes

Browse source
This commit is contained in:
Alex Chan 2021-07-29 03:07:38 -04:00
parent e50dbe61be
commit cd78100adb
9 changed files with 63 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
clientapi/routing/memberships.go
View file

@ -17,6 +17,7 @@ package routing
import (
"encoding/json"
"net/http"
"regexp"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/roomserver/api"
@ -68,30 +69,45 @@ func GetMemberships(
_ *config.ClientAPI,
rsAPI api.RoomserverInternalAPI,
) util.JSONResponse {
// how would i unpack this nicely into
// type queryParams struct {
// membership string
// notMembership string
// }
membership := req.URL.Query().Get("membership")
notMembership := req.URL.Query().Get("not_membership")
membershipStatusFilter := []string{"join", "invite", "leave", "ban"}
if len(notMembership) > 0 {
for i, v := range membershipStatusFilter {
if v == notMembership {
membershipStatusFilter = append(membershipStatusFilter[:i], membershipStatusFilter[i+1:]...)
regexpMembershipFilter, _ := regexp.Compile("join|invite|leave|ban")
if membership != "" && !regexpMembershipFilter.MatchString(membership) {
return util.JSONResponse{
Code: http.StatusBadRequest,
}
}
if notMembership != "" && !regexpMembershipFilter.MatchString(notMembership) {
return util.JSONResponse{
Code: http.StatusBadRequest,
}
}
membershipFilter := []string{"join", "invite", "leave", "ban"}
if notMembership != "" {
if membership != "" && membership != notMembership {
for idx, val := range membershipFilter {
if val == notMembership {
membershipFilter = append(membershipFilter[:idx], membershipFilter[idx+1:]...)
break
}
}
}
} else if len(membership) > 0 {
membershipStatusFilter = []string{membership}
// If membership and not_membership are both specified and they are the same,
// then we do no filtering at all because they create an OR conditional
} else {
membershipStatusFilter = []string{}
if membership != "" {
membershipFilter = []string{membership}
}
}
queryReq := api.QueryMembershipsForRoomRequest{
JoinedOnly: joinedOnly,
MembershipStatusFilter: membershipStatusFilter,
RoomID: roomID,
Sender: device.UserID,
JoinedOnly: joinedOnly,
MembershipFilter: membershipFilter,
RoomID: roomID,
Sender: device.UserID,
}
var queryRes api.QueryMembershipsForRoomResponse
if err := rsAPI.QueryMembershipsForRoom(req.Context(), &queryReq, &queryRes); err != nil {

6
roomserver/api/query.go
View file

@ -148,8 +148,10 @@ type QueryMembershipForUserResponse struct {
// QueryMembershipsForRoomRequest is a request to QueryMembershipsForRoom
type QueryMembershipsForRoomRequest struct {
// If true, only returns the membership events of "join" membership
JoinedOnly bool `json:"joined_only"`
MembershipStatusFilter []string `json:"membership_status_filter"`
JoinedOnly bool `json:"joined_only"`
// The kinds of membership to filter for - returns the membership
// events with the appropriate filter (ie. join, invite, leave, ban)
MembershipFilter []string `json:"membership_filter"`
// ID of the room to fetch memberships from
RoomID string `json:"room_id"`
// Optional - ID of the user sending the request, for checking if the

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

@ -59,7 +59,7 @@ func IsServerCurrentlyInRoom(ctx context.Context, db storage.Database, serverNam
return false, fmt.Errorf("unknown room %s", roomID)
}
eventNIDs, err := db.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, []string{"join"}, false)
eventNIDs, err := db.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, true, []string{}, false)
if err != nil {
return false, err
}

2
roomserver/internal/input/input_events.go
View file

@ -256,7 +256,7 @@ func (r *Inputer) calculateAndSetState(
stateAtEvent.Overwrite = true
var joinEventNIDs []types.EventNID
// Request join memberships only for local users only.
if joinEventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, roomInfo.RoomNID, []string{"join"}, true); err == nil {
if joinEventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, roomInfo.RoomNID, true, []string{}, true); err == nil {
// If we have no local users that are joined to the room then any state about
// the room that we have is quite possibly out of date. Therefore in that case
// we should overwrite it rather than merge it.

2
roomserver/internal/perform/perform_backfill.go
View file

@ -537,7 +537,7 @@ func joinEventsFromHistoryVisibility(
if err != nil {
return nil, err
}
joinEventNIDs, err := db.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, []string{"join"}, false)
joinEventNIDs, err := db.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, true, []string{}, false)
if err != nil {
return nil, err
}

6
roomserver/internal/query/query.go
View file

@ -251,7 +251,7 @@ func (r *Queryer) QueryMembershipsForRoom(
if request.Sender == "" {
var events []types.Event
var eventNIDs []types.EventNID
eventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, request.MembershipStatusFilter, false)
eventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, request.JoinedOnly, request.MembershipFilter, false)
if err != nil {
return fmt.Errorf("r.DB.GetMembershipEventNIDsForRoom: %w", err)
}
@ -286,7 +286,7 @@ func (r *Queryer) QueryMembershipsForRoom(
var stateEntries []types.StateEntry
if stillInRoom {
var eventNIDs []types.EventNID
eventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, request.MembershipStatusFilter, false)
eventNIDs, err = r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, request.JoinedOnly, request.MembershipFilter, false)
if err != nil {
return err
}
@ -328,7 +328,7 @@ func (r *Queryer) QueryServerJoinedToRoom(
}
response.RoomExists = true
eventNIDs, err := r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, []string{"join"}, false)
eventNIDs, err := r.DB.GetMembershipEventNIDsForRoom(ctx, info.RoomNID, true, []string{}, false)
if err != nil {
return fmt.Errorf("r.DB.GetMembershipEventNIDsForRoom: %w", err)
}

2
roomserver/storage/interface.go
View file

@ -131,7 +131,7 @@ type Database interface {
// been members of a given room. Only lookup events of "join" membership if
// joinOnly is set to true.
// Returns an error if there was a problem talking to the database.
GetMembershipEventNIDsForRoom(ctx context.Context, roomNID types.RoomNID, membershipStatusFilter []string, localOnly bool) ([]types.EventNID, error)
GetMembershipEventNIDsForRoom(ctx context.Context, roomNID types.RoomNID, joinOnly bool, membershipFilter []string, localOnly bool) ([]types.EventNID, error)
// EventsFromIDs looks up the Events for a list of event IDs. Does not error if event was
// not found.
// Returns an error if the retrieval went wrong.

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

@ -343,13 +343,20 @@ func (d *Database) GetMembership(ctx context.Context, roomNID types.RoomNID, req
}
func (d *Database) GetMembershipEventNIDsForRoom(
ctx context.Context, roomNID types.RoomNID, membershipStatusFilter []string, localOnly bool,
ctx context.Context, roomNID types.RoomNID, joinOnly bool, membershipFilter []string, localOnly bool,
) ([]types.EventNID, error) {
var eventNIDs []types.EventNID
var filteredEventNIDs []types.EventNID
var err error
if len(membershipStatusFilter) > 0 {
for _, filter := range membershipStatusFilter {
if joinOnly {
return d.MembershipTable.SelectMembershipsFromRoomAndMembership(
ctx, roomNID, tables.MembershipStateJoin, localOnly,
)
}
if len(membershipFilter) > 0 {
var eventNIDs []types.EventNID
var filteredEventNIDs []types.EventNID
var err error
leaveOrBan := false
for _, filter := range membershipFilter {
if filter == "join" {
filteredEventNIDs, err = d.MembershipTable.SelectMembershipsFromRoomAndMembership(
ctx, roomNID, tables.MembershipStateJoin, localOnly,
@ -358,7 +365,8 @@ func (d *Database) GetMembershipEventNIDsForRoom(
return eventNIDs, err
}
eventNIDs = append(eventNIDs, filteredEventNIDs...)
} else if filter == "invite" {
}
if filter == "invite" {
filteredEventNIDs, err = d.MembershipTable.SelectMembershipsFromRoomAndMembership(
ctx, roomNID, tables.MembershipStateInvite, localOnly,
)
@ -366,7 +374,8 @@ func (d *Database) GetMembershipEventNIDsForRoom(
return eventNIDs, err
}
eventNIDs = append(eventNIDs, filteredEventNIDs...)
} else {
}
if (filter == "ban" || filter == "leave") && !leaveOrBan {
filteredEventNIDs, err = d.MembershipTable.SelectMembershipsFromRoomAndMembership(
ctx, roomNID, tables.MembershipStateLeaveOrBan, localOnly,
)
@ -374,6 +383,7 @@ func (d *Database) GetMembershipEventNIDsForRoom(
return eventNIDs, err
}
eventNIDs = append(eventNIDs, filteredEventNIDs...)
leaveOrBan = true
}
}
return eventNIDs, err

1
sytest-whitelist
View file

@ -520,3 +520,4 @@ Inviting an AS-hosted user asks the AS server
Can generate a openid access_token that can be exchanged for information about a user
Invalid openid access tokens are rejected
Requests to userinfo without access tokens are rejected
Can get rooms/{roomId}/members at a given point