Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
ea379dcb9d
@ -270,7 +270,7 @@ namespace NadekoBot.Modules.Administration
|
|||||||
{
|
{
|
||||||
config = uow.GuildConfigs.For(channel.Guild.Id);
|
config = uow.GuildConfigs.For(channel.Guild.Id);
|
||||||
}
|
}
|
||||||
await channel.SendMessageAsync("ℹ️ Current **DM greet** message: `" + config.ChannelGreetMessageText?.SanitizeMentions() + "`");
|
await channel.SendMessageAsync("ℹ️ Current **DM greet** message: `" + config.DmGreetMessageText?.SanitizeMentions() + "`");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -292,8 +292,8 @@ namespace NadekoBot.Modules.Administration
|
|||||||
using (var uow = DbHandler.UnitOfWork())
|
using (var uow = DbHandler.UnitOfWork())
|
||||||
{
|
{
|
||||||
var conf = uow.GuildConfigs.For(guildId);
|
var conf = uow.GuildConfigs.For(guildId);
|
||||||
conf.ChannelGreetMessageText = message;
|
conf.DmGreetMessageText = message;
|
||||||
greetMsgEnabled = conf.SendChannelGreetMessage;
|
greetMsgEnabled = conf.SendDmGreetMessage;
|
||||||
|
|
||||||
uow.GuildConfigs.Update(conf);
|
uow.GuildConfigs.Update(conf);
|
||||||
uow.Complete();
|
uow.Complete();
|
||||||
|
Loading…
Reference in New Issue
Block a user