mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2024-11-22 22:31:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Send device update to local users if remote display name changes (#2215)

Browse source 
* Send device_list update to satisfy sytest

* Fix build issue from merged in change

Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
This commit is contained in:
S7evinK 2022-02-22 17:34:53 +01:00 committed by GitHub
parent cfff1b0aaa
commit 41dc651b25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
keyserver/internal/device_list_update.go
View file

@ -224,7 +224,7 @@ func (u *DeviceListUpdater) update(ctx context.Context, event gomatrixserverlib.
}).Info("DeviceListUpdater.Update") }).Info("DeviceListUpdater.Update")
// if we haven't missed anything update the database and notify users // if we haven't missed anything update the database and notify users
if exists { if exists || event.Deleted {
k := event.Keys k := event.Keys
if event.Deleted { if event.Deleted {
k = nil k = nil
@ -267,7 +267,7 @@ func (u *DeviceListUpdater) update(ctx context.Context, event gomatrixserverlib.
return false, fmt.Errorf("failed to store remote device keys for %s (%s): %w", event.UserID, event.DeviceID, err) return false, fmt.Errorf("failed to store remote device keys for %s (%s): %w", event.UserID, event.DeviceID, err)
} }
if err = emitDeviceKeyChanges(u.producer, existingKeys, keys); err != nil { if err = emitDeviceKeyChanges(u.producer, existingKeys, keys, false); err != nil {
return false, fmt.Errorf("failed to produce device key changes for %s (%s): %w", event.UserID, event.DeviceID, err) return false, fmt.Errorf("failed to produce device key changes for %s (%s): %w", event.UserID, event.DeviceID, err)
} }
return false, nil return false, nil
@ -473,7 +473,7 @@ func (u *DeviceListUpdater) updateDeviceList(res *gomatrixserverlib.RespUserDevi
if err != nil { if err != nil {
return fmt.Errorf("failed to mark device list as fresh: %w", err) return fmt.Errorf("failed to mark device list as fresh: %w", err)
} }
err = emitDeviceKeyChanges(u.producer, existingKeys, keys) err = emitDeviceKeyChanges(u.producer, existingKeys, keys, false)
if err != nil { if err != nil {
return fmt.Errorf("failed to emit key changes for fresh device list: %w", err) return fmt.Errorf("failed to emit key changes for fresh device list: %w", err)
} }

8
keyserver/internal/internal.go
View file

@ -648,7 +648,7 @@ func (a *KeyInternalAPI) uploadLocalDeviceKeys(ctx context.Context, req *api.Per
} }
return return
} }
err = emitDeviceKeyChanges(a.Producer, existingKeys, keysToStore) err = emitDeviceKeyChanges(a.Producer, existingKeys, keysToStore, req.OnlyDisplayNameUpdates)
if err != nil { if err != nil {
util.GetLogger(ctx).Errorf("Failed to emitDeviceKeyChanges: %s", err) util.GetLogger(ctx).Errorf("Failed to emitDeviceKeyChanges: %s", err)
} }
@ -710,7 +710,11 @@ func (a *KeyInternalAPI) uploadOneTimeKeys(ctx context.Context, req *api.Perform
} }
func emitDeviceKeyChanges(producer KeyChangeProducer, existing, new []api.DeviceMessage) error { func emitDeviceKeyChanges(producer KeyChangeProducer, existing, new []api.DeviceMessage, onlyUpdateDisplayName bool) error {
// if we only want to update the display names, we can skip the checks below
if onlyUpdateDisplayName {
return producer.ProduceKeyChanges(new)
}
// find keys in new that are not in existing // find keys in new that are not in existing
var keysAdded []api.DeviceMessage var keysAdded []api.DeviceMessage
for _, newKey := range new { for _, newKey := range new {

3
sytest-whitelist
View file

@ -597,4 +597,7 @@ Device list doesn't change if remote server is down
/context/ on non world readable room does not work /context/ on non world readable room does not work
/context/ returns correct number of events /context/ returns correct number of events
/context/ with lazy_load_members filter works /context/ with lazy_load_members filter works
Can query remote device keys using POST after notification
Device deletion propagates over federation
Get left notifs in sync and /keys/changes when other user leaves
Remote banned user is kicked and may not rejoin until unbanned Remote banned user is kicked and may not rejoin until unbanned