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

Allow starting bot before all shards are up

Browse Source
This commit is contained in:
Ske 2019-10-27 13:01:33 +01:00
parent eb62602fbb
commit aed38f37f7
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PluralKit.Bot/Bot.cs
View File

@ -151,11 +151,6 @@ namespace PluralKit.Bot
_client.MessageReceived += (msg) => _client.MessageReceived += (msg) =>
{ {
// _client.CurrentUser will be null if we've connected *some* shards but not shard #0 yet
// This will cause an error in WebhookCacheService so we just workaround and don't process any messages
// until we properly connect. TODO: can we do this without chucking away a bunch of messages?
if (_client.CurrentUser == null) return Task.CompletedTask;
return HandleEvent(s => s.AddMessageBreadcrumb(msg), eh => eh.HandleMessage(msg)); return HandleEvent(s => s.AddMessageBreadcrumb(msg), eh => eh.HandleMessage(msg));
}; };
_client.ReactionAdded += (msg, channel, reaction) => HandleEvent(s => s.AddReactionAddedBreadcrumb(msg, channel, reaction), eh => eh.HandleReactionAdded(msg, channel, reaction)); _client.ReactionAdded += (msg, channel, reaction) => HandleEvent(s => s.AddReactionAddedBreadcrumb(msg, channel, reaction), eh => eh.HandleReactionAdded(msg, channel, reaction));

10
PluralKit.Bot/Services/WebhookCacheService.cs
View File

@ -5,6 +5,8 @@ using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using Discord; using Discord;
using Discord.Webhook; using Discord.Webhook;
using Discord.WebSocket;
using Serilog; using Serilog;
namespace PluralKit.Bot namespace PluralKit.Bot
@ -13,21 +15,21 @@ namespace PluralKit.Bot
{ {
public static readonly string WebhookName = "PluralKit Proxy Webhook"; public static readonly string WebhookName = "PluralKit Proxy Webhook";
private IDiscordClient _client; private DiscordShardedClient _client;
private ConcurrentDictionary<ulong, Lazy<Task<IWebhook>>> _webhooks; private ConcurrentDictionary<ulong, Lazy<Task<IWebhook>>> _webhooks;
private ILogger _logger; private ILogger _logger;
public WebhookCacheService(IDiscordClient client, ILogger logger) public WebhookCacheService(IDiscordClient client, ILogger logger)
{ {
_client = client; _client = client as DiscordShardedClient;
_logger = logger.ForContext<WebhookCacheService>(); _logger = logger.ForContext<WebhookCacheService>();
_webhooks = new ConcurrentDictionary<ulong, Lazy<Task<IWebhook>>>(); _webhooks = new ConcurrentDictionary<ulong, Lazy<Task<IWebhook>>>();
} }
public async Task<IWebhook> GetWebhook(ulong channelId) public async Task<IWebhook> GetWebhook(ulong channelId)
{ {
var channel = await _client.GetChannelAsync(channelId) as ITextChannel; var channel = _client.GetChannel(channelId) as ITextChannel;
if (channel == null) return null; if (channel == null) return null;
return await GetWebhook(channel); return await GetWebhook(channel);
} }
@ -83,7 +85,7 @@ namespace PluralKit.Bot
return channel.CreateWebhookAsync(WebhookName); return channel.CreateWebhookAsync(WebhookName);
} }
private bool IsWebhookMine(IWebhook arg) => arg.Creator.Id == _client.CurrentUser.Id && arg.Name == WebhookName; private bool IsWebhookMine(IWebhook arg) => arg.Creator.Id == _client.GetShardFor(arg.Guild).CurrentUser.Id && arg.Name == WebhookName;
public int CacheSize => _webhooks.Count; public int CacheSize => _webhooks.Count;
} }