@@ -2,6 +2,8 @@ namespace Discord | |||||
{ | { | ||||
public enum TargetUserType | public enum TargetUserType | ||||
{ | { | ||||
/// <summary> The invite target user type is not defined. </summary> | |||||
NotDefined = 0, | |||||
/// <summary> The invite is for a Go Live stream. </summary> | /// <summary> The invite is for a Go Live stream. </summary> | ||||
Stream = 1 | Stream = 1 | ||||
} | } | ||||
@@ -1650,16 +1650,12 @@ namespace Discord.WebSocket | |||||
return; | return; | ||||
} | } | ||||
SocketGuildUser inviter = null; | |||||
if (data.Inviter.IsSpecified) | |||||
{ | |||||
inviter = guild.GetUser(data.Inviter.Value.Id); | |||||
if (inviter == null) | |||||
inviter = guild.AddOrUpdateUser(data.Inviter.Value); | |||||
} | |||||
SocketGuildUser inviter = data.Inviter.IsSpecified | |||||
? (guild.GetUser(data.Inviter.Value.Id) ?? guild.AddOrUpdateUser(data.Inviter.Value)) | |||||
: null; | |||||
SocketUser target = data.TargetUser.IsSpecified | |||||
? (guild.GetUser(data.TargetUser.Value.Id) ?? SocketUnknownUser.Create(this, State, data.TargetUser.Value)) | |||||
SocketUser target = data.TargetUser.IsSpecified | |||||
? (guild.GetUser(data.TargetUser.Value.Id) ?? (SocketUser)SocketUnknownUser.Create(this, State, data.TargetUser.Value)) | |||||
: null; | : null; | ||||
var invite = SocketInvite.Create(this, guild, channel, inviter, target, data); | var invite = SocketInvite.Create(this, guild, channel, inviter, target, data); | ||||
@@ -85,9 +85,9 @@ namespace Discord.WebSocket | |||||
/// </summary> | /// </summary> | ||||
public SocketUser TargetUser { get; private set; } | public SocketUser TargetUser { get; private set; } | ||||
/// <summary> | /// <summary> | ||||
/// Gets the type of the user targeted by this invite if available. | |||||
/// Gets the type of the user targeted by this invite. | |||||
/// </summary> | /// </summary> | ||||
public TargetUserType? TargetUserType { get; private set; } | |||||
public TargetUserType TargetUserType { get; private set; } | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public string Code => Id; | public string Code => Id; | ||||
@@ -117,7 +117,7 @@ namespace Discord.WebSocket | |||||
MaxUses = model.MaxUses; | MaxUses = model.MaxUses; | ||||
Uses = model.Uses; | Uses = model.Uses; | ||||
_createdAtTicks = model.CreatedAt.UtcTicks; | _createdAtTicks = model.CreatedAt.UtcTicks; | ||||
TargetUserType = model.TargetUserType.IsSpecified ? model.TargetUserType.Value : default(TargetUserType?); | |||||
TargetUserType = model.TargetUserType.IsSpecified ? model.TargetUserType.Value : TargetUserType.NotDefined; | |||||
} | } | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||