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

fix(room_member): Strip join_authorized_via_users_server (#1542) #1547

Merged
ginger merged 7 commits from Partha/continuwuity:bugfix/1542-room-member-strip into main 2026-03-24 13:11:26 +00:00
Conversation 6 Commits 7 Files changed 3 +52 -10
Partha commented 2026-03-17 08:01:01 +00:00
Contributor
Copy link

Some clients were sending join_authorized_via_users_server when they
were already in the room, to change nicknames. This caused an undesirable
error, so it is simply stripped from event instead.

Fixes: #1542

Signed-off-by: Jonathan Sutton jonathansutton91@proton.me

This pull request...

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:
Some clients were sending `join_authorized_via_users_server` when they were already in the room, to change nicknames. This caused an undesirable error, so it is simply stripped from event instead. Fixes: #1542 Signed-off-by: Jonathan Sutton <jonathansutton91@proton.me> <!-- 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... <!-- 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
Partha commented 2026-03-17 08:06:17 +00:00
Author
Contributor
Copy link

Will formally deploy and test soon. Also, not sure if I am doing this properly

Will formally deploy and test soon. Also, not sure if I am doing this properly
Partha force-pushed bugfix/1542-room-member-strip from a4b6175503
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m1s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 17m38s
Details
to 317dd1a8ec
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m4s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-03-18 06:36:28 +00:00 Compare
Partha force-pushed bugfix/1542-room-member-strip from 317dd1a8ec
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m4s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to 424abbc4a7
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m1s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 20m40s
Details
2026-03-18 06:48:21 +00:00 Compare
Partha changed title from WIP: fix(room_member): Strip join_authorized_via_users_server (#1542) to fix(room_member): Strip join_authorized_via_users_server (#1542) 2026-03-18 07:13:23 +00:00
Partha force-pushed bugfix/1542-room-member-strip from 5c24cd8779
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m54s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 10m3s
Details
to e95709cda0
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m55s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 24m50s
Details
2026-03-18 14:13:47 +00:00 Compare
Partha force-pushed bugfix/1542-room-member-strip from e95709cda0
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m55s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 24m50s
Details
to 9c1c376904
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m55s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 41m15s
Details
2026-03-18 18:59:07 +00:00 Compare
Partha force-pushed bugfix/1542-room-member-strip from 9c1c376904
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m55s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 41m15s
Details
to 187302a608
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m49s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 12m40s
Details
2026-03-19 13:17:22 +00:00 Compare
nex 2026-03-19 21:08:05 +00:00
nex added this to the (deleted) milestone 2026-03-19 21:08:26 +00:00
nex requested changes 2026-03-19 21:10:20 +00:00
Dismissed
src/api/client/state.rs Outdated
@ -377,0 +384,4 @@
{
let mut content: RoomMemberEventContent = membership_content.clone();
content.join_authorized_via_users_server = None;
*json = Raw::<AnyStateEventContent>::from_json_string(
nex commented 2026-03-19 21:10:12 +00:00
Owner
Copy link

I think you can just json.remove("join_authorized_via_users_server") rather than cloning the deserialised object and re-serializing it again

I think you can just `json.remove("join_authorized_via_users_server")` rather than cloning the deserialised object and re-serializing it again
Partha commented 2026-03-20 05:24:36 +00:00
Author
Contributor
Copy link

I'm planning on getting rid of the extra clone(). To be honest, if I was just going to do this, I should've just kept mut membership_content. I had been using that section as a scratchpad for testing, and left it in. It doesn't look like there is anything we can do with the json object, other than to turn it into a string using json.json().get(). If we are going to deserialize, modify, serialize, I think using the existing deserialized object makes sense (without the extra clone), but I will 100% do it your way (or any maintainer). I'm not here to be stubborn.

I'm planning on getting rid of the extra `clone()`. To be honest, if I was just going to do this, I should've just kept `mut membership_content`. I had been using that section as a scratchpad for testing, and left it in. It doesn't look like there is anything we can do with the `json` object, other than to turn it into a string using `json.json().get()`. If we are going to deserialize, modify, serialize, I think using the existing deserialized object makes sense (without the extra clone), but I will 100% do it your way (or any maintainer). I'm not here to be stubborn.
Partha commented 2026-03-22 01:35:29 +00:00
Author
Contributor
Copy link

I'm going to continue studying, but I'm tempted to go for a raw string manipulation solution. Almost everything I've seen deserialises into a map and calls remove() (it's just hidden from plain sight), and not really offering any performance benefit over the struct we already have. A better solution might involve manual parsing.

I'm going to continue studying, but I'm tempted to go for a raw string manipulation solution. Almost everything I've seen deserialises into a map and calls `remove()` (it's just hidden from plain sight), and not really offering any performance benefit over the struct we already have. A better solution might involve manual parsing.
Partha marked this conversation as resolved
Partha force-pushed bugfix/1542-room-member-strip from 187302a608
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m49s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 12m40s
Details
to d43fe24be6
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m0s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 12m41s
Details
2026-03-20 22:51:04 +00:00 Compare
Partha force-pushed bugfix/1542-room-member-strip from 7f3bd8e978
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 4m3s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 13m34s
Details
to bfb581423e
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m12s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-03-21 23:06:46 +00:00 Compare
trashpanda reviewed 2026-03-22 05:49:51 +00:00
src/api/client/state/tests.rs Outdated
@ -0,0 +1,34 @@
use super::*;
#[test]
fn test_strip_room_member() -> Result<()> {
trashpanda commented 2026-03-22 05:49:12 +00:00
Contributor
Copy link

This test seems a bit superfluous, you're not really testing anything.

This test seems a bit superfluous, you're not really testing anything.
Partha commented 2026-03-22 06:22:00 +00:00
Author
Contributor
Copy link

I want to remove this before it gets pulled into main, but this is my best idea to show that a particular couple of lines do work, as intended. Otherwise, I would have to use "Just trust me", as an argument. I don't think I would find that very convincing. But yeah, definitely shouldn't get pushed to main.

I want to remove this before it gets pulled into main, but this is my best idea to show that a particular couple of lines do work, as intended. Otherwise, I would have to use "Just trust me", as an argument. I don't think I would find that very convincing. But yeah, definitely shouldn't get pushed to main.
Partha marked this conversation as resolved
Partha force-pushed bugfix/1542-room-member-strip from b04bbb3fae
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m47s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 18m20s
Details
to dd106f2185
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m0s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 11m17s
Details
2026-03-23 19:55:26 +00:00 Compare
Partha requested review from nex 2026-03-23 20:41:40 +00:00
Jade approved these changes 2026-03-23 20:49:51 +00:00
Jade left a comment
Owner
Copy link

Seems OK to me. Pays the cost of an additional serialisation in this case but that's totally fine.

Seems OK to me. Pays the cost of an additional serialisation in this case but that's totally fine.
src/api/client/state.rs Outdated
@ -222,3 +225,3 @@
event_type: &StateEventType,
state_key: &str,
json: &Raw<AnyStateEventContent>,
json: &mut Raw<AnyStateEventContent>,
Jade commented 2026-03-23 20:49:00 +00:00
Owner
Copy link

🍣

🍣
Partha marked this conversation as resolved
Partha force-pushed bugfix/1542-room-member-strip from dd106f2185
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m0s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 11m17s
Details
to de74a8335e
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m5s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 25m19s
Details
2026-03-23 21:15:32 +00:00 Compare
nex approved these changes 2026-03-23 23:42:45 +00:00
ginger approved these changes 2026-03-24 13:11:20 +00:00
ginger merged commit b9854662f3 into main 2026-03-24 13:11:26 +00:00
Partha deleted branch bugfix/1542-room-member-strip 2026-03-26 17:12:37 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Jade
nex
ginger
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
5 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!1547
No description provided.