daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Add GuildSettingsManager to centrally manage guild settings

Browse source
This commit is contained in:
runebaas 2020-06-19 04:10:26 +02:00
parent 83dc2c8e49
commit fb676e8918
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
6 changed files with 138 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Geekbot.net/Lib/GuildSettingsManager/GuildSettingsManager.cs Normal file
View file

@ -0,0 +1,68 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.Extensions;
namespace Geekbot.net.Lib.GuildSettingsManager
{
public class GuildSettingsManager : IGuildSettingsManager
{
private readonly DatabaseContext _database;
private readonly Dictionary<ulong, GuildSettingsModel> _settings;
public GuildSettingsManager(DatabaseContext database)
{
_database = database;
_settings = new Dictionary<ulong, GuildSettingsModel>();
}
public GuildSettingsModel GetSettings(ulong guildId, bool createIfNonExist = true)
{
return _settings.ContainsKey(guildId) ? _settings[guildId] : GetFromDatabase(guildId, createIfNonExist);
}
public async Task UpdateSettings(GuildSettingsModel settings)
{
_database.GuildSettings.Update(settings);
if (_settings.ContainsKey(settings.GuildId.AsUlong()))
{
_settings[settings.GuildId.AsUlong()] = settings;
}
else
{
_settings.Add(settings.GuildId.AsUlong(), settings);
}
await _database.SaveChangesAsync();
}
private GuildSettingsModel GetFromDatabase(ulong guildId, bool createIfNonExist)
{
var settings = _database.GuildSettings.FirstOrDefault(guild => guild.GuildId.Equals(guildId.AsLong()));
if (createIfNonExist && settings == null)
{
settings = CreateSettings(guildId);
}
_settings.Add(guildId, settings);
return settings;
}
private GuildSettingsModel CreateSettings(ulong guildId)
{
_database.GuildSettings.Add(new GuildSettingsModel
{
GuildId = guildId.AsLong(),
Hui = false,
Ping = false,
Language = "EN",
ShowDelete = false,
ShowLeave = false,
WikiLang = "en"
});
_database.SaveChanges();
return _database.GuildSettings.FirstOrDefault(g => g.GuildId.Equals(guildId.AsLong()));
}
}
}

11
Geekbot.net/Lib/GuildSettingsManager/IGuildSettingsManager.cs Normal file
View file

@ -0,0 +1,11 @@
using System.Threading.Tasks;
using Geekbot.net.Database.Models;
namespace Geekbot.net.Lib.GuildSettingsManager
{
public interface IGuildSettingsManager
{
GuildSettingsModel GetSettings(ulong guildId, bool createIfNonExist = true);
Task UpdateSettings(GuildSettingsModel settings);
}
}

28
Geekbot.net/Lib/Localization/TranslationHandler.cs
View file

@ -4,9 +4,7 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Discord.Commands;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.GuildSettingsManager;
using Geekbot.net.Lib.Logger;
using YamlDotNet.Core;
using YamlDotNet.Serialization;
@ -15,15 +13,15 @@ namespace Geekbot.net.Lib.Localization
{
public class TranslationHandler : ITranslationHandler
{
private readonly DatabaseContext _database;
private readonly IGeekbotLogger _logger;
private readonly IGuildSettingsManager _guildSettingsManager;
private readonly Dictionary<ulong, string> _serverLanguages;
private Dictionary<string, Dictionary<string, Dictionary<string, string>>> _translations;
public TranslationHandler(DatabaseContext database, IGeekbotLogger logger)
public TranslationHandler(IGeekbotLogger logger, IGuildSettingsManager guildSettingsManager)
{
_database = database;
_logger = logger;
_guildSettingsManager = guildSettingsManager;
_logger.Information(LogSource.Geekbot, "Loading Translations");
LoadTranslations();
_serverLanguages = new Dictionary<ulong, string>();
@ -107,7 +105,7 @@ namespace Geekbot.net.Lib.Localization
}
catch
{
lang = (await GetGuild(guildId)).Language ?? "EN";
lang = _guildSettingsManager.GetSettings(guildId, false)?.Language ?? "EN";
_serverLanguages[guildId] = lang;
return lang;
}
@ -178,9 +176,9 @@ namespace Geekbot.net.Lib.Localization
try
{
if (!SupportedLanguages.Contains(language)) return false;
var guild = await GetGuild(guildId);
var guild = _guildSettingsManager.GetSettings(guildId);
guild.Language = language;
_database.GuildSettings.Update(guild);
await _guildSettingsManager.UpdateSettings(guild);
_serverLanguages[guildId] = language;
return true;
}
@ -192,17 +190,5 @@ namespace Geekbot.net.Lib.Localization
}
public List<string> SupportedLanguages { get; private set; }
private async Task<GuildSettingsModel> GetGuild(ulong guildId)
{
var guild = _database.GuildSettings.FirstOrDefault(g => g.GuildId.Equals(guildId.AsLong()));
if (guild != null) return guild;
_database.GuildSettings.Add(new GuildSettingsModel
{
GuildId = guildId.AsLong()
});
await _database.SaveChangesAsync();
return _database.GuildSettings.FirstOrDefault(g => g.GuildId.Equals(guildId.AsLong()));
}
}
}