From e8d619c740b935360055a41f9925bc10c8665948 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 17 Jun 2018 18:18:34 +0100
Subject: [PATCH] Some export bugs fixed.

---
 Telegram/SourceFiles/export/export_api_wrap.cpp      |  7 ++++---
 .../SourceFiles/export/output/export_output_text.cpp | 12 ++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index bf3fc5ceb3eb52..e95abe60c5ede7 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -461,7 +461,7 @@ void ApiWrap::appendDialogsSlice(Data::DialogsInfo &&info) {
 	Expects(_dialogsProcess != nullptr);
 	Expects(_settings != nullptr);
 
-	const auto types = _settings->types | _settings->fullChats;
+	const auto types = _settings->types;
 	auto filtered = ranges::view::all(
 		info.list
 	) | ranges::view::filter([&](const Data::DialogInfo &info) {
@@ -519,7 +519,7 @@ void ApiWrap::requestNextDialog() {
 	Expects(_dialogsProcess->single == nullptr);
 
 	const auto index = ++_dialogsProcess->singleIndex;
-	if (index < 11) {// _dialogsProcess->info.list.size()) {
+	if (index < _dialogsProcess->info.list.size()) {
 		const auto &one = _dialogsProcess->info.list[index];
 		_dialogsProcess->single = std::make_unique<DialogsProcess::Single>(one);
 		_dialogsProcess->startOne(one);
@@ -631,7 +631,8 @@ void ApiWrap::loadNextMessageFile() {
 		}
 		const auto ready = processFileLoad(
 			list[index].file(),
-			[=](const QString &path) { loadMessageFileDone(path); });
+			[=](const QString &path) { loadMessageFileDone(path); },
+			&list[index]);
 		if (!ready) {
 			return;
 		}
diff --git a/Telegram/SourceFiles/export/output/export_output_text.cpp b/Telegram/SourceFiles/export/output/export_output_text.cpp
index 914b5248433997..7d02f988bedf3f 100644
--- a/Telegram/SourceFiles/export/output/export_output_text.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_text.cpp
@@ -34,6 +34,8 @@ void SerializeMultiline(
 		offset = newline + 1;
 		newline = value.indexOf('\n', offset);
 	} while (newline > 0);
+	appendTo.append("> ");
+	appendTo.append(data + offset).append(kLineBreak);
 }
 
 QByteArray JoinList(
@@ -181,15 +183,17 @@ QByteArray SerializeMessage(
 	using SkipReason = Data::File::SkipReason;
 	const auto pushPath = [&](
 			const Data::File &file,
-			const QByteArray &label) {
+			const QByteArray &label,
+			const QByteArray &name = QByteArray()) {
 		Expects(!file.relativePath.isEmpty()
 			|| file.skipReason != SkipReason::None);
 
 		push(label, [&]() -> QByteArray {
+			const auto pre = name.isEmpty() ? QByteArray() : name + ' ';
 			switch (file.skipReason) {
-			case SkipReason::Unavailable: return "(file unavailable)";
-			case SkipReason::FileSize: return "(file too large)";
-			case SkipReason::FileType: return "(file skipped)";
+			case SkipReason::Unavailable: return pre + "(file unavailable)";
+			case SkipReason::FileSize: return pre + "(file too large)";
+			case SkipReason::FileType: return pre + "(file skipped)";
 			case SkipReason::None: return FormatFilePath(file);
 			}
 			Unexpected("Skip reason while writing file path.");