minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-11-04 08:34:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

GreetDmMessage will now show a footer with the source server -.-

Browse Source
This commit is contained in:
Kwoth
2022-01-06 05:00:44 +01:00
parent e9f42bf4df
commit e1fca41a70
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
View File

@@ -29,11 +29,11 @@ public class GreetService : INService
_guildConfigsCache = new(bot.AllGuildConfigs.ToDictionary(g => g.GuildId, GreetSettings.Create));
_client.UserJoined += UserJoined;
_client.UserLeft += UserLeft;
_client.UserJoined += OnUserJoined;
_client.UserLeft += OnUserLeft;
bot.JoinedGuild += Bot_JoinedGuild;
_client.LeftGuild += _client_LeftGuild;
bot.JoinedGuild += OnBotJoinedGuild;
_client.LeftGuild += OnClientLeftGuild;
_client.GuildMemberUpdated += ClientOnGuildMemberUpdated;
}
@@ -80,19 +80,19 @@ public class GreetService : INService
}
};
private Task _client_LeftGuild(SocketGuild arg)
private Task OnClientLeftGuild(SocketGuild arg)
{
_guildConfigsCache.TryRemove(arg.Id, out _);
return Task.CompletedTask;
}
private Task Bot_JoinedGuild(GuildConfig gc)
private Task OnBotJoinedGuild(GuildConfig gc)
{
_guildConfigsCache[gc.GuildId] = GreetSettings.Create(gc);
return Task.CompletedTask;
}
private Task UserLeft(SocketGuild guild, SocketUser user)
private Task OnUserLeft(SocketGuild guild, SocketUser user)
{
var _ = Task.Run(async () =>
{
@@ -214,9 +214,19 @@ public class GreetService : INService
var rep = new ReplacementBuilder().WithDefault(user, channel, (SocketGuild)user.Guild, _client).Build();
var text = SmartText.CreateFrom(conf.DmGreetMessageText);
rep.Replace(text);
text = rep.Replace(text);
try
{
if (text is SmartPlainText pt)
{
text = new SmartEmbedText() { PlainText = pt.Text };
}
((SmartEmbedText)text).Footer = new()
{
Text = $"This message was sent from {user.Guild} server.", IconUrl = user.Guild.IconUrl
};
await channel.SendAsync(text);
}
catch
@@ -227,7 +237,7 @@ public class GreetService : INService
return true;
}
private Task UserJoined(IGuildUser user)
private Task OnUserJoined(IGuildUser user)
{
var _ = Task.Run(async () =>
{