diff --git a/server/queues/tasks/DeliverWebhookTask.ts b/server/queues/tasks/DeliverWebhookTask.ts index 3a8e257d5..75ec3032f 100644 --- a/server/queues/tasks/DeliverWebhookTask.ts +++ b/server/queues/tasks/DeliverWebhookTask.ts @@ -84,6 +84,8 @@ export default class DeliverWebhookTask extends BaseTask { switch (event.name) { case "api_keys.create": case "api_keys.delete": + case "attachments.create": + case "attachments.delete": // Ignored return; case "users.create": diff --git a/server/routes/api/attachments.ts b/server/routes/api/attachments.ts index c7d086bcc..095b64653 100644 --- a/server/routes/api/attachments.ts +++ b/server/routes/api/attachments.ts @@ -81,7 +81,7 @@ router.post("attachments.create", auth(), async (ctx) => { name, }, teamId: user.teamId, - userId: user.id, + actorId: user.id, ip: ctx.request.ip, }, { transaction } @@ -133,7 +133,7 @@ router.post("attachments.delete", auth(), async (ctx) => { await Event.create({ name: "attachments.delete", teamId: user.teamId, - userId: user.id, + actorId: user.id, ip: ctx.request.ip, }); diff --git a/server/types.ts b/server/types.ts index d3acfe029..c7102b6e9 100644 --- a/server/types.ts +++ b/server/types.ts @@ -23,6 +23,25 @@ export type ApiKeyEvent = BaseEvent & { }; }; +export type AttachmentEvent = BaseEvent & + ( + | { + name: "attachments.create"; + modelId: string; + data: { + name: string; + source: string; + }; + } + | { + name: "attachments.delete"; + modelId: string; + data: { + name: string; + }; + } + ); + export type UserEvent = BaseEvent & ( | { @@ -244,6 +263,7 @@ export type WebhookSubscriptionEvent = BaseEvent & { export type Event = | ApiKeyEvent + | AttachmentEvent | UserEvent | DocumentEvent | PinEvent