Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export const App = () => {
);
const [replyTarget, setReplyTarget] = useState<Status | null>(null);
const [selectedStatus, setSelectedStatus] = useState<Status | null>(null);
const [selectedStatusThreadAccount, setSelectedStatusThreadAccount] = useState<Account | null>(null);
const [selectedTimelineStatus, setSelectedTimelineStatus] = useState<SelectedTimelineStatus | null>(null);
const [profileTargets, setProfileTargets] = useState<ProfileTarget[]>([]);
const [statusModalZIndex, setStatusModalZIndex] = useState<number | null>(null);
Expand Down Expand Up @@ -891,8 +892,7 @@ export const App = () => {
const handleStatusClick = (status: Status, columnAccount: Account | null) => {
setSelectedStatus(status);
setStatusModalZIndex(nextModalZIndexRef.current++);
// Status에 columnAccount 정보를 임시 저장
(status as any).__columnAccount = columnAccount;
setSelectedStatusThreadAccount(columnAccount);
};

const handleProfileOpen = useCallback((target: Status, columnAccount: Account | null) => {
Expand All @@ -915,6 +915,7 @@ export const App = () => {
const handleCloseStatusModal = () => {
setSelectedStatus(null);
setStatusModalZIndex(null);
setSelectedStatusThreadAccount(null);
};

const handleReaction = useCallback(
Expand Down Expand Up @@ -1052,7 +1053,7 @@ export const App = () => {
<div className="app">
<header className="app-header">
<a href="#/" className="app-logo" aria-label="Deck 홈">
<img src={logoUrl} alt="Deck logo" />
<img src={logoUrl} alt="Deck 로고" />
</a>
<div className="app-header-actions">
<button
Expand Down Expand Up @@ -1122,7 +1123,7 @@ export const App = () => {
{route === "home" ? (
<section className="panel sidebar-panel">
<div className="brand">
<img src={logoUrl} alt="Deck logo" />
<img src={logoUrl} alt="Deck 로고" />
<div className="brand-text">
<h1>Deck</h1>
<p>오픈소스 페디버스 웹 클라이언트</p>
Expand Down Expand Up @@ -1370,7 +1371,7 @@ export const App = () => {
<StatusModal
status={selectedStatus}
account={composeAccount}
threadAccount={(selectedStatus as any).__columnAccount || null}
threadAccount={selectedStatusThreadAccount}
api={services.api}
zIndex={statusModalZIndex ?? undefined}
onClose={handleCloseStatusModal}
Expand Down
13 changes: 2 additions & 11 deletions src/infra/UnifiedApiClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ export class UnifiedApiClient implements MastodonApi {
}

fetchInstanceInfo(account: Account): Promise<InstanceInfo> {
const client = this.getClient(account) as any;
return client.fetchInstanceInfo(account);
return this.getClient(account).fetchInstanceInfo(account);
}

fetchAccountProfile(account: Account, accountId: string) {
Expand Down Expand Up @@ -128,14 +127,6 @@ export class UnifiedApiClient implements MastodonApi {
}

async fetchThreadContext(account: Account, statusId: string): Promise<ThreadContext> {
if (account.platform === "misskey") {
// MisskeyHttpClient에는 fetchConversation 메서드가 있음
const misskeyClient = this.getClient(account) as any;
return misskeyClient.fetchConversation(account, statusId);
} else {
// MastodonHttpClient에는 fetchContext 메서드가 있음
const mastodonClient = this.getClient(account) as any;
return mastodonClient.fetchContext(account, statusId);
}
return this.getClient(account).fetchThreadContext(account, statusId);
}
}
Loading