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

Patch up Matrix.Event.RoomCanonicalAlias

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

20
src/matrix-event-room-canonical-alias.vala
View File

@ -24,15 +24,24 @@
* as suggestion to users which alias to use to advertise the room. * as suggestion to users which alias to use to advertise the room.
*/ */
public class Matrix.Event.RoomCanonicalAlias : Matrix.Event.State { public class Matrix.Event.RoomCanonicalAlias : Matrix.Event.State {
/**
* The canonical alias.
*/
public string? canonical_alias { get; set; default = null; } public string? canonical_alias { get; set; default = null; }
protected override void protected override void
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.canonical_alias event is non-empty");
}
}
if ((node = content_root.get_member("alias")) != null) { if ((node = content_root.get_member("alias")) != null) {
_canonical_alias = node.get_string(); _canonical_alias = node.get_string();
@ -48,6 +57,11 @@ public class Matrix.Event.RoomCanonicalAlias : 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.canonical_alias event with a non-empty state_key");
}
if (_canonical_alias != null) { if (_canonical_alias != null) {
content_root.set_string_member("alias", _canonical_alias); content_root.set_string_member("alias", _canonical_alias);
} }