From 363ef42923634194a167e5db3356275384b800ec Mon Sep 17 00:00:00 2001 From: Hokuto Chen Date: Sat, 12 Mar 2022 20:55:03 +0000 Subject: [PATCH 1/4] incorrect bot version (we are on 4.0.4)? --- src/NadekoBot/Services/Impl/StatsService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 8fbf8b5d0..43376b85e 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -1,4 +1,4 @@ -#nullable disable +#nullable disable using Humanizer.Localisation; using NadekoBot.Common.ModuleBehaviors; using System.Diagnostics; @@ -7,7 +7,7 @@ namespace NadekoBot.Services; public class StatsService : IStatsService, IReadyExecutor, INService, IDisposable { - public const string BOT_VERSION = "4.0.3"; + public const string BOT_VERSION = "4.0.4"; public string Author => "Kwoth#2452"; @@ -189,4 +189,4 @@ public class StatsService : IStatsService, IReadyExecutor, INService, IDisposabl _currentProcess.Dispose(); GC.SuppressFinalize(this); } -} \ No newline at end of file +} From aaf3c9cfe9921c2e025481b09d6c17db9471274b Mon Sep 17 00:00:00 2001 From: Alan Beatty Date: Mon, 14 Mar 2022 11:44:15 -0500 Subject: [PATCH 2/4] Fix ban dms sending to mod. Closes #340 --- .../Modules/Administration/UserPunish/UserPunishCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs b/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs index 1787f2021..a6f174ec9 100644 --- a/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs +++ b/src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs @@ -478,7 +478,7 @@ public partial class Administration var defaultMessage = GetText(strs.bandm(Format.Bold(ctx.Guild.Name), msg)); var embed = _service.GetBanUserDmEmbed(Context, user, defaultMessage, msg, null); if (embed is not null) - await ctx.User.SendAsync(embed); + await user.SendAsync(embed); } catch { From 624439f6845e6784fce4c95e331c12acaa3fd961 Mon Sep 17 00:00:00 2001 From: Hokuto Chen Date: Tue, 15 Mar 2022 09:30:51 +0000 Subject: [PATCH 3/4] wremoved "and when queue is empty" from .qap description. --- src/NadekoBot/data/strings/commands/commands.en-US.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/data/strings/commands/commands.en-US.yml b/src/NadekoBot/data/strings/commands/commands.en-US.yml index 15fd92fc2..e0dc5b19c 100644 --- a/src/NadekoBot/data/strings/commands/commands.en-US.yml +++ b/src/NadekoBot/data/strings/commands/commands.en-US.yml @@ -889,7 +889,7 @@ deleteplaylist: args: - "5" queueautoplay: - desc: "Toggles autoplay - When the song is finished, automatically queue a related Youtube song. (Works only for Youtube songs and when queue is empty)" + desc: "Toggles autoplay - When the song is finished, automatically queue a related Youtube song. (Works only for Youtube songs)" args: - "" streamadd: @@ -2154,4 +2154,4 @@ showembed: deleteemptyservers: desc: "Deletes all servers in which the bot is the only member." args: - - "" \ No newline at end of file + - "" From a9bdf36c532f3837aec658faaee237faea68758b Mon Sep 17 00:00:00 2001 From: David Date: Fri, 18 Mar 2022 17:31:27 +0000 Subject: [PATCH 4/4] python3 folder is up to 3.9 now --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6f7ae380..2c6911c8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ RUN set -xe; \ useradd -m nadeko; \ apt-get update; \ apt-get install -y libopus0 libsodium23 libsqlite3-0 curl ffmpeg python3 python3-pip sudo; \ - update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1; \ + update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1; \ echo 'Defaults>nadeko env_keep+="ASPNETCORE_* DOTNET_* NadekoBot_* shard_id total_shards TZ"' > /etc/sudoers.d/nadeko; \ pip3 install --upgrade youtube-dl; \ apt-get remove -y python3-pip; \ @@ -39,4 +39,4 @@ ENV total_shards=1 VOLUME [ "app/data" ] ENTRYPOINT [ "/usr/local/sbin/docker-entrypoint.sh" ] -CMD dotnet NadekoBot.dll "$shard_id" "$total_shards" \ No newline at end of file +CMD dotnet NadekoBot.dll "$shard_id" "$total_shards"