Merge remote-tracking branch 'origin/master' into crypto-updates

Dockerfile

@@ -69,6 +69,7 @@ RUN \
     cd olm && mkdir -p cmake && \
     git checkout ${OLM_VERSION} && \
     curl -L https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/deps/cmake/OlmCMakeLists.txt -o CMakeLists.txt && \
+    mkdir -p cmake && \
     curl -L https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/deps/cmake/OlmConfig.cmake.in -o cmake/OlmConfig.cmake.in && \
     cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release && \
     cmake --build build --target install && \

appveyor.yml

@@ -16,6 +16,7 @@ install:
     - set PATH=%PATH%;C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
     - mingw32-make.exe --version
     - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+    - cd "C:\Tools\vcpkg"&& git pull && .\bootstrap-vcpkg.bat && cd %APPVEYOR_BUILD_FOLDER%
     - vcpkg install
             nlohmann-json:%PLATFORM%-windows
             boost-asio:%PLATFORM%-windows

include/mtxclient/crypto/objects.hpp

@@ -8,18 +8,15 @@ namespace crypto {
 
 struct OlmDeleter
 {
-        void operator()(OlmAccount *ptr) { operator delete(ptr, olm_account_size()); }
-        void operator()(OlmUtility *ptr) { operator delete(ptr, olm_utility_size()); }
+        void operator()(OlmAccount *ptr) { delete[](reinterpret_cast<uint8_t *>(ptr)); }
+        void operator()(OlmUtility *ptr) { delete[](reinterpret_cast<uint8_t *>(ptr)); }
 
-        void operator()(OlmSession *ptr) { operator delete(ptr, olm_session_size()); }
+        void operator()(OlmSession *ptr) { delete[](reinterpret_cast<uint8_t *>(ptr)); }
         void operator()(OlmOutboundGroupSession *ptr)
         {
-                operator delete(ptr, olm_outbound_group_session_size());
-        }
-        void operator()(OlmInboundGroupSession *ptr)
-        {
-                operator delete(ptr, olm_inbound_group_session_size());
+                delete[](reinterpret_cast<uint8_t *>(ptr));
         }
+        void operator()(OlmInboundGroupSession *ptr) { delete[](reinterpret_cast<uint8_t *>(ptr)); }
 };
 
 struct UtilityObject

lib/http/session.cpp

 #include "mtxclient/http/session.hpp"
 
+#include <iostream>
+
 using namespace mtx::http;
 
 Session::Session(boost::asio::io_service &ios,

lib/structs/responses/sync.cpp

@@ -68,8 +68,17 @@ from_json(const json &obj, Ephemeral &ephemeral)
                                 auto event_id = it.key();
                                 auto users    = it.value().at("m.read");
 
-                                for (auto uit = users.begin(); uit != users.end(); ++uit)
-                                        user_times.emplace(uit.key(), uit.value().at("ts"));
+                                for (auto uit = users.begin(); uit != users.end(); ++uit) {
+                                        uint64_t ts = 0;
+                                        try {
+                                                ts = uit.value().at("ts");
+                                        } catch (json::type_error &) {
+                                                std::cerr
+                                                  << "mtxclient: Workaround synapse bug #4898, "
+                                                     "ignoring timestamp for m.receipt event\n";
+                                        }
+                                        user_times.emplace(uit.key(), ts);
+                                }
 
                                 receipts.emplace(event_id, user_times);
                         }