mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed some commands names to avoid conflicts

Browse Source
This commit is contained in:
Master Kwoth
2017-06-02 03:44:59 +02:00
parent 25a977545c
commit 524452e72e
10 changed files with 90 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs
View File

@@ -117,7 +117,7 @@ namespace NadekoBot.Modules.ClashOfClans
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public async Task Claim(int number, int baseNumber, [Remainder] string other_name = null)
public async Task BaseCall(int number, int baseNumber, [Remainder] string other_name = null)
{
var warsInfo = _service.GetWarInfo(Context.Guild, number);
if (warsInfo == null || warsInfo.Item1.Count == 0)
@@ -144,21 +144,21 @@ namespace NadekoBot.Modules.ClashOfClans
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public async Task ClaimFinish1(int number, int baseNumber = 0)
public async Task CallFinish1(int number, int baseNumber = 0)
{
await FinishClaim(number, baseNumber - 1, 1);
}
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public async Task ClaimFinish2(int number, int baseNumber = 0)
public async Task CallFinish2(int number, int baseNumber = 0)
{
await FinishClaim(number, baseNumber - 1, 2);
}
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public async Task ClaimFinish(int number, int baseNumber = 0)
public async Task CallFinish(int number, int baseNumber = 0)
{
await FinishClaim(number, baseNumber - 1);
}

2
src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs
View File

@@ -60,7 +60,7 @@ namespace NadekoBot.Modules.Gambling
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public async Task ShuffleDeck()
public async Task DeckShuffle()
{
//var channel = (ITextChannel)Context.Channel;

4
src/NadekoBot/Modules/Music/Music.cs
View File

@@ -493,7 +493,7 @@ namespace NadekoBot.Modules.Music
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
[Priority(0)]
public Task Remove(int num)
public Task SongRemove(int num)
{
MusicPlayer musicPlayer;
if ((musicPlayer = _music.GetPlayer(Context.Guild.Id)) == null)
@@ -508,7 +508,7 @@ namespace NadekoBot.Modules.Music
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
[Priority(1)]
public async Task Remove(string all)
public async Task SongRemove(string all)
{
if (all.Trim().ToUpperInvariant() != "ALL")
return;

1
src/NadekoBot/Modules/Searches/Searches.cs
View File

@@ -667,7 +667,6 @@ namespace NadekoBot.Modules.Searches
await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor()
.AddField(efb => efb.WithName("Username").WithValue(usr.ToString()).WithIsInline(false))
.AddField(efb => efb.WithName("Avatar Url").WithValue(shortenedAvatarUrl).WithIsInline(false))
//.AddField(efb => efb.WithName("Avatar Id").WithValue(usr.AvatarId).WithIsInline(false))
.WithThumbnailUrl(avatarUrl), Context.User.Mention).ConfigureAwait(false);
}

2
src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs
View File

@@ -86,7 +86,7 @@ namespace NadekoBot.Modules.Utility
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public async Task SearchQuote(string keyword, [Remainder] string text)
public async Task QuoteSearch(string keyword, [Remainder] string text)
{
if (string.IsNullOrWhiteSpace(keyword) || string.IsNullOrWhiteSpace(text))
return;

2
src/NadekoBot/Modules/Utility/Utility.cs
View File

@@ -260,7 +260,7 @@ namespace NadekoBot.Modules.Utility
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public async Task UserId(IGuildUser target = null)
public async Task UserId([Remainder] IGuildUser target = null)
{
var usr = target ?? Context.User;
await ReplyConfirmLocalized("userid", "🆔", Format.Bold(usr.ToString()),