From ba28132a97a92228513c3516edbd0f1b9fbfdddd Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 21 Oct 2017 19:48:05 +0200 Subject: [PATCH 1/4] Fixed .xp avatar --- NadekoBot.Core/Modules/Administration/DangerousCommands.cs | 1 + .../Modules/Administration/SelfAssignedRolesCommands.cs | 2 -- NadekoBot.Core/_Extensions/IUserExtensions.cs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NadekoBot.Core/Modules/Administration/DangerousCommands.cs b/NadekoBot.Core/Modules/Administration/DangerousCommands.cs index f61a3525..dfbdb64b 100644 --- a/NadekoBot.Core/Modules/Administration/DangerousCommands.cs +++ b/NadekoBot.Core/Modules/Administration/DangerousCommands.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; #if !GLOBAL_NADEKO namespace NadekoBot.Modules.Administration { + //todo make users confirm their decision public partial class Administration { [Group] diff --git a/NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs b/NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs index d867c236..9ab5d71f 100644 --- a/NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs +++ b/NadekoBot.Core/Modules/Administration/SelfAssignedRolesCommands.cs @@ -1,6 +1,5 @@ using Discord; using Discord.Commands; -using Discord.WebSocket; using NadekoBot.Extensions; using NadekoBot.Core.Services; using NadekoBot.Core.Services.Database.Models; @@ -11,7 +10,6 @@ using System.Text; using System.Threading.Tasks; using NadekoBot.Common.Attributes; using NadekoBot.Common.Collections; -using Microsoft.EntityFrameworkCore; namespace NadekoBot.Modules.Administration { diff --git a/NadekoBot.Core/_Extensions/IUserExtensions.cs b/NadekoBot.Core/_Extensions/IUserExtensions.cs index 36a7f9e5..d00d9cb3 100644 --- a/NadekoBot.Core/_Extensions/IUserExtensions.cs +++ b/NadekoBot.Core/_Extensions/IUserExtensions.cs @@ -44,6 +44,6 @@ namespace NadekoBot.Extensions public static string RealAvatarUrl(this DiscordUser usr) => usr.AvatarId.StartsWith("a_") ? $"{DiscordConfig.CDNUrl}avatars/{usr.UserId}/{usr.AvatarId}.gif" - : ((IUser)usr).GetAvatarUrl(ImageFormat.Auto); + : $"{DiscordConfig.CDNUrl}avatars/{usr.UserId}/{usr.AvatarId}.png"; } } From e23d4902c4ce2664e82530d6d54eb1a214da3006 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 21 Oct 2017 20:58:33 +0200 Subject: [PATCH 2/4] Fixed method not found errors --- NuGet.Config | 7 ++++--- src/NadekoBot/NuGet.Config | 8 -------- 2 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 src/NadekoBot/NuGet.Config diff --git a/NuGet.Config b/NuGet.Config index e482807c..b7e1e1e0 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,7 +1,8 @@  - - + + + - + \ No newline at end of file diff --git a/src/NadekoBot/NuGet.Config b/src/NadekoBot/NuGet.Config deleted file mode 100644 index b7e1e1e0..00000000 --- a/src/NadekoBot/NuGet.Config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From 5b227bccb69070762100de3929347601541190ce Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 21 Oct 2017 20:59:07 +0200 Subject: [PATCH 3/4] Fixed method not found errors --- NadekoBot.Core/NadekoBot.Core.csproj | 4 ---- NadekoBot.Core/Services/Impl/StatsService.cs | 4 +--- NadekoBot.Core/Services/NadekoBot.cs | 1 + NuGet.Config | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/NadekoBot.Core/NadekoBot.Core.csproj b/NadekoBot.Core/NadekoBot.Core.csproj index fcf7538f..0b47b22e 100644 --- a/NadekoBot.Core/NadekoBot.Core.csproj +++ b/NadekoBot.Core/NadekoBot.Core.csproj @@ -13,10 +13,6 @@ true - - - - diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs index 9fa1b86d..304482eb 100644 --- a/NadekoBot.Core/Services/Impl/StatsService.cs +++ b/NadekoBot.Core/Services/Impl/StatsService.cs @@ -1,8 +1,6 @@ using Discord; using Discord.WebSocket; -using NadekoBot.Common.ShardCom; using NadekoBot.Extensions; -using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Globalization; @@ -23,7 +21,7 @@ namespace NadekoBot.Core.Services.Impl private readonly IBotCredentials _creds; private readonly DateTime _started; - public const string BotVersion = "2.0.0"; + public const string BotVersion = "2.0.1"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; diff --git a/NadekoBot.Core/Services/NadekoBot.cs b/NadekoBot.Core/Services/NadekoBot.cs index 6e974535..0fc5d4f6 100644 --- a/NadekoBot.Core/Services/NadekoBot.cs +++ b/NadekoBot.Core/Services/NadekoBot.cs @@ -58,6 +58,7 @@ namespace NadekoBot public NadekoBot(int shardId, int parentProcessId) { + Console.WriteLine(typeof(DiscordSocketClient).Assembly.GetName().Version); if (shardId < 0) throw new ArgumentOutOfRangeException(nameof(shardId)); diff --git a/NuGet.Config b/NuGet.Config index b7e1e1e0..e27a9cbb 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,8 +1,8 @@  + - \ No newline at end of file From a9b10a4d2b066361e8872fe00fac18994a61c129 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Sat, 21 Oct 2017 21:06:07 +0200 Subject: [PATCH 4/4] Fixed .deletewaifus --- NadekoBot.Core/Modules/Administration/DangerousCommands.cs | 4 +++- NadekoBot.Core/Services/Impl/StatsService.cs | 2 +- NadekoBot.Core/Services/NadekoBot.cs | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NadekoBot.Core/Modules/Administration/DangerousCommands.cs b/NadekoBot.Core/Modules/Administration/DangerousCommands.cs index dfbdb64b..c0889c0e 100644 --- a/NadekoBot.Core/Modules/Administration/DangerousCommands.cs +++ b/NadekoBot.Core/Modules/Administration/DangerousCommands.cs @@ -46,7 +46,9 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Usage, Description, Aliases] [OwnerOnly] public Task DeleteWaifus() => - ExecSql("DELETE FROM WaifuUpdates; DELETE FROM WaifuInfo;"); + ExecSql(@"DELETE FROM WaifuUpdates; +DELETE FROM WaifuItem; +DELETE FROM WaifuInfo;"); [NadekoCommand, Usage, Description, Aliases] [OwnerOnly] diff --git a/NadekoBot.Core/Services/Impl/StatsService.cs b/NadekoBot.Core/Services/Impl/StatsService.cs index 304482eb..a1528839 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.0.1"; + public const string BotVersion = "2.0.2"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; diff --git a/NadekoBot.Core/Services/NadekoBot.cs b/NadekoBot.Core/Services/NadekoBot.cs index 0fc5d4f6..6e974535 100644 --- a/NadekoBot.Core/Services/NadekoBot.cs +++ b/NadekoBot.Core/Services/NadekoBot.cs @@ -58,7 +58,6 @@ namespace NadekoBot public NadekoBot(int shardId, int parentProcessId) { - Console.WriteLine(typeof(DiscordSocketClient).Assembly.GetName().Version); if (shardId < 0) throw new ArgumentOutOfRangeException(nameof(shardId));