From 472925bb05e23a63134cf132f8d9b9a960aa6c0e Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Thu, 7 Sep 2023 12:19:28 +0700
Subject: [PATCH] small fixes

---
 src/shared/navigation.tsx          |  7 ++++++-
 src/shared/notes/mentions/note.tsx | 27 +++++++++++----------------
 src/utils/parser.ts                |  6 +++---
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/shared/navigation.tsx b/src/shared/navigation.tsx
index c27c29b6..8dd7e886 100644
--- a/src/shared/navigation.tsx
+++ b/src/shared/navigation.tsx
@@ -4,6 +4,8 @@ import { twMerge } from 'tailwind-merge';
 
 import { ChatsList } from '@app/chats/components/list';
 
+import { useStorage } from '@libs/storage/provider';
+
 import { ActiveAccount } from '@shared/accounts/active';
 import { ComposerModal } from '@shared/composer';
 import { Frame } from '@shared/frame';
@@ -12,11 +14,14 @@ import { BellIcon, NavArrowDownIcon, SpaceIcon } from '@shared/icons';
 import { useSidebar } from '@stores/sidebar';
 
 export function Navigation() {
+  const { db } = useStorage();
   const [chats, toggleChats] = useSidebar((state) => [state.chats, state.toggleChats]);
 
   return (
     <Frame className="relative flex h-full w-[232px] flex-col" lighter>
-      <div data-tauri-drag-region className="h-11 w-full shrink-0" />
+      {db.platform === 'darwin' ? (
+        <div data-tauri-drag-region className="h-11 w-full shrink-0" />
+      ) : null}
       <div className="scrollbar-hide flex h-full flex-1 flex-col gap-6 overflow-y-auto pb-32">
         <div className="flex flex-col pr-2">
           <ComposerModal />
diff --git a/src/shared/notes/mentions/note.tsx b/src/shared/notes/mentions/note.tsx
index b6a9eb95..a663db79 100644
--- a/src/shared/notes/mentions/note.tsx
+++ b/src/shared/notes/mentions/note.tsx
@@ -58,29 +58,24 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
   if (status === 'error') {
     const noteLink = `https://nostr.com/${nip19.noteEncode(id)}`;
     return (
-      <div className="relative mb-5 flex flex-col">
-        <div className="relative z-10 flex items-start gap-3">
-          <div className="inline-flex h-11 w-11 items-end justify-center rounded-lg bg-black pb-1">
+      <div className="relative mt-3 flex flex-col">
+        <div className="relative z-10 flex items-center gap-3">
+          <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" />
           </div>
           <h5 className="truncate font-semibold leading-none text-white">
             Lume <span className="text-green-500">(System)</span>
           </h5>
         </div>
-        <div className="-mt-6 flex items-start gap-3">
-          <div className="w-11 shrink-0" />
-          <div>
-            <div className="relative z-20 mt-1 flex-1 select-text">
-              <div className="mb-1 select-text rounded-lg bg-white/5 p-1.5 text-sm">
-                Lume cannot find this post with your current relays, but you can view it
-                via nostr.com.{' '}
-                <Link to={noteLink} className="text-fuchsia-500">
-                  Learn more
-                </Link>
-              </div>
-            </div>
-            <LinkPreview urls={[noteLink]} />
+        <div className="mt-1">
+          <div className="mb-1 select-text rounded-lg bg-white/5 p-1.5 text-sm">
+            Lume cannot find this post with your current relays, but you can view it via
+            nostr.com.{' '}
+            <Link to={noteLink} className="text-fuchsia-500">
+              Learn more
+            </Link>
           </div>
+          <LinkPreview urls={[noteLink]} />
         </div>
       </div>
     );
diff --git a/src/utils/parser.ts b/src/utils/parser.ts
index aa7b39bb..3e450c91 100644
--- a/src/utils/parser.ts
+++ b/src/utils/parser.ts
@@ -32,18 +32,18 @@ export function parser(eventContent: string) {
         const url = new URL(word);
         url.search = '';
 
-        if (url.toString().match(/\.(jpg|jpeg|gif|png|webp|avif)$/)) {
+        if (url.pathname.match(/\.(jpg|jpeg|gif|png|webp|avif)$/)) {
           // image url
           content.images.push(word);
           // remove url from original content
           return word.replace(word, '');
         }
 
-        if (url.toString().match(/\.(mp4|mov|webm|wmv|flv|mts|avi|ogv|mkv|mp3|m3u8)$/)) {
+        if (url.pathname.match(/\.(mp4|mov|webm|wmv|flv|mts|avi|ogv|mkv|mp3|m3u8)$/)) {
           // video
           content.videos.push(word);
           // remove url from original content
-          word = word.replace(word, '');
+          return word.replace(word, '');
         }
 
         content.links.push(url.toString());