Improved html message layout.

Telegram/SourceFiles/export/data/export_data_types.cpp

@@ -20,6 +20,7 @@ QString formatPhone(QString phone);
 } // namespace App
 QString FillAmountAndCurrency(uint64 amount, const QString &currency);
 QString formatSizeText(qint64 size);
+QString formatDurationText(qint64 duration);
 
 namespace Export {
 namespace Data {
@@ -940,19 +941,32 @@ Message ParseMessage(
 		const MTPMessage &data,
 		const QString &mediaFolder) {
 	auto result = Message();
-	data.match([&](const MTPDmessage &data) {
+	data.match([&](const auto &data) {
 		result.id = data.vid.v;
-		const auto peerId = ParsePeerId(data.vto_id);
-		if (IsChatPeerId(peerId)) {
-			result.chatId = BarePeerId(peerId);
+		if constexpr (!MTPDmessageEmpty::Is<decltype(data)>()) {
+			result.toId = ParsePeerId(data.vto_id);
+			const auto peerId = (!data.is_out()
+				&& data.has_from_id()
+				&& data.vto_id.type() == mtpc_peerUser)
+				? UserPeerId(data.vfrom_id.v)
+				: result.toId;
+			if (IsChatPeerId(peerId)) {
+				result.chatId = BarePeerId(peerId);
+			}
+			if (data.has_from_id()) {
+				result.fromId = data.vfrom_id.v;
+			}
+			if (data.has_reply_to_msg_id()) {
+				result.replyToMsgId = data.vreply_to_msg_id.v;
+			}
+			result.date = data.vdate.v;
+			result.out = data.is_out();
 		}
-		result.date = data.vdate.v;
+	});
+	data.match([&](const MTPDmessage &data) {
 		if (data.has_edit_date()) {
 			result.edited = data.vedit_date.v;
 		}
-		if (data.has_from_id()) {
-			result.fromId = data.vfrom_id.v;
-		}
 		if (data.has_fwd_from()) {
 			result.forwardedFromId = data.vfwd_from.match(
 			[](const MTPDmessageFwdHeader &data) {
@@ -963,6 +977,10 @@ Message ParseMessage(
 				}
 				return PeerId(0);
 			});
+			result.forwardedDate = data.vfwd_from.match(
+			[](const MTPDmessageFwdHeader &data) {
+				return data.vdate.v;
+			});
 			result.savedFromChatId = data.vfwd_from.match(
 			[](const MTPDmessageFwdHeader &data) {
 				if (data.has_saved_from_peer()) {
@@ -998,22 +1016,10 @@ Message ParseMessage(
 				? data.ventities.v
 				: QVector<MTPMessageEntity>{}));
 	}, [&](const MTPDmessageService &data) {
-		result.id = data.vid.v;
-		const auto peerId = ParsePeerId(data.vto_id);
-		if (IsChatPeerId(peerId)) {
-			result.chatId = BarePeerId(peerId);
-		}
-		result.date = data.vdate.v;
 		result.action = ParseServiceAction(
 			context,
 			data.vaction,
 			mediaFolder);
-		if (data.has_from_id()) {
-			result.fromId = data.vfrom_id.v;
-		}
-		if (data.has_reply_to_msg_id()) {
-			result.replyToMsgId = data.vreply_to_msg_id.v;
-		}
 	}, [&](const MTPDmessageEmpty &data) {
 		result.id = data.vid.v;
 	});
@@ -1373,9 +1379,9 @@ Utf8String FormatDateTime(
 	const auto value = QDateTime::fromTime_t(date);
 	return (QString("%1") + dateSeparator + "%2" + dateSeparator + "%3"
 		+ separator + "%4" + timeSeparator + "%5" + timeSeparator + "%6"
-	).arg(value.date().year()
-	).arg(value.date().month(), 2, 10, QChar('0')
 	).arg(value.date().day(), 2, 10, QChar('0')
+	).arg(value.date().month(), 2, 10, QChar('0')
+	).arg(value.date().year()
 	).arg(value.time().hour(), 2, 10, QChar('0')
 	).arg(value.time().minute(), 2, 10, QChar('0')
 	).arg(value.time().second(), 2, 10, QChar('0')
@@ -1392,5 +1398,9 @@ Utf8String FormatFileSize(int64 size) {
 	return formatSizeText(size).toUtf8();
 }
 
+Utf8String FormatDuration(int64 seconds) {
+	return formatDurationText(seconds).toUtf8();
+}
+
 } // namespace Data
 } // namespace Export

Telegram/SourceFiles/export/data/export_data_types.h

@@ -26,6 +26,8 @@ using PeerId = uint64;
 PeerId UserPeerId(int32 userId);
 PeerId ChatPeerId(int32 chatId);
 int32 BarePeerId(PeerId peerId);
+bool IsChatPeerId(PeerId peerId);
+bool IsUserPeerId(PeerId peerId);
 int PeerColorIndex(int32 bareId);
 int ApplicationColorIndex(int applicationId);
 int DomainApplicationId(const Utf8String &data);
@@ -462,7 +464,9 @@ struct Message {
 	TimeId date = 0;
 	TimeId edited = 0;
 	int32 fromId = 0;
+	PeerId toId = 0;
 	PeerId forwardedFromId = 0;
+	TimeId forwardedDate = 0;
 	PeerId savedFromChatId = 0;
 	Utf8String signature;
 	int32 viaBotId = 0;
@@ -470,6 +474,7 @@ struct Message {
 	std::vector<TextPart> text;
 	Media media;
 	ServiceAction action;
+	bool out = false;
 
 	File &file();
 	const File &file() const;
@@ -546,6 +551,7 @@ Utf8String FormatDateTime(
 	QChar separator = QChar(' '));
 Utf8String FormatMoneyAmount(uint64 amount, const Utf8String &currency);
 Utf8String FormatFileSize(int64 size);
+Utf8String FormatDuration(int64 seconds);
 
 } // namespace Data
 } // namespace Export

Telegram/SourceFiles/export/output/export_output_abstract.cpp

@@ -197,7 +197,11 @@ Stats AbstractWriter::produceTestExample(
 		message.id = counter();
 		message.date = prevdate();
 		message.edited = date();
-		message.forwardedFromId = user.info.userId;
+		static auto count = 0;
+		if (++count % 3 == 0) {
+			message.forwardedFromId = Data::UserPeerId(user.info.userId);
+			message.forwardedDate = date();
+		}
 		message.fromId = user.info.userId;
 		message.replyToMsgId = counter();
 		message.viaBotId = bot.info.userId;
@@ -485,6 +489,5 @@ Stats AbstractWriter::produceTestExample(
 	return result;
 }
 
-
 } // namespace Output
 } // namespace Export

Telegram/SourceFiles/export/output/export_output_html.h

@@ -35,6 +35,8 @@ private:
 };
 
 struct UserpicData;
+struct PeersMap;
+struct MediaData;
 
 } // namespace details
 
@@ -84,7 +86,9 @@ public:
 private:
 	using Context = details::HtmlContext;
 	using UserpicData = details::UserpicData;
+	using MediaData = details::MediaData;
 	class Wrap;
+	struct MessageInfo;
 
 	[[nodiscard]] Result copyFile(
 		const QString &source,
@@ -104,6 +108,7 @@ private:
 	[[nodiscard]] Result writeChatsStart(
 		const Data::DialogsInfo &data,
 		const QByteArray &listName,
+		const QByteArray &buttonClass,
 		const QByteArray &about,
 		const QString &fileName);
 	[[nodiscard]] Result writeChatStart(const Data::DialogInfo &data);
@@ -153,7 +158,7 @@ private:
 	Data::DialogInfo _dialog;
 
 	int _messagesCount = 0;
-	TimeId _lastMessageDate = 0;
+	std::unique_ptr<MessageInfo> _lastMessageInfo;
 	int _dateMessageId = 0;
 	std::unique_ptr<Wrap> _chats;
 	std::unique_ptr<Wrap> _chat;