Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
349 changes: 324 additions & 25 deletions lib/api/xmly_anchor.dart

Large diffs are not rendered by default.

68 changes: 51 additions & 17 deletions lib/api/xmly_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -174,21 +174,22 @@ class XmlyClient {
RegExp(r'^/mobile/track/pay/[1-9][0-9]{0,18}/ts-[0-9]+$')
.hasMatch(path);
if (origin == searchOrigin)
return method == 'GET' &&
const {
'/revision/search',
'/revision/track/simple',
'/revision/comment/queryReplies',
'/revision/user/basic',
'/revision/user/pub',
'/revision/user/track',
'/revision/user/following',
'/revision/album/v1/simple',
'/revision/category/v2/allCategory',
'/revision/category/v2/albums',
'/revision/rank/v3/cluster',
'/revision/rank/v3/element',
}.contains(path);
return _webAccountEndpoint(method, path) ||
(method == 'GET' &&
const {
'/revision/search',
'/revision/track/simple',
'/revision/comment/queryReplies',
'/revision/user/basic',
'/revision/user/pub',
'/revision/user/track',
'/revision/user/following',
'/revision/album/v1/simple',
'/revision/category/v2/allCategory',
'/revision/category/v2/albums',
'/revision/rank/v3/cluster',
'/revision/rank/v3/element',
}.contains(path));
if (origin == pcOrigin)
return method == 'GET' &&
const {
Expand All @@ -208,7 +209,8 @@ class XmlyClient {
if (origin == collector)
return method == 'POST' && path == '/nyx/v1/history/merge/android';
if (origin == welfare)
return (method == 'GET' &&
return _publicAnchorTrackEndpoint(method, origin, path) ||
(method == 'GET' &&
RegExp(
r'^/lite-earn/ting/welfare/queryVipDurationTask/ts-[0-9]+$',
).hasMatch(path)) ||
Expand Down Expand Up @@ -260,6 +262,31 @@ class XmlyClient {
.hasMatch(path));
}

static bool _webAccountEndpoint(String method, String path) {
AppLog.instance.trace(
"lib/api/xmly_client.dart::XmlyClient._webAccountEndpoint",
);
return (method == 'GET' && path == '/revision/user/basic') ||
(method == 'POST' &&
const {
'/revision/follow/setFollow',
'/revision/follow/cancelFollow',
}.contains(path));
}

static bool _publicAnchorTrackEndpoint(
String method,
String origin,
String path,
) {
AppLog.instance.trace(
"lib/api/xmly_client.dart::XmlyClient._publicAnchorTrackEndpoint",
);
return method == 'GET' &&
origin == welfare &&
path == '/m-revision/common/anchor/queryAnchorTracksByPage';
}

static Duration _retryAfter(String? value) {
AppLog.instance.trace("lib/api/xmly_client.dart::XmlyClient._retryAfter");
return serverRetryAfter(value) ?? const Duration(seconds: 30);
Expand Down Expand Up @@ -436,8 +463,11 @@ class XmlyClient {
throw const XmlyException('client_closed', '连接已关闭', definitive: true);
method = method.toUpperCase();
if (!_endpoint(method, origin, path) ||
(account && _publicAnchorTrackEndpoint(method, origin, path)) ||
(account && const {pcOrigin, hotWordsOrigin}.contains(origin)) ||
(account &&
const {searchOrigin, pcOrigin, hotWordsOrigin}.contains(origin)))
origin == searchOrigin &&
!_webAccountEndpoint(method, path)))
throw const XmlyException(
'invalid_endpoint',
'请求地址不受支持',
Expand Down Expand Up @@ -619,6 +649,10 @@ class XmlyClient {
'Accept': origin == collector ? '*/*' : 'application/json',
if (origin == collector) 'User-Agent': 'ting_3.4.10.3(Android,30)',
if (authenticated) 'Cookie': credentials!.cookie,
if (authenticated && origin == searchOrigin) ...{
'Origin': searchOrigin,
'Referer': '$searchOrigin/',
},
if (signed)
'x-tk': XmlyCrypto.freshTicket(
credentials!,
Expand Down
23 changes: 21 additions & 2 deletions lib/pages/anchor_following_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,18 @@ class _AnchorFollowingPageState extends State<AnchorFollowingPage> {
unawaited(_load());
}

void _open(AnchorProfile anchor) {
Future<void> _open(AnchorProfile anchor) async {
AppLog.instance.trace(
"lib/pages/anchor_following_page.dart::_AnchorFollowingPageState._open",
);

final generation = _generation;
final identities = Map<String, String>.of(widget.accountIdentities);
final accountIdentity = _originIdentities[anchor.uid];
Navigator.of(context).push(
final runtime = widget.runtime, revision = runtime.libraryRevision;
final primary = runtime.accounts.primaryAccountId;
final uids = _uids, accounts = runtime.accounts.accountIds.toSet();
await Navigator.of(context).push(
MaterialPageRoute<void>(
settings: const RouteSettings(name: AnchorPage.routeName),
builder: (_) {
Expand All @@ -304,6 +309,20 @@ class _AnchorFollowingPageState extends State<AnchorFollowingPage> {
},
),
);
if (!_current(generation) ||
!mapEquals(widget.accountIdentities, identities) ||
!identical(widget.runtime, runtime) ||
runtime.libraryRevision == revision)
return;
final currentUids = _uids;
final currentAccounts = runtime.accounts.accountIds.toSet();
if (runtime.accounts.primaryAccountId != primary ||
currentUids.length != uids.length ||
!currentUids.containsAll(uids) ||
currentAccounts.length != accounts.length ||
!currentAccounts.containsAll(accounts))
return;
await _refresh();
}

Widget _footer() {
Expand Down
Loading