merge: 同步 upstream/main 新功能到定制版本

- feat: Add slider verification code (bd67997)
- fix bug: Inventory cannot be zero (1f7a6ee)
- fix: resolve merge conflicts and lint errors
This commit is contained in:
2026-03-23 21:50:10 -07:00
parent 3806264343
commit d6616c5859
63 changed files with 3111 additions and 1130 deletions
+29
View File
@@ -338,6 +338,17 @@ declare namespace API {
state: string;
};
type GenerateCaptchaResponse = {
type: string;
id: string;
image: string;
block_image?: string;
};
type SliderVerifyCaptchaResponse = {
token: string;
};
type HeartbeatResponse = {
status: boolean;
message?: string;
@@ -732,6 +743,9 @@ declare namespace API {
password: string;
code?: string;
cf_token?: string;
captcha_id?: string;
captcha_code?: string;
slider_token?: string;
};
type ResetSubscribeTrafficLog = {
@@ -931,6 +945,9 @@ declare namespace API {
telephone_area_code: string;
password: string;
cf_token?: string;
captcha_id?: string;
captcha_code?: string;
slider_token?: string;
};
type TelephoneRegisterRequest = {
@@ -941,6 +958,9 @@ declare namespace API {
invite?: string;
code?: string;
cf_token?: string;
captcha_id?: string;
captcha_code?: string;
slider_token?: string;
};
type TelephoneResetPasswordRequest = {
@@ -950,6 +970,9 @@ declare namespace API {
password: string;
code?: string;
cf_token?: string;
captcha_id?: string;
captcha_code?: string;
slider_token?: string;
};
type Ticket = {
@@ -1069,6 +1092,9 @@ declare namespace API {
email: string;
password: string;
cf_token?: string;
captcha_id?: string;
captcha_code?: string;
slider_token?: string;
};
type UserRegisterRequest = {
@@ -1078,6 +1104,9 @@ declare namespace API {
invite?: string;
code?: string;
cf_token?: string;
captcha_id?: string;
captcha_code?: string;
slider_token?: string;
};
type UserSubscribe = {