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
@@ -628,6 +628,15 @@ class Application {
|
||||
this.authService.hydrateFromStorage();
|
||||
this.renderSavedProfiles();
|
||||
|
||||
if (
|
||||
this.nostrService &&
|
||||
typeof this.nostrService.setDmBlockChecker === "function"
|
||||
) {
|
||||
this.nostrService.setDmBlockChecker((pubkey) =>
|
||||
this.isAuthorBlocked(pubkey),
|
||||
);
|
||||
}
|
||||
|
||||
loadModerationOverridesFromStorage();
|
||||
loadModerationSettingsFromStorage();
|
||||
loadDmPrivacySettingsFromStorage();
|
||||
|
||||
@@ -635,6 +635,7 @@ export class NostrService {
|
||||
logger: userLogger,
|
||||
});
|
||||
this.dmPreviewCache = new LRUCache({ maxSize: DM_PREVIEW_CACHE_LIMIT });
|
||||
this._dmBlockChecker = null;
|
||||
try {
|
||||
if (this.moderationService && typeof this.moderationService.setNostrClient === "function") {
|
||||
this.moderationService.setNostrClient(this.nostrClient);
|
||||
@@ -644,6 +645,28 @@ export class NostrService {
|
||||
}
|
||||
}
|
||||
|
||||
setDmBlockChecker(checker) {
|
||||
this._dmBlockChecker =
|
||||
typeof checker === "function" ? checker : null;
|
||||
}
|
||||
|
||||
_isDmRemoteBlocked(message, actorPubkey) {
|
||||
if (typeof this._dmBlockChecker !== "function") {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
const actor = normalizeHexPubkey(actorPubkey || this.dmActorPubkey || "");
|
||||
const remote = resolveDirectMessageRemotePubkey(message, actor);
|
||||
if (!remote) {
|
||||
return false;
|
||||
}
|
||||
return this._dmBlockChecker(remote);
|
||||
} catch (error) {
|
||||
devLogger.warn("[nostrService] Block check failed for DM", error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
log(...args) {
|
||||
try {
|
||||
this.logger(...args);
|
||||
@@ -810,6 +833,13 @@ export class NostrService {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (this._isDmRemoteBlocked(message, actorPubkey)) {
|
||||
devLogger.log("[nostrService] Skipping persist for blocked DM sender", {
|
||||
id: record.id,
|
||||
});
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
await writeMessages(record);
|
||||
const notificationResult = await this.dmNotificationManager.recordMessage({
|
||||
@@ -876,6 +906,11 @@ export class NostrService {
|
||||
return;
|
||||
}
|
||||
|
||||
if (this._isDmRemoteBlocked(normalized)) {
|
||||
devLogger.log("[nostrService] Dropping DM from blocked user", { eventId });
|
||||
return;
|
||||
}
|
||||
|
||||
this.dmMessageIndex.set(eventId, normalized);
|
||||
|
||||
const actor = normalizeHexPubkey(
|
||||
|
||||
@@ -798,8 +798,28 @@ export default class ApplicationBootstrap {
|
||||
try {
|
||||
const summaries =
|
||||
await app.nostrService.listDirectMessageConversationSummaries();
|
||||
const actorHex =
|
||||
typeof app.normalizeHexPubkey === "function" && app.pubkey
|
||||
? app.normalizeHexPubkey(app.pubkey)
|
||||
: "";
|
||||
const canCheckBlock =
|
||||
userBlocks && typeof userBlocks.isBlocked === "function";
|
||||
const totalUnseen = Array.isArray(summaries)
|
||||
? summaries.reduce((sum, summary) => {
|
||||
if (canCheckBlock && actorHex && summary?.conversation_id) {
|
||||
const parts = summary.conversation_id.split(":");
|
||||
const remote =
|
||||
parts.length === 3 && parts[0] === "dm"
|
||||
? parts[1] === actorHex
|
||||
? parts[2]
|
||||
: parts[2] === actorHex
|
||||
? parts[1]
|
||||
: ""
|
||||
: "";
|
||||
if (remote && userBlocks.isBlocked(remote)) {
|
||||
return sum;
|
||||
}
|
||||
}
|
||||
const count = Number(summary?.unseen_count);
|
||||
return sum + (Number.isFinite(count) ? count : 0);
|
||||
}, 0)
|
||||
|
||||
@@ -4197,7 +4197,15 @@ export class ProfileModalController {
|
||||
};
|
||||
}
|
||||
|
||||
const threads = this.groupDirectMessages(messages, actor);
|
||||
const allThreads = this.groupDirectMessages(messages, actor);
|
||||
const blocksService = this.services.userBlocks;
|
||||
const isRemoteBlocked =
|
||||
blocksService && typeof blocksService.isBlocked === "function"
|
||||
? (pubkey) => blocksService.isBlocked(pubkey)
|
||||
: () => false;
|
||||
const threads = allThreads.filter(
|
||||
(thread) => !thread.remoteHex || !isRemoteBlocked(thread.remoteHex),
|
||||
);
|
||||
const remoteKeys = new Set();
|
||||
threads.forEach((thread) => {
|
||||
if (thread.remoteHex) {
|
||||
|
||||
Reference in new issue
Block a user