mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-22 11:41:38 +00:00
Only emit key change notifications from federation when changes are made (#2217)
* Only emit key changes when poked over federation * Remove logging * Fix unit test possibly
This commit is contained in:
parent
bbe7d37928
commit
600fbae31f
@ -241,14 +241,33 @@ func (u *DeviceListUpdater) update(ctx context.Context, event gomatrixserverlib.
|
||||
StreamID: event.StreamID,
|
||||
},
|
||||
}
|
||||
|
||||
// DeviceKeysJSON will side-effect modify this, so it needs
|
||||
// to be a copy, not sharing any pointers with the above.
|
||||
deviceKeysCopy := *keys[0].DeviceKeys
|
||||
deviceKeysCopy.KeyJSON = nil
|
||||
existingKeys := []api.DeviceMessage{
|
||||
{
|
||||
Type: keys[0].Type,
|
||||
DeviceKeys: &deviceKeysCopy,
|
||||
StreamID: keys[0].StreamID,
|
||||
},
|
||||
}
|
||||
|
||||
// fetch what keys we had already and only emit changes
|
||||
if err = u.db.DeviceKeysJSON(ctx, existingKeys); err != nil {
|
||||
// non-fatal, log and continue
|
||||
util.GetLogger(ctx).WithError(err).WithField("user_id", event.UserID).Errorf(
|
||||
"failed to query device keys json for calculating diffs",
|
||||
)
|
||||
}
|
||||
|
||||
err = u.db.StoreRemoteDeviceKeys(ctx, keys, nil)
|
||||
if err != nil {
|
||||
return false, fmt.Errorf("failed to store remote device keys for %s (%s): %w", event.UserID, event.DeviceID, err)
|
||||
}
|
||||
// ALWAYS emit key changes when we've been poked over federation even if there's no change
|
||||
// just in case this poke is important for something.
|
||||
err = u.producer.ProduceKeyChanges(keys)
|
||||
if err != nil {
|
||||
|
||||
if err = emitDeviceKeyChanges(u.producer, existingKeys, keys); err != nil {
|
||||
return false, fmt.Errorf("failed to produce device key changes for %s (%s): %w", event.UserID, event.DeviceID, err)
|
||||
}
|
||||
return false, nil
|
||||
|
Loading…
Reference in New Issue
Block a user