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

Removed DiscordClient reference from CachedPublicUser

Browse Source
This commit is contained in:
RogueException
2016-06-19 18:54:24 -03:00
parent f7b4bbf410
commit a86acaba65
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Discord.Net/DiscordClient.cs
View File

@@ -142,7 +142,7 @@ namespace Discord
}
}
else
return new DMChannel(this, new User(this, model.Recipient.Value), model);
return new DMChannel(this, new User(model.Recipient.Value), model);
}
return null;
}
@@ -150,7 +150,7 @@ namespace Discord
public virtual async Task<IReadOnlyCollection<IDMChannel>> GetDMChannelsAsync()
{
var models = await ApiClient.GetMyDMsAsync().ConfigureAwait(false);
return models.Select(x => new DMChannel(this, new User(this, x.Recipient.Value), x)).ToImmutableArray();
return models.Select(x => new DMChannel(this, new User(x.Recipient.Value), x)).ToImmutableArray();
}
/// <inheritdoc />
@@ -198,7 +198,7 @@ namespace Discord
{
var model = await ApiClient.GetUserAsync(id).ConfigureAwait(false);
if (model != null)
return new User(this, model);
return new User(model);
return null;
}
/// <inheritdoc />
@@ -206,7 +206,7 @@ namespace Discord
{
var model = await ApiClient.GetUserAsync(username, discriminator).ConfigureAwait(false);
if (model != null)
return new User(this, model);
return new User(model);
return null;
}
/// <inheritdoc />
@@ -225,7 +225,7 @@ namespace Discord
public virtual async Task<IReadOnlyCollection<IUser>> QueryUsersAsync(string query, int limit)
{
var models = await ApiClient.QueryUsersAsync(query, limit).ConfigureAwait(false);
return models.Select(x => new User(this, x)).ToImmutableArray();
return models.Select(x => new User(x)).ToImmutableArray();
}
/// <inheritdoc />

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

@@ -13,6 +13,7 @@ using System.Collections.Immutable;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Diagnostics;
namespace Discord
{
@@ -308,7 +309,7 @@ namespace Discord
internal CachedDMChannel AddDMChannel(API.Channel model, DataStore dataStore, ConcurrentHashSet<ulong> dmChannels)
{
var recipient = GetOrAddUser(model.Recipient.Value, dataStore);
var channel = recipient.AddDMChannel(model);
var channel = recipient.AddDMChannel(this, model);
dataStore.AddChannel(channel);
dmChannels.TryAdd(model.Id);
return channel;
@@ -334,7 +335,7 @@ namespace Discord
}
internal CachedPublicUser GetOrAddUser(API.User model, DataStore dataStore)
{
var user = dataStore.GetOrAddUser(model.Id, _ => new CachedPublicUser(this, model));
var user = dataStore.GetOrAddUser(model.Id, _ => new CachedPublicUser(model));
user.AddRef();
return user;
}
@@ -543,7 +544,7 @@ namespace Discord
if (guild != null)
{
foreach (var member in guild.Members)
member.User.RemoveRef();
member.User.RemoveRef(this);
await GuildUnavailable.RaiseAsync(guild).ConfigureAwait(false);
await _gatewayLogger.InfoAsync($"Disconnected from {data.Name}").ConfigureAwait(false);
@@ -692,7 +693,7 @@ namespace Discord
var user = guild.RemoveUser(data.User.Id);
if (user != null)
{
user.User.RemoveRef();
user.User.RemoveRef(this);
await UserLeft.RaiseAsync(user).ConfigureAwait(false);
}
else
@@ -813,7 +814,7 @@ namespace Discord
var data = (payload as JToken).ToObject<GuildBanEvent>(_serializer);
var guild = DataStore.GetGuild(data.GuildId);
if (guild != null)
await UserBanned.RaiseAsync(new User(this, data)).ConfigureAwait(false);
await UserBanned.RaiseAsync(new User(data)).ConfigureAwait(false);
else
{
await _gatewayLogger.WarningAsync("GUILD_BAN_ADD referenced an unknown guild.").ConfigureAwait(false);
@@ -828,7 +829,7 @@ namespace Discord
var data = (payload as JToken).ToObject<GuildBanEvent>(_serializer);
var guild = DataStore.GetGuild(data.GuildId);
if (guild != null)
await UserUnbanned.RaiseAsync(new User(this, data)).ConfigureAwait(false);
await UserUnbanned.RaiseAsync(new User(data)).ConfigureAwait(false);
else
{
await _gatewayLogger.WarningAsync("GUILD_BAN_REMOVE referenced an unknown guild.").ConfigureAwait(false);