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

Update to conform to Kwoth

Browse Source
This commit is contained in:
appelemac 2016-05-04 23:34:24 +02:00
parent 1bd3e7481c
commit 40390ed17c
1 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NadekoBot/Modules/CustomReactions/CustomReactions.cs
View File

@ -15,7 +15,7 @@ namespace NadekoBot.Modules.CustomReactions
public override void Install(ModuleManager manager) public override void Install(ModuleManager manager)
{ {
manager.CreateCommands("",cgb => manager.CreateCommands("", cgb =>
{ {
cgb.AddCheck(PermissionChecker.Instance); cgb.AddCheck(PermissionChecker.Instance);
@ -42,27 +42,8 @@ namespace NadekoBot.Modules.CustomReactions
c.Parameter("args", ParameterType.Unparsed); c.Parameter("args", ParameterType.Unparsed);
c.Do(async e => c.Do(async e =>
{ {
string str = command.Value[range.Next(0, command.Value.Count())];
var ownerMentioned = e.Message.MentionedUsers.Where(x =>NadekoBot.IsOwner(x.Id));
var ownerReactions = command.Value.Where(x => x.Contains("%owner%")).ToList();
string str;
if (ownerMentioned.Any() && ownerReactions.Any())
{
str = ownerReactions[range.Next(0, ownerReactions.Count)];
str = str.Replace("%owner%", ownerMentioned.FirstOrDefault().Mention);
}
else if (ownerReactions.Any())
{
var others = command.Value.Except(ownerReactions).ToList();
str = others[range.Next(0, others.Count())];
}
else
{
str = command.Value[range.Next(0, command.Value.Count())];
}
MyFuncs.Keys.ForEach(k => str = str.Replace(k, MyFuncs[k](e))); MyFuncs.Keys.ForEach(k => str = str.Replace(k, MyFuncs[k](e)));
await e.Channel.SendMessage(str).ConfigureAwait(false); await e.Channel.SendMessage(str).ConfigureAwait(false);
}); });
} }