From b95da36352c017cc91bf3460fede77d7c26c4f47 Mon Sep 17 00:00:00 2001
From: haha114514 <47912037+haha114514@users.noreply.github.com>
Date: Mon, 13 Feb 2023 15:34:58 +1100
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=87=AA=E5=AE=9A=E4=B9=89AP?=
 =?UTF-8?q?I=E6=98=AF=E5=90=A6=E4=BC=A0Cookie=E7=9A=84=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=20(#306)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 改进自定义API是否传Cookie的判断

* Add files via upload

* Update config.yaml

* Update config.yaml
---
 biliup/plugins/bilibili.py | 10 ++++++++--
 public/config.yaml         |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/biliup/plugins/bilibili.py b/biliup/plugins/bilibili.py
index d70bb69..22ff6fd 100644
--- a/biliup/plugins/bilibili.py
+++ b/biliup/plugins/bilibili.py
@@ -13,6 +13,7 @@ class Bilibili(DownloadBase):
         super().__init__(fname, url, suffix)
         self.fake_headers['Referer'] = 'https://live.bilibili.com'
         self.fake_headers['cookie'] = config.get('user', {}).get('bili_cookie')
+        self.customAPI_use_cookie = config.get('user', {}).get('customAPI_use_cookie', False)
 
     def check_stream(self):
         # 预读配置
@@ -49,8 +50,13 @@ class Bilibili(DownloadBase):
                 return False
             params['room_id'] = roomInfo['data']['room_info']['room_id']
             self.room_title = roomInfo['data']['room_info']['title']
-            # 当 Cookie 存在时，仅使用官方 Api
-            roomPlayInfoUrl = (lambda a, b, c : a if not c else b)(customApiHost, officialApiHost, self.fake_headers['cookie'])+'/xlive/web-room/v2/index/getRoomPlayInfo'
+            # 当 Cookie 存在，并且自定义APi使用Cookie开关关闭时，仅使用官方 Api
+            if self.fake_headers['cookie'] and self.customAPI_use_cookie is False:
+                roomPlayInfoUrl = officialApiHost
+            else:
+                roomPlayInfoUrl = customApiHost
+            roomPlayInfoUrl += '/xlive/web-room/v2/index/getRoomPlayInfo'
+
             # 尝试获取直播流
             try:
                 playInfo = s.get(roomPlayInfoUrl, params=params, timeout=5).json()
diff --git a/public/config.yaml b/public/config.yaml
index 81be2a4..53e388e 100644
--- a/public/config.yaml
+++ b/public/config.yaml
@@ -103,7 +103,11 @@ streamers:
 #user:
     #------哔哩哔哩------#
     ### 参照https://github.com/BililiveRecorder/BililiveRecorder/issues/263
-    # bili_cookie: ''
+    #bili_cookie: ''
+    ### 重要！！！
+    ###是否将cookie传入第三方API。将Cookie传入未知的第三方API有几率泄露帐号登录信息。
+    ###在开启了自定义Cookie（bili_cookie）又同时设置了第三方API（bili_liveapi）的情况下，如果打开了允许第三方API使用Cookie，那么就使用第三方API，如果没有允许（默认），那么设置的第三方API就不生效
+    #customAPI_use_cookie : False
 
     #------抖音------#
     ### 如需要录制抖音请在此填入cookie需要__ac_nonce与__ac_signature的值