Browse Source

[Feature] Add support for Guild Member Flags (#2571)

* implement `GuildUserFlags`

Co-authored-by: Casmir <68127614+csmir@users.noreply.github.com>
pull/2572/head
Misha133 GitHub 2 years ago
parent
commit
7d8d6ec1a6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 80 additions and 1 deletions
  1. +42
    -0
      src/Discord.Net.Core/Entities/Users/GuildUserFlags.cs
  2. +8
    -0
      src/Discord.Net.Core/Entities/Users/GuildUserProperties.cs
  3. +5
    -0
      src/Discord.Net.Core/Entities/Users/IGuildUser.cs
  4. +3
    -0
      src/Discord.Net.Rest/API/Common/GuildMember.cs
  5. +3
    -0
      src/Discord.Net.Rest/API/Rest/ModifyGuildMemberParams.cs
  6. +5
    -0
      src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs
  7. +2
    -0
      src/Discord.Net.Rest/Entities/Users/RestWebhookUser.cs
  8. +2
    -1
      src/Discord.Net.Rest/Entities/Users/UserHelper.cs
  9. +4
    -0
      src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs
  10. +4
    -0
      src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs
  11. +2
    -0
      src/Discord.Net.WebSocket/Entities/Users/SocketWebhookUser.cs

+ 42
- 0
src/Discord.Net.Core/Entities/Users/GuildUserFlags.cs View File

@@ -0,0 +1,42 @@
namespace Discord;


/// <summary>
/// Represents public flags for a guild member.
/// </summary>
public enum GuildUserFlags
{
/// <summary>
/// Member has no flags set.
/// </summary>
None = 0,

/// <summary>
/// Member has left and rejoined the guild.
/// </summary>
/// <remarks>
/// Cannot be modified.
/// </remarks>
DidRejoin = 1 << 0,

/// <summary>
/// Member has completed onboarding.
/// </summary>
/// <remarks>
/// Cannot be modified.
/// </remarks>
CompletedOnboarding = 1 << 1,

/// <summary>
/// Member bypasses guild verification requirements.
/// </summary>
BypassesVerification = 1 << 2,

/// <summary>
/// Member has started onboarding.
/// </summary>
/// <remarks>
/// Cannot be modified.
/// </remarks>
StartedOnboarding = 1 << 3,
}

+ 8
- 0
src/Discord.Net.Core/Entities/Users/GuildUserProperties.cs View File

@@ -82,5 +82,13 @@ namespace Discord
/// <see langword="null"/> or a time in the past to clear a currently existing timeout.
/// </remarks>
public Optional<DateTimeOffset?> TimedOutUntil { get; set; }

/// <summary>
/// Gets or sets the flags of the guild member.
/// </summary>
/// <remarks>
/// Not all flags can be modified, these are reserved for Discord.
/// </remarks>
public Optional<GuildUserFlags> Flags { get; set; }
}
}

+ 5
- 0
src/Discord.Net.Core/Entities/Users/IGuildUser.cs View File

@@ -112,6 +112,11 @@ namespace Discord
DateTimeOffset? TimedOutUntil { get; }

/// <summary>
/// Gets the public flags for this guild member.
/// </summary>
GuildUserFlags Flags { get; }

/// <summary>
/// Gets the level permissions granted to this user to a given channel.
/// </summary>
/// <example>


+ 3
- 0
src/Discord.Net.Rest/API/Common/GuildMember.cs View File

@@ -25,5 +25,8 @@ namespace Discord.API
public Optional<DateTimeOffset?> PremiumSince { get; set; }
[JsonProperty("communication_disabled_until")]
public Optional<DateTimeOffset?> TimedOutUntil { get; set; }

[JsonProperty("flags")]
public GuildUserFlags Flags { get; set; }
}
}

+ 3
- 0
src/Discord.Net.Rest/API/Rest/ModifyGuildMemberParams.cs View File

@@ -18,5 +18,8 @@ namespace Discord.API.Rest
public Optional<ulong?> ChannelId { get; set; }
[JsonProperty("communication_disabled_until")]
public Optional<DateTimeOffset?> TimedOutUntil { get; set; }

[JsonProperty("flags")]
public Optional<GuildUserFlags> Flags { get; set; }
}
}

+ 5
- 0
src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs View File

@@ -38,6 +38,10 @@ namespace Discord.Rest
public ulong GuildId { get; }
/// <inheritdoc />
public bool? IsPending { get; private set; }

/// <inheritdoc />
public GuildUserFlags Flags { get; private set; }

/// <inheritdoc />
public int Hierarchy
{
@@ -114,6 +118,7 @@ namespace Discord.Rest
_timedOutTicks = model.TimedOutUntil.Value?.UtcTicks;
if (model.Pending.IsSpecified)
IsPending = model.Pending.Value;
Flags = model.Flags;
}
private void UpdateRoles(ulong[] roleIds)
{


+ 2
- 0
src/Discord.Net.Rest/Entities/Users/RestWebhookUser.cs View File

@@ -71,6 +71,8 @@ namespace Discord.Rest
DateTimeOffset? IGuildUser.TimedOutUntil => null;
/// <inheritdoc />
GuildPermissions IGuildUser.GuildPermissions => GuildPermissions.Webhook;
/// <inheritdoc />
GuildUserFlags IGuildUser.Flags => GuildUserFlags.None;

/// <inheritdoc />
ChannelPermissions IGuildUser.GetPermissions(IGuildChannel channel) => Permissions.ToChannelPerms(channel, GuildPermissions.Webhook.RawValue);


+ 2
- 1
src/Discord.Net.Rest/Entities/Users/UserHelper.cs View File

@@ -40,7 +40,8 @@ namespace Discord.Rest
Deaf = args.Deaf,
Mute = args.Mute,
Nickname = args.Nickname,
TimedOutUntil = args.TimedOutUntil
TimedOutUntil = args.TimedOutUntil,
Flags = args.Flags
};

if (args.Channel.IsSpecified)


+ 4
- 0
src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs View File

@@ -71,6 +71,8 @@ namespace Discord.WebSocket
/// <inheritdoc />
public bool? IsPending { get; private set; }

/// <inheritdoc />
public GuildUserFlags Flags { get; private set; }

/// <inheritdoc />
public DateTimeOffset? JoinedAt => DateTimeUtils.FromTicks(_joinedAtTicks);
@@ -179,6 +181,8 @@ namespace Discord.WebSocket
_timedOutTicks = model.TimedOutUntil.Value?.UtcTicks;
if (model.Pending.IsSpecified)
IsPending = model.Pending.Value;

Flags = model.Flags;
}
internal void Update(ClientState state, PresenceModel model, bool updatePresence)
{


+ 4
- 0
src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs View File

@@ -127,6 +127,10 @@ namespace Discord.WebSocket
=> GuildUser.IsVideoing;

/// <inheritdoc/>
public GuildUserFlags Flags
=> GuildUser.Flags;

/// <inheritdoc/>
public DateTimeOffset? RequestToSpeakTimestamp
=> GuildUser.RequestToSpeakTimestamp;



+ 2
- 0
src/Discord.Net.WebSocket/Entities/Users/SocketWebhookUser.cs View File

@@ -84,6 +84,8 @@ namespace Discord.WebSocket
int IGuildUser.Hierarchy => 0;
/// <inheritdoc />
GuildPermissions IGuildUser.GuildPermissions => GuildPermissions.Webhook;
/// <inheritdoc />
GuildUserFlags IGuildUser.Flags => GuildUserFlags.None;

/// <inheritdoc />
ChannelPermissions IGuildUser.GetPermissions(IGuildChannel channel) => Permissions.ToChannelPerms(channel, GuildPermissions.Webhook.RawValue);


Loading…
Cancel
Save