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

Only update status if we've received a Ready

Browse Source
This commit is contained in:
Ske 2020-05-09 15:49:45 +02:00
parent a3517f8663
commit 65bac86ac1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PluralKit.Bot/Bot.cs
View File

@ -32,6 +32,7 @@ namespace PluralKit.Bot
private readonly PeriodicStatCollector _collector; private readonly PeriodicStatCollector _collector;
private readonly IMetrics _metrics; private readonly IMetrics _metrics;
private bool _hasReceivedReady = false;
private Timer _periodicTask; // Never read, just kept here for GC reasons private Timer _periodicTask; // Never read, just kept here for GC reasons
public Bot(DiscordShardedClient client, ILifetimeScope services, ILogger logger, PeriodicStatCollector collector, IMetrics metrics) public Bot(DiscordShardedClient client, ILifetimeScope services, ILogger logger, PeriodicStatCollector collector, IMetrics metrics)
@ -58,7 +59,11 @@ namespace PluralKit.Bot
_client.MessageReactionAdded += HandleEvent; _client.MessageReactionAdded += HandleEvent;
// Update shard status for shards immediately on connect // Update shard status for shards immediately on connect
_client.Ready += args => UpdateBotStatus(args.Client); _client.Ready += args =>
{
_hasReceivedReady = true;
return UpdateBotStatus(args.Client);
};
_client.Resumed += args => UpdateBotStatus(args.Client); _client.Resumed += args => UpdateBotStatus(args.Client);
// Init the shard stuff // Init the shard stuff
@ -83,6 +88,7 @@ namespace PluralKit.Bot
// Send users a lil status message // Send users a lil status message
// We're not actually properly disconnecting from the gateway (lol) so it'll linger for a few minutes // We're not actually properly disconnecting from the gateway (lol) so it'll linger for a few minutes
// Should be plenty of time for the bot to connect again next startup and set the real status // Should be plenty of time for the bot to connect again next startup and set the real status
if (_hasReceivedReady)
await _client.UpdateStatusAsync(new DiscordActivity("Restarting... (please wait)")); await _client.UpdateStatusAsync(new DiscordActivity("Restarting... (please wait)"));
} }
@ -161,6 +167,9 @@ namespace PluralKit.Bot
private async Task UpdateBotStatus(DiscordClient specificShard = null) private async Task UpdateBotStatus(DiscordClient specificShard = null)
{ {
// If we're not on any shards, don't bother (this happens if the periodic timer fires before the first Ready)
if (!_hasReceivedReady) return;
var totalGuilds = _client.ShardClients.Values.Sum(c => c.Guilds.Count); var totalGuilds = _client.ShardClients.Values.Sum(c => c.Guilds.Count);
try // DiscordClient may throw an exception if the socket is closed (e.g just after OP 7 received) try // DiscordClient may throw an exception if the socket is closed (e.g just after OP 7 received)
{ {