diff --git a/NadekoBot.Core/Modules/Searches/Services/SearchesService.cs b/NadekoBot.Core/Modules/Searches/Services/SearchesService.cs index 8656a038..142871b1 100644 --- a/NadekoBot.Core/Modules/Searches/Services/SearchesService.cs +++ b/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 diff --git a/NadekoBot.Core/Services/Impl/Localization.cs b/NadekoBot.Core/Services/Impl/Localization.cs index 9d121915..496a4440 100644 --- a/NadekoBot.Core/Services/Impl/Localization.cs +++ b/NadekoBot.Core/Services/Impl/Localization.cs @@ -24,7 +24,7 @@ namespace NadekoBot.Core.Services.Impl static Localization() { _commandData = JsonConvert.DeserializeObject>( - File.ReadAllText("./data/command_strings.json")); + File.ReadAllText("./_strings/cmd/command_strings.json")); } private Localization() { } diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs index a79dddf2..d05ff01f 100644 --- a/NadekoBot.Core/Services/Impl/StatsService.cs +++ b/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"; diff --git a/NadekoBot.iss b/NadekoBot.iss index c8a73ff2..a1fc56c6 100644 --- a/NadekoBot.iss +++ b/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; diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index ba45cce3..00000000 --- a/build.ps1 +++ /dev/null @@ -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) } \ No newline at end of file diff --git a/pack.ps1 b/pack.ps1 deleted file mode 100644 index ddb3b585..00000000 --- a/pack.ps1 +++ /dev/null @@ -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) } \ No newline at end of file diff --git a/src/NadekoBot/NadekoBot.csproj b/src/NadekoBot/NadekoBot.csproj index 4f6cca5f..1bfb0e4f 100644 --- a/src/NadekoBot/NadekoBot.csproj +++ b/src/NadekoBot/NadekoBot.csproj @@ -23,7 +23,7 @@ PreserveNewest - + PreserveNewest diff --git a/src/NadekoBot/data/command_strings.json b/src/NadekoBot/_strings/cmd/command_strings.json similarity index 100% rename from src/NadekoBot/data/command_strings.json rename to src/NadekoBot/_strings/cmd/command_strings.json