From b8165242f07bb8cf6b3f6169a752346477fe19b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Thu, 21 Nov 2024 14:21:14 +0800 Subject: [PATCH] feat: NTSex --- src/core/entities/group.ts | 2 +- src/core/entities/user.ts | 13 +++++++------ src/onebot/helper/data.ts | 11 ++++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/core/entities/group.ts b/src/core/entities/group.ts index f960b203..0e853e31 100644 --- a/src/core/entities/group.ts +++ b/src/core/entities/group.ts @@ -1,4 +1,4 @@ -import { QQLevel, Sex } from './user'; +import { QQLevel, NTSex } from './user'; export interface KickMemberInfo { optFlag: number; diff --git a/src/core/entities/user.ts b/src/core/entities/user.ts index f3f0a06d..69c93fa9 100644 --- a/src/core/entities/user.ts +++ b/src/core/entities/user.ts @@ -1,8 +1,9 @@ // 性别枚举 -export enum Sex { - male = 1, - female = 2, - unknown = 255, +export enum NTSex { + GENDER_UNKOWN = 0, + GENDER_MALE = 1, + GENDER_FEMALE = 2, + GENDER_PRIVACY = 255, } // 好友分类类型 @@ -226,7 +227,7 @@ export interface UserDetailInfoListenerArg { export interface ModifyProfileParams { nick: string; longNick: string; - sex: Sex; + sex: NTSex; birthday: { birthday_year: string, birthday_month: string, birthday_day: string }; location: any; } @@ -259,7 +260,7 @@ export interface User { avatarUrl?: string; longNick?: string; remark?: string; - sex?: Sex; + sex?: NTSex; age?: number; qqLevel?: QQLevel; qid?: string; diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index ef65978e..f96895f9 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -1,5 +1,5 @@ import { calcQQLevel, FileNapCatOneBotUUID } from '@/common/helper'; -import { FriendV2, Group, GroupFileInfoUpdateParamType, GroupMember, SelfInfo, Sex } from '@/core'; +import { FriendV2, Group, GroupFileInfoUpdateParamType, GroupMember, SelfInfo, NTSex } from '@/core'; import { OB11Group, OB11GroupFile, @@ -37,12 +37,13 @@ export class OB11Construct { }[role]; } - static sex(sex?: Sex): OB11UserSex { + static sex(sex?: NTSex): OB11UserSex { if (!sex) return OB11UserSex.unknown; return { - [Sex.male]: OB11UserSex.male, - [Sex.female]: OB11UserSex.female, - [Sex.unknown]: OB11UserSex.unknown, + [NTSex.GENDER_MALE]: OB11UserSex.male, + [NTSex.GENDER_FEMALE]: OB11UserSex.female, + [NTSex.GENDER_UNKOWN]: OB11UserSex.unknown, + [NTSex.GENDER_PRIVACY]: OB11UserSex.unknown, }[sex] || OB11UserSex.unknown; }