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

Port UserRepository and remove OW stuff

Browse source
This commit is contained in:
runebaas 2018-05-10 02:00:26 +02:00
parent d2f31d0730
commit 15034d63a3
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
20 changed files with 176 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Geekbot.net/Lib/UserRepository/IUserRepository.cs
View file

@ -1,13 +1,12 @@
using System.Threading.Tasks;
using Discord.WebSocket;
using Geekbot.net.Database.Models;
namespace Geekbot.net.Lib.UserRepository
{
public interface IUserRepository
{
Task<bool> Update(SocketUser user);
UserRepositoryUser Get(ulong userId);
string GetUserSetting(ulong userId, string setting);
bool SaveUserSetting(ulong userId, string setting, string value);
UserModel Get(ulong userId);
}
}

116
Geekbot.net/Lib/UserRepository/UserRepository.cs
View file

@ -1,125 +1,81 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Discord.WebSocket;
using Geekbot.net.Database;
using Geekbot.net.Database.Models;
using Geekbot.net.Lib.Extensions;
using Geekbot.net.Lib.Logger;
using StackExchange.Redis;
using Utf8Json;
namespace Geekbot.net.Lib.UserRepository
{
public class UserRepository : IUserRepository
{
private readonly IDatabase _redis;
private readonly DatabaseContext _database;
private readonly IGeekbotLogger _logger;
public UserRepository(IDatabase redis, IGeekbotLogger logger)
public UserRepository(DatabaseContext database, IGeekbotLogger logger)
{
_redis = redis;
_database = database;
_logger = logger;
}
public Task<bool> Update(SocketUser user)
public async Task<bool> Update(SocketUser user)
{
try
{
var savedUser = Get(user.Id);
savedUser.Id = user.Id;
var isNew = false;
if (savedUser == null)
{
savedUser = new UserModel();
isNew = true;
}
savedUser.UserId = user.Id.AsLong();
savedUser.Username = user.Username;
savedUser.Discriminator = user.Discriminator;
savedUser.AvatarUrl = user.GetAvatarUrl() ?? "0";
savedUser.AvatarUrl = user.GetAvatarUrl() ?? "";
savedUser.IsBot = user.IsBot;
savedUser.Joined = user.CreatedAt;
if(savedUser.UsedNames == null) savedUser.UsedNames = new List<string>();
if (savedUser.UsedNames == null) savedUser.UsedNames = Enumerable.Empty<string>().ToArray();
if (!savedUser.UsedNames.Contains(user.Username))
{
savedUser.UsedNames.Add(user.Username);
savedUser.UsedNames = savedUser.UsedNames.Concat(new[] {user.Username}).ToArray();
}
Store(savedUser);
if (isNew)
{
await _database.Users.AddAsync(savedUser);
}
else
{
_database.Users.Update(savedUser);
}
await _database.SaveChangesAsync();
_logger.Information(LogSource.UserRepository, "Updated User", savedUser);
return Task.FromResult(true);
await Task.Delay(500);
return true;
}
catch (Exception e)
{
_logger.Warning(LogSource.UserRepository, $"Failed to update user: {user.Username}#{user.Discriminator} ({user.Id})", e);
return Task.FromResult(false);
return false;
}
}
private void Store(UserRepositoryUser user)
{
_redis.HashSetAsync($"Users:{user.Id.ToString()}", new[]
{
new HashEntry("Id", user.Id.ToString()),
new HashEntry("Username", user.Username),
new HashEntry("Discriminator", user.Discriminator),
new HashEntry("AvatarUrl", user.AvatarUrl),
new HashEntry("IsBot", user.IsBot),
new HashEntry("Joined", user.Joined.ToString()),
new HashEntry("UsedNames", JsonSerializer.Serialize(user.UsedNames))
});
}
public UserRepositoryUser Get(ulong userId)
public UserModel Get(ulong userId)
{
try
{
var user = _redis.HashGetAll($"Users:{userId.ToString()}");
for (var i = 1; i < 11; i++)
{
if (user.Length != 0) break;
user = _redis.HashGetAll($"Users:{(userId + (ulong) i).ToString()}");
}
var dto = new UserRepositoryUser();
foreach (var a in user.ToDictionary())
{
switch (a.Key)
{
case "Id":
dto.Id = ulong.Parse(a.Value);
break;
case "Username":
dto.Username = a.Value.ToString();
break;
case "Discriminator":
dto.Discriminator = a.Value.ToString();
break;
case "AvatarUrl":
dto.AvatarUrl = a.Value != "0" ? a.Value.ToString() : null;
break;
case "IsBot":
dto.IsBot = a.Value == 1;
break;
case "Joined":
dto.Joined = DateTimeOffset.Parse(a.Value.ToString());
break;
case "UsedNames":
dto.UsedNames = JsonSerializer.Deserialize<List<string>>(a.Value.ToString()) ?? new List<string>();
break;
}
}
return dto;
return _database.Users.FirstOrDefault(u => u.UserId.Equals(userId.AsLong()));
}
catch (Exception e)
{
_logger.Warning(LogSource.UserRepository, $"Failed to get {userId} from repository", e);
return new UserRepositoryUser();
return null;
}
}
public string GetUserSetting(ulong userId, string setting)
{
return _redis.HashGet($"Users:{userId}", setting);
}
public bool SaveUserSetting(ulong userId, string setting, string value)
{
_redis.HashSet($"Users:{userId}", new[]
{
new HashEntry(setting, value)
});
return true;
}
}
}

16
Geekbot.net/Lib/UserRepository/UserRepositoryUserDto.cs
View file

@ -1,16 +0,0 @@
using System;
using System.Collections.Generic;
namespace Geekbot.net.Lib.UserRepository
{
public class UserRepositoryUser
{
public ulong Id { get; set; }
public string Username { get; set; }
public string Discriminator { get; set; }
public string AvatarUrl { get; set; }
public bool IsBot { get; set; }
public DateTimeOffset Joined { get; set; }
public List<string> UsedNames { get; set; }
}
}