client_exchange: Use room messages to send out to-device events.

This commit is contained in:
Damir Jelić 2020-04-08 19:45:42 +02:00
parent 3385470dd5
commit 24b9ea7dc9
2 changed files with 6 additions and 4 deletions

View File

@ -21,6 +21,8 @@ Breaking changes:
* `server::get_user_info::ConnectionInfo` * `server::get_user_info::ConnectionInfo`
* `device::Device` * `device::Device`
* Change all usages of `HashMap` to `BTreeMap` * Change all usages of `HashMap` to `BTreeMap`
* Change the messages type that gets sent out using the `r0::client_exchange::send_event_to_device`
request.
Improvements: Improvements:

View File

@ -3,7 +3,7 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use ruma_api::ruma_api; use ruma_api::ruma_api;
use ruma_events::{collections::all, EventResult}; use ruma_events::{room::message::MessageEventContent, EventResult, EventType};
use ruma_identifiers::UserId; use ruma_identifiers::UserId;
use super::DeviceIdOrAllDevices; use super::DeviceIdOrAllDevices;
@ -21,15 +21,15 @@ ruma_api! {
request { request {
/// Type of event being sent to each device. /// Type of event being sent to each device.
#[ruma_api(path)] #[ruma_api(path)]
pub event_type: String, pub event_type: EventType,
/// A request identifier unique to the access token used to send the request. /// A request identifier unique to the access token used to send the request.
#[ruma_api(path)] #[ruma_api(path)]
pub txn_id: String, pub txn_id: String,
/// A map of users to devices to a message event to be sent to the user's /// A map of users to devices to a message event to be sent to the user's
/// device. Individual message events can be sent to devices, but all /// device. Individual message events can be sent to devices, but all
/// events must be of the same type. /// events must be of the same type.
#[wrap_incoming(all::Event with EventResult)] #[wrap_incoming(MessageEventContent with EventResult)]
pub messages: BTreeMap<UserId, BTreeMap<DeviceIdOrAllDevices, all::Event>> pub messages: BTreeMap<UserId, BTreeMap<DeviceIdOrAllDevices, MessageEventContent>>
} }
response {} response {}