Merge remote-tracking branch 'origin/main'

55gms · Sep 12, 2024 · fa307c9 · fa307c9
2 parents 3e741b6 + 116fc2e
commit fa307c9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/static/!.html b/static/!.html
@@ -2,7 +2,7 @@
 <html lang="en" class="notranslate" translate="no">
 
 <head>
-  <title>Courses</title>
+  <title>Google</title>
   <meta content="width=device-width, initial-scale=1.0" name="viewport" />
   <script src="/assets/js/script.js?v=10" async></script>
   <link href="/img/favicon.ico" rel="icon" type="image/x-icon" />
@@ -47,4 +47,4 @@
 <script src="assets/uv/uv.bundle.js" defer></script>
 <script src="assets/uv/uv.config.js?cdn" defer></script>
 
-</html>
+</html>
diff --git a/static/assets/js/frame.js b/static/assets/js/frame.js
@@ -43,7 +43,7 @@ window.addEventListener("DOMContentLoaded", function () {
   if (searchBar) {
     searchBar.setAttribute(
       "value",
-      decodeURL(sessionStorage.getItem("encodedUrl"))
+      decodeURL(sessionStorage.getItem("encodedUrl")),
     );
     // search bar functionality
     searchBar.addEventListener("keydown", function (event) {
@@ -66,7 +66,7 @@ function reload() {
 document.onfullscreenchange = function () {
   document.body.classList.toggle(
     "fullscreen-active",
-    document.fullscreenElement
+    document.fullscreenElement,
   );
   iframe = document.getElementById("iframeid");
   if (document.fullscreenElement) {

diff --git a/static/assets/js/media.js b/static/assets/js/media.js
@@ -44,7 +44,7 @@ function fetchTmdbId() {
               </a>
             </div>`;
           } else if (movie.media_type === "movie") {
-            let link = `https://vidlink.pro/movie/${movie.id}?icons=vid`;
+            let link = `https://vidlink.pro/movie/${movie.id}`;
             gameHtml = `<div class="card" style="padding-top: 5px">
               <div class="rating">★ ${rating}</div>
               <div class="year">${year}</div>
@@ -67,7 +67,7 @@ function fetchTmdbId() {
 
 async function displayPopular() {
   const response = await fetch(
-    "https://api.themoviedb.org/3/trending/all/week?api_key=d93115754010beb32ae8956c26dbc590"
+    "https://api.themoviedb.org/3/trending/all/week?api_key=d93115754010beb32ae8956c26dbc590",
   );
   const data = await response.json();
   const popular = data.results;
@@ -101,7 +101,7 @@ async function displayPopular() {
         </div>
       </div>`;
     } else if (movie.media_type === "movie") {
-      let link = `https://vidlink.pro/movie/${movie.id}?icons=vid`;
+      let link = `https://vidlink.pro/movie/${movie.id}`;
       gameHtml = `<div class="card" style="padding-top: 5px">
         <div class="rating">★ ${rating}</div>
         <div class="year">${year}</div>
@@ -141,3 +141,23 @@ document.addEventListener("DOMContentLoaded", function () {
     });
   displayPopular();
 });
+
+function promptForSeasonAndEpisode(videoId) {
+  const season = prompt("Enter season number:");
+  const episode = prompt("Enter episode number:");
+  if (!season || !episode) {
+    return;
+  } else if (isNaN(season) || isNaN(episode)) {
+    alert("Season and episode must be numbers");
+    return;
+  } else if (season < 1 || episode < 1) {
+    alert("Season and episode must be greater than 0");
+    return;
+  } else if (season.includes(".") || episode.includes(".")) {
+    alert("Season and episode must be whole numbers");
+    return;
+  }
+
+  const link = `https://vidlink.pro/tv/${videoId}/${season}/${episode}?nextbutton=true`;
+  hire(link);
+}
diff --git a/static/math.html b/static/math.html
@@ -7,7 +7,7 @@
   <meta name="google" content="notranslate" />
   <link rel="stylesheet" type="text/css" href="/assets/css/style.css" />
   <link rel="stylesheet" href="/assets/css/nav.css?v=3" />
-  <link rel="stylesheet" type="text/css" href="/assets/css/media.css?1" />
+  <link rel="stylesheet" type="text/css" href="/assets/css/media.css?2" />
   <title>Google</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="author" content="Rednotsus" />
@@ -19,7 +19,7 @@
     content="unblocked games, 55gms tk, 55gms, reds exploit corner, games, unblocked, site, lanier, lanier middle school, gg, Minecraft, discord, chromebook, chromeos, rednotsus, vanillacraft, eaglercraft unblocked, resent client unblocked, fun, cool, proxy, slope unblocked, free, unblocked monkey mart, 555gms, 5gms, school" />
   </script>
   <script src="/assets/js/script.js?v=10"></script>
-  <script src="/assets/js/media.js?12"></script>
+  <script src="/assets/js/media.js?14"></script>
   <script src="/assets/js/easteregg.min.js" async></script>
 </head>
 
@@ -67,4 +67,4 @@ <h3 class="popular" id='popular'>Popular Movies/TV Shows</h3>
   <script src="assets/uv/uv.config.js" defer></script>
 </body>
 
-</html>
+</html>