Merge pull request #977 from VillainsRule/main

Fix crossorigin iframes

Author: xbubbo

static/404.html

@@ -40,8 +40,8 @@ <h3>Page not found.</h3>
       </button>
     </div>
   </body>
-  <script src="/assets/js/i.js?v=02"></script>
+  <script src="/assets/js/i.js?v=03"></script>
   <script src="/assets/ultra/bundle.js?v=10-02-2024"></script>
   <script src="/assets/ultra/config.js?v=10-02-2024"></script>
-  <script src="/assets/js/mv.js?v=002"></script>
+  <script src="/assets/js/mv.js?v=003"></script>
 </html>

static/apps.html

@@ -13,7 +13,7 @@
     <link rel="stylesheet" href="/assets/css/global.css?v=6" />
     <link rel="stylesheet" href="/assets/css/container.css?v=2" />
     <link rel="stylesheet" href="/assets/css/nav.css?v=01" />
-    <script src="/assets/js/i.js?v=02"></script>
+    <script src="/assets/js/i.js?v=03"></script>
     <script src="assets/js/f.js"></script>
     <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6840529569014734"
      crossorigin="anonymous"></script>
@@ -50,8 +50,8 @@
     </div>
     <div class="pinned"></div>
     <div class="apps"></div>
-    <script src="assets/js/c.js?v=05"></script>
-    <script src="/assets/js/mv.js?v=002"></script>
+    <script src="assets/js/c.js?v=06"></script>
+    <script src="/assets/js/mv.js?v=003"></script>
     <script
       async
       src="https://www.googletagmanager.com/gtag/js?id=G-WKJQ5QHQTJ"

static/assets/js/c.js

@@ -2,7 +2,18 @@ let appInd;
 const g = window.location.pathname === "/up";
 const a = window.location.pathname === "/yz";
 const c = window.location.pathname === "/gt";
-const t = window.top.location.pathname === "/rx";
+
+let t;
+
+try {
+  t = window.top.location.pathname === "/rx";
+} catch {
+  try {
+    t = window.parent.location.pathname === "/rx";   
+  } catch {
+    t = false;
+  }
+}
 
 function Span(name) {
   return name.split("").map(char => {

static/assets/js/i.js

@@ -4,15 +4,28 @@ window.addEventListener("load", () => {
   });
 });
 
+let xl;
+
+try {
+  xl = window.top.location.pathname === "/rx";
+} catch {
+  try {
+    xl = window.parent.location.pathname === "/rx";   
+  } catch {
+    xl = false;
+  }
+}
+
 const form = document.getElementById("fv");
 const input = document.getElementById("iv");
 
 if (form && input) {
   form.addEventListener("submit", async event => {
     event.preventDefault();
-    if (window.top.location.pathname === "/rx") {
-      processUrl(input.value, "");
-    } else {
+    try {
+      if (xl) processUrl(input.value, "");
+      else processUrl(input.value, "/rx");
+    } catch {
       processUrl(input.value, "/rx");
     }
   });

static/assets/js/mv.js

@@ -1,3 +1,15 @@
+let qp;
+
+try {
+  qp = window.top.location.pathname === "/rx";
+} catch {
+  try {
+    qp = window.parent.location.pathname === "/rx";   
+  } catch {
+    qp = false;
+  }
+}
+
 document.addEventListener("DOMContentLoaded", () => {
   // Blocked Hostnames Check
   /* const blockedHostnames = [
@@ -30,7 +42,7 @@ document.addEventListener("DOMContentLoaded", () => {
       <div class="f-nav-right">
         <a class="navbar-link" href="/./up"><i class="fa-solid fa-gamepad navbar-icon"></i><an>&#71;&#97;</an><an>&#109;&#101;&#115;</an></a>
         <a class="navbar-link" href="/./yz"><i class="fa-solid fa-phone navbar-icon"></i><an>&#65;&#112;</an><an>&#112;&#115;</an></a>
-        ${window.top.location.pathname === "/rx" ? "" : '<a class="navbar-link" href="/./rx"><i class="fa-solid fa-laptop navbar-icon"></i><an>&#84;&#97;</an><an>&#98;&#115;</an></a>'}
+        ${qp ? "" : '<a class="navbar-link" href="/./rx"><i class="fa-solid fa-laptop navbar-icon"></i><an>&#84;&#97;</an><an>&#98;&#115;</an></a>'}
         <a class="navbar-link" href="/./vk"><i class="fa-solid fa-gear navbar-icon settings-icon"></i><an>&#83;&#101;&#116;</an><an>&#116;&#105;&#110;&#103;</an></a>
       </div>`;
     nav.innerHTML = html;

static/assets/js/settings.js

@@ -162,11 +162,18 @@ function ResetCustomCloak() {
 function redirectToMainDomain() {
   const currentUrl = window.location.href;
   const mainDomainUrl = currentUrl.replace(/\/[^\/]*$/, "");
+  const target = mainDomainUrl + window.location.pathname;
   if (window !== top) {
-    top.location.href = mainDomainUrl + window.location.pathname;
-  } else {
-    window.location.href = mainDomainUrl + window.location.pathname;
-  }
+    try {
+      top.location.href = target
+    } catch {
+      try {
+        parent.location.href = target
+      } catch {
+        window.location.href = target
+      }
+    }
+  } else window.location.href = mainDomainUrl + window.location.pathname;
 }
 
 document.addEventListener("DOMContentLoaded", event => {

static/games.html

@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="/assets/css/global.css?v=6" />
     <link rel="stylesheet" href="/assets/css/container.css?v=2" />
     <link rel="stylesheet" href="/assets/css/nav.css?v=01" />
-    <script src="/assets/js/i.js?v=02"></script>
+    <script src="/assets/js/i.js?v=03"></script>
     <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6840529569014734"
      crossorigin="anonymous"></script>
 
@@ -37,11 +37,11 @@
     </div>
     <div class="pinned"></div>
     <div class="apps"></div>
-    <script src="/assets/js/c.js?v=05"></script>
+    <script src="/assets/js/c.js?v=06"></script>
     <script src="./assets/ultra/bundle.js?v=10-02-2024"></script>
     <script src="./assets/ultra/config.js?v=10-02-2024"></script>
     <script src="assets/js/f.js"></script>
-    <script src="/assets/js/mv.js?v=002"></script>
+    <script src="/assets/js/mv.js?v=003"></script>
     <script
       async
       src="https://www.googletagmanager.com/gtag/js?id=G-WKJQ5QHQTJ"

static/index.html

@@ -31,12 +31,12 @@ <h1 class="title">&#73;&#110;&#116;&#101;&#114;&#115;&#116;&#101;&#108;&#108;&#9
         </div>
       </div>
     </div>
-    <script src="assets/js/i.js?v=02"></script>
+    <script src="assets/js/i.js?v=03"></script>
     <script src="/assets/js/home.js?v=00"></script>
     <script src="./assets/ultra/bundle.js?v=10-02-2024"></script>
     <script src="./assets/ultra/config.js?v=10-02-2024"></script>
     <script src="assets/js/f.js"></script>
-    <script src="/assets/js/mv.js?v=002"></script>
+    <script src="/assets/js/mv.js?v=003"></script>
     <!-- DO NOT REMOVE-->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-WKJQ5QHQTJ"></script>
     <script>

static/settings.html

@@ -260,8 +260,8 @@ <h3>Information</h3>
         </div>
       </div>
     </div>
-    <script src="/assets/js/mv.js?v=002"></script>
-    <script src="/assets/js/settings.js?v=010"></script>
+    <script src="/assets/js/mv.js?v=003"></script>
+    <script src="/assets/js/settings.js?v=011"></script>
     <!-- DO NOT REMOVE-->
     <script
       async

static/tabs.html

@@ -93,7 +93,7 @@
     <script src="assets/js/t.js?v=03"></script>
     <script src="./assets/ultra/bundle.js?v=10-02-2024"></script>
     <script src="./assets/ultra/config.js?v=10-02-2024"></script>
-    <script src="/assets/js/mv.js?v=002"></script>
+    <script src="/assets/js/mv.js?v=003"></script>
     <!-- DO NOT REMOVE-->
     <script
       async