Skip to content

fix: correct nullable annotations in AuditLogAbstractions.cs #2297

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

Merged
akiraveliara merged 1 commit into from
Apr 23, 2025
Merged

fix: correct nullable annotations in AuditLogAbstractions.cs #2297

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
18 changes: 9 additions & 9 deletions DSharpPlus/Entities/AuditLogs/AuditLogParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ internal static async Task<DiscordAuditLogEntry?> ParseAuditLogEntryAsync
case DiscordAuditLogActionType.Prune:
entry = new DiscordAuditLogPruneEntry
{
Days = auditLogAction.Options.DeleteMemberDays,
Toll = auditLogAction.Options.MembersRemoved
Days = auditLogAction.Options!.DeleteMemberDays,
Toll = auditLogAction.Options!.MembersRemoved
};
break;

Expand Down Expand Up @@ -281,10 +281,10 @@ internal static async Task<DiscordAuditLogEntry?> ParseAuditLogEntryAsync

if (messageEntry.Channel is not null)
{
guild.Discord.UserCache.TryGetValue(auditLogAction.UserId, out DiscordUser? user);
guild.Discord.UserCache.TryGetValue(auditLogAction.UserId.Value, out DiscordUser? user);
messageEntry.Target = user ?? new DiscordUser
{
Id = auditLogAction.UserId,
Id = auditLogAction.UserId.Value,
Discord = guild.Discord
};
}
Expand Down Expand Up @@ -451,10 +451,10 @@ internal static async Task<DiscordAuditLogEntry?> ParseAuditLogEntryAsync
};
}

autoModerationEntry.ResponsibleRule = auditLogAction.Options.RoleName;
autoModerationEntry.ResponsibleRule = auditLogAction.Options!.AutoModerationRuleName;
autoModerationEntry.Channel = guild.GetChannel(auditLogAction.Options.ChannelId);
autoModerationEntry.RuleTriggerType =
(DiscordRuleTriggerType)int.Parse(auditLogAction.Options.AutoModerationRuleTriggerType);
(DiscordRuleTriggerType)int.Parse(auditLogAction.Options!.AutoModerationRuleTriggerType);
break;

case DiscordAuditLogActionType.AutoModerationRuleCreate:
Expand Down Expand Up @@ -507,11 +507,11 @@ or DiscordAuditLogActionType.StickerUpdate
entry.Reason = auditLogAction.Reason;
entry.Discord = guild.Discord;

entry.UserResponsible = members.TryGetValue(auditLogAction.UserId, out DiscordMember? member)
entry.UserResponsible = members.TryGetValue(auditLogAction.UserId!.Value, out DiscordMember? member)
? member
: guild.Discord.UserCache.TryGetValue(auditLogAction.UserId, out DiscordUser? discordUser)
: guild.Discord.UserCache.TryGetValue(auditLogAction.UserId!.Value, out DiscordUser? discordUser)
? discordUser
: new DiscordUser { Id = auditLogAction.UserId, Discord = guild.Discord };
: new DiscordUser { Id = auditLogAction.UserId!.Value, Discord = guild.Discord };

return entry;
}
Expand Down
7 changes: 6 additions & 1 deletion DSharpPlus/Entities/AuditLogs/Entries/DiscordAuditLogAutoModerationExecutedEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,10 @@ public sealed class DiscordAuditLogAutoModerationExecutedEntry : DiscordAuditLog
/// <summary>
/// Channel where the rule was executed
/// </summary>
public DiscordChannel Channel { get; internal set; } = default!;
public DiscordChannel? Channel { get; internal set; }

/// <summary>
/// Id of the channel where the rule was executed
/// </summary>
public ulong ChannelId { get; internal set; }
}
8 changes: 4 additions & 4 deletions DSharpPlus/Net/Abstractions/AuditLogAbstractions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ internal sealed class AuditLogAction
public ulong? TargetId { get; set; }

[JsonProperty("user_id")]
public ulong UserId { get; set; }
public ulong? UserId { get; set; }

[JsonProperty("id")]
public ulong Id { get; set; }
Expand All @@ -113,13 +113,13 @@ internal sealed class AuditLogAction
public DiscordAuditLogActionType ActionType { get; set; }

[JsonProperty("changes")]
public IEnumerable<AuditLogActionChange> Changes { get; set; }
public IEnumerable<AuditLogActionChange>? Changes { get; set; }

[JsonProperty("options")]
public AuditLogActionOptions Options { get; set; }
public AuditLogActionOptions? Options { get; set; }

[JsonProperty("reason")]
public string Reason { get; set; }
public string? Reason { get; set; }
}

internal sealed class AuditLog
Expand Down
Loading