Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feat/voice-status' into feat/voi…
Browse files Browse the repository at this point in the history
…ce-status

# Conflicts:
#	Backend/Remora.Discord.API.Abstractions/API/Objects/Permissions/DiscordPermission.cs
  • Loading branch information
VelvetToroyashi committed Apr 29, 2024
2 parents 64848c4 + 0a22fc8 commit 0d20410
Showing 1 changed file with 14 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public enum DiscordPermission
ManageWebhooks = 29,

/// <summary>
/// Allows for editing and deleting of emojis, stickers, and soundboard sounds created by all users.
/// Allows management and editing of emojis, stickers, and soundboard sounds.
/// </summary>
ManageGuildExpressions = 30,

Expand All @@ -203,7 +203,7 @@ public enum DiscordPermission
RequestToSpeak = 32,

/// <summary>
/// Allows for editing and deleting scheduled events created by all users.
/// Allows the user to manage scheduled events.
/// </summary>
ManageEvents = 33,

Expand Down Expand Up @@ -254,16 +254,10 @@ public enum DiscordPermission
UseSoundboard = 42,

/// <summary>
/// Allows for creating emojis, stickers, and soundboard sounds, as well as editing and deleting those created by
/// the current user.
/// Allows for creating emojis, stickers, and soundboard sounds, independently of managing them.
/// </summary>
CreateGuildExpressions = 43,

/// <summary>
/// Allows for creating scheduled events, as well as editing and deleting those created by the current user.
/// </summary>
CreateEvents = 44,

/// <summary>
/// Allows the usage of custom soundboard sounds from other servers.
/// </summary>
Expand All @@ -272,5 +266,15 @@ public enum DiscordPermission
/// <summary>
/// Allows for sending voice messages.
/// </summary>
SendVoiceMessages = 46
SendVoiceMessages = 46,

/// <summary>
/// Allows for interaction with Clyde (AI).
/// </summary>
UseClydeAi = 47,

/// <summary>
/// Allows for setting the status of a voice channel.
/// </summary>
SetVoiceChannelStatus = 48
}

0 comments on commit 0d20410

Please sign in to comment.