| @@ -52,6 +52,8 @@ namespace Discord | |||||
| /// The level of requirements. | /// The level of requirements. | ||||
| /// </returns> | /// </returns> | ||||
| VerificationLevel VerificationLevel { get; } | VerificationLevel VerificationLevel { get; } | ||||
| /// <summary> Gets the level of content filtering applied to user's content in a Guild. </summary> | |||||
| ExplicitContentFilterLevel ExplicitContentFilter { get; } | |||||
| /// <summary> | /// <summary> | ||||
| /// Gets the ID of this guild's icon. | /// Gets the ID of this guild's icon. | ||||
| /// </summary> | /// </summary> | ||||
| @@ -133,12 +135,18 @@ namespace Discord | |||||
| /// welcome messages are sent; <c>null</c> if none is set. | /// welcome messages are sent; <c>null</c> if none is set. | ||||
| /// </returns> | /// </returns> | ||||
| ulong? SystemChannelId { get; } | ulong? SystemChannelId { get; } | ||||
| <<<<<<< HEAD | |||||
| /// <summary> | /// <summary> | ||||
| /// Gets the ID of the user that owns this guild. | /// Gets the ID of the user that owns this guild. | ||||
| /// </summary> | /// </summary> | ||||
| /// <returns> | /// <returns> | ||||
| /// A <see cref="ulong"/> representing the snowflake identifier of the user that owns this guild. | /// A <see cref="ulong"/> representing the snowflake identifier of the user that owns this guild. | ||||
| /// </returns> | /// </returns> | ||||
| ======= | |||||
| /// <summary> Gets the application id of the guild creator if it is bot-created. </summary> | |||||
| ulong? ApplicationId { get; } | |||||
| /// <summary> Gets the id of the user that created this guild. </summary> | |||||
| >>>>>>> Implement ApplicationId in Guild model | |||||
| ulong OwnerId { get; } | ulong OwnerId { get; } | ||||
| /// <summary> | /// <summary> | ||||
| /// Gets the ID of the region hosting this guild's voice channels. | /// Gets the ID of the region hosting this guild's voice channels. | ||||
| @@ -41,6 +41,8 @@ namespace Discord.API | |||||
| public string[] Features { get; set; } | public string[] Features { get; set; } | ||||
| [JsonProperty("mfa_level")] | [JsonProperty("mfa_level")] | ||||
| public MfaLevel MfaLevel { get; set; } | public MfaLevel MfaLevel { get; set; } | ||||
| [JsonProperty("application_id")] | |||||
| public ulong? ApplicationId { get; set; } | |||||
| [JsonProperty("system_channel_id")] | [JsonProperty("system_channel_id")] | ||||
| public ulong? SystemChannelId { get; set; } | public ulong? SystemChannelId { get; set; } | ||||
| } | } | ||||
| @@ -49,6 +49,7 @@ namespace Discord.Rest | |||||
| /// <inheritdoc /> | /// <inheritdoc /> | ||||
| public string SplashId { get; private set; } | public string SplashId { get; private set; } | ||||
| internal bool Available { get; private set; } | internal bool Available { get; private set; } | ||||
| public ulong? ApplicationId { get; private set; } | |||||
| /// <inheritdoc /> | /// <inheritdoc /> | ||||
| public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id); | public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id); | ||||
| @@ -99,7 +100,8 @@ namespace Discord.Rest | |||||
| VerificationLevel = model.VerificationLevel; | VerificationLevel = model.VerificationLevel; | ||||
| MfaLevel = model.MfaLevel; | MfaLevel = model.MfaLevel; | ||||
| DefaultMessageNotifications = model.DefaultMessageNotifications; | DefaultMessageNotifications = model.DefaultMessageNotifications; | ||||
| ExplicitContentFilter = model.ExplicitContentFilter; | |||||
| ExplicitContentFilter = model.ExplicitContentFilter; | |||||
| ApplicationId = model.ApplicationId; | |||||
| if (model.Emojis != null) | if (model.Emojis != null) | ||||
| { | { | ||||
| @@ -75,6 +75,7 @@ namespace Discord.WebSocket | |||||
| internal bool IsAvailable { get; private set; } | internal bool IsAvailable { get; private set; } | ||||
| /// <summary> Indicates whether the client is connected to this guild. </summary> | /// <summary> Indicates whether the client is connected to this guild. </summary> | ||||
| public bool IsConnected { get; internal set; } | public bool IsConnected { get; internal set; } | ||||
| public ulong? ApplicationId { get; internal set; } | |||||
| internal ulong? AFKChannelId { get; private set; } | internal ulong? AFKChannelId { get; private set; } | ||||
| internal ulong? EmbedChannelId { get; private set; } | internal ulong? EmbedChannelId { get; private set; } | ||||
| @@ -349,6 +350,7 @@ namespace Discord.WebSocket | |||||
| MfaLevel = model.MfaLevel; | MfaLevel = model.MfaLevel; | ||||
| DefaultMessageNotifications = model.DefaultMessageNotifications; | DefaultMessageNotifications = model.DefaultMessageNotifications; | ||||
| ExplicitContentFilter = model.ExplicitContentFilter; | ExplicitContentFilter = model.ExplicitContentFilter; | ||||
| ApplicationId = model.ApplicationId; | |||||
| if (model.Emojis != null) | if (model.Emojis != null) | ||||
| { | { | ||||