Support copying and deleting old-format bookmarks

web/src/lib/Author.ts

@@ -30,6 +30,11 @@ import {
 	replaceableKinds
 } from './Constants';
 import { bookmarkEvent, legacyBookmarkEvent } from './author/Bookmark';
+import {
+	isAddressableEventDeleted,
+	isDeletedLegacyBookmarkEvent,
+	restoreLegacyBookmarkDeletionState
+} from './author/Delete';
 import { legacyProfileBadgesKey, setProfileBadgesEvent } from './author/ProfileBadges';
 import { profileBadgesKind } from './ProfileBadgesEvent';
 import { contactsOfFolloweesReqEmit } from './author/MuteAutomatically';
@@ -121,8 +126,13 @@ export class Author {
 		}
 
 		bookmarkEvent.set(replaceableEvents.get(Kind.BookmarkList));
+		const legacyBookmark = parameterizedReplaceableEvents.get(
+			`${Kind.Genericlists}:${legacyBookmarkIdentifier}`
+		);
 		legacyBookmarkEvent.set(
-			parameterizedReplaceableEvents.get(`${Kind.Genericlists}:${legacyBookmarkIdentifier}`)
+			legacyBookmark !== undefined && isAddressableEventDeleted(legacyBookmark)
+				? undefined
+				: legacyBookmark
 		);
 		setProfileBadgesEvent(
 			replaceableEvents.get(profileBadgesKind),
@@ -196,6 +206,7 @@ export class Author {
 		parameterizedReplaceableEvents: Map<string, Event>;
 	}> {
 		const storage = new WebStorage(localStorage);
+		await restoreLegacyBookmarkDeletionState(pubkey, storage);
 		const cachedAt = storage.getCachedAt();
 		if (cachedAt !== null) {
 			console.log('[cached at]', new Date(cachedAt * 1000));
@@ -232,7 +243,9 @@ export class Author {
 			storage.setReplaceableEvent(event);
 		}
 		for (const [, event] of [...parameterizedReplaceableEvents]) {
-			storage.setParameterizedReplaceableEvent(event);
+			if (!isDeletedLegacyBookmarkEvent(event)) {
+				storage.setParameterizedReplaceableEvent(event);
+			}
 		}
 		return { replaceableEvents, parameterizedReplaceableEvents };
 	}

web/src/lib/List.ts

@@ -45,22 +45,29 @@ export async function decryptListContent(
 	pubkey: string,
 	content: string
 ): Promise<[tags: string[][], legacy: boolean]> {
-	if (content === '') {
-		return [[], false];
-	}
-
 	try {
-		const legacy = isLegacyEncryption(content);
-		const json = await (legacy
-			? Signer.decrypt(pubkey, content)
-			: Signer.decryptNip44(pubkey, content));
-		return [JSON.parse(json), legacy];
+		return await decryptListContentStrict(pubkey, content);
 	} catch (error) {
 		console.warn('[list parse error]', error);
 		return [[], false];
 	}
 }
 
+export async function decryptListContentStrict(
+	pubkey: string,
+	content: string
+): Promise<[tags: string[][], legacy: boolean]> {
+	if (content === '') {
+		return [[], false];
+	}
+
+	const legacy = isLegacyEncryption(content);
+	const json = await (legacy
+		? Signer.decrypt(pubkey, content)
+		: Signer.decryptNip44(pubkey, content));
+	return [JSON.parse(json), legacy];
+}
+
 export async function encryptListContent(
 	tags: string[][],
 	legacy: boolean = false

web/src/lib/WebStorage.ts

@@ -76,6 +76,10 @@ export class WebStorage {
 		}
 	}
 
+	public removeParameterizedReplaceableEvent(kind: number, identifier: string): void {
+		this.remove(`kind:${kind}:${identifier}`);
+	}
+
 	public getCachedAt(): number | null {
 		const cachedAt = this.get('cached_at');
 		return cachedAt === null ? null : Number(cachedAt);