From ef7cf78d3309f0f565ab2aa6a3ee2014d6a06bf9 Mon Sep 17 00:00:00 2001
From: Fijxu <fijxu@nadeko.net>
Date: Mon, 14 Sep 2026 18:18:50 -0300
Subject: [PATCH] Add video id validation to /watch route.

---
 src/invidious/routes/watch.cr | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/invidious/routes/watch.cr b/src/invidious/routes/watch.cr
index 7f62a2a4f..4bca37531 100644
--- a/src/invidious/routes/watch.cr
+++ b/src/invidious/routes/watch.cr
@@ -18,14 +18,8 @@ module Invidious::Routes::Watch
         return error_template(400, "Invalid parameters.")
       end
 
-      if id.size > 11
-        url = "/watch?v=#{id[0, 11]}"
-        env.params.query.delete_all("v")
-        if env.params.query.size > 0
-          url += "&#{env.params.query}"
-        end
-
-        return env.redirect url
+      unless validate_video_id(id)
+        return error_template(400, InvalidVideoID.new(id))
       end
     else
       return env.redirect "/"