1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00

Fix roles not returning on rejoin if welcome messages were disabled

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2023-08-03 13:21:44 +05:00
parent 84e730838b
commit 58ae13c170
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF

View file

@ -38,11 +38,6 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
var data = await _guildData.GetData(gatewayEvent.GuildID, ct); var data = await _guildData.GetData(gatewayEvent.GuildID, ct);
var cfg = data.Settings; var cfg = data.Settings;
if (GuildSettings.PublicFeedbackChannel.Get(cfg).Empty()
|| GuildSettings.WelcomeMessage.Get(cfg) is "off" or "disable" or "disabled")
{
return Result.FromSuccess();
}
if (GuildSettings.ReturnRolesOnRejoin.Get(cfg)) if (GuildSettings.ReturnRolesOnRejoin.Get(cfg))
{ {
@ -55,6 +50,12 @@ public class GuildMemberJoinedResponder : IResponder<IGuildMemberAdd>
} }
} }
if (GuildSettings.PublicFeedbackChannel.Get(cfg).Empty()
|| GuildSettings.WelcomeMessage.Get(cfg) is "off" or "disable" or "disabled")
{
return Result.FromSuccess();
}
Messages.Culture = GuildSettings.Language.Get(cfg); Messages.Culture = GuildSettings.Language.Get(cfg);
var welcomeMessage = GuildSettings.WelcomeMessage.Get(cfg) is "default" or "reset" var welcomeMessage = GuildSettings.WelcomeMessage.Get(cfg) is "default" or "reset"
? Messages.DefaultWelcomeMessage ? Messages.DefaultWelcomeMessage