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

Slight code improvement in GreetService

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

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

@@ -88,9 +88,7 @@ public class GreetService : INService
private Task Bot_JoinedGuild(GuildConfig gc) private Task Bot_JoinedGuild(GuildConfig gc)
{ {
_guildConfigsCache.AddOrUpdate(gc.GuildId, _guildConfigsCache[gc.GuildId] = GreetSettings.Create(gc);
GreetSettings.Create(gc),
delegate { return GreetSettings.Create(gc); });
return Task.CompletedTask; return Task.CompletedTask;
} }
@@ -142,7 +140,7 @@ public class GreetService : INService
public string? GetDmGreetMsg(ulong id) public string? GetDmGreetMsg(ulong id)
{ {
using var uow = _db.GetDbContext(); using var uow = _db.GetDbContext();
return uow.GuildConfigsForId(id, set => set)?.DmGreetMessageText; return uow.GuildConfigsForId(id, set => set).DmGreetMessageText;
} }
public string? GetGreetMsg(ulong gid) public string? GetGreetMsg(ulong gid)
@@ -330,21 +328,20 @@ public class GreetService : INService
await uow.SaveChangesAsync(); await uow.SaveChangesAsync();
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
return true; return true;
} }
public async Task<bool> SetGreet(ulong guildId, ulong channelId, bool? value = null) public async Task<bool> SetGreet(ulong guildId, ulong channelId, bool? value = null)
{ {
bool enabled;
await using var uow = _db.GetDbContext(); await using var uow = _db.GetDbContext();
var conf = uow.GuildConfigsForId(guildId, set => set); var conf = uow.GuildConfigsForId(guildId, set => set);
enabled = conf.SendChannelGreetMessage = value ?? !conf.SendChannelGreetMessage; var enabled = conf.SendChannelGreetMessage = value ?? !conf.SendChannelGreetMessage;
conf.GreetMessageChannelId = channelId; conf.GreetMessageChannelId = channelId;
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
await uow.SaveChangesAsync(); await uow.SaveChangesAsync();
return enabled; return enabled;
@@ -376,7 +373,7 @@ public class GreetService : INService
var enabled = conf.SendDmGreetMessage = value ?? !conf.SendDmGreetMessage; var enabled = conf.SendDmGreetMessage = value ?? !conf.SendDmGreetMessage;
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
await uow.SaveChangesAsync(); await uow.SaveChangesAsync();
return enabled; return enabled;
@@ -394,7 +391,7 @@ public class GreetService : INService
conf.DmGreetMessageText = message; conf.DmGreetMessageText = message;
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
uow.SaveChanges(); uow.SaveChanges();
return conf.SendDmGreetMessage; return conf.SendDmGreetMessage;
@@ -408,7 +405,7 @@ public class GreetService : INService
conf.ByeMessageChannelId = channelId; conf.ByeMessageChannelId = channelId;
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
await uow.SaveChangesAsync(); await uow.SaveChangesAsync();
return enabled; return enabled;
@@ -426,7 +423,7 @@ public class GreetService : INService
conf.ChannelByeMessageText = message; conf.ChannelByeMessageText = message;
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
uow.SaveChanges(); uow.SaveChanges();
return conf.SendChannelByeMessage; return conf.SendChannelByeMessage;
@@ -442,22 +439,22 @@ public class GreetService : INService
conf.AutoDeleteByeMessagesTimer = timer; conf.AutoDeleteByeMessagesTimer = timer;
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
await uow.SaveChangesAsync(); await uow.SaveChangesAsync();
} }
public async Task SetGreetDel(ulong id, int timer) public async Task SetGreetDel(ulong guildId, int timer)
{ {
if (timer is < 0 or > 600) if (timer is < 0 or > 600)
return; return;
await using var uow = _db.GetDbContext(); await using var uow = _db.GetDbContext();
var conf = uow.GuildConfigsForId(id, set => set); var conf = uow.GuildConfigsForId(guildId, set => set);
conf.AutoDeleteGreetMessagesTimer = timer; conf.AutoDeleteGreetMessagesTimer = timer;
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(id, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
await uow.SaveChangesAsync(); await uow.SaveChangesAsync();
} }
@@ -471,7 +468,7 @@ public class GreetService : INService
conf.BoostMessage = message; conf.BoostMessage = message;
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
uow.SaveChanges(); uow.SaveChanges();
return conf.SendBoostMessage; return conf.SendBoostMessage;
@@ -487,7 +484,7 @@ public class GreetService : INService
conf.BoostMessageDeleteAfter = timer; conf.BoostMessageDeleteAfter = timer;
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
await uow.SaveChangesAsync(); await uow.SaveChangesAsync();
} }
@@ -501,7 +498,7 @@ public class GreetService : INService
await uow.SaveChangesAsync(); await uow.SaveChangesAsync();
var toAdd = GreetSettings.Create(conf); var toAdd = GreetSettings.Create(conf);
_guildConfigsCache.AddOrUpdate(guildId, toAdd, (_, _) => toAdd); _guildConfigsCache[guildId] = toAdd;
return conf.SendBoostMessage; return conf.SendBoostMessage;
} }