Skip to content
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

Jump to bottom

feat(GuildAuditLogsEntry): expose extra integrationType in relevant log types #9796

Merged
merged 7 commits into from
Sep 17, 2023
Merged

feat(GuildAuditLogsEntry): expose extra integrationType in relevant log types #9796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8d9b12
feat(GuildAuditLogsEntry): expose ingrationType
almostSouji Aug 22, 2023
bc74696
fix: not optional, if extra is present on these types
almostSouji Aug 22, 2023
ea0cc57
fix: remove non-extra approach
almostSouji Aug 22, 2023
c98e3cf
fix(types): string is not guaranteed to be the known enum
almostSouji Aug 24, 2023
5a39e03
fix: adapt type tests to new extra properties
almostSouji Aug 26, 2023
29ffc3a
fix: include null in type, since extra is not always populated
almostSouji Aug 26, 2023
9b0c4e5
Merge branch 'main' into feat/auditlogentry-integrationtype
Jiralite Sep 17, 2023
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
10 changes: 10 additions & 0 deletions packages/discord.js/src/structures/GuildAuditLogsEntry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,16 @@ class GuildAuditLogsEntry {
};
break;

case AuditLogEvent.MemberKick:
case AuditLogEvent.MemberRoleUpdate: {
if (data.integration_type) {
this.extra = {
integrationType: data.integration_type,
};
}
break;
}

default:
break;
}
Expand Down
2 changes: 2 additions & 0 deletions packages/discord.js/typings/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5414,6 +5414,8 @@ interface GuildAuditLogsTypes {
export type GuildAuditLogsActionType = GuildAuditLogsTypes[keyof GuildAuditLogsTypes][1] | 'All';

export interface GuildAuditLogsEntryExtraField {
[AuditLogEvent.MemberKick]: { integrationType: string } | null;
[AuditLogEvent.MemberRoleUpdate]: { integrationType: string } | null;
[AuditLogEvent.MemberPrune]: { removed: number; days: number };
[AuditLogEvent.MemberMove]: { channel: VoiceBasedChannel | { id: Snowflake }; count: number };
[AuditLogEvent.MessageDelete]: { channel: GuildTextBasedChannel | { id: Snowflake }; count: number };
Expand Down
7 changes: 6 additions & 1 deletion packages/discord.js/typings/index.test-d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2074,9 +2074,14 @@ expectType<Promise<GuildAuditLogsEntry<null, GuildAuditLogsActionType, GuildAudi
guild.fetchAuditLogs().then(al => al.entries.first()),
);

expectType<Promise<null | undefined>>(
expectType<Promise<{ integrationType: string } | null | undefined>>(
guild.fetchAuditLogs({ type: AuditLogEvent.MemberKick }).then(al => al.entries.first()?.extra),
);

expectType<Promise<{ integrationType: string } | null | undefined>>(
guild.fetchAuditLogs({ type: AuditLogEvent.MemberRoleUpdate }).then(al => al.entries.first()?.extra),
);

expectType<Promise<StageChannel | { id: Snowflake } | undefined>>(
guild.fetchAuditLogs({ type: AuditLogEvent.StageInstanceCreate }).then(al => al.entries.first()?.extra),
);
Expand Down