rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show pack Id for image pack changes in timeline

Browse Source 
Show either pack name, state key or (empty).
This commit is contained in:
tastytea 2022-04-20 09:41:18 +02:00
parent 3b2f47c56f
commit ffc5426e87
No known key found for this signature in database
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/timeline/TimelineModel.cpp
View File

@ -2250,18 +2250,27 @@ TimelineModel::formatImagePackEvent(const QString &id)
auto added = calcChange(newImages, oldImages); auto added = calcChange(newImages, oldImages);
auto removed = calcChange(oldImages, newImages); auto removed = calcChange(oldImages, newImages);
auto sender = utils::replaceEmoji(displayName(QString::fromStdString(event->sender))); auto sender = utils::replaceEmoji(displayName(QString::fromStdString(event->sender)));
const auto packId = [&event]() -> QString {
if (!event->content.pack->display_name.empty()) {
return event->content.pack->display_name.c_str();
} else if (!event->state_key.empty()) {
return event->state_key.c_str();
}
return tr("(empty)");
}();
QString msg; QString msg;
if (!removed.isEmpty()) { if (!removed.isEmpty()) {
msg = tr("%1 removed the following images from the pack:<br>%2") msg = tr("%1 removed the following images from the pack %2:<br>%3")
.arg(sender, removed.join(", ")); .arg(sender, packId, removed.join(", "));
} }
if (!added.isEmpty()) { if (!added.isEmpty()) {
if (!msg.isEmpty()) if (!msg.isEmpty())
msg += "<br>"; msg += "<br>";
msg += tr("%1 added the following images to the pack:<br>%2").arg(sender, added.join(", ")); msg += tr("%1 added the following images to the pack %2:<br>%3")
.arg(sender, packId, added.join(", "));
} }
if (msg.isEmpty()) if (msg.isEmpty())