diff --git a/web/src/components/MemoReactionistView.tsx b/web/src/components/MemoReactionListView.tsx similarity index 89% rename from web/src/components/MemoReactionistView.tsx rename to web/src/components/MemoReactionListView.tsx index a2a0c339..36d65699 100644 --- a/web/src/components/MemoReactionistView.tsx +++ b/web/src/components/MemoReactionListView.tsx @@ -1,5 +1,6 @@ import { uniq } from "lodash-es"; import { memo, useEffect, useState } from "react"; +import useCurrentUser from "@/hooks/useCurrentUser"; import { extractUsernameFromName, useUserStore } from "@/store/v1"; import { Memo } from "@/types/proto/api/v2/memo_service"; import { Reaction, Reaction_Type } from "@/types/proto/api/v2/reaction_service"; @@ -14,6 +15,7 @@ interface Props { const MemoReactionListView = (props: Props) => { const { memo, reactions } = props; + const currentUser = useCurrentUser(); const userStore = useUserStore(); const [reactionGroup, setReactionGroup] = useState>(new Map()); @@ -31,8 +33,8 @@ const MemoReactionListView = (props: Props) => { }, [reactions]); return ( -
- +
+ {currentUser && } {Array.from(reactionGroup).map(([reactionType, users]) => { return ; })} diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index a666a53c..89320c85 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -20,7 +20,7 @@ import { showCommonDialog } from "./Dialog/CommonDialog"; import Icon from "./Icon"; import MemoContent from "./MemoContent"; import showMemoEditorDialog from "./MemoEditor/MemoEditorDialog"; -import MemoReactionistView from "./MemoReactionistView"; +import MemoReactionistView from "./MemoReactionListView"; import MemoRelationListView from "./MemoRelationListView"; import MemoResourceListView from "./MemoResourceListView"; import showPreviewImageDialog from "./PreviewImageDialog"; diff --git a/web/src/components/ReactionSelector.tsx b/web/src/components/ReactionSelector.tsx index e9624db6..e1493ebf 100644 --- a/web/src/components/ReactionSelector.tsx +++ b/web/src/components/ReactionSelector.tsx @@ -14,11 +14,11 @@ interface Props { const REACTION_TYPES = [ Reaction_Type.THUMBS_UP, + Reaction_Type.THUMBS_DOWN, + Reaction_Type.LAUGH, Reaction_Type.HEART, Reaction_Type.ROCKET, - Reaction_Type.LAUGH, Reaction_Type.EYES, - Reaction_Type.THUMBS_DOWN, ]; const ReactionSelector = (props: Props) => { diff --git a/web/src/components/ReactionView.tsx b/web/src/components/ReactionView.tsx index 61d75606..091b5806 100644 --- a/web/src/components/ReactionView.tsx +++ b/web/src/components/ReactionView.tsx @@ -40,9 +40,9 @@ const stringifyUsers = (users: User[]): string => { return users.map((user) => user.nickname || user.username).join(", "); } return `${users - .slice(0, 5) + .slice(0, 4) .map((user) => user.nickname || user.username) - .join(", ")} and ${users.length - 5} others`; + .join(", ")} and ${users.length - 4} others`; }; const ReactionView = (props: Props) => {