Don't send rewrite events

This commit is contained in:
Neil Alexander 2020-10-06 09:28:04 +01:00
parent 52ddded72d
commit 6d367570cf
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 2 additions and 15 deletions

View file

@ -35,10 +35,6 @@ const (
// KindBackfill event extend the contiguous graph going backwards. // KindBackfill event extend the contiguous graph going backwards.
// They always have state. // They always have state.
KindBackfill = 3 KindBackfill = 3
// KindRewrite events are used when rewriting the head of the room
// graph with entirely new state. The output events generated will
// be state events rather than timeline events.
KindRewrite = 4
) )
// DoNotSendToOtherServers tells us not to send the event to other matrix // DoNotSendToOtherServers tells us not to send the event to other matrix

View file

@ -146,7 +146,7 @@ func SendEventWithRewrite(
// Each of these rewrite events includes all of the rewrite events // Each of these rewrite events includes all of the rewrite events
// that came before in their StateEventIDs. // that came before in their StateEventIDs.
ires = append(ires, InputRoomEvent{ ires = append(ires, InputRoomEvent{
Kind: KindRewrite, Kind: KindOutlier,
Event: authOrStateEvent.Headered(event.RoomVersion), Event: authOrStateEvent.Headered(event.RoomVersion),
AuthEventIDs: authOrStateEvent.AuthEventIDs(), AuthEventIDs: authOrStateEvent.AuthEventIDs(),
HasState: true, HasState: true,

View file

@ -136,15 +136,6 @@ func (r *Inputer) processRoomEvent(
return event.EventID(), rejectionErr return event.EventID(), rejectionErr
} }
if input.Kind == api.KindRewrite {
logrus.WithFields(logrus.Fields{
"event_id": event.EventID(),
"type": event.Type(),
"room": event.RoomID(),
}).Debug("Stored rewrite")
return event.EventID(), nil
}
if err = r.updateLatestEvents( if err = r.updateLatestEvents(
ctx, // context ctx, // context
roomInfo, // room info for the room being updated roomInfo, // room info for the room being updated

View file

@ -344,7 +344,7 @@ func TestOutputRewritesState(t *testing.T) {
for i := 0; i < len(rewriteEvents)-1; i++ { for i := 0; i < len(rewriteEvents)-1; i++ {
ev := rewriteEvents[i] ev := rewriteEvents[i]
inputEvents = append(inputEvents, api.InputRoomEvent{ inputEvents = append(inputEvents, api.InputRoomEvent{
Kind: api.KindRewrite, Kind: api.KindOutlier,
Event: ev, Event: ev,
AuthEventIDs: ev.AuthEventIDs(), AuthEventIDs: ev.AuthEventIDs(),
HasState: true, HasState: true,