hippoz/cinny
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

close #72: Hide unread badge when there aren't any messages

Browse source
This commit is contained in:
unknown 2021-08-26 10:36:41 +05:30
parent ec4da47af6
commit 7b54988514
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/organisms/channel/ChannelViewCmdBar.jsx
View file

@ -312,7 +312,7 @@ function ChannelViewCmdBar({ roomId, roomTimeline, viewEvent }) {
else if (searchTerm.match(/^[-]?(\|)$/)) searchTerm = 'neutral_face'; else if (searchTerm.match(/^[-]?(\|)$/)) searchTerm = 'neutral_face';
else if (searchTerm.match(/^[-]?(d|D)$/)) searchTerm = 'grin'; else if (searchTerm.match(/^[-]?(d|D)$/)) searchTerm = 'grin';
else if (searchTerm.match(/^[-]?(\/)$/)) searchTerm = 'frown'; else if (searchTerm.match(/^[-]?(\/)$/)) searchTerm = 'frown';
else if (searchTerm.match(/^[-]?(p|P)$/)) searchTerm = 'stick_out_tongue'; else if (searchTerm.match(/^[-]?(p|P)$/)) searchTerm = 'stuck_out_tongue';
else if (searchTerm.match(/^'[-]?(\()$/)) searchTerm = 'cry'; else if (searchTerm.match(/^'[-]?(\()$/)) searchTerm = 'cry';
else if (searchTerm.match(/^[-]?(x|X)$/)) searchTerm = 'dizzy_face'; else if (searchTerm.match(/^[-]?(x|X)$/)) searchTerm = 'dizzy_face';
else if (searchTerm.match(/^[-]?(\()$/)) searchTerm = 'pleading_face'; else if (searchTerm.match(/^[-]?(\()$/)) searchTerm = 'pleading_face';

6
src/util/matrixUtil.js
View file

@ -48,6 +48,7 @@ async function isRoomAliasAvailable(alias) {
function doesRoomHaveUnread(room) { function doesRoomHaveUnread(room) {
const userId = initMatrix.matrixClient.getUserId(); const userId = initMatrix.matrixClient.getUserId();
const readUpToId = room.getEventReadUpTo(userId); const readUpToId = room.getEventReadUpTo(userId);
const supportEvents = ['m.room.message', 'm.room.encrypted', 'm.sticker'];
if (room.timeline.length if (room.timeline.length
&& room.timeline[room.timeline.length - 1].sender && room.timeline[room.timeline.length - 1].sender
@ -60,7 +61,10 @@ function doesRoomHaveUnread(room) {
const event = room.timeline[i]; const event = room.timeline[i];
if (event.getId() === readUpToId) return false; if (event.getId() === readUpToId) return false;
return true;
if (supportEvents.includes(event.getType())) {
return true;
}
} }
return true; return true;
} }