polish

2023-11-01 13:01:52 +07:00
parent e218ebee89
commit f2dddf97f5
11 changed files with 115 additions and 837 deletions
--- a/src/shared/notes/kinds/articleDetail.tsx
+++ b/src/shared/notes/kinds/articleDetail.tsx
@@ -1,10 +1,4 @@
 import { NDKEvent } from '@nostr-dev-kit/ndk';
-import ReactMarkdown from 'react-markdown';
-import { Link } from 'react-router-dom';
-import rehypeExternalLinks from 'rehype-external-links';
-import remarkGfm from 'remark-gfm';
-
-import { Boost, Hashtag, Invoice, MentionUser } from '@shared/notes';

 export function ArticleDetailNote({ event }: { event: NDKEvent }) {
  /*const metadata = useMemo(() => {
@@ -30,39 +24,8 @@ export function ArticleDetailNote({ event }: { event: NDKEvent }) {
  }, [event.id]);*/

  return (
-    <ReactMarkdown
-      className="break-p prose prose-neutral max-w-none select-text whitespace-pre-line leading-normal dark:prose-invert prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:last:mb-1 prose-a:font-normal prose-a:text-blue-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-blue-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:bg-white/10 prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-ul:mt-1 prose-img:mb-2 prose-img:mt-3 prose-hr:mx-0 prose-hr:my-2 hover:prose-a:text-blue-500"
-      remarkPlugins={[remarkGfm]}
-      rehypePlugins={[rehypeExternalLinks({ target: '_blank' })]}
-      components={{
-        a: ({ href }) => {
-          const cleanURL = new URL(href);
-          cleanURL.search = '';
-          return (
-            <Link to={href} target="_blank" className="w-max break-all hover:!underline">
-              {cleanURL.hostname + cleanURL.pathname}
-            </Link>
-          );
-        },
-        del: ({ children }) => {
-          const key = children[0] as string;
-          if (typeof key !== 'string') return;
-          if (key.startsWith('pub') && key.length > 50 && key.length < 100) {
-            return <MentionUser pubkey={key.replace('pub-', '')} />;
-          }
-          if (key.startsWith('tag')) {
-            return <Hashtag tag={key.replace('tag-', '')} />;
-          }
-          if (key.startsWith('boost')) {
-            return <Boost boost={key.replace('boost-', '')} />;
-          }
-          if (key.startsWith('lnbc')) {
-            return <Invoice invoice={key.replace('lnbc-', '')} />;
-          }
-        },
-      }}
-    >
+    <div className="break-p prose prose-neutral max-w-none select-text whitespace-pre-line leading-normal dark:prose-invert prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:last:mb-1 prose-a:font-normal prose-a:text-blue-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-blue-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:bg-white/10 prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-ul:mt-1 prose-img:mb-2 prose-img:mt-3 prose-hr:mx-0 prose-hr:my-2 hover:prose-a:text-blue-500">
      {event.content}
-    </ReactMarkdown>
+    </div>
  );
 }
--- a/src/shared/notes/kinds/file.tsx
+++ b/src/shared/notes/kinds/file.tsx
@@ -1,4 +1,6 @@
 import { NDKEvent } from '@nostr-dev-kit/ndk';
+import { downloadDir } from '@tauri-apps/api/path';
+import { download } from '@tauri-apps/plugin-upload';
 import {
  MediaControlBar,
  MediaController,
@@ -9,7 +11,9 @@ import {
  MediaVolumeRange,
 } from 'media-chrome/dist/react';
 import { memo } from 'react';
-import { Link } from 'react-router-dom';
+
+import { DownloadIcon } from '@shared/icons';
+import { LinkPreview } from '@shared/notes';

 import { fileType } from '@utils/nip94';

@@ -17,56 +21,58 @@ export function FileNote(props: { event?: NDKEvent }) {
  const url = props.event.tags.find((el) => el[0] === 'url')[1];
  const type = fileType(url);

+  const downloadImage = async (url: string) => {
+    const downloadDirPath = await downloadDir();
+    const filename = url.substring(url.lastIndexOf('/') + 1);
+    return await download(url, downloadDirPath + `/${filename}`);
+  };
+
  if (type === 'image') {
    return (
-      <div className="mb-2 mt-3">
+      <div key={url} className="group relative mt-2">
        <img
          src={url}
-          alt={props.event.content}
-          className="h-auto w-full rounded-lg object-cover"
-          loading="lazy"
-          decoding="async"
-          style={{ contentVisibility: 'auto' }}
+          alt={url}
+          className="h-auto w-full rounded-lg border border-neutral-300 object-cover dark:border-neutral-700"
        />
+        <button
+          type="button"
+          onClick={() => downloadImage(url)}
+          className="absolute right-2 top-2 hidden h-10 w-10 items-center justify-center rounded-lg bg-black/50 backdrop-blur-xl group-hover:inline-flex hover:bg-blue-500"
+        >
+          <DownloadIcon className="h-5 w-5 text-white" />
+        </button>
      </div>
    );
  }

  if (type === 'video') {
    return (
-      <div className="mb-2 mt-3">
-        <MediaController
-          key={url}
-          className="aspect-video w-full overflow-hidden rounded-lg"
-        >
-          <video
-            slot="media"
-            src={url}
-            poster={`https://thumbnail.video/api/get?url=${url}&seconds=1`}
-            preload="none"
-            muted
-          />
-          <MediaControlBar>
-            <MediaPlayButton></MediaPlayButton>
-            <MediaTimeRange></MediaTimeRange>
-            <MediaTimeDisplay showDuration></MediaTimeDisplay>
-            <MediaMuteButton></MediaMuteButton>
-            <MediaVolumeRange></MediaVolumeRange>
-          </MediaControlBar>
-        </MediaController>
-      </div>
+      <MediaController
+        key={url}
+        className="mt-2 aspect-video w-full overflow-hidden rounded-lg"
+      >
+        <video
+          slot="media"
+          src={url}
+          poster={`https://thumbnail.video/api/get?url=${url}&seconds=1`}
+          preload="none"
+          muted
+        />
+        <MediaControlBar>
+          <MediaPlayButton></MediaPlayButton>
+          <MediaTimeRange></MediaTimeRange>
+          <MediaTimeDisplay showDuration></MediaTimeDisplay>
+          <MediaMuteButton></MediaMuteButton>
+          <MediaVolumeRange></MediaVolumeRange>
+        </MediaControlBar>
+      </MediaController>
    );
  }

  return (
-    <div className="mb-2">
-      <Link
-        to={url}
-        target="_blank"
-        className="break-all font-normal text-blue-500 hover:text-blue-600"
-      >
-        {url}
-      </Link>
+    <div className="mt-2">
+      <LinkPreview urls={[url]} />
    </div>
  );
 }
--- a/src/shared/notes/kinds/text.tsx
+++ b/src/shared/notes/kinds/text.tsx
@@ -26,7 +26,7 @@ export function TextNote(props: { content?: string; truncate?: boolean }) {
  }

  return (
-    <div>
+    <div className="flex w-full flex-col items-start gap-2">
      <Markdown
        options={{
          overrides: {
--- a/src/shared/notes/mentions/note.tsx
+++ b/src/shared/notes/mentions/note.tsx
@@ -49,7 +49,7 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {

  if (status === 'pending') {
    return (
-      <div className="mt-3 cursor-default rounded-lg border border-neutral-300 bg-neutral-200 p-3 dark:border-neutral-700 dark:bg-neutral-800">
+      <div className="w-full cursor-default rounded-lg border border-neutral-300 bg-neutral-200 p-3 dark:border-neutral-700 dark:bg-neutral-800">
        <NoteSkeleton />
      </div>
    );
@@ -58,7 +58,7 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
  if (status === 'error') {
    const noteLink = `https://njump.me/${nip19.noteEncode(id)}`;
    return (
-      <div className="mt-3 rounded-lg bg-neutral-200 px-3 py-3 dark:bg-neutral-800">
+      <div className="w-full rounded-lg bg-neutral-200 px-3 py-3 dark:bg-neutral-800">
        <div className="flex items-center gap-2">
          <div className="inline-flex h-6 w-6 items-end justify-center rounded bg-black pb-1">
            <img src="/lume.png" alt="lume" className="h-auto w-1/3" />
@@ -79,7 +79,7 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
    <div
      role="button"
      onClick={(e) => openThread(e, id)}
-      className="mt-3 cursor-default rounded-lg border border-neutral-300 bg-neutral-200 p-3 dark:border-neutral-700 dark:bg-neutral-800"
+      className="w-full cursor-default rounded-lg border border-neutral-300 bg-neutral-200 p-3 dark:border-neutral-700 dark:bg-neutral-800"
    >
      <User pubkey={data.pubkey} time={data.created_at} variant="mention" />
      <div className="mt-1 text-left">{renderKind(data)}</div>
--- a/src/shared/notes/preview/image.tsx
+++ b/src/shared/notes/preview/image.tsx
@@ -11,7 +11,7 @@ export function ImagePreview({ urls }: { urls: string[] }) {
  };

  return (
-    <div className="my-2 flex flex-col gap-2">
+    <div className="flex w-full flex-col gap-2">
      {urls.map((url) => (
        <div key={url} className="group relative">
          <img
--- a/src/shared/notes/preview/link.tsx
+++ b/src/shared/notes/preview/link.tsx
@@ -7,68 +7,55 @@ function isImage(url: string) {
 }

 export function LinkPreview({ urls }: { urls: string[] }) {
-  const { status, data, error } = useOpenGraph(urls[0]);
+  const { status, data } = useOpenGraph(urls[0]);
  const domain = new URL(urls[0]);

-  return (
-    <div className="my-2">
-      {status === 'pending' ? (
-        <div className="flex flex-col bg-neutral-200 dark:bg-neutral-800">
-          <div className="h-44 w-full animate-pulse bg-neutral-400 dark:bg-neutral-600" />
-          <div className="flex flex-col gap-2 px-3 py-3">
-            <div className="h-3 w-2/3 animate-pulse rounded bg-neutral-400 dark:bg-neutral-600" />
-            <div className="h-3 w-3/4 animate-pulse rounded bg-neutral-400 dark:bg-neutral-600" />
-            <span className="mt-2.5 text-sm leading-none text-neutral-600 dark:text-neutral-400">
-              {domain.hostname}
-            </span>
-          </div>
+  if (status === 'pending') {
+    return (
+      <div className="flex w-full flex-col bg-neutral-200 dark:bg-neutral-800">
+        <div className="h-44 w-full animate-pulse bg-neutral-400 dark:bg-neutral-600" />
+        <div className="flex flex-col gap-2 px-3 py-3">
+          <div className="h-3 w-2/3 animate-pulse rounded bg-neutral-400 dark:bg-neutral-600" />
+          <div className="h-3 w-3/4 animate-pulse rounded bg-neutral-400 dark:bg-neutral-600" />
+          <span className="mt-2.5 text-sm leading-none text-neutral-600 dark:text-neutral-400">
+            {domain.hostname}
+          </span>
        </div>
-      ) : (
-        <Link
-          to={urls[0]}
-          target="_blank"
-          rel="noreferrer"
-          className="flex flex-col rounded-lg border border-neutral-300 bg-neutral-200 dark:border-neutral-700 dark:bg-neutral-800"
-        >
-          {error ? (
-            <div className="flex flex-col gap-2 px-3 py-3">
-              <p className="text-sm text-neutral-600 dark:text-neutral-400">
-                Can&apos;t fetch open graph, click to open webpage
-              </p>
-              <span className="text-sm leading-none text-neutral-900 dark:text-neutral-100">
-                {domain.hostname}
-              </span>
-            </div>
-          ) : (
-            <>
-              {isImage(data.image) ? (
-                <img
-                  src={data.image}
-                  alt={urls[0]}
-                  className="h-44 w-full rounded-t-lg bg-white object-cover"
-                />
-              ) : null}
-              <div className="flex flex-col items-start px-3 py-3">
-                <div className="flex flex-col items-start gap-1 text-left">
-                  {data.title && (
-                    <h5 className="line-clamp-1 text-base font-semibold text-neutral-900 dark:text-neutral-100">
-                      {data.title}
-                    </h5>
-                  )}
-                  {data.description ? (
-                    <p className="mb-2.5 line-clamp-3 break-all text-sm text-neutral-700 dark:text-neutral-400">
-                      {data.description}
-                    </p>
-                  ) : null}
-                </div>
-                <span className="break-all text-sm text-neutral-600 dark:text-neutral-400">
-                  {domain.hostname}
-                </span>
-              </div>
-            </>
+      </div>
+    );
+  }
+
+  return (
+    <Link
+      to={urls[0]}
+      target="_blank"
+      rel="noreferrer"
+      className="flex w-full flex-col rounded-lg border border-neutral-300 bg-neutral-200 dark:border-neutral-700 dark:bg-neutral-800"
+    >
+      {isImage(data.image) ? (
+        <img
+          src={data.image}
+          alt={urls[0]}
+          className="h-44 w-full rounded-t-lg bg-white object-cover"
+        />
+      ) : null}
+      <div className="flex flex-col items-start px-3 py-3">
+        <div className="flex flex-col items-start gap-1 text-left">
+          {data.title && (
+            <h5 className="line-clamp-1 text-base font-semibold text-neutral-900 dark:text-neutral-100">
+              {data.title}
+            </h5>
          )}
-        </Link>
-      )}
-    </div>
+          {data.description ? (
+            <p className="mb-2.5 line-clamp-3 break-all text-sm text-neutral-700 dark:text-neutral-400">
+              {data.description}
+            </p>
+          ) : null}
+        </div>
+        <span className="break-all text-sm text-neutral-600 dark:text-neutral-400">
+          {domain.hostname}
+        </span>
+      </div>
+    </Link>
  );
 }
--- a/src/shared/notes/preview/video.tsx
+++ b/src/shared/notes/preview/video.tsx
@@ -11,7 +11,7 @@ import { memo } from 'react';

 export const VideoPreview = memo(function VideoPreview({ urls }: { urls: string[] }) {
  return (
-    <div className="my-2 flex flex-col gap-2">
+    <div className="flex w-full flex-col gap-2">
      {urls.map((url) => (
        <MediaController key={url} className="aspect-video overflow-hidden rounded-lg">
          <video