mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Comments for why we don't json.marshal the InputRoomEvent directly

Browse source
This commit is contained in:
Mark Haines 2017-02-22 15:21:14 +00:00
parent 1082b2adf3
commit e7f859978a
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/roomserver/api/input.go
View file

@ -50,6 +50,8 @@ type InputRoomEvent struct {
// UnmarshalJSON implements json.Unmarshaller // UnmarshalJSON implements json.Unmarshaller
func (ire *InputRoomEvent) UnmarshalJSON(data []byte) error { func (ire *InputRoomEvent) UnmarshalJSON(data []byte) error {
// Create a struct rather than unmarshalling directly into the InputRoomEvent
// so that we can use json.RawMessage.
var content struct { var content struct {
Kind int Kind int
Event *json.RawMessage Event *json.RawMessage
@ -72,6 +74,8 @@ func (ire *InputRoomEvent) UnmarshalJSON(data []byte) error {
// MarshalJSON implements json.Marshaller // MarshalJSON implements json.Marshaller
func (ire InputRoomEvent) MarshalJSON() ([]byte, error) { func (ire InputRoomEvent) MarshalJSON() ([]byte, error) {
// Create a struct rather than marshalling directly from the InputRoomEvent
// so that we can use json.RawMessage.
event := json.RawMessage(ire.Event) event := json.RawMessage(ire.Event)
content := struct { content := struct {
Kind int Kind int