diff options
| author | Timo Kösters <timo@koesters.xyz> | 2023-08-10 17:01:56 +0000 |
|---|---|---|
| committer | Timo Kösters <timo@koesters.xyz> | 2023-08-10 17:01:56 +0000 |
| commit | 0c2cfda3ae923d9e922d5edf379e4d8976a52d4e (patch) | |
| tree | a8a8ecddf12f8ea183fc8f9948d8483648b9e187 /src/api/client_server/profile.rs | |
| parent | 53f14a2c4c216b529cc63137d8704573197aed19 (diff) | |
| parent | 4bf8ee1f7481a222efe87235fa400f6cd14ebd11 (diff) | |
| download | conduit-0c2cfda3ae923d9e922d5edf379e4d8976a52d4e.zip | |
Merge branch 'next' into 'master'v0.6.0
Merge remote-tracking branch 'origin/next'
See merge request famedly/conduit!538
Diffstat (limited to 'src/api/client_server/profile.rs')
| -rw-r--r-- | src/api/client_server/profile.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/api/client_server/profile.rs b/src/api/client_server/profile.rs index 6400e89..8fb38b5 100644 --- a/src/api/client_server/profile.rs +++ b/src/api/client_server/profile.rs @@ -9,7 +9,7 @@ use ruma::{ }, federation::{self, query::get_profile_information::v1::ProfileField}, }, - events::{room::member::RoomMemberEventContent, RoomEventType, StateEventType}, + events::{room::member::RoomMemberEventContent, StateEventType, TimelineEventType}, }; use serde_json::value::to_raw_value; use std::sync::Arc; @@ -37,7 +37,7 @@ pub async fn set_displayname_route( .map(|room_id| { Ok::<_, Error>(( PduBuilder { - event_type: RoomEventType::RoomMember, + event_type: TimelineEventType::RoomMember, content: to_raw_value(&RoomMemberEventContent { displayname: body.displayname.clone(), ..serde_json::from_str( @@ -172,7 +172,7 @@ pub async fn set_avatar_url_route( .map(|room_id| { Ok::<_, Error>(( PduBuilder { - event_type: RoomEventType::RoomMember, + event_type: TimelineEventType::RoomMember, content: to_raw_value(&RoomMemberEventContent { avatar_url: body.avatar_url.clone(), ..serde_json::from_str( |