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

AutoMod custom block message (#2613)

Browse Source
This commit is contained in:
Misha133
2023-02-26 22:47:13 +03:00
committed by GitHub
parent 11481a159e
commit 709364aaef
8 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2895,7 +2895,7 @@ namespace Discord.WebSocket
var rule = guild.AddOrUpdateAutoModRule(data);
await TimedInvokeAsync(_autoModRuleCreated, nameof(AutoModRuleCreated), rule);
await TimedInvokeAsync(_autoModRuleCreated, nameof(AutoModRuleCreated), rule);
}
break;
@@ -2942,8 +2942,14 @@ namespace Discord.WebSocket
? data.Action.Metadata.Value.DurationSeconds.IsSpecified
? data.Action.Metadata.Value.DurationSeconds.Value
: null
: null,
data.Action.Metadata.IsSpecified
? data.Action.Metadata.Value.CustomMessage.IsSpecified
? data.Action.Metadata.Value.CustomMessage.Value
: null
: null);
var member = guild.GetUser(data.UserId);
var cacheableUser = new Cacheable<SocketGuildUser, ulong>(member,
@@ -2965,7 +2971,7 @@ namespace Discord.WebSocket
channel != null,
async () =>
{
if(data.ChannelId.IsSpecified)
if (data.ChannelId.IsSpecified)
return await GetChannelAsync(data.ChannelId.Value).ConfigureAwait(false) as ISocketMessageChannel;
return null;
});
@@ -2980,7 +2986,7 @@ namespace Discord.WebSocket
cachedMsg is not null,
async () =>
{
if(data.MessageId.IsSpecified)
if (data.MessageId.IsSpecified)
return (await channel!.GetMessageAsync(data.MessageId.Value).ConfigureAwait(false)) as IUserMessage;
return null;
});

11
src/Discord.Net.WebSocket/Entities/Guilds/SocketAutoModRule.cs
View File

@@ -93,7 +93,16 @@ namespace Discord.WebSocket
MentionTotalLimit = model.TriggerMetadata.MentionLimit.IsSpecified
? model.TriggerMetadata.MentionLimit.Value
: null;
Actions = model.Actions.Select(x => new AutoModRuleAction(x.Type, x.Metadata.GetValueOrDefault()?.ChannelId.ToNullable(), x.Metadata.GetValueOrDefault()?.DurationSeconds.ToNullable())).ToImmutableArray();
Actions = model.Actions.Select(x => new AutoModRuleAction(
x.Type,
x.Metadata.GetValueOrDefault()?.ChannelId.ToNullable(),
x.Metadata.GetValueOrDefault()?.DurationSeconds.ToNullable(),
x.Metadata.IsSpecified
? x.Metadata.Value.CustomMessage.IsSpecified
? x.Metadata.Value.CustomMessage.Value
: null
: null
)).ToImmutableArray();
Enabled = model.Enabled;
ExemptRoles = model.ExemptRoles.Select(x => Guild.GetRole(x)).ToImmutableArray();
ExemptChannels = model.ExemptChannels.Select(x => Guild.GetChannel(x)).ToImmutableArray();