diff --git a/ruma-client-api/src/r0/sync/sync_events.rs b/ruma-client-api/src/r0/sync/sync_events.rs index 0ca7e9df..13a04a4c 100644 --- a/ruma-client-api/src/r0/sync/sync_events.rs +++ b/ruma-client-api/src/r0/sync/sync_events.rs @@ -4,6 +4,7 @@ use std::{collections::BTreeMap, time::Duration}; use js_int::UInt; use ruma_api::ruma_api; +use ruma_common::presence::PresenceState; use ruma_events::{ presence::PresenceEvent, AnyBasicEvent, AnyEphemeralRoomEvent, AnyRoomEventStub, AnyStateEventStub, AnyStrippedStateEventStub, AnyToDeviceEvent, EventJson, @@ -92,10 +93,8 @@ ruma_api! { error: crate::Error } -pub use ruma_common::presence::PresenceState; - -#[deprecated = "use `PresenceState` instead"] -pub use self::PresenceState as SetPresence; +#[deprecated = "use `presence::PresenceState` from `ruma` or `ruma-common` instead"] +pub use ruma_common::presence::PresenceState as SetPresence; /// A filter represented either as its full JSON definition or the ID of a saved filter. #[derive(Clone, Debug, Deserialize, Serialize)] diff --git a/ruma-events/CHANGELOG.md b/ruma-events/CHANGELOG.md index c945dedf..a561e4f6 100644 --- a/ruma-events/CHANGELOG.md +++ b/ruma-events/CHANGELOG.md @@ -15,6 +15,10 @@ Improvements: * Add `room::MessageFormat` and `room::FormattedBody` +Deprecations: + +* `presence::PresenceState` has been moved. Import it from `ruma` or `ruma-common`. + # 0.21.3 Bug fixes: diff --git a/ruma-events/src/presence.rs b/ruma-events/src/presence.rs index 033d9e45..fa36e754 100644 --- a/ruma-events/src/presence.rs +++ b/ruma-events/src/presence.rs @@ -3,11 +3,13 @@ //! The only content valid for this event is `PresenceEventContent. use js_int::UInt; -pub use ruma_common::presence::PresenceState; use ruma_events_macros::{Event, EventContent}; use ruma_identifiers::UserId; use serde::{Deserialize, Serialize}; +#[deprecated = "use `presence::PresenceState` from `ruma` or `ruma-common` instead"] +pub use ruma_common::presence::PresenceState; + /// Presence event. #[derive(Clone, Debug, Event)] pub struct PresenceEvent {