Merge remote-tracking branch 'parent/main' into upstream-20230103

2024-01-03 19:15:01 +09:00 · 2024-01-03 19:15:01 +09:00 · 7356f776f2
commit 7356f776f2
parent 41631fe46d 7cce2a41f2
60 changed files with 1349 additions and 323 deletions
--- a/app/controllers/api/v1/streaming_controller.rb
+++ b/app/controllers/api/v1/streaming_controller.rb
@ -13,7 +13,9 @@ class Api::V1::StreamingController < Api::BaseController

  def streaming_api_url
    Addressable::URI.parse(request.url).tap do |uri|
-      uri.host = Addressable::URI.parse(Rails.configuration.x.streaming_api_base_url).host
+      base_url = Addressable::URI.parse(Rails.configuration.x.streaming_api_base_url)
+      uri.host = base_url.host
+      uri.port = base_url.port
    end.to_s
  end
 end