From 738cd61825a44b9ed32abbca0b73a506d838caf9 Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Fri, 25 Apr 2025 10:15:34 +0800 Subject: [PATCH] fix: remove wwebid related #715 Signed-off-by: bggRGjQaUbCoE --- lib/http/member.dart | 4 -- lib/pages/member_search/controller.dart | 10 ----- lib/pages/video/detail/member/controller.dart | 5 +-- lib/utils/request_utils.dart | 43 ++++++++----------- 4 files changed, 19 insertions(+), 43 deletions(-) diff --git a/lib/http/member.dart b/lib/http/member.dart index d3b94898..2b339c40 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -279,7 +279,6 @@ class MemberHttp { static Future memberInfo({ int? mid, String token = '', - dynamic wwebid, }) async { String dmImgStr = Utils.base64EncodeRandomString(16, 64); String dmCoverImgStr = Utils.base64EncodeRandomString(32, 128); @@ -288,7 +287,6 @@ class MemberHttp { 'token': token, 'platform': 'web', 'web_location': 1550101, - 'w_webid': wwebid, 'dm_img_list': '[]', 'dm_img_str': dmImgStr, 'dm_cover_img_str': dmCoverImgStr, @@ -347,7 +345,6 @@ class MemberHttp { String? keyword, String order = 'pubdate', bool orderAvoided = true, - String? wwebid, }) async { String dmImgStr = Utils.base64EncodeRandomString(16, 64); String dmCoverImgStr = Utils.base64EncodeRandomString(32, 128); @@ -365,7 +362,6 @@ class MemberHttp { 'dm_img_str': dmImgStr, 'dm_cover_img_str': dmCoverImgStr, 'dm_img_inter': '{"ds":[],"wh":[0,0,0],"of":[0,0,0]}', - if (wwebid != null) 'w_webid': wwebid, }); var res = await Request().get( Api.memberArchive, diff --git a/lib/pages/member_search/controller.dart b/lib/pages/member_search/controller.dart index 3c5d51b7..92c54929 100644 --- a/lib/pages/member_search/controller.dart +++ b/lib/pages/member_search/controller.dart @@ -2,8 +2,6 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/models/member/archive.dart'; import 'package:PiliPlus/utils/extension.dart'; -import 'package:PiliPlus/utils/request_utils.dart'; -import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/http/member.dart'; @@ -33,18 +31,11 @@ class MemberSearchController extends GetxController Rx?>> dynamicState = LoadingState?>.loading().obs; - dynamic wwebid; - @override void onInit() { super.onInit(); mid = int.parse(Get.parameters['mid']!); uname.value = Get.parameters['uname']!; - if (!Accounts.main.isLogin) { - RequestUtils.getWwebid(mid).then((res) { - wwebid = res; - }); - } } // 清空搜索 @@ -136,7 +127,6 @@ class MemberSearchController extends GetxController pn: archivePn, keyword: textEditingController.text, order: 'pubdate', - wwebid: wwebid, ); if (res['status']) { MemberArchiveDataModel data = res['data']; diff --git a/lib/pages/video/detail/member/controller.dart b/lib/pages/video/detail/member/controller.dart index db799078..590b605c 100644 --- a/lib/pages/video/detail/member/controller.dart +++ b/lib/pages/video/detail/member/controller.dart @@ -6,14 +6,12 @@ import 'package:PiliPlus/models/space_archive/item.dart'; import 'package:PiliPlus/pages/common/common_data_controller.dart'; import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute.dart' show ContributeType; -import 'package:PiliPlus/utils/request_utils.dart'; import 'package:get/get.dart'; class HorizontalMemberPageController extends CommonDataController { HorizontalMemberPageController({this.mid, required this.lastAid}); dynamic mid; - dynamic wwebid; Rx> userState = LoadingState.loading().obs; @@ -28,8 +26,7 @@ class HorizontalMemberPageController extends CommonDataController { } Future getUserInfo() async { - wwebid ??= await RequestUtils.getWwebid(mid); - dynamic res = await MemberHttp.memberInfo(mid: mid, wwebid: wwebid); + dynamic res = await MemberHttp.memberInfo(mid: mid); if (res['status']) { userState.value = LoadingState.success(res['data']); getMemberStat(); diff --git a/lib/utils/request_utils.dart b/lib/utils/request_utils.dart index 5fb24674..9128f714 100644 --- a/lib/utils/request_utils.dart +++ b/lib/utils/request_utils.dart @@ -1,11 +1,8 @@ -import 'dart:convert'; import 'dart:math'; import 'package:PiliPlus/common/widgets/radio_widget.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; -import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/dynamics.dart'; -import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/member.dart'; import 'package:PiliPlus/http/user.dart'; @@ -16,16 +13,12 @@ import 'package:PiliPlus/pages/common/multi_select_controller.dart'; import 'package:PiliPlus/pages/dynamics/tab/controller.dart'; import 'package:PiliPlus/pages/later/controller.dart'; import 'package:PiliPlus/pages/video/detail/introduction/widgets/group_panel.dart'; -import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/storage.dart'; -import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:html/dom.dart' as dom; -import 'package:html/parser.dart' as html_parser; class RequestUtils { static Future actionRelationMod({ @@ -183,24 +176,24 @@ class RequestUtils { ); } - static Future getWwebid(mid) async { - try { - dynamic response = await Request().get( - '${HttpString.spaceBaseUrl}/$mid/dynamic', - options: Options( - extra: {'account': AnonymousAccount()}, - ), - ); - dom.Document document = html_parser.parse(response.data); - dom.Element? scriptElement = - document.querySelector('script#__RENDER_DATA__'); - return jsonDecode( - Uri.decodeComponent(scriptElement?.text ?? ''))['access_id']; - } catch (e) { - debugPrint('failed to get wwebid: $e'); - return null; - } - } + // static Future getWwebid(mid) async { + // try { + // dynamic response = await Request().get( + // '${HttpString.spaceBaseUrl}/$mid/dynamic', + // options: Options( + // extra: {'account': AnonymousAccount()}, + // ), + // ); + // dom.Document document = html_parser.parse(response.data); + // dom.Element? scriptElement = + // document.querySelector('script#__RENDER_DATA__'); + // return jsonDecode( + // Uri.decodeComponent(scriptElement?.text ?? ''))['access_id']; + // } catch (e) { + // debugPrint('failed to get wwebid: $e'); + // return null; + // } + // } static Future insertCreatedDyn(result) async { try {