github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatically sync guilds

Browse Source
This commit is contained in:
RogueException
2016-06-28 20:40:05 -03:00
parent 9e8b897589
commit d44163791f
1 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Discord.Net/DiscordSocketClient.cs
View File

@@ -29,8 +29,6 @@ namespace Discord
private int _lastSeq; private int _lastSeq;
private ImmutableDictionary<string, VoiceRegion> _voiceRegions; private ImmutableDictionary<string, VoiceRegion> _voiceRegions;
private TaskCompletionSource<bool> _connectTask; private TaskCompletionSource<bool> _connectTask;
private ConcurrentHashSet<ulong> _syncedGuilds;
private SemaphoreSlim _syncedGuildsLock;
private CancellationTokenSource _cancelToken; private CancellationTokenSource _cancelToken;
private Task _heartbeatTask, _guildDownloadTask, _reconnectTask; private Task _heartbeatTask, _guildDownloadTask, _reconnectTask;
private long _heartbeatTime; private long _heartbeatTime;
@@ -104,8 +102,6 @@ namespace Discord
_voiceRegions = ImmutableDictionary.Create<string, VoiceRegion>(); _voiceRegions = ImmutableDictionary.Create<string, VoiceRegion>();
_largeGuilds = new ConcurrentQueue<ulong>(); _largeGuilds = new ConcurrentQueue<ulong>();
_syncedGuilds = new ConcurrentHashSet<ulong>();
_syncedGuildsLock = new SemaphoreSlim(1, 1);
} }
protected override async Task OnLoginAsync() protected override async Task OnLoginAsync()
@@ -309,7 +305,6 @@ namespace Discord
} }
internal CachedGuild RemoveGuild(ulong id) internal CachedGuild RemoveGuild(ulong id)
{ {
_syncedGuilds.TryRemove(id);
var guild = DataStore.RemoveGuild(id); var guild = DataStore.RemoveGuild(id);
foreach (var channel in guild.Channels) foreach (var channel in guild.Channels)
guild.RemoveChannel(channel.Id); guild.RemoveChannel(channel.Id);
@@ -380,26 +375,9 @@ namespace Discord
var cachedGuilds = guilds.ToArray(); var cachedGuilds = guilds.ToArray();
if (cachedGuilds.Length == 0) return; if (cachedGuilds.Length == 0) return;
//Sync guilds var unsyncedGuilds = guilds.Select(x => x.SyncPromise).Where(x => !x.IsCompleted).ToArray();
if (ApiClient.AuthTokenType == TokenType.User) if (unsyncedGuilds.Length > 0)
{ await Task.WhenAll(unsyncedGuilds);
await _syncedGuildsLock.WaitAsync().ConfigureAwait(false);
try
{
foreach (var guild in cachedGuilds)
_syncedGuilds.TryAdd(guild.Id);
await ApiClient.SendGuildSyncAsync(_syncedGuilds).ConfigureAwait(false);
await Task.WhenAll(cachedGuilds.Select(x => x.SyncPromise));
//Reduce the list only to those with members left to download
cachedGuilds = cachedGuilds.Where(x => !x.HasAllMembers).ToArray();
if (cachedGuilds.Length == 0) return;
}
finally
{
_syncedGuildsLock.Release();
}
}
//Download offline members //Download offline members
const short batchSize = 50; const short batchSize = 50;
@@ -521,7 +499,6 @@ namespace Discord
var currentUser = new CachedSelfUser(this, data.User); var currentUser = new CachedSelfUser(this, data.User);
int unavailableGuilds = 0; int unavailableGuilds = 0;
//dataStore.GetOrAddUser(data.User.Id, _ => currentUser); //dataStore.GetOrAddUser(data.User.Id, _ => currentUser);
for (int i = 0; i < data.Guilds.Length; i++) for (int i = 0; i < data.Guilds.Length; i++)
{ {
var model = data.Guilds[i]; var model = data.Guilds[i];
@@ -536,20 +513,12 @@ namespace Discord
_currentUser = currentUser; _currentUser = currentUser;
_unavailableGuilds = unavailableGuilds; _unavailableGuilds = unavailableGuilds;
_lastGuildAvailableTime = Environment.TickCount; _lastGuildAvailableTime = Environment.TickCount;
await _syncedGuildsLock.WaitAsync().ConfigureAwait(false); DataStore = dataStore;
try
{
_syncedGuilds = new ConcurrentHashSet<ulong>();
}
finally
{
_syncedGuildsLock.Release();
}
DataStore = dataStore;
_guildDownloadTask = WaitForGuildsAsync(_cancelToken.Token); _guildDownloadTask = WaitForGuildsAsync(_cancelToken.Token);
await _readyEvent.InvokeAsync().ConfigureAwait(false); await _readyEvent.InvokeAsync().ConfigureAwait(false);
await SyncGuildsAsync().ConfigureAwait(false);
_connectTask.TrySetResult(true); //Signal the .Connect() call to complete _connectTask.TrySetResult(true); //Signal the .Connect() call to complete
await _gatewayLogger.InfoAsync("Ready").ConfigureAwait(false); await _gatewayLogger.InfoAsync("Ready").ConfigureAwait(false);
@@ -579,6 +548,7 @@ namespace Discord
if (data.Unavailable != false) if (data.Unavailable != false)
{ {
guild = AddGuild(data, DataStore); guild = AddGuild(data, DataStore);
await SyncGuildsAsync().ConfigureAwait(false);
await _joinedGuildEvent.InvokeAsync(guild).ConfigureAwait(false); await _joinedGuildEvent.InvokeAsync(guild).ConfigureAwait(false);
await _gatewayLogger.InfoAsync($"Joined {data.Name}").ConfigureAwait(false); await _gatewayLogger.InfoAsync($"Joined {data.Name}").ConfigureAwait(false);
} }
@@ -1280,5 +1250,11 @@ namespace Discord
while ((_unavailableGuilds != 0) && (Environment.TickCount - _lastGuildAvailableTime < 2000)) while ((_unavailableGuilds != 0) && (Environment.TickCount - _lastGuildAvailableTime < 2000))
await Task.Delay(500, cancelToken).ConfigureAwait(false); await Task.Delay(500, cancelToken).ConfigureAwait(false);
} }
private async Task SyncGuildsAsync()
{
var guildIds = Guilds.Where(x => x.Available).Select(x => x.Id).ToArray();
if (guildIds.Length > 0)
await ApiClient.SendGuildSyncAsync(guildIds).ConfigureAwait(false);
}
} }
} }