Skip to content

Commit 865a0f7

Browse files
committed
Removes mention marker from NIP-10 in support of q tags per nostr-protocol/nips#1750
1 parent ccf18f8 commit 865a0f7

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

ndk/src/events/content-tagger.test.ts

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ describe("await generateContentTags", () => {
3535
expect(processedTags).toEqual([
3636
["p", "fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52"],
3737
[
38-
"e",
38+
"q",
3939
"6ab77c8baf6d0542131cc70b59ba3ece904fd58efe91d612dc3e870bdaf93034",
4040
"",
41-
"mention",
4241
],
4342
]);
4443
});
@@ -74,10 +73,9 @@ describe("await generateContentTags", () => {
7473
["p", "existing_p"],
7574
["p", "fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52"],
7675
[
77-
"e",
76+
"q",
7877
"6ab77c8baf6d0542131cc70b59ba3ece904fd58efe91d612dc3e870bdaf93034",
7978
"",
80-
"mention",
8179
],
8280
]);
8381
});
@@ -98,10 +96,9 @@ describe("await generateContentTags", () => {
9896
);
9997
expect(processedTags).toEqual([
10098
[
101-
"e",
99+
"q",
102100
"8c9093d06a21a5b738e9d21d907334444e7ea12258c21da333e0fc265cf92a8b",
103101
"",
104-
"mention",
105102
],
106103
]);
107104
});
@@ -119,10 +116,9 @@ describe("await generateContentTags", () => {
119116
);
120117
expect(processedTags).toEqual([
121118
[
122-
"e",
119+
"q",
123120
"8c9093d06a21a5b738e9d21d907334444e7ea12258c21da333e0fc265cf92a8b",
124121
"",
125-
"mention",
126122
],
127123
]);
128124
});
@@ -140,10 +136,9 @@ describe("await generateContentTags", () => {
140136
);
141137
expect(processedTags).toEqual([
142138
[
143-
"a",
139+
"q",
144140
"30023:6389be6491e7b693e9f368ece88fcd145f07c068d2c1bbae4247b9b5ef439d32:283946",
145141
"",
146-
"mention",
147142
],
148143
["p", "6389be6491e7b693e9f368ece88fcd145f07c068d2c1bbae4247b9b5ef439d32"],
149144
]);
@@ -162,10 +157,9 @@ describe("await generateContentTags", () => {
162157
);
163158
expect(processedTags).toEqual([
164159
[
165-
"e",
160+
"q",
166161
"4b6d6da883fc7d74d3936b0a4e0fc8ed00fd505e9024e1ae9d96fc1d2616fe5c",
167162
"wss://nos.lol/",
168-
"mention",
169163
],
170164
["p", "b190175cef407c593f17c155480eda1a2ee7f6c84378eef0e97353f87ee59300"],
171165
]);
@@ -184,10 +178,9 @@ describe("await generateContentTags", () => {
184178
);
185179
expect(processedTags).toEqual([
186180
[
187-
"a",
181+
"q",
188182
"30023:6389be6491e7b693e9f368ece88fcd145f07c068d2c1bbae4247b9b5ef439d32:283946",
189183
"wss://nos.lol",
190-
"mention",
191184
],
192185
["p", "6389be6491e7b693e9f368ece88fcd145f07c068d2c1bbae4247b9b5ef439d32"],
193186
]);

ndk/src/events/content-tagger.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,9 @@ export async function generateContentTags(
138138
promises.push(
139139
new Promise(async (resolve) => {
140140
addTagIfNew([
141-
"e",
141+
"q",
142142
data,
143143
await maybeGetEventRelayUrl(entity),
144-
"mention",
145144
]);
146145
resolve();
147146
})
@@ -159,7 +158,7 @@ export async function generateContentTags(
159158
relays = [await maybeGetEventRelayUrl(entity)];
160159
}
161160

162-
addTagIfNew(["e", id, relays[0], "mention"]);
161+
addTagIfNew(["q", id, relays[0]]);
163162
if (author) addTagIfNew(["p", author]);
164163
resolve();
165164
})
@@ -177,7 +176,7 @@ export async function generateContentTags(
177176
relays = [await maybeGetEventRelayUrl(entity)];
178177
}
179178

180-
addTagIfNew(["a", id, relays[0], "mention"]);
179+
addTagIfNew(["q", id, relays[0]]);
181180
addTagIfNew(["p", data.pubkey]);
182181
resolve();
183182
})

0 commit comments

Comments
 (0)