From e5f9a28b8cea01b53ab2beb598aa9a04dd5041f5 Mon Sep 17 00:00:00 2001
From: syeopite <syeopite@syeopite.dev>
Date: Sun, 23 May 2021 03:23:21 -0700
Subject: [PATCH] Remove lsquic.cr from Invidious

---
 shard.lock                     | 4 ----
 shard.yml                      | 3 ---
 src/invidious/helpers/utils.cr | 5 ++---
 src/invidious/routes/login.cr  | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/shard.lock b/shard.lock
index 5ed730b8..5edbfac4 100644
--- a/shard.lock
+++ b/shard.lock
@@ -16,10 +16,6 @@ shards:
     git: https://github.com/jeromegn/kilt.git
     version: 0.4.0
 
-  lsquic:
-    git: https://github.com/iv-org/lsquic.cr.git
-    version: 2.18.1-1
-
   pg:
     git: https://github.com/will/crystal-pg.git
     version: 0.23.1
diff --git a/shard.yml b/shard.yml
index a15b3ea5..15490263 100644
--- a/shard.yml
+++ b/shard.yml
@@ -25,9 +25,6 @@ dependencies:
   protodec:
     github: iv-org/protodec
     version: ~> 0.1.3
-  lsquic:
-    github: iv-org/lsquic.cr
-    version: ~> 2.18.1-1
 
 crystal: 0.36.1
 
diff --git a/src/invidious/helpers/utils.cr b/src/invidious/helpers/utils.cr
index 602e0c37..95f2a740 100644
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@@ -1,4 +1,3 @@
-require "lsquic"
 require "pool/connection"
 
 def add_yt_headers(request)
@@ -20,7 +19,7 @@ struct YoutubeConnectionPool
   property! url : URI
   property! capacity : Int32
   property! timeout : Float64
-  property pool : ConnectionPool(QuicProxyWrapper | HTTP::Client | QUIC::Client)
+  property pool : ConnectionPool(QuicProxyWrapper | HTTP::Client)
 
   def initialize(url : URI, @capacity = 5, @timeout = 5.0, use_quic = true)
     @url = url
@@ -47,7 +46,7 @@ struct YoutubeConnectionPool
   end
 
   private def build_pool(use_quic)
-    ConnectionPool(QuicProxyWrapper | HTTP::Client | QUIC::Client).new(capacity: capacity, timeout: timeout) do
+    ConnectionPool(QuicProxyWrapper | HTTP::Client).new(capacity: capacity, timeout: timeout) do
       if use_quic
         conn = QuicProxyWrapper.new(URI.parse("http://#{CONFIG.quic_proxy_address}:#{CONFIG.quic_proxy_port}"))
       else
diff --git a/src/invidious/routes/login.cr b/src/invidious/routes/login.cr
index ffe5f568..fc2d01f0 100644
--- a/src/invidious/routes/login.cr
+++ b/src/invidious/routes/login.cr
@@ -51,7 +51,7 @@ class Invidious::Routes::Login < Invidious::Routes::BaseRoute
 
       # See https://github.com/ytdl-org/youtube-dl/blob/2019.04.07/youtube_dl/extractor/youtube.py#L82
       begin
-        client = QUIC::Client.new(LOGIN_URL)
+        client = QuicProxyWrapper.new(LOGIN_URL)
         headers = HTTP::Headers.new
 
         login_page = client.get("/ServiceLogin")