Merge main

2024-12-20 14:37:43 +01:00 · 2024-03-23 11:07:09 -04:00 · 2024-03-23 11:07:09 -04:00 · aabdd0abac
commit aabdd0abac
parent ad17b3838e 626805dfab
7 changed files with 200 additions and 237 deletions
--- a/README.md
+++ b/README.md
@ -72,4 +72,4 @@ git push  # Push to YOUR repository

 ## Contact Me
 **Discord:** *.baddeveloper*  
-**Email:** *[sudo-flix@proton.me](mailto:sudo-flix@proton.me)*
+**Email:** *[dev@sudo-flix.lol](mailto:dev@sudo-flix.lol)*
--- a/index.html
+++ b/index.html
@ -14,6 +14,8 @@
  </script>
  <meta charset="utf-8" />
  <link rel="icon" href="/favicon.ico" />
+  <meta itemprop="image" content="/android-chrome-192x192.png">
+  <meta property="og:image" content="/android-chrome-192x192.png">
  <meta name="viewport"
    content="width=device-width, initial-scale=1, viewport-fit=cover, maximum-scale=1.0, user-scalable=no" />
  <meta name="description" content="Watch your favorite shows and movies for free with no ads ever! (っ'ヮ'c)" />
--- a/src/assets/locales/en.json
+++ b/src/assets/locales/en.json
@ -454,7 +454,7 @@
  },
  "screens": {
    "dmca": {
-      "text": "Welcome to sudo-flix's DMCA contact page. If you believe your copyrighted work has been improperly used on our platform (😢), please send a detailed DMCA notice to: <bold>sudo-flix@proton.me</bold> below. Please include a description of the copyrighted material, your contact details, and a statement of good faith belief. We're committed to resolving these matters promptly and appreciate your cooperation.",
+      "text": "Welcome to sudo-flix's DMCA contact page. If you believe your copyrighted work has been improperly used on our platform (😢), please send a detailed DMCA notice to: <bold>dev@sudo-flix.lol</bold> below. Please include a description of the copyrighted material, your contact details, and a statement of good faith belief. We're committed to resolving these matters promptly and appreciate your cooperation.",
      "title": "DMCA :("
    },
    "loadingApp": "Loading application",
--- a/src/components/player/atoms/NextEpisodeButton.tsx
+++ b/src/components/player/atoms/NextEpisodeButton.tsx
@ -1,5 +1,5 @@
 import classNames from "classnames";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useCallback } from "react";
 import { useTranslation } from "react-i18next";

 import { Icon, Icons } from "@/components/Icon";
@ -88,22 +88,6 @@ export function NextEpisodeButton(props: {
    props.onChange?.(metaCopy);
  }, [setDirectMeta, meta, props, setShouldStartFromBeginning]);

-  const [countdown, setCountdown] = useState(15);
-
-  useEffect(() => {
-    const timer = setInterval(() => {
-      setCountdown((prev) => (prev > 0 ? prev - 1 : 0));
-    }, 1000);
-
-    return () => clearInterval(timer);
-  }, []);
-
-  useEffect(() => {
-    if (countdown === 0) {
-      loadNextEpisode();
-    }
-  }, [countdown, loadNextEpisode]);
-
  if (!meta?.episode || !nextEp) return null;
  if (metaType !== "show") return null;

@ -130,9 +114,7 @@ export function NextEpisodeButton(props: {
          className="bg-buttons-primary hover:bg-buttons-primaryHover text-buttons-primaryText flex justify-center items-center"
        >
          <Icon className="text-xl mr-1" icon={Icons.SKIP_EPISODE} />
-          {countdown > 0
-            ? `Next episode in ${countdown} seconds`
-            : t("player.nextEpisode.next")}
+          {t("player.nextEpisode.next")}
        </Button>
      </div>
    </Transition>
--- a/src/components/player/atoms/Volume.tsx
+++ b/src/components/player/atoms/Volume.tsx
@ -41,8 +41,13 @@ export function Volume(props: Props) {

  const handleMouseEnter = useCallback(async () => {
    if (await canChangeVolume()) setHovering(true);
+    document.body.classList.add("overflow-y-hidden");
  }, [setHovering]);

+  const handleMouseLeave = () => {
+    document.body.classList.remove("overflow-y-hidden");
+  };
+
  let percentage = makePercentage(volume * 100);
  if (dragging) percentage = makePercentage(dragPercentage);
  const percentageString = makePercentageString(percentage);
@ -61,9 +66,10 @@ export function Volume(props: Props) {
    <div
      className={props.className}
      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
      onWheel={handleWheel}
    >
-      <div className="pointer-events-auto flex cursor-pointer items-center py-0">
+      <div className="pointer-events-auto flex cursor-pointer items-center py-0 touch-none">
        <div className="px-4 text-2xl text-white" onClick={handleClick}>
          <Icon icon={percentage > 0 ? Icons.VOLUME : Icons.VOLUME_X} />
        </div>
--- a/src/components/utils/Lightbar.tsx
+++ b/src/components/utils/Lightbar.tsx
@ -145,17 +145,15 @@ function ParticlesCanvas() {

    // Basic particle config
    const particleCount = 265;
-    let imageParticleCount = particleCount;

-    // Holiday overrides
    let imageOverride: { image: string; sizeRange?: [number, number] }[] = [];
    const date = new Date();
    const month = date.getMonth();
    const day = date.getDate();
-    if (
-      (month === 11 && day >= 24 && day <= 26) ||
-      Math.random() < 0.051 // 5.1%
-    ) {
+    let imageParticleCount = particleCount;
+
+    switch (true) {
+      case (month === 11 && day >= 24 && day <= 26) || Math.random() < 0.051:
        imageOverride = [
          {
            image: "/lightbar-images/snowflake.svg",
@ -167,15 +165,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount * 0.1;
-    }
+        break;

-    // Halloween overrides
-    const month2 = date.getMonth();
-    const day2 = date.getDate();
-    if (
-      (month2 === 9 && day2 >= 29 && day2 <= 31) ||
-      Math.random() < 0.05 // 5%
-    ) {
+      case (month === 9 && day >= 29 && day <= 31) || Math.random() < 0.05:
        imageOverride = [
          {
            image: "/lightbar-images/ghost.png",
@ -187,11 +179,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount * 0.0879;
-    }
+        break;

-    // Fish easter egg
-    const shouldShowFishie = Math.random() < 0.1; // 10%
-    if (shouldShowFishie) {
+      case Math.random() < 0.1:
        imageOverride = [
          {
            image: "/lightbar-images/fishie.png",
@ -202,14 +192,10 @@ function ParticlesCanvas() {
            sizeRange: [48, 56] as [number, number],
          },
        ];
-      imageParticleCount = particleCount * 0.085;
-    }
+        imageParticleCount = particleCount * 0.075;
+        break;

-    // Weed easter egg
-    const month3 = date.getMonth() + 1;
-    const day3 = date.getDate();
-    const shouldShowZa = (month3 === 4 && day3 === 20) || Math.random() < 0.25; // 25%
-    if (shouldShowZa) {
+      case (month === 4 && day === 20) || Math.random() < 0.25:
        imageOverride = [
          {
            image: "/lightbar-images/weed.png",
@ -217,11 +203,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 6.25;
-    }
+        break;

-    // Kitty easter egg
-    const shouldShowCat = Math.random() < 0.2; // 20%
-    if (shouldShowCat) {
+      case Math.random() < 0.2:
        imageOverride = [
          {
            image: "/lightbar-images/cat.png",
@ -229,11 +213,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 6.6;
-    }
+        break;

-    // Movie & popcorn easter egg
-    const shouldShowParaphernalia = Math.random() < 0.3; // 30%
-    if (shouldShowParaphernalia) {
+      case Math.random() < 0.3:
        imageOverride = [
          {
            image: "/lightbar-images/camera.png",
@ -245,11 +227,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 7.85;
-    }
+        break;

-    // Chicken easter egg
-    const shouldShow4thDecor = Math.random() < 0.08; // 8%
-    if (shouldShow4thDecor) {
+      case Math.random() < 0.08:
        imageOverride = [
          {
            image: "/lightbar-images/cock.png",
@ -265,11 +245,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 9;
-    }
+        break;

-    // Money easter egg
-    const shouldShowMoney = Math.random() < 0.06; // 6%
-    if (shouldShowMoney) {
+      case Math.random() < 0.06:
        imageOverride = [
          {
            image: "/lightbar-images/money-sack.png",
@ -285,11 +263,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 8.45;
-    }
+        break;

-    // Pirate easter egg
-    const shouldShowPirate = Math.random() < 0.075; // 7.5%
-    if (shouldShowPirate) {
+      case Math.random() < 0.075:
        imageOverride = [
          {
            image: "/lightbar-images/skull.png",
@ -301,11 +277,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 10;
-    }
+        break;

-    // Dev easter egg
-    const shouldShowCode = Math.random() < 0.03; // 3%
-    if (shouldShowCode) {
+      case Math.random() < 0.03:
        imageOverride = [
          {
            image: "/lightbar-images/ts.png",
@ -317,11 +291,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 9;
-    }
+        break;

-    // DUI easter egg
-    const shouldShowFlix = Math.random() < 0.08; // 8%
-    if (shouldShowFlix) {
+      case Math.random() < 0.7:
        imageOverride = [
          {
            image: "/lightbar-images/beer.png",
@ -345,11 +317,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 11;
-    }
+        break;

-    // Gangster easter egg
-    const shouldShowCowboy = Math.random() < 0.05; // 5%
-    if (shouldShowCowboy) {
+      case Math.random() < 0.05:
        imageOverride = [
          {
            image: "/lightbar-images/auto-gun.png",
@ -361,11 +331,9 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 11.6;
-    }
+        break;

-    // Star easter egg
-    const shouldShowStars = Math.random() < 0.15; // 15%
-    if (shouldShowStars) {
+      case Math.random() < 0.15:
        imageOverride = [
          {
            image: "/lightbar-images/star.png",
@ -373,6 +341,11 @@ function ParticlesCanvas() {
          },
        ];
        imageParticleCount = particleCount / 6.6;
+        break;
+
+      default:
+        // Default case
+        break;
    }

    // HOIST THE SAIL (of particles)!
--- a/src/pages/Dmca.tsx
+++ b/src/pages/Dmca.tsx
@ -26,7 +26,7 @@ export function DmcaPage() {
          <Trans
            i18nKey="screens.dmca.text"
            components={{
-              bold: <span className="font-bold" style={{ color: "#cfcfcf" }} />,
+              bold: <span className="font-bold text-white" />,
            }}
          />
        </Paragraph>
@ -36,7 +36,7 @@ export function DmcaPage() {
            href={`mailto:${conf().DMCA_EMAIL}`}
            style={{
              transition: "color 0.3s ease",
-              color: isHovered ? "#cfcfcf" : "inherit",
+              color: isHovered ? "#ffffff" : "inherit",
            }}
            onMouseEnter={() => setIsHovered(true)}
            onMouseLeave={() => setIsHovered(false)}