github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Custom activation methods

Browse Source
This commit is contained in:
Googie2149
2016-01-27 15:10:03 -05:00
parent 484b2b1391
commit 00171c68ac
2 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/Discord.Net.Commands/CommandService.cs
View File

@@ -74,17 +74,50 @@ namespace Discord.Commands
string msg = e.Message.RawText;
if (msg.Length == 0) return;
//Check for command char if one is provided
var chars = Config.CommandChars;
if (chars.Length > 0)
bool activated = false; // Either this or nested if statements
// Also needs a clearer name
if ((Config.ActivationMode & ActivationMode.Char) != 0)
{
if (!chars.Contains(msg[0]))
return;
msg = msg.Substring(1);
//Check for command char if one is provided
var chars = Config.CommandChars;
if (chars.Length > 0)
{
if (chars.Contains(msg[0]))
{
msg = msg.Substring(1);
activated = true;
}
}
}
//Parse command
IEnumerable<Command> commands;
if (!activated && (Config.ActivationMode & ActivationMode.Mention) != 0)
{
if (e.Message.IsMentioningMe() && msg.StartsWith(e.Server.CurrentUser.Mention))
{
msg = msg.Substring(e.Server.CurrentUser.Mention.Length);
activated = true;
}
}
// Checking if that's null with the Custom flag set on launch and throwing an
// exception (similar to commands with several unparsed parameters) would probably be better than the null check here
if (!activated && (Config.ActivationMode & ActivationMode.Custom) != 0 && Config.CustomActivator != null)
{
int index = Config.CustomActivator(e.Message);
if (index > 0)
{
msg = msg.Substring(index);
activated = true;
}
}
// This kills trying to parse messages when you don't have a command char set or anything else
if (!activated)
return;
//Parse command
IEnumerable<Command> commands;
int argPos;
CommandParser.ParseCommand(msg, _map, out commands, out argPos);
if (commands == null)