fix bug

Author: Dawnnnnnn

LotteryResult.py

@@ -5,11 +5,9 @@
 class LotteryResult():
 
     async def query(self):
-        
         while 1:
-
             await Statistics().clean_activity()
 
             await Statistics().clean_TV()
 
-            await asyncio.sleep(30) 
+            await asyncio.sleep(30)

MultiRoom.py

@@ -1,46 +1,68 @@
 import requests
 import random
 
+
 class MultiRoom():
+
     def asmr_area(self):
-        url = "https://api.live.bilibili.com/room/v1/area/getRoomList?platform=web&parent_area_id=1&cate_id=0&area_id=0&sort_type=online&page=1&page_size=-1"
-        response = requests.get(url,timeout=3)
+        url = "https://api.live.bilibili.com/room/v1/area/getRoomList?platform=web&parent_area_id=1&cate_id=0&area_id=0&sort_type=online&page=1&page_size=30"
+        response = requests.get(url, timeout=3)
         checklen = len(response.json()['data'])
-        asmr_area_room = response.json()['data'][random.randint(0,checklen)]['roomid']
-        return asmr_area_room
+        asmr_area_room = response.json()['data'][random.randint(0, checklen)]['roomid']
+        state = self.check_state(asmr_area_room)
+        if state == 1:
+            return [asmr_area_room,"娱乐分区"]
+        else:
+            self.asmr_area()
+
 
     def game_area(self):
-        url = "https://api.live.bilibili.com/room/v1/area/getRoomList?platform=web&parent_area_id=2&cate_id=0&area_id=0&sort_type=online&page=1&page_size=-1"
-        response = requests.get(url,timeout=3)
+        url = "https://api.live.bilibili.com/room/v1/area/getRoomList?platform=web&parent_area_id=2&cate_id=0&area_id=0&sort_type=online&page=1&page_size=30"
+        response = requests.get(url, timeout=3)
         checklen = len(response.json()['data'])
-        game_area_room = response.json()['data'][random.randint(0,checklen)]['roomid']
-        return game_area_room
+        game_area_room = response.json()['data'][random.randint(0, checklen)]['roomid']
+        state = self.check_state(game_area_room)
+        if state == 1:
+            return [game_area_room,"游戏分区"]
+        else:
+            self.game_area()
 
     def mobile_area(self):
-        url = "https://api.live.bilibili.com/room/v1/area/getRoomList?platform=web&parent_area_id=3&cate_id=0&area_id=0&sort_type=online&page=1&page_size=-1"
-        response = requests.get(url,timeout=3)
+        url = "https://api.live.bilibili.com/room/v1/area/getRoomList?platform=web&parent_area_id=3&cate_id=0&area_id=0&sort_type=online&page=1&page_size=30"
+        response = requests.get(url, timeout=3)
         checklen = len(response.json()['data'])
-        mobile_area_room = response.json()['data'][random.randint(0,checklen)]['roomid']
-        return mobile_area_room
+        mobile_area_room = response.json()['data'][random.randint(0, checklen)]['roomid']
+        state = self.check_state(mobile_area_room)
+        if state == 1:
+            return [mobile_area_room,"手游分区"]
+        else:
+            self.mobile_area()
 
     def draw_area(self):
-        url = "https://api.live.bilibili.com/room/v1/area/getRoomList?platform=web&parent_area_id=4&cate_id=0&area_id=0&sort_type=online&page=1&page_size=-1"
-        response = requests.get(url,timeout=3)
+        url = "https://api.live.bilibili.com/room/v1/area/getRoomList?platform=web&parent_area_id=4&cate_id=0&area_id=0&sort_type=online&page=1&page_size=30"
+        response = requests.get(url, timeout=3)
         checklen = len(response.json()['data'])
-        draw_area_room = response.json()['data'][random.randint(0,checklen)]['roomid']
-        return draw_area_room
+        draw_area_room = response.json()['data'][random.randint(0, checklen)]['roomid']
+        state = self.check_state(draw_area_room)
+        if state == 1:
+            return [draw_area_room,"绘画分区"]
+        else:
+            self.draw_area()
+
+    def check_state(self,roomid):
+        url = "https://api.live.bilibili.com/room/v1/Room/room_init?id="+str(roomid)
+        response = requests.get(url)
+        state = response.json()['data']['live_status']
+        return state
 
     def get_all(self):
         try:
-            asmr = 23058
+            asmr = [23058,"娱乐分区"]
             game = self.game_area()
             mobile = self.mobile_area()
             draw = self.draw_area()
-            return [asmr,game,mobile,draw]
+            return [asmr, game, mobile, draw]
         except:
+            print("获取房间列表失败,立即进行下次尝试")
             tmp = self.get_all()
             return tmp
-
-
-
-

OnlineHeart.py

@@ -5,6 +5,7 @@
 import asyncio
 from printer import Printer
 
+
 def CurrentTime():
     currenttime = int(time.mktime(datetime.datetime.now().timetuple()))
     return str(currenttime)
@@ -22,11 +23,10 @@ async def pcpost_heartbeat(self):
     async def heart_gift(self):
         await bilibili().heart_gift()
 
-
     # 因为休眠时间差不多,所以放到这里,此为实验性功能
     async def draw_lottery(self):
-        black_list = ["测试","test"]
-        for i in range(74,90):
+        black_list = ["测试", "test"]
+        for i in range(74, 90):
             response = await bilibili().get_lotterylist(i)
             json_response = await response.json()
             if json_response['code'] == 0:
@@ -44,7 +44,7 @@ async def draw_lottery(self):
                             response1 = await bilibili().get_gift_of_lottery(i, g)
                             json_response1 = await response1.json()
                             print("当前时间:", time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())))
-                            print("参与实物抽奖回显：",json_response1)
+                            print("参与实物抽奖回显：", json_response1)
                         else:
                             pass
             else:
@@ -59,6 +59,6 @@ async def run(self):
                 Printer().printlist_append(['join_lottery', '', 'user', "cookie过期,将重新登录"], True)
                 login().login()
             await self.apppost_heartbeat()
-            await self.heart_gift()           
+            await self.heart_gift()
             await self.draw_lottery()
-            await asyncio.sleep(300)
+            await asyncio.sleep(300)

README.md

@@ -60,4 +60,4 @@
 感谢:https://github.com/lzghzr/bilive_client
 
 
-本项目采用MIT开源协议
+本项目采用MIT开源协议

Silver.py

@@ -22,7 +22,7 @@ async def time_start(self):
         temp = await response.json()
         # print (temp['code'])    #宝箱领完返回的code为-10017
         if temp['code'] == -10017:
-            Printer().printlist_append(['join_lottery', '', 'user', "今日宝箱领取完毕"],True)
+            Printer().printlist_append(['join_lottery', '', 'user', "今日宝箱领取完毕"], True)
         else:
             time_start = temp['data']['time_start']
             return str(time_start)
@@ -43,7 +43,7 @@ async def GetAward(self):
             timeend = await self.time_end()
             timestart = await self.time_start()
             response = await bilibili().get_silver(timestart, timeend)
-            #print(response.json())
+            # print(response.json())
             json_response = await response.json()
             return json_response['code']
         except:
@@ -59,5 +59,5 @@ async def run(self):
                 Printer().printlist_append(['join_lottery', '', 'user', "# 打开了宝箱"])
                 await self.GetAward()
             else:
-                Printer().printlist_append(['join_lottery', '', 'user',"# 继续等待宝箱冷却..."])
+                Printer().printlist_append(['join_lottery', '', 'user', "# 继续等待宝箱冷却..."])
                 await asyncio.sleep(181)

Tasks.py

@@ -7,20 +7,21 @@
 import utils
 from printer import Printer
 
+
 class Tasks():
 
     def __init__(self):
         fileDir = os.path.dirname(os.path.realpath('__file__'))
         file_user = fileDir + "/conf/user.conf"
         self.dic_user = configloader.load_user(file_user)
-    
+
     # 获取每日包裹奖励
     async def Daily_bag(self):
         response = await bilibili().get_dailybag()
         json_response = await response.json()
-        for i in range(0,len(json_response['data']['bag_list'])):
-            Printer().printlist_append(['join_lottery', '', 'user', "获得-" + json_response['data']['bag_list'][i]['bag_name'] + "-成功"],True)
-
+        for i in range(0, len(json_response['data']['bag_list'])):
+            Printer().printlist_append(
+                ['join_lottery', '', 'user', "获得-" + json_response['data']['bag_list'][i]['bag_name'] + "-成功"], True)
 
     def CurrentTime(self):
         currenttime = str(int(time.mktime(datetime.datetime.now().timetuple())))
@@ -30,44 +31,45 @@ def CurrentTime(self):
     async def DoSign(self):
         response = await bilibili().get_dosign()
         temp = await response.json(content_type=None)
-        Printer().printlist_append(['join_lottery', '', 'user', "签到状态:",temp['msg']],True)
+        Printer().printlist_append(['join_lottery', '', 'user', "签到状态:", temp['msg']], True)
 
     # 领取每日任务奖励
     async def Daily_Task(self):
         response2 = await bilibili().get_dailytask()
         json_response2 = await response2.json()
-        Printer().printlist_append(['join_lottery', '', 'user', "双端观看直播:", json_response2["msg"]],True)
+        Printer().printlist_append(['join_lottery', '', 'user', "双端观看直播:", json_response2["msg"]], True)
 
     # 应援团签到
     async def link_sign(self):
         response = bilibili().get_grouplist()
         check = len(response.json()['data']['list'])
         group_id_list = []
         owner_uid_list = []
-        for i in range(0,check):
+        for i in range(0, check):
             group_id = response.json()['data']['list'][i]['group_id']
             owner_uid = response.json()['data']['list'][i]['owner_uid']
             group_id_list.append(group_id)
             owner_uid_list.append(owner_uid)
-        for (i1,i2) in zip(group_id_list,owner_uid_list):
+        for (i1, i2) in zip(group_id_list, owner_uid_list):
             response = bilibili().assign_group(i1, i2)
             if response.json()['code'] == 0:
                 if (response.json()['data']['status']) == 1:
-                    Printer().printlist_append(['join_lottery', '', 'user', "# 应援团 %s 已应援过"  %(i1) ])
+                    Printer().printlist_append(['join_lottery', '', 'user', "# 应援团 %s 已应援过" % (i1)])
                 if (response.json()['data']['status']) == 0:
-                    Printer().printlist_append(['join_lottery', '', 'user', "# 应援团 %s 应援成功,获得 %s 点亲密度"  %(i1, response.json()['data']['add_num'])])
+                    Printer().printlist_append(['join_lottery', '', 'user',
+                                                "# 应援团 %s 应援成功,获得 %s 点亲密度" % (i1, response.json()['data']['add_num'])])
             else:
-                Printer().printlist_append(['join_lottery', '', 'user',"# 应援团 %s 应援失败" %(i1)])
+                Printer().printlist_append(['join_lottery', '', 'user', "# 应援团 %s 应援失败" % (i1)])
 
     async def send_gift(self):
         if self.dic_user['gift']['on/off'] == '1':
-            argvs,x = await utils.fetch_bag_list(printer=False)
-            for i in range(0,len(argvs)):
+            argvs, x = await utils.fetch_bag_list(printer=False)
+            for i in range(0, len(argvs)):
                 giftID = argvs[i][0]
                 giftNum = argvs[i][1]
                 bagID = argvs[i][2]
                 roomID = self.dic_user['gift']['send_to_room']
-                await utils.send_gift_web(roomID,giftID,giftNum,bagID)
+                await utils.send_gift_web(roomID, giftID, giftNum, bagID)
             if not argvs:
                 Printer().printlist_append(['join_lottery', '', 'user', "没有将要过期的礼物~"])
 
@@ -87,7 +89,7 @@ async def auto_send_gift(self):
             day_limit = a[2]
             left_num = int(day_limit) - int(today_feed)
             calculate = 0
-            for i in range(0,len(temp)):
+            for i in range(0, len(temp)):
                 gift_id = int(temp[i][0])
                 gift_num = int(temp[i][1])
                 bag_id = int(temp[i][2])
@@ -96,16 +98,16 @@ async def auto_send_gift(self):
                     if (gift_num * (temp_dic[gift_id] / 100) < left_num):
                         calculate = calculate + temp_dic[gift_id] / 100 * gift_num
                         tmp2 = temp_dic[gift_id] / 100 * gift_num
-                        await utils.send_gift_web(roomid,gift_id,gift_num,bag_id)
-                        left_num = left_num-tmp2
+                        await utils.send_gift_web(roomid, gift_id, gift_num, bag_id)
+                        left_num = left_num - tmp2
                     elif left_num - temp_dic[gift_id] / 100 >= 0:
                         tmp = (left_num) / (temp_dic[gift_id] / 100)
                         tmp1 = (temp_dic[gift_id] / 100) * int(tmp)
                         calculate = calculate + tmp1
                         await utils.send_gift_web(roomid, gift_id, tmp, bag_id)
                         left_num = left_num - tmp1
             Printer().printlist_append(['join_lottery', '', 'user', "自动送礼共送出亲密度为%s的礼物" % int(calculate)])
-            
+
     async def doublegain_coin2silver(self):
         if self.dic_user['doublegain_coin2silver']['on/off'] == "1":
             response0 = await bilibili().request_doublegain_coin2silver()
@@ -121,7 +123,7 @@ async def sliver2coin(self):
             json_response1 = await response1.json()
             json_response = await response.json()
 
-            Printer().printlist_append(['join_lottery', '', 'user',"", json_response['msg']])
+            Printer().printlist_append(['join_lottery', '', 'user', "", json_response['msg']])
             Printer().printlist_append(['join_lottery', '', 'user', "", json_response1['msg']])
 
     async def run(self):