Browse Source

Init

pull/2217/head
Armano den Boef 3 years ago
parent
commit
5a6be32b12
2 changed files with 9 additions and 4 deletions
  1. +7
    -3
      src/Discord.Net.WebSocket/DiscordSocketClient.cs
  2. +2
    -1
      src/Discord.Net.WebSocket/Entities/Interaction/SocketInteraction.cs

+ 7
- 3
src/Discord.Net.WebSocket/DiscordSocketClient.cs View File

@@ -2331,7 +2331,7 @@ namespace Discord.WebSocket

SocketUser user = data.User.IsSpecified
? State.GetOrAddUser(data.User.Value.Id, (_) => SocketGlobalUser.Create(this, State, data.User.Value))
: guild.AddOrUpdateUser(data.Member.Value);
: guild?.AddOrUpdateUser(data.Member.Value); // null if the bot scope isn't set, so the guild cannot be retrieved.

SocketChannel channel = null;
if(data.ChannelId.IsSpecified)
@@ -2346,8 +2346,12 @@ namespace Discord.WebSocket
}
else
{
await UnknownChannelAsync(type, data.ChannelId.Value).ConfigureAwait(false);
return;
if (guild != null) // The guild id is set, but the guild cannot be found as the bot scope is not set.
{
await UnknownChannelAsync(type, data.ChannelId.Value).ConfigureAwait(false);
return;
}
// The channel isnt required when responding to an interaction, so we can leave the channel null.
}
}
}


+ 2
- 1
src/Discord.Net.WebSocket/Entities/Interaction/SocketInteraction.cs View File

@@ -19,13 +19,14 @@ namespace Discord.WebSocket
/// Gets the <see cref="ISocketMessageChannel"/> this interaction was used in.
/// </summary>
/// <remarks>
/// If the channel isn't cached or the bot doesn't have access to it then
/// If the channel isn't cached, the bot scope isn't used, or the bot doesn't have access to it then
/// this property will be <see langword="null"/>.
/// </remarks>
public ISocketMessageChannel Channel { get; private set; }

/// <summary>
/// Gets the <see cref="SocketUser"/> who triggered this interaction.
/// This property will be <see langword="null"/> if the bot scope isn't used.
/// </summary>
public SocketUser User { get; private set; }



Loading…
Cancel
Save