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

Merge branch 'Davipb-issues/262' into dev

Browse Source
This commit is contained in:
RogueException
2016-11-19 09:33:17 -04:00
parent 9784a0324c b0286975cd
commit ff33b3b7a3
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Discord.Net.Commands/CommandParser.cs
View File

@@ -65,7 +65,9 @@ namespace Discord.Commands
return ParseResult.FromError(CommandError.ParseFailed, "There must be at least one character of whitespace between arguments."); return ParseResult.FromError(CommandError.ParseFailed, "There must be at least one character of whitespace between arguments.");
else else
{ {
curParam = command.Parameters.Count > argList.Count ? command.Parameters[argList.Count] : null; if (curParam == null)
curParam = command.Parameters.Count > argList.Count ? command.Parameters[argList.Count] : null;
if (curParam != null && curParam.IsRemainder) if (curParam != null && curParam.IsRemainder)
{ {
argBuilder.Append(c); argBuilder.Append(c);
@@ -116,11 +118,7 @@ namespace Discord.Commands
{ {
paramList.Add(typeReaderResult); paramList.Add(typeReaderResult);
if (curPos == endPos) curPart = ParserPart.None;
{
curParam = null;
curPart = ParserPart.None;
}
} }
else else
{ {

2
src/Discord.Net.Core/DiscordConfig.cs
View File

@@ -11,7 +11,7 @@ namespace Discord
"Unknown"; "Unknown";
public static readonly string ClientAPIUrl = $"https://discordapp.com/api/v{APIVersion}/"; public static readonly string ClientAPIUrl = $"https://discordapp.com/api/v{APIVersion}/";
public const string CDNUrl = "https://discordcdn.com/"; public const string CDNUrl = "https://cdn.discordapp.com/";
public const string InviteUrl = "https://discord.gg/"; public const string InviteUrl = "https://discord.gg/";
public const int DefaultRequestTimeout = 15000; public const int DefaultRequestTimeout = 15000;