mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Improved html message layout.

Browse Source
This commit is contained in:
John Preston
2018-07-04 00:09:25 +01:00
parent eeb1a6b769
commit cb8ff398a5
42 changed files with 895 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Telegram/SourceFiles/export/data/export_data_types.cpp
View File

@@ -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

6
Telegram/SourceFiles/export/data/export_data_types.h
View File

@@ -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