lovely-projects/whatsapp
lovely-projects/whatsapp
1
0
Fork 0
mirror of https://github.com/mautrix/whatsapp.git synced 2025-03-14 14:15:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handlewhatsapp: resync contacts on app state sync

Browse source 
Also removes the avatar fetch attempted flag in favor of checking if
the avatar ID is empty.
This commit is contained in:
Tulir Asokan 2024-09-26 18:44:25 +03:00
parent e61de784d0
commit 7ec5e2e5f4
4 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/mautrix-whatsapp/legacymigrate.sql
View file

@ -46,8 +46,7 @@ SELECT
-- only: sqlite (line commented)
-- json_object
(
'last_sync', last_sync,
'avatar_fetch_attempted', CASE WHEN avatar<>'' THEN json('true') ELSE json('false') END
'last_sync', last_sync
-- TODO name quality
) -- metadata
FROM puppet_old;

8
pkg/connector/handlewhatsapp.go
View file

@ -113,13 +113,7 @@ func (wa *WhatsAppClient) handleWAEvent(rawEvt any) {
log.Warn().Err(err).Msg("Failed to send presence after app state sync")
}
} else if evt.Name == appstate.WAPatchCriticalUnblockLow {
go func() {
// TODO resync contacts
//err := user.ResyncContacts(false)
//if err != nil {
// user.zlog.Err(err).Msg("Failed to resync contacts after app state sync")
//}
}()
go wa.resyncContacts(false)
}
case *events.AppState:
// Intentionally ignored

40
pkg/connector/userinfo.go
View file

@ -161,8 +161,7 @@ func (wa *WhatsAppClient) GetUserInfo(ctx context.Context, ghost *bridgev2.Ghost
return nil, nil
}
jid := waid.ParseUserID(ghost.ID)
fetchAvatar := !ghost.Metadata.(*waid.GhostMetadata).AvatarFetchAttempted
return wa.getUserInfo(ctx, jid, fetchAvatar)
return wa.getUserInfo(ctx, jid, ghost.AvatarID == "")
}
func (wa *WhatsAppClient) getUserInfo(ctx context.Context, jid types.JID, fetchAvatar bool) (*bridgev2.UserInfo, error) {
@ -175,16 +174,17 @@ func (wa *WhatsAppClient) getUserInfo(ctx context.Context, jid types.JID, fetchA
func (wa *WhatsAppClient) contactToUserInfo(jid types.JID, contact types.ContactInfo, getAvatar bool) *bridgev2.UserInfo {
ui := &bridgev2.UserInfo{
Name: ptr.Ptr(wa.Main.Config.FormatDisplayname(jid, contact)),
IsBot: ptr.Ptr(jid.IsBot()),
Identifiers: []string{fmt.Sprintf("tel:+%s", jid.User)},
Name: ptr.Ptr(wa.Main.Config.FormatDisplayname(jid, contact)),
IsBot: ptr.Ptr(jid.IsBot()),
Identifiers: []string{fmt.Sprintf("tel:+%s", jid.User)},
ExtraUpdates: updateGhostLastSyncAt,
}
if getAvatar {
ui.ExtraUpdates = bridgev2.MergeExtraUpdaters(ui.ExtraUpdates, wa.fetchGhostAvatar)
}
ui.ExtraUpdates = bridgev2.MergeExtraUpdaters(ui.ExtraUpdates, updateGhostLastSyncAt)
return ui
}
func updateGhostLastSyncAt(_ context.Context, ghost *bridgev2.Ghost) bool {
meta := ghost.Metadata.(*waid.GhostMetadata)
forceSave := time.Since(meta.LastSync.Time) > 24*time.Hour
@ -194,13 +194,10 @@ func updateGhostLastSyncAt(_ context.Context, ghost *bridgev2.Ghost) bool {
func (wa *WhatsAppClient) fetchGhostAvatar(ctx context.Context, ghost *bridgev2.Ghost) bool {
jid := waid.ParseUserID(ghost.ID)
meta := ghost.Metadata.(*waid.GhostMetadata)
existingID := string(ghost.AvatarID)
if existingID == "remove" || existingID == "unauthorized" {
existingID = ""
}
wasAttempted := meta.AvatarFetchAttempted
meta.AvatarFetchAttempted = true
var wrappedAvatar *bridgev2.Avatar
avatar, err := wa.Client.GetProfilePictureInfo(jid, &whatsmeow.GetProfilePictureParams{ExistingID: existingID})
if errors.Is(err, whatsmeow.ErrProfilePictureNotSet) {
@ -215,9 +212,9 @@ func (wa *WhatsAppClient) fetchGhostAvatar(ctx context.Context, ghost *bridgev2.
}
} else if err != nil {
zerolog.Ctx(ctx).Err(err).Msg("Failed to get avatar info")
return !wasAttempted
return false
} else if avatar == nil {
return !wasAttempted
return false
} else {
wrappedAvatar = &bridgev2.Avatar{
ID: networkid.AvatarID(avatar.ID),
@ -226,5 +223,24 @@ func (wa *WhatsAppClient) fetchGhostAvatar(ctx context.Context, ghost *bridgev2.
},
}
}
return ghost.UpdateAvatar(ctx, wrappedAvatar) || !wasAttempted
return ghost.UpdateAvatar(ctx, wrappedAvatar)
}
func (wa *WhatsAppClient) resyncContacts(forceAvatarSync bool) {
log := wa.UserLogin.Log.With().Str("action", "resync contacts").Logger()
ctx := log.WithContext(context.Background())
contacts, err := wa.Device.Contacts.GetAllContacts()
if err != nil {
log.Err(err).Msg("Failed to get cached contacts")
return
}
log.Info().Int("contact_count", len(contacts)).Msg("Resyncing displaynames with contact info")
for jid, contact := range contacts {
ghost, err := wa.Main.Bridge.GetGhostByID(ctx, waid.MakeUserID(jid))
if err != nil {
log.Err(err).Msg("Failed to get ghost")
} else if ghost != nil {
ghost.UpdateInfo(ctx, wa.contactToUserInfo(jid, contact, forceAvatarSync || ghost.AvatarID == ""))
}
}
}

3
pkg/waid/dbmeta.go
View file

@ -60,6 +60,5 @@ type PortalMetadata struct {
}
type GhostMetadata struct {
AvatarFetchAttempted bool `json:"avatar_fetch_attempted,omitempty"`
LastSync jsontime.Unix `json:"last_sync,omitempty"`
LastSync jsontime.Unix `json:"last_sync,omitempty"`
}