Skip to content

Sync upstream main (333d015: REFER stays in Confirmed) - #13

Merged
tgeorge06 merged 2 commits into
mainfrom
sync/upstream-333d015
Sep 27, 2026
Merged

tgeorge06 merged 2 commits into
mainfrom
sync/upstream-333d015

Conversation

@tgeorge06

Copy link
Copy Markdown
Owner

Merge upstream restsend/rsipstack main (333d015, "Keep established dialog state while dispatching REFER") into the fork.

  • Upstream makes REFER an event-only dialog notification (the dialog stays Confirmed, no extra Confirmed after the REFER response).
  • One conflict in DialogInner::transition() against our fork fix (notify only applied transitions): resolved by keeping our structure and adding DialogState::Refer to the event-only arm — the same resolution as upstream PR fix: notify dialog state only for transitions that are applied restsend/rsipstack#148 (fb7eb5f).
  • handle_refer in InviteDialog / ServerInviteDialog now takes the upstream form (no return_to_confirmed); INFO / UPDATE / MESSAGE / NOTIFY are unchanged.
  • Merge, not rebase: upstream main becomes an ancestor of the fork, so future syncs are plain merges and git log upstream/main..main shows only our changes.

Checks: cargo test — 369 lib (368 + the new upstream REFER test) + 65 doc passed, 0 failed. rustfmt --check clean on dialog.rs (the new upstream test_refer.rs is not rustfmt-clean upstream; left untouched).

🤖 Generated with Claude Code

https://claude.ai/code/session_01L1Gu5CifqgBjASbxYmJ6mr

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.

2 participants