Skip to content

Implemented PATCH /guilds/:guild_id/roles (untested) #1311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OoLunar merged 1 commit into from
Aug 5, 2022
Merged

Implemented PATCH /guilds/:guild_id/roles (untested) #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions DSharpPlus/Entities/Guild/DiscordGuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,25 @@ public async Task<DiscordGuild> ModifyAsync(Action<GuildEditModel> action)
mdl.SystemChannelFlags, mdl.AuditLogReason).ConfigureAwait(false);
}

/// <summary>
/// Batch modifies the role order in the guild.
/// </summary>
/// <param name="roles">A dictionary of guild roles indexed by their new role positions.</param>
/// <param name="reason">An optional Audit log reason on why this action was done.</param>
/// <returns>A list of all the current guild roles ordered in their new role positions.</returns>
public async Task<IReadOnlyList<DiscordRole>> ModifyRolePositionsAsync(IDictionary<int, DiscordRole> roles, string reason = null)
{
if (roles.Count == 0)
throw new ArgumentException("Roles cannot be empty.", nameof(roles));

// Sort the roles by position and create skeleton roles for the payload.
var returnedRoles = await this.Discord.ApiClient.ModifyGuildRolePositionsAsync(this.Id, roles.Select(x => new RestGuildRoleReorderPayload() { RoleId = x.Value.Id, Position = x.Key }), reason).ConfigureAwait(false);

// Update the cache as the endpoint returns all roles in the order they were sent.
this._roles = new(returnedRoles.Select(x => new KeyValuePair<ulong, DiscordRole>(x.Id, x)));
return returnedRoles;
}

/// <summary>
/// Bans a specified member from this guild.
/// </summary>
Expand Down Expand Up @@ -2436,9 +2455,9 @@ public async Task<IReadOnlyList<DiscordAuditLogEntry>> GetAuditLogsAsync(int? li
};

var threadentry = entry as DiscordAuditLogThreadEventEntry;
foreach(var xc in xac.Changes)
foreach (var xc in xac.Changes)
{
switch(xc.Key.ToLowerInvariant())
switch (xc.Key.ToLowerInvariant())
{
case "name":
threadentry.Name = new PropertyChange<string?>
Expand Down
22 changes: 22 additions & 0 deletions DSharpPlus/Net/Rest/DiscordApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,28 @@ internal Task ModifyGuildRolePositionAsync(ulong guild_id, IEnumerable<RestGuild
return this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(pld));
}

internal async Task<DiscordRole[]> ModifyGuildRolePositionsAsync(ulong guild_id, IEnumerable<RestGuildRoleReorderPayload> newRolePositions, string reason)
{
var headers = Utilities.GetBaseHeaders();
if (!string.IsNullOrWhiteSpace(reason))
headers[REASON_HEADER_NAME] = reason;

var route = $"{Endpoints.GUILDS}/:guild_id{Endpoints.ROLES}";
var bucket = this.Rest.GetBucket(RestRequestMethod.PATCH, route, new { guild_id }, out var path);

var url = Utilities.GetApiUriFor(path);
var res = await this.DoRequestAsync(this.Discord, bucket, url, RestRequestMethod.PATCH, route, headers, DiscordJson.SerializeObject(newRolePositions)).ConfigureAwait(false);

var ret = JsonConvert.DeserializeObject<DiscordRole[]>(res.Response);
foreach (var r in ret)
{
r.Discord = this.Discord;
r._guild_id = guild_id;
}

return ret;
}

internal async Task<AuditLog> GetAuditLogsAsync(ulong guild_id, int limit, ulong? after, ulong? before, ulong? responsible, int? action_type)
{
var urlparams = new Dictionary<string, string>
Expand Down