Merge pull request #14 from MonokelPinguin/fix-travis

Fix CI issues w/ mtxclient.  Thanks to @MonokelPinguin 

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

lib/structs/responses/sync.cpp

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