serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-28 13:33:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix custom account data serialization (#165)

Browse source 
Stylistic change

Fix custom data serialization

Build a custom event before storing global account data

Co-authored-by: Guillem Nieto <gnieto.talo@gmail.com>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/165
Reviewed-by: Timo Kösters <timo@koesters.xyz>
This commit is contained in:
gnieto 2020-07-29 07:48:34 +02:00 committed by Timo Kösters
parent c4260bde81
commit cc411c530b
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/client_server.rs
View file

@ -67,11 +67,12 @@ use ruma::{
unversioned::get_supported_versions,
},
events::{
custom::CustomEventContent,
room::{
canonical_alias, guest_access, history_visibility, join_rules, member, name, redaction,
topic,
},
AnyEphemeralRoomEvent, AnyEvent, AnySyncEphemeralRoomEvent, EventType,
AnyEphemeralRoomEvent, AnyEvent, AnySyncEphemeralRoomEvent, BasicEvent, EventType,
},
Raw, RoomAliasId, RoomId, RoomVersionId, UserId,
};
@ -601,8 +602,13 @@ pub fn set_global_account_data_route(
db.account_data.update(
None,
user_id,
EventType::Custom(event_type),
&content,
event_type.clone().into(),
&BasicEvent {
content: CustomEventContent {
event_type,
json: content,
},
},
&db.globals,
)?;