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

fixed bridge reply formatting

Browse source
This commit is contained in:
unknown 2021-08-18 15:51:57 +05:30
parent 804248d6ad
commit daa0015fbd
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/app/molecules/message/Message.jsx
View file

@ -86,9 +86,7 @@ MessageHeader.propTypes = {
time: PropTypes.string.isRequired,
};
function MessageReply({
userId, name, color, content,
}) {
function MessageReply({ name, color, content }) {
return (
<div className="message__reply">
<Text variant="b2">
@ -101,7 +99,6 @@ function MessageReply({
}
MessageReply.propTypes = {
userId: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
color: PropTypes.string.isRequired,
content: PropTypes.string.isRequired,

10
src/app/organisms/channel/ChannelViewContent.jsx
View file

@ -205,13 +205,12 @@ function genMessage(roomId, prevMEvent, mEvent, roomTimeline, viewEvent) {
if (isReply) {
const parsedContent = parseReply(content);
if (parsedContent !== null) {
const username = getUsername(parsedContent.userId);
const c = roomTimeline.room.currentState;
const ID = parsedContent.userId || c.getUserIdsWithDisplayName(parsedContent.displayName)[0];
reply = {
userId: parsedContent.userId,
color: colorMXID(parsedContent.userId),
to: username,
color: colorMXID(ID || parsedContent.displayName),
to: parsedContent.displayName || getUsername(parsedContent.userId),
content: parsedContent.replyContent,
};
content = parsedContent.content;
@ -284,7 +283,6 @@ function genMessage(roomId, prevMEvent, mEvent, roomTimeline, viewEvent) {
);
const userReply = reply === null ? null : (
<MessageReply
userId={reply.userId}
name={reply.to}
color={reply.color}
content={reply.content}

11
src/app/organisms/channel/common.jsx
View file

@ -161,17 +161,20 @@ function getUsersActionJsx(userIds, actionStr) {
function parseReply(rawContent) {
if (rawContent.indexOf('>') !== 0) return null;
let content = rawContent.slice(rawContent.indexOf('@'));
const userId = content.slice(0, content.indexOf('>'));
let content = rawContent.slice(rawContent.indexOf('<') + 1);
const user = content.slice(0, content.indexOf('>'));
content = content.slice(content.indexOf('>') + 2);
const replyContent = content.slice(0, content.indexOf('\n\n'));
content = content.slice(content.indexOf('\n\n') + 2);
if (userId === '') return null;
if (user === '') return null;
const isUserId = user.match(/^@.+:.+/);
return {
userId,
userId: isUserId ? user : null,
displayName: isUserId ? null : user,
replyContent,
content,
};