github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Some IDiscordClient methods are not properly implemented in clients (#2774)

Browse Source 
* Add proper implementations of CreateGlobalApplicationCommand and BulkOverwriteGlobalApplicationCommand

* Update all shards
This commit is contained in:
FluffyDoggo
2023-09-15 00:46:51 -05:00
committed by GitHub
parent 8591de7119
commit 8baf913c9d
3 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net.Rest/DiscordRestClient.cs
View File

@@ -371,6 +371,12 @@ namespace Discord.Rest
/// <inheritdoc />
async Task<IApplicationCommand> IDiscordClient.GetGlobalApplicationCommandAsync(ulong id, RequestOptions options)
=> await ClientHelper.GetGlobalApplicationCommandAsync(this, id, options).ConfigureAwait(false);
/// <inheritdoc />
async Task<IApplicationCommand> IDiscordClient.CreateGlobalApplicationCommand(ApplicationCommandProperties properties, RequestOptions options)
=> await CreateGlobalCommand(properties, options).ConfigureAwait(false);
/// <inheritdoc />
async Task<IReadOnlyCollection<IApplicationCommand>> IDiscordClient.BulkOverwriteGlobalApplicationCommand(ApplicationCommandProperties[] properties, RequestOptions options)
=> await BulkOverwriteGlobalCommands(properties, options).ConfigureAwait(false);
#endregion
}
}

49
src/Discord.Net.WebSocket/DiscordShardedClient.cs
View File

@@ -519,6 +519,49 @@ namespace Discord.WebSocket
client.WebhooksUpdated += (arg1, arg2) => _webhooksUpdated.InvokeAsync(arg1, arg2);
client.AuditLogCreated += (arg1, arg2) => _auditLogCreated.InvokeAsync(arg1, arg2);
}
public async Task<SocketApplicationCommand> CreateGlobalApplicationCommandAsync(ApplicationCommandProperties properties, RequestOptions options = null)
{
var model = await InteractionHelper.CreateGlobalCommandAsync(this, properties, options).ConfigureAwait(false);
SocketApplicationCommand entity = null;
foreach (var shard in _shards)
{
entity = shard.State.GetOrAddCommand(model.Id, (id) => SocketApplicationCommand.Create(shard, model));
//Update it in case it was cached
entity.Update(model);
}
System.Diagnostics.Debug.Assert(entity != null, "There should be at least one shard to get the entity");
return entity;
}
public async Task<IReadOnlyCollection<SocketApplicationCommand>> BulkOverwriteGlobalApplicationCommandsAsync(
ApplicationCommandProperties[] properties, RequestOptions options = null)
{
var models = await InteractionHelper.BulkOverwriteGlobalCommandsAsync(this, properties, options);
IEnumerable<SocketApplicationCommand> entities = null;
foreach (var shard in _shards)
{
entities = models.Select(x => SocketApplicationCommand.Create(shard, x));
//Purge our previous commands
shard.State.PurgeCommands(x => x.IsGlobalCommand);
foreach (var entity in entities)
{
shard.State.AddCommand(entity);
}
}
System.Diagnostics.Debug.Assert(entities != null, "There should be at least one shard to get the entities");
return entities.ToImmutableArray();
}
#endregion
#region IDiscordClient
@@ -578,6 +621,12 @@ namespace Discord.WebSocket
{
return await GetVoiceRegionAsync(id).ConfigureAwait(false);
}
/// <inheritdoc />
async Task<IApplicationCommand> IDiscordClient.CreateGlobalApplicationCommand(ApplicationCommandProperties properties, RequestOptions options)
=> await CreateGlobalApplicationCommandAsync(properties, options).ConfigureAwait(false);
/// <inheritdoc />
async Task<IReadOnlyCollection<IApplicationCommand>> IDiscordClient.BulkOverwriteGlobalApplicationCommand(ApplicationCommandProperties[] properties, RequestOptions options)
=> await BulkOverwriteGlobalApplicationCommandsAsync(properties, options);
#endregion
#region Dispose

6
src/Discord.Net.WebSocket/DiscordSocketClient.cs
View File

@@ -3442,6 +3442,12 @@ namespace Discord.WebSocket
/// <inheritdoc />
async Task<IReadOnlyCollection<IApplicationCommand>> IDiscordClient.GetGlobalApplicationCommandsAsync(bool withLocalizations, string locale, RequestOptions options)
=> await GetGlobalApplicationCommandsAsync(withLocalizations, locale, options);
/// <inheritdoc />
async Task<IApplicationCommand> IDiscordClient.CreateGlobalApplicationCommand(ApplicationCommandProperties properties, RequestOptions options)
=> await CreateGlobalApplicationCommandAsync(properties, options).ConfigureAwait(false);
/// <inheritdoc />
async Task<IReadOnlyCollection<IApplicationCommand>> IDiscordClient.BulkOverwriteGlobalApplicationCommand(ApplicationCommandProperties[] properties, RequestOptions options)
=> await BulkOverwriteGlobalApplicationCommandsAsync(properties, options);
/// <inheritdoc />
async Task IDiscordClient.StartAsync()