Files
backspace/packages/web/src/components/modals/AddDmMemberModal.tsx
T
Jannis Braun 49e9047005 feat(client-federation): user-view cache for cross-instance DM render
Fixes a render bug where a federated user (e.g. axel@nova) appeared with
the federation globe icon and a broken avatar when viewed on his own home
instance. Root cause: `populateFromReady` is first-wins by federatedId and
discards the entire skipped DM payload — including its `members` array —
so when a sibling instance's ready arrived first, the home instance's view
of every shared user was dropped on the floor.

Adds a render-only `userViews` cache that mirrors the `dmAlternatives`
philosophy: information from skipped ready payloads is preserved for
rendering. Every wire surface that delivers a User upserts into the cache
regardless of dedup outcome; render sites read through a Zustand selector
hook to surface the home view when one is loaded. The DM channel ingestion
race is left untouched — the existing no-flapping invariant on origin
reconnect is intentional and load-bearing for failover.

Layered changes:

- `identity.ts`: `normalizeOriginToHost`, `canonicalUserKey`,
  `isDeliveryFromHome`, `isFederationGlobeApplicable` — single helpers
  for origin/host normalization and the home/stub tier decision.
- `spaceStore.ts`: `userViews` Map, `UserViewEntry` type, `upsertUserView`
  action with the home-wins preference rule, prune by `deliveredBy` in
  `removeInstanceSpaces` (mirrors `dmAlternatives` cleanup), `reset`
  clears.
- `userViewLookup.ts`: `useCanonicalUserView` (Zustand selector hook for
  React) + `getCanonicalUserView` (sync getter for non-React paths).
  Render reactivity is structural via the selector, not coincidence on
  legacy update paths.
- `populateFromReady` upsert pass runs BEFORE the federatedId dedup so
  members of skipped DMs still reach the cache.
- WS handlers (dm_message_*, message_*, user_updated, member_joined,
  friend_request_*, dm_channel_created, dm_member_added) and REST
  hydrators (socialStore, discoverStore, mutuals) feed the cache with
  their delivering origin.
- Render-site routing through `useCanonicalUserView` at every audited
  user-rendering site (sidebar, header, search, message bubble, reply
  chips, profile popout/modal, group settings, voice tiles, mention
  chips, member lists, friends, invites). Self-rendering sites compose
  alongside via existing `isSelf`/`resolveDisplayIdentity`.
- Globe predicate hoisted to `isFederationGlobeApplicable` and applied
  at three sites, gating on `domain !== window.location.host` so we
  never show the globe for users whose home IS our own.

Tests: 31 new unit tests across `identity`, `userViews` store, and
`userViewLookup`. Full suite 276/276.

Docs: `client-federation.md` §3 gains a "User View Cache" section
parallel to "DM Origin Failover"; `dm-system.md` notes the new store
action and WS handler upserts.

Bug 3 (federation profile-sync gap — orbit's stale profile data on
nova-Axel after a clear/color-change on nova never propagated)
remains open. The user-view cache routes around it for the common case
(home instance is connected), but the underlying S2S relay gap is its
own diagnosis and follows in a separate branch.
2026-05-05 01:59:05 +02:00

293 lines
10 KiB
TypeScript

import React, { useState, useRef, useEffect, useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
import { Modal } from '../ui/Modal';
import { Avatar } from '../ui/Avatar';
import { useUIStore } from '../../stores/uiStore';
import { useSpaceStore } from '../../stores/spaceStore';
import { useAuthStore } from '../../stores/authStore';
import { useSocialStore, type TaggedFriend } from '../../stores/socialStore';
import { api } from '../../api/client';
import { isSelf, parseFederatedUsername } from '../../utils/identity';
import { useCanonicalUserView } from '../../utils/userViewLookup';
import type { User } from '@backspace/shared';
function AddDmFriendRow({
friend,
isInDm,
isSelected,
atCapacity,
isAdding,
onToggle,
}: {
friend: TaggedFriend;
isInDm: boolean;
isSelected: boolean;
atCapacity: boolean;
isAdding: boolean;
onToggle: (id: string) => void;
}) {
const canonical = useCanonicalUserView(friend as unknown as User);
const { baseName } = parseFederatedUsername(canonical.username);
const friendDisplayName = canonical.displayName ?? baseName;
return (
<button
onClick={() => onToggle(friend.id)}
disabled={isInDm || isAdding || atCapacity}
className={`w-full flex items-center gap-3 px-3 py-2 rounded-[4px] transition-colors text-left ${
isInDm
? 'opacity-40 cursor-not-allowed'
: isSelected
? 'bg-accent-mint/[0.08]'
: 'hover:bg-interactive-hover'
} ${atCapacity && !isInDm ? 'opacity-50 cursor-not-allowed' : ''}`}
>
<Avatar
src={canonical.avatar}
name={friendDisplayName}
size={30}
status={canonical.status as any}
userId={canonical.homeUserId ?? canonical.id}
avatarColor={canonical.avatarColor}
/>
<div className="flex-1 min-w-0">
<div className="text-[13px] font-medium text-txt-primary truncate">
{friendDisplayName}
</div>
<div className="text-[11px] text-txt-tertiary truncate">
{isInDm ? 'Already in this DM' : `@${canonical.username}`}
</div>
</div>
{!isInDm && (
<div
className={`w-[18px] h-[18px] rounded flex-shrink-0 flex items-center justify-center ${
isSelected
? 'bg-accent-mint'
: 'border-2 border-border-hard'
}`}
>
{isSelected && (
<svg width="12" height="12" viewBox="0 0 12 12" fill="none" className="text-surface-base">
<path d="M2.5 6L5 8.5L9.5 3.5" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
</svg>
)}
</div>
)}
</button>
);
}
export function AddDmMemberModal() {
const [query, setQuery] = useState('');
const [selected, setSelected] = useState<Set<string>>(new Set());
const [error, setError] = useState('');
const [isAdding, setIsAdding] = useState(false);
const activeModal = useUIStore((s) => s.activeModal);
const modalData = useUIStore((s) => s.modalData);
const closeModal = useUIStore((s) => s.closeModal);
const dmChannels = useSpaceStore((s) => s.dmChannels);
const addDmChannel = useSpaceStore((s) => s.addDmChannel);
const friends = useSocialStore((s) => s.friends);
const navigate = useNavigate();
const myUser = useAuthStore((s) => s.user);
const inputRef = useRef<HTMLInputElement>(null);
const isOpen = activeModal === 'addDmMember';
const dmChannelId = modalData.dmChannelId as string | undefined;
const dmChannel = dmChannels.find(dm => dm.id === dmChannelId);
const currentMemberIds = useMemo(
() => new Set(dmChannel?.members.map(m => m.id) ?? []),
[dmChannel?.members],
);
const memberCount = dmChannel?.members.length ?? 0;
const maxMembers = 10;
const remainingSlots = maxMembers - memberCount;
// Filter friends: client-side search, exclude self
const filteredFriends = useMemo(() => {
const q = query.trim().toLowerCase();
return friends.filter((f) => {
if (isSelf(f, myUser)) return false;
if (!q) return true;
const displayName = (f.displayName ?? '').toLowerCase();
const username = f.username.toLowerCase();
return displayName.includes(q) || username.includes(q);
});
}, [friends, query, myUser]);
// Reset state when modal opens
useEffect(() => {
if (isOpen) {
setQuery('');
setSelected(new Set());
setError('');
setIsAdding(false);
setTimeout(() => inputRef.current?.focus(), 100);
}
}, [isOpen]);
const toggleFriend = (friendId: string) => {
if (currentMemberIds.has(friendId)) return;
setSelected((prev) => {
const next = new Set(prev);
if (next.has(friendId)) {
next.delete(friendId);
} else {
// Enforce remaining capacity
if (next.size >= remainingSlots) return prev;
next.add(friendId);
}
return next;
});
};
const removeFriend = (friendId: string) => {
setSelected((prev) => {
const next = new Set(prev);
next.delete(friendId);
return next;
});
};
const selectedFriends = useMemo(
() => friends.filter((f) => selected.has(f.id)),
[friends, selected],
);
const handleSubmit = async () => {
if (!dmChannelId || !dmChannel || isAdding || selectedFriends.length === 0) return;
setError('');
setIsAdding(true);
try {
if (!dmChannel.ownerId) {
// 1-on-1 DM → create a new group DM with all selected + existing other member
const otherMember = dmChannel.members.find(m => !isSelf(m, myUser));
if (!otherMember) {
setError('Could not determine the other member of this conversation.');
setIsAdding(false);
return;
}
const users = [
{ id: otherMember.id, homeUserId: otherMember.homeUserId, homeInstance: otherMember.homeInstance },
...selectedFriends.map((f) => ({
id: f.id,
homeUserId: f.homeUserId,
homeInstance: f.homeInstance,
})),
];
const newChannel = await api.dm.createGroup({ users, fromDmChannelId: dmChannelId });
addDmChannel(newChannel);
closeModal();
navigate(`/channels/@me/${newChannel.id}`);
} else {
// Existing group DM → add each friend sequentially
for (const friend of selectedFriends) {
await api.dm.addMember(dmChannelId, {
userId: friend.homeInstance ? undefined : friend.id,
homeUserId: friend.homeUserId ?? undefined,
homeInstance: friend.homeInstance ?? undefined,
});
}
closeModal();
}
} catch (err) {
setError((err as Error).message || 'Failed to add members');
} finally {
setIsAdding(false);
}
};
const buttonText = selectedFriends.length === 0
? 'Select Friends'
: `Add ${selectedFriends.length} Friend${selectedFriends.length > 1 ? 's' : ''}`;
return (
<Modal isOpen={isOpen} onClose={closeModal} title="Add Friends to DM" mobileStyle="sheet">
<div className="space-y-3">
{/* Header with member count */}
<div className="flex items-center justify-between">
<p className="text-[13px] text-txt-tertiary">
Select friends to add to this conversation.
</p>
<span className="text-[12px] text-txt-tertiary flex-shrink-0 ml-2">
{memberCount}/{maxMembers}
</span>
</div>
{/* Selected chips */}
{selectedFriends.length > 0 && (
<div className="flex gap-1.5 flex-wrap">
{selectedFriends.map((f) => (
<span
key={f.id}
className="flex items-center gap-1 px-2.5 py-1 rounded-full text-[12px] bg-accent-mint/15 text-accent-mint"
>
{f.displayName ?? parseFederatedUsername(f.username).baseName}
<button
onClick={() => removeFriend(f.id)}
className="opacity-60 hover:opacity-100 transition-opacity text-[14px] leading-none"
>
&times;
</button>
</span>
))}
</div>
)}
{/* Search input */}
<input
ref={inputRef}
type="text"
value={query}
onChange={(e) => setQuery(e.target.value)}
placeholder="Search friends..."
className="input-search w-full py-2 text-[14px]"
disabled={remainingSlots <= 0}
/>
{remainingSlots <= 0 && (
<p className="text-txt-danger text-[13px]">This group DM has reached the 10-member limit.</p>
)}
{error && (
<p className="text-txt-danger text-[13px]">{error}</p>
)}
{/* Friend list */}
<div className="max-h-[300px] overflow-y-auto space-y-[2px]">
{filteredFriends.length === 0 && (
<div className="py-4 text-center text-txt-tertiary text-[14px]">
{query.trim() ? 'No friends match your search' : 'No friends yet'}
</div>
)}
{filteredFriends.map((friend) => {
const isInDm = currentMemberIds.has(friend.id);
const isSelected = selected.has(friend.id);
const atCapacity = !isSelected && selected.size >= remainingSlots;
return (
<AddDmFriendRow
key={friend.id}
friend={friend}
isInDm={isInDm}
isSelected={isSelected}
atCapacity={atCapacity}
isAdding={isAdding}
onToggle={toggleFriend}
/>
);
})}
</div>
{/* Submit button */}
<button
onClick={handleSubmit}
disabled={selectedFriends.length === 0 || isAdding}
className="w-full py-2 rounded-md text-[13px] font-semibold transition-colors bg-accent-mint text-surface-base hover:bg-accent-mint/90 disabled:opacity-50 disabled:cursor-not-allowed"
>
{isAdding ? 'Adding...' : buttonText}
</button>
</div>
</Modal>
);
}