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

Use DeviceId identifier consistently.

Browse Source
This commit is contained in:
Isaiah Inuwa 2019-12-24 10:15:56 -05:00
parent d025c3e26e
commit 16a8aa70d6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/r0/account/register.rs
View File

@ -1,7 +1,7 @@
//! [POST /_matrix/client/r0/register](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-register)
use ruma_api::ruma_api;
use ruma_identifiers::UserId;
use ruma_identifiers::{DeviceId, UserId};
use serde::{Deserialize, Serialize};
use super::AuthenticationData;
@ -37,7 +37,7 @@ ruma_api! {
/// If this does not correspond to a known client device, a new device will be created.
/// The server will auto-generate a device_id if this is not specified.
#[serde(skip_serializing_if = "Option::is_none")]
pub device_id: Option<String>,
pub device_id: Option<DeviceId>,
/// A display name to assign to the newly-created device.
///
/// Ignored if `device_id` corresponds to a known device.
@ -71,7 +71,7 @@ ruma_api! {
/// ID of the registered device.
///
/// Will be the same as the corresponding parameter in the request, if one was specified.
pub device_id: String,
pub device_id: DeviceId,
}
}

4
src/r0/session/login.rs
View File

@ -1,7 +1,7 @@
//! [POST /_matrix/client/r0/login](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-login)
use ruma_api::ruma_api;
use ruma_identifiers::UserId;
use ruma_identifiers::{DeviceId, UserId};
use serde::{Deserialize, Serialize};
ruma_api! {
@ -30,7 +30,7 @@ ruma_api! {
pub address: Option<String>,
/// ID of the client device
#[serde(skip_serializing_if = "Option::is_none")]
pub device_id: Option<String>,
pub device_id: Option<DeviceId>,
}
response {