refactor(onebot): inline ctx.bridge.apis.groupAdmin direct calls
Remove the 6 pure pass-through fields from `ApiActionContext` for the group-admin area (`setGroupKick / setGroupKickMembers / setGroupBan / setGroupWholeBan / setGroupLeave / setGroupRemark`). All 5 call sites in `actions/group-admin.ts` now invoke `ctx.bridge.apis.groupAdmin.<m>` directly. `setGroupRemark` had zero remaining callers (extended.ts was already on the direct path) so the field is simply deleted. Part 1 of RoadMap #6 OneBot-side slim-down. Core side's typed Api hub (bridge.apis.X) has been in place since the #6 commit series; OneBot actions were still routing through a 90+ field bag-of- functions on `ApiActionContext`. Most of those fields were 1:1 shims like `setGroupKick: (g,u,r) => bridge.apis.groupAdmin.kickMember(g,u,r)` — pure indirection with no composition logic. This commit kills the group-admin chunk; the friend / interaction / profile / web / album / groupFile / message chunks land in follow-up commits. Behavior preserved byte-for-byte: same parameter parsing (`asNumber/asString/asBoolean`), same default values, same 1800s mute fallback, same error responses. 552/552 tests still green.
This commit is contained in:
@@ -8,7 +8,7 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
const userId = asNumber(params.user_id);
|
const userId = asNumber(params.user_id);
|
||||||
const reject = asBoolean(params.reject_add_request, false);
|
const reject = asBoolean(params.reject_add_request, false);
|
||||||
if (!groupId || !userId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id and user_id are required');
|
if (!groupId || !userId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id and user_id are required');
|
||||||
await ctx.setGroupKick(groupId, userId, reject);
|
await ctx.bridge.apis.groupAdmin.kickMember(groupId, userId, reject);
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
const userIds = Array.isArray(params.user_id) ? params.user_id.map(asNumber).filter(Boolean) : [];
|
const userIds = Array.isArray(params.user_id) ? params.user_id.map(asNumber).filter(Boolean) : [];
|
||||||
const reject = asBoolean(params.reject_add_request, false);
|
const reject = asBoolean(params.reject_add_request, false);
|
||||||
if (!groupId || userIds.length === 0) return failedResponse(RETCODE.BAD_REQUEST, 'group_id and user_id array are required');
|
if (!groupId || userIds.length === 0) return failedResponse(RETCODE.BAD_REQUEST, 'group_id and user_id array are required');
|
||||||
await ctx.setGroupKickMembers(groupId, userIds, reject);
|
await ctx.bridge.apis.groupAdmin.kickMembers(groupId, userIds, reject);
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -26,7 +26,7 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
const userId = asNumber(params.user_id);
|
const userId = asNumber(params.user_id);
|
||||||
const duration = asNumber(params.duration) || 1800;
|
const duration = asNumber(params.duration) || 1800;
|
||||||
if (!groupId || !userId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id and user_id are required');
|
if (!groupId || !userId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id and user_id are required');
|
||||||
await ctx.setGroupBan(groupId, userId, duration);
|
await ctx.bridge.apis.groupAdmin.muteMember(groupId, userId, duration);
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
const groupId = asNumber(params.group_id);
|
const groupId = asNumber(params.group_id);
|
||||||
const enable = asBoolean(params.enable, true);
|
const enable = asBoolean(params.enable, true);
|
||||||
if (!groupId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id is required');
|
if (!groupId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id is required');
|
||||||
await ctx.setGroupWholeBan(groupId, enable);
|
await ctx.bridge.apis.groupAdmin.muteAll(groupId, enable);
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -82,7 +82,7 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
h.registerAction('set_group_leave', async (params) => {
|
h.registerAction('set_group_leave', async (params) => {
|
||||||
const groupId = asNumber(params.group_id);
|
const groupId = asNumber(params.group_id);
|
||||||
if (!groupId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id is required');
|
if (!groupId) return failedResponse(RETCODE.BAD_REQUEST, 'group_id is required');
|
||||||
await ctx.setGroupLeave(groupId);
|
await ctx.bridge.apis.groupAdmin.leave(groupId);
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -61,12 +61,10 @@ export interface ApiActionContext {
|
|||||||
getGroupMemberList: (groupId: number, noCache?: boolean) => Promise<JsonObject[]>;
|
getGroupMemberList: (groupId: number, noCache?: boolean) => Promise<JsonObject[]>;
|
||||||
getGroupMemberInfo: (groupId: number, userId: number, noCache?: boolean) => Promise<JsonObject | null>;
|
getGroupMemberInfo: (groupId: number, userId: number, noCache?: boolean) => Promise<JsonObject | null>;
|
||||||
getStrangerInfo: (userId: number) => Promise<JsonObject | null>;
|
getStrangerInfo: (userId: number) => Promise<JsonObject | null>;
|
||||||
// Group admin (adapters: rename Bridge methods to OneBot vocabulary)
|
// Group admin (mute/kick/admin/card/name/title/leave/etc) — all
|
||||||
setGroupKick: (groupId: number, userId: number, rejectAdd: boolean) => Promise<void>;
|
// accessed directly through `ctx.bridge.apis.groupAdmin.method()`
|
||||||
setGroupKickMembers: (groupId: number, userIds: number[], rejectAdd: boolean) => Promise<void>;
|
// after the #6 OneBot-side slim-down; no per-method passthrough
|
||||||
setGroupBan: (groupId: number, userId: number, duration: number) => Promise<void>;
|
// here anymore.
|
||||||
setGroupWholeBan: (groupId: number, enable: boolean) => Promise<void>;
|
|
||||||
setGroupLeave: (groupId: number) => Promise<void>;
|
|
||||||
// Group file (adapters: field extraction + Bridge name translation)
|
// Group file (adapters: field extraction + Bridge name translation)
|
||||||
uploadGroupFile: (groupId: number, file: string, name?: string, folderId?: string, uploadFile?: boolean) => Promise<string | null>;
|
uploadGroupFile: (groupId: number, file: string, name?: string, folderId?: string, uploadFile?: boolean) => Promise<string | null>;
|
||||||
uploadPrivateFile: (userId: number, file: string, name?: string, uploadFile?: boolean) => Promise<string | null>;
|
uploadPrivateFile: (userId: number, file: string, name?: string, uploadFile?: boolean) => Promise<string | null>;
|
||||||
@@ -101,7 +99,6 @@ export interface ApiActionContext {
|
|||||||
forwardSingleMsg: (messageId: number, target: { groupId?: number; userId?: number }) => Promise<{ messageId: number }>;
|
forwardSingleMsg: (messageId: number, target: { groupId?: number; userId?: number }) => Promise<{ messageId: number }>;
|
||||||
// Extended NapCat-compatible
|
// Extended NapCat-compatible
|
||||||
setFriendRemark: (userId: number, remark: string) => Promise<void>;
|
setFriendRemark: (userId: number, remark: string) => Promise<void>;
|
||||||
setGroupRemark: (groupId: number, remark: string) => Promise<void>;
|
|
||||||
setGroupAvatar: (groupId: number, source: string) => Promise<void>;
|
setGroupAvatar: (groupId: number, source: string) => Promise<void>;
|
||||||
setMsgEmojiLike: (messageId: number, emojiId: string, set: boolean) => Promise<void>;
|
setMsgEmojiLike: (messageId: number, emojiId: string, set: boolean) => Promise<void>;
|
||||||
markGroupMsgAsRead: (groupId: number, sequence: number) => Promise<void>;
|
markGroupMsgAsRead: (groupId: number, sequence: number) => Promise<void>;
|
||||||
|
|||||||
@@ -111,12 +111,8 @@ export function buildApiContext(ref: OneBotInstanceContext): ApiActionContext {
|
|||||||
getGroupMemberInfo: (groupId, userId, noCache) => getGroupMemberInfo(bridge, groupId, userId, noCache),
|
getGroupMemberInfo: (groupId, userId, noCache) => getGroupMemberInfo(bridge, groupId, userId, noCache),
|
||||||
getStrangerInfo: (userId) => getStrangerInfo(bridge, userId),
|
getStrangerInfo: (userId) => getStrangerInfo(bridge, userId),
|
||||||
|
|
||||||
// Group admin — names translate to OneBot vocabulary.
|
// Group admin — actions now call `ctx.bridge.apis.groupAdmin.X(...)`
|
||||||
setGroupKick: (groupId, userId, reject) => bridge.apis.groupAdmin.kickMember(groupId, userId, reject),
|
// directly; no per-method passthrough here anymore.
|
||||||
setGroupKickMembers: (groupId, userIds, reject) => bridge.apis.groupAdmin.kickMembers(groupId, userIds, reject),
|
|
||||||
setGroupBan: (groupId, userId, duration) => bridge.apis.groupAdmin.muteMember(groupId, userId, duration),
|
|
||||||
setGroupWholeBan: (groupId, enable) => bridge.apis.groupAdmin.muteAll(groupId, enable),
|
|
||||||
setGroupLeave: (groupId) => bridge.apis.groupAdmin.leave(groupId),
|
|
||||||
|
|
||||||
// Group file — fileId field extraction + defaults.
|
// Group file — fileId field extraction + defaults.
|
||||||
uploadGroupFile: async (groupId, file, name, folderId, uploadFile) => {
|
uploadGroupFile: async (groupId, file, name, folderId, uploadFile) => {
|
||||||
@@ -164,7 +160,6 @@ export function buildApiContext(ref: OneBotInstanceContext): ApiActionContext {
|
|||||||
handleDeleteFriend: (userId, block) => bridge.apis.friend.delete(userId, !!block),
|
handleDeleteFriend: (userId, block) => bridge.apis.friend.delete(userId, !!block),
|
||||||
forceFetchClientKey: () => bridge.apis.web.forceFetchClientKey(),
|
forceFetchClientKey: () => bridge.apis.web.forceFetchClientKey(),
|
||||||
setFriendRemark: (userId, remark) => bridge.apis.friend.setRemark(userId, remark),
|
setFriendRemark: (userId, remark) => bridge.apis.friend.setRemark(userId, remark),
|
||||||
setGroupRemark: (groupId, remark) => bridge.apis.groupAdmin.setRemark(groupId, remark),
|
|
||||||
setGroupAvatar: (groupId, source) => bridge.apis.profile.setGroupAvatar(groupId, source),
|
setGroupAvatar: (groupId, source) => bridge.apis.profile.setGroupAvatar(groupId, source),
|
||||||
getGroupFileCount: (groupId) => bridge.apis.groupFile.getCount(groupId),
|
getGroupFileCount: (groupId) => bridge.apis.groupFile.getCount(groupId),
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user