This commit is contained in:
Erik Johnston 2018-11-23 16:02:48 +00:00 committed by Andrew Morgan
parent 3223f415e2
commit 14059e2300
2 changed files with 7 additions and 3 deletions

View file

@ -641,7 +641,9 @@ class FederationServer(FederationBase):
dont_relay.add(dest) dont_relay.add(dest)
if destinations: if destinations:
pdu.unsigned["destinations"] = {d: c for d, c in destinations.items() if d not in dont_relay} pdu.unsigned["destinations"] = {
d: c for d, c in destinations.items() if d not in dont_relay
}
yield self.handler.on_receive_pdu( yield self.handler.on_receive_pdu(
origin, pdu, sent_to_us_directly=True, origin, pdu, sent_to_us_directly=True,

View file

@ -810,9 +810,11 @@ class ServerHealth(ClientV1RestServlet):
"room_id": room_id, "room_id": room_id,
}) })
event, context = yield self.event_creation_handler.create_new_client_event( event, context = yield (
self.event_creation_handler.create_new_client_event(
builder=builder, builder=builder,
) )
)
event.internal_metadata.internal_event = True event.internal_metadata.internal_event = True
yield self.event_creation_handler.handle_new_client_event( yield self.event_creation_handler.handle_new_client_event(
requester, requester,