Skip to content

refactor(base): Remove the event_id field of PredecessorRoom #5419

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 17, 2025
Merged

refactor(base): Remove the event_id field of PredecessorRoom #5419

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd686f4
refactor(base): Remove the event_id field of PredecessorRoom
zecakeh Jul 17, 2025
313017e
Add changelogs
zecakeh Jul 17, 2025
96e20ba
Move changelog entry to the top
zecakeh Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions bindings/matrix-sdk-ffi/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ All notable changes to this project will be documented in this file.
- `ClientBuilder::build_with_qr_code` has been removed. Instead, the Client should be built by passing
`QrCodeData::server_name` to `ClientBuilder::server_name_or_homeserver_url`, after which QR login can be performed by
calling `Client::login_with_qr_code`. ([#5388](https://github.com/matrix-org/matrix-rust-sdk/pull/5388))
- The `event_id` field of `PredecessorRoom` was removed, due to its removal in the Matrix
specification with MSC4291.
([#5419](https://github.com/matrix-org/matrix-rust-sdk/pull/5419))

## [0.13.0] - 2025-07-10

Expand Down
5 changes: 1 addition & 4 deletions bindings/matrix-sdk-ffi/src/room/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,13 +1504,10 @@ impl From<SdkSuccessorRoom> for SuccessorRoom {
pub struct PredecessorRoom {
/// The ID of the replacement room.
pub room_id: String,

/// The event ID of the last known event in the predecesssor room.
pub last_event_id: String,
}

impl From<SdkPredecessorRoom> for PredecessorRoom {
fn from(value: SdkPredecessorRoom) -> Self {
Self { room_id: value.room_id.to_string(), last_event_id: value.last_event_id.to_string() }
Self { room_id: value.room_id.to_string() }
}
}
9 changes: 7 additions & 2 deletions crates/matrix-sdk-base/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ All notable changes to this project will be documented in this file.
inviter.
([#5390](https://github.com/matrix-org/matrix-rust-sdk/pull/5390))

### Refactor
- [**breaking**] The `event_id` field of `PredecessorRoom` was removed, due to
its removal in the Matrix specification with MSC4291.
([#5419](https://github.com/matrix-org/matrix-rust-sdk/pull/5419))

## [0.13.0] - 2025-07-10

### Features
Expand Down Expand Up @@ -59,8 +64,8 @@ No notable changes in this release.
- `EventCacheStoreMedia` has a new method `last_media_cleanup_time_inner`
- There are new `'static` bounds in `MediaService` for the media cache stores
- `event_cache::store::MemoryStore` implements `Clone`.
- `BaseClient` now has a `handle_verification_events` field which is `true` by
default and can be negated so the `NotificationClient` won't handle received
- `BaseClient` now has a `handle_verification_events` field which is `true` by
default and can be negated so the `NotificationClient` won't handle received
verification events too, causing errors in the `VerificationMachine`.
- [**breaking**] `Room::is_encryption_state_synced` has been removed
([#4777](https://github.com/matrix-org/matrix-rust-sdk/pull/4777))
Expand Down
15 changes: 4 additions & 11 deletions crates/matrix-sdk-base/src/room/tombstone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

use std::ops::Not;

use ruma::{events::room::tombstone::RoomTombstoneEventContent, OwnedEventId, OwnedRoomId};
use ruma::{events::room::tombstone::RoomTombstoneEventContent, OwnedRoomId};

use super::Room;

Expand Down Expand Up @@ -67,12 +67,9 @@ impl Room {
/// [`m.room.tombstone`]: https://spec.matrix.org/v1.14/client-server-api/#mroomtombstone
/// [`m.room.create`]: https://spec.matrix.org/v1.14/client-server-api/#mroomcreate
pub fn predecessor_room(&self) -> Option<PredecessorRoom> {
self.create_content().and_then(|content_event| content_event.predecessor).map(
|predecessor| PredecessorRoom {
room_id: predecessor.room_id,
last_event_id: predecessor.event_id,
},
)
self.create_content()
.and_then(|content_event| content_event.predecessor)
.map(|predecessor| PredecessorRoom { room_id: predecessor.room_id })
}
}

Expand Down Expand Up @@ -104,9 +101,6 @@ pub struct SuccessorRoom {
pub struct PredecessorRoom {
/// The ID of the old room.
pub room_id: OwnedRoomId,

/// The event ID of the last known event in the predecesssor room.
pub last_event_id: OwnedEventId,
}

#[cfg(test)]
Expand Down Expand Up @@ -252,7 +246,6 @@ mod tests {
assert!(room.create_content().is_some());
assert_matches!(room.predecessor_room(), Some(predecessor_room) => {
assert_eq!(predecessor_room.room_id, predecessor_room_id);
assert_eq!(predecessor_room.last_event_id, predecessor_last_event_id);
});
}
}
Loading