+
+
+
+
diff --git a/js/accessControl.js b/js/accessControl.js
index 4cc051ba..bb19970d 100644
--- a/js/accessControl.js
+++ b/js/accessControl.js
@@ -1,228 +1,401 @@
// js/accessControl.js
-import { isDevMode, isWhitelistEnabled } from "./config.js";
-import { initialWhitelist, initialBlacklist } from "./lists.js";
+import {
+ ADMIN_EDITORS_NPUBS,
+ ADMIN_SUPER_NPUB,
+ getWhitelistMode,
+ setWhitelistMode as persistWhitelistMode,
+ ADMIN_WHITELIST_MODE_STORAGE_KEY,
+} from "./config.js";
+import { loadAdminState, persistAdminState } from "./adminListStore.js";
+
+function normalizeNpub(value) {
+ return typeof value === "string" ? value.trim() : "";
+}
+
+function dedupeNpubs(values) {
+ const normalized = Array.isArray(values) ? values.map(normalizeNpub) : [];
+ return Array.from(
+ normalized.reduce((set, npub) => {
+ if (npub) {
+ set.add(npub);
+ }
+ return set;
+ }, new Set())
+ );
+}
+
+function isValidNpub(npub) {
+ if (typeof npub !== "string") {
+ return false;
+ }
+ const trimmed = npub.trim();
+ if (!trimmed) {
+ return false;
+ }
+
+ try {
+ const decoded = window?.NostrTools?.nip19?.decode(trimmed);
+ return decoded?.type === "npub";
+ } catch (error) {
+ return false;
+ }
+}
class AccessControl {
constructor() {
- // Debug logging for initialization
- console.log("DEBUG: AccessControl constructor called");
-
- const { data: storedWhitelist, status: whitelistStatus } = this.loadWhitelist();
- const { data: storedBlacklist, status: blacklistStatus } = this.loadBlacklist();
-
- if (storedWhitelist !== null) {
- this.whitelist = new Set(storedWhitelist);
- } else {
- this.whitelist = new Set(initialWhitelist);
- this.saveWhitelist();
- if (whitelistStatus && whitelistStatus !== "missing") {
- console.warn(
- `Whitelist storage ${whitelistStatus}. Falling back to initial whitelist.`
- );
- }
- }
-
- if (storedBlacklist !== null) {
- this.blacklist = new Set(storedBlacklist);
- } else {
- this.blacklist = new Set(initialBlacklist.filter((x) => x)); // Filter out empty strings
- this.saveBlacklist();
- if (blacklistStatus && blacklistStatus !== "missing") {
- console.warn(
- `Blacklist storage ${blacklistStatus}. Falling back to initial blacklist.`
- );
- }
- }
-
- // Debug the sets
- console.log("DEBUG: Whitelist after initialization:", [...this.whitelist]);
- console.log("DEBUG: Blacklist after initialization:", [...this.blacklist]);
+ this.editors = new Set();
+ this.whitelist = new Set();
+ this.blacklist = new Set();
+ this.whitelistEnabled = getWhitelistMode();
+ this.hasLoaded = false;
+ this.lastError = null;
+ this._isRefreshing = false;
+ this._refreshPromise = this._performRefresh();
+ this._refreshPromise.catch((error) => {
+ console.error("Failed to load admin lists:", error);
+ });
}
- // Rest of the class remains the same...
- loadWhitelist() {
+ async _performRefresh() {
+ if (this._isRefreshing) {
+ return this._refreshPromise;
+ }
+
+ this._isRefreshing = true;
try {
- const stored = localStorage.getItem("bitvid_whitelist");
- if (!stored) {
- if (isDevMode) console.log("No stored whitelist found in localStorage.");
- return { data: null, status: "missing" };
- }
+ const state = await loadAdminState();
+ const editors = Array.isArray(state?.editors) ? state.editors : [];
+ const whitelist = Array.isArray(state?.whitelist)
+ ? state.whitelist
+ : [];
+ const blacklist = Array.isArray(state?.blacklist)
+ ? state.blacklist
+ : [];
- const parsed = JSON.parse(stored);
- const sanitized = this.sanitizeList(parsed, "whitelist");
- return {
- data: sanitized,
- status: sanitized === null ? "invalid" : "ok",
- };
- } catch (error) {
- console.error("Error loading whitelist, using defaults:", error);
- return { data: null, status: "error" };
- }
- }
-
- loadBlacklist() {
- try {
- const stored = localStorage.getItem("bitvid_blacklist");
- if (!stored) {
- if (isDevMode) console.log("No stored blacklist found in localStorage.");
- return { data: null, status: "missing" };
- }
-
- const parsed = JSON.parse(stored);
- const sanitized = this.sanitizeList(parsed, "blacklist");
- return {
- data: sanitized,
- status: sanitized === null ? "invalid" : "ok",
- };
- } catch (error) {
- console.error("Error loading blacklist, using defaults:", error);
- return { data: null, status: "error" };
- }
- }
-
- sanitizeList(list, listName) {
- if (!Array.isArray(list)) {
- console.warn(
- `Stored ${listName} is not an array. Received:`,
- list
+ this.editors = new Set(
+ dedupeNpubs([...ADMIN_EDITORS_NPUBS, ...editors])
);
- return null;
- }
+ const normalizedWhitelist = dedupeNpubs(whitelist);
+ this.whitelist = new Set(normalizedWhitelist);
- const sanitized = [];
- let invalidEntries = 0;
+ const blacklistDedupe = dedupeNpubs(blacklist);
+ const whitelistSet = new Set(normalizedWhitelist.map(normalizeNpub));
+ const adminGuardSet = new Set([
+ normalizeNpub(ADMIN_SUPER_NPUB),
+ ...Array.from(this.editors),
+ ]);
+ const sanitizedBlacklist = blacklistDedupe.filter((npub) => {
+ const normalized = normalizeNpub(npub);
+ if (!normalized) {
+ return false;
+ }
+ if (whitelistSet.has(normalized)) {
+ return false;
+ }
+ if (adminGuardSet.has(normalized)) {
+ return false;
+ }
+ return true;
+ });
+ this.blacklist = new Set(sanitizedBlacklist);
- list.forEach((value) => {
- if (typeof value !== "string") {
- invalidEntries += 1;
- return;
+ this.whitelistEnabled = getWhitelistMode();
+ this.hasLoaded = true;
+ this.lastError = null;
+ } catch (error) {
+ this.lastError = error;
+ if (!this.hasLoaded) {
+ this.editors.clear();
+ this.whitelist.clear();
+ this.blacklist.clear();
}
+ throw error;
+ } finally {
+ this._isRefreshing = false;
+ }
+ }
- const trimmed = value.trim();
- if (trimmed) {
- sanitized.push(trimmed);
+ refresh() {
+ const promise = this._performRefresh();
+ this._refreshPromise = promise;
+ promise.catch((error) => {
+ console.error("Failed to refresh admin lists:", error);
+ });
+ return promise;
+ }
+
+ async ensureReady() {
+ try {
+ await this._refreshPromise;
+ } catch (error) {
+ if (!this.hasLoaded) {
+ await this.refresh();
+ await this._refreshPromise;
} else {
- invalidEntries += 1;
+ throw error;
}
- });
-
- if (invalidEntries > 0) {
- console.warn(
- `Stored ${listName} contained ${invalidEntries} invalid entr${
- invalidEntries === 1 ? "y" : "ies"
- }. Sanitized list:`,
- sanitized
- );
- }
-
- return sanitized;
- }
-
- saveWhitelist() {
- try {
- localStorage.setItem(
- "bitvid_whitelist",
- JSON.stringify([...this.whitelist])
- );
- } catch (error) {
- console.error("Error saving whitelist:", error);
}
}
- saveBlacklist() {
- try {
- localStorage.setItem(
- "bitvid_blacklist",
- JSON.stringify([...this.blacklist])
- );
- } catch (error) {
- console.error("Error saving blacklist:", error);
- }
+ whitelistMode() {
+ return this.whitelistEnabled;
}
- addToWhitelist(npub) {
- if (!this.isValidNpub(npub)) {
- throw new Error("Invalid npub format");
- }
- this.whitelist.add(npub);
- this.saveWhitelist();
- if (isDevMode) console.log(`Added ${npub} to whitelist`);
+ isSuperAdmin(npub) {
+ const normalized = normalizeNpub(npub);
+ return normalized ? normalized === ADMIN_SUPER_NPUB : false;
}
- removeFromWhitelist(npub) {
- this.whitelist.delete(npub);
- this.saveWhitelist();
- if (isDevMode) console.log(`Removed ${npub} from whitelist`);
- }
-
- addToBlacklist(npub) {
- if (!this.isValidNpub(npub)) {
- throw new Error("Invalid npub format");
- }
- this.blacklist.add(npub);
- this.saveBlacklist();
- if (isDevMode) console.log(`Added ${npub} to blacklist`);
- }
-
- removeFromBlacklist(npub) {
- this.blacklist.delete(npub);
- this.saveBlacklist();
- if (isDevMode) console.log(`Removed ${npub} from blacklist`);
- }
-
- isWhitelisted(npub) {
- const result = this.whitelist.has(npub);
- if (isDevMode)
- console.log(
- `Checking if ${npub} is whitelisted:`,
- result,
- "Current whitelist:",
- [...this.whitelist]
- );
- return result;
- }
-
- isBlacklisted(npub) {
- return this.blacklist.has(npub);
- }
-
- canAccess(npub) {
- if (this.isBlacklisted(npub)) {
+ isAdminEditor(npub) {
+ const normalized = normalizeNpub(npub);
+ if (!normalized) {
return false;
}
- const canAccess = !isWhitelistEnabled || this.isWhitelisted(npub);
- if (isDevMode) console.log(`Checking access for ${npub}:`, canAccess);
- return canAccess;
- }
-
- filterVideos(videos) {
- return videos.filter((video) => {
- try {
- const npub = window.NostrTools.nip19.npubEncode(video.pubkey);
- return !this.isBlacklisted(npub);
- } catch (error) {
- console.error("Error filtering video:", error);
- return false;
- }
- });
- }
-
- isValidNpub(npub) {
- try {
- return npub.startsWith("npub1") && npub.length === 63;
- } catch (error) {
- return false;
+ if (this.isSuperAdmin(normalized)) {
+ return true;
}
+ return this.editors.has(normalized);
+ }
+
+ canEditAdminLists(npub) {
+ return this.isAdminEditor(npub);
}
getWhitelist() {
- return [...this.whitelist];
+ return Array.from(this.whitelist);
}
getBlacklist() {
- return [...this.blacklist];
+ return Array.from(this.blacklist);
+ }
+
+ getEditors() {
+ return Array.from(this.editors);
+ }
+
+ async addModerator(requestorNpub, moderatorNpub) {
+ if (!this.isSuperAdmin(requestorNpub)) {
+ return { ok: false, error: "forbidden" };
+ }
+ if (!isValidNpub(moderatorNpub)) {
+ return { ok: false, error: "invalid npub" };
+ }
+
+ const normalized = normalizeNpub(moderatorNpub);
+ if (!normalized || normalized === ADMIN_SUPER_NPUB) {
+ return { ok: false, error: "immutable" };
+ }
+
+ const nextEditors = dedupeNpubs([...this.getEditors(), normalized]);
+
+ try {
+ await persistAdminState(requestorNpub, { editors: nextEditors });
+ await this.refresh();
+ return { ok: true };
+ } catch (error) {
+ return { ok: false, error: error?.code || "storage-error" };
+ }
+ }
+
+ async removeModerator(requestorNpub, moderatorNpub) {
+ if (!this.isSuperAdmin(requestorNpub)) {
+ return { ok: false, error: "forbidden" };
+ }
+
+ const normalized = normalizeNpub(moderatorNpub);
+ if (!normalized || normalized === ADMIN_SUPER_NPUB) {
+ return { ok: false, error: "immutable" };
+ }
+ const nextEditors = this.getEditors().filter((value) => value !== normalized);
+
+ try {
+ await persistAdminState(requestorNpub, { editors: nextEditors });
+ await this.refresh();
+ return { ok: true };
+ } catch (error) {
+ return { ok: false, error: error?.code || "storage-error" };
+ }
+ }
+
+ async addToWhitelist(actorNpub, targetNpub) {
+ if (!this.canEditAdminLists(actorNpub)) {
+ return { ok: false, error: "forbidden" };
+ }
+ if (!isValidNpub(targetNpub)) {
+ return { ok: false, error: "invalid npub" };
+ }
+
+ const normalized = normalizeNpub(targetNpub);
+ if (!normalized) {
+ return { ok: false, error: "invalid npub" };
+ }
+
+ const nextWhitelist = dedupeNpubs([...this.getWhitelist(), normalized]);
+ const nextBlacklist = this.getBlacklist().filter(
+ (value) => value !== normalized
+ );
+
+ try {
+ await persistAdminState(actorNpub, {
+ whitelist: nextWhitelist,
+ blacklist: nextBlacklist,
+ });
+ await this.refresh();
+ return { ok: true };
+ } catch (error) {
+ return { ok: false, error: error?.code || "storage-error" };
+ }
+ }
+
+ async removeFromWhitelist(actorNpub, targetNpub) {
+ if (!this.canEditAdminLists(actorNpub)) {
+ return { ok: false, error: "forbidden" };
+ }
+
+ const normalized = normalizeNpub(targetNpub);
+ if (!normalized) {
+ return { ok: false, error: "invalid npub" };
+ }
+ const nextWhitelist = this.getWhitelist().filter(
+ (value) => value !== normalized
+ );
+
+ try {
+ await persistAdminState(actorNpub, { whitelist: nextWhitelist });
+ await this.refresh();
+ return { ok: true };
+ } catch (error) {
+ return { ok: false, error: error?.code || "storage-error" };
+ }
+ }
+
+ async addToBlacklist(actorNpub, targetNpub) {
+ if (!this.canEditAdminLists(actorNpub)) {
+ return { ok: false, error: "forbidden" };
+ }
+ if (!isValidNpub(targetNpub)) {
+ return { ok: false, error: "invalid npub" };
+ }
+
+ const normalized = normalizeNpub(targetNpub);
+ if (!normalized) {
+ return { ok: false, error: "invalid npub" };
+ }
+
+ const normalizedActor = normalizeNpub(actorNpub);
+ if (normalizedActor && normalized === normalizedActor) {
+ return { ok: false, error: "self" };
+ }
+
+ if (this.isSuperAdmin(normalized) || this.isAdminEditor(normalized)) {
+ return { ok: false, error: "immutable" };
+ }
+
+ const nextBlacklist = dedupeNpubs([...this.getBlacklist(), normalized]);
+ const nextWhitelist = this.getWhitelist().filter(
+ (value) => value !== normalized
+ );
+
+ try {
+ await persistAdminState(actorNpub, {
+ blacklist: nextBlacklist,
+ whitelist: nextWhitelist,
+ });
+ await this.refresh();
+ return { ok: true };
+ } catch (error) {
+ return { ok: false, error: error?.code || "storage-error" };
+ }
+ }
+
+ async removeFromBlacklist(actorNpub, targetNpub) {
+ if (!this.canEditAdminLists(actorNpub)) {
+ return { ok: false, error: "forbidden" };
+ }
+
+ const normalized = normalizeNpub(targetNpub);
+ if (!normalized) {
+ return { ok: false, error: "invalid npub" };
+ }
+ const nextBlacklist = this.getBlacklist().filter(
+ (value) => value !== normalized
+ );
+
+ try {
+ await persistAdminState(actorNpub, { blacklist: nextBlacklist });
+ await this.refresh();
+ return { ok: true };
+ } catch (error) {
+ return { ok: false, error: error?.code || "storage-error" };
+ }
+ }
+
+ setWhitelistMode(actorNpub, enabled) {
+ if (!this.isSuperAdmin(actorNpub)) {
+ return { ok: false, error: "forbidden" };
+ }
+ persistWhitelistMode(!!enabled);
+ this.whitelistEnabled = !!enabled;
+ return { ok: true };
+ }
+
+ isBlacklisted(npub) {
+ const normalized = normalizeNpub(npub);
+ if (!normalized) {
+ return false;
+ }
+ if (this.whitelist.has(normalized)) {
+ return false;
+ }
+ return this.blacklist.has(normalized);
+ }
+
+ canAccess(candidate) {
+ let npub = "";
+
+ if (typeof candidate === "string") {
+ npub = candidate;
+ } else if (candidate && typeof candidate === "object") {
+ if (typeof candidate.npub === "string") {
+ npub = candidate.npub;
+ } else if (typeof candidate.pubkey === "string") {
+ try {
+ npub = window.NostrTools.nip19.npubEncode(candidate.pubkey);
+ } catch (error) {
+ npub = candidate.pubkey;
+ }
+ }
+ }
+
+ const normalized = normalizeNpub(npub);
+ if (!normalized) {
+ return false;
+ }
+
+ if (this.isAdminEditor(normalized)) {
+ return true;
+ }
+
+ if (this.whitelist.has(normalized)) {
+ return true;
+ }
+
+ if (this.blacklist.has(normalized)) {
+ return false;
+ }
+
+ if (this.whitelistEnabled && !this.whitelist.has(normalized)) {
+ return false;
+ }
+
+ return true;
}
}
export const accessControl = new AccessControl();
+export {
+ ADMIN_WHITELIST_MODE_STORAGE_KEY,
+ normalizeNpub,
+ isValidNpub,
+};
diff --git a/js/adminListStore.js b/js/adminListStore.js
new file mode 100644
index 00000000..3b9dd969
--- /dev/null
+++ b/js/adminListStore.js
@@ -0,0 +1,558 @@
+// js/adminListStore.js
+
+import {
+ ADMIN_LIST_MODE,
+ ADMIN_LIST_NAMESPACE,
+ ADMIN_SUPER_NPUB,
+ ADMIN_EDITORS_NPUBS,
+ isDevMode,
+} from "./config.js";
+import { nostrClient } from "./nostr.js";
+
+const LIST_IDENTIFIERS = {
+ editors: "editors",
+ whitelist: "whitelist",
+ blacklist: "blacklist",
+};
+
+const LEGACY_STORAGE_KEYS = {
+ editors: "bitvid_admin_editors",
+ whitelist: "bitvid_admin_whitelist",
+ whitelistLegacy: "bitvid_whitelist",
+ blacklist: "bitvid_admin_blacklist",
+ blacklistLegacy: "bitvid_blacklist",
+};
+
+const PUBLISH_TIMEOUT_MS = 7000;
+
+function createError(code, message, cause) {
+ const error = new Error(message);
+ error.code = code;
+ if (cause) {
+ error.cause = cause;
+ }
+ return error;
+}
+
+function normalizeNpub(value) {
+ return typeof value === "string" ? value.trim() : "";
+}
+
+function dedupeNpubs(values) {
+ const normalized = Array.isArray(values) ? values.map(normalizeNpub) : [];
+ return Array.from(
+ normalized.reduce((set, npub) => {
+ if (npub) {
+ set.add(npub);
+ }
+ return set;
+ }, new Set())
+ );
+}
+
+function canDecodeNpub() {
+ return !!(
+ typeof window !== "undefined" &&
+ window?.NostrTools?.nip19 &&
+ typeof window.NostrTools.nip19.decode === "function"
+ );
+}
+
+function isLikelyNpub(value) {
+ if (typeof value !== "string") {
+ return false;
+ }
+
+ const trimmed = value.trim();
+ if (!trimmed) {
+ return false;
+ }
+
+ if (!canDecodeNpub()) {
+ return true;
+ }
+
+ try {
+ const decoded = window.NostrTools.nip19.decode(trimmed);
+ return decoded?.type === "npub";
+ } catch (error) {
+ return false;
+ }
+}
+
+function sanitizeNpubList(values) {
+ return dedupeNpubs(values).filter(isLikelyNpub);
+}
+
+function sanitizeAdminState(state = {}) {
+ const sanitizedEditors = sanitizeNpubList(state.editors || []);
+ const sanitizedWhitelist = sanitizeNpubList(state.whitelist || []);
+ const whitelistSet = new Set(sanitizedWhitelist.map(normalizeNpub));
+
+ const adminGuardSet = new Set([
+ normalizeNpub(ADMIN_SUPER_NPUB),
+ ...ADMIN_EDITORS_NPUBS.map(normalizeNpub),
+ ...sanitizedEditors.map(normalizeNpub),
+ ]);
+
+ const sanitizedBlacklist = sanitizeNpubList(state.blacklist || []).filter(
+ (npub) => {
+ const normalized = normalizeNpub(npub);
+ if (!normalized) {
+ return false;
+ }
+ if (whitelistSet.has(normalized)) {
+ return false;
+ }
+ if (adminGuardSet.has(normalized)) {
+ return false;
+ }
+ return true;
+ }
+ );
+
+ return {
+ editors: sanitizedEditors,
+ whitelist: sanitizedWhitelist,
+ blacklist: sanitizedBlacklist,
+ };
+}
+
+function hasAnyEntries(state = {}) {
+ return Boolean(
+ (Array.isArray(state.editors) && state.editors.length) ||
+ (Array.isArray(state.whitelist) && state.whitelist.length) ||
+ (Array.isArray(state.blacklist) && state.blacklist.length)
+ );
+}
+
+function readJsonListFromStorage(key) {
+ if (typeof localStorage === "undefined") {
+ return null;
+ }
+
+ try {
+ const raw = localStorage.getItem(key);
+ if (raw === null) {
+ return null;
+ }
+ const parsed = JSON.parse(raw);
+ return Array.isArray(parsed) ? parsed : null;
+ } catch (error) {
+ if (isDevMode) {
+ console.warn(`[adminListStore] Failed to parse legacy list for ${key}:`, error);
+ }
+ return null;
+ }
+}
+
+function loadLegacyAdminState() {
+ const editors = readJsonListFromStorage(LEGACY_STORAGE_KEYS.editors) || [];
+ const whitelist =
+ readJsonListFromStorage(LEGACY_STORAGE_KEYS.whitelist) ||
+ readJsonListFromStorage(LEGACY_STORAGE_KEYS.whitelistLegacy) ||
+ [];
+ const blacklist =
+ readJsonListFromStorage(LEGACY_STORAGE_KEYS.blacklist) ||
+ readJsonListFromStorage(LEGACY_STORAGE_KEYS.blacklistLegacy) ||
+ [];
+
+ const sanitized = sanitizeAdminState({ editors, whitelist, blacklist });
+ return hasAnyEntries(sanitized) ? sanitized : null;
+}
+
+function clearLegacyStorageFor(listKey) {
+ if (typeof localStorage === "undefined") {
+ return;
+ }
+
+ const keyGroups = {
+ editors: [LEGACY_STORAGE_KEYS.editors],
+ whitelist: [
+ LEGACY_STORAGE_KEYS.whitelist,
+ LEGACY_STORAGE_KEYS.whitelistLegacy,
+ ],
+ blacklist: [
+ LEGACY_STORAGE_KEYS.blacklist,
+ LEGACY_STORAGE_KEYS.blacklistLegacy,
+ ],
+ };
+
+ const keys = keyGroups[listKey];
+ if (!Array.isArray(keys)) {
+ return;
+ }
+
+ for (const key of keys) {
+ try {
+ localStorage.removeItem(key);
+ } catch (error) {
+ if (isDevMode) {
+ console.warn(`[adminListStore] Failed to clear legacy storage for ${key}:`, error);
+ }
+ }
+ }
+}
+
+function ensureNostrReady() {
+ if (!nostrClient || !nostrClient.pool) {
+ throw createError(
+ "nostr-unavailable",
+ "Nostr relay pool is not initialized."
+ );
+ }
+
+ const relays = Array.isArray(nostrClient.relays) ? nostrClient.relays : [];
+ if (!relays.length) {
+ throw createError("nostr-unavailable", "No Nostr relays configured.");
+ }
+
+ return relays;
+}
+
+function decodeNpubToHex(npub) {
+ const trimmed = normalizeNpub(npub);
+ if (!trimmed) {
+ throw createError("invalid npub", "Empty npub provided.");
+ }
+
+ try {
+ const decoded = window?.NostrTools?.nip19?.decode(trimmed);
+ if (decoded?.type !== "npub" || !decoded?.data) {
+ throw new Error("Invalid npub format");
+ }
+ return typeof decoded.data === "string"
+ ? decoded.data
+ : decoded.data?.pubkey || "";
+ } catch (error) {
+ throw createError("invalid npub", "Unable to decode npub.", error);
+ }
+}
+
+function encodeHexToNpub(hex) {
+ try {
+ return window?.NostrTools?.nip19?.npubEncode(hex) || "";
+ } catch (error) {
+ if (isDevMode) {
+ console.warn("Failed to encode hex pubkey to npub:", error);
+ }
+ return "";
+ }
+}
+
+function extractNpubsFromEvent(event) {
+ if (!event || !Array.isArray(event.tags)) {
+ return [];
+ }
+
+ const hexKeys = event.tags
+ .filter((tag) => Array.isArray(tag) && tag[0] === "p" && tag[1])
+ .map((tag) => tag[1]);
+
+ const npubs = hexKeys
+ .map((hex) => encodeHexToNpub(hex))
+ .filter((npub) => typeof npub === "string" && npub);
+
+ return dedupeNpubs(npubs);
+}
+
+async function loadNostrList(identifier) {
+ const relays = ensureNostrReady();
+ const dTagValue = `${ADMIN_LIST_NAMESPACE}:${identifier}`;
+ const filter = {
+ kinds: [30000],
+ "#d": [dTagValue],
+ limit: 50,
+ };
+
+ let events = [];
+ try {
+ const combined = await nostrClient.pool.list(relays, [filter]);
+ if (Array.isArray(combined)) {
+ events = combined;
+ }
+ } catch (error) {
+ if (isDevMode) {
+ console.warn(
+ `[adminListStore] Combined relay fetch failed for ${identifier}:`,
+ error
+ );
+ }
+ }
+
+ if (!events.length) {
+ const perRelay = await Promise.all(
+ relays.map(async (url) => {
+ try {
+ const result = await nostrClient.pool.list([url], [filter]);
+ return Array.isArray(result) ? result : [];
+ } catch (error) {
+ if (isDevMode) {
+ console.warn(
+ `[adminListStore] Relay fetch failed for ${identifier} on ${url}:`,
+ error
+ );
+ }
+ return [];
+ }
+ })
+ );
+ events = perRelay.flat();
+ }
+
+ if (!events.length) {
+ return [];
+ }
+
+ const newest = events.reduce((latest, event) => {
+ if (!latest) {
+ return event;
+ }
+ if (event.created_at === latest.created_at) {
+ return event.id > latest.id ? event : latest;
+ }
+ return event.created_at > latest.created_at ? event : latest;
+ }, null);
+
+ return extractNpubsFromEvent(newest);
+}
+
+async function loadNostrState() {
+ const [editors, whitelist, blacklist] = await Promise.all([
+ loadNostrList(LIST_IDENTIFIERS.editors),
+ loadNostrList(LIST_IDENTIFIERS.whitelist),
+ loadNostrList(LIST_IDENTIFIERS.blacklist),
+ ]);
+
+ return sanitizeAdminState({ editors, whitelist, blacklist });
+}
+
+function buildListEvent(listKey, npubs, actorHex) {
+ const identifier = LIST_IDENTIFIERS[listKey];
+ const dTagValue = `${ADMIN_LIST_NAMESPACE}:${identifier}`;
+
+ const hexPubkeys = Array.from(
+ new Set(npubs.map((npub) => {
+ try {
+ return decodeNpubToHex(npub);
+ } catch (error) {
+ if (isDevMode) {
+ console.warn(
+ `[adminListStore] Failed to decode npub while publishing ${listKey}:`,
+ error
+ );
+ }
+ return "";
+ }
+ }).filter((hex) => !!hex))
+ );
+
+ if (listKey === "whitelist" || listKey === "editors") {
+ try {
+ const superHex = decodeNpubToHex(ADMIN_SUPER_NPUB);
+ if (superHex && !hexPubkeys.includes(superHex)) {
+ hexPubkeys.push(superHex);
+ }
+ } catch (error) {
+ if (isDevMode) {
+ console.warn("Failed to ensure super admin presence:", error);
+ }
+ }
+ }
+
+ const tags = [["d", dTagValue]];
+ hexPubkeys.forEach((hex) => {
+ tags.push(["p", hex]);
+ });
+
+ return {
+ kind: 30000,
+ pubkey: actorHex,
+ created_at: Math.floor(Date.now() / 1000),
+ tags,
+ content: "",
+ };
+}
+
+function publishToRelay(url, signedEvent, listKey) {
+ return new Promise((resolve) => {
+ let settled = false;
+ const timeout = setTimeout(() => {
+ if (!settled) {
+ settled = true;
+ resolve({ url, success: false, error: new Error("timeout") });
+ }
+ }, PUBLISH_TIMEOUT_MS);
+
+ const finalize = (success, error) => {
+ if (settled) {
+ return;
+ }
+ settled = true;
+ clearTimeout(timeout);
+ resolve({ url, success, error });
+ };
+
+ try {
+ const pub = nostrClient.pool.publish([url], signedEvent);
+ if (!pub) {
+ finalize(false, new Error("publish returned no result"));
+ return;
+ }
+
+ if (typeof pub.on === "function") {
+ pub.on("ok", () => finalize(true));
+ pub.on("seen", () => finalize(true));
+ pub.on("failed", (reason) => {
+ const error =
+ reason instanceof Error ? reason : new Error(String(reason || "failed"));
+ finalize(false, error);
+ });
+ return;
+ }
+
+ if (typeof pub.then === "function") {
+ pub.then(() => finalize(true)).catch((error) => finalize(false, error));
+ return;
+ }
+ } catch (error) {
+ finalize(false, error);
+ return;
+ }
+
+ finalize(true);
+ }).then((result) => {
+ if (!result.success && isDevMode) {
+ console.warn(
+ `[adminListStore] Publish failed for ${listKey} on ${result.url}:`,
+ result.error
+ );
+ }
+ return result;
+ });
+}
+
+async function persistNostrState(actorNpub, updates = {}) {
+ ensureNostrReady();
+ const extension = window?.nostr;
+ if (!extension || typeof extension.signEvent !== "function") {
+ throw createError(
+ "nostr-extension-missing",
+ "A Nostr extension with signEvent support is required."
+ );
+ }
+
+ const actorHex = decodeNpubToHex(actorNpub);
+ if (!actorHex) {
+ throw createError("invalid npub", "Unable to decode the actor npub.");
+ }
+
+ const sanitizedUpdates = {};
+ const actorNormalized = normalizeNpub(actorNpub);
+
+ if (Array.isArray(updates.editors)) {
+ sanitizedUpdates.editors = sanitizeNpubList(updates.editors).filter((npub) => {
+ const normalized = normalizeNpub(npub);
+ return normalized && normalized !== normalizeNpub(ADMIN_SUPER_NPUB);
+ });
+ }
+
+ if (Array.isArray(updates.whitelist)) {
+ sanitizedUpdates.whitelist = sanitizeNpubList(updates.whitelist);
+ }
+
+ if (Array.isArray(updates.blacklist)) {
+ const whitelistSet = new Set(
+ (sanitizedUpdates.whitelist || []).map(normalizeNpub)
+ );
+ const editorGuard = new Set([
+ normalizeNpub(ADMIN_SUPER_NPUB),
+ ...ADMIN_EDITORS_NPUBS.map(normalizeNpub),
+ ...((sanitizedUpdates.editors || []).map(normalizeNpub) || []),
+ ]);
+
+ if (actorNormalized) {
+ editorGuard.add(actorNormalized);
+ }
+
+ sanitizedUpdates.blacklist = sanitizeNpubList(updates.blacklist).filter(
+ (npub) => {
+ const normalized = normalizeNpub(npub);
+ if (!normalized) {
+ return false;
+ }
+ if (whitelistSet.has(normalized)) {
+ return false;
+ }
+ if (editorGuard.has(normalized)) {
+ return false;
+ }
+ return true;
+ }
+ );
+ }
+
+ const entries = Object.entries(sanitizedUpdates).filter(([, value]) =>
+ Array.isArray(value)
+ );
+
+ if (!entries.length) {
+ return;
+ }
+
+ for (const [listKey, npubs] of entries) {
+ const event = buildListEvent(listKey, npubs, actorHex);
+
+ let signedEvent;
+ try {
+ signedEvent = await extension.signEvent(event);
+ } catch (error) {
+ throw createError("signature-failed", "Failed to sign admin list event.", error);
+ }
+
+ const relays = ensureNostrReady();
+ const publishResults = await Promise.all(
+ relays.map((url) => publishToRelay(url, signedEvent, listKey))
+ );
+
+ if (!publishResults.some((result) => result.success)) {
+ throw createError(
+ "publish-failed",
+ `Failed to publish ${listKey} list to any relay.`
+ );
+ }
+
+ clearLegacyStorageFor(listKey);
+ }
+}
+
+export async function loadAdminState() {
+ if (ADMIN_LIST_MODE !== "nostr" && isDevMode) {
+ console.warn(
+ `[adminListStore] ADMIN_LIST_MODE "${ADMIN_LIST_MODE}" is deprecated. Defaulting to remote Nostr lists.`
+ );
+ }
+
+ const state = await loadNostrState();
+ if (!hasAnyEntries(state)) {
+ const legacy = loadLegacyAdminState();
+ if (legacy && isDevMode) {
+ console.warn(
+ "[adminListStore] Ignoring legacy admin lists because remote mode is enforced. Publish them to Nostr to retain access.",
+ legacy
+ );
+ }
+ }
+
+ return state;
+}
+
+export async function persistAdminState(actorNpub, updates) {
+ if (ADMIN_LIST_MODE !== "nostr" && isDevMode) {
+ console.warn(
+ `[adminListStore] ADMIN_LIST_MODE "${ADMIN_LIST_MODE}" is deprecated. Remote lists are enforced.`
+ );
+ }
+
+ return persistNostrState(actorNpub, updates);
+}
diff --git a/js/app.js b/js/app.js
index be73a127..909b6635 100644
--- a/js/app.js
+++ b/js/app.js
@@ -3,19 +3,56 @@
import { loadView } from "./viewManager.js";
import { nostrClient } from "./nostr.js";
import { torrentClient } from "./webtorrent.js";
-import { isDevMode } from "./config.js";
-import { isWhitelistEnabled } from "./config.js";
+import { isDevMode, ADMIN_SUPER_NPUB } from "./config.js";
+import { accessControl, normalizeNpub } from "./accessControl.js";
import { safeDecodeMagnet } from "./magnetUtils.js";
-import { normalizeAndAugmentMagnet } from "./magnet.js";
+import { extractMagnetHints, normalizeAndAugmentMagnet } from "./magnet.js";
import { deriveTorrentPlaybackConfig } from "./playbackUtils.js";
import { URL_FIRST_ENABLED } from "./constants.js";
import { trackVideoView } from "./analytics.js";
import { attachHealthBadges } from "./gridHealth.js";
+import { attachUrlHealthBadges } from "./urlHealthObserver.js";
+import { ADMIN_INITIAL_EVENT_BLACKLIST } from "./lists.js";
+import { userBlocks } from "./userBlocks.js";
import {
- initialWhitelist,
- initialBlacklist,
- initialEventBlacklist,
-} from "./lists.js";
+ loadR2Settings,
+ saveR2Settings,
+ clearR2Settings,
+ buildR2Key,
+ buildPublicUrl,
+ mergeBucketEntry,
+ sanitizeBaseDomain,
+} from "./r2.js";
+import {
+ sanitizeBucketName,
+ ensureBucket,
+ putCors,
+ attachCustomDomainAndWait,
+ setManagedDomain,
+ deriveShortSubdomain,
+} from "./storage/r2-mgmt.js";
+import {
+ makeR2Client,
+ multipartUpload,
+ ensureBucketCors,
+} from "./storage/r2-s3.js";
+import { initQuickR2Upload } from "./r2-quick.js";
+
+function truncateMiddle(text, maxLength = 72) {
+ if (!text || typeof text !== "string") {
+ return "";
+ }
+
+ if (text.length <= maxLength) {
+ return text;
+ }
+
+ const ellipsis = "…";
+ const charsToShow = maxLength - ellipsis.length;
+ const front = Math.ceil(charsToShow / 2);
+ const back = Math.floor(charsToShow / 2);
+ return `${text.slice(0, front)}${ellipsis}${text.slice(text.length - back)}`;
+}
/**
* Simple "decryption" placeholder for private videos.
@@ -28,6 +65,9 @@ const UNSUPPORTED_BTITH_MESSAGE =
"This magnet link is missing a compatible BitTorrent v1 info hash.";
const FALLBACK_THUMBNAIL_SRC = "assets/jpg/video-thumbnail-fallback.jpg";
+const ADMIN_DM_IMAGE_URL =
+ "https://beta.bitvid.network/assets/jpg/video-thumbnail-fallback.jpg";
+const BITVID_WEBSITE_URL = "https://bitvid.network/";
const TRACKING_SCRIPT_PATTERN = /(?:^|\/)tracking\.js(?:$|\?)/;
const EMPTY_VIDEO_LIST_SIGNATURE = "__EMPTY__";
const PROFILE_CACHE_STORAGE_KEY = "bitvid:profileCache:v1";
@@ -39,7 +79,9 @@ const PROFILE_CACHE_TTL_MS = 10 * 60 * 1000; // 10 minutes
// recovers. Results are stored both in-memory and in localStorage so other
// views can reuse them without re-probing.
const URL_HEALTH_TTL_MS = 45 * 60 * 1000; // 45 minutes
+const URL_HEALTH_TIMEOUT_RETRY_MS = 5 * 60 * 1000; // 5 minutes
const URL_PROBE_TIMEOUT_MS = 8 * 1000; // 8 seconds
+const URL_PROBE_TIMEOUT_RETRY_MS = 15 * 1000; // 15 seconds
const URL_HEALTH_STORAGE_PREFIX = "bitvid:urlHealth:";
const urlHealthCache = new Map();
const urlHealthInFlight = new Map();
@@ -187,12 +229,19 @@ function writeUrlHealthToCache(eventId, url, result, ttlMs = URL_HEALTH_TTL_MS)
* event simultaneously do not all fire off duplicate requests. The stored
* metadata includes the URL so edits invalidate the old request immediately.
*/
-function setInFlightUrlProbe(eventId, url, promise) {
+function buildUrlProbeKey(url, options = {}) {
+ const trimmed = typeof url === "string" ? url : "";
+ const mode = options?.confirmPlayable ? "playable" : "basic";
+ return `${trimmed}::${mode}`;
+}
+
+function setInFlightUrlProbe(eventId, url, promise, options = {}) {
if (!eventId || !promise) {
return;
}
- urlHealthInFlight.set(eventId, { promise, url });
+ const key = buildUrlProbeKey(url, options);
+ urlHealthInFlight.set(eventId, { promise, key });
promise.finally(() => {
const current = urlHealthInFlight.get(eventId);
if (current && current.promise === promise) {
@@ -201,7 +250,7 @@ function setInFlightUrlProbe(eventId, url, promise) {
});
}
-function getInFlightUrlProbe(eventId, url) {
+function getInFlightUrlProbe(eventId, url, options = {}) {
if (!eventId) {
return null;
}
@@ -211,7 +260,8 @@ function getInFlightUrlProbe(eventId, url) {
return null;
}
- if (url && entry.url && entry.url !== url) {
+ const key = buildUrlProbeKey(url, options);
+ if (entry.key && entry.key !== key) {
return null;
}
@@ -448,6 +498,47 @@ class bitvidApp {
this.profileLogoutBtn = null;
this.profileModalAvatar = null;
this.profileModalName = null;
+ this.profileChannelLink = null;
+ this.profileNavButtons = {
+ account: null,
+ relays: null,
+ blocked: null,
+ admin: null,
+ };
+ this.profilePaneElements = {
+ account: null,
+ relays: null,
+ blocked: null,
+ admin: null,
+ };
+ this.profileRelayList = null;
+ this.profileBlockedList = null;
+ this.profileBlockedEmpty = null;
+ this.profileBlockedInput = null;
+ this.profileAddBlockedBtn = null;
+ this.profileRelayInput = null;
+ this.profileAddRelayBtn = null;
+ this.profileRestoreRelaysBtn = null;
+ this.adminModeratorInput = null;
+ this.adminAddModeratorBtn = null;
+ this.adminModeratorList = null;
+ this.adminModeratorsEmpty = null;
+ this.adminModeratorsSection = null;
+ this.adminWhitelistInput = null;
+ this.adminAddWhitelistBtn = null;
+ this.adminWhitelistList = null;
+ this.adminWhitelistEmpty = null;
+ this.adminWhitelistSection = null;
+ this.adminBlacklistInput = null;
+ this.adminAddBlacklistBtn = null;
+ this.adminBlacklistList = null;
+ this.adminBlacklistEmpty = null;
+ this.adminBlacklistSection = null;
+ this.lastFocusedBeforeProfileModal = null;
+ this.boundProfileModalKeydown = null;
+ this.boundProfileModalFocusIn = null;
+ this.profileModalFocusables = [];
+ this.currentUserNpub = null;
// Upload modal elements
this.uploadButton = document.getElementById("uploadButton") || null;
@@ -455,6 +546,71 @@ class bitvidApp {
this.closeUploadModalBtn =
document.getElementById("closeUploadModal") || null;
this.uploadForm = document.getElementById("uploadForm") || null;
+ this.uploadEnableCommentsInput = null;
+ this.uploadModeToggleButtons = [];
+ this.customUploadSection = null;
+ this.cloudflareUploadSection = null;
+ this.activeUploadMode = "custom";
+ this.cloudflareSettings = null;
+ this.cloudflareSettingsForm = null;
+ this.cloudflareClearSettingsButton = null;
+ this.cloudflareSettingsStatus = null;
+ this.cloudflareBucketPreview = null;
+ this.cloudflareUploadForm = null;
+ this.cloudflareFileInput = null;
+ this.cloudflareUploadButton = null;
+ this.cloudflareUploadStatus = null;
+ this.cloudflareProgressBar = null;
+ this.cloudflareProgressFill = null;
+ this.cloudflareTitleInput = null;
+ this.cloudflareDescriptionInput = null;
+ this.cloudflareThumbnailInput = null;
+ this.cloudflareMagnetInput = null;
+ this.cloudflareWsInput = null;
+ this.cloudflareXsInput = null;
+ this.cloudflareEnableCommentsInput = null;
+ this.cloudflareAdvancedToggle = null;
+ this.cloudflareAdvancedToggleLabel = null;
+ this.cloudflareAdvancedToggleIcon = null;
+ this.cloudflareAdvancedFields = null;
+ this.cloudflareAdvancedVisible = false;
+ this.r2AccountIdInput = null;
+ this.r2AccessKeyIdInput = null;
+ this.r2SecretAccessKeyInput = null;
+ this.r2ApiTokenInput = null;
+ this.r2ZoneIdInput = null;
+ this.r2BaseDomainInput = null;
+
+ // Edit video modal elements
+ this.editVideoModal = null;
+ this.editVideoOverlay = null;
+ this.editVideoForm = null;
+ this.closeEditVideoModalBtn = null;
+ this.cancelEditVideoBtn = null;
+ this.editVideoSubmitBtn = null;
+ this.editVideoFieldButtons = [];
+ this.activeEditVideo = null;
+
+ // Revert video modal elements
+ this.revertVideoModal = null;
+ this.revertVideoOverlay = null;
+ this.revertVersionsList = null;
+ this.revertVersionDetails = null;
+ this.revertVersionPlaceholder = null;
+ this.revertVersionDetailsDefaultHTML = "";
+ this.revertHistoryCount = null;
+ this.revertSelectionStatus = null;
+ this.revertModalTitle = null;
+ this.revertModalSubtitle = null;
+ this.closeRevertVideoModalBtn = null;
+ this.cancelRevertVideoBtn = null;
+ this.confirmRevertVideoBtn = null;
+ this.activeRevertVideo = null;
+ this.revertHistory = [];
+ this.selectedRevertTarget = null;
+ this.revertModalBusy = false;
+ this.revertConfirmDefaultLabel = "Revert to selected version";
+ this.pendingRevertEntries = [];
// Optional small inline player stats
this.status = document.getElementById("status") || null;
@@ -481,6 +637,8 @@ class bitvidApp {
this.copyMagnetBtn = null;
this.shareBtn = null;
this.modalZapBtn = null;
+ this.modalMoreBtn = null;
+ this.modalMoreMenu = null;
this.modalPosterCleanup = null;
this.cleanupPromise = null;
@@ -502,6 +660,9 @@ class bitvidApp {
// Videos stored as a Map (key=event.id)
this.videosMap = new Map();
+ this.moreMenuGlobalHandlerBound = false;
+ this.boundMoreMenuDocumentClick = null;
+ this.boundMoreMenuDocumentKeydown = null;
// Simple cache for user profiles
this.profileCache = new Map();
this.lastRenderedVideoSignature = null;
@@ -514,7 +675,7 @@ class bitvidApp {
// Build a set of blacklisted event IDs (hex) from nevent strings, skipping empties
this.blacklistedEventIds = new Set();
- for (const neventStr of initialEventBlacklist) {
+ for (const neventStr of ADMIN_INITIAL_EVENT_BLACKLIST) {
// Skip any empty or obviously invalid strings
if (!neventStr || neventStr.trim().length < 8) {
continue;
@@ -676,6 +837,32 @@ class bitvidApp {
return entry;
}
+ prepareForViewLoad() {
+ if (this._videoListElement && this._videoListClickHandler) {
+ try {
+ this._videoListElement.removeEventListener(
+ "click",
+ this._videoListClickHandler
+ );
+ } catch (err) {
+ console.warn("[prepareForViewLoad] Failed to detach video list handler:", err);
+ }
+ this._videoListElement = null;
+ this._videoListClickHandler = null;
+ }
+
+ this.videoList = null;
+ this._lastRenderedVideoListElement = null;
+ this.lastRenderedVideoSignature = null;
+ if (this.renderedVideoIds) {
+ this.renderedVideoIds.clear();
+ }
+
+ if (this.mediaLoader && typeof this.mediaLoader.disconnect === "function") {
+ this.mediaLoader.disconnect();
+ }
+ }
+
forceRefreshAllProfiles() {
// 1) Grab the newest set of videos from nostrClient
const activeVideos = nostrClient.getActiveVideos();
@@ -706,6 +893,10 @@ class bitvidApp {
// 2. Initialize the upload modal (components/upload-modal.html)
await this.initUploadModal();
+ initQuickR2Upload(this);
+
+ // 2.5 Initialize the edit modal (components/edit-video-modal.html)
+ await this.initEditVideoModal();
// 3. (Optional) Initialize the profile modal (components/profile-modal.html)
await this.initProfileModal();
@@ -713,13 +904,23 @@ class bitvidApp {
// 4. Connect to Nostr
await nostrClient.init();
+ try {
+ await accessControl.refresh();
+ } catch (error) {
+ console.warn("Failed to refresh admin lists after connecting to Nostr:", error);
+ }
+
// Grab the "Subscriptions" link by its id in the sidebar
this.subscriptionsLink = document.getElementById("subscriptionsLink");
const savedPubKey = localStorage.getItem("userPubKey");
if (savedPubKey) {
// Auto-login if a pubkey was saved
- this.login(savedPubKey, false);
+ try {
+ await this.login(savedPubKey, false);
+ } catch (error) {
+ console.error("Auto-login failed:", error);
+ }
// If the user was already logged in, show the Subscriptions link
if (this.subscriptionsLink) {
@@ -803,9 +1004,11 @@ class bitvidApp {
if (!modalNav || !playerModal) {
throw new Error("Modal nav (#modalNav) or #playerModal not found!");
}
+ const scrollRegion =
+ playerModal.querySelector(".player-modal__content") || playerModal;
let lastScrollY = 0;
- playerModal.addEventListener("scroll", (e) => {
- const currentScrollY = e.target.scrollTop;
+ scrollRegion.addEventListener("scroll", () => {
+ const currentScrollY = scrollRegion.scrollTop;
const shouldShowNav =
currentScrollY <= lastScrollY || currentScrollY < 50;
modalNav.style.transform = shouldShowNav
@@ -847,6 +1050,9 @@ class bitvidApp {
this.copyMagnetBtn = document.getElementById("copyMagnetBtn") || null;
this.shareBtn = document.getElementById("shareBtn") || null;
this.modalZapBtn = document.getElementById("modalZapBtn") || null;
+ this.modalMoreBtn = document.getElementById("modalMoreBtn") || null;
+ this.modalMoreMenu = document.getElementById("moreDropdown-modal") || null;
+ this.setModalZapVisibility(false);
// Attach existing event listeners for copy/share
if (this.copyMagnetBtn) {
@@ -890,6 +1096,12 @@ class bitvidApp {
this.openCreatorChannel();
});
}
+
+ if (this.playerModal) {
+ this.attachMoreMenuHandlers(this.playerModal);
+ }
+
+ this.syncModalMoreMenuData();
}
goToProfile(pubkey) {
@@ -935,6 +1147,12 @@ class bitvidApp {
if (this.playerModal) {
this.playerModal.style.display = "flex";
this.playerModal.classList.remove("hidden");
+ document.body.classList.add("modal-open");
+ document.documentElement.classList.add("modal-open");
+ const scrollRegion =
+ this.playerModal.querySelector(".player-modal__content") ||
+ this.playerModal;
+ scrollRegion.scrollTop = 0;
}
this.applyModalLoadingPoster();
}
@@ -1041,6 +1259,68 @@ class bitvidApp {
this.closeUploadModalBtn =
document.getElementById("closeUploadModal") || null;
this.uploadForm = document.getElementById("uploadForm") || null;
+ this.uploadEnableCommentsInput =
+ document.getElementById("uploadEnableComments") || null;
+ this.uploadModeToggleButtons = Array.from(
+ document.querySelectorAll(".upload-mode-toggle[data-upload-mode]")
+ );
+ this.customUploadSection =
+ document.getElementById("customUploadSection") || null;
+ this.cloudflareUploadSection =
+ document.getElementById("cloudflareUploadSection") || null;
+ this.cloudflareSettingsForm =
+ document.getElementById("cloudflareSettingsForm") || null;
+ this.cloudflareClearSettingsButton =
+ document.getElementById("cloudflareClearSettings") || null;
+ this.cloudflareSettingsStatus =
+ document.getElementById("cloudflareSettingsStatus") || null;
+ this.cloudflareBucketPreview =
+ document.getElementById("cloudflareBucketPreview") || null;
+ this.cloudflareUploadForm =
+ document.getElementById("cloudflareUploadForm") || null;
+ this.cloudflareFileInput =
+ document.getElementById("cloudflareFile") || null;
+ this.cloudflareUploadButton =
+ document.getElementById("cloudflareUploadButton") || null;
+ this.cloudflareUploadStatus =
+ document.getElementById("cloudflareUploadStatus") || null;
+ this.cloudflareProgressBar =
+ document.getElementById("cloudflareProgressBar") || null;
+ this.cloudflareProgressFill =
+ document.getElementById("cloudflareProgressFill") || null;
+ this.cloudflareTitleInput =
+ document.getElementById("cloudflareTitle") || null;
+ this.cloudflareDescriptionInput =
+ document.getElementById("cloudflareDescription") || null;
+ this.cloudflareThumbnailInput =
+ document.getElementById("cloudflareThumbnail") || null;
+ this.cloudflareMagnetInput =
+ document.getElementById("cloudflareMagnet") || null;
+ this.cloudflareWsInput =
+ document.getElementById("cloudflareWs") || null;
+ this.cloudflareXsInput =
+ document.getElementById("cloudflareXs") || null;
+ this.cloudflareEnableCommentsInput =
+ document.getElementById("cloudflareEnableComments") || null;
+ this.cloudflareAdvancedToggle =
+ document.getElementById("cloudflareAdvancedToggle") || null;
+ this.cloudflareAdvancedToggleLabel =
+ document.getElementById("cloudflareAdvancedToggleLabel") || null;
+ this.cloudflareAdvancedToggleIcon =
+ document.getElementById("cloudflareAdvancedToggleIcon") || null;
+ this.cloudflareAdvancedFields =
+ document.getElementById("cloudflareAdvancedFields") || null;
+ this.r2AccountIdInput =
+ document.getElementById("r2AccountId") || null;
+ this.r2AccessKeyIdInput =
+ document.getElementById("r2AccessKeyId") || null;
+ this.r2SecretAccessKeyInput =
+ document.getElementById("r2SecretAccessKey") || null;
+ this.r2ApiTokenInput =
+ document.getElementById("r2ApiToken") || null;
+ this.r2ZoneIdInput = document.getElementById("r2ZoneId") || null;
+ this.r2BaseDomainInput =
+ document.getElementById("r2BaseDomain") || null;
// Optional: if close button found, wire up
if (this.closeUploadModalBtn) {
@@ -1058,6 +1338,50 @@ class bitvidApp {
});
}
+ if (this.cloudflareSettingsForm) {
+ this.cloudflareSettingsForm.addEventListener("submit", (e) => {
+ e.preventDefault();
+ this.handleCloudflareSettingsSubmit();
+ });
+ }
+
+ if (this.cloudflareClearSettingsButton) {
+ this.cloudflareClearSettingsButton.addEventListener("click", () => {
+ this.handleCloudflareClearSettings();
+ });
+ }
+
+ if (this.cloudflareUploadForm) {
+ this.cloudflareUploadForm.addEventListener("submit", (e) => {
+ e.preventDefault();
+ this.handleCloudflareUploadSubmit();
+ });
+ }
+
+ if (this.uploadModeToggleButtons.length > 0) {
+ this.uploadModeToggleButtons.forEach((btn) => {
+ btn.addEventListener("click", () => {
+ const mode = btn.dataset.uploadMode || "custom";
+ this.setUploadMode(mode);
+ });
+ });
+ }
+
+ if (this.cloudflareAdvancedToggle) {
+ this.cloudflareAdvancedToggle.addEventListener("click", () => {
+ this.setCloudflareAdvancedVisibility(
+ !this.cloudflareAdvancedVisible
+ );
+ });
+ }
+
+ this.setCloudflareAdvancedVisibility(this.cloudflareAdvancedVisible);
+
+ await this.loadCloudflareSettingsFromStorage();
+ await this.updateCloudflareBucketPreview();
+
+ this.setUploadMode(this.activeUploadMode);
+
console.log("Upload modal initialization successful");
return true;
} catch (error) {
@@ -1067,6 +1391,1875 @@ class bitvidApp {
}
}
+ async initEditVideoModal() {
+ try {
+ let modal = document.getElementById("editVideoModal");
+ if (!modal) {
+ const resp = await fetch("components/edit-video-modal.html");
+ if (!resp.ok) {
+ throw new Error(`HTTP error! status: ${resp.status}`);
+ }
+ const html = await resp.text();
+ const modalContainer = document.getElementById("modalContainer");
+ if (!modalContainer) {
+ throw new Error("Modal container element not found!");
+ }
+
+ const wrapper = document.createElement("div");
+ wrapper.innerHTML = html;
+ removeTrackingScripts(wrapper);
+ modalContainer.appendChild(wrapper);
+
+ modal = wrapper.querySelector("#editVideoModal");
+ }
+
+ if (!modal) {
+ throw new Error("Edit video modal markup missing after load.");
+ }
+
+ this.editVideoModal = modal;
+ this.editVideoOverlay =
+ modal.querySelector("#editVideoModalOverlay") || null;
+ this.editVideoForm = modal.querySelector("#editVideoForm") || null;
+ this.closeEditVideoModalBtn =
+ modal.querySelector("#closeEditVideoModal") || null;
+ this.cancelEditVideoBtn =
+ modal.querySelector("#cancelEditVideo") || null;
+ this.editVideoSubmitBtn =
+ modal.querySelector("#submitEditVideo") || null;
+ this.editVideoFieldButtons = Array.from(
+ modal.querySelectorAll("[data-edit-target]")
+ );
+
+ if (this.editVideoForm) {
+ this.editVideoForm.addEventListener("submit", (event) => {
+ event.preventDefault();
+ this.handleEditVideoSubmit();
+ });
+ }
+
+ if (this.closeEditVideoModalBtn) {
+ this.closeEditVideoModalBtn.addEventListener("click", () => {
+ this.hideEditVideoModal();
+ });
+ }
+
+ if (this.cancelEditVideoBtn) {
+ this.cancelEditVideoBtn.addEventListener("click", () => {
+ this.hideEditVideoModal();
+ });
+ }
+
+ if (this.editVideoOverlay) {
+ this.editVideoOverlay.addEventListener("click", () => {
+ this.hideEditVideoModal();
+ });
+ }
+
+ if (Array.isArray(this.editVideoFieldButtons)) {
+ this.editVideoFieldButtons.forEach((btn) => {
+ btn.addEventListener("click", (event) => {
+ this.handleEditFieldToggle(event);
+ });
+ });
+ }
+
+ this.resetEditVideoForm();
+
+ return true;
+ } catch (error) {
+ console.error("initEditVideoModal failed:", error);
+ this.showError(`Failed to initialize edit modal: ${error.message}`);
+ return false;
+ }
+ }
+
+ resetEditVideoForm() {
+ if (!this.editVideoModal) {
+ this.activeEditVideo = null;
+ return;
+ }
+
+ const fieldIds = [
+ "editVideoTitle",
+ "editVideoUrl",
+ "editVideoMagnet",
+ "editVideoWs",
+ "editVideoXs",
+ "editVideoThumbnail",
+ "editVideoDescription",
+ "editEnableComments",
+ ];
+
+ fieldIds.forEach((id) => {
+ const input = this.editVideoModal.querySelector(`#${id}`);
+ if (input) {
+ if (input.type === "checkbox") {
+ input.checked = true;
+ input.disabled = false;
+ } else {
+ input.value = "";
+ input.readOnly = false;
+ input.classList.remove("locked-input");
+ }
+ delete input.dataset.originalValue;
+ }
+ const button = this.editVideoModal.querySelector(
+ `[data-edit-target="${id}"]`
+ );
+ if (button) {
+ button.classList.add("hidden");
+ button.dataset.mode = "locked";
+ button.textContent = "Edit field";
+ }
+ });
+
+ this.activeEditVideo = null;
+ }
+
+ showEditVideoModal() {
+ if (this.editVideoModal) {
+ this.editVideoModal.classList.remove("hidden");
+ }
+ }
+
+ hideEditVideoModal() {
+ if (this.editVideoModal) {
+ this.editVideoModal.classList.add("hidden");
+ }
+ this.resetEditVideoForm();
+ }
+
+ async initRevertVideoModal() {
+ try {
+ let modal = document.getElementById("revertVideoModal");
+ if (!modal) {
+ const response = await fetch("components/revert-video-modal.html");
+ if (!response.ok) {
+ throw new Error(`HTTP error! status: ${response.status}`);
+ }
+ const html = await response.text();
+ const modalContainer = document.getElementById("modalContainer");
+ if (!modalContainer) {
+ throw new Error("Modal container element not found!");
+ }
+
+ const wrapper = document.createElement("div");
+ wrapper.innerHTML = html;
+ removeTrackingScripts(wrapper);
+ modalContainer.appendChild(wrapper);
+
+ modal = wrapper.querySelector("#revertVideoModal");
+ }
+
+ if (!modal) {
+ throw new Error("Revert video modal markup missing after load.");
+ }
+
+ this.revertVideoModal = modal;
+ this.revertVideoOverlay =
+ modal.querySelector("#revertVideoModalOverlay") || null;
+ this.revertVersionsList =
+ modal.querySelector("#revertVersionsList") || null;
+ this.revertVersionDetails =
+ modal.querySelector("#revertVersionDetails") || null;
+ this.revertVersionPlaceholder =
+ modal.querySelector("#revertVersionPlaceholder") || null;
+ if (this.revertVersionDetails && !this.revertVersionDetailsDefaultHTML) {
+ this.revertVersionDetailsDefaultHTML = this.revertVersionDetails.innerHTML;
+ }
+ this.revertHistoryCount =
+ modal.querySelector("#revertHistoryCount") || null;
+ this.revertSelectionStatus =
+ modal.querySelector("#revertSelectionStatus") || null;
+ this.revertModalTitle =
+ modal.querySelector("#revertModalTitle") || null;
+ this.revertModalSubtitle =
+ modal.querySelector("#revertModalSubtitle") || null;
+ this.closeRevertVideoModalBtn =
+ modal.querySelector("#closeRevertVideoModal") || null;
+ this.cancelRevertVideoBtn =
+ modal.querySelector("#cancelRevertVideo") || null;
+ this.confirmRevertVideoBtn =
+ modal.querySelector("#confirmRevertVideo") || null;
+
+ if (
+ this.revertVersionsList &&
+ !this.revertVersionsList.dataset.listenerAttached
+ ) {
+ this.revertVersionsList.addEventListener("click", (event) => {
+ this.handleRevertVersionListClick(event);
+ });
+ this.revertVersionsList.dataset.listenerAttached = "true";
+ }
+
+ if (this.closeRevertVideoModalBtn && !this.closeRevertVideoModalBtn.dataset.listenerAttached) {
+ this.closeRevertVideoModalBtn.addEventListener("click", () => {
+ if (!this.revertModalBusy) {
+ this.hideRevertVideoModal();
+ }
+ });
+ this.closeRevertVideoModalBtn.dataset.listenerAttached = "true";
+ }
+
+ if (this.cancelRevertVideoBtn && !this.cancelRevertVideoBtn.dataset.listenerAttached) {
+ this.cancelRevertVideoBtn.addEventListener("click", () => {
+ if (!this.revertModalBusy) {
+ this.hideRevertVideoModal();
+ }
+ });
+ this.cancelRevertVideoBtn.dataset.listenerAttached = "true";
+ }
+
+ if (this.revertVideoOverlay && !this.revertVideoOverlay.dataset.listenerAttached) {
+ this.revertVideoOverlay.addEventListener("click", () => {
+ if (!this.revertModalBusy) {
+ this.hideRevertVideoModal();
+ }
+ });
+ this.revertVideoOverlay.dataset.listenerAttached = "true";
+ }
+
+ if (
+ this.confirmRevertVideoBtn &&
+ !this.confirmRevertVideoBtn.dataset.listenerAttached
+ ) {
+ this.confirmRevertVideoBtn.addEventListener("click", () => {
+ this.handleConfirmRevertSelection();
+ });
+ this.confirmRevertVideoBtn.dataset.listenerAttached = "true";
+ }
+
+ this.resetRevertVideoModal();
+
+ return true;
+ } catch (error) {
+ console.error("initRevertVideoModal failed:", error);
+ this.showError(`Failed to initialize revert modal: ${error.message}`);
+ return false;
+ }
+ }
+
+ resetRevertVideoModal() {
+ this.activeRevertVideo = null;
+ this.revertHistory = [];
+ this.selectedRevertTarget = null;
+ this.revertModalBusy = false;
+ this.pendingRevertEntries = [];
+
+ if (this.revertHistoryCount) {
+ this.revertHistoryCount.textContent = "";
+ }
+
+ if (this.revertSelectionStatus) {
+ this.revertSelectionStatus.textContent =
+ "Select an older revision to inspect its metadata before reverting.";
+ }
+
+ if (this.revertModalTitle) {
+ this.revertModalTitle.textContent = "Revert Video Note";
+ }
+
+ if (this.revertModalSubtitle) {
+ this.revertModalSubtitle.textContent =
+ "Review previous versions before restoring an older state.";
+ }
+
+ if (this.revertVersionsList) {
+ this.revertVersionsList.innerHTML = "";
+ }
+
+ if (this.revertVersionDetails && this.revertVersionDetailsDefaultHTML) {
+ this.revertVersionDetails.innerHTML = this.revertVersionDetailsDefaultHTML;
+ this.revertVersionPlaceholder =
+ this.revertVersionDetails.querySelector("#revertVersionPlaceholder");
+ }
+
+ if (this.confirmRevertVideoBtn) {
+ this.confirmRevertVideoBtn.disabled = true;
+ this.confirmRevertVideoBtn.textContent = this.revertConfirmDefaultLabel;
+ this.confirmRevertVideoBtn.classList.remove("cursor-wait");
+ }
+
+ if (this.cancelRevertVideoBtn) {
+ this.cancelRevertVideoBtn.disabled = false;
+ this.cancelRevertVideoBtn.classList.remove("opacity-60", "cursor-not-allowed");
+ }
+
+ if (this.closeRevertVideoModalBtn) {
+ this.closeRevertVideoModalBtn.disabled = false;
+ this.closeRevertVideoModalBtn.classList.remove("opacity-60", "cursor-not-allowed");
+ }
+ }
+
+ showRevertVideoModal() {
+ if (this.revertVideoModal) {
+ this.revertVideoModal.classList.remove("hidden");
+ }
+ }
+
+ hideRevertVideoModal() {
+ if (this.revertVideoModal) {
+ this.revertVideoModal.classList.add("hidden");
+ }
+ this.resetRevertVideoModal();
+ }
+
+ populateRevertVideoModal(video, history = []) {
+ if (!this.revertVideoModal) {
+ return;
+ }
+
+ this.resetRevertVideoModal();
+
+ if (!video || typeof video !== "object") {
+ if (this.revertSelectionStatus) {
+ this.revertSelectionStatus.textContent =
+ "Unable to load revision history for this note.";
+ }
+ return;
+ }
+
+ this.activeRevertVideo = video;
+
+ const merged = Array.isArray(history) ? history.slice() : [];
+ if (video.id && !merged.some((entry) => entry && entry.id === video.id)) {
+ merged.push(video);
+ }
+
+ const deduped = new Map();
+ for (const entry of merged) {
+ if (!entry || typeof entry !== "object" || !entry.id) {
+ continue;
+ }
+ deduped.set(entry.id, entry);
+ }
+
+ this.revertHistory = Array.from(deduped.values()).sort(
+ (a, b) => b.created_at - a.created_at
+ );
+
+ this.selectedRevertTarget = null;
+ if (this.revertHistory.length > 1 && video.created_at) {
+ // Auto-select the newest non-deleted revision that predates the active
+ // event so the confirmation button immediately conveys its effect.
+ const firstOlder = this.revertHistory.find(
+ (entry) =>
+ entry &&
+ entry.id !== video.id &&
+ entry.deleted !== true &&
+ typeof entry.created_at === "number" &&
+ entry.created_at < video.created_at
+ );
+ if (firstOlder) {
+ this.selectedRevertTarget = firstOlder;
+ }
+ }
+
+ if (this.revertHistoryCount) {
+ this.revertHistoryCount.textContent = `${this.revertHistory.length}`;
+ }
+
+ if (this.revertModalTitle) {
+ this.revertModalTitle.textContent = video.title
+ ? `Revert “${video.title}”`
+ : "Revert Video Note";
+ }
+
+ if (this.revertModalSubtitle) {
+ const subtitleParts = [];
+ const dTagValue = this.extractDTagValue(video.tags);
+ if (dTagValue) {
+ subtitleParts.push(`d=${dTagValue}`);
+ }
+ if (video.videoRootId) {
+ subtitleParts.push(`root=${truncateMiddle(video.videoRootId, 40)}`);
+ }
+ this.revertModalSubtitle.textContent = subtitleParts.length
+ ? `History grouped by ${subtitleParts.join(" • ")}`
+ : "Review previous versions before restoring an older state.";
+ }
+
+ this.renderRevertVersionsList();
+
+ if (this.selectedRevertTarget) {
+ this.renderRevertVersionDetails(this.selectedRevertTarget);
+ }
+
+ if (this.revertHistory.length <= 1) {
+ if (this.revertSelectionStatus) {
+ this.revertSelectionStatus.textContent =
+ "No earlier revisions are available for this note.";
+ }
+ this.updateRevertConfirmationState();
+ return;
+ }
+
+ this.updateRevertConfirmationState();
+ }
+
+ renderRevertVersionsList() {
+ if (!this.revertVersionsList) {
+ return;
+ }
+
+ const history = Array.isArray(this.revertHistory)
+ ? this.revertHistory
+ : [];
+ const selectedId = this.selectedRevertTarget?.id || "";
+ const currentId = this.activeRevertVideo?.id || "";
+
+ this.revertVersionsList.innerHTML = "";
+
+ if (!history.length) {
+ this.revertVersionsList.innerHTML =
+ 'No revisions found.
'; + return; + } + + const fragment = document.createDocumentFragment(); + + history.forEach((entry) => { + if (!entry || !entry.id) { + return; + } + + const isCurrent = entry.id === currentId; + const isSelected = entry.id === selectedId; + const isDeleted = entry.deleted === true; + + const button = document.createElement("button"); + button.type = "button"; + button.dataset.revertVersionId = entry.id; + + const classes = [ + "w-full", + "text-left", + "rounded-md", + "border", + "px-3", + "py-3", + "text-sm", + "transition", + "duration-150", + "focus:outline-none", + "focus:ring-2", + "focus:ring-offset-2", + "focus:ring-offset-gray-900", + ]; + + if (isSelected) { + classes.push( + "border-blue-500", + "bg-blue-500/20", + "text-blue-100", + "focus:ring-blue-500" + ); + } else if (isCurrent) { + classes.push( + "border-green-500/60", + "bg-green-500/10", + "text-green-100", + "focus:ring-green-500/80" + ); + } else if (isDeleted) { + classes.push( + "border-red-800/70", + "bg-red-900/30", + "text-red-200/90", + "hover:bg-red-900/40" + ); + } else { + classes.push( + "border-gray-800", + "bg-gray-800/60", + "hover:bg-gray-700/70", + "text-gray-200" + ); + } + + button.className = classes.join(" "); + button.setAttribute("aria-pressed", isSelected ? "true" : "false"); + if (isCurrent) { + button.setAttribute("aria-current", "true"); + } + + const relative = this.formatTimeAgo(entry.created_at); + const absolute = this.formatAbsoluteTimestamp(entry.created_at); + const versionLabel = + entry.version !== undefined ? `v${entry.version}` : "v?"; + + const metaParts = []; + if (isCurrent) { + metaParts.push("Current version"); + } + if (entry.deleted) { + metaParts.push("Marked deleted"); + } + if (entry.isPrivate) { + metaParts.push("Private"); + } + const meta = metaParts.join(" • "); + + const metaClass = entry.deleted + ? "text-red-200/80" + : "text-gray-400"; + + button.innerHTML = ` +${this.escapeHTML( + entry.title || "Untitled" + )}
+${this.escapeHTML( + relative + )} • ${this.escapeHTML(absolute)}
+ ${ + meta + ? `` + : "" + } +${this.escapeHTML( + description + )}
` + : 'No description provided.
'; + + const rootId = + typeof version.videoRootId === "string" ? version.videoRootId : ""; + const rootDisplay = rootId + ? this.escapeHTML(truncateMiddle(rootId, 64)) + : ""; + const eventDisplay = version.id + ? this.escapeHTML(truncateMiddle(version.id, 64)) + : ""; + + this.revertVersionDetails.innerHTML = ` +${this.escapeHTML( + absolute + )} (${this.escapeHTML(relative)})
+${this.escapeHTML(
+ dTagValue
+ )}`
+ : 'Not provided'}
+ ${rootDisplay}`
+ : 'Not provided'}
+ ${eventDisplay}`
+ : 'Unknown'}
+