Skip to content
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.

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

MSC4140: don't cancel delayed state on own state #17810

Merged

Conversation

AndrewFerr
Copy link
Member

@AndrewFerr AndrewFerr commented Oct 10, 2024

When a user sends a state event, do not cancel their own delayed events for the same piece of state.

For context, see the relevant section in the MSC.

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Code style is correct
    (run the linters)

@AndrewFerr
Copy link
Member Author

Depends on matrix-org/complement#742 for Complement tests to pass.

@AndrewFerr AndrewFerr marked this pull request as ready for review October 10, 2024 13:55
@AndrewFerr AndrewFerr requested a review from a team as a code owner October 10, 2024 13:55
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

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

Looks good on the whole, just some small points of feedback.

@AndrewFerr
Copy link
Member Author

The sytests pass when I run them locally. Is there a way to retry their CI runs?

@MadLittleMods
Copy link
Contributor

@AndrewFerr Retried 👍

@AndrewFerr AndrewFerr mentioned this pull request Oct 23, 2024
3 tasks
When a user sends a state event, do not cancel their own delayed events
for the same piece of state.
@AndrewFerr AndrewFerr force-pushed the msc4140_no-self-state-cancel branch from d45595c to 4ecbe62 Compare November 11, 2024 03:23
@AndrewFerr
Copy link
Member Author

Now the only failing tests are the ones that depend on matrix-org/complement#742 (finally!).

@hughns
Copy link
Member

hughns commented Jan 17, 2025

@AndrewFerr what's the latest on this PR and addressing any outstanding issues?

@AndrewFerr
Copy link
Member Author

AndrewFerr commented Jan 17, 2025

what's the latest on this PR and addressing any outstanding issues?

This and matrix-org/complement#742 are both ready to be merged (though the latter should be merged first).

EDIT: I'll open a new Complement PR with its branch name set such that it will be used in this PR's Complement tests in CI.

@AndrewFerr
Copy link
Member Author

Eugh, looks like I had the wrong understanding of how CI chooses which Complement branch to run on.

In any case, I can assure you that TestDelayedEvents passes when using this PR + matrix-org/complement#768.

hughns added a commit to matrix-org/matrix-js-sdk that referenced this pull request Mar 12, 2025
Removes workaround for element-hq/synapse#17810 not having landed
@sandhose sandhose requested a review from a team March 17, 2025 13:46
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

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

This LGTM, thanks for your patience 🙏

Will merge this PR at the same time as matrix-org/complement#768.

@anoadragon453 anoadragon453 merged commit 51df675 into element-hq:develop Mar 17, 2025
35 of 39 checks passed
@AndrewFerr AndrewFerr deleted the msc4140_no-self-state-cancel branch March 17, 2025 17:36
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.

4 participants