Merge branch '1.9' into wip

NadekoBot.Core/Modules/Searches/Services/SearchesService.cs

@@ -67,7 +67,7 @@ namespace NadekoBot.Modules.Searches.Services
                     data = await Http.GetStringAsync("https://api.coinmarketcap.com/v1/ticker/")
                         .ConfigureAwait(false);
 
-                    await r.StringSetAsync("crypto_data", data, TimeSpan.FromHours(6)).ConfigureAwait(false);
+                    await r.StringSetAsync("crypto_data", data, TimeSpan.FromHours(1)).ConfigureAwait(false);
                 }
             }
             finally

NadekoBot.Core/Services/Impl/Localization.cs

@@ -24,7 +24,7 @@ namespace NadekoBot.Core.Services.Impl
         static Localization()
         {
             _commandData = JsonConvert.DeserializeObject<Dictionary<string, CommandData>>(
-                File.ReadAllText("./data/command_strings.json"));
+                File.ReadAllText("./_strings/cmd/command_strings.json"));
         }
 
         private Localization() { }

NadekoBot.Core/Services/Impl/StatsService.cs

@@ -21,7 +21,7 @@ namespace NadekoBot.Core.Services.Impl
         private readonly IBotCredentials _creds;
         private readonly DateTime _started;
 
-        public const string BotVersion = "2.3.6";
+        public const string BotVersion = "2.4.3";
 
         public string Author => "Kwoth#2560";
         public string Library => "Discord.Net";

NadekoBot.iss

@@ -21,6 +21,7 @@ DisableWelcomePage=no
 [Files]
 ;install 
 Source: "src\NadekoBot\bin\Release\netcoreapp2.0\{#target}\publish\*"; DestDir: "{app}\{#sysfolder}"; Permissions: users-full; Flags: recursesubdirs onlyifdoesntexist ignoreversion createallsubdirs; Excludes: "*.pdb, *.db"
+Source: "src\NadekoBot\bin\Release\netcoreapp2.0\{#target}\publish\data\command_strings.json"; DestDir: "{app}\{#sysfolder}\data"; DestName: "command_strings.json"; Permissions: users-full; Flags: skipifsourcedoesntexist ignoreversion createallsubdirs recursesubdirs;
 ;rename credentials example to credentials, but don't overwrite if it exists
 ;Source: "src\NadekoBot\bin\Release\netcoreapp2.0\{#target}\publish\credentials_example.json"; DestName: "credentials.json"; DestDir: "{app}\{#sysfolder}"; Permissions: users-full; Flags: skipifsourcedoesntexist onlyifdoesntexist;
 

build.ps1

@@ -1,4 +0,0 @@
-appveyor-retry dotnet restore NadekoBot.sln -v Minimal /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
-if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
-dotnet build NadekoBot.sln -c "Release" /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
-if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }

pack.ps1

@@ -1,2 +0,0 @@
-dotnet pack "src\NadekoBot\NadekoBot.csproj" -c "Release" -o "../../artifacts" --no-build --version-suffix "$Env:BUILD" /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
-if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }

src/NadekoBot/NadekoBot.csproj

@@ -23,7 +23,7 @@
     <None Update="data\**\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="_strings\*">
+    <None Update="_strings\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="libsodium.dll;opus.dll;libsodium.so;libopus.so">