diff --git a/src/Discord.Net.Core/Entities/Guilds/IGuild.cs b/src/Discord.Net.Core/Entities/Guilds/IGuild.cs index d64297a1e..bce43974b 100644 --- a/src/Discord.Net.Core/Entities/Guilds/IGuild.cs +++ b/src/Discord.Net.Core/Entities/Guilds/IGuild.cs @@ -20,7 +20,7 @@ namespace Discord /// Gets the level of requirements a user must fulfill before being allowed to post messages in this guild. VerificationLevel VerificationLevel { get; } /// Gets the level of content filtering applied to user's content in a Guild. - ExplicitContentFilterLevel ExplicitContentFilterLevel { get; } + ExplicitContentFilterLevel ExplicitContentFilter { get; } /// Returns the id of this guild's icon, or null if one is not set. string IconId { get; } /// Returns the url to this guild's icon, or null if one is not set. @@ -40,6 +40,8 @@ namespace Discord ulong? EmbedChannelId { get; } /// Gets the id of the channel where randomized welcome messages are sent, or null if not. ulong? SystemChannelId { get; } + /// Gets the application id of the guild creator if it is bot-created. + ulong? ApplicationId { get; } /// Gets the id of the user that created this guild. ulong OwnerId { get; } /// Gets the id of the region hosting this guild's voice channels. diff --git a/src/Discord.Net.Rest/API/Common/Guild.cs b/src/Discord.Net.Rest/API/Common/Guild.cs index be45ac3fa..a84b55a93 100644 --- a/src/Discord.Net.Rest/API/Common/Guild.cs +++ b/src/Discord.Net.Rest/API/Common/Guild.cs @@ -41,6 +41,8 @@ namespace Discord.API public string[] Features { get; set; } [JsonProperty("mfa_level")] public MfaLevel MfaLevel { get; set; } + [JsonProperty("application_id")] + public ulong? ApplicationId { get; set; } [JsonProperty("system_channel_id")] public ulong? SystemChannelId { get; set; } } diff --git a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs index 8ad1785f1..f3a57899c 100644 --- a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs +++ b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs @@ -33,6 +33,7 @@ namespace Discord.Rest public string IconId { get; private set; } public string SplashId { get; private set; } internal bool Available { get; private set; } + public ulong? ApplicationId { get; private set; } public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id); @@ -71,7 +72,8 @@ namespace Discord.Rest VerificationLevel = model.VerificationLevel; MfaLevel = model.MfaLevel; DefaultMessageNotifications = model.DefaultMessageNotifications; - ExplicitContentFilter = model.ExplicitContentFilter; + ExplicitContentFilter = model.ExplicitContentFilter; + ApplicationId = model.ApplicationId; if (model.Emojis != null) { diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs index 68da8c46e..cf4124ccb 100644 --- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs +++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs @@ -45,6 +45,7 @@ namespace Discord.WebSocket public int DownloadedMemberCount { get; private set; } internal bool IsAvailable { get; private set; } public bool IsConnected { get; internal set; } + public ulong? ApplicationId { get; internal set; } internal ulong? AFKChannelId { get; private set; } internal ulong? EmbedChannelId { get; private set; } @@ -212,6 +213,7 @@ namespace Discord.WebSocket MfaLevel = model.MfaLevel; DefaultMessageNotifications = model.DefaultMessageNotifications; ExplicitContentFilter = model.ExplicitContentFilter; + ApplicationId = model.ApplicationId; if (model.Emojis != null) {