Merge branch 'unstable' into codex/fix-profile-modal-z-index-issue-iidrqt

js/channelProfile.js

@@ -2870,32 +2870,111 @@ function isValidRelayUrl(url) {
 }
 
 function getCachedChannelVideoEvents(pubkey) {
-  if (
-    !nostrClient?.allEvents ||
-    typeof nostrClient.allEvents.forEach !== "function"
-  ) {
-    return [];
-  }
-
   const normalized =
     typeof pubkey === "string" ? pubkey.trim().toLowerCase() : "";
   if (!normalized) {
     return [];
   }
 
-  const results = [];
-  nostrClient.allEvents.forEach((event) => {
+  const collectMatches = (source, iterator) => {
+    const matches = [];
+    if (!source || typeof iterator !== "function") {
+      return matches;
+    }
+
+    iterator((event) => {
+      const candidate = event || null;
+      if (!candidate) {
+        return;
+      }
+
+      const candidatePubkey =
+        typeof candidate.pubkey === "string"
+          ? candidate.pubkey.trim().toLowerCase()
+          : "";
+
+      if (!candidatePubkey || candidatePubkey !== normalized) {
+        return;
+      }
+
+      matches.push(candidate);
+    });
+
+    return matches;
+  };
+
+  const rawMatches = collectMatches(nostrClient?.rawEvents, (callback) => {
     if (
-      event &&
-      event.kind === 30078 &&
-      typeof event.pubkey === "string" &&
-      event.pubkey.trim().toLowerCase() === normalized
+      nostrClient?.rawEvents &&
+      typeof nostrClient.rawEvents.forEach === "function"
     ) {
-      results.push(event);
+      nostrClient.rawEvents.forEach((event) => {
+        if (event?.kind === 30078) {
+          callback(event);
+        }
+      });
     }
   });
 
-  return results;
+  if (rawMatches.length) {
+    return rawMatches;
+  }
+
+  const processedMatches = collectMatches(
+    nostrClient?.allEvents,
+    (callback) => {
+      if (
+        nostrClient?.allEvents &&
+        typeof nostrClient.allEvents.forEach === "function"
+      ) {
+        nostrClient.allEvents.forEach((video) => {
+          if (video) {
+            callback(video);
+          }
+        });
+      }
+    }
+  );
+
+  return processedMatches;
+}
+
+function normalizeRenderableChannelVideo(entry) {
+  if (!entry || typeof entry !== "object") {
+    return null;
+  }
+
+  const looksLikeRawEvent =
+    typeof entry.content === "string" ||
+    Array.isArray(entry.tags) ||
+    typeof entry.kind === "number";
+
+  if (looksLikeRawEvent) {
+    const converted = sharedConvertEventToVideo(entry);
+    if (converted && !converted.invalid) {
+      return converted;
+    }
+    return null;
+  }
+
+  const looksLikeConvertedVideo =
+    typeof entry.id === "string" &&
+    typeof entry.title === "string" &&
+    typeof entry.pubkey === "string" &&
+    Number.isFinite(entry.created_at);
+
+  if (looksLikeConvertedVideo) {
+    if (entry.invalid) {
+      return null;
+    }
+
+    return {
+      ...entry,
+      invalid: false,
+    };
+  }
+
+  return null;
 }
 
 function buildRenderableChannelVideos({ events = [], app } = {}) {
@@ -2904,7 +2983,7 @@ function buildRenderableChannelVideos({ events = [], app } = {}) {
   }
 
   const convertedVideos = events
-    .map((evt) => sharedConvertEventToVideo(evt))
+    .map((entry) => normalizeRenderableChannelVideo(entry))
     .filter((vid) => vid && !vid.invalid);
 
   if (!convertedVideos.length) {

js/gridHealth.js

@@ -480,11 +480,8 @@ function setBadge(card, state, details) {
     delete badge.dataset.variant;
   }
 
-  const peersText =
-    normalizedState === "healthy" && peersValue > 0 ? ` (${peersValue})` : "";
-
   const iconPrefix = entry.icon ? `${entry.icon} ` : "";
-  badge.textContent = `${iconPrefix}WebTorrent${peersText}`;
+  badge.textContent = `${iconPrefix}WebTorrent`;
   const tooltip =
     normalizedState === "checking" || normalizedState === "unknown"
       ? entry.aria

js/ui/components/VideoCard.js

@@ -663,7 +663,15 @@ export class VideoCard {
         alt: "Placeholder"
       }
     });
-    avatar.classList.add("author-pic", "cursor-pointer");
+    avatar.classList.add(
+      "author-pic",
+      "cursor-pointer",
+      "block",
+      "h-full",
+      "w-full",
+      "rounded-full",
+      "object-cover"
+    );
     if (this.video.pubkey) {
       avatar.dataset.pubkey = this.video.pubkey;
     }
@@ -1601,10 +1609,8 @@ export class VideoCard {
     } else if (badge.dataset.variant) {
       delete badge.dataset.variant;
     }
-    const peersText =
-      state === "healthy" && peersValue > 0 ? ` (${peersValue})` : "";
     const iconPrefix = descriptor.icon ? `${descriptor.icon} ` : "";
-    const computedText = `${iconPrefix}WebTorrent${peersText}`;
+    const computedText = `${iconPrefix}WebTorrent`;
     badge.textContent = text || computedText;
 
     const tooltipValue =