reya/lume
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new note parser for channel message

Browse Source
This commit is contained in:
Ren Amamiya
2023-05-02 16:33:42 +07:00
parent dfd1333db8
commit 90bcabf27b
5 changed files with 7 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/channel/components/messages/item.tsx
View File

@@ -2,10 +2,12 @@ import MessageHideButton from '@lume/app/channel/components/messages/hideButton'
import MessageMuteButton from '@lume/app/channel/components/messages/muteButton';
import MessageReplyButton from '@lume/app/channel/components/messages/replyButton';
import ChannelMessageUser from '@lume/app/channel/components/messages/user';
import { messageParser } from '@lume/utils/parser';
import { noteParser } from '@lume/app/note/components/parser';
import { useMemo } from 'react';
export default function ChannelMessageItem({ data }: { data: any }) {
const content = messageParser(data.content);
const content = useMemo(() => noteParser(data), [data]);
return (
<div className="group relative flex h-min min-h-min w-full select-text flex-col px-5 py-2 hover:bg-black/20">
@@ -13,8 +15,8 @@ export default function ChannelMessageItem({ data }: { data: any }) {
<ChannelMessageUser pubkey={data.pubkey} time={data.created_at} />
<div className="-mt-[17px] pl-[48px]">
<div className="flex flex-col gap-2">
<div className="whitespace-pre-line break-words break-words text-sm leading-tight">
{data.hide ? <span className="italic text-zinc-400">[hided message]</span> : content}
<div className="whitespace-pre-line break-words text-sm leading-tight">
{data.hide ? <span className="italic text-zinc-400">[hided message]</span> : content.parsed}
</div>
</div>
</div>

2
src/app/chat/components/messages/item.tsx
View File

@@ -19,7 +19,7 @@ export const ChatMessageItem = memo(function MessageListItem({
<div className="flex flex-col">
<ChatMessageUser pubkey={data.pubkey} time={data.created_at} />
<div className="-mt-[17px] pl-[48px]">
<div className="whitespace-pre-line break-words break-words text-sm leading-tight">{content}</div>
<div className="whitespace-pre-line break-words text-sm leading-tight">{content}</div>
</div>
</div>
</div>

7
src/app/note/components/parser.tsx
View File

@@ -57,12 +57,5 @@ export const noteParser = (event: Event) => {
}
});
// make sure no unnessary spaces are left
content.parsed.forEach((item: string, index: string) => {
if (typeof item === 'string') {
content.parsed[index] = item.replace(/^\x20+|\x20+$/gm, '');
}
});
return content;
};