Merge branch 'preview'

pdelfan · Dec 16, 2023 · ef4e20f · ef4e20f
2 parents 8636e74 + 6978a31
commit ef4e20f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/components/dataDisplay/profileBio/ProfileBio.tsx b/src/components/dataDisplay/profileBio/ProfileBio.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { getHandle } from "@/lib/utils/text";
+import { getHandle, getHostname, getShortAddress } from "@/lib/utils/text";
 import { RichText as RichTextHelper } from "@atproto/api";
 import Link from "next/link";
 import { Fragment } from "react";
@@ -40,13 +40,13 @@ export default function ProfileBio(props: Props) {
         text: segment.text,
         component: (
           <Link
-            className="text-primary break-all hover:text-primary-dark"
-            href={segment.link?.uri!}
+            className="inline-block text-primary break-all hover:text-primary-dark"
+            href={segment.link!.uri}
             target="blank"
-            key={segment.link?.uri}
+            key={segment.link!.uri}
             onClick={(e) => e.stopPropagation()}
           >
-            {segment.text}
+            {getShortAddress(segment.link!.uri)}
           </Link>
         ),
       });

diff --git a/src/lib/utils/text.ts b/src/lib/utils/text.ts
@@ -1,4 +1,3 @@
-import { BskyAgent, RichText } from "@atproto/api";
 import { JSONContent } from "@tiptap/react";
 
 export function getHandle(mention: string) {
@@ -16,6 +15,17 @@ export function getHostname(url: string) {
   return matches ? matches[1] : url.replace(/^www\./, "");
 }
 
+export function getShortAddress(url: string) {
+  const newURL = new URL(url);
+  const text = newURL.hostname + newURL.pathname;
+
+  if (text.endsWith("/")) {
+    return text.slice(0, -1);
+  }
+
+  return text;
+}
+
 export function getNotificationLabel(reason: string) {
   switch (reason) {
     case "like":