global fix and add tauri app
This commit is contained in:
lendry
@@ -1,8 +1,8 @@
|
||||
'use client';
|
||||
|
||||
import Link from 'next/link';
|
||||
import { useState } from 'react';
|
||||
import { Loader2, Search, UsersRound } from 'lucide-react';
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { Loader2, Pin, Search, UsersRound } from 'lucide-react';
|
||||
import { AvatarWithPresence } from '@/components/family/avatar-with-presence';
|
||||
import { FamilyGroupSelector } from '@/components/family/family-group-selector';
|
||||
import { FamilyInviteDialog } from '@/components/family/family-invite-dialog';
|
||||
@@ -11,6 +11,8 @@ import { useAuth } from '@/components/id/auth-provider';
|
||||
import { useSelectedFamily } from '@/hooks/use-primary-family';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { ChatRoom, fetchChatRooms, getApiErrorMessage, setChatRoomPinned } from '@/lib/api';
|
||||
import { useToast } from '@/components/id/toast-provider';
|
||||
|
||||
export function FamilySidebarPanel() {
|
||||
const { user, token } = useAuth();
|
||||
@@ -25,7 +27,64 @@ export function FamilySidebarPanel() {
|
||||
refresh
|
||||
} = useSelectedFamily(Boolean(user && token));
|
||||
const { openChatWithMember } = useFamilyOverlay();
|
||||
const { showToast } = useToast();
|
||||
const [inviteOpen, setInviteOpen] = useState(false);
|
||||
const [rooms, setRooms] = useState<ChatRoom[]>([]);
|
||||
const [pinningRoomId, setPinningRoomId] = useState<string | null>(null);
|
||||
const currentUserId = user?.id ?? '';
|
||||
|
||||
useEffect(() => {
|
||||
if (!group?.id || !token) {
|
||||
setRooms([]);
|
||||
return;
|
||||
}
|
||||
fetchChatRooms(group.id, token)
|
||||
.then((response) => setRooms(response.rooms ?? []))
|
||||
.catch(() => setRooms([]));
|
||||
}, [group?.id, token]);
|
||||
|
||||
const roomByPeerUserId = useMemo(() => {
|
||||
const map = new Map<string, ChatRoom>();
|
||||
for (const room of rooms) {
|
||||
if (room.type !== 'DIRECT' && room.type !== 'BOT' && room.type !== 'E2E') continue;
|
||||
const peer = room.members.find((member) => member.userId !== currentUserId);
|
||||
if (peer) map.set(peer.userId, room);
|
||||
}
|
||||
return map;
|
||||
}, [currentUserId, rooms]);
|
||||
|
||||
const sortedMembers = useMemo(() => {
|
||||
return [...(group?.members ?? [])].sort((left, right) => {
|
||||
const leftRoom = roomByPeerUserId.get(left.userId);
|
||||
const rightRoom = roomByPeerUserId.get(right.userId);
|
||||
const pinDiff = Number(Boolean(rightRoom?.isPinned)) - Number(Boolean(leftRoom?.isPinned));
|
||||
if (pinDiff !== 0) return pinDiff;
|
||||
if (leftRoom?.isPinned && rightRoom?.isPinned) {
|
||||
return (rightRoom.pinnedAt ?? '').localeCompare(leftRoom.pinnedAt ?? '');
|
||||
}
|
||||
if (left.userId === currentUserId) return -1;
|
||||
if (right.userId === currentUserId) return 1;
|
||||
return left.displayName.localeCompare(right.displayName, 'ru');
|
||||
});
|
||||
}, [currentUserId, group?.members, roomByPeerUserId]);
|
||||
|
||||
async function toggleMemberPinned(memberUserId: string) {
|
||||
const room = roomByPeerUserId.get(memberUserId);
|
||||
if (!room || !token) {
|
||||
showToast('Откройте чат с участником, чтобы его можно было закрепить');
|
||||
return;
|
||||
}
|
||||
setPinningRoomId(room.id);
|
||||
try {
|
||||
const updated = await setChatRoomPinned(room.id, !room.isPinned, token);
|
||||
setRooms((current) => current.map((item) => (item.id === updated.id ? updated : item)));
|
||||
showToast(updated.isPinned ? 'Чат закреплён' : 'Чат откреплён');
|
||||
} catch (error) {
|
||||
showToast(getApiErrorMessage(error, 'Не удалось закрепить чат') ?? 'Ошибка');
|
||||
} finally {
|
||||
setPinningRoomId(null);
|
||||
}
|
||||
}
|
||||
|
||||
if (!user || !token) return null;
|
||||
|
||||
@@ -69,49 +128,68 @@ export function FamilySidebarPanel() {
|
||||
Загрузка...
|
||||
</div>
|
||||
) : hasFamily ? (
|
||||
<div className="max-h-[220px] space-y-1 overflow-y-auto pr-1">
|
||||
{(group?.members ?? []).map((member) => {
|
||||
<div className="space-y-1 overflow-y-auto pr-1">
|
||||
{sortedMembers.map((member) => {
|
||||
const presence = presenceByUserId.get(member.userId);
|
||||
const isSelf = member.userId === user.id;
|
||||
const isSelf = member.userId === currentUserId;
|
||||
const memberRoom = roomByPeerUserId.get(member.userId);
|
||||
const memberPinned = Boolean(memberRoom?.isPinned);
|
||||
return (
|
||||
<button
|
||||
<div
|
||||
key={member.id}
|
||||
type="button"
|
||||
className={cn(
|
||||
'flex w-full items-center gap-2 rounded-xl px-2 py-1.5 text-left transition hover:bg-[#f4f5f8]',
|
||||
'flex w-full items-center gap-1 rounded-xl transition hover:bg-[#f4f5f8]',
|
||||
isSelf && 'bg-[#fafbfd]'
|
||||
)}
|
||||
onClick={() =>
|
||||
openChatWithMember(member.userId, member.displayName, {
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
className="flex min-w-0 flex-1 items-center gap-2 px-2 py-1.5 text-left"
|
||||
onClick={() => openChatWithMember(member.userId, member.displayName, {
|
||||
isBot: member.isBot,
|
||||
botUsername: member.botUsername
|
||||
})
|
||||
}
|
||||
title={isSelf ? 'Вы' : `Написать ${member.displayName}`}
|
||||
>
|
||||
<AvatarWithPresence
|
||||
userId={member.userId}
|
||||
displayName={member.displayName}
|
||||
hasAvatar={member.hasAvatar}
|
||||
token={token}
|
||||
isVerified={member.isVerified}
|
||||
verificationIcon={member.verificationIcon}
|
||||
online={isSelf ? undefined : presence?.online}
|
||||
className="h-8 w-8"
|
||||
/>
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="truncate text-[12px] font-medium leading-tight">
|
||||
{member.displayName}
|
||||
{member.isBot ? ' 🤖' : ''}
|
||||
{isSelf ? ' (Вы)' : ''}
|
||||
</p>
|
||||
{!isSelf ? (
|
||||
<p className={cn('truncate text-[10px]', member.isBot ? 'text-[#3390ec]' : presence?.online ? 'text-emerald-600' : 'text-[#a8adbc]')}>
|
||||
{member.isBot ? 'Бот' : presence?.online ? 'В сети' : 'Не в сети'}
|
||||
})}
|
||||
title={isSelf ? 'Вы' : `Написать ${member.displayName}`}
|
||||
>
|
||||
<AvatarWithPresence
|
||||
userId={member.userId}
|
||||
displayName={member.displayName}
|
||||
hasAvatar={member.hasAvatar}
|
||||
token={token}
|
||||
isVerified={member.isVerified}
|
||||
verificationIcon={member.verificationIcon}
|
||||
online={isSelf ? undefined : presence?.online}
|
||||
className="h-8 w-8"
|
||||
/>
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="flex min-w-0 items-center gap-1 truncate text-[12px] font-medium leading-tight">
|
||||
<span className="truncate">{member.displayName}</span>
|
||||
{member.isBot ? <span>🤖</span> : null}
|
||||
{isSelf ? <span>(Вы)</span> : null}
|
||||
{memberPinned ? <Pin className="h-3 w-3 shrink-0 fill-[#8a8f9e] text-[#8a8f9e]" /> : null}
|
||||
</p>
|
||||
) : null}
|
||||
</div>
|
||||
</button>
|
||||
{!isSelf ? (
|
||||
<p className={cn('truncate text-[10px]', member.isBot ? 'text-[#3390ec]' : presence?.online ? 'text-emerald-600' : 'text-[#a8adbc]')}>
|
||||
{member.isBot ? 'Бот' : presence?.online ? 'В сети' : 'Не в сети'}
|
||||
</p>
|
||||
) : null}
|
||||
</div>
|
||||
</button>
|
||||
{!isSelf ? (
|
||||
<button
|
||||
type="button"
|
||||
aria-label={memberPinned ? 'Открепить чат' : 'Закрепить чат'}
|
||||
className="mr-1 flex h-7 w-7 shrink-0 items-center justify-center rounded-lg text-[#8a8f9e] transition hover:bg-[#eceef4] hover:text-[#667085]"
|
||||
onClick={() => void toggleMemberPinned(member.userId)}
|
||||
>
|
||||
{pinningRoomId === memberRoom?.id ? (
|
||||
<Loader2 className="h-3.5 w-3.5 animate-spin" />
|
||||
) : (
|
||||
<Pin className={cn('h-3.5 w-3.5', memberPinned && 'fill-[#8a8f9e]')} />
|
||||
)}
|
||||
</button>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user