mirror of
https://github.com/PR0M3TH3AN/bitvid.git
synced 2026-11-08 05:43:04 +00:00
videos: cross-ecosystem dedup (prefer bitvid, show one) across all grids
Phase 1 of the on-boarding plan, and the shared layer for unified grid loading. A video that exists as both a bitvid kind-30078 note and a NIP-71 mirror/original previously could appear twice (e.g. independent dual-posts). js/utils/videoDeduper.js: collapseCrossEcosystem() groups events by a per-author identity (fileSha256 / originalFileSha256 / infoHash, plus an `eid` namespace that links an on-boarded note's `importedFrom` to the original foreign event) via union-find, and keeps the bitvid-native version (else newest). dedupeVideos() = root-dedup THEN cross-ecosystem collapse. Routed through the shared chokepoint app.dedupeVideosByRoot (playback coordinator), so the feed stage, channel profile, and search all collapse duplicates identically — "show one, prefer bitvid" everywhere. Channel fallback path updated too. Limitation (documented): hash-less independent dual-posts can't be matched until the bitvid side carries on-board provenance (Phase 2). Tests + mutation-verified (prefer-bitvid, per-author identity, infohash, provenance link, root+cross composition). 1262/1263 unit (known flake). Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
1 parent
c404618137
commit
065706a3cf
6 files changed
+250
-9
No files matched your search
@@ -34,4 +34,125 @@ export function dedupeToNewestByRoot(videos) {
|
||||
return Array.from(map.values());
|
||||
}
|
||||
|
||||
// Identity keys that mark two events as "the same video" across ecosystems
|
||||
// (bitvid kind-30078 vs a NIP-71 mirror/original). Scoped per author. Content
|
||||
// hashes + infohash are the reliable signals; `importedFrom` (Phase 2 on-board
|
||||
// provenance) links an on-boarded bitvid note to the original foreign event via a
|
||||
// shared "eid" namespace. Videos with none of these only ever match themselves.
|
||||
function crossEcosystemIdentityKeys(video) {
|
||||
const author =
|
||||
typeof video?.pubkey === "string" ? video.pubkey.trim().toLowerCase() : "";
|
||||
if (!author) {
|
||||
return [];
|
||||
}
|
||||
const keys = [];
|
||||
const push = (ns, value) => {
|
||||
const s = typeof value === "string" ? value.trim().toLowerCase() : "";
|
||||
if (s) {
|
||||
keys.push(`${author}|${ns}|${s}`);
|
||||
}
|
||||
};
|
||||
push("sha", video.fileSha256);
|
||||
push("ox", video.originalFileSha256);
|
||||
push("ih", video.infoHash);
|
||||
push("eid", video.id);
|
||||
push("eid", video.importedFrom);
|
||||
return keys;
|
||||
}
|
||||
|
||||
function isBitvidNative(video) {
|
||||
return video?.source !== "nip71-ingest" && video?.foreign !== true;
|
||||
}
|
||||
|
||||
// Within a group of same-video events, prefer the bitvid-native (kind-30078)
|
||||
// version; among the same kind, the newest (tie: higher id) for determinism.
|
||||
function pickPreferredVideo(group) {
|
||||
let best = null;
|
||||
for (const video of group) {
|
||||
if (!best) {
|
||||
best = video;
|
||||
continue;
|
||||
}
|
||||
const nativeV = isBitvidNative(video);
|
||||
const nativeBest = isBitvidNative(best);
|
||||
if (nativeV !== nativeBest) {
|
||||
if (nativeV) best = video;
|
||||
continue;
|
||||
}
|
||||
const tV = Number(video.created_at);
|
||||
const tBest = Number(best.created_at);
|
||||
const cV = Number.isFinite(tV) ? tV : -Infinity;
|
||||
const cBest = Number.isFinite(tBest) ? tBest : -Infinity;
|
||||
if (cV > cBest || (cV === cBest && String(video.id) > String(best.id))) {
|
||||
best = video;
|
||||
}
|
||||
}
|
||||
return best;
|
||||
}
|
||||
|
||||
/**
|
||||
* Collapse duplicates of the same video that appear in BOTH ecosystems (a bitvid
|
||||
* kind-30078 note and a NIP-71 mirror/original) so a grid never shows both.
|
||||
* Always prefers the bitvid version. Same-ecosystem, distinct videos are
|
||||
* untouched. Pure.
|
||||
*/
|
||||
export function collapseCrossEcosystem(videos) {
|
||||
const list = Array.isArray(videos) ? videos.filter(Boolean) : [];
|
||||
if (list.length < 2) {
|
||||
return list.slice();
|
||||
}
|
||||
|
||||
// Union-find: merge any videos that share an identity key.
|
||||
const parent = list.map((_, i) => i);
|
||||
const find = (i) => {
|
||||
let root = i;
|
||||
while (parent[root] !== root) root = parent[root];
|
||||
while (parent[i] !== root) {
|
||||
const next = parent[i];
|
||||
parent[i] = root;
|
||||
i = next;
|
||||
}
|
||||
return root;
|
||||
};
|
||||
const union = (a, b) => {
|
||||
const ra = find(a);
|
||||
const rb = find(b);
|
||||
if (ra !== rb) parent[ra] = rb;
|
||||
};
|
||||
|
||||
const keyToIndex = new Map();
|
||||
list.forEach((video, i) => {
|
||||
for (const key of crossEcosystemIdentityKeys(video)) {
|
||||
if (keyToIndex.has(key)) {
|
||||
union(keyToIndex.get(key), i);
|
||||
} else {
|
||||
keyToIndex.set(key, i);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const groups = new Map();
|
||||
list.forEach((video, i) => {
|
||||
const root = find(i);
|
||||
const group = groups.get(root);
|
||||
if (group) group.push(video);
|
||||
else groups.set(root, [video]);
|
||||
});
|
||||
|
||||
const result = [];
|
||||
for (const group of groups.values()) {
|
||||
result.push(group.length === 1 ? group[0] : pickPreferredVideo(group));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* The shared grid dedupe: collapse to newest-per-root, THEN collapse
|
||||
* cross-ecosystem duplicates (prefer bitvid). Use this everywhere a video list is
|
||||
* built so every grid behaves identically.
|
||||
*/
|
||||
export function dedupeVideos(videos) {
|
||||
return collapseCrossEcosystem(dedupeToNewestByRoot(videos));
|
||||
}
|
||||
|
||||
export default dedupeToNewestByRoot;
|
||||
Reference in new issue
Block a user