From 97028b09d22f1de4f0cce858250cbbdffed22428 Mon Sep 17 00:00:00 2001
From: Lkeme <19500576+lkeme@users.noreply.github.com>
Date: Wed, 26 Feb 2020 15:14:05 +0800
Subject: [PATCH] [fix] Heart

---
 CHANGELOG.md               | 13 +++++++++++++
 DOC.md                     |  2 +-
 README.md                  |  2 +-
 src/plugin/Heart.php       | 14 +++++++-------
 src/plugin/StormRaffle.php |  4 ++--
 src/plugin/User.php        | 37 ++++++++++++++++++++++++++++++++++++-
 6 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 638a9f9..716a933 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Release Notes
 # 本项目Log
 
+## v0.2.0.200226 alpha (2020-02-26)
+
+### Added
+- 
+
+### Changed
+- 
+
+### Fixed
+- 修复节奏风暴
+- 修复双端心跳
+- 
+
 ## v0.2.0.200224 alpha (2020-02-24)
 
 ### Added
diff --git a/DOC.md b/DOC.md
index 2be5c71..956e081 100644
--- a/DOC.md
+++ b/DOC.md
@@ -2,7 +2,7 @@
 <p align="center"><img width="300px" src="https://i.loli.net/2018/04/20/5ad97bd395912.jpeg"></p>
 
 <p align="center">
-<img src="https://img.shields.io/badge/version-0.2.0.200224 alpha-green.svg?longCache=true&style=for-the-badge">
+<img src="https://img.shields.io/badge/version-0.2.0.200226 alpha-green.svg?longCache=true&style=for-the-badge">
 <img src="https://img.shields.io/badge/license-mit-blue.svg?longCache=true&style=for-the-badge">
 </p>
 
diff --git a/README.md b/README.md
index 0c3a88b..925c075 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Group: [55308141](https://jq.qq.com/?_wv=1027&k=5AIDaJg)
 
 ## 公告
 
-Currently for Personal Edition **0.2.0.200224 alpha**  
+Currently for Personal Edition **0.2.0.200226 alpha**  
 
 ## 文档
 
diff --git a/src/plugin/Heart.php b/src/plugin/Heart.php
index ff56d43..0df8f74 100644
--- a/src/plugin/Heart.php
+++ b/src/plugin/Heart.php
@@ -23,18 +23,17 @@ class Heart
         if (self::getLock() > time()) {
             return;
         }
-
-        self::pc();
-        self::mobile();
-
+        self::webHeart();
+        self::appHeart();
         self::setLock(5 * 60);
     }
 
     /**
-     * @use pc端心跳
+     * @use Web 心跳
      */
-    protected static function pc()
+    protected static function webHeart()
     {
+        User::webGetUserInfo();
         $payload = [
             'room_id' => getenv('ROOM_ID'),
         ];
@@ -51,8 +50,9 @@ class Heart
     /**
      * @use 手机端心跳
      */
-    protected static function mobile()
+    protected static function appHeart()
     {
+        User::appGetUserInfo();
         $payload = [
             'room_id' => getenv('ROOM_ID'),
         ];
diff --git a/src/plugin/StormRaffle.php b/src/plugin/StormRaffle.php
index 49eaa9a..3b0883b 100644
--- a/src/plugin/StormRaffle.php
+++ b/src/plugin/StormRaffle.php
@@ -123,8 +123,8 @@ class StormRaffle extends BaseRaffle
                     Log::notice(self::formatInfo($raffle['raffle_id'], $num, $de_raw['data']['mobile_content']));
                     break;
                 }
-                if ($de_raw['msg'] == '节奏风暴不存在') {
-                    Log::notice(self::formatInfo($raffle['raffle_id'], $num, '节奏风暴已结束'));
+                if ($de_raw['msg'] == '节奏风暴不存在' || $de_raw['msg'] == '节奏风暴抽奖过期') {
+                    Log::notice(self::formatInfo($raffle['raffle_id'], $num, '节奏风暴已经结束'));
                     break;
                 }
                 if ($de_raw['msg'] == '已经领取奖励') {
diff --git a/src/plugin/User.php b/src/plugin/User.php
index 44732ae..0eb8ab3 100644
--- a/src/plugin/User.php
+++ b/src/plugin/User.php
@@ -23,6 +23,7 @@ class User
     /**
      * @use 实名检测
      * @return bool
+     * @throws \Exception
      */
     public static function realNameCheck(): bool
     {
@@ -38,8 +39,9 @@ class User
 
 
     /**
-     * @use 是否是老爷
+     * @use 老爷检测
      * @return bool
+     * @throws \Exception
      */
     public static function isMaster(): bool
     {
@@ -60,6 +62,7 @@ class User
     /**
      * @use 用户名写入
      * @return bool
+     * @throws \Exception
      */
     public static function userInfo(): bool
     {
@@ -99,4 +102,36 @@ class User
             'sid' => $sid,
         ];
     }
+
+
+    /**
+     * @use Web User
+     * @param null $room_id
+     * @return mixed
+     * @throws \Exception
+     */
+    public static function webGetUserInfo($room_id = null)
+    {
+        $url = 'https://api.live.bilibili.com/xlive/web-room/v1/index/getInfoByUser';
+        $payload = [
+            'room_id' => $room_id ?? getenv('ROOM_ID')
+        ];
+        $raw = Curl::get($url, Sign::api($payload));
+        return json_decode($raw, true);;
+    }
+
+    /**
+     * @use App User
+     * @return mixed
+     * @throws \Exception
+     */
+    public static function appGetUserInfo()
+    {
+        $url = 'https://api.live.bilibili.com/xlive/app-room/v1/index/getInfoByUser';
+        $payload = [
+            'room_id' => $room_id ?? getenv('ROOM_ID')
+        ];
+        $raw = Curl::get($url, Sign::api($payload));
+        return json_decode($raw, true);;
+    }
 }
\ No newline at end of file