From eccea590703f9ff74e4953fcfb4bc22815ece679 Mon Sep 17 00:00:00 2001
From: MMaker <mmaker@mmaker.moe>
Date: Thu, 27 Feb 2025 16:07:14 -0500
Subject: [PATCH] Revert experimental placeholder video

Discord seems to cache the video regardless of
what it's told.
---
 app.py | 48 ++++--------------------------------------------
 1 file changed, 4 insertions(+), 44 deletions(-)

diff --git a/app.py b/app.py
index b52b221..80ce5e8 100644
--- a/app.py
+++ b/app.py
@@ -3,9 +3,8 @@ import http.cookiejar
 import json
 import requests
 from bs4 import BeautifulSoup
-from flask import Flask, Response, request, jsonify, send_file, make_response
+from flask import Flask, Response, request, jsonify
 from diskcache import Cache
-from io import BytesIO
 import logging
 
 import threading
@@ -37,17 +36,6 @@ CACHE_EXPIRATION_HTML = 60 * 60  # 1 hour
 CACHE_EXPIRATION_CDN = 60 * 60 * 24 * 7  # 1 week
 CACHE_SIZE_LIMIT = 100 * 1024 * 1024  # 100 MB
 
-placeholder_video = None
-PLACEHOLDER_VIDEO_PATH = os.environ.get('NICONICOGAY_PLACEHOLDER_VIDEO', 'placeholder.mp4')
-try:
-    with open(PLACEHOLDER_VIDEO_PATH, 'rb') as f:
-        placeholder_video = f.read()
-    logger.debug("Loaded placeholder video")
-except FileNotFoundError:
-    logger.warning(f"Placeholder video file '{PLACEHOLDER_VIDEO_PATH}' not found")
-except Exception as e:
-    logger.error(f"Error loading placeholder video: {e}")
-
 cache = None
 if os.environ.get('NICONICOGAY_DISABLE_CACHE', '') != '1':
     cache = Cache("disk_cache", size_limit=CACHE_SIZE_LIMIT)
@@ -285,33 +273,6 @@ def get_oembed_url(params):
     return oembed_url
 
 
-@app.route("/cdn/<video_id>.mp4")
-def cdn_redirect(video_id):
-    """
-    Checks if a video exists in CDN and redirects accordingly.
-    Returns CDN URL if video exists, otherwise returns a placeholder video URL.
-    Only responds to requests from Discord bots.
-    """
-    logger.info(f"{video_id}: CDN redirect request received")
-    request_user_agent = request.headers.get('User-Agent', '')
-    # Discord uses a more realistic user agent for file requests
-    if 'Firefox/38.0' not in request_user_agent:
-        logger.info(f"{video_id}: Video CDN redirect ignored due to user agent ({request_user_agent})")
-        return Response("Video not found", status=404)
-
-    if placeholder_video is None or is_video_in_cdn(video_id):
-        cdn_url = get_cdn_url(video_id)
-        logger.info(f"{video_id}: Redirecting to CDN URL: {cdn_url}")
-        return Response("", status=302, headers={"Location": cdn_url})
-
-    logger.info(f"{video_id}: Video not found in CDN, returning placeholder")
-    response = make_response(send_file(BytesIO(placeholder_video), mimetype="video/mp4"))
-    response.headers['Content-Length'] = str(len(placeholder_video))
-    response.headers['Cache-Control'] = 'no-cache'
-    response.headers['Pragma'] = 'no-cache'
-    response.headers['Expires'] = '0'
-    return response
-
 
 @app.route("/watch/<video_id>")
 def proxy(video_id):
@@ -334,8 +295,8 @@ def proxy(video_id):
         logger.error(f"{video_id}: Failed to fetch data")
         return Response("Video not found", status=404)
 
-    reason_code = params.get('reasonCode')
-    if (reason_code or '').upper() in ['HIDDEN_VIDEO', 'ADMINISTRATOR_DELETE_VIDEO']:
+    reason_code = params.get('reasonCode', '').upper()
+    if reason_code in ['HIDDEN_VIDEO', 'ADMINISTRATOR_DELETE_VIDEO']:
         logger.warning(f"{video_id}: Video is hidden or deleted ({reason_code}) - returning 404")
         return Response("Video not found", status=404)
 
@@ -368,7 +329,7 @@ def proxy(video_id):
                     download_queue.append((video_id, real_url, video_quality))
                     logger.info(f"{video_id}: Queued for download")
 
-    cdn_video_url = f"{HOST}/cdn/{video_id}.mp4" if placeholder_video else get_cdn_url(video_id)
+    cdn_video_url = get_cdn_url(video_id)
     og_tags = soup.find_all("meta", attrs={"property": True})
     for tag in og_tags:
         # Remove attribute(s) added by niconico
@@ -411,7 +372,6 @@ if you want to download videos, please consider using a tool like nndownload: ht
     logger.info(f"{video_id}: Returning response")
     return Response(html_response, mimetype="text/html")
 
-
 @app.route("/owoembed")
 def owoembed():
     """