continuwuation/continuwuity
continuwuation/continuwuity
11
32
Fork 29
Code Issues 95 Pull requests 18 Releases 19 Packages 4 Activity Actions

fix: V12 room upgrades #1067

Merged
Jade merged 2 commits from nex/fix/upgrade into main 2025-09-25 08:15:23 +00:00
Conversation 7 Commits 2 Files changed 2 +113 -40
nex commented 2025-09-22 19:45:48 +00:00
Owner
Copy link

allows the /upgrade endpoint (and client commands) to upgrade to v12 rooms kinda

allows the /upgrade endpoint (and client commands) to upgrade to v12 rooms kinda
fix: V12 room upgrades
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Successful in 30s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m13s
Details
Release Docker Image / Build linux-arm64 (release) (pull_request) Successful in 6m16s
Details
Release Docker Image / Build linux-amd64 (release) (pull_request) Successful in 6m34s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 8m3s
Details
Release Docker Image / Create Multi-arch Release Manifest (pull_request) Successful in 11s
Details
Release Docker Image / Build linux-amd64 (max-perf) (pull_request) Successful in 14m54s
Details
Release Docker Image / Build linux-arm64 (max-perf) (pull_request) Successful in 14m4s
Details
Release Docker Image / Create Max-Perf Manifest (pull_request) Successful in 17s
Details
6137cced3b
Jade reviewed 2025-09-22 19:51:51 +00:00
src/api/client/room/upgrade.rs Outdated
@ -100,2 +89,2 @@
drop(state_lock);
let state_lock = services.rooms.state.mutex.lock(&replacement_room).await;
let tombstone_event_id = if room_features.room_ids_as_hashes {
None
Jade commented 2025-09-22 19:51:51 +00:00
Owner
Copy link

This is the thing that's missing right?

This is the thing that's missing right?
nex commented 2025-09-22 19:54:47 +00:00
Author
Owner
Copy link

yeah it previously just forced a new room ID which makes v12 rooms sad because the room Id changedf to the create event id

yeah it previously just forced a new room ID which makes v12 rooms sad because the room Id changedf to the create event id
Jade commented 2025-09-22 19:59:23 +00:00
Owner
Copy link

logic probs needs to look like

  • check perms to sent tombstone event
  • actually make the room
  • send tombstone event

except there's a cyclic dep between tombstone and new room with v12 if we want to link the latest event in the tombstone, and I can't remember what the solution to this was lol

logic probs needs to look like - check perms to sent tombstone event - actually make the room - send tombstone event except there's a cyclic dep between tombstone and new room with v12 if we want to link the latest event in the tombstone, and I can't remember what the solution to this was lol
nex commented 2025-09-22 20:00:35 +00:00
Author
Owner
Copy link

v12 explicitly breaks the previous cyclic thingy by dropping the event reference entirely

v12 explicitly breaks the previous cyclic thingy by dropping the event reference entirely
nex force-pushed nex/fix/upgrade from 6137cced3b
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Successful in 30s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m13s
Details
Release Docker Image / Build linux-arm64 (release) (pull_request) Successful in 6m16s
Details
Release Docker Image / Build linux-amd64 (release) (pull_request) Successful in 6m34s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 8m3s
Details
Release Docker Image / Create Multi-arch Release Manifest (pull_request) Successful in 11s
Details
Release Docker Image / Build linux-amd64 (max-perf) (pull_request) Successful in 14m54s
Details
Release Docker Image / Build linux-arm64 (max-perf) (pull_request) Successful in 14m4s
Details
Release Docker Image / Create Max-Perf Manifest (pull_request) Successful in 17s
Details
to e2a2aef7be
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Successful in 29s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 54s
Details
Release Docker Image / Build linux-amd64 (release) (pull_request) Successful in 5m33s
Details
Release Docker Image / Build linux-arm64 (release) (pull_request) Successful in 6m22s
Details
Release Docker Image / Create Multi-arch Release Manifest (pull_request) Successful in 19s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 8m32s
Details
Release Docker Image / Build linux-amd64 (max-perf) (pull_request) Successful in 23m27s
Details
Release Docker Image / Build linux-arm64 (max-perf) (pull_request) Successful in 24m48s
Details
Release Docker Image / Create Max-Perf Manifest (pull_request) Successful in 11s
Details
2025-09-22 19:51:54 +00:00 Compare
nex requested review from Owners 2025-09-22 19:59:57 +00:00
Jade commented 2025-09-22 20:03:08 +00:00
Owner
Copy link

Are we OK with just not sending tombstones for now then?

Are we OK with just not sending tombstones for now then?
nex commented 2025-09-22 20:04:49 +00:00
Author
Owner
Copy link

no i forgor

no i forgor
nex removed review request for Owners 2025-09-22 20:04:51 +00:00
Jade commented 2025-09-22 20:15:13 +00:00
Owner
Copy link

also CI clippy is being odd but local clippy says:

warning: using `clone` on type `Option<&RoomId>` which implements the `Copy` trait
   --> src/api/client/room/upgrade.rs:102:24
    |
102 |                     replacement_room: replacement_room.clone().unwrap().to_owned(),
    |                                       ^^^^^^^^^^^^^^^^^^^^^^^^ help: try removing the `clone` call: `replacement_room`
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#clone_on_copy
    = note: `-W clippy::clone-on-copy` implied by `-W clippy::complexity`
    = help: to override `-W clippy::complexity` add `#[allow(clippy::clone_on_copy)]`

warning: `conduwuit_api` (lib) generated 1 warning (run `cargo clippy --fix --lib -p conduwuit_api` to apply 1 suggestion)
also CI clippy is being odd but local clippy says: ``` warning: using `clone` on type `Option<&RoomId>` which implements the `Copy` trait --> src/api/client/room/upgrade.rs:102:24 | 102 | replacement_room: replacement_room.clone().unwrap().to_owned(), | ^^^^^^^^^^^^^^^^^^^^^^^^ help: try removing the `clone` call: `replacement_room` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#clone_on_copy = note: `-W clippy::clone-on-copy` implied by `-W clippy::complexity` = help: to override `-W clippy::complexity` add `#[allow(clippy::clone_on_copy)]` warning: `conduwuit_api` (lib) generated 1 warning (run `cargo clippy --fix --lib -p conduwuit_api` to apply 1 suggestion) ```
fix(v12): Create tombstone event on room upgrade
Some checks failed
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m32s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 3m25s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 7m32s
Details
Release Docker Image / Build linux-amd64 (release) (pull_request) Successful in 7m32s
Details
Release Docker Image / Build linux-arm64 (release) (pull_request) Successful in 7m37s
Details
Release Docker Image / Create Multi-arch Release Manifest (pull_request) Successful in 9s
Details
Release Docker Image / Build linux-amd64 (max-perf) (pull_request) Successful in 12m53s
Details
Release Docker Image / Build linux-arm64 (max-perf) (pull_request) Successful in 12m48s
Details
Release Docker Image / Create Max-Perf Manifest (pull_request) Successful in 9s
Details
03c29e19cb
Jade commented 2025-09-23 20:47:09 +00:00
Owner
Copy link

Does that look good to you?

Does that look good to you?
Jade requested review from Owners 2025-09-23 20:56:23 +00:00
nex commented 2025-09-23 21:01:54 +00:00
Author
Owner
Copy link

lgtm, you might wanna run clippy though

lgtm, you might wanna run clippy though
Jade commented 2025-09-23 21:02:02 +00:00
Owner
Copy link

I feel like the clippy cache might be poisoned somehow lol

I feel like the clippy cache might be poisoned somehow lol
nex force-pushed nex/fix/upgrade from 03c29e19cb
Some checks failed
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m32s
Details
Documentation / Build and Deploy Documentation (pull_request) Successful in 3m25s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 7m32s
Details
Release Docker Image / Build linux-amd64 (release) (pull_request) Successful in 7m32s
Details
Release Docker Image / Build linux-arm64 (release) (pull_request) Successful in 7m37s
Details
Release Docker Image / Create Multi-arch Release Manifest (pull_request) Successful in 9s
Details
Release Docker Image / Build linux-amd64 (max-perf) (pull_request) Successful in 12m53s
Details
Release Docker Image / Build linux-arm64 (max-perf) (pull_request) Successful in 12m48s
Details
Release Docker Image / Create Max-Perf Manifest (pull_request) Successful in 9s
Details
to 9d0c89bd04
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Successful in 54s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 1m44s
Details
Release Docker Image / Build linux-amd64 (release) (pull_request) Successful in 5m35s
Details
Release Docker Image / Build linux-arm64 (release) (pull_request) Successful in 5m47s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 6m49s
Details
Release Docker Image / Create Multi-arch Release Manifest (pull_request) Successful in 10s
Details
Release Docker Image / Build linux-amd64 (max-perf) (pull_request) Successful in 12m23s
Details
Release Docker Image / Build linux-arm64 (max-perf) (pull_request) Successful in 12m19s
Details
Release Docker Image / Create Max-Perf Manifest (pull_request) Successful in 9s
Details
2025-09-24 18:22:18 +00:00 Compare
nex added this to the 0.5.0 milestone 2025-09-25 02:11:43 +00:00
Jade merged commit ef84e1bb02 into main 2025-09-25 08:15:23 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
continuwuation/Owners
Labels
Clear labels   
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/Blocked

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

  
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

  
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
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/Blocked
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
To-Merge
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
0.5.0
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 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!1067
No description provided.