From b22d704001fb85e8b38aed9128dfed0e61516c31 Mon Sep 17 00:00:00 2001 From: RogueException Date: Thu, 20 Oct 2016 04:31:52 -0300 Subject: [PATCH] Renamed SocketGuild.GetCurrentUser -> CurrentUser --- .../Entities/Guilds/SocketGuild.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs index 11ac15248..d5d93f991 100644 --- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs +++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs @@ -59,6 +59,16 @@ namespace Discord.WebSocket public bool IsSynced => _syncPromise.Task.IsCompleted; public Task SyncPromise => _syncPromise.Task; public Task DownloaderPromise => _downloaderPromise.Task; + public SocketGuildUser CurrentUser + { + get + { + SocketGuildUser member; + if (_members.TryGetValue(Discord.CurrentUser.Id, out member)) + return member; + return null; + } + } public SocketRole EveryoneRole => GetRole(Id); public IReadOnlyCollection Channels @@ -338,13 +348,6 @@ namespace Discord.WebSocket return member; return null; } - public SocketGuildUser GetCurrentUser() - { - SocketGuildUser member; - if (_members.TryGetValue(Discord.CurrentUser.Id, out member)) - return member; - return null; - } public Task PruneUsersAsync(int days = 30, bool simulate = false, RequestOptions options = null) => GuildHelper.PruneUsersAsync(this, Discord, days, simulate, options); @@ -562,7 +565,7 @@ namespace Discord.WebSocket Task IGuild.GetUserAsync(ulong id, CacheMode mode, RequestOptions options) => Task.FromResult(GetUser(id)); Task IGuild.GetCurrentUserAsync(CacheMode mode, RequestOptions options) - => Task.FromResult(GetCurrentUser()); + => Task.FromResult(CurrentUser); Task IGuild.DownloadUsersAsync() { throw new NotSupportedException(); } } }