rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow handling of incomplete /sync responses

Browse Source 
matrix-org/synapse#2358 proposes a change to only contain objects
in the sync stream where values get updated.
The current behavior leads nheko to fail when that is used.

This PR makes nheko compatible to that
This commit is contained in:
Krombel 2017-09-23 15:25:01 +02:00
parent ed5a96341b
commit 6746d5e53c
1 changed files with 112 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
src/Sync.cc
View File

@ -32,13 +32,45 @@ SyncResponse::deserialize(const QJsonDocument &data)
QJsonObject object = data.object(); QJsonObject object = data.object();
if (object.value("next_batch") == QJsonValue::Undefined) if (!object.contains("next_batch"))
throw DeserializationException("Sync: missing next_batch parameter"); throw DeserializationException("Sync: missing next_batch parameter");
if (object.value("rooms") == QJsonValue::Undefined) if (object.contains("rooms")) {
throw DeserializationException("Sync: missing rooms parameter"); if (!object.value("rooms").isObject()) {
throw DeserializationException("Sync: rooms is not a JSON object");
}
rooms_.deserialize(object.value("rooms"));
}
if (object.contains("presence")) {
if (!object.value("presence").isObject()) {
throw DeserializationException("Sync: presence is not a JSON object");
}
//TODO: implement presence handling
}
if (object.contains("account_data")) {
if (!object.value("account_data").isObject()) {
throw DeserializationException("Sync: account_data is not a JSON object");
}
//TODO: implement account_data handling
}
if (object.contains("to_device")) {
if (!object.value("to_device").isObject()) {
throw DeserializationException("Sync: to_device is not a JSON object");
}
//TODO: implement to_device handling
}
// for device_lists updates (for e2e)
if (object.contains("device_lists")) {
if (!object.value("device_lists").isObject()) {
throw DeserializationException("Sync: device_lists is not a JSON object");
}
//TODO: implement device_lists handling
}
rooms_.deserialize(object.value("rooms"));
next_batch_ = object.value("next_batch").toString(); next_batch_ = object.value("next_batch").toString();
} }
@ -50,37 +82,38 @@ Rooms::deserialize(const QJsonValue &data)
QJsonObject object = data.toObject(); QJsonObject object = data.toObject();
if (!object.contains("join")) if (object.contains("join")) {
throw DeserializationException("rooms/join is missing"); if (!object.value("join").isObject())
throw DeserializationException("rooms/join must be a JSON object");
if (!object.contains("invite")) auto join = object.value("join").toObject();
throw DeserializationException("rooms/invite is missing");
if (!object.contains("leave")) for (auto it = join.constBegin(); it != join.constEnd(); it++) {
throw DeserializationException("rooms/leave is missing"); JoinedRoom tmp_room;
if (!object.value("join").isObject()) try {
throw DeserializationException("rooms/join must be a JSON object"); tmp_room.deserialize(it.value());
join_.insert(it.key(), tmp_room);
if (!object.value("invite").isObject()) } catch (DeserializationException &e) {
throw DeserializationException("rooms/invite must be a JSON object"); qWarning() << e.what();
qWarning() << "Skipping malformed object for room" << it.key();
if (!object.value("leave").isObject()) }
throw DeserializationException("rooms/leave must be a JSON object");
auto join = object.value("join").toObject();
for (auto it = join.constBegin(); it != join.constEnd(); it++) {
JoinedRoom tmp_room;
try {
tmp_room.deserialize(it.value());
join_.insert(it.key(), tmp_room);
} catch (DeserializationException &e) {
qWarning() << e.what();
qWarning() << "Skipping malformed object for room" << it.key();
} }
} }
if (object.contains("invite")) {
if (!object.value("invite").isObject()) {
throw DeserializationException("rooms/invite must be a JSON object");
}
//TODO: Implement invite handling
}
if (object.contains("leave")) {
if (!object.value("leave").isObject()) {
throw DeserializationException("rooms/leave must be a JSON object");
}
//TODO: Implement leave handling
}
} }
void void
@ -91,28 +124,62 @@ JoinedRoom::deserialize(const QJsonValue &data)
QJsonObject object = data.toObject(); QJsonObject object = data.toObject();
if (!object.contains("state")) if (object.contains("state")) {
throw DeserializationException("join/state is missing"); if (!object.value("state").isObject()) {
throw DeserializationException("join/state should be an object");
}
if (!object.contains("timeline")) QJsonObject state = object.value("state").toObject();
throw DeserializationException("join/timeline is missing");
if (!object.contains("account_data")) if (state.contains("events")) {
throw DeserializationException("join/account_data is missing"); if (!state.value("events").isArray()) {
throw DeserializationException("join/state/events should be an array");
}
if (!object.contains("unread_notifications")) state_.deserialize(state.value("events"));
throw DeserializationException("join/unread_notifications is missing"); }
}
if (!object.value("state").isObject()) if (object.contains("timeline")) {
throw DeserializationException("join/state should be an object"); if (!object.value("timeline").isObject())
throw DeserializationException("join/timeline should be an object");
timeline_.deserialize(object.value("timeline"));
}
QJsonObject state = object.value("state").toObject(); if (object.contains("ephemeral")) {
if (!object.value("ephemeral").isObject())
throw DeserializationException("join/ephemeral should be an object");
if (!state.contains("events")) QJsonObject ephemeral = object.value("ephemeral").toObject();
throw DeserializationException("join/state/events is missing");
state_.deserialize(state.value("events")); if (ephemeral.contains("events")) {
timeline_.deserialize(object.value("timeline")); if (!ephemeral.value("events").isArray())
qWarning() << "join/ephemeral/events should be an array";
//TODO: Implement ephemeral handling
}
}
if (object.contains("account_data")) {
if (!object.value("account_data").isObject())
throw DeserializationException("join/account_data is not a JSON object");
//TODO: Implement account_data handling
}
if (object.contains("unread_notifications")) {
if (!object.value("unread_notifications").isObject()) {
throw DeserializationException("join/unread_notifications is not a JSON object");
}
QJsonObject unreadNotifications = object.value("unread_notifications").toObject();
if (unreadNotifications.contains("highlight_count")) {
//TODO: Implement unread_notifications handling
}
if (unreadNotifications.contains("notification_count")) {
//TODO: Implement unread_notifications handling
}
}
} }
void void