aljaz/rabbit
1
0
Fork 0
mirror of https://github.com/aljazceru/rabbit.git synced 2025-12-17 22:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Shusui MOYATANI
2023-05-16 03:59:04 +09:00
parent 68d1cb19c0
commit b343e21bfb
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/event/textNote/PlainTextDisplay.tsx
View File

@@ -1,11 +0,0 @@
import type { PlainText } from '@/nostr/parseTextNote';
export type PlainTextDisplayProps = {
plainText: PlainText;
};
const PlainTextDisplay = (props: PlainTextDisplayProps) => {
return <span>{props.plainText.content}</span>;
};
export default PlainTextDisplay;

11
src/components/event/textNote/TextNoteContentDisplay.tsx
View File

@@ -7,7 +7,6 @@ import EventDisplayById from '@/components/event/EventDisplayById';
import ImageDisplay from '@/components/event/textNote/ImageDisplay'; import ImageDisplay from '@/components/event/textNote/ImageDisplay';
import MentionedEventDisplay from '@/components/event/textNote/MentionedEventDisplay'; import MentionedEventDisplay from '@/components/event/textNote/MentionedEventDisplay';
import MentionedUserDisplay from '@/components/event/textNote/MentionedUserDisplay'; import MentionedUserDisplay from '@/components/event/textNote/MentionedUserDisplay';
import PlainTextDisplay from '@/components/event/textNote/PlainTextDisplay';
import EventLink from '@/components/EventLink'; import EventLink from '@/components/EventLink';
import SafeLink from '@/components/utils/SafeLink'; import SafeLink from '@/components/utils/SafeLink';
import { createSearchColumn } from '@/core/column'; import { createSearchColumn } from '@/core/column';
@@ -38,7 +37,7 @@ const TextNoteContentDisplay = (props: TextNoteContentDisplayProps) => {
<For each={parseTextNote(props.event.content)}> <For each={parseTextNote(props.event.content)}>
{(item: ParsedTextNoteNode) => { {(item: ParsedTextNoteNode) => {
if (item.type === 'PlainText') { if (item.type === 'PlainText') {
return <PlainTextDisplay plainText={item} />; return <span>{item.content}</span>;
} }
if (item.type === 'URL') { if (item.type === 'URL') {
if (isImageUrl(item.content)) { if (isImageUrl(item.content)) {
@@ -55,7 +54,9 @@ const TextNoteContentDisplay = (props: TextNoteContentDisplayProps) => {
} }
if (item.type === 'TagReference') { if (item.type === 'TagReference') {
const resolved = resolveTagReference(item, props.event); const resolved = resolveTagReference(item, props.event);
if (resolved == null) return null; if (resolved == null) {
return <span>{item.content}</span>;
}
if (resolved.type === 'MentionedUser') { if (resolved.type === 'MentionedUser') {
return <MentionedUserDisplay pubkey={resolved.pubkey} />; return <MentionedUserDisplay pubkey={resolved.pubkey} />;
} }
@@ -103,10 +104,10 @@ const TextNoteContentDisplay = (props: TextNoteContentDisplayProps) => {
} }
if (item.type === 'CustomEmoji') { if (item.type === 'CustomEmoji') {
const emojiUrl = event().getEmojiUrl(item.shortcode); const emojiUrl = event().getEmojiUrl(item.shortcode);
if (emojiUrl == null) return item.content; if (emojiUrl == null) return <span>{item.content}</span>;
return ( return (
<img <img
class="inline-block h-6 max-w-[64px] align-middle" class="inline-block h-7 max-w-[64px] align-middle"
src={emojiUrl} src={emojiUrl}
alt={item.shortcode} alt={item.shortcode}
/> />