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

Patch up Matrix.Event.RoomHistoryVisibility

Browse Source 
* Require an empty state_key
This commit is contained in:
Gergely Polonkai
2016-03-09 15:35:13 +01:00
committed by Gergely Polonkai
parent 969d9d27ea
commit 7817fb68f6
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/matrix-event-room-history-visibility.vala
View File

@@ -36,9 +36,15 @@ public class Matrix.Event.RoomHistoryVisibility : 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 = null;
if (Config.DEBUG && ((node = root.get_member("state_key")) != null)) {
if (node.get_string() != "") {
warning("state_key of a m.room.history_visibility event is non-empty");
}
}
if ((node = content_root.get_member("history_visibility")) != null) { if ((node = content_root.get_member("history_visibility")) != null) {
Matrix.HistoryVisibility? vis = (Matrix.HistoryVisibility?)_g_enum_nick_to_value( Matrix.HistoryVisibility? vis = (Matrix.HistoryVisibility?)_g_enum_nick_to_value(
@@ -62,6 +68,11 @@ public class Matrix.Event.RoomHistoryVisibility : Matrix.Event.State {
var content_root = json_data.get_object() var content_root = json_data.get_object()
.get_member("content").get_object(); .get_member("content").get_object();
if (_state_key != "") {
throw new Matrix.Error.INCOMPLETE(
"Won't generate a m.room.history_visibility event with a non-empty state key");
}
if (visibility == Matrix.HistoryVisibility.UNKNOWN) { if (visibility == Matrix.HistoryVisibility.UNKNOWN) {
throw new Matrix.Error.UNKNOWN_VALUE( throw new Matrix.Error.UNKNOWN_VALUE(
"Won't send m.room.history_visibility event with unknown visibility value"); "Won't send m.room.history_visibility event with unknown visibility value");