mirror of
https://github.com/PR0M3TH3AN/bitvid.git
synced 2026-11-06 12:52:26 +00:00
fix: apply block/mute list filtering to DM messages and conversations
The user's block/mute list (NIP-51) was not being checked when processing direct messages, allowing blocked users' messages to appear in conversations, trigger notifications, and increment unseen counts. This adds block filtering at four layers: - nostrService.applyDirectMessage: drops incoming DMs from blocked users before they enter the in-memory message cache - nostrService.persistDirectMessageRecord: prevents blocked DM senders from being persisted to IndexedDB or triggering notifications - profileModalController.buildDmConversationData: filters blocked users from the conversation list UI (catches pre-block persisted messages) - applicationBootstrap: excludes blocked-user conversations from the unread DM badge count The block checker is injected via setDmBlockChecker() to keep nostrService decoupled from userBlocks, wired up in app.js init(). https://claude.ai/code/session_01EAVLtAM14GN99Eik8otLg2
This commit is contained in:
5 files changed
+246
-1
No files matched your search
@@ -0,0 +1,173 @@
|
||||
import { describe, it, beforeEach, afterEach, mock } from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import nostrService from "../js/services/nostrService.js";
|
||||
|
||||
const ACTOR_PUBKEY = "aaaa".repeat(16);
|
||||
const BLOCKED_PUBKEY = "bbbb".repeat(16);
|
||||
const ALLOWED_PUBKEY = "cccc".repeat(16);
|
||||
|
||||
function makeDmMessage({ senderPubkey, receiverPubkey, eventId, direction }) {
|
||||
return {
|
||||
ok: true,
|
||||
direction: direction || "incoming",
|
||||
sender: { pubkey: senderPubkey },
|
||||
recipients: [{ pubkey: receiverPubkey }],
|
||||
remotePubkey:
|
||||
direction === "outgoing" ? receiverPubkey : senderPubkey,
|
||||
actorPubkey: direction === "outgoing" ? senderPubkey : receiverPubkey,
|
||||
timestamp: Math.floor(Date.now() / 1000),
|
||||
plaintext: "Hello",
|
||||
event: {
|
||||
id: eventId || `evt-${Math.random().toString(36).slice(2)}`,
|
||||
kind: 4,
|
||||
pubkey: senderPubkey,
|
||||
created_at: Math.floor(Date.now() / 1000),
|
||||
tags: [["p", receiverPubkey]],
|
||||
},
|
||||
message: {
|
||||
kind: 4,
|
||||
pubkey: senderPubkey,
|
||||
tags: [["p", receiverPubkey]],
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
describe("DM block/mute filtering", () => {
|
||||
beforeEach(() => {
|
||||
nostrService.dmMessages = [];
|
||||
nostrService.dmMessageIndex = new Map();
|
||||
nostrService.dmActorPubkey = ACTOR_PUBKEY;
|
||||
nostrService.dmHydratedFromSnapshot = false;
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
nostrService.setDmBlockChecker(null);
|
||||
nostrService.dmMessages = [];
|
||||
nostrService.dmMessageIndex = new Map();
|
||||
nostrService.dmActorPubkey = null;
|
||||
mock.reset();
|
||||
});
|
||||
|
||||
describe("setDmBlockChecker", () => {
|
||||
it("should accept a function", () => {
|
||||
nostrService.setDmBlockChecker(() => false);
|
||||
assert.equal(typeof nostrService._dmBlockChecker, "function");
|
||||
});
|
||||
|
||||
it("should clear checker when passed null", () => {
|
||||
nostrService.setDmBlockChecker(() => true);
|
||||
nostrService.setDmBlockChecker(null);
|
||||
assert.equal(nostrService._dmBlockChecker, null);
|
||||
});
|
||||
|
||||
it("should clear checker when passed non-function", () => {
|
||||
nostrService.setDmBlockChecker(() => true);
|
||||
nostrService.setDmBlockChecker("not-a-function");
|
||||
assert.equal(nostrService._dmBlockChecker, null);
|
||||
});
|
||||
});
|
||||
|
||||
describe("applyDirectMessage with block checker", () => {
|
||||
it("should drop messages from blocked senders", () => {
|
||||
nostrService.setDmBlockChecker((pubkey) => pubkey === BLOCKED_PUBKEY);
|
||||
|
||||
const message = makeDmMessage({
|
||||
senderPubkey: BLOCKED_PUBKEY,
|
||||
receiverPubkey: ACTOR_PUBKEY,
|
||||
eventId: "blocked-msg-1",
|
||||
direction: "incoming",
|
||||
});
|
||||
|
||||
nostrService.applyDirectMessage(message, { reason: "test" });
|
||||
|
||||
assert.equal(nostrService.dmMessages.length, 0);
|
||||
assert.equal(nostrService.dmMessageIndex.has("blocked-msg-1"), false);
|
||||
});
|
||||
|
||||
it("should allow messages from non-blocked senders", () => {
|
||||
nostrService.setDmBlockChecker((pubkey) => pubkey === BLOCKED_PUBKEY);
|
||||
|
||||
const message = makeDmMessage({
|
||||
senderPubkey: ALLOWED_PUBKEY,
|
||||
receiverPubkey: ACTOR_PUBKEY,
|
||||
eventId: "allowed-msg-1",
|
||||
direction: "incoming",
|
||||
});
|
||||
|
||||
nostrService.applyDirectMessage(message, { reason: "test" });
|
||||
|
||||
assert.equal(nostrService.dmMessages.length, 1);
|
||||
});
|
||||
|
||||
it("should allow all messages when no block checker is set", () => {
|
||||
const message = makeDmMessage({
|
||||
senderPubkey: BLOCKED_PUBKEY,
|
||||
receiverPubkey: ACTOR_PUBKEY,
|
||||
eventId: "no-checker-msg-1",
|
||||
direction: "incoming",
|
||||
});
|
||||
|
||||
nostrService.applyDirectMessage(message, { reason: "test" });
|
||||
|
||||
assert.equal(nostrService.dmMessages.length, 1);
|
||||
});
|
||||
|
||||
it("should block outgoing messages to blocked recipients", () => {
|
||||
nostrService.setDmBlockChecker((pubkey) => pubkey === BLOCKED_PUBKEY);
|
||||
|
||||
const message = makeDmMessage({
|
||||
senderPubkey: ACTOR_PUBKEY,
|
||||
receiverPubkey: BLOCKED_PUBKEY,
|
||||
eventId: "outgoing-blocked-1",
|
||||
direction: "outgoing",
|
||||
});
|
||||
|
||||
nostrService.applyDirectMessage(message, { reason: "test" });
|
||||
|
||||
assert.equal(nostrService.dmMessages.length, 0);
|
||||
});
|
||||
});
|
||||
|
||||
describe("_isDmRemoteBlocked", () => {
|
||||
it("should return false when no checker is set", () => {
|
||||
const message = makeDmMessage({
|
||||
senderPubkey: BLOCKED_PUBKEY,
|
||||
receiverPubkey: ACTOR_PUBKEY,
|
||||
direction: "incoming",
|
||||
});
|
||||
assert.equal(nostrService._isDmRemoteBlocked(message), false);
|
||||
});
|
||||
|
||||
it("should return true for blocked remote pubkey", () => {
|
||||
nostrService.setDmBlockChecker((pubkey) => pubkey === BLOCKED_PUBKEY);
|
||||
const message = makeDmMessage({
|
||||
senderPubkey: BLOCKED_PUBKEY,
|
||||
receiverPubkey: ACTOR_PUBKEY,
|
||||
direction: "incoming",
|
||||
});
|
||||
assert.equal(nostrService._isDmRemoteBlocked(message), true);
|
||||
});
|
||||
|
||||
it("should return false for allowed remote pubkey", () => {
|
||||
nostrService.setDmBlockChecker((pubkey) => pubkey === BLOCKED_PUBKEY);
|
||||
const message = makeDmMessage({
|
||||
senderPubkey: ALLOWED_PUBKEY,
|
||||
receiverPubkey: ACTOR_PUBKEY,
|
||||
direction: "incoming",
|
||||
});
|
||||
assert.equal(nostrService._isDmRemoteBlocked(message), false);
|
||||
});
|
||||
|
||||
it("should handle checker that throws", () => {
|
||||
nostrService.setDmBlockChecker(() => {
|
||||
throw new Error("checker error");
|
||||
});
|
||||
const message = makeDmMessage({
|
||||
senderPubkey: BLOCKED_PUBKEY,
|
||||
receiverPubkey: ACTOR_PUBKEY,
|
||||
direction: "incoming",
|
||||
});
|
||||
assert.equal(nostrService._isDmRemoteBlocked(message), false);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user