Merge pull request #869 from matrix-org/erikj/backfill_fix
Correctly mark backfilled events as backfilled
This commit is contained in:
commit
d9f7fa2e57
|
@ -345,6 +345,8 @@ class FederationHandler(BaseHandler):
|
||||||
)
|
)
|
||||||
|
|
||||||
missing_auth = required_auth - set(auth_events)
|
missing_auth = required_auth - set(auth_events)
|
||||||
|
if missing_auth:
|
||||||
|
logger.info("Missing auth for backfill: %r", missing_auth)
|
||||||
results = yield defer.gatherResults(
|
results = yield defer.gatherResults(
|
||||||
[
|
[
|
||||||
self.replication_layer.get_pdu(
|
self.replication_layer.get_pdu(
|
||||||
|
@ -399,7 +401,7 @@ class FederationHandler(BaseHandler):
|
||||||
# previous to work out the state.
|
# previous to work out the state.
|
||||||
# TODO: We can probably do something more clever here.
|
# TODO: We can probably do something more clever here.
|
||||||
yield self._handle_new_event(
|
yield self._handle_new_event(
|
||||||
dest, event
|
dest, event, backfilled=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
defer.returnValue(events)
|
defer.returnValue(events)
|
||||||
|
|
Loading…
Reference in New Issue