HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-23 18:46:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "opt: account (#846)"

Browse Source 
This reverts commit ab57aee8c1.
This commit is contained in:
bggRGjQaUbCoE
2025-05-31 20:02:22 +08:00
parent 0fb01f1b7c
commit b990f9cf87
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/utils/accounts/account.dart
View File

@@ -5,15 +5,15 @@ import 'package:cookie_jar/cookie_jar.dart';
import 'package:hive/hive.dart'; import 'package:hive/hive.dart';
abstract class Account { abstract class Account {
bool get isLogin; final bool isLogin = false;
DefaultCookieJar get cookieJar; late final DefaultCookieJar cookieJar;
String? get accessKey; String? accessKey;
String? get refresh; String? refresh;
Set<AccountType> get type; late final Set<AccountType> type;
int get mid; final int mid = 0;
String get csrf; late String csrf;
Map<String, String> get headers; final Map<String, String> headers = const {};
// bool activited = false; // bool activited = false;
@@ -29,16 +29,16 @@ class LoginAccount implements Account {
final bool isLogin = true; final bool isLogin = true;
@override @override
@HiveField(0) @HiveField(0)
final DefaultCookieJar cookieJar; late final DefaultCookieJar cookieJar;
@override @override
@HiveField(1) @HiveField(1)
final String? accessKey; String? accessKey;
@override @override
@HiveField(2) @HiveField(2)
final String? refresh; String? refresh;
@override @override
@HiveField(3) @HiveField(3)
final Set<AccountType> type; late final Set<AccountType> type;
@override @override
late final int mid = int.parse(_midStr); late final int mid = int.parse(_midStr);
@@ -49,7 +49,7 @@ class LoginAccount implements Account {
'x-bili-aurora-eid': Utils.genAuroraEid(mid), 'x-bili-aurora-eid': Utils.genAuroraEid(mid),
}; };
@override @override
late final String csrf = late String csrf =
cookieJar.domainCookies['bilibili.com']!['/']!['bili_jct']!.cookie.value; cookieJar.domainCookies['bilibili.com']!['/']!['bili_jct']!.cookie.value;
@override @override
@@ -71,19 +71,19 @@ class LoginAccount implements Account {
late final Box<LoginAccount> _box = Accounts.account; late final Box<LoginAccount> _box = Accounts.account;
LoginAccount( LoginAccount(this.cookieJar, this.accessKey, this.refresh,
this.cookieJar, [Set<AccountType>? type])
this.accessKey, : type = type ?? {};
this.refresh, [
Set<AccountType>? type,
]) : type = type ?? {};
factory LoginAccount.fromJson(Map<String, dynamic> json) => LoginAccount( LoginAccount.fromJson(Map json) {
BiliCookieJar.fromJson(json['cookies'])..setBuvid3(), cookieJar = BiliCookieJar.fromJson(json['cookies']);
json['accessKey'], accessKey = json['accessKey'];
json['refresh'], refresh = json['refresh'];
(json['type'] as Iterable?)?.map((i) => AccountType.values[i]).toSet(), type = (json['type'] as Iterable?)
); ?.map((i) => AccountType.values[i])
.toSet() ??
{};
}
@override @override
int get hashCode => mid.hashCode; int get hashCode => mid.hashCode;
@@ -97,18 +97,17 @@ class AnonymousAccount implements Account {
@override @override
final bool isLogin = false; final bool isLogin = false;
@override @override
final DefaultCookieJar cookieJar = DefaultCookieJar(ignoreExpires: true) late final DefaultCookieJar cookieJar;
..setBuvid3();
@override @override
final String? accessKey = null; String? accessKey;
@override @override
final String? refresh = null; String? refresh;
@override @override
final Set<AccountType> type = {}; Set<AccountType> type = {};
@override @override
final int mid = 0; final int mid = 0;
@override @override
final String csrf = ''; String csrf = '';
@override @override
final Map<String, String> headers = const {}; final Map<String, String> headers = const {};
@@ -126,7 +125,9 @@ class AnonymousAccount implements Account {
static final _instance = AnonymousAccount._(); static final _instance = AnonymousAccount._();
AnonymousAccount._(); AnonymousAccount._() {
cookieJar = DefaultCookieJar(ignoreExpires: true)..setBuvid3();
}
factory AnonymousAccount() => _instance; factory AnonymousAccount() => _instance;