diff --git a/docs/Commands List.md b/docs/Commands List.md
index 37e5085a..a72309e8 100644
--- a/docs/Commands List.md
+++ b/docs/Commands List.md
@@ -448,12 +448,12 @@ Commands and aliases | Description | Usage
----------------|--------------|-------
`.experience` `.xp` | Shows your xp stats. Specify the user to show that user's stats instead. | `.xp`
`.xprolerewards` `.xprrs` | Shows currently set role rewards. | `.xprrs`
-`.xprolereward` `.xprr` | Sets a role reward on a specified level. **Requires ManageRoles server permission.** | `.xprr 3 Social`
+`.xprolereward` `.xprr` | Sets a role reward on a specified level. Provide no role name in order to remove the role reward. **Requires ManageRoles server permission.** | `.xprr 3 Social`
`.xpnotify` `.xpn` | Sets how the bot should notify you when you get a `server` or `global` level. You can set `dm` (for the bot to send a direct message), `channel` (to get notified in the channel you sent the last message in) or `none` to disable. | `.xpn global dm` `.xpn server channel`
-`.xpexclude` `.xpex` | Exclude a user or a role from the xp system, or whole current server. **Requires Administrator server permission.** | `.xpex User @b1nzy` `.xpex Server`
+`.xpexclude` `.xpex` | Exclude a user or a role from the xp system, or whole current server. **Requires Administrator server permission.** | `.xpex Role Excluded-Role` `.xpex Server`
`.xpexclusionlist` `.xpexl` | Shows the roles and channels excluded from the XP system on this server, as well as whether the whole server is excluded. | `.xpexl`
`.xpleaderboard` `.xplb` | Shows current server's xp leaderboard. | `.xplb`
-`.xpgleaderboard` `.xpglb` | Shows current server's xp leaderboard. | `.xpglb`
+`.xpgleaderboard` `.xpglb` | Shows the global xp leaderboard. | `.xpglb`
`.xpadd` | Adds xp to a user on the server. This does not affect their global ranking. You can use negative values. **Requires Administrator server permission.** | `.xpadd 100 @b1nzy`
`.clubcreate` | Creates a club. You must be atleast level 5 and not be in the club already. | `.clubcreate b1nzy's friends`
`.clubicon` | Sets the club icon. | `.clubicon https://i.imgur.com/htfDMfU.png`
diff --git a/src/NadekoBot/Modules/Administration/SelfCommands.cs b/src/NadekoBot/Modules/Administration/SelfCommands.cs
index 9edc1684..622e1b6b 100644
--- a/src/NadekoBot/Modules/Administration/SelfCommands.cs
+++ b/src/NadekoBot/Modules/Administration/SelfCommands.cs
@@ -409,19 +409,6 @@ namespace NadekoBot.Modules.Administration
await ReplyConfirmLocalized("message_sent").ConfigureAwait(false);
}
- [NadekoCommand, Usage, Description, Aliases]
- [OwnerOnly]
- public async Task Announce([Remainder] string message)
- {
- var channels = _client.Guilds.Select(g => g.DefaultChannel).ToArray();
- if (channels == null)
- return;
- await Task.WhenAll(channels.Where(c => c != null).Select(c => c.SendConfirmAsync(GetText("message_from_bo", Context.User.ToString()), message)))
- .ConfigureAwait(false);
-
- await ReplyConfirmLocalized("message_sent").ConfigureAwait(false);
- }
-
[NadekoCommand, Usage, Description, Aliases]
[OwnerOnly]
public async Task ReloadImages()
diff --git a/src/NadekoBot/Modules/Utility/InfoCommands.cs b/src/NadekoBot/Modules/Utility/InfoCommands.cs
index 0eb448f8..95a3f6b1 100644
--- a/src/NadekoBot/Modules/Utility/InfoCommands.cs
+++ b/src/NadekoBot/Modules/Utility/InfoCommands.cs
@@ -31,19 +31,18 @@ namespace NadekoBot.Modules.Utility
{
var channel = (ITextChannel)Context.Channel;
guildName = guildName?.ToUpperInvariant();
- IGuild guild;
+ SocketGuild guild;
if (string.IsNullOrWhiteSpace(guildName))
- guild = channel.Guild;
+ guild = (SocketGuild)channel.Guild;
else
guild = _client.Guilds.FirstOrDefault(g => g.Name.ToUpperInvariant() == guildName.ToUpperInvariant());
if (guild == null)
return;
- var ownername = await guild.GetUserAsync(guild.OwnerId);
- var textchn = (await guild.GetTextChannelsAsync()).Count();
- var voicechn = (await guild.GetVoiceChannelsAsync()).Count();
+ var ownername = guild.GetUser(guild.OwnerId);
+ var textchn = guild.TextChannels.Count();
+ var voicechn = guild.VoiceChannels.Count();
var createdAt = new DateTime(2015, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(guild.Id >> 22);
- var users = await guild.GetUsersAsync().ConfigureAwait(false);
var features = string.Join("\n", guild.Features);
if (string.IsNullOrWhiteSpace(features))
features = "-";
@@ -52,7 +51,7 @@ namespace NadekoBot.Modules.Utility
.WithTitle(guild.Name)
.AddField(fb => fb.WithName(GetText("id")).WithValue(guild.Id.ToString()).WithIsInline(true))
.AddField(fb => fb.WithName(GetText("owner")).WithValue(ownername.ToString()).WithIsInline(true))
- .AddField(fb => fb.WithName(GetText("members")).WithValue(users.Count.ToString()).WithIsInline(true))
+ .AddField(fb => fb.WithName(GetText("members")).WithValue(guild.MemberCount.ToString()).WithIsInline(true))
.AddField(fb => fb.WithName(GetText("text_channels")).WithValue(textchn.ToString()).WithIsInline(true))
.AddField(fb => fb.WithName(GetText("voice_channels")).WithValue(voicechn.ToString()).WithIsInline(true))
.AddField(fb => fb.WithName(GetText("created_at")).WithValue($"{createdAt:dd.MM.yyyy HH:mm}").WithIsInline(true))
diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 60eb05c8..dceae623 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -774,15 +774,6 @@
`{0}donadd Donate Amount`
-
- announce
-
-
- Sends a message to all servers' default channel that bot is connected to.
-
-
- `{0}announce Useless spam`
-
savechat