From 788955bb1af1f0c7762d2e0b47813de7041c5878 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 04:33:54 +0100 Subject: [PATCH 01/11] Version upped --- NadekoBot.Core/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs index a79dddf2..bdf27db8 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.0"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From d5840e6acde2313d97de92dd996975ca2c180aa2 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 06:30:33 +0100 Subject: [PATCH 02/11] Delete pack.ps1 --- pack.ps1 | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 pack.ps1 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 From ed27d6b21370c6210499bb769f23db02be81c5b6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 06:30:55 +0100 Subject: [PATCH 03/11] Delete build.ps1 --- build.ps1 | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 build.ps1 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 From 759bb0982ecc2c6d93985043f8b49f1467c4dcd8 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 12:46:17 +0100 Subject: [PATCH 04/11] Version upped to 2.4.1 --- NadekoBot.Core/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs index bdf27db8..701bd256 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.4.0"; + public const string BotVersion = "2.4.1"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From e340a44e3a34284cebd00ef2d42c9b17cb76da9f Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 12:55:14 +0100 Subject: [PATCH 05/11] Update installer in order to fix missing strings. --- NadekoBot.iss | 1 + 1 file changed, 1 insertion(+) diff --git a/NadekoBot.iss b/NadekoBot.iss index c8a73ff2..c310db9e 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 overwrite; ;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; From 01b46020dbe08b43371ccb75a61dd7dd7bb494c0 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 12:57:04 +0100 Subject: [PATCH 06/11] Installer fix #2? --- NadekoBot.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot.iss b/NadekoBot.iss index c310db9e..2a68a6a4 100644 --- a/NadekoBot.iss +++ b/NadekoBot.iss @@ -21,7 +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 overwrite; +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; ;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; From 106ea84e6b35cbdcda92873a75f90d8897996218 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 12:58:23 +0100 Subject: [PATCH 07/11] Installer fix final --- NadekoBot.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot.iss b/NadekoBot.iss index 2a68a6a4..a1fc56c6 100644 --- a/NadekoBot.iss +++ b/NadekoBot.iss @@ -21,7 +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; +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; From d08f27e0887dddd9823c9695b7bccbd12e943f20 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 13:09:38 +0100 Subject: [PATCH 08/11] Version Upped --- NadekoBot.Core/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs index 701bd256..76d4f678 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.4.1"; + public const string BotVersion = "2.4.2"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 41555aa629111b043fa8c1fbc26b23246f703c5b Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Wed, 8 Nov 2017 13:30:10 +0100 Subject: [PATCH 09/11] Fixed linux command strings --- NadekoBot.Core/Services/Impl/Localization.cs | 2 +- src/NadekoBot/NadekoBot.csproj | 2 +- src/NadekoBot/{data => _strings/cmd}/command_strings.json | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/NadekoBot/{data => _strings/cmd}/command_strings.json (100%) 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/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 From 5b14fb2c224e5aea97ef4f219016b015f4c36d6a Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 10 Nov 2017 13:38:00 +0100 Subject: [PATCH 10/11] Version upped --- NadekoBot.Core/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs index 76d4f678..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.4.2"; + public const string BotVersion = "2.4.3"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 85fcf0bc60130fa83539b28649a762ca25c48047 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Fri, 10 Nov 2017 13:42:43 +0100 Subject: [PATCH 11/11] .crypto will cache for only 1 hour now, in order to get more accurate prices --- NadekoBot.Core/Modules/Searches/Services/SearchesService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadekoBot.Core/Modules/Searches/Services/SearchesService.cs b/NadekoBot.Core/Modules/Searches/Services/SearchesService.cs index 2755cfb1..0d567e42 100644 --- a/NadekoBot.Core/Modules/Searches/Services/SearchesService.cs +++ b/NadekoBot.Core/Modules/Searches/Services/SearchesService.cs @@ -68,7 +68,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