Upload index.html

index.html

@@ -3142,10 +3142,46 @@ function safeImgHTML(urls, alt, lazy){
  * matokeo tayari yamechujwa, tunayabadilisha tu kuwa muundo wa
  * poster card (sawa na toCard()).
  */
+// Fallback: 'movies.search' ya dodolive kupitia jaynes-max-tv-api-. Muundo wa jibu
+// haujulikani kwa hakika, kwa hiyo tunapitia jibu lote kutafuta objects zenye id + title + picha.
+function collectDodoSubjects(node, depth, seen, out) {
+  if (node == null || depth > 10) return;
+  if (Array.isArray(node)) { node.forEach(n => collectDodoSubjects(n, depth + 1, seen, out)); return; }
+  if (typeof node !== 'object') return;
+  const o = (node.subject && typeof node.subject === 'object') ? node.subject : node;
+  const id = o.subjectId != null ? o.subjectId : o.id;
+  const title = typeof o.title === 'string' ? o.title : (typeof o.name === 'string' ? o.name : '');
+  const cover = (o.cover && o.cover.url) || o.poster || o.coverUrl || o.image || null;
+  if (id != null && title && cover && !seen.has(String(id))) {
+    seen.add(String(id));
+    out.push({
+      id: String(id), title, cover: typeof cover === 'string' ? cover : null,
+      genre: o.genre ?? null, rating: o.imdbRatingValue ?? o.rating ?? null,
+      releaseDate: o.releaseDate ?? o.year ?? null, subjectType: o.subjectType ?? null,
+      detailPath: o.detailPath ?? null, description: o.description ?? null,
+    });
+  }
+  Object.keys(node).forEach(k => collectDodoSubjects(node[k], depth + 1, seen, out));
+}
+async function searchViaDodo(keyword) {
+  const r = await rpcRaw('movies.search', { keyword, keywords: keyword, query: keyword, q: keyword, page: 1, perPage: 20 });
+  const out = [];
+  collectDodoSubjects(r && r.data !== undefined ? r.data : r, 0, new Set(), out);
+  return out;
+}
+
 async function searchMovieBoxRaw(keyword) {
-  const url = SEARCH_FN_URL + '?keyword=' + encodeURIComponent(keyword);
-  const res = await fetch(url, { headers: { 'apikey': SUPABASE_ANON_KEY }, cache: 'no-store' });
-  const arr = await res.json();
+  let arr = [];
+  try {
+    const url = SEARCH_FN_URL + '?keyword=' + encodeURIComponent(keyword);
+    const res = await fetch(url, { headers: { 'apikey': SUPABASE_ANON_KEY }, cache: 'no-store' });
+    const j = await res.json();
+    if (Array.isArray(j)) arr = j;
+  } catch (_) {}
+  // movie-box ikirudisha tupu au kushindwa -> jaribu dodolive
+  if (!arr.length) {
+    try { arr = await searchViaDodo(keyword); } catch (_) {}
+  }
   if (!Array.isArray(arr)) return [];
   return arr.map(x => {
     const year = x.releaseDate ? String(x.releaseDate).slice(0, 4) : null;
@@ -4254,7 +4290,58 @@ async function shareTranslatedTitle(d) {
 // ── MICHEZO (fawa-live) ──
 // Inarudisha orodha bapa (flat) ya mechi zote — inatumika na loadSports()
 // (kuonyesha kwa rails, kikundi kwa ligi) na search (kuchuja kwa query).
+// ── EMBEDS za Michezo: YouTube Live (inachezwa ndani ya app) na WhatsApp (kiungo cha kufungua nje) ──
+// Hariri orodha hii tu. type: 'youtube' | 'whatsapp'
+//  youtube : url = kiungo cha YouTube (watch?v=, youtu.be/, /live/, /embed/) AU channel ID (UC...)
+//  whatsapp: url = kiungo cha WhatsApp Channel / group / wa.me (haiwezi ku-embed — inafunguliwa nje)
+const SPORTS_EMBEDS = [
+  // { type: 'youtube',  title: 'Mechi Live',     url: 'https://www.youtube.com/watch?v=VIDEO_ID', league: 'Live YouTube', time: 'LIVE' },
+  // { type: 'whatsapp', title: 'Kundi la Mechi', url: 'https://whatsapp.com/channel/XXXXXXXX',    league: 'WhatsApp' },
+];
+function youtubeEmbedUrl(u) {
+  u = String(u || '').trim();
+  let id = null, channel = null;
+  if (/^UC[\w-]{22}$/.test(u)) channel = u;
+  else {
+    const m = u.match(/(?:youtu\.be\/|[?&]v=|\/embed\/|\/live\/|\/shorts\/)([\w-]{11})/);
+    if (m) id = m[1];
+    else if (/^[\w-]{11}$/.test(u)) id = u;
+    else { const c = u.match(/channel\/(UC[\w-]{22})/); if (c) channel = c[1]; }
+  }
+  if (id) return 'https://www.youtube.com/embed/' + id + '?autoplay=1&playsinline=1&rel=0&modestbranding=1';
+  if (channel) return 'https://www.youtube.com/embed/live_stream?channel=' + channel + '&autoplay=1&playsinline=1&rel=0';
+  return null;
+}
+function sportsEmbedItems() {
+  return SPORTS_EMBEDS.map((e, i) => ({
+    id: 'embed-' + i, kind: 'sport', title: e.title, poster: e.poster || null,
+    subtitle: e.time || (e.type === 'youtube' ? 'LIVE' : 'WhatsApp'), imgFallbackOn: true,
+    _league: e.league || (e.type === 'youtube' ? 'Live YouTube' : 'WhatsApp'), _embed: e
+  }));
+}
+function openSportsEmbed(item) {
+  const e = item._embed;
+  openPlayerShell(item.title);
+  if (e.type === 'youtube') {
+    const src = youtubeEmbedUrl(e.url);
+    if (!src) return statusMsg('Kiungo cha YouTube si sahihi.');
+    stage.innerHTML = '<iframe allowfullscreen allow="autoplay; encrypted-media; picture-in-picture; fullscreen" referrerpolicy="strict-origin-when-cross-origin" src="' + esc(src) + '"></iframe>';
+  } else {
+    stage.innerHTML = '<div class="status">WhatsApp hairuhusu video kuwekwa ndani ya app.<br><br>' +
+      '<a href="' + esc(e.url) + '" target="_blank" rel="noopener" style="display:inline-block;padding:12px 20px;border-radius:999px;background:#25d366;color:#04210f;font-weight:800;text-decoration:none">Fungua WhatsApp</a></div>';
+  }
+}
+
 async function fetchAllSportsItemsRaw() {
+  const embeds = sportsEmbedItems();
+  try {
+    return (await fetchFawaMatchItems()).concat(embeds);
+  } catch (e) {
+    if (embeds.length) return embeds;   // fawa-live ikishindwa, embeds bado zinaonekana
+    throw e;
+  }
+}
+async function fetchFawaMatchItems() {
   const res = await fetch(FAWA_BASE + '/matches', { headers: { Authorization: 'Bearer ' + FAWA_KEY } });
   if (!res.ok) throw new Error(T('err_generic') + ' ' + res.status);
   const d = await res.json();
@@ -6402,6 +6489,7 @@ async function playHlsUrl(url, opts = {}) {
 }
 
 async function openFawaMatch(item) {
+  if (item && item._embed) return openSportsEmbed(item);
   openPlayerShell(item.title);
   // Jaribu Worker (Cloudflare) kwanza; ikishindwa (mf. 502) jaribu Supabase
   let url, opts, r = null;