Skip to content

fix(hooks): pass mediaUrl/mediaUrls to plugin message_received event metadata #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WarrenJones wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(hooks): pass mediaUrl/mediaUrls to plugin message_received event metadata #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/hooks/message-hook-mappers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ function makeInboundCtx(overrides: Partial<FinalizedMsgContext> = {}): Finalized
MessageThreadId: 42,
MediaPath: "/tmp/audio.ogg",
MediaType: "audio/ogg",
MediaUrl: "https://cdn.example.com/audio.ogg",
GroupSubject: "ops",
GroupChannel: "ops-room",
GroupSpace: "guild-1",
Expand Down Expand Up @@ -112,20 +113,41 @@ describe("message hook mappers", () => {
MediaType: undefined,
MediaPaths: ["/tmp/tree.jpg", "/tmp/ramp.jpg"],
MediaTypes: ["image/jpeg", "image/jpeg"],
MediaUrl: "https://cdn.example.com/tree.jpg",
MediaUrls: ["https://cdn.example.com/tree.jpg", "https://cdn.example.com/ramp.jpg"],
}),
);

expect(canonical.mediaPath).toBe("/tmp/tree.jpg");
expect(canonical.mediaType).toBe("image/jpeg");
expect(canonical.mediaPaths).toEqual(["/tmp/tree.jpg", "/tmp/ramp.jpg"]);
expect(canonical.mediaTypes).toEqual(["image/jpeg", "image/jpeg"]);
expect(canonical.mediaUrl).toBe("https://cdn.example.com/tree.jpg");
expect(canonical.mediaUrls).toEqual([
"https://cdn.example.com/tree.jpg",
"https://cdn.example.com/ramp.jpg",
]);
expect(toPluginInboundClaimEvent(canonical)).toEqual(
expect.objectContaining({
metadata: expect.objectContaining({
mediaPath: "/tmp/tree.jpg",
mediaType: "image/jpeg",
mediaPaths: ["/tmp/tree.jpg", "/tmp/ramp.jpg"],
mediaTypes: ["image/jpeg", "image/jpeg"],
mediaUrl: "https://cdn.example.com/tree.jpg",
mediaUrls: ["https://cdn.example.com/tree.jpg", "https://cdn.example.com/ramp.jpg"],
}),
}),
);
expect(toPluginMessageReceivedEvent(canonical)).toEqual(
expect.objectContaining({
metadata: expect.objectContaining({
mediaPath: "/tmp/tree.jpg",
mediaType: "image/jpeg",
mediaPaths: ["/tmp/tree.jpg", "/tmp/ramp.jpg"],
mediaTypes: ["image/jpeg", "image/jpeg"],
mediaUrl: "https://cdn.example.com/tree.jpg",
mediaUrls: ["https://cdn.example.com/tree.jpg", "https://cdn.example.com/ramp.jpg"],
}),
}),
);
Expand Down
18 changes: 18 additions & 0 deletions src/hooks/message-hook-mappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export type CanonicalInboundMessageHookContext = {
mediaType?: string;
mediaPaths?: string[];
mediaTypes?: string[];
mediaUrl?: string;
mediaUrls?: string[];
originatingChannel?: string;
originatingTo?: string;
guildId?: string;
Expand Down Expand Up @@ -94,6 +96,12 @@ export function deriveInboundMessageHookContext(
(value): value is string => typeof value === "string" && value.length > 0,
)
: undefined;
const mediaUrl = ctx.MediaUrl;
const mediaUrls = Array.isArray(ctx.MediaUrls)
? ctx.MediaUrls.filter(
(value): value is string => typeof value === "string" && value.length > 0,
)
: undefined;
return {
from: ctx.From ?? "",
to: ctx.To,
Expand Down Expand Up @@ -125,6 +133,8 @@ export function deriveInboundMessageHookContext(
mediaType: ctx.MediaType ?? mediaTypes?.[0],
mediaPaths,
mediaTypes,
mediaUrl,
mediaUrls,
originatingChannel: ctx.OriginatingChannel,
originatingTo: ctx.OriginatingTo,
guildId: ctx.GroupSpace,
Expand Down Expand Up @@ -263,6 +273,8 @@ export function toPluginInboundClaimEvent(
mediaType: canonical.mediaType,
mediaPaths: canonical.mediaPaths,
mediaTypes: canonical.mediaTypes,
mediaUrl: canonical.mediaUrl,
mediaUrls: canonical.mediaUrls,
guildId: canonical.guildId,
channelName: canonical.channelName,
groupId: canonical.groupId,
Expand All @@ -289,6 +301,12 @@ export function toPluginMessageReceivedEvent(
senderName: canonical.senderName,
senderUsername: canonical.senderUsername,
senderE164: canonical.senderE164,
mediaPath: canonical.mediaPath,
mediaType: canonical.mediaType,
mediaPaths: canonical.mediaPaths,
mediaTypes: canonical.mediaTypes,
mediaUrl: canonical.mediaUrl,
mediaUrls: canonical.mediaUrls,
guildId: canonical.guildId,
channelName: canonical.channelName,
},
Expand Down