From 693b0df4ce8c5dec68449e11f8812e3d10196d10 Mon Sep 17 00:00:00 2001 From: Chris Johnston Date: Sat, 12 Jan 2019 11:12:19 -0800 Subject: [PATCH] Remove unnecessary extension methods and use built-in functionality --- .../Entities/Activities/Game.cs | 2 +- .../Entities/Activities/IActivity.cs | 3 +-- src/Discord.Net.Core/Entities/Users/IUser.cs | 3 +-- .../Extensions/ActivityExtensions.cs | 19 ------------------- .../Extensions/UserExtensions.cs | 11 ----------- src/Discord.Net.Rest/API/Common/Game.cs | 2 +- src/Discord.Net.Rest/API/Common/User.cs | 2 +- .../Entities/Users/RestUser.cs | 2 +- .../Entities/Users/SocketUser.cs | 2 +- 9 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 src/Discord.Net.Core/Extensions/ActivityExtensions.cs diff --git a/src/Discord.Net.Core/Entities/Activities/Game.cs b/src/Discord.Net.Core/Entities/Activities/Game.cs index 9e6efc5e7..d2d088a41 100644 --- a/src/Discord.Net.Core/Entities/Activities/Game.cs +++ b/src/Discord.Net.Core/Entities/Activities/Game.cs @@ -13,7 +13,7 @@ namespace Discord /// public ActivityType Type { get; internal set; } /// - public int Flags { get; internal set; } + public ActivityFlag Flags { get; internal set; } internal Game() { } /// diff --git a/src/Discord.Net.Core/Entities/Activities/IActivity.cs b/src/Discord.Net.Core/Entities/Activities/IActivity.cs index 44fa43d6c..869d780c9 100644 --- a/src/Discord.Net.Core/Entities/Activities/IActivity.cs +++ b/src/Discord.Net.Core/Entities/Activities/IActivity.cs @@ -24,11 +24,10 @@ namespace Discord /// /// /// This value is determined by bitwise OR-ing values together. - /// Each flag's value can be checked using /// /// /// The value of flags for this activity. /// - int Flags { get; } + ActivityFlag Flags { get; } } } diff --git a/src/Discord.Net.Core/Entities/Users/IUser.cs b/src/Discord.Net.Core/Entities/Users/IUser.cs index 2ad23a518..ae0b16a72 100644 --- a/src/Discord.Net.Core/Entities/Users/IUser.cs +++ b/src/Discord.Net.Core/Entities/Users/IUser.cs @@ -117,12 +117,11 @@ namespace Discord /// /// /// This value is determined by bitwise OR-ing values together. - /// Each flag's value can be checked using /// /// /// The value of flags for this user. /// - int Flags { get; } + UserFlag Flags { get; } /// /// The type of Nitro subscription that is active on this user's account. /// diff --git a/src/Discord.Net.Core/Extensions/ActivityExtensions.cs b/src/Discord.Net.Core/Extensions/ActivityExtensions.cs deleted file mode 100644 index 220b54dbc..000000000 --- a/src/Discord.Net.Core/Extensions/ActivityExtensions.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace Discord -{ - /// - /// Extension methods for the types. - /// - public static class ActivityExtensions - { - /// - /// Determines if the given flag is enabled with this activity. - /// - /// The user to check. - /// The to check for. - /// - /// True if the activity has this flag enabled, false otherwise. - /// - public static bool CheckActivityFlag(this IActivity activity, ActivityFlag flag) - => (activity.Flags & (int)flag) >= (int)flag; - } -} diff --git a/src/Discord.Net.Core/Extensions/UserExtensions.cs b/src/Discord.Net.Core/Extensions/UserExtensions.cs index 92a1d3769..f98bf7227 100644 --- a/src/Discord.Net.Core/Extensions/UserExtensions.cs +++ b/src/Discord.Net.Core/Extensions/UserExtensions.cs @@ -160,16 +160,5 @@ namespace Discord /// public static Task BanAsync(this IGuildUser user, int pruneDays = 0, string reason = null, RequestOptions options = null) => user.Guild.AddBanAsync(user, pruneDays, reason, options); - - /// - /// Determines if the user has a given flag applied to their account. - /// - /// The user to check. - /// The to check for. - /// - /// True if the user has the given flag on their account, otherwise false. - /// - public static bool CheckUserFlag(this IUser user, UserFlag flag) - => (user.Flags & (int)flag) >= (int)flag; } } diff --git a/src/Discord.Net.Rest/API/Common/Game.cs b/src/Discord.Net.Rest/API/Common/Game.cs index 09c74b1dc..d58b7b98b 100644 --- a/src/Discord.Net.Rest/API/Common/Game.cs +++ b/src/Discord.Net.Rest/API/Common/Game.cs @@ -34,7 +34,7 @@ namespace Discord.API [JsonProperty("session_id")] public Optional SessionId { get; set; } [JsonProperty("Flags")] - public Optional Flags { get; set; } + public Optional Flags { get; set; } [OnError] internal void OnError(StreamingContext context, ErrorContext errorContext) diff --git a/src/Discord.Net.Rest/API/Common/User.cs b/src/Discord.Net.Rest/API/Common/User.cs index e1a5d2915..c7b7de81c 100644 --- a/src/Discord.Net.Rest/API/Common/User.cs +++ b/src/Discord.Net.Rest/API/Common/User.cs @@ -24,7 +24,7 @@ namespace Discord.API [JsonProperty("mfa_enabled")] public Optional MfaEnabled { get; set; } [JsonProperty("flags")] - public Optional Flags { get; set; } + public Optional Flags { get; set; } [JsonProperty("premium_type")] public Optional PremiumType { get; set; } [JsonProperty("locale")] diff --git a/src/Discord.Net.Rest/Entities/Users/RestUser.cs b/src/Discord.Net.Rest/Entities/Users/RestUser.cs index 7d9f8a4b7..3e93d3cf4 100644 --- a/src/Discord.Net.Rest/Entities/Users/RestUser.cs +++ b/src/Discord.Net.Rest/Entities/Users/RestUser.cs @@ -33,7 +33,7 @@ namespace Discord.Rest /// public virtual bool IsWebhook => false; /// - public int Flags { get; private set; } + public UserFlag Flags { get; private set; } /// public PremiumType? PremiumType { get; private set; } /// diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs index be64c2db0..d9d5bfd1f 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs @@ -39,7 +39,7 @@ namespace Discord.WebSocket /// public UserStatus Status => Presence.Status; /// - public int Flags { get; internal set; } + public UserFlag Flags { get; internal set; } /// public PremiumType? PremiumType { get; internal set; } ///