Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
fkndean 2016-11-30 18:49:38 -05:00
commit ea379dcb9d

View File

@ -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();