continuwuation/continuwuity
continuwuation/continuwuity
15
84
Fork 97
Code Issues 127 Pull requests 24 Releases 27 Packages 3 Activity Actions 5

fix: ensure pagination works correctly for flat space hierarchies #1562

Closed
vicr123 wants to merge 2 commits from vicr123/continuwuity:bug/client-hierarchy-pagination-2 into main
pull from: vicr123/continuwuity:bug/client-hierarchy-pagination-2
merge into: continuwuation:main
Conversation 4 Commits 2 Files changed 2 +55 -48
vicr123 commented 2026-03-22 11:07:10 +00:00
First-time contributor
Copy link

This pull request fixes the hierarchy pagination request for single level hierarchies, by changing the
algorithm used to walk parent/child spaces and rooms. Previously, paginating a space hierarchy would
not work correctly if pagination stopped in the middle of a space.

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:
<!-- 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. --> This pull request fixes the hierarchy pagination request for single level hierarchies, by changing the algorithm used to walk parent/child spaces and rooms. Previously, paginating a space hierarchy would not work correctly if pagination stopped in the middle of a space. <!-- 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
vicr123 force-pushed bug/client-hierarchy-pagination-2 from caf7cc8079
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been cancelled
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to b8261ccbc5
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been cancelled
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-03-22 11:08:47 +00:00 Compare
vicr123 force-pushed bug/client-hierarchy-pagination-2 from b8261ccbc5
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been cancelled
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to 97dc6877c1
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m56s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 16m1s
Details
2026-03-22 11:11:54 +00:00 Compare
nex requested changes 2026-03-27 00:40:16 +00:00
src/api/client/space.rs Outdated
@ -122,0 +125,4 @@
continue;
}
if path.len() == short_room_ids.clone().count()
nex commented 2026-03-27 00:40:05 +00:00
Owner
Copy link

You seem to clone() very liberally in this diff - is this necessary? I haven't checked but they look like rather heavy clones

You seem to clone() very liberally in this diff - is this necessary? I haven't checked but they look like rather heavy clones
vicr123 force-pushed bug/client-hierarchy-pagination-2 from 97dc6877c1
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m56s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 16m1s
Details
to 5c88c10c7b
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 11s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m9s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m51s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 16m58s
Details
2026-03-27 04:25:50 +00:00 Compare
vicr123 commented 2026-03-27 04:25:54 +00:00
Author
First-time contributor
Copy link

Good call, I've collected the iterator into a vec and borrowed that instead.

Good call, I've collected the iterator into a vec and borrowed that instead.
vicr123 requested review from nex 2026-03-27 04:25:59 +00:00
ginger reviewed 2026-03-29 16:17:26 +00:00
src/api/client/space.rs Outdated
@ -122,0 +127,4 @@
}
if path.len() == short_room_ids.len()
&& path
ginger commented 2026-03-29 16:16:40 +00:00
Owner
Copy link

This condition could be split into two ifs with the result of the big stream combinator sequence assigned to a variable for readibility

This condition could be split into two `if`s with the result of the big stream combinator sequence assigned to a variable for readibility
vicr123 commented 2026-03-29 22:51:17 +00:00
Author
First-time contributor
Copy link

Done 😃

Done 😃
vicr123 marked this conversation as resolved
src/api/client/space.rs Outdated
@ -122,0 +137,4 @@
.map(|parent_short_room_id| {
short_room_ids.contains(&&parent_short_room_id)
})
.unwrap_or(false)
ginger commented 2026-03-29 16:14:44 +00:00
Owner
Copy link

This unwrap_or and map combo could be replaced with is_some_and, and frankly the return value of get_shortroomid could be expected since all existing rooms should have a shortroomid

This `unwrap_or` and `map` combo could be replaced with `is_some_and`, and frankly the return value of `get_shortroomid` could be `expect`ed since all existing rooms should have a shortroomid
vicr123 commented 2026-03-29 22:51:26 +00:00
Author
First-time contributor
Copy link

Done 😃

Done 😃
vicr123 marked this conversation as resolved
vicr123 force-pushed bug/client-hierarchy-pagination-2 from 5c88c10c7b
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 11s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m9s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m51s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 16m58s
Details
to a09d667795
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 10s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m17s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 22m7s
Details
2026-03-29 22:54:33 +00:00 Compare
ginger added this to the (deleted) milestone 2026-04-06 13:06:47 +00:00
ginger commented 2026-04-14 13:18:43 +00:00
Owner
Copy link

Superseded by #1656.

Superseded by #1656.
ginger closed this pull request 2026-04-14 13:18:44 +00:00
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 10s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m17s
Required
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 22m7s
Required
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
nex
Labels
Clear labels   
Blocked

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

  
Bug

Something isn't working as intended

  
Changelog
Added
Changelog entry added

  
Changelog
Missing
No changelog when one is needed

  
Changelog
None
Changelog is unnecesary for this change

  
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/E2EE

Issues related to end to end encryption

  
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

  
Matrix/T&S

Changes or issues related to trust & safety tooling

  
Merge

This PR is ready to be merged

  
Merge/Manual

This PR should be manually merged

  
Merge/Squash

This PR should be squashed when it is merged

  
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

  
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
Changelog
Added
Changelog
Missing
Changelog
None
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/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Merge
Merge/Manual
Merge/Squash
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 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!1562
No description provided.