From 5adaed27370f781a27ddd25972d86f2e93bd129f Mon Sep 17 00:00:00 2001 From: Martti Malmi Date: Mon, 8 Jan 2024 13:15:20 +0200 Subject: [PATCH] Note -> EventComponent, split NoteInner --- .../app/src/Components/Embed/NostrLink.tsx | 2 +- .../Components/Event/Create/NoteCreator.tsx | 2 +- .../Event/{Note.css => EventComponent.css} | 0 .../Event/{Note.tsx => EventComponent.tsx} | 4 +- .../app/src/Components/Event/LongFormText.tsx | 4 +- .../Event/{ => Note}/NoteContextMenu.tsx | 2 +- .../Event/{ => Note}/NoteFooter.tsx | 2 +- .../Components/Event/{ => Note}/NoteGhost.tsx | 2 +- .../Components/Event/{ => Note}/NoteInner.tsx | 118 ++---------------- .../Components/Event/{ => Note}/NoteQuote.tsx | 2 +- .../src/Components/Event/Note/NoteText.tsx | 96 ++++++++++++++ .../Components/Event/{ => Note}/NoteTime.tsx | 0 .../ReactionsModal.css} | 0 .../Event/{ => Note}/ReactionsModal.tsx | 4 +- .../app/src/Components/Event/NoteReaction.tsx | 2 +- packages/app/src/Components/Event/Thread.tsx | 4 +- packages/app/src/Components/Feed/Articles.tsx | 2 +- .../app/src/Components/Feed/ImageGridItem.tsx | 2 +- .../src/Components/Feed/TimelineFragment.tsx | 2 +- .../src/Components/Feed/TimelineRenderer.tsx | 2 +- .../Spotlight/SpotlightThreadModal.tsx | 2 +- .../app/src/Components/Trending/ShortNote.tsx | 2 +- .../src/Components/Trending/TrendingPosts.tsx | 2 +- .../app/src/Components/User/Bookmarks.tsx | 2 +- packages/app/src/Pages/Messages/DM.tsx | 2 +- .../app/src/Pages/Messages/MessagesPage.tsx | 2 +- .../app/src/Pages/Profile/ProfilePage.tsx | 2 +- packages/app/src/Pages/wallet/index.tsx | 2 +- .../Event => Utils}/getEventMedia.ts | 0 29 files changed, 133 insertions(+), 135 deletions(-) rename packages/app/src/Components/Event/{Note.css => EventComponent.css} (100%) rename packages/app/src/Components/Event/{Note.tsx => EventComponent.tsx} (97%) rename packages/app/src/Components/Event/{ => Note}/NoteContextMenu.tsx (99%) rename packages/app/src/Components/Event/{ => Note}/NoteFooter.tsx (99%) rename packages/app/src/Components/Event/{ => Note}/NoteGhost.tsx (93%) rename packages/app/src/Components/Event/{ => Note}/NoteInner.tsx (73%) rename packages/app/src/Components/Event/{ => Note}/NoteQuote.tsx (91%) create mode 100644 packages/app/src/Components/Event/Note/NoteText.tsx rename packages/app/src/Components/Event/{ => Note}/NoteTime.tsx (100%) rename packages/app/src/Components/Event/{Reactions.css => Note/ReactionsModal.css} (100%) rename packages/app/src/Components/Event/{ => Note}/ReactionsModal.tsx (98%) rename packages/app/src/{Components/Event => Utils}/getEventMedia.ts (100%) diff --git a/packages/app/src/Components/Embed/NostrLink.tsx b/packages/app/src/Components/Embed/NostrLink.tsx index 7c9d700a..5af0eb56 100644 --- a/packages/app/src/Components/Embed/NostrLink.tsx +++ b/packages/app/src/Components/Embed/NostrLink.tsx @@ -2,7 +2,7 @@ import { NostrPrefix, tryParseNostrLink } from "@snort/system"; import { Link } from "react-router-dom"; import Mention from "@/Components/Embed/Mention"; -import NoteQuote from "@/Components/Event/NoteQuote"; +import NoteQuote from "@/Components/Event/Note/NoteQuote"; export default function NostrLink({ link, depth }: { link: string; depth?: number }) { const nav = tryParseNostrLink(link); diff --git a/packages/app/src/Components/Event/Create/NoteCreator.tsx b/packages/app/src/Components/Event/Create/NoteCreator.tsx index 8082e001..0cbb61a9 100644 --- a/packages/app/src/Components/Event/Create/NoteCreator.tsx +++ b/packages/app/src/Components/Event/Create/NoteCreator.tsx @@ -12,7 +12,7 @@ import { AsyncIcon } from "@/Components/Button/AsyncIcon"; import CloseButton from "@/Components/Button/CloseButton"; import { TrendingHashTagsLine } from "@/Components/Event/Create/TrendingHashTagsLine"; import { sendEventToRelays } from "@/Components/Event/Create/util"; -import Note from "@/Components/Event/Note"; +import Note from "@/Components/Event/EventComponent"; import Icon from "@/Components/Icons/Icon"; import { ToggleSwitch } from "@/Components/Icons/Toggle"; import Modal from "@/Components/Modal/Modal"; diff --git a/packages/app/src/Components/Event/Note.css b/packages/app/src/Components/Event/EventComponent.css similarity index 100% rename from packages/app/src/Components/Event/Note.css rename to packages/app/src/Components/Event/EventComponent.css diff --git a/packages/app/src/Components/Event/Note.tsx b/packages/app/src/Components/Event/EventComponent.tsx similarity index 97% rename from packages/app/src/Components/Event/Note.tsx rename to packages/app/src/Components/Event/EventComponent.tsx index d217c119..216a7957 100644 --- a/packages/app/src/Components/Event/Note.tsx +++ b/packages/app/src/Components/Event/EventComponent.tsx @@ -1,4 +1,4 @@ -import "./Note.css"; +import "./EventComponent.css"; import { EventKind, NostrEvent, TaggedNostrEvent } from "@snort/system"; import { memo, ReactNode } from "react"; @@ -13,7 +13,7 @@ import { LiveEvent } from "@/Components/LiveStream/LiveEvent"; import ProfilePreview from "@/Components/User/ProfilePreview"; import { LongFormText } from "./LongFormText"; -import { NoteInner } from "./NoteInner"; +import { NoteInner } from "./Note/NoteInner"; export interface NoteProps { data: TaggedNostrEvent; diff --git a/packages/app/src/Components/Event/LongFormText.tsx b/packages/app/src/Components/Event/LongFormText.tsx index 939f2ceb..988e31a8 100644 --- a/packages/app/src/Components/Event/LongFormText.tsx +++ b/packages/app/src/Components/Event/LongFormText.tsx @@ -12,8 +12,8 @@ import useImgProxy from "@/Hooks/useImgProxy"; import { findTag } from "@/Utils"; import { Markdown } from "./Markdown"; -import NoteFooter from "./NoteFooter"; -import NoteTime from "./NoteTime"; +import NoteFooter from "./Note/NoteFooter"; +import NoteTime from "./Note/NoteTime"; interface LongFormTextProps { ev: TaggedNostrEvent; diff --git a/packages/app/src/Components/Event/NoteContextMenu.tsx b/packages/app/src/Components/Event/Note/NoteContextMenu.tsx similarity index 99% rename from packages/app/src/Components/Event/NoteContextMenu.tsx rename to packages/app/src/Components/Event/Note/NoteContextMenu.tsx index e0600f5d..a8262f34 100644 --- a/packages/app/src/Components/Event/NoteContextMenu.tsx +++ b/packages/app/src/Components/Event/Note/NoteContextMenu.tsx @@ -12,7 +12,7 @@ import useModeration from "@/Hooks/useModeration"; import { setBookmarked, setPinned } from "@/Utils/Login"; import { getCurrentSubscription, SubscriptionType } from "@/Utils/Subscription"; -import { ReBroadcaster } from "../ReBroadcaster"; +import { ReBroadcaster } from "../../ReBroadcaster"; export interface NoteTranslation { text: string; diff --git a/packages/app/src/Components/Event/NoteFooter.tsx b/packages/app/src/Components/Event/Note/NoteFooter.tsx similarity index 99% rename from packages/app/src/Components/Event/NoteFooter.tsx rename to packages/app/src/Components/Event/Note/NoteFooter.tsx index c0695f73..3b2f13a6 100644 --- a/packages/app/src/Components/Event/NoteFooter.tsx +++ b/packages/app/src/Components/Event/Note/NoteFooter.tsx @@ -21,7 +21,7 @@ import { Zapper, ZapTarget } from "@/Utils/Zapper"; import { ZapPoolController } from "@/Utils/ZapPoolController"; import { useWallet } from "@/Wallet"; -import messages from "../messages"; +import messages from "../../messages"; let isZapperBusy = false; const barrierZapper = async (then: () => Promise): Promise => { diff --git a/packages/app/src/Components/Event/NoteGhost.tsx b/packages/app/src/Components/Event/Note/NoteGhost.tsx similarity index 93% rename from packages/app/src/Components/Event/NoteGhost.tsx rename to packages/app/src/Components/Event/Note/NoteGhost.tsx index 96ab06f5..2094edeb 100644 --- a/packages/app/src/Components/Event/NoteGhost.tsx +++ b/packages/app/src/Components/Event/Note/NoteGhost.tsx @@ -1,4 +1,4 @@ -import "./Note.css"; +import "../EventComponent.css"; import ProfileImage from "@/Components/User/ProfileImage"; diff --git a/packages/app/src/Components/Event/NoteInner.tsx b/packages/app/src/Components/Event/Note/NoteInner.tsx similarity index 73% rename from packages/app/src/Components/Event/NoteInner.tsx rename to packages/app/src/Components/Event/Note/NoteInner.tsx index 176d11e3..c1f40d52 100644 --- a/packages/app/src/Components/Event/NoteInner.tsx +++ b/packages/app/src/Components/Event/Note/NoteInner.tsx @@ -1,11 +1,12 @@ import { EventExt, EventKind, HexKey, NostrLink, NostrPrefix, TaggedNostrEvent } from "@snort/system"; import classNames from "classnames"; -import React, { ReactNode, useMemo, useState } from "react"; +import React, { ReactNode, useState } from "react"; import { useInView } from "react-intersection-observer"; import { FormattedMessage, useIntl } from "react-intl"; import { Link, useNavigate } from "react-router-dom"; import { UserCache } from "@/Cache"; +import { NoteText } from "@/Components/Event/Note/NoteText"; import Icon from "@/Components/Icons/Icon"; import DisplayName from "@/Components/User/DisplayName"; import { ProfileLink } from "@/Components/User/ProfileLink"; @@ -16,19 +17,16 @@ import { chainKey } from "@/Hooks/useThreadContext"; import { findTag, hexToBech32 } from "@/Utils"; import { setBookmarked, setPinned } from "@/Utils/Login"; -import messages from "../messages"; -import Text from "../Text/Text"; -import ProfileImage from "../User/ProfileImage"; -import HiddenNote from "./HiddenNote"; -import { NoteProps } from "./Note"; +import messages from "../../messages"; +import Text from "../../Text/Text"; +import ProfileImage from "../../User/ProfileImage"; +import { NoteProps } from "../EventComponent"; +import HiddenNote from "../HiddenNote"; +import Poll from "../Poll"; import { NoteContextMenu, NoteTranslation } from "./NoteContextMenu"; import NoteFooter from "./NoteFooter"; import NoteTime from "./NoteTime"; -import Poll from "./Poll"; import ReactionsModal from "./ReactionsModal"; -import Reveal from "./Reveal"; - -const TEXT_TRUNCATE_LENGTH = 400; export function NoteInner(props: NoteProps) { const { data: ev, highlight, options: opt, ignoreModeration = false, className, waitUntilInView } = props; @@ -42,10 +40,9 @@ export function NoteInner(props: NoteProps) { const login = useLogin(); const { pinned, bookmarked } = useLogin(); const { publisher, system } = useEventPublisher(); - const [translated, setTranslated] = useState(); const [showTranslation, setShowTranslation] = useState(true); + const [translated, setTranslated] = useState(); const { formatMessage } = useIntl(); - const [showMore, setShowMore] = useState(false); const options = { showHeader: true, @@ -79,101 +76,6 @@ export function NoteInner(props: NoteProps) { } } - const ToggleShowMore = () => ( - { - e.preventDefault(); - e.stopPropagation(); - setShowMore(!showMore); - }}> - {showMore ? ( - - ) : ( - - )} - - ); - - const innerContent = useMemo(() => { - const body = translated && showTranslation ? translated.text : ev?.content ?? ""; - const id = translated && showTranslation ? `${ev.id}-translated` : ev.id; - const shouldTruncate = opt?.truncate && body.length > TEXT_TRUNCATE_LENGTH; - - return ( - <> - {shouldTruncate && showMore && } - - {shouldTruncate && !showMore && } - - ); - }, [ - showMore, - ev, - translated, - showTranslation, - props.searchedValue, - props.depth, - options.showMedia, - props.options?.showMediaSpotlight, - opt?.truncate, - TEXT_TRUNCATE_LENGTH, - ]); - - const transformBody = () => { - if (!login.appData.item.showContentWarningPosts) { - const contentWarning = ev.tags.find(a => a[0] === "content-warning"); - if (contentWarning) { - return ( - - {c}, - }} - /> - {contentWarning[1] && ( - <> -   - {c}, - reason: contentWarning[1], - }} - /> - - )} - . .{" "} - - - - - - - }> - {innerContent} - - ); - } - } - return innerContent; - }; - function goToEvent(e: React.MouseEvent, eTarget: TaggedNostrEvent) { if (opt?.canClick === false) { return; @@ -359,7 +261,7 @@ export function NoteInner(props: NoteProps) { )}
goToEvent(e, ev, true)}> - {transformBody()} + {translation()} {pollOptions()}
diff --git a/packages/app/src/Components/Event/NoteQuote.tsx b/packages/app/src/Components/Event/Note/NoteQuote.tsx similarity index 91% rename from packages/app/src/Components/Event/NoteQuote.tsx rename to packages/app/src/Components/Event/Note/NoteQuote.tsx index f1c6586d..7253a147 100644 --- a/packages/app/src/Components/Event/NoteQuote.tsx +++ b/packages/app/src/Components/Event/Note/NoteQuote.tsx @@ -1,7 +1,7 @@ import { NostrLink } from "@snort/system"; import { useEventFeed } from "@snort/system-react"; -import Note from "@/Components/Event/Note"; +import Note from "@/Components/Event/EventComponent"; import PageSpinner from "@/Components/PageSpinner"; export default function NoteQuote({ link, depth }: { link: NostrLink; depth?: number }) { diff --git a/packages/app/src/Components/Event/Note/NoteText.tsx b/packages/app/src/Components/Event/Note/NoteText.tsx new file mode 100644 index 00000000..d55563a4 --- /dev/null +++ b/packages/app/src/Components/Event/Note/NoteText.tsx @@ -0,0 +1,96 @@ +import React, { useState } from "react"; +import { FormattedMessage } from "react-intl"; +import { Link } from "react-router-dom"; + +import { NoteProps } from "@/Components/Event/EventComponent"; +import { NoteTranslation } from "@/Components/Event/Note/NoteContextMenu"; +import Reveal from "@/Components/Event/Reveal"; +import Text from "@/Components/Text/Text"; +import { LoginSession } from "@/Utils/Login"; + +const TEXT_TRUNCATE_LENGTH = 400; +export const NoteText = function InnerContent( + props: NoteProps & { translated: NoteTranslation; showTranslation?: boolean; login: LoginSession }, +) { + const { data: ev, options, translated, showTranslation, login } = props; + const [showMore, setShowMore] = useState(false); + const body = translated && showTranslation ? translated.text : ev?.content ?? ""; + const id = translated && showTranslation ? `${ev.id}-translated` : ev.id; + const shouldTruncate = options?.truncate && body.length > TEXT_TRUNCATE_LENGTH; + + const ToggleShowMore = () => ( + { + e.preventDefault(); + e.stopPropagation(); + setShowMore(!showMore); + }}> + {showMore ? ( + + ) : ( + + )} + + ); + + const innerContent = ( + <> + {shouldTruncate && showMore && } + + {shouldTruncate && !showMore && } + + ); + + if (!login.appData.item.showContentWarningPosts) { + const contentWarning = ev.tags.find(a => a[0] === "content-warning"); + if (contentWarning) { + return ( + + {c}, + }} + /> + {contentWarning[1] && ( + <> +   + {c}, + reason: contentWarning[1], + }} + /> + + )} + . .{" "} + + + + + + + }> + {innerContent} + + ); + } + } + return innerContent; +}; diff --git a/packages/app/src/Components/Event/NoteTime.tsx b/packages/app/src/Components/Event/Note/NoteTime.tsx similarity index 100% rename from packages/app/src/Components/Event/NoteTime.tsx rename to packages/app/src/Components/Event/Note/NoteTime.tsx diff --git a/packages/app/src/Components/Event/Reactions.css b/packages/app/src/Components/Event/Note/ReactionsModal.css similarity index 100% rename from packages/app/src/Components/Event/Reactions.css rename to packages/app/src/Components/Event/Note/ReactionsModal.css diff --git a/packages/app/src/Components/Event/ReactionsModal.tsx b/packages/app/src/Components/Event/Note/ReactionsModal.tsx similarity index 98% rename from packages/app/src/Components/Event/ReactionsModal.tsx rename to packages/app/src/Components/Event/Note/ReactionsModal.tsx index 991a6b5c..5a1f6c84 100644 --- a/packages/app/src/Components/Event/ReactionsModal.tsx +++ b/packages/app/src/Components/Event/Note/ReactionsModal.tsx @@ -1,4 +1,4 @@ -import "./Reactions.css"; +import "./ReactionsModal.css"; import { NostrLink, socialGraphInstance, TaggedNostrEvent } from "@snort/system"; import { useEventReactions, useReactions } from "@snort/system-react"; @@ -12,7 +12,7 @@ import Tabs from "@/Components/Tabs/Tabs"; import ProfileImage from "@/Components/User/ProfileImage"; import { formatShort } from "@/Utils/Number"; -import messages from "../messages"; +import messages from "../../messages"; interface ReactionsModalProps { show: boolean; diff --git a/packages/app/src/Components/Event/NoteReaction.tsx b/packages/app/src/Components/Event/NoteReaction.tsx index 211bb9b9..cf6166a4 100644 --- a/packages/app/src/Components/Event/NoteReaction.tsx +++ b/packages/app/src/Components/Event/NoteReaction.tsx @@ -7,7 +7,7 @@ import { useInView } from "react-intersection-observer"; import { FormattedMessage } from "react-intl"; import { Link } from "react-router-dom"; -import Note from "@/Components/Event/Note"; +import Note from "@/Components/Event/EventComponent"; import Icon from "@/Components/Icons/Icon"; import useModeration from "@/Hooks/useModeration"; import { eventLink, getDisplayName, hexToBech32 } from "@/Utils"; diff --git a/packages/app/src/Components/Event/Thread.tsx b/packages/app/src/Components/Event/Thread.tsx index f90655e0..cf75c4e7 100644 --- a/packages/app/src/Components/Event/Thread.tsx +++ b/packages/app/src/Components/Event/Thread.tsx @@ -8,8 +8,8 @@ import { useNavigate, useParams } from "react-router-dom"; import BackButton from "@/Components/Button/BackButton"; import Collapsed from "@/Components/Collapsed"; -import Note from "@/Components/Event/Note"; -import NoteGhost from "@/Components/Event/NoteGhost"; +import Note from "@/Components/Event/EventComponent"; +import NoteGhost from "@/Components/Event/Note/NoteGhost"; import { chainKey, ThreadContext, ThreadContextWrapper } from "@/Hooks/useThreadContext"; import messages from "../messages"; diff --git a/packages/app/src/Components/Feed/Articles.tsx b/packages/app/src/Components/Feed/Articles.tsx index d9a97a58..c7068e21 100644 --- a/packages/app/src/Components/Feed/Articles.tsx +++ b/packages/app/src/Components/Feed/Articles.tsx @@ -4,7 +4,7 @@ import { useArticles } from "@/Feed/ArticlesFeed"; import { DeckContext } from "@/Pages/DeckLayout"; import { orderDescending } from "@/Utils"; -import Note from "../Event/Note"; +import Note from "../Event/EventComponent"; export default function Articles() { const data = useArticles(); diff --git a/packages/app/src/Components/Feed/ImageGridItem.tsx b/packages/app/src/Components/Feed/ImageGridItem.tsx index e1ec5c1c..b5d50014 100644 --- a/packages/app/src/Components/Feed/ImageGridItem.tsx +++ b/packages/app/src/Components/Feed/ImageGridItem.tsx @@ -2,9 +2,9 @@ import { NostrLink, TaggedNostrEvent } from "@snort/system"; import { MouseEvent } from "react"; import { Link } from "react-router-dom"; -import getEventMedia from "@/Components/Event/getEventMedia"; import Icon from "@/Components/Icons/Icon"; import { ProxyImg } from "@/Components/ProxyImg"; +import getEventMedia from "@/Utils/getEventMedia"; const ImageGridItem = (props: { event: TaggedNostrEvent; onClick: (e: MouseEvent) => void }) => { const { event, onClick } = props; diff --git a/packages/app/src/Components/Feed/TimelineFragment.tsx b/packages/app/src/Components/Feed/TimelineFragment.tsx index beb26888..eb25800b 100644 --- a/packages/app/src/Components/Feed/TimelineFragment.tsx +++ b/packages/app/src/Components/Feed/TimelineFragment.tsx @@ -1,7 +1,7 @@ import { TaggedNostrEvent } from "@snort/system"; import { ReactNode } from "react"; -import Note from "@/Components/Event/Note"; +import Note from "@/Components/Event/EventComponent"; export interface TimelineFragment { events: Array; diff --git a/packages/app/src/Components/Feed/TimelineRenderer.tsx b/packages/app/src/Components/Feed/TimelineRenderer.tsx index f9f0bd04..148c8eef 100644 --- a/packages/app/src/Components/Feed/TimelineRenderer.tsx +++ b/packages/app/src/Components/Feed/TimelineRenderer.tsx @@ -4,13 +4,13 @@ import { useInView } from "react-intersection-observer"; import { FormattedMessage } from "react-intl"; import ErrorBoundary from "@/Components/ErrorBoundary"; -import getEventMedia from "@/Components/Event/getEventMedia"; import { DisplayAs } from "@/Components/Feed/DisplayAsSelector"; import ImageGridItem from "@/Components/Feed/ImageGridItem"; import { TimelineFragment } from "@/Components/Feed/TimelineFragment"; import Icon from "@/Components/Icons/Icon"; import { SpotlightThreadModal } from "@/Components/Spotlight/SpotlightThreadModal"; import ProfileImage from "@/Components/User/ProfileImage"; +import getEventMedia from "@/Utils/getEventMedia"; export interface TimelineRendererProps { frags: Array; diff --git a/packages/app/src/Components/Spotlight/SpotlightThreadModal.tsx b/packages/app/src/Components/Spotlight/SpotlightThreadModal.tsx index a2a234dd..50ced03d 100644 --- a/packages/app/src/Components/Spotlight/SpotlightThreadModal.tsx +++ b/packages/app/src/Components/Spotlight/SpotlightThreadModal.tsx @@ -1,10 +1,10 @@ import { NostrLink, TaggedNostrEvent } from "@snort/system"; -import getEventMedia from "@/Components/Event/getEventMedia"; import { Thread } from "@/Components/Event/Thread"; import Modal from "@/Components/Modal/Modal"; import { SpotlightMedia } from "@/Components/Spotlight/SpotlightMedia"; import { ThreadContextWrapper } from "@/Hooks/useThreadContext"; +import getEventMedia from "@/Utils/getEventMedia"; interface SpotlightThreadModalProps { thread?: NostrLink; diff --git a/packages/app/src/Components/Trending/ShortNote.tsx b/packages/app/src/Components/Trending/ShortNote.tsx index b532c319..6bfc7997 100644 --- a/packages/app/src/Components/Trending/ShortNote.tsx +++ b/packages/app/src/Components/Trending/ShortNote.tsx @@ -1,7 +1,7 @@ import { NostrLink, TaggedNostrEvent } from "@snort/system"; import { Link } from "react-router-dom"; -import NoteTime from "@/Components/Event/NoteTime"; +import NoteTime from "@/Components/Event/Note/NoteTime"; import Text from "@/Components/Text/Text"; import ProfileImage from "@/Components/User/ProfileImage"; diff --git a/packages/app/src/Components/Trending/TrendingPosts.tsx b/packages/app/src/Components/Trending/TrendingPosts.tsx index 4e5534ca..6c4db9b1 100644 --- a/packages/app/src/Components/Trending/TrendingPosts.tsx +++ b/packages/app/src/Components/Trending/TrendingPosts.tsx @@ -4,7 +4,7 @@ import classNames from "classnames"; import { useState } from "react"; import { ErrorOrOffline } from "@/Components/ErrorOrOffline"; -import Note from "@/Components/Event/Note"; +import Note from "@/Components/Event/EventComponent"; import { DisplayAs, DisplayAsSelector } from "@/Components/Feed/DisplayAsSelector"; import ImageGridItem from "@/Components/Feed/ImageGridItem"; import PageSpinner from "@/Components/PageSpinner"; diff --git a/packages/app/src/Components/User/Bookmarks.tsx b/packages/app/src/Components/User/Bookmarks.tsx index 2ec0025e..42e02551 100644 --- a/packages/app/src/Components/User/Bookmarks.tsx +++ b/packages/app/src/Components/User/Bookmarks.tsx @@ -3,7 +3,7 @@ import { ChangeEvent, useMemo, useState } from "react"; import { FormattedMessage } from "react-intl"; import { UserCache } from "@/Cache"; -import Note from "@/Components/Event/Note"; +import Note from "@/Components/Event/EventComponent"; import useLogin from "@/Hooks/useLogin"; import messages from "../messages"; diff --git a/packages/app/src/Pages/Messages/DM.tsx b/packages/app/src/Pages/Messages/DM.tsx index 45fe07fc..881a1744 100644 --- a/packages/app/src/Pages/Messages/DM.tsx +++ b/packages/app/src/Pages/Messages/DM.tsx @@ -5,7 +5,7 @@ import { useInView } from "react-intersection-observer"; import { FormattedMessage, useIntl } from "react-intl"; import { Chat, ChatMessage, ChatType, setLastReadIn } from "@/chat"; -import NoteTime from "@/Components/Event/NoteTime"; +import NoteTime from "@/Components/Event/Note/NoteTime"; import messages from "@/Components/messages"; import Text from "@/Components/Text/Text"; import ProfileImage from "@/Components/User/ProfileImage"; diff --git a/packages/app/src/Pages/Messages/MessagesPage.tsx b/packages/app/src/Pages/Messages/MessagesPage.tsx index 95f3a7c6..0c32e1fe 100644 --- a/packages/app/src/Pages/Messages/MessagesPage.tsx +++ b/packages/app/src/Pages/Messages/MessagesPage.tsx @@ -4,7 +4,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import { useNavigate, useParams } from "react-router-dom"; import { Chat, ChatType, useChatSystem } from "@/chat"; -import NoteTime from "@/Components/Event/NoteTime"; +import NoteTime from "@/Components/Event/Note/NoteTime"; import NoteToSelf from "@/Components/User/NoteToSelf"; import ProfileImage from "@/Components/User/ProfileImage"; import useLogin from "@/Hooks/useLogin"; diff --git a/packages/app/src/Pages/Profile/ProfilePage.tsx b/packages/app/src/Pages/Profile/ProfilePage.tsx index cad9233a..96e32ef3 100644 --- a/packages/app/src/Pages/Profile/ProfilePage.tsx +++ b/packages/app/src/Pages/Profile/ProfilePage.tsx @@ -16,7 +16,7 @@ import { Link, useLocation, useNavigate, useParams } from "react-router-dom"; import IconButton from "@/Components/Button/IconButton"; import Copy from "@/Components/Copy/Copy"; -import Note from "@/Components/Event/Note"; +import Note from "@/Components/Event/EventComponent"; import Timeline from "@/Components/Feed/Timeline"; import Icon from "@/Components/Icons/Icon"; import Modal from "@/Components/Modal/Modal"; diff --git a/packages/app/src/Pages/wallet/index.tsx b/packages/app/src/Pages/wallet/index.tsx index 40274ce2..1496a821 100644 --- a/packages/app/src/Pages/wallet/index.tsx +++ b/packages/app/src/Pages/wallet/index.tsx @@ -5,7 +5,7 @@ import { useNavigate } from "react-router-dom"; import AsyncButton from "@/Components/Button/AsyncButton"; import { AsyncIcon } from "@/Components/Button/AsyncIcon"; -import NoteTime from "@/Components/Event/NoteTime"; +import NoteTime from "@/Components/Event/Note/NoteTime"; import Icon from "@/Components/Icons/Icon"; import { useRates } from "@/Hooks/useRates"; import { unwrap } from "@/Utils"; diff --git a/packages/app/src/Components/Event/getEventMedia.ts b/packages/app/src/Utils/getEventMedia.ts similarity index 100% rename from packages/app/src/Components/Event/getEventMedia.ts rename to packages/app/src/Utils/getEventMedia.ts