Rename Flag enum types to use Properties suffix

src/Discord.Net.Core/Entities/Activities/ActivityFlag.cs → src/Discord.Net.Core/Entities/Activities/ActivityProperties.cs

@@ -7,7 +7,7 @@ namespace Discord
     ///     These describe what the activity payload includes.
     /// </summary>
     [Flags]
-    public enum ActivityFlag
+    public enum ActivityProperties
     {
         /// <summary>
         ///     Indicates that no actions on this activity can be taken.

src/Discord.Net.Core/Entities/Activities/Game.cs

@@ -13,7 +13,7 @@ namespace Discord
         /// <inheritdoc/>
         public ActivityType Type { get; internal set; }
         /// <inheritdoc/>
-        public ActivityFlag Flags { get; internal set; }
+        public ActivityProperties Flags { get; internal set; }
 
         internal Game() { }
         /// <summary>

src/Discord.Net.Core/Entities/Activities/IActivity.cs

@@ -23,11 +23,11 @@ namespace Discord
         ///     Gets the flags that are relevant to this activity.
         /// </summary>
         /// <remarks>
-        ///     This value is determined by bitwise OR-ing <see cref="ActivityFlag"/> values together.
+        ///     This value is determined by bitwise OR-ing <see cref="ActivityProperties"/> values together.
         /// </remarks>
         /// <returns>
         ///     The value of flags for this activity.
         /// </returns>
-        ActivityFlag Flags { get; }
+        ActivityProperties Flags { get; }
     }
 }

src/Discord.Net.Core/Entities/Users/IUser.cs

@@ -116,12 +116,12 @@ namespace Discord
         ///     Gets the flags that are applied to a user's account.
         /// </summary>
         /// <remarks>
-        ///     This value is determined by bitwise OR-ing <see cref="UserFlag"/> values together.
+        ///     This value is determined by bitwise OR-ing <see cref="UserProperties"/> values together.
         /// </remarks>
         /// <returns>
         ///     The value of flags for this user.
         /// </returns>
-        UserFlag Flags { get; }
+        UserProperties Flags { get; }
         /// <summary>
         ///     Gets the type of Nitro subscription that is active on this user's account.
         /// </summary>

src/Discord.Net.Core/Entities/Users/UserFlag.cs → src/Discord.Net.Core/Entities/Users/UserProperties.cs

@@ -3,7 +3,7 @@ using System;
 namespace Discord
 {
     [Flags]
-    public enum UserFlag
+    public enum UserProperties
     {
         /// <summary>
         ///     Default value for flags, when none are given to an account.

src/Discord.Net.Rest/API/Common/Game.cs

@@ -34,7 +34,7 @@ namespace Discord.API
         [JsonProperty("session_id")]
         public Optional<string> SessionId { get; set; }
         [JsonProperty("Flags")]
-        public Optional<ActivityFlag> Flags { get; set; }
+        public Optional<ActivityProperties> Flags { get; set; }
 
         [OnError]
         internal void OnError(StreamingContext context, ErrorContext errorContext)

src/Discord.Net.Rest/API/Common/User.cs

@@ -24,7 +24,7 @@ namespace Discord.API
         [JsonProperty("mfa_enabled")]
         public Optional<bool> MfaEnabled { get; set; }
         [JsonProperty("flags")]
-        public Optional<UserFlag> Flags { get; set; }
+        public Optional<int> Flags { get; set; }
         [JsonProperty("premium_type")]
         public Optional<PremiumType> PremiumType { get; set; }
         [JsonProperty("locale")]

src/Discord.Net.Rest/Entities/Users/RestUser.cs

@@ -33,7 +33,7 @@ namespace Discord.Rest
         /// <inheritdoc />
         public virtual bool IsWebhook => false;
         /// <inheritdoc />
-        public UserFlag Flags { get; private set; }
+        public UserProperties Flags { get; private set; }
         /// <inheritdoc />
         public PremiumType? PremiumType { get; private set; }
         /// <inheritdoc />
@@ -66,7 +66,7 @@ namespace Discord.Rest
             if (model.Username.IsSpecified)
                 Username = model.Username.Value;
             if (model.Flags.IsSpecified)
-                Flags = model.Flags.Value;
+                Flags = (UserProperties) model.Flags.Value;
             if (model.PremiumType.IsSpecified)
                 PremiumType = model.PremiumType.Value;
             if (model.Locale.IsSpecified)

src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs

@@ -39,7 +39,7 @@ namespace Discord.WebSocket
         /// <inheritdoc />
         public UserStatus Status => Presence.Status;
         /// <inheritdoc />
-        public UserFlag Flags { get; internal set; }
+        public UserProperties Flags { get; internal set; }
         /// <inheritdoc />
         public PremiumType? PremiumType { get; internal set; }
         /// <inheritdoc />
@@ -81,9 +81,9 @@ namespace Discord.WebSocket
                 Username = model.Username.Value;
                 hasChanges = true;
             }
-            if (model.Flags.IsSpecified && model.Flags.Value != Flags)
+            if (model.Flags.IsSpecified ) // && model.Flags.Value != Flags)
             {
-                Flags = model.Flags.Value;
+                Flags = (UserProperties) model.Flags.Value;
                 hasChanges = true;
             }
             if (model.PremiumType.IsSpecified && model.PremiumType.Value != PremiumType)