feat: NTGroupMemberRole

src/core/apis/group.ts

@@ -2,7 +2,7 @@ import {
     GeneralCallResult,
     Group,
     GroupMember,
-    GroupMemberRole,
+    NTGroupMemberRole,
     GroupRequestOperateTypes,
     InstanceContext,
     KickMemberV2Req,
@@ -457,7 +457,7 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().modifyMemberCardName(groupQQ, memberUid, cardName);
     }
 
-    async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
+    async setMemberRole(groupQQ: string, memberUid: string, role: NTGroupMemberRole) {
         return this.context.session.getGroupService().modifyMemberRole(groupQQ, memberUid, role);
     }
 

src/core/entities/contact.ts

@@ -1,4 +1,3 @@
-
 export interface FSABRecentContactParams {
     anchorPointContact: {
         contactId: string;

src/core/entities/group.ts

@@ -113,14 +113,13 @@ export interface Group {
         memberUid: string;
     };
 }
-
-// 群成员角色类型
-export enum GroupMemberRole {
-    normal = 2,
-    admin = 3,
-    owner = 4
+export enum NTGroupMemberRole {
+    KUNSPECIFIED = 0,
+    KSTRANGER = 1,
+    KMEMBER = 2,
+    KADMIN = 3,
+    KOWNER = 4
 }
-
 export interface GroupMember {
     memberRealLevel: number | undefined;
     memberSpecialTitle?: string;
@@ -131,7 +130,7 @@ export interface GroupMember {
     nick: string;
     qid: string;
     remark: string;
-    role: GroupMemberRole;
+    role: NTGroupMemberRole;
     shutUpTime: number; // 禁言时间(S)
     uid: string;
     uin: string;

src/core/entities/msg.ts

@@ -1,4 +1,4 @@
-import { GroupMemberRole } from '@/core';
+import { NTGroupMemberRole } from '@/core';
 import { ActionBarElement, ArkElement, AvRecordElement, CalendarElement, FaceBubbleElement, FaceElement, FileElement, GiphyElement, GrayTipElement, MarketFaceElement, PicElement, PttElement, RecommendedMsgElement, ReplyElement, ShareLocationElement, StructLongMsgElement, TaskTopMsgElement, TextElement, TofuRecordElement, VideoElement, YoloGameResultElement } from './element';
 
 /**
@@ -420,13 +420,13 @@ export interface TipGroupElement {
             uid: string;
             card: string;
             name: string;
-            role: GroupMemberRole
+            role: NTGroupMemberRole
         };
         member: {
             uid: string
             card: string;
             name: string;
-            role: GroupMemberRole
+            role: NTGroupMemberRole
         }
     };
 }

src/core/entities/notify.ts

@@ -135,7 +135,7 @@ export interface FriendRequest {
     isDecide: boolean;
     friendUid: string;
     reqType: BuddyReqType,
-    reqTime: string;  // 时间戳;秒
+    reqTime: string;  // 时间戳 秒
     extWords: string;  // 申请人填写的验证消息
     isUnread: boolean;
     friendNick: string;

src/onebot/action/group/SetGroupAdmin.ts

@@ -1,5 +1,5 @@
 import { OneBotAction } from '@/onebot/action/OneBotAction';
-import { GroupMemberRole } from '@/core/entities';
+import { NTGroupMemberRole } from '@/core/entities';
 import { ActionName } from '@/onebot/action/router';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -23,7 +23,7 @@ export default class SetGroupAdmin extends OneBotAction<Payload, null> {
         const enable = typeof payload.enable === 'string' ? payload.enable === 'true' : !!payload.enable;
         const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
         if (!uid) throw new Error('get Uid Error');
-        await this.core.apis.GroupApi.setMemberRole(payload.group_id.toString(), uid, enable ? GroupMemberRole.admin : GroupMemberRole.normal);
+        await this.core.apis.GroupApi.setMemberRole(payload.group_id.toString(), uid, enable ? NTGroupMemberRole.KADMIN : NTGroupMemberRole.KMEMBER);
         return null;
     }
 }

src/onebot/index.ts

@@ -2,7 +2,7 @@ import {
     BuddyReqType,
     ChatType,
     DataSource,
-    GroupMemberRole,
+    NTGroupMemberRole,
     GroupNotifyMsgStatus,
     GroupNotifyMsgType,
     InstanceContext,
@@ -524,7 +524,7 @@ export class NapCatOneBot11Adapter {
                         this.core,
                         parseInt(groupCode),
                         parseInt(member.uin),
-                        member.role === GroupMemberRole.admin ? 'set' : 'unset'
+                        member.role === NTGroupMemberRole.KADMIN ? 'set' : 'unset'
                     );
                     this.networkManager
                         .emitEvent(groupAdminNoticeEvent)