Upload index.html

index.html

@@ -1477,6 +1477,18 @@ 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-';
+async function fetchTranslatedMovie(id) { // -> { ok, error?, movie } kutoka chanzo sahihi
+  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;
+}
 const PIXTVMAX_CATEGORY_SW = {
   'Sports': 'cat_sports', 'Movie Channels': 'cat_movies', 'News': 'cat_news',
   'Entertainment': 'cat_ent', 'Documentary': 'cat_doc', 'Religion': 'cat_religion',
@@ -3567,15 +3579,29 @@ async function loadLive() {
 
 // ── ZILIZOTAFSIRIWA (movies/series za DJ — mradi tofauti) ──
 async function fetchTranslatedList() {
-  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 => ({
-    id: m.id, kind: 'translated', title: m.title,
+  const card = (m, idPrefix) => ({
+    id: idPrefix + m.id, kind: 'translated', title: m.title,
     poster: m.thumb_url || m.poster_url || null, imgFallbackOn: true,
     subtitle: m.dj || (m.category === 'series' ? 'Series' : 'Movie'),
-  }));
+  });
+  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 [a, b] = await Promise.allSettled([oldP, newP]);
+  if (a.status === 'rejected' && b.status === 'rejected') throw a.reason;
+  const fresh = b.status === 'fulfilled' ? b.value : [], 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 loadTranslated() {
@@ -3611,8 +3637,7 @@ async function openTranslatedDetailScreen(item) {
   detailBody.innerHTML = stateBoxHTML(t('state_loading'));
   fadeInScreen(detailBody);
   try {
-    const r = await fetch(TRANSLATED_BASE + '?id=' + encodeURIComponent(item.id), { headers: { apikey: TRANSLATED_KEY } });
-    const d = await r.json();
+    const d = await fetchTranslatedMovie(item.id);
     if (!d.ok) throw new Error(d.error || 'Haipatikani');
     const m = d.movie || {};
     const vids = m.video_urls || {};
@@ -8908,8 +8933,7 @@ async function openTranslatedDownloadSheet(d){
     // Pata orodha kamili ya sasa kutoka server (ikishindwa, tumia tuliyonayo tayari)
     let vids = d.vids || {};
     try {
-      const r = await fetch(TRANSLATED_BASE + '?id=' + encodeURIComponent(d.id), { headers: { apikey: TRANSLATED_KEY } });
-      const j = await r.json();
+      const j = await fetchTranslatedMovie(d.id);
       const fresh = j && j.movie && j.movie.video_urls;
       if (fresh && Object.keys(fresh).length) vids = fresh;
     } catch (_) {}