From 3d446f3ff6effb87da2e2a9df0e2c7ba9073e154 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 30 Aug 2018 09:00:21 +0900
Subject: SyncJob: Add account_data to left rooms

Closes #240.
---
 lib/jobs/syncjob.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/jobs')

diff --git a/lib/jobs/syncjob.cpp b/lib/jobs/syncjob.cpp
index 02690e6d..9cbac71b 100644
--- a/lib/jobs/syncjob.cpp
+++ b/lib/jobs/syncjob.cpp
@@ -130,10 +130,10 @@ SyncRoomData::SyncRoomData(const QString& roomId_, JoinState joinState_,
     switch (joinState) {
         case JoinState::Join:
             ephemeral = load<Events>(room_, "ephemeral"_ls);
-            accountData = load<Events>(room_, "account_data"_ls);
             FALLTHROUGH;
         case JoinState::Leave:
         {
+            accountData = load<Events>(room_, "account_data"_ls);
             timeline = load<RoomEvents>(room_, "timeline"_ls);
             const auto timelineJson = room_.value("timeline"_ls).toObject();
             timelineLimited = timelineJson.value("limited"_ls).toBool();
-- 
cgit v1.2.3


From 343341e1422251a863149cad515b955aae395569 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 15 Sep 2018 19:34:53 +0900
Subject: BaseJob::rawData: only add "truncated" when actually truncated

---
 lib/jobs/basejob.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/jobs')

diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index f9628c19..979fa431 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -514,7 +514,7 @@ BaseJob::Status BaseJob::status() const
 
 QByteArray BaseJob::rawData(int bytesAtMost) const
 {
-    return bytesAtMost > 0 ?
+    return bytesAtMost > 0 && d->rawResponse.size() > bytesAtMost ?
         d->rawResponse.left(bytesAtMost) + "...(truncated)" : d->rawResponse;
 }
 
-- 
cgit v1.2.3