From 19befc9eb593aead6ff3e518a77eec4f01c5d1d6 Mon Sep 17 00:00:00 2001
From: MMaker <mmaker@mmaker.moe>
Date: Thu, 27 Feb 2025 12:52:37 -0500
Subject: [PATCH] Refactor out allow check

---
 app.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app.py b/app.py
index 1075b55..a2c14dc 100644
--- a/app.py
+++ b/app.py
@@ -191,11 +191,6 @@ def get_cdn_url(video_id):
     """Get the CDN URL for a video"""
     return f"{CDN_BASE_URL}/niconico/{video_id}.mp4"
 
-def allow_download(params):
-    if params['video']['duration'] > 60 * 15:
-        return False
-    return True
-
 def get_video_resolution(params):
     if not params:
         return None, None
@@ -314,10 +309,13 @@ def proxy(video_id):
     ) if params else None
     video_width, video_height = get_video_resolution(params) if params else (None, None)
 
-    download_allowed = allow_download(params) if params else False
+    download_allowed = True
+    if params['video']['duration'] > 60 * 20:  # 20 minutes
+        logger.info(f"{video_id}: Video download ignored due to duration ({params['video']['duration']} seconds)")
+        download_allowed = False
     request_user_agent = request.headers.get('User-Agent', '').lower()
     if download_allowed and 'discordbot' not in request_user_agent:
-        logger.info(f"{video_id}: Video download ignored for due to user agent ({request_user_agent})")
+        logger.info(f"{video_id}: Video download ignored due to user agent ({request_user_agent})")
         download_allowed = False
     video_quality = get_video_quality(params) if params else None
     if download_allowed and video_quality is not None:
@@ -334,6 +332,7 @@ def proxy(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
         if 'data-server' in tag.attrs:
             del tag.attrs['data-server']
         # Fix thumbnail