Upload index.html

index.html

@@ -1492,14 +1492,14 @@ const TRAILER_BASE = JM_CONFIG.CONTENT_URL + '/functions/v1/movie-trailer';
 const TRAILER_KEY = SUPABASE_ANON_KEY;
 
 // movie-zilizotafsiriwa — mradi TOFAUTI (DJ movies/series), function ya umma pekee (GET)
-const TRANSLATED_BASE = JM_CONFIG.TRANSLATED_URL + '/functions/v1/' + JM_CONFIG.TRANSLATED_FN;
-const TRANSLATED_KEY = JM_CONFIG.TRANSLATED_KEY;
 // movie-zilizotafsriwa2 — filamu zenye MP4 (draft/public kutoka admin); project ile ile ya CONTENT_URL.
 // Id zake zinaanza na 'n2-' ili zisigongane na za chanzo cha zamani.
 const TRANSLATED2_BASE = JM_CONFIG.CONTENT_URL + '/functions/v1/movie-zilizotafsriwa2';
 const TR2_PREFIX = 'n2-';
 // movie-public2 — Absalom Family (Season Zilizotafsiriwa). Project ile ile ya CONTENT_URL. Id zake zinaanza na 'ab-'.
 const ABSALOM_BASE = JM_CONFIG.CONTENT_URL + '/functions/v1/movie-zilizotafsriwa3';
+// Chanzo kimoja cha Zilizotafsiriwa: movie-translated-all (inaunganisha old + n2 + absalom)
+const TRANSLATED_ALL = JM_CONFIG.CONTENT_URL + '/functions/v1/movie-translated-all';
 const AB_PREFIX = 'ab-';
 const AB_MAX_POSTS = 1000;   // posts zisizozidi 1000 kwenye orodha
 // Jina la kipindi: "EP1" / "Episode 1" / "1" -> "1" (ili ionekane kama Episode 1 na download iwe na namba); vinginevyo jina kamili
@@ -1524,7 +1524,7 @@ function loadTrModel() {
   return trModelP;
 }
 function logTrPlay(id) { // rekodi uchezaji bila kuzuia player; kitambulisho cha kifaa ni cha nasibu (hakuna jina/email)
-  if (!id || String(id).startsWith(AB_PREFIX)) return;
+  if (!id || String(id).startsWith(AB_PREFIX) || String(id).startsWith('abm-')) return;
   let dev = '';
   try { dev = localStorage.getItem('jm_dev') || ''; if (!dev) { dev = (crypto.randomUUID && crypto.randomUUID()) || (Date.now() + '-' + Math.random().toString(36).slice(2)); localStorage.setItem('jm_dev', dev); } } catch (_) {}
   fetch(TRANSLATED2_BASE + '?action=play', { method: 'POST', keepalive: true,
@@ -1562,14 +1562,11 @@ async function fetchAbsalomMovie(slug) { // -> { ok, error?, movie } ikiwa na vi
   (p.episodes || []).forEach(e => { if (e && e.mp4_url) eps[abEpKey(e.label, used)] = e.mp4_url; });
   return { ok: true, movie: { title: p.title, dj: p.dj, poster_url: p.poster, video_urls: { 'Season 1': eps } } };
 }
-async function fetchTranslatedMovie(id) { // -> { ok, error?, movie } kutoka chanzo sahihi
-  if (String(id).startsWith(AB_PREFIX)) return fetchAbsalomMovie(String(id).slice(AB_PREFIX.length));
-  const isNew = String(id).startsWith(TR2_PREFIX);
-  const url = isNew ? TRANSLATED2_BASE + '?id=' + encodeURIComponent(String(id).slice(TR2_PREFIX.length))
-                    : TRANSLATED_BASE + '?id=' + encodeURIComponent(id);
-  const r = await fetch(url, { headers: { apikey: isNew ? SUPABASE_ANON_KEY : TRANSLATED_KEY } });
-  const d = await r.json();
-  return isNew ? { ok: r.ok && !d.error, error: d.error, movie: d } : d;
+async function fetchTranslatedMovie(id) { // -> { ok, error?, movie } kutoka movie-translated-all
+  const r = await fetch(TRANSLATED_ALL + '?id=' + encodeURIComponent(id), { headers: { apikey: SUPABASE_ANON_KEY } });
+  const d = await r.json().catch(() => ({}));
+  if (!r.ok || !d.ok) return { ok: false, error: d.error || ('HTTP ' + r.status) };
+  return d;
 }
 const PIXTVMAX_CATEGORY_SW = {
   'Sports': 'cat_sports', 'Movie Channels': 'cat_movies', 'News': 'cat_news',
@@ -3821,33 +3818,12 @@ function absalomCardsCached() {
   return absCardsP;
 }
 
-async function fetchTranslatedList() {
-  const card = (m, idPrefix) => ({
-    id: idPrefix + m.id, kind: 'translated', title: m.title,
-    poster: m.thumb_url || m.poster_url || null, imgFallbackOn: true,
-    subtitle: normDj(m.dj) || (m.category === 'series' ? 'Series' : 'Movie'), isSeries: m.category === 'series',
-  });
-  const oldP = (async () => { // chanzo cha zamani
-    const r = await fetch(TRANSLATED_BASE + '?limit=100', { headers: { apikey: TRANSLATED_KEY } });
-    if (!r.ok) throw new Error(T('err_generic') + ' ' + r.status);
-    const d = await r.json();
-    if (!d.ok) throw new Error(d.error || 'Seva imekataa ombi.');
-    return (d.movies || []).map(m => card(m, ''));
-  })();
-  const newP = (async () => { // movie-zilizotafsriwa2: public tu (seva inachuja)
-    const r = await fetch(TRANSLATED2_BASE, { headers: { apikey: SUPABASE_ANON_KEY } });
-    if (!r.ok) throw new Error(T('err_generic') + ' ' + r.status);
-    const d = await r.json();
-    return (Array.isArray(d) ? d : []).map(m => card(m, TR2_PREFIX));
-  })();
-  const absP = absalomCardsCached(); // movie-public2: posts zenye MP4 (jibu jepesi, cache ya dakika 10)
-  const [a, b, c] = await Promise.allSettled([oldP, newP, absP]);
-  if (a.status === 'rejected' && b.status === 'rejected' && c.status === 'rejected') throw a.reason;
-  const absItems = c.status === 'fulfilled' ? c.value.map(m => card(m, AB_PREFIX)) : [];
-  const fresh = (b.status === 'fulfilled' ? b.value : []).concat(absItems),
-        older = a.status === 'fulfilled' ? a.value : [];
-  const seen = new Set(fresh.map(x => String(x.title || '').trim().toLowerCase()));
-  return fresh.concat(older.filter(x => !seen.has(String(x.title || '').trim().toLowerCase())));
+async function fetchTranslatedList() { // movie-translated-all: orodha moja iliyounganishwa
+  const r = await fetch(TRANSLATED_ALL, { headers: { apikey: SUPABASE_ANON_KEY } });
+  if (!r.ok) throw new Error(T('err_generic') + ' ' + r.status);
+  const d = await r.json();
+  if (!d.ok) throw new Error(d.error || 'Imekataa ombi.');
+  return (d.movies || []).map(m => card(m, ''));
 }
 
 async function loadTranslated() {