merge main

lib/http/api.dart

@@ -355,4 +355,9 @@ class Api {
 
   static const String sessionMsg =
       'https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs';
+  // 获取某个动态详情
+  // timezone_offset=-480
+  // id=849312409672744983
+  // features=itemOpusStyle
+  static const String dynamicDetail = '/x/polymer/web-dynamic/v1/detail';
 }

lib/http/dynamics.dart

@@ -86,4 +86,35 @@ class DynamicsHttp {
       };
     }
   }
+
+  //
+  static Future dynamicDetail({
+    String? id,
+  }) async {
+    var res = await Request().get(Api.dynamicDetail, data: {
+      'timezone_offset': -480,
+      'id': id,
+      'features': 'itemOpusStyle',
+    });
+    if (res.data['code'] == 0) {
+      try {
+        return {
+          'status': true,
+          'data': DynamicItemModel.fromJson(res.data['data']['item']),
+        };
+      } catch (err) {
+        return {
+          'status': false,
+          'data': [],
+          'msg': err.toString(),
+        };
+      }
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/html.dart

@@ -9,37 +9,57 @@ class HtmlHttp {
       "https://www.bilibili.com/opus/$id",
       extra: {'ua': 'pc'},
     );
-    Document rootTree = parse(response.data);
-    Element body = rootTree.body!;
-    Element appDom = body.querySelector('#app')!;
-    Element authorHeader = appDom.querySelector('.fixed-author-header')!;
-    // 头像
-    String avatar = authorHeader.querySelector('img')!.attributes['src']!;
-    avatar = 'https:${avatar.split('@')[0]}';
-    String uname =
-        authorHeader.querySelector('.fixed-author-header__author__name')!.text;
-    // 动态详情
-    Element opusDetail = appDom.querySelector('.opus-detail')!;
-    // 发布时间
-    String updateTime =
-        opusDetail.querySelector('.opus-module-author__pub__text')!.text;
-    //
-    String opusContent =
-        opusDetail.querySelector('.opus-module-content')!.innerHtml;
-    String commentId = opusDetail
-        .querySelector('.bili-comment-container')!
-        .className
-        .split(' ')[1]
-        .split('-')[2];
-    // List imgList = opusDetail.querySelectorAll('bili-album__preview__picture__img');
-    return {
-      'status': true,
-      'avatar': avatar,
-      'uname': uname,
-      'updateTime': updateTime,
-      'content': opusContent,
-      'commentId': int.parse(commentId)
-    };
+
+    if (response.data.contains('Redirecting to')) {
+      RegExp regex = RegExp(r'//([\w\.]+)/(\w+)/(\w+)');
+      Match match = regex.firstMatch(response.data)!;
+      String matchedString = match.group(0)!;
+      response = await Request().get(
+        'https:$matchedString' + '/',
+        extra: {'ua': 'pc'},
+      );
+    }
+    try {
+      Document rootTree = parse(response.data);
+      // log(response.data.body.toString());
+      Element body = rootTree.body!;
+      Element appDom = body.querySelector('#app')!;
+      Element authorHeader = appDom.querySelector('.fixed-author-header')!;
+      // 头像
+      String avatar = authorHeader.querySelector('img')!.attributes['src']!;
+      avatar = 'https:${avatar.split('@')[0]}';
+      String uname = authorHeader
+          .querySelector('.fixed-author-header__author__name')!
+          .text;
+
+      // 动态详情
+      Element opusDetail = appDom.querySelector('.opus-detail')!;
+      // 发布时间
+      String updateTime =
+          opusDetail.querySelector('.opus-module-author__pub__text')!.text;
+      //
+      String opusContent =
+          opusDetail.querySelector('.opus-module-content')!.innerHtml;
+      String test = opusDetail
+          .querySelector('.horizontal-scroll-album__pic__img')!
+          .innerHtml;
+      String commentId = opusDetail
+          .querySelector('.bili-comment-container')!
+          .className
+          .split(' ')[1]
+          .split('-')[2];
+      // List imgList = opusDetail.querySelectorAll('bili-album__preview__picture__img');
+      return {
+        'status': true,
+        'avatar': avatar,
+        'uname': uname,
+        'updateTime': updateTime,
+        'content': test + opusContent,
+        'commentId': int.parse(commentId)
+      };
+    } catch (err) {
+      print('err: $err');
+    }
   }
 
   // read