ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve timeline state event text representation

Browse Source 
Change are inspired by Quatermion model

* Fix invite events not getting displayed correctly
* Add some options to control what get displayed (for the moment without
a GUI
* Show reason for a state event if it exists
This commit is contained in:
Carl Schwan
2021-01-08 17:18:48 +00:00
parent 249054b57f
commit f6ac8ccb45
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neochatconfig.kcfg
View File

@@ -32,6 +32,14 @@
<label>Show avatar in the timeline</label> <label>Show avatar in the timeline</label>
<default>true</default> <default>true</default>
</entry> </entry>
<entry name="ShowRename" type="bool">
<label>Show rename events in the timeline</label>
<default>true</default>
</entry>
<entry name="ShowAvatarUpdate" type="bool">
<label>Show avatar update events in the timeline</label>
<default>true</default>
</entry>
</group> </group>
</kcfg> </kcfg>

33
src/neochatroom.cpp
View File

@@ -356,33 +356,44 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
switch (e.membership()) { switch (e.membership()) {
case MembershipType::Invite: case MembershipType::Invite:
if (e.repeatsState()) { if (e.repeatsState()) {
return i18n("reinvited %1 to the room", subjectName); auto text = i18n("reinvited %1 to the room", subjectName);
if (!e.reason().isEmpty()) {
text += i18nc("Optional reason for an invitation", ": %1") + e.reason().toHtmlEscaped();
}
return text;
} }
break; Q_FALLTHROUGH();
case MembershipType::Join: { case MembershipType::Join: {
QString text {};
// Part 1: invites and joins
if (e.repeatsState()) { if (e.repeatsState()) {
return i18n("joined the room (repeated)"); text = i18n("joined the room (repeated)");
} else if (e.changesMembership()) {
text = e.membership() == MembershipType::Invite
? i18n("invited %1 to the room", subjectName)
: i18n("joined the room");
} }
if (!e.prevContent() || e.membership() != e.prevContent()->membership) { if (!text.isEmpty()) {
return e.membership() == MembershipType::Invite ? i18n("invited %1 to the room", subjectName) : i18n("joined the room"); if (!e.reason().isEmpty()) {
text += i18n(": %1", e.reason().toHtmlEscaped());
}
return text;
} }
QString text{}; // Part 2: profile changes of joined members
if (e.isRename()) { if (e.isRename() && NeoChatConfig::self()->showRename()) {
if (!e.newDisplayName().has_value()) { if (e.newDisplayName().has_value()) {
text = i18n("cleared their display name"); text = i18n("cleared their display name");
} else { } else {
text = i18n("changed their display name to %1", e.newDisplayName()->toHtmlEscaped()); text = i18n("changed their display name to %1", e.newDisplayName()->toHtmlEscaped());
} }
} }
if (e.isAvatarUpdate()) { if (e.isAvatarUpdate() && NeoChatConfig::self()->showAvatarUpdate()) {
if (!text.isEmpty()) { if (!text.isEmpty()) {
text += i18n(" and "); text += i18n(" and ");
} }
if (!e.newAvatarUrl().has_value()) { if (!e.newAvatarUrl().has_value()) {
text += i18n("cleared their avatar"); text += i18n("cleared their avatar");
} else if (e.prevContent()->avatarUrl) { } else if (e.prevContent()->avatarUrl) {
text += i18n("set an avatar");
} else {
text += i18n("updated their avatar"); text += i18n("updated their avatar");
} }
} }