Skip to content

connector: backfill DM peer UserInfo on resync #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fizzadar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

connector: backfill DM peer UserInfo on resync #287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions pkg/connector/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,24 @@ func (r *FBChatResync) GetChatInfo(ctx context.Context, portal *bridgev2.Portal)
r.Info.Members.MemberMap = makeNoteToSelfMembers(portal.OtherUserID, r.Info.Members.MemberMap[portal.OtherUserID].UserInfo)
}
}
// When DMs are re-created contact information is not redelivered, so ensure we correctly populate
// the other users contact info from our ghosts or get the info.
if otherUserID := r.Info.Members.OtherUserID; otherUserID != "" && otherUserID != networkid.UserID(r.m.UserLogin.ID) {
if member, ok := r.Info.Members.MemberMap[otherUserID]; ok && member.UserInfo == nil {
if ghost, err := r.m.Main.Bridge.GetGhostByID(ctx, otherUserID); err != nil {
zerolog.Ctx(ctx).Warn().Err(err).
Str("other_user_id", string(otherUserID)).
Msg("Failed to get DM peer ghost to backfill member UserInfo")
} else if userInfo, err := r.m.GetUserInfo(ctx, ghost); err != nil {
zerolog.Ctx(ctx).Warn().Err(err).
Str("other_user_id", string(otherUserID)).
Msg("Failed to fetch DM peer UserInfo for resync, emitting member without profile")
} else if userInfo != nil {
member.UserInfo = userInfo
r.Info.Members.MemberMap[otherUserID] = member
}
}
}
return r.Info, nil
}

Expand Down
Loading