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

Merge pull request #20 from Kwoth/dev

Browse Source 
Update
This commit is contained in:
samvaio
2016-12-02 07:10:15 +05:30
committed by GitHub
parent 589238ed46 becf870987
commit 00b4d17e22
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ namespace NadekoBot.Modules.CustomReactions
{ {
var txtStream = await customReactions.GroupBy(cr => cr.Trigger) var txtStream = await customReactions.GroupBy(cr => cr.Trigger)
.OrderBy(cr => cr.Key) .OrderBy(cr => cr.Key)
.Select(cr => new { Trigger = cr.Key, Responses = cr.Count() }) .Select(cr => new { Trigger = cr.Key, Responses = cr.Select(y => y.Response).ToList() })
.ToJson() .ToJson()
.ToStream() .ToStream()
.ConfigureAwait(false); .ConfigureAwait(false);
@@ -173,7 +173,7 @@ namespace NadekoBot.Modules.CustomReactions
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
public async Task ListCustReactG(IUserMessage imsg, int page = 1) public async Task ListCustReactG(IUserMessage imsg, int page = 1)
{ {
var channel = (ITextChannel)imsg.Channel; var channel = imsg.Channel as ITextChannel;
if (page < 1 || page > 10000) if (page < 1 || page > 10000)
return; return;
ConcurrentHashSet<CustomReaction> customReactions; ConcurrentHashSet<CustomReaction> customReactions;

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

@@ -535,7 +535,7 @@ namespace NadekoBot.Modules.Searches
if (matches.Count == 0) if (matches.Count == 0)
return null; return null;
var match = matches[rng.Next(0, matches.Count)]; var match = matches[rng.Next(0, matches.Count)];
return matches[rng.Next(0, matches.Count)].Groups["url"].Value; return "http:" + matches[rng.Next(0, matches.Count)].Groups["url"].Value;
} }
} }