github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 19:14:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(slack): dedupe event system-event emit

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 16:01:20 +00:00
parent 30eacd36af
commit afc333cc5b
2 changed files with 68 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/slack/monitor/events/channels.ts
View File

@@ -15,6 +15,35 @@ import { resolveSlackChannelLabel } from "../channel-config.js";
export function registerSlackChannelEvents(params: { ctx: SlackMonitorContext }) { export function registerSlackChannelEvents(params: { ctx: SlackMonitorContext }) {
const { ctx } = params; const { ctx } = params;
const enqueueChannelSystemEvent = (params: {
kind: "created" | "renamed";
channelId: string | undefined;
channelName: string | undefined;
}) => {
if (
!ctx.isChannelAllowed({
channelId: params.channelId,
channelName: params.channelName,
channelType: "channel",
})
) {
return;
}
const label = resolveSlackChannelLabel({
channelId: params.channelId,
channelName: params.channelName,
});
const sessionKey = ctx.resolveSlackSystemEventSessionKey({
channelId: params.channelId,
channelType: "channel",
});
enqueueSystemEvent(`Slack channel ${params.kind}: ${label}.`, {
sessionKey,
contextKey: `slack:channel:${params.kind}:${params.channelId ?? params.channelName ?? "unknown"}`,
});
};
ctx.app.event( ctx.app.event(
"channel_created", "channel_created",
async ({ event, body }: SlackEventMiddlewareArgs<"channel_created">) => { async ({ event, body }: SlackEventMiddlewareArgs<"channel_created">) => {
@@ -26,24 +55,7 @@ export function registerSlackChannelEvents(params: { ctx: SlackMonitorContext })
const payload = event as SlackChannelCreatedEvent; const payload = event as SlackChannelCreatedEvent;
const channelId = payload.channel?.id; const channelId = payload.channel?.id;
const channelName = payload.channel?.name; const channelName = payload.channel?.name;
if ( enqueueChannelSystemEvent({ kind: "created", channelId, channelName });
!ctx.isChannelAllowed({
channelId,
channelName,
channelType: "channel",
})
) {
return;
}
const label = resolveSlackChannelLabel({ channelId, channelName });
const sessionKey = ctx.resolveSlackSystemEventSessionKey({
channelId,
channelType: "channel",
});
enqueueSystemEvent(`Slack channel created: ${label}.`, {
sessionKey,
contextKey: `slack:channel:created:${channelId ?? channelName ?? "unknown"}`,
});
} catch (err) { } catch (err) {
ctx.runtime.error?.(danger(`slack channel created handler failed: ${String(err)}`)); ctx.runtime.error?.(danger(`slack channel created handler failed: ${String(err)}`));
} }
@@ -61,24 +73,7 @@ export function registerSlackChannelEvents(params: { ctx: SlackMonitorContext })
const payload = event as SlackChannelRenamedEvent; const payload = event as SlackChannelRenamedEvent;
const channelId = payload.channel?.id; const channelId = payload.channel?.id;
const channelName = payload.channel?.name_normalized ?? payload.channel?.name; const channelName = payload.channel?.name_normalized ?? payload.channel?.name;
if ( enqueueChannelSystemEvent({ kind: "renamed", channelId, channelName });
!ctx.isChannelAllowed({
channelId,
channelName,
channelType: "channel",
})
) {
return;
}
const label = resolveSlackChannelLabel({ channelId, channelName });
const sessionKey = ctx.resolveSlackSystemEventSessionKey({
channelId,
channelType: "channel",
});
enqueueSystemEvent(`Slack channel renamed: ${label}.`, {
sessionKey,
contextKey: `slack:channel:renamed:${channelId ?? channelName ?? "unknown"}`,
});
} catch (err) { } catch (err) {
ctx.runtime.error?.(danger(`slack channel rename handler failed: ${String(err)}`)); ctx.runtime.error?.(danger(`slack channel rename handler failed: ${String(err)}`));
} }

94
src/slack/monitor/events/messages.ts
View File

@@ -17,6 +17,31 @@ export function registerSlackMessageEvents(params: {
}) { }) {
const { ctx, handleSlackMessage } = params; const { ctx, handleSlackMessage } = params;
const resolveSlackChannelSystemEventTarget = async (channelId: string | undefined) => {
const channelInfo = channelId ? await ctx.resolveChannelName(channelId) : {};
const channelType = channelInfo?.type;
if (
!ctx.isChannelAllowed({
channelId,
channelName: channelInfo?.name,
channelType,
})
) {
return null;
}
const label = resolveSlackChannelLabel({
channelId,
channelName: channelInfo?.name,
});
const sessionKey = ctx.resolveSlackSystemEventSessionKey({
channelId,
channelType,
});
return { channelInfo, channelType, label, sessionKey };
};
ctx.app.event("message", async ({ event, body }: SlackEventMiddlewareArgs<"message">) => { ctx.app.event("message", async ({ event, body }: SlackEventMiddlewareArgs<"message">) => {
try { try {
if (ctx.shouldDropMismatchedSlackEvent(body)) { if (ctx.shouldDropMismatchedSlackEvent(body)) {
@@ -27,28 +52,13 @@ export function registerSlackMessageEvents(params: {
if (message.subtype === "message_changed") { if (message.subtype === "message_changed") {
const changed = event as SlackMessageChangedEvent; const changed = event as SlackMessageChangedEvent;
const channelId = changed.channel; const channelId = changed.channel;
const channelInfo = channelId ? await ctx.resolveChannelName(channelId) : {}; const target = await resolveSlackChannelSystemEventTarget(channelId);
const channelType = channelInfo?.type; if (!target) {
if (
!ctx.isChannelAllowed({
channelId,
channelName: channelInfo?.name,
channelType,
})
) {
return; return;
} }
const messageId = changed.message?.ts ?? changed.previous_message?.ts; const messageId = changed.message?.ts ?? changed.previous_message?.ts;
const label = resolveSlackChannelLabel({ enqueueSystemEvent(`Slack message edited in ${target.label}.`, {
channelId, sessionKey: target.sessionKey,
channelName: channelInfo?.name,
});
const sessionKey = ctx.resolveSlackSystemEventSessionKey({
channelId,
channelType,
});
enqueueSystemEvent(`Slack message edited in ${label}.`, {
sessionKey,
contextKey: `slack:message:changed:${channelId ?? "unknown"}:${messageId ?? changed.event_ts ?? "unknown"}`, contextKey: `slack:message:changed:${channelId ?? "unknown"}:${messageId ?? changed.event_ts ?? "unknown"}`,
}); });
return; return;
@@ -56,27 +66,12 @@ export function registerSlackMessageEvents(params: {
if (message.subtype === "message_deleted") { if (message.subtype === "message_deleted") {
const deleted = event as SlackMessageDeletedEvent; const deleted = event as SlackMessageDeletedEvent;
const channelId = deleted.channel; const channelId = deleted.channel;
const channelInfo = channelId ? await ctx.resolveChannelName(channelId) : {}; const target = await resolveSlackChannelSystemEventTarget(channelId);
const channelType = channelInfo?.type; if (!target) {
if (
!ctx.isChannelAllowed({
channelId,
channelName: channelInfo?.name,
channelType,
})
) {
return; return;
} }
const label = resolveSlackChannelLabel({ enqueueSystemEvent(`Slack message deleted in ${target.label}.`, {
channelId, sessionKey: target.sessionKey,
channelName: channelInfo?.name,
});
const sessionKey = ctx.resolveSlackSystemEventSessionKey({
channelId,
channelType,
});
enqueueSystemEvent(`Slack message deleted in ${label}.`, {
sessionKey,
contextKey: `slack:message:deleted:${channelId ?? "unknown"}:${deleted.deleted_ts ?? deleted.event_ts ?? "unknown"}`, contextKey: `slack:message:deleted:${channelId ?? "unknown"}:${deleted.deleted_ts ?? deleted.event_ts ?? "unknown"}`,
}); });
return; return;
@@ -84,28 +79,13 @@ export function registerSlackMessageEvents(params: {
if (message.subtype === "thread_broadcast") { if (message.subtype === "thread_broadcast") {
const thread = event as SlackThreadBroadcastEvent; const thread = event as SlackThreadBroadcastEvent;
const channelId = thread.channel; const channelId = thread.channel;
const channelInfo = channelId ? await ctx.resolveChannelName(channelId) : {}; const target = await resolveSlackChannelSystemEventTarget(channelId);
const channelType = channelInfo?.type; if (!target) {
if (
!ctx.isChannelAllowed({
channelId,
channelName: channelInfo?.name,
channelType,
})
) {
return; return;
} }
const label = resolveSlackChannelLabel({
channelId,
channelName: channelInfo?.name,
});
const messageId = thread.message?.ts ?? thread.event_ts; const messageId = thread.message?.ts ?? thread.event_ts;
const sessionKey = ctx.resolveSlackSystemEventSessionKey({ enqueueSystemEvent(`Slack thread reply broadcast in ${target.label}.`, {
channelId, sessionKey: target.sessionKey,
channelType,
});
enqueueSystemEvent(`Slack thread reply broadcast in ${label}.`, {
sessionKey,
contextKey: `slack:thread:broadcast:${channelId ?? "unknown"}:${messageId ?? "unknown"}`, contextKey: `slack:thread:broadcast:${channelId ?? "unknown"}:${messageId ?? "unknown"}`,
}); });
return; return;