liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract system/member guild settings and refactor DB access

Browse Source 
(also refactor MemberAvatar now that I'm here)
This commit is contained in:
Ske
2020-06-13 16:03:57 +02:00
parent ed511a6236
commit a915ddb41c
13 changed files with 247 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PluralKit.Bot/Services/EmbedService.cs
View File

@@ -16,12 +16,14 @@ namespace PluralKit.Bot {
public class EmbedService
{
private IDataStore _data;
private DbConnectionFactory _db;
private DiscordShardedClient _client;
public EmbedService(DiscordShardedClient client, IDataStore data)
public EmbedService(DiscordShardedClient client, IDataStore data, DbConnectionFactory db)
{
_client = client;
_data = data;
_db = db;
}
public async Task<DiscordEmbed> CreateSystemEmbed(DiscordClient client, PKSystem system, LookupContext ctx) {
@@ -93,7 +95,7 @@ namespace PluralKit.Bot {
color = DiscordUtils.Gray;
}
var guildSettings = guild != null ? await _data.GetMemberGuildSettings(member, guild.Id) : null;
var guildSettings = guild != null ? await _db.Execute(c => c.QueryOrInsertMemberGuildConfig(guild.Id, member.Id)) : null;
var guildDisplayName = guildSettings?.DisplayName;
var avatar = guildSettings?.AvatarUrl ?? member.AvatarUrl;