Skip to content

Merge latest whatsmeow changes - #40

Merged
purpshell merged 5 commits into
polymorfa:mainfrom
tulir:main
Aug 19, 2026
Merged

Merge latest whatsmeow changes#40
purpshell merged 5 commits into
polymorfa:mainfrom
tulir:main

Conversation

@purpshell

@purpshell purpshell commented Aug 19, 2026

Copy link
Copy Markdown
Member

Checklist


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fb386f1528

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread user.go
if err != nil {
return nil, fmt.Errorf("failed to get user info for %s to fill LID cache: %w", jid, err)
}
lid = info[jid].LID

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Normalize the JID before indexing user info

When the caller supplies an AD phone-number JID and its LID is not cached, GetUserInfo strips the device via ToNonAD() and keys its result map by the normalized JID, so indexing with the original jid misses the returned entry and incorrectly reports that the server supplied no LID. Normalize the JID before both the lookup and subsequent blocklist request so user-level blocking works for device JIDs.

Useful? React with 👍 / 👎.

@purpshell

Copy link
Copy Markdown
Member Author

This upstream-head PR cannot accept Polymorfa conflict-resolution commits (maintainerCanModify=false). The exact five-commit sync, with HyperMeow module/libsignal/retraction policy preserved and full controls green, is ready in #41. Please merge #41 instead; this PR remains open only for traceability until that merge decision.

@purpshell
purpshell merged commit e091e71 into polymorfa:main Aug 19, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants