The_Great_Archive/RSNewWebUI
1
0
Fork 0
mirror of https://github.com/RetroShare/RSNewWebUI.git synced 2026-09-12 19:50:04 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sorting in mails & show identity icon when no avatar available

Browse Source
This commit is contained in:
defnax 2026-07-20 21:07:06 +02:00
parent fe63ef872b
commit 059a28ab14
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webui-src/app/mail/mail_util.js
View File

@ -175,15 +175,10 @@ const MessageSummary = () => {
},
},
[
fromUserInfo &&
fromUserInfo.mAvatar &&
fromUserInfo.mAvatar.mData &&
fromUserInfo.mAvatar.mData.base64 &&
fromUserInfo.mAvatar.mData.base64 !== '' &&
m(peopleUtil.UserAvatar, {
avatar: fromUserInfo.mAvatar,
firstLetter: (fromUserInfo.mNickname || '').slice(0, 1).toUpperCase(),
identityId: details.from._addr_string,
m(peopleUtil.UserAvatar, {
avatar: fromUserInfo?.mAvatar,
firstLetter: (fromUserInfo?.mNickname || '').slice(0, 1).toUpperCase(),
identityId: details.from?._addr_string,
size: 24,
}),
m('span', fromUserInfo && Number(fromUserInfo.mId) !== 0 ? fromUserInfo.mNickname : '[Unknown]'),
@ -477,8 +472,10 @@ function sortList(list) {
case 'from': {
const aSenderId = MessageCache[msgA.msgId]?.from?._addr_string || msgA.from?._addr_string;
const bSenderId = MessageCache[msgB.msgId]?.from?._addr_string || msgB.from?._addr_string;
const aFrom = (aSenderId && (UserNicknamesCache[aSenderId] || rs.userList.userMap[aSenderId])) || '';
const bFrom = (bSenderId && (UserNicknamesCache[bSenderId] || rs.userList.userMap[bSenderId])) || '';
const aName = aSenderId && rs.userList.userMap[aSenderId];
const bName = bSenderId && rs.userList.userMap[bSenderId];
const aFrom = (UserNicknamesCache[aSenderId] || (aName && aName.name) || aName || '') + '';
const bFrom = (UserNicknamesCache[bSenderId] || (bName && bName.name) || bName || '') + '';
valA = aFrom.toLowerCase();
valB = bFrom.toLowerCase();
break;