Merge pull request #32 from codeforjapan/refactor/show-x-url-without-…

…post refactor: build x url without post
codeforjapan · Mar 9, 2025 · 896e0b1 · 896e0b1
2 parents 8667fa9 + 4721472
commit 896e0b1
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 22 deletions.
diff --git a/app/components/note/Note.tsx b/app/components/note/Note.tsx
@@ -2,7 +2,12 @@ import { Badge, Button, Card, Group, Stack, Text } from "@mantine/core";
 import { useMemo } from "react";
 
 import { LANGUAGE_ID_TO_LABEL } from "../../feature/search/language";
+import {
+  birdWatchLinkFromPostId,
+  postLinkFromPostId,
+} from "../../feature/twitter/link-builder";
 import type { SearchedNote } from "../../generated/api/schemas";
+import { isNonEmptyString } from "../../utils/string";
 import { Post } from "../post/Post";
 import { NoteStatus } from "./NoteStatus";
 import { NoteTopic } from "./NoteTopics";
@@ -56,28 +61,30 @@ export const Note = ({ note }: NoteProps) => {
           </div>
         </Stack>
         <Post post={note.post} />
-        <Group justify="flex-end">
-          <Button
-            color="pink"
-            component="a"
-            href={note.post.link}
-            size="xs"
-            target="_blank"
-            variant="light"
-          >
-            ポストを見る
-          </Button>
-          <Button
-            color="pink"
-            component="a"
-            href={`https://x.com/i/birdwatch/t/${note.post.postId}`}
-            size="xs"
-            target="_blank"
-            variant="light"
-          >
-            このポストについたノートを見る
-          </Button>
-        </Group>
+        {isNonEmptyString(note.postId) && (
+          <Group justify="flex-end">
+            <Button
+              color="pink"
+              component="a"
+              href={postLinkFromPostId(note.postId)}
+              size="xs"
+              target="_blank"
+              variant="light"
+            >
+              ポストを見る
+            </Button>
+            <Button
+              color="pink"
+              component="a"
+              href={birdWatchLinkFromPostId(note.postId)}
+              size="xs"
+              target="_blank"
+              variant="light"
+            >
+              このポストについたノートを見る
+            </Button>
+          </Group>
+        )}
       </Stack>
     </Card>
   );

diff --git a/app/feature/twitter/link-builder.ts b/app/feature/twitter/link-builder.ts
@@ -0,0 +1,8 @@
+export const birdWatchLinkFromPostId = (postId: string): string => {
+  return `https://x.com/i/birdwatch/t/${postId}`;
+};
+
+export const postLinkFromPostId = (postId: string): string => {
+  // X redirects to correct post url regardless of userId, so just specify `i`
+  return `https://x.com/i/status/${postId}`;
+};
diff --git a/app/utils/string.ts b/app/utils/string.ts
@@ -0,0 +1,2 @@
+export const isNonEmptyString = (value?: unknown): value is string =>
+  typeof value === "string" && value !== "";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export const isNonEmptyString = (value?: unknown): value is string =>
		typeof value === "string" && value !== "";