Merge remote-tracking branch 'upstream/1.0' into 1.0

This commit is contained in:
fkndean 2016-11-14 15:01:59 -05:00
commit 0e2a92c5d3
7 changed files with 12 additions and 9 deletions

View File

@ -2,14 +2,14 @@
namespace ConcurrentCollections namespace ConcurrentCollections
{ {
internal static class PlatformHelper public static class PlatformHelper
{ {
private const int ProcessorCountRefreshIntervalMs = 30000; private const int ProcessorCountRefreshIntervalMs = 30000;
private static volatile int _processorCount; private static volatile int _processorCount;
private static volatile int _lastProcessorCountRefreshTicks; private static volatile int _lastProcessorCountRefreshTicks;
internal static int ProcessorCount { public static int ProcessorCount {
get { get {
var now = Environment.TickCount; var now = Environment.TickCount;
if (_processorCount == 0 || (now - _lastProcessorCountRefreshTicks) >= ProcessorCountRefreshIntervalMs) if (_processorCount == 0 || (now - _lastProcessorCountRefreshTicks) >= ProcessorCountRefreshIntervalMs)

View File

@ -162,7 +162,7 @@ namespace NadekoBot.Modules.Administration.Commands.Migration
} }
} }
internal class ServerSpecificConfig public class ServerSpecificConfig
{ {
public bool VoicePlusTextEnabled { get; set; } public bool VoicePlusTextEnabled { get; set; }
public bool SendPrivateMessageOnMention { get; set; } public bool SendPrivateMessageOnMention { get; set; }

View File

@ -245,7 +245,7 @@ namespace NadekoBot.Modules.Music.Classes
}); });
} }
internal async Task UpdateSongDurationsAsync() public async Task UpdateSongDurationsAsync()
{ {
var curSong = CurrentSong; var curSong = CurrentSong;
var toUpdate = playlist.Where(s => s.SongInfo.ProviderType == MusicType.Normal && var toUpdate = playlist.Where(s => s.SongInfo.ProviderType == MusicType.Normal &&

View File

@ -18,5 +18,8 @@
<ItemGroup> <ItemGroup>
<DnxInvisibleFolder Include="data\permissions\" /> <DnxInvisibleFolder Include="data\permissions\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<DnxInvisibleContent Include="data\questions.json" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" /> <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project> </Project>

View File

@ -22,7 +22,7 @@ using System.Threading.Tasks;
namespace Services.CleverBotApi namespace Services.CleverBotApi
{ {
internal class Cleverbot : ChatterBot public class Cleverbot : ChatterBot
{ {
private readonly int endIndex; private readonly int endIndex;
private readonly string baseUrl; private readonly string baseUrl;
@ -41,7 +41,7 @@ namespace Services.CleverBotApi
} }
} }
internal class CleverbotSession : ChatterBotSession public class CleverbotSession : ChatterBotSession
{ {
private readonly int endIndex; private readonly int endIndex;
private readonly string url; private readonly string url;

View File

@ -22,7 +22,7 @@ using System.Threading.Tasks;
namespace Services.CleverBotApi namespace Services.CleverBotApi
{ {
internal class Pandorabots : ChatterBot public class Pandorabots : ChatterBot
{ {
private readonly string botid; private readonly string botid;
@ -37,7 +37,7 @@ namespace Services.CleverBotApi
} }
} }
internal class PandorabotsSession : ChatterBotSession public class PandorabotsSession : ChatterBotSession
{ {
private readonly IDictionary<string, string> vars; private readonly IDictionary<string, string> vars;

View File

@ -28,7 +28,7 @@ using System.Xml.XPath;
namespace Services.CleverBotApi namespace Services.CleverBotApi
{ {
internal static class Utils public static class Utils
{ {
public static string ParametersToWWWFormURLEncoded(IDictionary<string, string> parameters) public static string ParametersToWWWFormURLEncoded(IDictionary<string, string> parameters)
{ {