mirror of
https://github.com/cinnyapp/cinny.git
synced 2024-11-20 06:49:52 +01:00
added read receipt support
This commit is contained in:
parent
8d4e796f42
commit
683ce431db
4 changed files with 17 additions and 4 deletions
|
@ -14,7 +14,7 @@ import InviteCancelArraowIC from '../../../../public/res/ic/outlined/invite-canc
|
||||||
import UserIC from '../../../../public/res/ic/outlined/user.svg';
|
import UserIC from '../../../../public/res/ic/outlined/user.svg';
|
||||||
import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
|
import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
|
||||||
|
|
||||||
function TimelineChange({ variant, content, time }) {
|
function TimelineChange({ variant, content, time, onClick }) {
|
||||||
let iconSrc;
|
let iconSrc;
|
||||||
|
|
||||||
switch (variant) {
|
switch (variant) {
|
||||||
|
@ -42,7 +42,7 @@ function TimelineChange({ variant, content, time }) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="timeline-change">
|
<button style={{ cursor: onClick === null ? 'default' : 'pointer' }} onClick={onClick} type="button" className="timeline-change">
|
||||||
<div className="timeline-change__avatar-container">
|
<div className="timeline-change__avatar-container">
|
||||||
<RawIcon src={iconSrc} size="extra-small" />
|
<RawIcon src={iconSrc} size="extra-small" />
|
||||||
</div>
|
</div>
|
||||||
|
@ -55,12 +55,13 @@ function TimelineChange({ variant, content, time }) {
|
||||||
<div className="timeline-change__time">
|
<div className="timeline-change__time">
|
||||||
<Text variant="b3">{time}</Text>
|
<Text variant="b3">{time}</Text>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</button>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
TimelineChange.defaultProps = {
|
TimelineChange.defaultProps = {
|
||||||
variant: 'other',
|
variant: 'other',
|
||||||
|
onClick: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
TimelineChange.propTypes = {
|
TimelineChange.propTypes = {
|
||||||
|
@ -74,6 +75,7 @@ TimelineChange.propTypes = {
|
||||||
PropTypes.node,
|
PropTypes.node,
|
||||||
]).isRequired,
|
]).isRequired,
|
||||||
time: PropTypes.string.isRequired,
|
time: PropTypes.string.isRequired,
|
||||||
|
onClick: PropTypes.func,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default TimelineChange;
|
export default TimelineChange;
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
padding-right: var(--sp-extra-tight);
|
padding-right: var(--sp-extra-tight);
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: var(--bg-surface-hover);
|
background-color: var(--bg-surface-hover);
|
||||||
|
|
|
@ -15,6 +15,7 @@ import {
|
||||||
openCreateChannel,
|
openCreateChannel,
|
||||||
openPublicChannels,
|
openPublicChannels,
|
||||||
openInviteUser,
|
openInviteUser,
|
||||||
|
openReadReceipts,
|
||||||
} from '../../../client/action/navigation';
|
} from '../../../client/action/navigation';
|
||||||
import { searchEmoji } from '../emoji-board/emoji';
|
import { searchEmoji } from '../emoji-board/emoji';
|
||||||
|
|
||||||
|
@ -143,11 +144,13 @@ function FollowingMembers({ roomId, roomTimeline, viewEvent }) {
|
||||||
};
|
};
|
||||||
}, [roomTimeline]);
|
}, [roomTimeline]);
|
||||||
|
|
||||||
|
const lastMEvent = roomTimeline.timeline[roomTimeline.timeline.length - 1];
|
||||||
return followingMembers.length !== 0 && (
|
return followingMembers.length !== 0 && (
|
||||||
<TimelineChange
|
<TimelineChange
|
||||||
variant="follow"
|
variant="follow"
|
||||||
content={getUsersActionJsx(followingMembers, 'following the conversation.')}
|
content={getUsersActionJsx(followingMembers, 'following the conversation.')}
|
||||||
time=""
|
time=""
|
||||||
|
onClick={() => openReadReceipts(roomId, lastMEvent.getId())}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ import { redactEvent, sendReaction } from '../../../client/action/roomTimeline';
|
||||||
import { getUsername, doesRoomHaveUnread } from '../../../util/matrixUtil';
|
import { getUsername, doesRoomHaveUnread } from '../../../util/matrixUtil';
|
||||||
import colorMXID from '../../../util/colorMXID';
|
import colorMXID from '../../../util/colorMXID';
|
||||||
import { diffMinutes, isNotInSameDay } from '../../../util/common';
|
import { diffMinutes, isNotInSameDay } from '../../../util/common';
|
||||||
import { openEmojiBoard } from '../../../client/action/navigation';
|
import { openEmojiBoard, openReadReceipts } from '../../../client/action/navigation';
|
||||||
|
|
||||||
import Divider from '../../atoms/divider/Divider';
|
import Divider from '../../atoms/divider/Divider';
|
||||||
import Avatar from '../../atoms/avatar/Avatar';
|
import Avatar from '../../atoms/avatar/Avatar';
|
||||||
|
@ -32,6 +32,7 @@ import TimelineChange from '../../molecules/message/TimelineChange';
|
||||||
|
|
||||||
import ReplyArrowIC from '../../../../public/res/ic/outlined/reply-arrow.svg';
|
import ReplyArrowIC from '../../../../public/res/ic/outlined/reply-arrow.svg';
|
||||||
import EmojiAddIC from '../../../../public/res/ic/outlined/emoji-add.svg';
|
import EmojiAddIC from '../../../../public/res/ic/outlined/emoji-add.svg';
|
||||||
|
import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
|
||||||
import BinIC from '../../../../public/res/ic/outlined/bin.svg';
|
import BinIC from '../../../../public/res/ic/outlined/bin.svg';
|
||||||
|
|
||||||
import { parseReply, parseTimelineChange } from './common';
|
import { parseReply, parseTimelineChange } from './common';
|
||||||
|
@ -321,6 +322,12 @@ function genMessage(roomId, prevMEvent, mEvent, roomTimeline, viewEvent) {
|
||||||
size="extra-small"
|
size="extra-small"
|
||||||
tooltip="Reply"
|
tooltip="Reply"
|
||||||
/>
|
/>
|
||||||
|
<IconButton
|
||||||
|
onClick={() => openReadReceipts(roomId, mEvent.getId())}
|
||||||
|
src={TickMarkIC}
|
||||||
|
size="extra-small"
|
||||||
|
tooltip="Read receipts"
|
||||||
|
/>
|
||||||
{(canIRedact || mEvent.getSender() === mx.getUserId()) && (
|
{(canIRedact || mEvent.getSender() === mx.getUserId()) && (
|
||||||
<IconButton
|
<IconButton
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
|
Loading…
Reference in a new issue