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

Unpack the arg array if one exists when generating bucket ids

Browse Source
This commit is contained in:
RogueException
2016-10-13 12:02:34 -03:00
parent 88c5dd38bf
commit 30067959d7
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Discord.Net.Core/API/DiscordRestApiClient.cs
View File

@@ -1120,6 +1120,15 @@ namespace Discord.API
var methodArgs = methodCall.Arguments.ToArray(); var methodArgs = methodCall.Arguments.ToArray();
string format = (methodArgs[0] as ConstantExpression).Value as string; string format = (methodArgs[0] as ConstantExpression).Value as string;
//Unpack the array, if one exists (happens with 4+ parameters)
if (methodArgs.Length > 1 && methodArgs[1].NodeType == ExpressionType.NewArrayInit)
{
var arrayExpr = methodArgs[1] as NewArrayExpression;
var elements = arrayExpr.Expressions.ToArray();
Array.Resize(ref methodArgs, elements.Length + 1);
Array.Copy(elements, 0, methodArgs, 1, elements.Length);
}
int endIndex = format.IndexOf('?'); //Dont include params int endIndex = format.IndexOf('?'); //Dont include params
if (endIndex == -1) if (endIndex == -1)
endIndex = format.Length; endIndex = format.Length;