Browse Source

Applying suggested changes to TargetUserType

pull/1491/head
Paulo 5 years ago
parent
commit
1373f73338
3 changed files with 10 additions and 12 deletions
  1. +2
    -0
      src/Discord.Net.Core/Entities/Invites/TargetUserType.cs
  2. +5
    -9
      src/Discord.Net.WebSocket/DiscordSocketClient.cs
  3. +3
    -3
      src/Discord.Net.WebSocket/Entities/Invites/SocketInvite.cs

+ 2
- 0
src/Discord.Net.Core/Entities/Invites/TargetUserType.cs View File

@@ -2,6 +2,8 @@ namespace Discord
{
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>
Stream = 1
}


+ 5
- 9
src/Discord.Net.WebSocket/DiscordSocketClient.cs View File

@@ -1650,16 +1650,12 @@ namespace Discord.WebSocket
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;

var invite = SocketInvite.Create(this, guild, channel, inviter, target, data);


+ 3
- 3
src/Discord.Net.WebSocket/Entities/Invites/SocketInvite.cs View File

@@ -85,9 +85,9 @@ namespace Discord.WebSocket
/// </summary>
public SocketUser TargetUser { get; private set; }
/// <summary>
/// Gets the type of the user targeted by this invite if available.
/// Gets the type of the user targeted by this invite.
/// </summary>
public TargetUserType? TargetUserType { get; private set; }
public TargetUserType TargetUserType { get; private set; }

/// <inheritdoc />
public string Code => Id;
@@ -117,7 +117,7 @@ namespace Discord.WebSocket
MaxUses = model.MaxUses;
Uses = model.Uses;
_createdAtTicks = model.CreatedAt.UtcTicks;
TargetUserType = model.TargetUserType.IsSpecified ? model.TargetUserType.Value : default(TargetUserType?);
TargetUserType = model.TargetUserType.IsSpecified ? model.TargetUserType.Value : TargetUserType.NotDefined;
}

/// <inheritdoc />


Loading…
Cancel
Save