Skip to content

Commit bbd2fd6

Browse files
committed
Resurface hidden DMs from client activity
Signed-off-by: kenny lopez <[email protected]>
1 parent dcee330 commit bbd2fd6

20 files changed

Lines changed: 1351 additions & 62 deletions

‎desktop/src/app/AppShell.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import {
3434
useHideDmMutation,
3535
useOpenDmMutation,
3636
} from "@/features/channels/hooks";
37+
import { useDmResurfaceFromMessages } from "@/features/channels/useDmResurfaceFromMessages";
3738
import { useUnreadChannels } from "@/features/channels/useUnreadChannels";
3839
import { useMembershipNotifications } from "@/features/channels/useMembershipNotifications";
3940
import { useFeedItemState } from "@/features/home/useFeedItemState";
@@ -505,6 +506,11 @@ export function AppShell() {
505506
const { applyCanvas, applyAgents } = useApplyTemplate();
506507
const openDmMutation = useOpenDmMutation();
507508
const hideDmMutation = useHideDmMutation();
509+
useDmResurfaceFromMessages({
510+
pubkey: identityQuery.data?.pubkey,
511+
relayUrl: communitiesHook.activeCommunity?.relayUrl,
512+
reopen: openDmMutation.mutateAsync,
513+
});
508514
const {
509515
browseDialogType,
510516
openBrowseChannels: handleOpenBrowseChannels,
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import assert from "node:assert/strict";
2+
import test from "node:test";
3+
4+
import {
5+
dmPeerPubkeysFromMembers,
6+
isIncomingDmMessageFeedItem,
7+
isIncomingDmMessageRelayEvent,
8+
markHiddenDmFeedItems,
9+
} from "./dmResurface.ts";
10+
11+
const SELF = "1".repeat(64);
12+
const ALICE = "2".repeat(64);
13+
const BOB = "3".repeat(64);
14+
15+
function item(overrides = {}) {
16+
return {
17+
id: "event-1",
18+
kind: 9,
19+
pubkey: ALICE,
20+
content: "hello",
21+
createdAt: 10,
22+
channelId: "dm-1",
23+
channelName: "",
24+
tags: [
25+
["h", "dm-1"],
26+
["p", SELF],
27+
["p", BOB],
28+
],
29+
category: "mention",
30+
...overrides,
31+
};
32+
}
33+
34+
test("DM resurface derives peers from authoritative membership", () => {
35+
const members = [{ pubkey: SELF }, { pubkey: ALICE }, { pubkey: BOB }];
36+
assert.deepEqual(dmPeerPubkeysFromMembers(members, SELF), [ALICE, BOB]);
37+
assert.deepEqual(dmPeerPubkeysFromMembers([{ pubkey: ALICE }], SELF), []);
38+
});
39+
40+
test("only external addressed human messages qualify", () => {
41+
assert.equal(isIncomingDmMessageFeedItem(item(), SELF), true);
42+
assert.equal(isIncomingDmMessageFeedItem(item({ kind: 7 }), SELF), false);
43+
assert.equal(
44+
isIncomingDmMessageFeedItem(item({ pubkey: SELF }), SELF),
45+
false,
46+
);
47+
assert.equal(
48+
isIncomingDmMessageFeedItem(item({ tags: [["h", "dm-1"]] }), SELF),
49+
false,
50+
);
51+
});
52+
53+
test("hidden feed items are projected as DMs for Inbox presentation", () => {
54+
const feed = {
55+
feed: {
56+
mentions: [item()],
57+
needsAction: [],
58+
activity: [],
59+
agentActivity: [],
60+
},
61+
meta: { since: 0, total: 1, generatedAt: 10 },
62+
};
63+
const marked = markHiddenDmFeedItems(feed, new Set(["dm-1"]));
64+
assert.equal(marked.feed.mentions[0].channelType, "dm");
65+
});
66+
67+
test("relay events use the same eligibility contract", () => {
68+
const relayEvent = {
69+
id: "event-1",
70+
kind: 40002,
71+
pubkey: ALICE,
72+
content: "hello",
73+
created_at: 10,
74+
tags: [
75+
["h", "dm-1"],
76+
["p", SELF],
77+
["p", BOB],
78+
],
79+
sig: "",
80+
};
81+
assert.equal(isIncomingDmMessageRelayEvent(relayEvent, SELF), true);
82+
});
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
import type {
2+
ChannelMember,
3+
FeedItem,
4+
HomeFeedResponse,
5+
RelayEvent,
6+
} from "@/shared/api/types";
7+
import { CHANNEL_MESSAGE_EVENT_KINDS } from "@/shared/constants/kinds";
8+
import { normalizePubkey } from "@/shared/lib/pubkey";
9+
10+
const CHANNEL_MESSAGE_KINDS = new Set<number>(CHANNEL_MESSAGE_EVENT_KINDS);
11+
const HEX_PUBKEY = /^[0-9a-f]{64}$/;
12+
13+
export function dmPeerPubkeysFromMembers(
14+
members: readonly Pick<ChannelMember, "pubkey">[],
15+
currentPubkey: string | undefined,
16+
): string[] {
17+
const self = normalizePubkey(currentPubkey ?? "");
18+
const normalized = [
19+
...new Set(members.map((member) => normalizePubkey(member.pubkey))),
20+
].filter((pubkey) => HEX_PUBKEY.test(pubkey));
21+
if (!HEX_PUBKEY.test(self) || !normalized.includes(self)) return [];
22+
return normalized.filter((pubkey) => pubkey !== self);
23+
}
24+
25+
export function isIncomingDmMessageFeedItem(
26+
item: FeedItem,
27+
currentPubkey: string | undefined,
28+
): boolean {
29+
const self = normalizePubkey(currentPubkey ?? "");
30+
if (
31+
!item.channelId ||
32+
self.length === 0 ||
33+
!CHANNEL_MESSAGE_KINDS.has(item.kind) ||
34+
normalizePubkey(item.pubkey) === self
35+
) {
36+
return false;
37+
}
38+
39+
return item.tags.some(
40+
(tag) => tag[0] === "p" && normalizePubkey(tag[1] ?? "") === self,
41+
);
42+
}
43+
44+
export function isIncomingDmMessageRelayEvent(
45+
event: RelayEvent,
46+
currentPubkey: string | undefined,
47+
): boolean {
48+
return isIncomingDmMessageFeedItem(
49+
{
50+
id: event.id,
51+
kind: event.kind,
52+
pubkey: event.pubkey,
53+
content: event.content,
54+
createdAt: event.created_at,
55+
channelId:
56+
event.tags.find((tag) => tag[0] === "h" && tag[1])?.[1] ?? null,
57+
channelName: "",
58+
tags: event.tags,
59+
category: "mention",
60+
},
61+
currentPubkey,
62+
);
63+
}
64+
65+
export function relayEventChannelId(event: RelayEvent): string | null {
66+
return event.tags.find((tag) => tag[0] === "h" && tag[1])?.[1] ?? null;
67+
}
68+
69+
export function markHiddenDmFeedItems(
70+
feed: HomeFeedResponse,
71+
hiddenDmIds: ReadonlySet<string>,
72+
): HomeFeedResponse {
73+
if (hiddenDmIds.size === 0) return feed;
74+
75+
const mark = (item: FeedItem): FeedItem =>
76+
item.channelId && hiddenDmIds.has(item.channelId)
77+
? { ...item, channelType: "dm" }
78+
: item;
79+
80+
return {
81+
...feed,
82+
feed: {
83+
mentions: feed.feed.mentions.map(mark),
84+
needsAction: feed.feed.needsAction.map(mark),
85+
activity: feed.feed.activity.map(mark),
86+
agentActivity: feed.feed.agentActivity.map(mark),
87+
},
88+
};
89+
}
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
import assert from "node:assert/strict";
2+
import test from "node:test";
3+
4+
import { resurfaceHiddenDmMessage } from "./hiddenDmResurfaceAction.ts";
5+
6+
const SELF = "1".repeat(64);
7+
const ALICE = "2".repeat(64);
8+
const BOB = "3".repeat(64);
9+
10+
function event() {
11+
return {
12+
id: "event-1",
13+
kind: 40002,
14+
pubkey: ALICE,
15+
content: "hello",
16+
created_at: 10,
17+
// Message p tags are intentionally incomplete for this group DM.
18+
tags: [
19+
["h", "hidden-dm"],
20+
["p", SELF],
21+
],
22+
sig: "",
23+
};
24+
}
25+
26+
function member(pubkey) {
27+
return {
28+
pubkey,
29+
role: "member",
30+
isAgent: false,
31+
joinedAt: "",
32+
displayName: null,
33+
};
34+
}
35+
36+
test("reopens the source hidden group DM from authoritative membership", async () => {
37+
const inputs = [];
38+
assert.equal(
39+
await resurfaceHiddenDmMessage({
40+
event: event(),
41+
expectedRelayUrl: "wss://relay.example",
42+
expectedSignerPubkey: SELF,
43+
fetchHiddenDmIds: async () => new Set(["hidden-dm"]),
44+
fetchMembers: async () => [member(SELF), member(ALICE), member(BOB)],
45+
isCurrent: () => true,
46+
reopen: async (input) => {
47+
inputs.push(input);
48+
return { id: "hidden-dm" };
49+
},
50+
}),
51+
true,
52+
);
53+
assert.deepEqual(inputs, [
54+
{
55+
pubkeys: [ALICE, BOB],
56+
expectedRelayUrl: "wss://relay.example",
57+
expectedSignerPubkey: SELF,
58+
},
59+
]);
60+
});
61+
62+
test("a suspended old-community read cannot reopen a DM", async () => {
63+
let current = true;
64+
let resume;
65+
const members = new Promise((resolve) => {
66+
resume = resolve;
67+
});
68+
let reopenCount = 0;
69+
const result = resurfaceHiddenDmMessage({
70+
event: event(),
71+
expectedRelayUrl: "wss://old.example",
72+
expectedSignerPubkey: SELF,
73+
fetchHiddenDmIds: async () => new Set(["hidden-dm"]),
74+
fetchMembers: async () => members,
75+
isCurrent: () => current,
76+
reopen: async () => {
77+
reopenCount += 1;
78+
return { id: "hidden-dm" };
79+
},
80+
});
81+
await Promise.resolve();
82+
current = false;
83+
resume([member(SELF), member(ALICE)]);
84+
assert.equal(await result, false);
85+
assert.equal(reopenCount, 0);
86+
});
87+
88+
test("rejects a reopen result for any channel other than the source", async () => {
89+
await assert.rejects(
90+
resurfaceHiddenDmMessage({
91+
event: event(),
92+
expectedRelayUrl: "wss://relay.example",
93+
expectedSignerPubkey: SELF,
94+
fetchHiddenDmIds: async () => new Set(["hidden-dm"]),
95+
fetchMembers: async () => [member(SELF), member(ALICE)],
96+
isCurrent: () => true,
97+
reopen: async () => ({ id: "alternate-dm" }),
98+
}),
99+
/different DM conversation/,
100+
);
101+
});
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import type { ChannelMember, RelayEvent } from "@/shared/api/types";
2+
import type { OpenDmInput } from "@/shared/api/tauriChannels";
3+
import {
4+
dmPeerPubkeysFromMembers,
5+
isIncomingDmMessageRelayEvent,
6+
relayEventChannelId,
7+
} from "./dmResurface";
8+
9+
type HiddenDmResurfaceActionOptions = {
10+
event: RelayEvent;
11+
expectedRelayUrl: string;
12+
expectedSignerPubkey: string;
13+
fetchHiddenDmIds: () => Promise<ReadonlySet<string>>;
14+
fetchMembers: (channelId: string) => Promise<readonly ChannelMember[]>;
15+
isCurrent: () => boolean;
16+
reopen: (input: OpenDmInput) => Promise<{ id: string }>;
17+
};
18+
19+
export async function resurfaceHiddenDmMessage({
20+
event,
21+
expectedRelayUrl,
22+
expectedSignerPubkey,
23+
fetchHiddenDmIds,
24+
fetchMembers,
25+
isCurrent,
26+
reopen,
27+
}: HiddenDmResurfaceActionOptions): Promise<boolean> {
28+
if (!isIncomingDmMessageRelayEvent(event, expectedSignerPubkey)) return false;
29+
const channelId = relayEventChannelId(event);
30+
if (!channelId) return false;
31+
32+
const hiddenDmIds = await fetchHiddenDmIds();
33+
if (!isCurrent() || !hiddenDmIds.has(channelId)) return false;
34+
35+
const members = await fetchMembers(channelId);
36+
if (!isCurrent()) return false;
37+
const pubkeys = dmPeerPubkeysFromMembers(members, expectedSignerPubkey);
38+
if (pubkeys.length === 0) return false;
39+
40+
const opened = await reopen({
41+
pubkeys,
42+
expectedRelayUrl,
43+
expectedSignerPubkey,
44+
});
45+
if (!isCurrent()) return false;
46+
if (opened.id !== channelId) {
47+
throw new Error("Relay reopened a different DM conversation.");
48+
}
49+
return true;
50+
}

‎desktop/src/features/channels/hooks.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import {
5353
CHANNEL_MEMBERS_STALE_TIME_MS,
5454
channelMembersQueryKey,
5555
} from "@/features/channels/rosterFreshness";
56+
import { dmVisibilityQueryKey } from "@/features/channels/useHiddenDmIds";
5657

5758
export const channelsQueryKey = ["channels"] as const;
5859
/** Keeps focused polling at the established one-minute cadence. */
@@ -537,6 +538,14 @@ export function useOpenDmMutation() {
537538
queryClient.setQueryData<Channel[]>(channelsQueryKey, (current) =>
538539
upsertCachedChannel(current, openedChannel),
539540
);
541+
queryClient.setQueriesData<Set<string>>(
542+
{ queryKey: dmVisibilityQueryKey },
543+
(current) => {
544+
const next = new Set(current);
545+
next.delete(openedChannel.id);
546+
return next;
547+
},
548+
);
540549
},
541550
onSettled: () => {
542551
// The relay-returned DM is already in the cache. Mark the list stale so
@@ -546,6 +555,7 @@ export function useOpenDmMutation() {
546555
queryKey: channelsQueryKey,
547556
refetchType: "none",
548557
});
558+
void queryClient.invalidateQueries({ queryKey: dmVisibilityQueryKey });
549559
},
550560
});
551561
}
@@ -591,8 +601,17 @@ export function useHideDmMutation() {
591601
queryClient.setQueryData(channelsQueryKey, context.previous);
592602
}
593603
},
604+
onSuccess: (_data, channelId) => {
605+
queryClient.setQueriesData<Set<string>>(
606+
{ queryKey: dmVisibilityQueryKey },
607+
(current) => new Set(current).add(channelId),
608+
);
609+
},
594610
onSettled: async () => {
595-
await queryClient.invalidateQueries({ queryKey: channelsQueryKey });
611+
await Promise.all([
612+
queryClient.invalidateQueries({ queryKey: channelsQueryKey }),
613+
queryClient.invalidateQueries({ queryKey: dmVisibilityQueryKey }),
614+
]);
596615
},
597616
});
598617
}

0 commit comments

Comments
 (0)