devsyncwrld/backspace
1
0
Fork 0
Code Issues Pull Requests Actions 40 Packages Projects Releases 1 Wiki Activity

chore: clean up review feedback — consolidate imports, fix reconnect verb, DRY username

Browse Source
This commit is contained in:
Jannis Braun
2026-03-24 18:42:45 +01:00
parent a97dc95877
commit 52c93ae0c5
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/web/src/components/chat/FriendsPage.tsx
+3 -5
View File
@@ -88,7 +88,8 @@ export function FriendsPage({ mobile }: FriendsPageProps) {
try {
await sendFriendRequest(username);
setAddStatus({ type: 'success', message: `Connected to ${domain} — friend request sent!` });
const verb = result === 'reconnect' ? 'Reconnected to' : 'Connected to';
setAddStatus({ type: 'success', message: `${verb} ${domain} — friend request sent!` });
setAddUsername('');
} catch (err) {
addToast((err as Error).message, 'warning');
@@ -583,17 +584,14 @@ function UserDiscoverCard({
const handleSendRequest = async () => {
setActionLoading(true);
setError('');
const username = user._instanceOrigin ? baseName + '@' + (originLabel ?? '') : baseName;
try {
// For federated users, use user@host format
const username = user._instanceOrigin ? baseName + '@' + (originLabel ?? '') : baseName;
const requestId = await sendFriendRequest(username);
updateRelationship(user.id, user._instanceOrigin, 'outbound_pending', requestId);
} catch (err) {
if (err instanceof InstanceNotConnectedError) {
const username = user._instanceOrigin ? baseName + '@' + (originLabel ?? '') : baseName;
setConnectModal({ domain: err.domain, isReconnect: false, username });
} else if (err instanceof InstanceDisconnectedError) {
const username = user._instanceOrigin ? baseName + '@' + (originLabel ?? '') : baseName;
setConnectModal({ domain: err.domain, isReconnect: true, username });
} else {
setError(err instanceof Error ? err.message : 'Failed to send request');
packages/web/src/hooks/useInstanceConnect.ts
+1 -2
View File
@@ -1,6 +1,5 @@
import { useState, useCallback } from 'react';
import { useInstanceStore } from '../stores/instanceStore';
import { DifferentPasswordError } from '../stores/instanceStore';
import { useInstanceStore, DifferentPasswordError } from '../stores/instanceStore';
/**
* Reusable hook for connecting to a federated instance.