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

Fallback to user repo when retrieving a user via the discord gateway fails or times out

Browse source
This commit is contained in:
runebaas 2020-12-29 17:12:03 +01:00
parent 714b0008bc
commit 7e792bd782
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Bot/Commands/Utils/Quote/Quote.cs
View file

@ -13,6 +13,7 @@ using Geekbot.Core.Extensions;
using Geekbot.Core.GuildSettingsManager; using Geekbot.Core.GuildSettingsManager;
using Geekbot.Core.Polyfills; using Geekbot.Core.Polyfills;
using Geekbot.Core.RandomNumberGenerator; using Geekbot.Core.RandomNumberGenerator;
using Geekbot.Core.UserRepository;
namespace Geekbot.Bot.Commands.Utils.Quote namespace Geekbot.Bot.Commands.Utils.Quote
{ {
@ -22,13 +23,15 @@ namespace Geekbot.Bot.Commands.Utils.Quote
{ {
private readonly DatabaseContext _database; private readonly DatabaseContext _database;
private readonly IRandomNumberGenerator _randomNumberGenerator; private readonly IRandomNumberGenerator _randomNumberGenerator;
private readonly IUserRepository _userRepository;
private readonly bool _isDev; private readonly bool _isDev;
public Quote(IErrorHandler errorHandler, DatabaseContext database, IRandomNumberGenerator randomNumberGenerator, IGuildSettingsManager guildSettingsManager) public Quote(IErrorHandler errorHandler, DatabaseContext database, IRandomNumberGenerator randomNumberGenerator, IGuildSettingsManager guildSettingsManager, IUserRepository userRepository)
: base(errorHandler, guildSettingsManager) : base(errorHandler, guildSettingsManager)
{ {
_database = database; _database = database;
_randomNumberGenerator = randomNumberGenerator; _randomNumberGenerator = randomNumberGenerator;
_userRepository = userRepository;
// to remove restrictions when developing // to remove restrictions when developing
_isDev = Constants.BotVersion() == "0.0.0-DEV"; _isDev = Constants.BotVersion() == "0.0.0-DEV";
} }
@ -254,7 +257,16 @@ namespace Geekbot.Bot.Commands.Utils.Quote
private EmbedBuilder QuoteBuilder(QuoteModel quote) private EmbedBuilder QuoteBuilder(QuoteModel quote)
{ {
var user = Context.Client.GetUserAsync(quote.UserId.AsUlong()).Result ?? new UserPolyfillDto { Username = "Unknown User" }; var user = Context.Client.GetUserAsync(quote.UserId.AsUlong()).Result;
if (user == null)
{
var fallbackUserFromRepo = _userRepository.Get(quote.UserId.AsUlong());
user = new UserPolyfillDto()
{
Username = fallbackUserFromRepo?.Username ?? "Unknown User",
AvatarUrl = fallbackUserFromRepo?.AvatarUrl
};
}
var eb = new EmbedBuilder(); var eb = new EmbedBuilder();
eb.WithColor(new Color(143, 167, 232)); eb.WithColor(new Color(143, 167, 232));
if (quote.InternalId == 0) if (quote.InternalId == 0)

3
src/Core/Polyfills/UserPolyfillDto.cs
View file

@ -14,6 +14,7 @@ namespace Geekbot.Core.Polyfills
public UserStatus Status { get; set; } public UserStatus Status { get; set; }
public IImmutableSet<ClientType> ActiveClients { get; } public IImmutableSet<ClientType> ActiveClients { get; }
public string AvatarId { get; set; } public string AvatarId { get; set; }
public string AvatarUrl { get; set; }
public string Discriminator { get; set; } public string Discriminator { get; set; }
public ushort DiscriminatorValue { get; set; } public ushort DiscriminatorValue { get; set; }
public bool IsBot { get; set; } public bool IsBot { get; set; }
@ -22,7 +23,7 @@ namespace Geekbot.Core.Polyfills
public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128) public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
{ {
return "https://discordapp.com/assets/6debd47ed13483642cf09e832ed0bc1b.png"; return AvatarUrl ?? "https://discordapp.com/assets/6debd47ed13483642cf09e832ed0bc1b.png";
} }
public string GetDefaultAvatarUrl() public string GetDefaultAvatarUrl()