diff --git a/src/components/ui/XLogPost.tsx b/src/components/ui/XLogPost.tsx
index c5d8b553..b0e3259c 100644
--- a/src/components/ui/XLogPost.tsx
+++ b/src/components/ui/XLogPost.tsx
@@ -12,6 +12,7 @@ import { Loading } from "../common/Loading"
 import { Time } from "../common/Time"
 import PostCover from "../home/PostCover"
 import { Avatar } from "./Avatar"
+import { UniLink } from "./UniLink"
 
 interface Props {
   slug: string
@@ -33,119 +34,117 @@ const XLogPost: FC<Props> = ({ slug, handle, url }) => {
     translateTo: locale,
   })
 
-  const images = page.data?.metadata?.content?.attachments
-    ?.filter((attachment) => attachment.name === "image")
-    .map((img) => img.address || "")
-    .concat(page.data.metadata.content.images ?? [])
-    .filter(Boolean)
-
   const isMobile = isMobileDevice()
+  const images = page.data?.metadata.content.images || []
   const isShort = !!page.data?.metadata?.content?.tags?.includes("short")
 
-  const toggleExpand = useCallback(
+  const preventNavigate = useCallback(
     (e: React.MouseEvent<HTMLElement, MouseEvent>) => {
       e.stopPropagation()
-      setIsExpanded((prev) => !prev)
+      e.preventDefault()
     },
     [],
   )
 
-  const handleRedirect = useCallback(() => {
-    window.open(url, "_blank")
-  }, [url])
+  const toggleExpand = useCallback(
+    (e: React.MouseEvent<HTMLElement, MouseEvent>) => {
+      preventNavigate(e)
+      setIsExpanded((prev) => !prev)
+    },
+    [preventNavigate],
+  )
 
   if (page.isLoading) return <Loading />
 
   return (
-    <div
-      onClick={handleRedirect}
-      className={cn(
-        "flex flex-col md:flex-row w-full bg-zinc-50 rounded-xl p-4 gap-x-4 hover:cursor-pointer my-2",
-        isExpanded ? "sm:h-[350px]" : "sm:h-[150px]",
-        "transition-all duration-500 ease-in-out",
-      )}
-    >
+    <UniLink href={url} className="!no-underline !text-inherit">
       <div
-        onClick={(e) => e.stopPropagation()}
         className={cn(
-          "w-full h-full mb-2 sm:mb-0 align-middle flex items-center justify-center",
-          isExpanded ? "sm:w-[350px]" : "sm:w-[150px]",
-          "transition-all duration-500 ease-in-out",
+          "flex flex-col md:flex-row w-full bg-zinc-50 rounded-xl p-4 gap-x-4 hover:cursor-pointer my-2 transition-all duration-500 ease-in-out",
+          isExpanded ? "sm:h-[350px]" : "sm:h-[150px]",
         )}
       >
-        <PostCover
-          uniqueKey={`short-${page.data?.characterId}-${page.data?.noteId}`}
-          images={images}
-          title={page.data?.metadata?.content?.title}
-          className="rounded-lg w-full aspect-auto border-b-0 h-full"
-          imgClassName="rounded-lg object-contain"
-        />
-      </div>
-      <div className="flex-1 flex flex-col justify-between">
-        <div className="flex-1 flex flex-col overflow-hidden">
-          {page.data?.metadata?.content?.title && (
-            <div className="font-bold mb-2 text-lg truncate">
-              {page.data?.metadata?.content?.title}
-            </div>
+        <div
+          onClick={preventNavigate}
+          className={cn(
+            "w-full h-full mb-2 sm:mb-0 align-middle flex items-center justify-center transition-all duration-500 ease-in-out",
+            isExpanded ? "sm:w-[350px]" : "sm:w-[150px]",
           )}
-          <div className="prose overflow-y-auto">
-            <p
-              className={
-                isExpanded || isMobile ? "line-clamp-6" : "line-clamp-1"
-              }
-            >
-              {isShort
-                ? page.data?.metadata?.content?.content
-                : page.data?.metadata?.content?.summary}
-            </p>
+        >
+          <PostCover
+            uniqueKey={`short-${page.data?.characterId}-${page.data?.noteId}`}
+            images={images}
+            title={page.data?.metadata?.content?.title}
+            className="rounded-lg w-full aspect-auto border-b-0 h-full"
+            imgClassName="rounded-lg object-contain"
+          />
+        </div>
+        <div className="flex-1 flex flex-col justify-between">
+          <div className="flex-1 flex flex-col overflow-hidden">
+            {page.data?.metadata?.content?.title && (
+              <div className="font-bold mb-2 text-lg truncate">
+                {page.data?.metadata?.content?.title}
+              </div>
+            )}
+            <div className="prose overflow-y-auto">
+              <p
+                className={
+                  isExpanded || isMobile ? "line-clamp-6" : "line-clamp-1"
+                }
+              >
+                {isShort
+                  ? page.data?.metadata?.content?.content
+                  : page.data?.metadata?.content?.summary}
+              </p>
+            </div>
+          </div>
+
+          <div className="flex flex-row w-full justify-between items-end sm:mt-0 mt-4">
+            <span className="text-sm">
+              <Time isoString={page.data?.metadata?.content?.date_published} />
+            </span>
+
+            <span className="p-2 flex w-auto justify-end items-center transition-colors py-1 rounded-lg">
+              <Avatar
+                cid={site.data?.characterId}
+                className="align-middle"
+                images={site.data?.metadata?.content?.avatars || []}
+                name={site.data?.metadata?.content?.name}
+                size={32}
+              />
+
+              <div
+                className={`flex-1 flex-col min-w-0 ml-2 max-w-[100px] flex sm:mr-6`}
+              >
+                <span
+                  className={`text-left leading-none font-medium truncate text-gray-600 text-base`}
+                  style={{ marginBottom: "0.15rem" }}
+                >
+                  {site.data?.metadata?.content?.name}
+                </span>
+                {site.data?.handle && (
+                  <span
+                    className={`text-left leading-none text-sm truncate text-gray-400`}
+                  >
+                    {"@" + site.data?.handle}
+                  </span>
+                )}
+              </div>
+
+              <i
+                className={cn(
+                  "i-mingcute-arrows-down-line text-xl ml-[2px] text-accent hover:cursor-pointer",
+                  isExpanded ? "rotate-180" : "rotate-0",
+                  "transition-transform duration-500 ease-in-out",
+                  "hidden sm:inline-block",
+                )}
+                onClick={toggleExpand}
+              />
+            </span>
           </div>
         </div>
-
-        <div className="flex flex-row w-full justify-between items-end sm:mt-0 mt-4">
-          <span className="text-sm">
-            <Time isoString={page.data?.metadata?.content?.date_published} />
-          </span>
-
-          <span className="p-2 flex w-auto justify-end items-center transition-colors py-1 rounded-lg">
-            <Avatar
-              cid={site.data?.characterId}
-              className="align-middle"
-              images={site.data?.metadata?.content?.avatars || []}
-              name={site.data?.metadata?.content?.name}
-              size={32}
-            />
-
-            <div
-              className={`flex-1 flex-col min-w-0 ml-2 max-w-[100px] flex sm:mr-6`}
-            >
-              <span
-                className={`text-left leading-none font-medium truncate text-gray-600 text-base`}
-                style={{ marginBottom: "0.15rem" }}
-              >
-                {site.data?.metadata?.content?.name}
-              </span>
-              {site.data?.handle && (
-                <span
-                  className={`text-left leading-none text-sm truncate text-gray-400`}
-                >
-                  {"@" + site.data?.handle}
-                </span>
-              )}
-            </div>
-
-            <i
-              className={cn(
-                "i-mingcute-arrows-down-line text-xl ml-[2px] text-accent hover:cursor-pointer",
-                isExpanded ? "rotate-180" : "rotate-0",
-                "transition-transform duration-500 ease-in-out",
-                "hidden sm:inline-block",
-              )}
-              onClick={toggleExpand}
-            />
-          </span>
-        </div>
       </div>
-    </div>
+    </UniLink>
   )
 }