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

Linting

Browse source
This commit is contained in:
Kegan Dougal 2020-08-05 13:00:21 +01:00
parent 617862e40c
commit 2a0c160148
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
federationapi/routing/send.go
View file

@ -313,10 +313,18 @@ func (t *txnReq) processEDUs(edus []gomatrixserverlib.EDU) {
} }
} }
case gomatrixserverlib.MDeviceListUpdate: case gomatrixserverlib.MDeviceListUpdate:
t.processDeviceListUpdate(e)
default:
util.GetLogger(t.context).WithField("type", e.Type).Warn("unhandled edu")
}
}
}
func (t *txnReq) processDeviceListUpdate(e gomatrixserverlib.EDU) {
var payload gomatrixserverlib.DeviceListUpdateEvent var payload gomatrixserverlib.DeviceListUpdateEvent
if err := json.Unmarshal(e.Content, &payload); err != nil { if err := json.Unmarshal(e.Content, &payload); err != nil {
util.GetLogger(t.context).WithError(err).Error("Failed to unmarshal device list update event") util.GetLogger(t.context).WithError(err).Error("Failed to unmarshal device list update event")
continue return
} }
var inputRes keyapi.InputDeviceListUpdateResponse var inputRes keyapi.InputDeviceListUpdateResponse
t.keyAPI.InputDeviceListUpdate(context.Background(), &keyapi.InputDeviceListUpdateRequest{ t.keyAPI.InputDeviceListUpdate(context.Background(), &keyapi.InputDeviceListUpdateRequest{
@ -325,10 +333,6 @@ func (t *txnReq) processEDUs(edus []gomatrixserverlib.EDU) {
if inputRes.Error != nil { if inputRes.Error != nil {
util.GetLogger(t.context).WithError(inputRes.Error).WithField("user_id", payload.UserID).Error("failed to InputDeviceListUpdate") util.GetLogger(t.context).WithError(inputRes.Error).WithField("user_id", payload.UserID).Error("failed to InputDeviceListUpdate")
} }
default:
util.GetLogger(t.context).WithField("type", e.Type).Warn("unhandled edu")
}
}
} }
func (t *txnReq) processEvent(e gomatrixserverlib.Event, isInboundTxn bool) error { func (t *txnReq) processEvent(e gomatrixserverlib.Event, isInboundTxn bool) error {

7
keyserver/internal/internal.go
View file

@ -95,7 +95,12 @@ func (a *KeyInternalAPI) InputDeviceListUpdate(
} }
// ALWAYS emit key changes when we've been poked over federation just in case // ALWAYS emit key changes when we've been poked over federation just in case
// this poke is important for something. // this poke is important for something.
a.Producer.ProduceKeyChanges(keys) err = a.Producer.ProduceKeyChanges(keys)
if err != nil {
res.Error = &api.KeyError{
Err: fmt.Sprintf("failed to emit remote device key changes: %s", err),
}
}
return return
} }