chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

federation-api: Use TransactionId for DirectDeviceContent#message_id

Browse Source
This commit is contained in:
Jonas Platte 2022-01-29 02:11:22 +01:00
parent 392cf23d4b
commit 21ef0a3c63
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruma-federation-api/src/transactions/edu.rs
View File

@ -7,7 +7,7 @@ use ruma_common::{
encryption::DeviceKeys, presence::PresenceState, to_device::DeviceIdOrAllDevices, encryption::DeviceKeys, presence::PresenceState, to_device::DeviceIdOrAllDevices,
}; };
use ruma_events::{from_raw_json_value, receipt::Receipt, AnyToDeviceEventContent, EventType}; use ruma_events::{from_raw_json_value, receipt::Receipt, AnyToDeviceEventContent, EventType};
use ruma_identifiers::{DeviceId, EventId, RoomId, UserId}; use ruma_identifiers::{DeviceId, EventId, RoomId, TransactionId, UserId};
use ruma_serde::Raw; use ruma_serde::Raw;
use serde::{de, Deserialize, Serialize}; use serde::{de, Deserialize, Serialize};
use serde_json::{value::RawValue as RawJsonValue, Value as JsonValue}; use serde_json::{value::RawValue as RawJsonValue, Value as JsonValue};
@ -259,7 +259,7 @@ pub struct DirectDeviceContent {
pub ev_type: EventType, pub ev_type: EventType,
/// Unique utf8 string ID for the message, used for idempotency. /// Unique utf8 string ID for the message, used for idempotency.
pub message_id: String, pub message_id: Box<TransactionId>,
/// The contents of the messages to be sent. /// The contents of the messages to be sent.
/// ///
@ -270,7 +270,7 @@ pub struct DirectDeviceContent {
impl DirectDeviceContent { impl DirectDeviceContent {
/// Creates a new `DirectDeviceContent` with the given `sender, `ev_type` and `message_id`. /// Creates a new `DirectDeviceContent` with the given `sender, `ev_type` and `message_id`.
pub fn new(sender: Box<UserId>, ev_type: EventType, message_id: String) -> Self { pub fn new(sender: Box<UserId>, ev_type: EventType, message_id: Box<TransactionId>) -> Self {
Self { sender, ev_type, message_id, messages: DirectDeviceMessages::new() } Self { sender, ev_type, message_id, messages: DirectDeviceMessages::new() }
} }
} }