refactor(onebot): inline ctx.bridge.apis.friend/interaction/message direct calls
Remove 8 passthrough fields from ApiActionContext spanning three Api
areas:
friend area:
- handleFriendRequest (set_friend_add_request)
- handleDeleteFriend (delete_friend)
- setFriendRemark already kept the field name but now unused
interaction area:
- sendFriendPoke / sendGroupPoke (friend_poke, group_poke, send_poke)
- getEmojiLikes (was already dead — extended.ts used the direct
path; field removed)
message area:
- markGroupMsgAsRead / markPrivateMsgAsRead (already dead —
mark_msg_as_read sites use the module helper)
`handleGroupRequest` stays on ctx because `handleGroupAddRequest` is
a module helper that does the flag-parsing + group-request roster
lookup before routing to `bridge.apis.groupAdmin.setAddRequest` —
real composition, not a passthrough.
Behavior preserved: same flag parsing (`asString/asNumber/asBoolean`),
same `isGroup` flag flatten into `sendPoke(isGroup, peerUin, target?)`,
same default `block=false` for delete_friend.
Part 3 of the OneBot-side slim-down. 552/552 tests still green.
This commit is contained in:
@@ -96,7 +96,7 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
const userId = asNumber(params.user_id);
|
const userId = asNumber(params.user_id);
|
||||||
const targetId = asNumber(params.target_id) || undefined;
|
const targetId = asNumber(params.target_id) || undefined;
|
||||||
if (!userId) return failedResponse(RETCODE.BAD_REQUEST, 'user_id is required');
|
if (!userId) return failedResponse(RETCODE.BAD_REQUEST, 'user_id is required');
|
||||||
await ctx.sendFriendPoke(userId, targetId);
|
await ctx.bridge.apis.interaction.sendPoke(false, userId, targetId);
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -104,7 +104,7 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
const groupId = asNumber(params.group_id);
|
const groupId = asNumber(params.group_id);
|
||||||
const userId = asNumber(params.user_id);
|
const userId = asNumber(params.user_id);
|
||||||
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.sendGroupPoke(groupId, userId);
|
await ctx.bridge.apis.interaction.sendPoke(true, groupId, userId);
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -113,9 +113,9 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
const userId = asNumber(params.user_id);
|
const userId = asNumber(params.user_id);
|
||||||
if (!userId) return failedResponse(RETCODE.BAD_REQUEST, 'user_id is required');
|
if (!userId) return failedResponse(RETCODE.BAD_REQUEST, 'user_id is required');
|
||||||
if (groupId) {
|
if (groupId) {
|
||||||
await ctx.sendGroupPoke(groupId, userId);
|
await ctx.bridge.apis.interaction.sendPoke(true, groupId, userId);
|
||||||
} else {
|
} else {
|
||||||
await ctx.sendFriendPoke(userId);
|
await ctx.bridge.apis.interaction.sendPoke(false, userId);
|
||||||
}
|
}
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
const userId = asNumber(params.user_id);
|
const userId = asNumber(params.user_id);
|
||||||
const block = asBoolean(params.block, false);
|
const block = asBoolean(params.block, false);
|
||||||
if (!userId) return failedResponse(RETCODE.BAD_REQUEST, 'user_id is required');
|
if (!userId) return failedResponse(RETCODE.BAD_REQUEST, 'user_id is required');
|
||||||
await ctx.handleDeleteFriend(userId, block);
|
await ctx.bridge.apis.friend.delete(userId, block);
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void {
|
|||||||
const flag = asString(params.flag);
|
const flag = asString(params.flag);
|
||||||
const approve = asBoolean(params.approve, true);
|
const approve = asBoolean(params.approve, true);
|
||||||
if (!flag) return failedResponse(RETCODE.BAD_REQUEST, 'flag is required');
|
if (!flag) return failedResponse(RETCODE.BAD_REQUEST, 'flag is required');
|
||||||
await ctx.handleFriendRequest(flag, approve);
|
await ctx.bridge.apis.friend.handleRequest(flag, approve);
|
||||||
return okResponse();
|
return okResponse();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -71,20 +71,19 @@ export interface ApiActionContext {
|
|||||||
// stays because it composes through the `getGroupFiles` module
|
// stays because it composes through the `getGroupFiles` module
|
||||||
// helper (identity-lookup enrichment of uploader names).
|
// helper (identity-lookup enrichment of uploader names).
|
||||||
getGroupFiles: (groupId: number, folderId?: string) => Promise<JsonObject>;
|
getGroupFiles: (groupId: number, folderId?: string) => Promise<JsonObject>;
|
||||||
// Requests (adapters: rename to OneBot vocabulary)
|
// Friend requests: direct via `ctx.bridge.apis.friend.handleRequest`.
|
||||||
handleFriendRequest: (flag: string, approve: boolean) => Promise<void>;
|
// Group requests: stay on ctx because `handleGroupAddRequest` is a
|
||||||
|
// module helper that does the flag-parsing + group-request lookup
|
||||||
|
// dance before routing to `bridge.apis.groupAdmin.setAddRequest`.
|
||||||
handleGroupRequest: (flag: string, subType: string, approve: boolean, reason: string) => Promise<void>;
|
handleGroupRequest: (flag: string, subType: string, approve: boolean, reason: string) => Promise<void>;
|
||||||
// Pokes (adapters: flatten isGroup into bridge.sendPoke signature)
|
// Pokes: direct via `ctx.bridge.apis.interaction.sendPoke(isGroup, …)`.
|
||||||
sendFriendPoke: (userId: number, targetId?: number) => Promise<void>;
|
|
||||||
sendGroupPoke: (groupId: number, userId: number) => Promise<void>;
|
|
||||||
// Essence (adapter: bakes the set/unset boolean)
|
// Essence (adapter: bakes the set/unset boolean)
|
||||||
setEssenceMsg: (messageId: number) => Promise<void>;
|
setEssenceMsg: (messageId: number) => Promise<void>;
|
||||||
deleteEssenceMsg: (messageId: number) => Promise<void>;
|
deleteEssenceMsg: (messageId: number) => Promise<void>;
|
||||||
// Profile reads with OneBot-specific default args
|
// Profile reads with OneBot-specific default args
|
||||||
getProfileLike: (userId?: number, start?: number, limit?: number) => Promise<any>;
|
getProfileLike: (userId?: number, start?: number, limit?: number) => Promise<any>;
|
||||||
getGroupEssence: (groupId: number, pageStart?: number, pageLimit?: number) => Promise<GroupEssenceMsgRet>;
|
getGroupEssence: (groupId: number, pageStart?: number, pageLimit?: number) => Promise<GroupEssenceMsgRet>;
|
||||||
// Friend deletion (adapter: rename + force-boolean)
|
// Friend deletion: direct via `ctx.bridge.apis.friend.delete(userId, block)`.
|
||||||
handleDeleteFriend: (userId: number, block?: boolean) => Promise<void>;
|
|
||||||
// Module wrappers / multi-dep compositions
|
// Module wrappers / multi-dep compositions
|
||||||
getGroupMsgHistory: (groupId: number, messageId?: number, count?: number) => Promise<JsonObject[]>;
|
getGroupMsgHistory: (groupId: number, messageId?: number, count?: number) => Promise<JsonObject[]>;
|
||||||
getFriendMsgHistory: (userId: number, messageId?: number, count?: number) => Promise<JsonObject[]>;
|
getFriendMsgHistory: (userId: number, messageId?: number, count?: number) => Promise<JsonObject[]>;
|
||||||
@@ -99,12 +98,12 @@ export interface ApiActionContext {
|
|||||||
setFriendRemark: (userId: number, remark: string) => Promise<void>;
|
setFriendRemark: (userId: 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 / markPrivateMsgAsRead: direct via
|
||||||
markPrivateMsgAsRead: (userId: number, sequence: number) => Promise<void>;
|
// `ctx.bridge.apis.message.{markGroupRead,markPrivateRead}`.
|
||||||
setOnlineStatus: (status: number, extStatus?: number, batteryStatus?: number) => Promise<void>;
|
setOnlineStatus: (status: number, extStatus?: number, batteryStatus?: number) => Promise<void>;
|
||||||
setProfile: (nickname?: string, personalNote?: string) => Promise<void>;
|
setProfile: (nickname?: string, personalNote?: string) => Promise<void>;
|
||||||
fetchCustomFace: (count?: number) => Promise<string[]>;
|
fetchCustomFace: (count?: number) => Promise<string[]>;
|
||||||
getEmojiLikes: (groupId: number, sequence: number, emojiId: string, emojiType?: number, count?: number, cookie?: string) => Promise<{ users: Array<{ uin: number }>, cookie: string, isLast: boolean }>;
|
// getEmojiLikes: direct via `ctx.bridge.apis.interaction.getEmojiLikes(...)`.
|
||||||
// Web
|
// Web
|
||||||
getGroupHonorInfo: (groupId: number, type: WebHonorType | string) => Promise<any>;
|
getGroupHonorInfo: (groupId: number, type: WebHonorType | string) => Promise<any>;
|
||||||
getGroupEssenceAll: (groupId: number) => Promise<GroupEssenceMsgRet[]>;
|
getGroupEssenceAll: (groupId: number) => Promise<GroupEssenceMsgRet[]>;
|
||||||
|
|||||||
@@ -119,14 +119,11 @@ export function buildApiContext(ref: OneBotInstanceContext): ApiActionContext {
|
|||||||
// rest of the area is called directly via `ctx.bridge.apis.groupFile.*`.
|
// rest of the area is called directly via `ctx.bridge.apis.groupFile.*`.
|
||||||
getGroupFiles: (groupId, folderId) => getGroupFiles(bridge, groupId, folderId),
|
getGroupFiles: (groupId, folderId) => getGroupFiles(bridge, groupId, folderId),
|
||||||
|
|
||||||
// Requests — name translation.
|
// Group request handling stays here because `handleGroupAddRequest`
|
||||||
handleFriendRequest: (flag, approve) => bridge.apis.friend.handleRequest(flag, approve),
|
// is a module helper (flag parsing + group-request lookup). Friend
|
||||||
|
// request handling moved to direct `ctx.bridge.apis.friend.handleRequest`.
|
||||||
handleGroupRequest: (flag, _subType, approve, reason) => handleGroupAddRequest(bridge, flag, approve, reason),
|
handleGroupRequest: (flag, _subType, approve, reason) => handleGroupAddRequest(bridge, flag, approve, reason),
|
||||||
|
|
||||||
// Pokes — flatten isGroup into the bridge signature.
|
|
||||||
sendFriendPoke: (userId, targetId) => bridge.apis.interaction.sendPoke(false, userId, targetId),
|
|
||||||
sendGroupPoke: (groupId, userId) => bridge.apis.interaction.sendPoke(true, groupId, userId),
|
|
||||||
|
|
||||||
// Essence — bake the set/unset boolean.
|
// Essence — bake the set/unset boolean.
|
||||||
setEssenceMsg: (messageId) => setEssenceMessage(bridge, messageStore, messageId, true),
|
setEssenceMsg: (messageId) => setEssenceMessage(bridge, messageStore, messageId, true),
|
||||||
deleteEssenceMsg: (messageId) => setEssenceMessage(bridge, messageStore, messageId, false),
|
deleteEssenceMsg: (messageId) => setEssenceMessage(bridge, messageStore, messageId, false),
|
||||||
@@ -148,7 +145,6 @@ export function buildApiContext(ref: OneBotInstanceContext): ApiActionContext {
|
|||||||
sendForwardMsg: (messages, groupId) => uploadForwardMessage(ref, messages, groupId),
|
sendForwardMsg: (messages, groupId) => uploadForwardMessage(ref, messages, groupId),
|
||||||
getForwardMsg: (resId) => getForwardMessage(ref, resId),
|
getForwardMsg: (resId) => getForwardMessage(ref, resId),
|
||||||
forwardSingleMsg: (messageId, target) => forwardSingleMessage(ref, messageId, target),
|
forwardSingleMsg: (messageId, target) => forwardSingleMessage(ref, messageId, target),
|
||||||
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),
|
||||||
setGroupAvatar: (groupId, source) => bridge.apis.profile.setGroupAvatar(groupId, source),
|
setGroupAvatar: (groupId, source) => bridge.apis.profile.setGroupAvatar(groupId, source),
|
||||||
@@ -163,8 +159,6 @@ export function buildApiContext(ref: OneBotInstanceContext): ApiActionContext {
|
|||||||
if (!meta.isGroup) throw new Error('emoji reactions are not supported on private messages');
|
if (!meta.isGroup) throw new Error('emoji reactions are not supported on private messages');
|
||||||
await bridge.apis.interaction.setReaction(meta.targetId, meta.sequence, emojiId, set);
|
await bridge.apis.interaction.setReaction(meta.targetId, meta.sequence, emojiId, set);
|
||||||
},
|
},
|
||||||
markGroupMsgAsRead: (groupId, sequence) => bridge.apis.message.markGroupRead(groupId, sequence),
|
|
||||||
markPrivateMsgAsRead: (userId, sequence) => bridge.apis.message.markPrivateRead(userId, sequence),
|
|
||||||
setOnlineStatus: (status: number, extStatus?: number, batteryStatus?: number) => bridge.apis.profile.setOnlineStatus(status, extStatus, batteryStatus),
|
setOnlineStatus: (status: number, extStatus?: number, batteryStatus?: number) => bridge.apis.profile.setOnlineStatus(status, extStatus, batteryStatus),
|
||||||
setProfile: (nickname?: string, personalNote?: string) => bridge.apis.profile.setProfile(nickname, personalNote),
|
setProfile: (nickname?: string, personalNote?: string) => bridge.apis.profile.setProfile(nickname, personalNote),
|
||||||
|
|
||||||
@@ -186,7 +180,6 @@ export function buildApiContext(ref: OneBotInstanceContext): ApiActionContext {
|
|||||||
|
|
||||||
// Extended
|
// Extended
|
||||||
fetchCustomFace: (count) => bridge.apis.profile.fetchCustomFace(count),
|
fetchCustomFace: (count) => bridge.apis.profile.fetchCustomFace(count),
|
||||||
getEmojiLikes: (groupId, sequence, emojiId, emojiType, count, cookie) => bridge.apis.interaction.getEmojiLikes(groupId, sequence, emojiId, emojiType, count, cookie),
|
|
||||||
|
|
||||||
// Media lookup.
|
// Media lookup.
|
||||||
getImageInfo: (file) => getCachedImageInfo(mediaStore, file),
|
getImageInfo: (file) => getCachedImageInfo(mediaStore, file),
|
||||||
|
|||||||
Reference in New Issue
Block a user