gergely/matrix-glib-sdk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch up Matrix.Event.Base

Browse Source 
* Require event_type to be present
This commit is contained in:
Gergely Polonkai 2016-03-09 17:34:39 +01:00 committed by Gergely Polonkai
parent a33e3cf6b2
commit ddf2165cc2
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/matrix-event-base.vala
View File

@ -144,7 +144,16 @@ public abstract class Matrix.Event.Base : GLib.Object, GLib.Initable {
public virtual void public virtual void
from_json(Json.Node json_data) from_json(Json.Node json_data)
throws Matrix.Error throws Matrix.Error
{} {
var root = json_data.get_object();
Json.Node? node;
if ((node = root.get_member("type")) != null) {
_event_type = node.get_string();
} else if (Config.DEBUG) {
warning("type is not present in an event");
}
}
/** /**
* Subclasses should implement this to export their data to JSON. * Subclasses should implement this to export their data to JSON.
@ -153,11 +162,14 @@ public abstract class Matrix.Event.Base : GLib.Object, GLib.Initable {
to_json(Json.Node json_data) to_json(Json.Node json_data)
throws Matrix.Error throws Matrix.Error
{ {
Json.Object root = json_data.get_object(); var root = json_data.get_object();
if (event_type != null) { if (_event_type == null) {
root.set_string_member("type", event_type); throw new Matrix.Error.INCOMPLETE(
"Won't generate an event without type");
} }
root.set_string_member("type", _event_type);
} }
public static Base? public static Base?