thePR0M3TH3AN/bitvid
1
0 Fork 0
mirror of https://github.com/PR0M3TH3AN/bitvid.git synced 2026-11-06 12:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(logs): suppress dm sync spam and allow local image paths"

Browse Source
This commit is contained in:
thePR0M3TH3AN authored and GitHub committed 2026-01-05 21:26:32 -05:00
1 parent 9e685b6b6a
commit 8a4e4754f2
4 files changed
+9 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

js/nostr/client.js
+4 -51
View File
@@ -1420,8 +1420,6 @@ export class NostrClient {
let generated = null;
if (typeof tools.generateSecretKey === "function") {
generated = tools.generateSecretKey();
} else if (typeof tools.generatePrivateKey === "function") {
generated = tools.generatePrivateKey();
}
if (generated instanceof Uint8Array) {
@@ -1449,27 +1447,7 @@ export class NostrClient {
if (!tools || typeof tools.getPublicKey !== "function") {
throw new Error("Public key derivation is unavailable for remote signing.");
}
try {
publicKey = tools.getPublicKey(privateKey);
} catch (error) {
// Retry with bytes if string input failed (likely nostr-tools v2)
const hexToBytes =
typeof tools.utils?.hexToBytes === "function"
? tools.utils.hexToBytes
: (hex) => {
if (typeof hex !== "string") return null;
const bytes = new Uint8Array(hex.length / 2);
for (let i = 0; i < hex.length; i += 2)
bytes[i / 2] = parseInt(hex.substring(i, i + 2), 16);
return bytes;
};
const bytes = hexToBytes(privateKey);
if (bytes) {
publicKey = tools.getPublicKey(bytes);
} else {
throw error;
}
}
publicKey = tools.getPublicKey(privateKey);
}
if (!publicKey || !HEX64_REGEX.test(publicKey)) {
@@ -2799,12 +2777,7 @@ export class NostrClient {
let privateKey = "";
try {
if (typeof tools.generateSecretKey === "function") {
const secret = tools.generateSecretKey();
if (secret instanceof Uint8Array) {
privateKey = bytesToHex(secret);
}
} else if (typeof tools.generatePrivateKey === "function") {
if (typeof tools.generatePrivateKey === "function") {
privateKey = tools.generatePrivateKey();
} else if (window?.crypto?.getRandomValues) {
const randomBytes = new Uint8Array(32);
@@ -2831,28 +2804,8 @@ export class NostrClient {
try {
pubkey = getPublicKey(normalizedPrivateKey);
} catch (error) {
// Retry with bytes if string input failed (likely nostr-tools v2)
try {
const hexToBytes =
typeof tools.utils?.hexToBytes === "function"
? tools.utils.hexToBytes
: (hex) => {
if (typeof hex !== "string") return null;
const bytes = new Uint8Array(hex.length / 2);
for (let i = 0; i < hex.length; i += 2)
bytes[i / 2] = parseInt(hex.substring(i, i + 2), 16);
return bytes;
};
const bytes = hexToBytes(normalizedPrivateKey);
if (bytes) {
pubkey = getPublicKey(bytes);
} else {
throw error;
}
} catch (retryError) {
devLogger.warn("[nostr] Failed to derive session pubkey:", error);
return null;
}
devLogger.warn("[nostr] Failed to derive session pubkey:", error);
return null;
}
const normalizedPubkey =