diff --git a/src/ntqqapi/types/user.ts b/src/ntqqapi/types/user.ts index d33976b..efd2df6 100644 --- a/src/ntqqapi/types/user.ts +++ b/src/ntqqapi/types/user.ts @@ -1,7 +1,8 @@ export enum Sex { - male = 0, - female = 2, - unknown = 255, + Unknown = 0, + Male = 1, + Female = 2, + Hidden = 255 } export interface QQLevel { @@ -101,7 +102,7 @@ export interface BaseInfo { birthday_month: number birthday_day: number age: number - sex: number + sex: Sex eMail: string phoneNum: string categoryId: number diff --git a/src/onebot11/entities.ts b/src/onebot11/entities.ts index 1a84606..24c9a2a 100644 --- a/src/onebot11/entities.ts +++ b/src/onebot11/entities.ts @@ -665,9 +665,10 @@ export namespace OB11Entities { export function sex(sex: Sex): OB11UserSex { const sexMap = { - [Sex.male]: OB11UserSex.Male, - [Sex.female]: OB11UserSex.Female, - [Sex.unknown]: OB11UserSex.Unknown, + [Sex.Unknown]: OB11UserSex.Unknown, + [Sex.Male]: OB11UserSex.Male, + [Sex.Female]: OB11UserSex.Female, + [Sex.Hidden]: OB11UserSex.Unknown } return sexMap[sex] ?? OB11UserSex.Unknown } @@ -697,19 +698,6 @@ export namespace OB11Entities { } } - export function stranger(user: User): OB11User { - return { - ...user, - user_id: parseInt(user.uin), - nickname: user.nick, - sex: sex(user.sex!), - age: 0, - qid: user.qid, - login_days: 0, - level: (user.qqLevel && calcQQLevel(user.qqLevel)) || 0, - } - } - export function group(group: Group): OB11Group { return { group_id: parseInt(group.groupCode),