github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fix NRE when getting audit logs (#1256)

Browse Source 
* Fix NullReferenceException when the webhook was deleted

* Fixing doc note

* Better documentation regarding the webhook object

Co-Authored-By: SubZero0 <pnmanjos@hotmail.com>
This commit is contained in:
Paulo
2019-03-16 16:05:00 -03:00
committed by Christopher F
parent 2473619e63
commit 049b014518
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Discord.Net.Rest/Entities/AuditLogs/DataTypes/WebhookCreateAuditLogData.cs
View File

@@ -10,9 +10,10 @@ namespace Discord.Rest
/// </summary> /// </summary>
public class WebhookCreateAuditLogData : IAuditLogData public class WebhookCreateAuditLogData : IAuditLogData
{ {
private WebhookCreateAuditLogData(IWebhook webhook, WebhookType type, string name, ulong channelId) private WebhookCreateAuditLogData(IWebhook webhook, ulong webhookId, WebhookType type, string name, ulong channelId)
{ {
Webhook = webhook; Webhook = webhook;
WebhookId = webhookId;
Name = name; Name = name;
Type = type; Type = type;
ChannelId = channelId; ChannelId = channelId;
@@ -31,23 +32,31 @@ namespace Discord.Rest
var name = nameModel.NewValue.ToObject<string>(discord.ApiClient.Serializer); var name = nameModel.NewValue.ToObject<string>(discord.ApiClient.Serializer);
var webhookInfo = log.Webhooks?.FirstOrDefault(x => x.Id == entry.TargetId); var webhookInfo = log.Webhooks?.FirstOrDefault(x => x.Id == entry.TargetId);
var webhook = RestWebhook.Create(discord, (IGuild)null, webhookInfo); var webhook = webhookInfo == null ? null : RestWebhook.Create(discord, (IGuild)null, webhookInfo);
return new WebhookCreateAuditLogData(webhook, type, name, channelId); return new WebhookCreateAuditLogData(webhook, entry.TargetId.Value, type, name, channelId);
} }
// Doc Note: Corresponds to the *current* data // Doc Note: Corresponds to the *current* data
/// <summary> /// <summary>
/// Gets the webhook that was created. /// Gets the webhook that was created if it still exists.
/// </summary> /// </summary>
/// <returns> /// <returns>
/// A webhook object representing the webhook that was created. /// A webhook object representing the webhook that was created if it still exists, otherwise returns <c>null</c>.
/// </returns> /// </returns>
public IWebhook Webhook { get; } public IWebhook Webhook { get; }
// Doc Note: Corresponds to the *audit log* data // Doc Note: Corresponds to the *audit log* data
/// <summary>
/// Gets the webhook id.
/// </summary>
/// <returns>
/// The webhook identifier.
/// </returns>
public ulong WebhookId { get; }
/// <summary> /// <summary>
/// Gets the type of webhook that was created. /// Gets the type of webhook that was created.
/// </summary> /// </summary>