hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-02 22:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor history visibility functions to be a bit neater

Browse source
This commit is contained in:
Kegan Dougal 2020-09-11 15:24:58 +01:00
parent 913020e4b7
commit bb3400365b
2 changed files with 52 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -480,27 +480,37 @@ func (b *backfillRequester) ProvideEvents(roomVer gomatrixserverlib.RoomVersion,
// TODO: Long term we probably want a history_visibility table which stores eventNID | visibility_enum so we can just
// pull all events and then filter by that table.
func joinEventsFromHistoryVisibility(
ctx context.Context, db storage.Database, roomID string, stateEntries []types.StateEntry) ([]types.Event, error) {
ctx context.Context, db storage.Database, roomID string, stateEntries []types.StateEntry,
) ([]types.Event, error) {
var eventNIDs []types.EventNID
// Extract the history visibility event
var historyVisibilityNID types.EventNID
for _, entry := range stateEntries {
// Filter the events to retrieve to only keep the membership events
if entry.EventTypeNID == types.MRoomHistoryVisibilityNID && entry.EventStateKeyNID == types.EmptyStateKeyNID {
eventNIDs = append(eventNIDs, entry.EventNID)
historyVisibilityNID = entry.EventNID
break
}
}
// Get all of the events in this state
stateEvents, err := db.Events(ctx, eventNIDs)
if historyVisibilityNID == 0 {
return nil, fmt.Errorf("no history visibility event for room %s", roomID)
}
stateEvents, err := db.Events(ctx, []types.EventNID{historyVisibilityNID})
if err != nil {
return nil, err
}
events := make([]gomatrixserverlib.Event, len(stateEvents))
for i := range stateEvents {
events[i] = stateEvents[i].Event
if len(stateEvents) != 1 {
return nil, fmt.Errorf("failed to load history visibility event nid %d", historyVisibilityNID)
}
var hisVisEvent *gomatrixserverlib.Event
for i := range stateEvents {
if stateEvents[i].Type() == gomatrixserverlib.MRoomHistoryVisibility && stateEvents[i].StateKeyEquals("") {
hisVisEvent = &stateEvents[i].Event
}
}
visibility, err := auth.HistoryVisibilityForRoom(hisVisEvent)
if err != nil {
return nil, err
}
visibility := auth.HistoryVisibilityForRoom(events)
if visibility != "shared" {
logrus.Infof("ServersAtEvent history visibility not shared: %s", visibility)
return nil, nil