diff --git a/locale/Messages.resx b/locale/Messages.resx
index 02c7230..b010f53 100644
--- a/locale/Messages.resx
+++ b/locale/Messages.resx
@@ -117,13 +117,13 @@
{0}, welcome to {1}
-
+
Veemo!
-
+
Woomy!
-
+
Ngyes!
diff --git a/locale/Messages.ru.resx b/locale/Messages.ru.resx
index 87a7bc8..7e119db 100644
--- a/locale/Messages.ru.resx
+++ b/locale/Messages.ru.resx
@@ -117,13 +117,13 @@
{0}, добро пожаловать на сервер {1}
-
+
Виимо!
-
+
Вууми!
-
+
Нгьес!
diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx
index 722a34d..dbbda10 100644
--- a/locale/Messages.tt-ru.resx
+++ b/locale/Messages.tt-ru.resx
@@ -117,13 +117,13 @@
{0}, добро пожаловать на сервер {1}
-
+
вииимо!
-
+
вуууми!
-
+
нгьес!
diff --git a/src/Commands/ToolsCommandGroup.cs b/src/Commands/ToolsCommandGroup.cs
index ea91e1e..9a7c9b4 100644
--- a/src/Commands/ToolsCommandGroup.cs
+++ b/src/Commands/ToolsCommandGroup.cs
@@ -35,7 +35,7 @@ public class ToolsCommandGroup : CommandGroup
public ToolsCommandGroup(
ICommandContext context, IFeedbackService feedback,
GuildDataService guildData, IDiscordRestGuildAPI guildApi,
- IDiscordRestUserAPI userApi, IDiscordRestChannelAPI channelApi)
+ IDiscordRestUserAPI userApi)
{
_context = context;
_guildData = guildData;
diff --git a/src/Messages.Designer.cs b/src/Messages.Designer.cs
index 3c7ad6f..f70b162 100644
--- a/src/Messages.Designer.cs
+++ b/src/Messages.Designer.cs
@@ -66,21 +66,21 @@ namespace Octobot {
}
}
- internal static string Sound1 {
+ internal static string Loaded1 {
get {
- return ResourceManager.GetString("Sound1", resourceCulture);
+ return ResourceManager.GetString("Loaded1", resourceCulture);
}
}
- internal static string Sound2 {
+ internal static string Loaded2 {
get {
- return ResourceManager.GetString("Sound2", resourceCulture);
+ return ResourceManager.GetString("Loaded2", resourceCulture);
}
}
- internal static string Sound3 {
+ internal static string Loaded3 {
get {
- return ResourceManager.GetString("Sound3", resourceCulture);
+ return ResourceManager.GetString("Loaded3", resourceCulture);
}
}
diff --git a/src/Responders/GuildLoadedResponder.cs b/src/Responders/GuildLoadedResponder.cs
index a1e7d16..fd289fc 100644
--- a/src/Responders/GuildLoadedResponder.cs
+++ b/src/Responders/GuildLoadedResponder.cs
@@ -88,7 +88,7 @@ public class GuildLoadedResponder : IResponder
var i = Random.Shared.Next(1, 4);
var embed = new EmbedBuilder().WithSmallTitle(bot.GetTag(), bot)
- .WithTitle($"Sound{i}".Localized())
+ .WithTitle($"Loaded{i}".Localized())
.WithDescription(Messages.Ready)
.WithCurrentTimestamp()
.WithColour(ColorsList.Blue)
diff --git a/src/Services/Update/MemberUpdateService.cs b/src/Services/Update/MemberUpdateService.cs
index 7674bbe..dfe8219 100644
--- a/src/Services/Update/MemberUpdateService.cs
+++ b/src/Services/Update/MemberUpdateService.cs
@@ -151,6 +151,13 @@ public sealed partial class MemberUpdateService : BackgroundService
return Result.FromSuccess();
}
+ var existingBanResult = await _guildApi.GetGuildBanAsync(guildId, id, ct);
+ if (!existingBanResult.IsDefined())
+ {
+ data.BannedUntil = null;
+ return Result.FromSuccess();
+ }
+
var unbanResult = await _guildApi.RemoveGuildBanAsync(
guildId, id, Messages.PunishmentExpired.EncodeHeader(), ct);
if (unbanResult.IsSuccess)