From f24d51c38dfe2dea54ef5120829cd6bdbbfd16f7 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Thu, 6 Sep 2018 23:08:20 -0700 Subject: [PATCH] modules/client/sync: The structure sent from a longpoll has no need for a `state`, only `timeline`. --- modules/client/sync.cc | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/modules/client/sync.cc b/modules/client/sync.cc index 2793f453c..642c342c4 100644 --- a/modules/client/sync.cc +++ b/modules/client/sync.cc @@ -291,30 +291,8 @@ ircd::m::sync::longpoll::sync_room(client &client, }; const m::event &event{accepted}; - - std::vector state; - if(defined(json::get<"event_id"_>(event)) && defined(json::get<"state_key"_>(event))) - { - json::strung strung(event); - if(accepted.copts && accepted.copts->client_txnid) - strung = json::insert(strung, json::member - { - "unsigned", json::members - { - { "transaction_id", accepted.copts->client_txnid } - } - }); - - state.emplace_back(std::move(strung)); - } - - const json::strung state_serial - { - state.data(), state.data() + state.size() - }; - std::vector timeline; - if(defined(json::get<"event_id"_>(event)) && !defined(json::get<"state_key"_>(event))) + if(defined(json::get<"event_id"_>(event))) { json::strung strung(event); if(accepted.copts && accepted.copts->client_txnid) @@ -376,10 +354,6 @@ ircd::m::sync::longpoll::sync_room(client &client, { { "events", ephemeral_serial }, }}, - { "state", - { - { "events", state_serial } - }}, { "timeline", { { "events", timeline_serial },