Merge branch 'main' into feature-minePage

lib/http/api.dart

@@ -598,4 +598,7 @@ class Api {
 
   /// 更新用户信息
   static const String updateAccountInfo = '/x/member/web/update';
+
+  /// 删除评论
+  static const String replyDel = '/x/v2/reply/del';
 }

lib/http/init.dart

@@ -217,12 +217,13 @@ class Request {
   /*
    * get请求
    */
-  get(url, {data, options, cancelToken, extra}) async {
+  get(url, {data, Options? options, cancelToken, extra}) async {
     Response response;
-    final Options options = Options();
+    options ??= Options(); // 如果 options 为 null，则初始化一个新的 Options 对象
     ResponseType resType = ResponseType.json;
+
     if (extra != null) {
-      resType = extra!['resType'] ?? ResponseType.json;
+      resType = extra['resType'] ?? ResponseType.json;
       if (extra['ua'] != null) {
         options.headers = {'user-agent': headerUa(type: extra['ua'])};
       }
@@ -238,14 +239,11 @@ class Request {
       );
       return response;
     } on DioException catch (e) {
-      Response errResponse = Response(
-        data: {
-          'message': await ApiInterceptor.dioError(e)
-        }, // 将自定义 Map 数据赋值给 Response 的 data 属性
+      return Response(
+        data: {'message': await ApiInterceptor.dioError(e)},
         statusCode: 200,
         requestOptions: RequestOptions(),
       );
-      return errResponse;
     }
   }
 

lib/http/member.dart

@@ -4,6 +4,7 @@ import 'package:hive/hive.dart';
 import 'package:html/parser.dart';
 import 'package:pilipala/models/member/article.dart';
 import 'package:pilipala/models/member/like.dart';
+import 'package:pilipala/utils/global_data_cache.dart';
 import '../common/constants.dart';
 import '../models/dynamics/result.dart';
 import '../models/follow/result.dart';
@@ -19,14 +20,20 @@ import 'index.dart';
 
 class MemberHttp {
   static Future memberInfo({
-    int? mid,
+    required int mid,
     String token = '',
   }) async {
+    String? wWebid;
+    if ((await getWWebid(mid: mid))['status']) {
+      wWebid = GlobalDataCache().wWebid;
+    }
+
     Map params = await WbiSign().makSign({
       'mid': mid,
       'token': token,
       'platform': 'web',
       'web_location': 1550101,
+      ...wWebid != null ? {'w_webid': wWebid} : {},
     });
     var res = await Request().get(
       Api.memberInfo,
@@ -566,6 +573,10 @@ class MemberHttp {
   }
 
   static Future getWWebid({required int mid}) async {
+    String? wWebid = GlobalDataCache().wWebid;
+    if (wWebid != null) {
+      return {'status': true, 'data': wWebid};
+    }
     var res = await Request().get('https://space.bilibili.com/$mid/article');
     String? headContent = parse(res.data).head?.outerHtml;
     final regex = RegExp(
@@ -576,6 +587,7 @@ class MemberHttp {
         final content = match.group(1);
         String decodedString = Uri.decodeComponent(content!);
         Map<String, dynamic> map = jsonDecode(decodedString);
+        GlobalDataCache().wWebid = map['access_id'];
         return {'status': true, 'data': map['access_id']};
       } else {
         return {'status': false, 'data': '请检查登录状态'};
@@ -588,25 +600,20 @@ class MemberHttp {
   static Future getMemberArticle({
     required int mid,
     required int pn,
-    required String wWebid,
     String? offset,
   }) async {
+    String? wWebid;
+    if ((await getWWebid(mid: mid))['status']) {
+      wWebid = GlobalDataCache().wWebid;
+    }
     Map params = await WbiSign().makSign({
       'host_mid': mid,
       'page': pn,
       'offset': offset,
       'web_location': 333.999,
-      'w_webid': wWebid,
-    });
-    var res = await Request().get(Api.opusList, data: {
-      'host_mid': mid,
-      'page': pn,
-      'offset': offset,
-      'web_location': 333.999,
-      'w_webid': wWebid,
-      'w_rid': params['w_rid'],
-      'wts': params['wts'],
+      ...wWebid != null ? {'w_webid': wWebid} : {},
     });
+    var res = await Request().get(Api.opusList, data: params);
     if (res.data['code'] == 0) {
       return {
         'status': true,

lib/http/reply.dart

@@ -115,4 +115,25 @@ class ReplyHttp {
       };
     }
   }
+
+  static Future replyDel({
+    required int type, //replyType
+    required int oid,
+    required int rpid,
+  }) async {
+    var res = await Request().post(
+      Api.replyDel,
+      queryParameters: {
+        'type': type, //type.index
+        'oid': oid,
+        'rpid': rpid,
+        'csrf': await Request.getCsrf(),
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true, 'msg': '删除成功'};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
 }

lib/http/video.dart

@@ -536,7 +536,8 @@ class VideoHttp {
   // 获取字幕内容
   static Future<Map<String, dynamic>> getSubtitleContent(url) async {
     var res = await Request().get('https:$url');
-    final String content = SubTitleUtils.convertToWebVTT(res.data['body']);
+    final String content =
+        await SubTitleUtils.convertToWebVTT(res.data['body']);
     final List body = res.data['body'];
     return {'content': content, 'body': body};
   }