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

fix comment

Browse source
This commit is contained in:
Matthew Hodgson 2020-09-27 00:31:56 +01:00
parent 1e6e23dab1
commit fd90849802
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
federationsender/internal/perform.go
View file

@ -391,13 +391,13 @@ func (r *FederationSenderInternalAPI) performOutboundPeekUsingServer(
}
respState := respPeek.ToRespState()
// logrus.Warnf("converted respPeek %#v to respState %#v", respPeek, respState)
// logrus.Warnf("got respPeek %#v", respPeek)
// Send the newly returned state to the roomserver to update our local view.
if err = roomserverAPI.SendEventWithState(
if err = roomserverAPI.SendEventWithRewrite(
ctx, r.rsAPI,
&respState,
respPeek.LatestEvent.Headered(respPeek.RoomVersion), nil,
respPeek.RoomVersion,
respPeek.LatestEvent.Headered(respPeek.RoomVersion),
nil,
); err != nil {
return fmt.Errorf("r.producer.SendEventWithState: %w", err)
}
@ -578,4 +578,4 @@ func (r *FederationSenderInternalAPI) PerformBroadcastEDU(
}
return nil
}
}

2
federationsender/storage/interface.go
View file

@ -50,7 +50,7 @@ type Database interface {
GetPendingPDUServerNames(ctx context.Context) ([]gomatrixserverlib.ServerName, error)
GetPendingEDUServerNames(ctx context.Context) ([]gomatrixserverlib.ServerName, error)
// XXX: why don't these have contexts passed in?
// these don't have contexts passed in as we want things to happen regardless of the request context
AddServerToBlacklist(serverName gomatrixserverlib.ServerName) error
RemoveServerFromBlacklist(serverName gomatrixserverlib.ServerName) error
IsServerBlacklisted(serverName gomatrixserverlib.ServerName) (bool, error)