mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed sfi and sfw not ignoring server admin when message is edited. #1444

Browse Source
This commit is contained in:
Master Kwoth 2017-08-06 12:02:13 +02:00
parent 1358878773
commit 10fdd36e87
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/NadekoBot/Modules/Permissions/Services/FilterService.cs
View File

@ -61,12 +61,15 @@ namespace NadekoBot.Modules.Permissions.Services
_client.MessageUpdated += (oldData, newMsg, channel) => _client.MessageUpdated += (oldData, newMsg, channel) =>
{ {
var _ = Task.Run(async () => var _ = Task.Run(() =>
{ {
var guild = (channel as ITextChannel)?.Guild; var guild = (channel as ITextChannel)?.Guild;
var usrMsg = newMsg as IUserMessage; var usrMsg = newMsg as IUserMessage;
return (await FilterInvites(guild, usrMsg)) || (await FilterWords(guild, usrMsg)); if (guild == null || usrMsg == null)
return Task.CompletedTask;
return TryBlockEarly(guild, usrMsg);
}); });
return Task.CompletedTask; return Task.CompletedTask;
}; };
@ -116,9 +119,9 @@ namespace NadekoBot.Modules.Permissions.Services
if (usrMsg is null) if (usrMsg is null)
return false; return false;
if ((InviteFilteringChannels.Contains(usrMsg.Channel.Id) || if ((InviteFilteringChannels.Contains(usrMsg.Channel.Id)
InviteFilteringServers.Contains(guild.Id)) && || InviteFilteringServers.Contains(guild.Id))
usrMsg.Content.IsDiscordInvite()) && usrMsg.Content.IsDiscordInvite())
{ {
try try
{ {