feat: track awaitingApprovalPeerOrigins and show login toast for pending approvals
This commit is contained in:
@@ -22,6 +22,12 @@ export function getRejectedPeerOrigins(): Set<string> {
|
|||||||
return rejectedPeerOrigins;
|
return rejectedPeerOrigins;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const awaitingApprovalPeerOrigins = new Set<string>();
|
||||||
|
|
||||||
|
export function getAwaitingApprovalPeerOrigins(): Set<string> {
|
||||||
|
return awaitingApprovalPeerOrigins;
|
||||||
|
}
|
||||||
|
|
||||||
// ─── Connection state ─────────────────────────────────────────────────────────
|
// ─── Connection state ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
interface ConnectionState {
|
interface ConnectionState {
|
||||||
@@ -381,6 +387,27 @@ function handleEvent(origin: string, event: ServerEvent): void {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Populate awaiting-approval peer origins
|
||||||
|
if (isHome) {
|
||||||
|
awaitingApprovalPeerOrigins.clear();
|
||||||
|
if (Array.isArray(event.awaitingApprovalPeerOrigins)) {
|
||||||
|
for (const o of event.awaitingApprovalPeerOrigins) {
|
||||||
|
awaitingApprovalPeerOrigins.add(o);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Admin toast for pending approval requests
|
||||||
|
if (event.pendingApprovalCount && event.pendingApprovalCount > 0) {
|
||||||
|
const { addToast } = useUIStore.getState();
|
||||||
|
const count = event.pendingApprovalCount;
|
||||||
|
addToast(
|
||||||
|
`You have ${count} pending peering request${count === 1 ? '' : 's'}`,
|
||||||
|
'info',
|
||||||
|
5000,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'message_created':
|
case 'message_created':
|
||||||
@@ -658,9 +685,10 @@ function handleEvent(origin: string, event: ServerEvent): void {
|
|||||||
case 'federation_peer_rejected': {
|
case 'federation_peer_rejected': {
|
||||||
const { addToast } = useUIStore.getState();
|
const { addToast } = useUIStore.getState();
|
||||||
rejectedPeerOrigins.add(event.peerOrigin);
|
rejectedPeerOrigins.add(event.peerOrigin);
|
||||||
|
awaitingApprovalPeerOrigins.delete(event.peerOrigin);
|
||||||
const label = event.peerLabel || event.peerOrigin;
|
const label = event.peerLabel || event.peerOrigin;
|
||||||
addToast(
|
addToast(
|
||||||
`Cannot relay messages to ${label} — their server requires manual peering approval. Contact their admin to set up peering.`,
|
`Cannot relay messages to ${label} — ${event.reason}`,
|
||||||
'warning',
|
'warning',
|
||||||
10000,
|
10000,
|
||||||
);
|
);
|
||||||
@@ -669,6 +697,7 @@ function handleEvent(origin: string, event: ServerEvent): void {
|
|||||||
|
|
||||||
case 'federation_peer_active': {
|
case 'federation_peer_active': {
|
||||||
rejectedPeerOrigins.delete(event.peerOrigin);
|
rejectedPeerOrigins.delete(event.peerOrigin);
|
||||||
|
awaitingApprovalPeerOrigins.delete(event.peerOrigin);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user