Download users back?
This commit is contained in:
Kwoth
parent
3c4cdb3e60
commit
630c71de63
@ -1 +1 @@
|
||||
Subproject commit 80384323790471d254c7db5c237a49dc62624378
|
||||
Subproject commit b57d5d738921021f6e366ab6b4eb13cd0501959d
|
||||
@ -67,7 +67,8 @@ namespace NadekoBot
|
||||
MessageCacheSize = 10,
|
||||
LogLevel = LogSeverity.Warning,
|
||||
TotalShards = Credentials.TotalShards,
|
||||
ConnectionTimeout = int.MaxValue
|
||||
ConnectionTimeout = int.MaxValue,
|
||||
AlwaysDownloadUsers = true,
|
||||
});
|
||||
#if GLOBAL_NADEKO
|
||||
Client.Log += Client_Log;
|
||||
|
||||
@ -1,199 +0,0 @@
|
||||
using Discord;
|
||||
using Discord.WebSocket;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using NLog;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace NadekoBot
|
||||
{
|
||||
public class ShardedDiscordClient
|
||||
{
|
||||
private DiscordSocketConfig discordSocketConfig;
|
||||
private Logger _log { get; }
|
||||
|
||||
public event Action<SocketGuildUser> UserJoined = delegate { };
|
||||
public event Action<SocketMessage> MessageReceived = delegate { };
|
||||
public event Action<SocketGuildUser> UserLeft = delegate { };
|
||||
public event Action<SocketUser, SocketUser> UserUpdated = delegate { };
|
||||
public event Action<SocketGuildUser, SocketGuildUser> GuildUserUpdated = delegate { };
|
||||
public event Action<Optional<SocketMessage>, SocketMessage> MessageUpdated = delegate { };
|
||||
public event Action<ulong, Optional<SocketMessage>> MessageDeleted = delegate { };
|
||||
public event Action<SocketUser, SocketGuild> UserBanned = delegate { };
|
||||
public event Action<SocketUser, SocketGuild> UserUnbanned = delegate { };
|
||||
public event Action<Optional<SocketGuild>, SocketUser, SocketPresence, SocketPresence> UserPresenceUpdated = delegate { };
|
||||
public event Action<SocketUser, SocketVoiceState, SocketVoiceState> UserVoiceStateUpdated = delegate { };
|
||||
public event Action<SocketChannel> ChannelCreated = delegate { };
|
||||
public event Action<SocketChannel> ChannelDestroyed = delegate { };
|
||||
public event Action<SocketChannel, SocketChannel> ChannelUpdated = delegate { };
|
||||
public event Action<ulong, Optional<SocketUserMessage>, SocketReaction> ReactionAdded = delegate { };
|
||||
public event Action<ulong, Optional<SocketUserMessage>, SocketReaction> ReactionRemoved = delegate { };
|
||||
public event Action<ulong, Optional<SocketUserMessage>> ReactionsCleared = delegate { };
|
||||
|
||||
public event Action<SocketGuild> JoinedGuild = delegate { };
|
||||
public event Action<SocketGuild> LeftGuild = delegate { };
|
||||
|
||||
public event Action<Exception> Disconnected = delegate { };
|
||||
public event Action Connected = delegate { };
|
||||
|
||||
private uint _connectedCount = 0;
|
||||
private uint _downloadedCount = 0;
|
||||
|
||||
private int _guildCount = 0;
|
||||
|
||||
private IReadOnlyList<DiscordSocketClient> Clients { get; }
|
||||
|
||||
public ShardedDiscordClient(DiscordSocketConfig discordSocketConfig)
|
||||
{
|
||||
_log = LogManager.GetCurrentClassLogger();
|
||||
this.discordSocketConfig = discordSocketConfig;
|
||||
|
||||
var clientList = new List<DiscordSocketClient>();
|
||||
for (int i = 0; i < discordSocketConfig.TotalShards; i++)
|
||||
{
|
||||
discordSocketConfig.ShardId = i;
|
||||
var client = new DiscordSocketClient(discordSocketConfig);
|
||||
clientList.Add(client);
|
||||
client.UserJoined += arg1 => { UserJoined(arg1); return Task.CompletedTask; };
|
||||
client.MessageReceived += arg1 =>
|
||||
{
|
||||
if (arg1.Author == null || arg1.Author.IsBot)
|
||||
return Task.CompletedTask;
|
||||
MessageReceived(arg1);
|
||||
return Task.CompletedTask;
|
||||
};
|
||||
client.UserLeft += arg1 => { UserLeft(arg1); return Task.CompletedTask; };
|
||||
client.UserUpdated += (arg1, gu2) => { UserUpdated(arg1, gu2); return Task.CompletedTask; };
|
||||
client.GuildMemberUpdated += (arg1, arg2) => { GuildUserUpdated(arg1, arg2); return Task.CompletedTask; };
|
||||
client.MessageUpdated += (arg1, m2) => { MessageUpdated(arg1, m2); return Task.CompletedTask; };
|
||||
client.MessageDeleted += (arg1, arg2) => { MessageDeleted(arg1, arg2); return Task.CompletedTask; };
|
||||
client.UserBanned += (arg1, arg2) => { UserBanned(arg1, arg2); return Task.CompletedTask; };
|
||||
client.UserUnbanned += (arg1, arg2) => { UserUnbanned(arg1, arg2); return Task.CompletedTask; };
|
||||
client.UserPresenceUpdated += (arg1, arg2, arg3, arg4) => { UserPresenceUpdated(arg1, arg2, arg3, arg4); return Task.CompletedTask; };
|
||||
client.UserVoiceStateUpdated += (arg1, arg2, arg3) => { UserVoiceStateUpdated(arg1, arg2, arg3); return Task.CompletedTask; };
|
||||
client.ChannelCreated += arg => { ChannelCreated(arg); return Task.CompletedTask; };
|
||||
client.ChannelDestroyed += arg => { ChannelDestroyed(arg); return Task.CompletedTask; };
|
||||
client.ChannelUpdated += (arg1, arg2) => { ChannelUpdated(arg1, arg2); return Task.CompletedTask; };
|
||||
client.JoinedGuild += (arg1) => { JoinedGuild(arg1); ++_guildCount; return Task.CompletedTask; };
|
||||
client.LeftGuild += (arg1) => { LeftGuild(arg1); --_guildCount; return Task.CompletedTask; };
|
||||
client.ReactionAdded += (arg1, arg2, arg3) => { ReactionAdded(arg1, arg2, arg3); return Task.CompletedTask; };
|
||||
client.ReactionRemoved += (arg1, arg2, arg3) => { ReactionRemoved(arg1, arg2, arg3); return Task.CompletedTask; };
|
||||
client.ReactionsCleared += (arg1, arg2) => { ReactionsCleared(arg1, arg2); return Task.CompletedTask; };
|
||||
|
||||
_log.Info($"Shard #{i} initialized.");
|
||||
#if GLOBAL_NADEKO
|
||||
client.Log += Client_Log;
|
||||
#endif
|
||||
var j = i;
|
||||
client.Disconnected += (ex) =>
|
||||
{
|
||||
_log.Error("Shard #{0} disconnected", j);
|
||||
_log.Error(ex, ex?.Message ?? "No error");
|
||||
return Task.CompletedTask;
|
||||
};
|
||||
}
|
||||
|
||||
Clients = clientList.AsReadOnly();
|
||||
}
|
||||
|
||||
private Task Client_Log(LogMessage arg)
|
||||
{
|
||||
_log.Warn(arg.Message);
|
||||
_log.Error(arg.Exception);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public DiscordSocketClient MainClient =>
|
||||
Clients[0];
|
||||
|
||||
public SocketSelfUser CurrentUser =>
|
||||
Clients[0].CurrentUser;
|
||||
|
||||
public IEnumerable<SocketGuild> GetGuilds() =>
|
||||
Clients.SelectMany(c => c.Guilds);
|
||||
|
||||
public int GetGuildsCount() =>
|
||||
_guildCount;
|
||||
|
||||
public SocketGuild GetGuild(ulong id)
|
||||
{
|
||||
foreach (var c in Clients)
|
||||
{
|
||||
var g = c.GetGuild(id);
|
||||
if (g != null)
|
||||
return g;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public Task<IDMChannel> GetDMChannelAsync(ulong channelId) =>
|
||||
Clients[0].GetDMChannelAsync(channelId);
|
||||
|
||||
internal async Task LoginAsync(TokenType tokenType, string token)
|
||||
{
|
||||
foreach (var c in Clients)
|
||||
{
|
||||
await c.LoginAsync(tokenType, token).ConfigureAwait(false);
|
||||
_log.Info($"Shard #{c.ShardId} logged in.");
|
||||
}
|
||||
}
|
||||
|
||||
internal async Task ConnectAsync()
|
||||
{
|
||||
|
||||
foreach (var c in Clients)
|
||||
{
|
||||
try
|
||||
{
|
||||
var sw = Stopwatch.StartNew();
|
||||
await c.ConnectAsync().ConfigureAwait(false);
|
||||
sw.Stop();
|
||||
_log.Info($"Shard #{c.ShardId} connected after {sw.Elapsed.TotalSeconds:F2}s ({++_connectedCount}/{Clients.Count})");
|
||||
_guildCount += c.Guilds.Count;
|
||||
}
|
||||
catch
|
||||
{
|
||||
_log.Error($"Shard #{c.ShardId} FAILED CONNECTING.");
|
||||
try { await c.ConnectAsync().ConfigureAwait(false); }
|
||||
catch (Exception ex2)
|
||||
{
|
||||
_log.Error($"Shard #{c.ShardId} FAILED CONNECTING TWICE.");
|
||||
_log.Error(ex2);
|
||||
}
|
||||
}
|
||||
}
|
||||
Connected();
|
||||
}
|
||||
|
||||
internal Task DownloadAllUsersAsync() =>
|
||||
Task.WhenAll(Clients.Select(async c =>
|
||||
{
|
||||
var sw = Stopwatch.StartNew();
|
||||
await c.DownloadAllUsersAsync().ConfigureAwait(false);
|
||||
sw.Stop();
|
||||
_log.Info($"Shard #{c.ShardId} downloaded {c.Guilds.Sum(g => g.Users.Count)} users after {sw.Elapsed.TotalSeconds:F2}s ({++_downloadedCount}/{Clients.Count}).");
|
||||
}));
|
||||
|
||||
public Task SetGame(string game) => Task.WhenAll(Clients.Select(ms => ms.SetGameAsync(game)));
|
||||
|
||||
|
||||
public Task SetStream(string name, string url) => Task.WhenAll(Clients.Select(ms => ms.SetGameAsync(name, url, StreamType.Twitch)));
|
||||
|
||||
//public Task SetStatus(SettableUserStatus status) => Task.WhenAll(Clients.Select(ms => ms.SetStatusAsync(SettableUserStatusToUserStatus(status))));
|
||||
}
|
||||
|
||||
public enum SettableUserStatus
|
||||
{
|
||||
Online = 1,
|
||||
On = 1,
|
||||
Invisible = 2,
|
||||
Invis = 2,
|
||||
Idle = 3,
|
||||
Afk = 3,
|
||||
Dnd = 4,
|
||||
DoNotDisturb = 4,
|
||||
Busy = 4,
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user