diff --git a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
index 5f6693926..634447f52 100644
--- a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
+++ b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
@@ -235,7 +235,7 @@ namespace Discord.Rest
=> GuildHelper.DeleteAsync(this, Discord, options);
///
- /// is null.
+ /// is .
public async Task ModifyAsync(Action func, RequestOptions options = null)
{
var model = await GuildHelper.ModifyAsync(this, Discord, func, options).ConfigureAwait(false);
@@ -243,7 +243,7 @@ namespace Discord.Rest
}
///
- /// is null.
+ /// is .
[Obsolete("This endpoint is deprecated, use ModifyWidgetAsync instead.")]
public async Task ModifyEmbedAsync(Action func, RequestOptions options = null)
{
@@ -252,7 +252,7 @@ namespace Discord.Rest
}
///
- /// is null.
+ /// is .
public async Task ModifyWidgetAsync(Action func, RequestOptions options = null)
{
var model = await GuildHelper.ModifyWidgetAsync(this, Discord, func, options).ConfigureAwait(false);
@@ -260,7 +260,7 @@ namespace Discord.Rest
}
///
- /// is null.
+ /// is .
public async Task ReorderChannelsAsync(IEnumerable args, RequestOptions options = null)
{
var arr = args.ToArray();
@@ -301,7 +301,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains a ban object, which
- /// contains the user information and the reason for the ban; null if the ban entry cannot be found.
+ /// contains the user information and the reason for the ban; if the ban entry cannot be found.
///
public Task GetBanAsync(IUser user, RequestOptions options = null)
=> GuildHelper.GetBanAsync(this, Discord, user.Id, options);
@@ -312,7 +312,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains a ban object, which
- /// contains the user information and the reason for the ban; null if the ban entry cannot be found.
+ /// contains the user information and the reason for the ban; if the ban entry cannot be found.
///
public Task GetBanAsync(ulong userId, RequestOptions options = null)
=> GuildHelper.GetBanAsync(this, Discord, userId, options);
@@ -350,7 +350,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the generic channel
- /// associated with the specified ; null if none is found.
+ /// associated with the specified ; if none is found.
///
public Task GetChannelAsync(ulong id, RequestOptions options = null)
=> GuildHelper.GetChannelAsync(this, Discord, id, options);
@@ -362,7 +362,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the text channel
- /// associated with the specified ; null if none is found.
+ /// associated with the specified ; if none is found.
///
public async Task GetTextChannelAsync(ulong id, RequestOptions options = null)
{
@@ -391,7 +391,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the voice channel associated
- /// with the specified ; null if none is found.
+ /// with the specified ; if none is found.
///
public async Task GetVoiceChannelAsync(ulong id, RequestOptions options = null)
{
@@ -433,7 +433,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the voice channel that the
- /// AFK users will be moved to after they have idled for too long; null if none is set.
+ /// AFK users will be moved to after they have idled for too long; if none is set.
///
public async Task GetAFKChannelAsync(RequestOptions options = null)
{
@@ -452,7 +452,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the first viewable text
- /// channel in this guild; null if none is found.
+ /// channel in this guild; if none is found.
///
public async Task GetDefaultChannelAsync(RequestOptions options = null)
{
@@ -470,7 +470,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the embed channel set
- /// within the server's widget settings; null if none is set.
+ /// within the server's widget settings; if none is set.
///
[Obsolete("This endpoint is deprecated, use GetWidgetChannelAsync instead.")]
public async Task GetEmbedChannelAsync(RequestOptions options = null)
@@ -487,7 +487,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the widget channel set
- /// within the server's widget settings; null if none is set.
+ /// within the server's widget settings; if none is set.
///
public async Task GetWidgetChannelAsync(RequestOptions options = null)
{
@@ -503,7 +503,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the text channel
- /// where guild notices such as welcome messages and boost events are poste; null if none is found.
+ /// where guild notices such as welcome messages and boost events are poste; if none is found.
///
public async Task GetSystemChannelAsync(RequestOptions options = null)
{
@@ -517,12 +517,12 @@ namespace Discord.Rest
}
///
- /// Gets the text channel where guilds with the "PUBLIC" feature can display rules and/or guidelines.
+ /// Gets the text channel where Community guilds can display rules and/or guidelines.
///
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the text channel
- /// where guilds with the "PUBLIC" feature can display rules and/or guidelines; null if none is set.
+ /// where Community guilds can display rules and/or guidelines; if none is set.
///
public async Task GetRulesChannelAsync(RequestOptions options = null)
{
@@ -536,12 +536,12 @@ namespace Discord.Rest
}
///
- /// Gets the text channel channel where admins and moderators of guilds with the "PUBLIC" feature receive notices from Discord.
+ /// Gets the text channel channel where admins and moderators of Community guilds receive notices from Discord.
///
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the text channel channel where
- /// admins and moderators of guilds with the "PUBLIC" feature receive notices from Discord; null if none is set.
+ /// admins and moderators of Community guilds receive notices from Discord; if none is set.
///
public async Task GetPublicUpdatesChannelAsync(RequestOptions options = null)
{
@@ -585,7 +585,7 @@ namespace Discord.Rest
/// The name of the new channel.
/// The delegate containing the properties to be applied to the channel upon its creation.
/// The options to be used when sending the request.
- /// is null.
+ /// is .
///
/// The created voice channel.
///
@@ -597,7 +597,7 @@ namespace Discord.Rest
/// The name of the new channel.
/// The delegate containing the properties to be applied to the channel upon its creation.
/// The options to be used when sending the request.
- /// is null.
+ /// is .
///
/// The created category channel.
///
@@ -648,7 +648,7 @@ namespace Discord.Rest
///
/// The snowflake identifier for the role.
///
- /// A role that is associated with the specified ; null if none is found.
+ /// A role that is associated with the specified ; if none is found.
///
public RestRole GetRole(ulong id)
{
@@ -712,7 +712,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the guild user
- /// associated with the specified ; null if none is found.
+ /// associated with the specified ; if none is found.
///
public Task GetUserAsync(ulong id, RequestOptions options = null)
=> GuildHelper.GetUserAsync(this, Discord, id, options);
@@ -802,7 +802,7 @@ namespace Discord.Rest
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the webhook with the
- /// specified ; null if none is found.
+ /// specified ; if none is found.
///
public Task GetWebhookAsync(ulong id, RequestOptions options = null)
=> GuildHelper.GetWebhookAsync(this, Discord, id, options);
@@ -835,7 +835,7 @@ namespace Discord.Rest
public Task CreateEmoteAsync(string name, Image image, Optional> roles = default(Optional>), RequestOptions options = null)
=> GuildHelper.CreateEmoteAsync(this, Discord, name, image, roles, options);
///
- /// is null.
+ /// is .
public Task ModifyEmoteAsync(GuildEmote emote, Action func, RequestOptions options = null)
=> GuildHelper.ModifyEmoteAsync(this, Discord, emote.Id, func, options);
///
diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
index 5e2dedbcf..14980107b 100644
--- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
+++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
@@ -167,7 +167,7 @@ namespace Discord.WebSocket
///
///
/// A that the AFK users will be moved to after they have idled for too
- /// long; null if none is set.
+ /// long; if none is set.
///
public SocketVoiceChannel AFKChannel
{
@@ -181,7 +181,7 @@ namespace Discord.WebSocket
/// Gets the embed channel (i.e. the channel set in the guild's widget settings) in this guild.
///
///
- /// A channel set within the server's widget settings; null if none is set.
+ /// A channel set within the server's widget settings; if none is set.
///
[Obsolete("This property is deprecated, use WidgetChannel instead.")]
public SocketGuildChannel EmbedChannel
@@ -196,7 +196,7 @@ namespace Discord.WebSocket
/// Gets the widget channel (i.e. the channel set in the guild's widget settings) in this guild.
///
///
- /// A channel set within the server's widget settings; null if none is set.
+ /// A channel set within the server's widget settings; if none is set.
///
public SocketGuildChannel WidgetChannel
{
@@ -210,7 +210,7 @@ namespace Discord.WebSocket
/// Gets the system channel where randomized welcome messages are sent in this guild.
///
///
- /// A text channel where randomized welcome messages will be sent to; null if none is set.
+ /// A text channel where randomized welcome messages will be sent to; if none is set.
///
public SocketTextChannel SystemChannel
{
@@ -224,7 +224,7 @@ namespace Discord.WebSocket
/// Gets the channel with the guild rules.
///
///
- /// A text channel with the guild rules; null if none is set.
+ /// A text channel with the guild rules; if none is set.
///
public SocketTextChannel RulesChannel
{
@@ -235,12 +235,12 @@ namespace Discord.WebSocket
}
}
///
- /// Gets the channel where admins and moderators of guilds with the "PUBLIC"
- /// feature receive notices from Discord.
+ /// Gets the channel where admins and moderators of Community guilds receive
+ /// notices from Discord.
///
///
- /// A text channel where admins and moderators of guilds with the "PUBLIC"
- /// feature receive notices from Discord; null if none is set.
+ /// A text channel where admins and moderators of Community guilds receive
+ /// notices from Discord; if none is set.
///
public SocketTextChannel PublicUpdatesChannel
{
@@ -523,17 +523,17 @@ namespace Discord.WebSocket
=> GuildHelper.DeleteAsync(this, Discord, options);
///
- /// is null.
+ /// is .
public Task ModifyAsync(Action func, RequestOptions options = null)
=> GuildHelper.ModifyAsync(this, Discord, func, options);
///
- /// is null.
+ /// is .
[Obsolete("This endpoint is deprecated, use ModifyWidgetAsync instead.")]
public Task ModifyEmbedAsync(Action func, RequestOptions options = null)
=> GuildHelper.ModifyEmbedAsync(this, Discord, func, options);
///
- /// is null.
+ /// is .
public Task ModifyWidgetAsync(Action func, RequestOptions options = null)
=> GuildHelper.ModifyWidgetAsync(this, Discord, func, options);
///
@@ -566,7 +566,7 @@ namespace Discord.WebSocket
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains a ban object, which
- /// contains the user information and the reason for the ban; null if the ban entry cannot be found.
+ /// contains the user information and the reason for the ban; if the ban entry cannot be found.
///
public Task GetBanAsync(IUser user, RequestOptions options = null)
=> GuildHelper.GetBanAsync(this, Discord, user.Id, options);
@@ -577,7 +577,7 @@ namespace Discord.WebSocket
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains a ban object, which
- /// contains the user information and the reason for the ban; null if the ban entry cannot be found.
+ /// contains the user information and the reason for the ban; if the ban entry cannot be found.
///
public Task GetBanAsync(ulong userId, RequestOptions options = null)
=> GuildHelper.GetBanAsync(this, Discord, userId, options);
@@ -602,7 +602,7 @@ namespace Discord.WebSocket
///
/// The snowflake identifier for the channel.
///
- /// A generic channel associated with the specified ; null if none is found.
+ /// A generic channel associated with the specified ; if none is found.
///
public SocketGuildChannel GetChannel(ulong id)
{
@@ -616,7 +616,7 @@ namespace Discord.WebSocket
///
/// The snowflake identifier for the text channel.
///
- /// A text channel associated with the specified ; null if none is found.
+ /// A text channel associated with the specified ; if none is found.
///
public SocketTextChannel GetTextChannel(ulong id)
=> GetChannel(id) as SocketTextChannel;
@@ -625,7 +625,7 @@ namespace Discord.WebSocket
///
/// The snowflake identifier for the voice channel.
///
- /// A voice channel associated with the specified ; null if none is found.
+ /// A voice channel associated with the specified ; if none is found.
///
public SocketVoiceChannel GetVoiceChannel(ulong id)
=> GetChannel(id) as SocketVoiceChannel;
@@ -634,7 +634,7 @@ namespace Discord.WebSocket
///
/// The snowflake identifier for the category channel.
///
- /// A category channel associated with the specified ; null if none is found.
+ /// A category channel associated with the specified ; if none is found.
///
public SocketCategoryChannel GetCategoryChannel(ulong id)
=> GetChannel(id) as SocketCategoryChannel;
@@ -670,7 +670,7 @@ namespace Discord.WebSocket
/// The new name for the voice channel.
/// The delegate containing the properties to be applied to the channel upon its creation.
/// The options to be used when sending the request.
- /// is null.
+ /// is .
///
/// A task that represents the asynchronous creation operation. The task result contains the newly created
/// voice channel.
@@ -683,7 +683,7 @@ namespace Discord.WebSocket
/// The new name for the category.
/// The delegate containing the properties to be applied to the channel upon its creation.
/// The options to be used when sending the request.
- /// is null.
+ /// is .
///
/// A task that represents the asynchronous creation operation. The task result contains the newly created
/// category channel.
@@ -747,7 +747,7 @@ namespace Discord.WebSocket
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the partial metadata of
- /// the vanity invite found within this guild; null if none is found.
+ /// the vanity invite found within this guild; if none is found.
///
public Task GetVanityInviteAsync(RequestOptions options = null)
=> GuildHelper.GetVanityInviteAsync(this, Discord, options);
@@ -758,7 +758,7 @@ namespace Discord.WebSocket
///
/// The snowflake identifier for the role.
///
- /// A role that is associated with the specified ; null if none is found.
+ /// A role that is associated with the specified ; if none is found.
///
public SocketRole GetRole(ulong id)
{
@@ -780,7 +780,7 @@ namespace Discord.WebSocket
/// Whether the role is separated from others on the sidebar.
/// Whether the role can be mentioned.
/// The options to be used when sending the request.
- /// is null.
+ /// is .
///
/// A task that represents the asynchronous creation operation. The task result contains the newly created
/// role.
@@ -812,13 +812,13 @@ namespace Discord.WebSocket
///
/// This method retrieves a user found within this guild.
///
- /// This may return null in the WebSocket implementation due to incomplete user collection in
+ /// This may return in the WebSocket implementation due to incomplete user collection in
/// large guilds.
///
///
/// The snowflake identifier of the user.
///
- /// A guild user associated with the specified ; null if none is found.
+ /// A guild user associated with the specified ; if none is found.
///
public SocketGuildUser GetUser(ulong id)
{
@@ -972,7 +972,7 @@ namespace Discord.WebSocket
/// The options to be used when sending the request.
///
/// A task that represents the asynchronous get operation. The task result contains the webhook with the
- /// specified ; null if none is found.
+ /// specified ; if none is found.
///
public Task GetWebhookAsync(ulong id, RequestOptions options = null)
=> GuildHelper.GetWebhookAsync(this, Discord, id, options);
@@ -995,7 +995,7 @@ namespace Discord.WebSocket
public Task CreateEmoteAsync(string name, Image image, Optional> roles = default(Optional>), RequestOptions options = null)
=> GuildHelper.CreateEmoteAsync(this, Discord, name, image, roles, options);
///
- /// is null.
+ /// is .
public Task ModifyEmoteAsync(GuildEmote emote, Action func, RequestOptions options = null)
=> GuildHelper.ModifyEmoteAsync(this, Discord, emote.Id, func, options);
///