continuwuation/continuwuity
continuwuation/continuwuity
16
60
Fork 64
Code Issues 99 Pull requests 31 Releases 26 Packages 3 Activity Actions 10

fix(sliding-sync): properly handle wildcard state_key #1370

Merged
ginger merged 3 commits from titaniumtown/continuwuity:pr/sliding-sync-wildcard-fix into main 2026-02-14 19:17:55 +00:00
Conversation 4 Commits 3 Files changed 2 +45 -16
titaniumtown commented 2026-02-13 19:23:00 +00:00
Contributor
Copy link

Fixes calls as described in #1306

I was able to call between two users on the same homeserver.

Example of Video call message that appears:
image

The call:
image

Verified on ElementX and app.element.io

Pull request checklist:

  • This pull request targets the main branch, and the branch is named something other than
    main.
  • I have written an appropriate pull request title and my description is clear.
  • I understand I am responsible for the contents of this pull request.
  • I have followed the contributing guidelines:
Fixes calls as described in https://forgejo.ellis.link/continuwuation/continuwuity/issues/1306 I was able to call between two users on the same homeserver. Example of Video call message that appears: ![image](/attachments/1729fb8f-b73a-49a4-aabf-294c7bab6b77) The call: ![image](/attachments/0ed90c36-5c92-409a-b642-4373cd780ec6) Verified on ElementX and app.element.io <!-- In order to help reviewers know what your pull request does at a glance, you should ensure that 1. Your PR title is a short, single sentence describing what you changed 2. You have described in more detail what you have changed, why you have changed it, what the intended effect is, and why you think this will be beneficial to the project. If you have made any potentially strange/questionable design choices, but didn't feel they'd benefit from code comments, please don't mention them here - after opening your pull request, go to "files changed", and click on the "+" symbol in the line number gutter, and attach comments to the lines that you think would benefit from some clarification. --> <!-- Example: This pull request allows us to warp through time and space ten times faster than before by double-inverting the warp drive with hyperheated jump fluid, both making the drive faster and more efficient. This resolves the common issue where we have to wait more than 10 milliseconds to engage, use, and disengage the warp drive when travelling between galaxies. --> <!-- Closes: #... --> <!-- Fixes: #... --> <!-- Uncomment the above line(s) if your pull request fixes an issue or closes another pull request by superseding it. Replace `#...` with the issue/pr number, such as `#123`. --> **Pull request checklist:** <!-- You need to complete these before your PR can be considered. If you aren't sure about some, feel free to ask for clarification in #dev:continuwuity.org. --> - [X] This pull request targets the `main` branch, and the branch is named something other than `main`. - [X] I have written an appropriate pull request title and my description is clear. - [X] I understand I am responsible for the contents of this pull request. - I have followed the [contributing guidelines][c1]: - [X] My contribution follows the [code style][c2], if applicable. - [X] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [X] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [X] My commit messages follow the [commit message format][c1cm] and are descriptive. - [X] I have written a [news fragment][n1] for this PR, if applicable<!--(can be done after hitting open!)-->. <!-- Notes on these requirements: - While not required, we encourage you to sign your commits with GPG or SSH to attest the authenticity of your changes. - While we allow LLM-assisted contributions, we do not appreciate contributions that are low quality, which is typical of machine-generated contributions that have not had a lot of love and care from a human. Please do not open a PR if all you have done is asked ChatGPT to tidy up the codebase with a +-100,000 diff. - In the case of code style violations, reviewers may leave review comments/change requests indicating what the ideal change would look like. For example, a reviewer may suggest you lower a log level, or use `match` instead of `if/else` etc. - In the case of code style violations, pre-commit check failures, minor things like typos/spelling errors, and in some cases commit format violations, reviewers may modify your branch directly, typically by making changes and adding a commit. Particularly in the latter case, a reviewer may rebase your commits to squash "spammy" ones (like "fix", "fix", "actually fix"), and reword commit messages that don't satisfy the format. - Pull requests MUST pass the `Checks` CI workflows to be capable of being merged. This can only be bypassed in exceptional circumstances. If your CI flakes, let us know in matrix:r/dev:continuwuity.org. - Pull requests have to be based on the latest `main` commit before being merged. If the main branch changes while you're making your changes, you should make sure you rebase on main before opening a PR. Your branch will be rebased on main before it is merged if it has fallen behind. - We typically only do fast-forward merges, so your entire commit log will be included. Once in main, it's difficult to get out cleanly, so put on your best dress, smile for the cameras! --> [c1]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md [c2]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/docs/development/code_style.mdx [c1pc]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#pre-commit-checks [c1t]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#running-tests-locally [c1cm]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#commit-messages [n1]: https://towncrier.readthedocs.io/en/stable/tutorial.html#creating-news-fragments
image.png
25 KiB
image.png
1,020 KiB
fix(sliding-sync): properly handle wildcard state_key
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m18s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
ef9033b151
 
Fixes calls as described in #1306
ginger reviewed 2026-02-13 19:28:29 +00:00
src/api/client/sync/v5.rs Outdated
@ -692,0 +686,4 @@
) -> Vec<Raw<AnySyncStateEvent>> {
let mut required_state = Vec::new();
for (event_type, state_key) in required_state_request {
// Resolve wild-card sentinel issue
ginger commented 2026-02-13 19:27:17 +00:00
Owner
Copy link

this comment can probably be removed

this comment can probably be removed
titaniumtown commented 2026-02-13 19:38:30 +00:00
Author
Contributor
Copy link

Just the first line of the comment? or the whole 2 lines

Just the first line of the comment? or the whole 2 lines
ginger commented 2026-02-14 01:32:45 +00:00
Owner
Copy link

both lines, I think

both lines, I think
👍 1
titaniumtown marked this conversation as resolved
src/api/client/sync/v5.rs Outdated
@ -692,0 +695,4 @@
.room_state_keys(room_id, event_type)
.await
{
for key in keys {
ginger commented 2026-02-13 19:28:13 +00:00
Owner
Copy link

I seem to recall the existence of a function that does parallel lookups of state keys? multi_get_state or something like that

I seem to recall the existence of a function that does parallel lookups of state keys? `multi_get_state` or something like that
titaniumtown commented 2026-02-13 19:38:05 +00:00
Author
Contributor
Copy link

I can't seem to find this. Could you provide some more detail?

I can't seem to find this. Could you provide some more detail?
Henry-Hiles commented 2026-02-13 20:27:07 +00:00
Contributor
Copy link

I see this?

Line 271 in 53b06a7
pub async fn multi_get_state_from_short<'a, S>(

Probably different though.

I see this? https://forgejo.ellis.link/continuwuation/continuwuity/src/commit/53b06a79185c67687365da86afabfed065a82c13/src/service/rooms/short/mod.rs#L271 Probably different though.
titaniumtown commented 2026-02-14 04:50:52 +00:00
Author
Contributor
Copy link

I'm sorry I cannot figure this one out. I'm not familiar enough with how these data structures are setup or the meaning of these functions. A lot of them do not have doc strings so I have gotten really turned around haha.

I'm sorry I cannot figure this one out. I'm not familiar enough with how these data structures are setup or the meaning of these functions. A lot of them do not have doc strings so I have gotten really turned around haha.
ginger marked this conversation as resolved
ginger added this to the 0.5.5 milestone 2026-02-13 19:29:43 +00:00
ginger commented 2026-02-13 19:31:27 +00:00
Owner
Copy link

PR looks good besides the above nits and needing a news fragment

PR looks good besides the above nits and needing a news fragment
titaniumtown commented 2026-02-13 19:32:18 +00:00
Author
Contributor
Copy link

Alrighty. I gotta read about the news fragment thingy. I will get on addressing the reviews! Thanks for taking a look so quickly!

Alrighty. I gotta read about the news fragment thingy. I will get on addressing the reviews! Thanks for taking a look so quickly!
❤️ 1
fixup! add changelog.d entry
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m59s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 43m4s
Details
a15c721ece
titaniumtown force-pushed pr/sliding-sync-wildcard-fix from a15c721ece
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m59s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 43m4s
Details
to 68489856c4
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m17s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 35m46s
Details
2026-02-14 00:23:33 +00:00 Compare
Jade approved these changes 2026-02-14 01:15:37 +00:00
Jade left a comment
Owner
Copy link

can confirm it works

can confirm it works
❤️ 1
ginger force-pushed pr/sliding-sync-wildcard-fix from 68489856c4
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m17s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 35m46s
Details
to 8d66500c99
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m43s
Details
Documentation / Build and Deploy Documentation (push) Successful in 1m38s
Details
Checks / Prek / Pre-commit & Formatting (push) Successful in 4m21s
Details
Release Docker Image / Build linux-amd64 (release) (push) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (push) Has been cancelled
Details
Release Docker Image / Build linux-arm64 (release) (push) Has been cancelled
Details
Release Docker Image / Create Multi-arch Release Manifest (push) Has been cancelled
Details
Release Docker Image / Build linux-amd64 (max-perf) (push) Has been cancelled
Details
Release Docker Image / Build linux-arm64 (max-perf) (push) Has been cancelled
Details
Release Docker Image / Create Max-Perf Manifest (push) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 41m11s
Details
2026-02-14 19:13:04 +00:00 Compare
ginger merged commit 8d66500c99 into main 2026-02-14 19:17:55 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Jade
Labels
Clear labels   
Blocked

This pull request or issue is currently blocked from being merged/closed

  
Bug

Something isn't working as intended

  
Cherry-picking

Commits picked from other conduit projects

  
Database

This requires or includes changes to the database

  
Dependencies

Something dependency related

  
Dependencies/Renovate

Automatic dependency upgrades by Renovate

  
Difficulty
Easy
Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation

Improvements or additions to documentation

  
Enhancement

New feature or request

  
Good first issue

Good for newcomers

  
Help wanted

Additional eyes and keyboards are required for this one

  
Inherited

Issues that have been inhereted from the project pre-fork

  
Matrix/Administration

Features pertaining to homeserver administration

  
Matrix/Appservices

Features pertaining to the appservice API

  
Matrix/Auth

Features pertaining to authentication

  
Matrix/Client

Features pertaining to client-to-server interactions

  
Matrix/Core

Issues relating to core matrix functionality, such as state resolution and PDU formats

  
Matrix/Federation

Features pertaining to server-to-server interactions

  
Matrix/Hydra

Issues related to room version 12 and related changes (temporary label)

  
Matrix/MSC

Features pertaining to unstable matrix features

  
Matrix/Media

Features pertaining to media interactions

  
Meta

Related to housekeeping, maintenance, or other repo-meta.

  
Meta/CI

Issues related to CI changes

  
Meta/Packaging

Packaging

  
Priority
Blocking
This issue is blocking the next release

  
Priority
High
This issue is very important

  
Priority
Low
This issue is of a rather low priority

  
Security

This item is related to general security

  
Status
Confirmed
This issue has enough information and is confirmed

  
Status
Duplicate
This issue or pull request already exists

  
Status
Invalid
This issue doesn't seem right

  
Status
Needs Investigation
This issue needs further investigation

  
Support

Questions or support requests

  
To-Merge

   
Wont fix

This will not be worked on

  
old/ci/cd

Ci/CD

Archived

  
old/rust

Pull requests that update Rust code

Archived

No labels
Blocked
Bug
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
To-Merge
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
0.5.5
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
continuwuation/continuwuity!1370
No description provided.