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

Patch up Matrix.Event.RoomAvatar

Browse Source 
* Require an empty state key
This commit is contained in:
Gergely Polonkai 2016-03-09 15:12:48 +01:00 committed by Gergely Polonkai
parent ddf3fccbaa
commit a68afb1efb
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/matrix-event-room-avatar.vala
View File

@ -47,10 +47,20 @@ public class Matrix.Event.RoomAvatar : Matrix.Event.State {
from_json(Json.Node json_data) from_json(Json.Node json_data)
throws Matrix.Error throws Matrix.Error
{ {
var content_root = json_data.get_object() var root = json_data.get_object();
.get_member("content").get_object(); var content_root = root.get_member("content").get_object();
Json.Node? node; Json.Node? node;
if (Config.DEBUG) {
if ((node = root.get_member("state_key")) != null) {
var sk = node.get_string();
if (sk != "") {
warning("state_key of a m.room.avatar event is non-empty");
}
}
}
if ((node = content_root.get_member("url")) != null) { if ((node = content_root.get_member("url")) != null) {
_url = node.get_string(); _url = node.get_string();
} else { } else {
@ -131,8 +141,13 @@ public class Matrix.Event.RoomAvatar : Matrix.Event.State {
"Won't generate a m.room.avatar event without url"); "Won't generate a m.room.avatar event without url");
} }
var content_root = json_data.get_object() var root = json_data.get_object();
.get_member("content").get_object(); var content_root = root.get_member("content").get_object();
if (_state_key != "") {
throw new Matrix.Error.INCOMPLETE(
"Won't generate a m.room.avatar event with a non-empty state_key");
}
content_root.set_string_member("url", _url); content_root.set_string_member("url", _url);