mirror of
				https://github.com/iv-org/invidious.git
				synced 2025-11-04 06:31:57 +00:00 
			
		
		
		
	Fix proxying for videos
This commit is contained in:
		@@ -1885,7 +1885,6 @@ get "/api/v1/comments/:id" do |env|
 | 
			
		||||
              proxy_client.read_timeout = 10.seconds
 | 
			
		||||
              proxy_client.connect_timeout = 10.seconds
 | 
			
		||||
 | 
			
		||||
              proxy = list.sample(1)[0]
 | 
			
		||||
              proxy = HTTPProxy.new(proxy_host: proxy[:ip], proxy_port: proxy[:port])
 | 
			
		||||
              proxy_client.set_proxy(proxy)
 | 
			
		||||
 | 
			
		||||
@@ -1894,13 +1893,10 @@ get "/api/v1/comments/:id" do |env|
 | 
			
		||||
              proxy_headers["cookie"] = response.cookies.add_request_headers(headers)["cookie"]
 | 
			
		||||
              proxy_html = response.body
 | 
			
		||||
 | 
			
		||||
              if proxy_html.match(/<meta itemprop="regionsAllowed" content="">/)
 | 
			
		||||
                bypass_channel.send(nil)
 | 
			
		||||
              else
 | 
			
		||||
              if !proxy_html.match(/<meta itemprop="regionsAllowed" content="">/)
 | 
			
		||||
                bypass_channel.send({proxy_html, proxy_client, proxy_headers})
 | 
			
		||||
                break
 | 
			
		||||
              end
 | 
			
		||||
 | 
			
		||||
              break
 | 
			
		||||
            rescue ex
 | 
			
		||||
            end
 | 
			
		||||
          end
 | 
			
		||||
 
 | 
			
		||||
@@ -176,7 +176,7 @@ def produce_channel_videos_url(ucid, page = 1, auto_generated = nil)
 | 
			
		||||
  continuation = Base64.urlsafe_encode(continuation)
 | 
			
		||||
  continuation = URI.escape(continuation)
 | 
			
		||||
 | 
			
		||||
  url = "/browse_ajax?continuation=#{continuation}"
 | 
			
		||||
  url = "/browse_ajax?continuation=#{continuation}&gl=US&hl=en"
 | 
			
		||||
 | 
			
		||||
  return url
 | 
			
		||||
end
 | 
			
		||||
 
 | 
			
		||||
@@ -573,11 +573,8 @@ def fetch_video(id, proxies)
 | 
			
		||||
            info = HTTP::Params.parse(client.get("/get_video_info?video_id=#{id}&ps=default&eurl=&gl=US&hl=en&disable_polymer=1").body)
 | 
			
		||||
            if !info["reason"]?
 | 
			
		||||
              bypass_channel.send(proxy)
 | 
			
		||||
            else
 | 
			
		||||
              bypass_channel.send(nil)
 | 
			
		||||
              break
 | 
			
		||||
            end
 | 
			
		||||
 | 
			
		||||
            break
 | 
			
		||||
          rescue ex
 | 
			
		||||
          end
 | 
			
		||||
        end
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user