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

Removed _userId references

Browse Source
This commit is contained in:
RogueException
2015-12-10 15:44:55 -04:00
parent 3c22ed519c
commit 910b4c4c3d
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net/DiscordClient.Channels.cs
View File

@@ -136,7 +136,7 @@ namespace Discord
channel = user.Global.PrivateChannel; channel = user.Global.PrivateChannel;
if (channel == null) if (channel == null)
{ {
var response = await _api.CreatePMChannel(_userId.Value, user.Id).ConfigureAwait(false); var response = await _api.CreatePMChannel(_privateUser.Id, user.Id).ConfigureAwait(false);
var recipient = _users.GetOrAdd(response.Recipient.Id, null); var recipient = _users.GetOrAdd(response.Recipient.Id, null);
recipient.Update(response.Recipient); recipient.Update(response.Recipient);
channel = _channels.GetOrAdd(response.Id, response.GuildId, response.Recipient.Id); channel = _channels.GetOrAdd(response.Id, response.GuildId, response.Recipient.Id);

4
src/Discord.Net/DiscordClient.Messages.cs
View File

@@ -195,13 +195,13 @@ namespace Discord
if (Config.UseMessageQueue) if (Config.UseMessageQueue)
{ {
var nonce = GenerateNonce(); var nonce = GenerateNonce();
msg = _messages.GetOrAdd(nonce, channel.Id, _userId.Value); msg = _messages.GetOrAdd(nonce, channel.Id, _privateUser.Id);
var currentUser = msg.User; var currentUser = msg.User;
msg.Update(new MessageInfo msg.Update(new MessageInfo
{ {
Content = text, Content = text,
Timestamp = DateTime.UtcNow, Timestamp = DateTime.UtcNow,
Author = new UserReference { Avatar = currentUser.AvatarId, Discriminator = currentUser.Discriminator, Id = _userId.Value, Username = currentUser.Name }, Author = new UserReference { Avatar = currentUser.AvatarId, Discriminator = currentUser.Discriminator, Id = _privateUser.Id, Username = currentUser.Name },
ChannelId = channel.Id, ChannelId = channel.Id,
Nonce = IdConvert.ToString(nonce), Nonce = IdConvert.ToString(nonce),
IsTextToSpeech = isTextToSpeech IsTextToSpeech = isTextToSpeech

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

@@ -58,7 +58,6 @@ namespace Discord
private readonly object _cacheLock; private readonly object _cacheLock;
private Logger _logger, _restLogger, _cacheLogger; private Logger _logger, _restLogger, _cacheLogger;
private bool _sentInitialLog; private bool _sentInitialLog;
private long? _userId;
private UserStatus _status; private UserStatus _status;
private int? _gameId; private int? _gameId;
private Task _runTask; private Task _runTask;
@@ -413,7 +412,7 @@ namespace Discord
await _webSocket.SignalDisconnect().ConfigureAwait(false); await _webSocket.SignalDisconnect().ConfigureAwait(false);
_userId = null; _privateUser = null;
_gateway = null; _gateway = null;
_token = null; _token = null;
@@ -664,7 +663,7 @@ namespace Discord
var data = e.Payload.ToObject<MessageCreateEvent>(_webSocket.Serializer); var data = e.Payload.ToObject<MessageCreateEvent>(_webSocket.Serializer);
Message msg = null; Message msg = null;
bool isAuthor = data.Author.Id == _userId; bool isAuthor = data.Author.Id == _privateUser.Id;
int nonce = 0; int nonce = 0;
if (data.Author.Id == _privateUser.Id && Config.UseMessageQueue) if (data.Author.Id == _privateUser.Id && Config.UseMessageQueue)