eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' of ssh://github.com/pluralkit/pluralkit

Browse source
This commit is contained in:
spiral 2022-06-11 00:48:09 -04:00
commit 6ed066de29
No known key found for this signature in database
GPG key ID: 244A11E4B0BCF40E
7 changed files with 51 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PluralKit.Bot/Services/LogChannelService.cs
View file

@ -86,7 +86,7 @@ public class LogChannelService
{
_logger.Information(
"Does not have permission to log proxy, ignoring (channel: {ChannelId}, guild: {GuildId}, bot permissions: {BotPermissions})",
logChannel.Id, trigger.GuildId!.Value, perms);
logChannel.Id, guildId, perms);
return null;
}

5
PluralKit.Bot/Services/WebhookExecutorService.cs
View file

@ -173,8 +173,9 @@ public class WebhookExecutorService
// We don't care about whether the sending succeeds, and we don't want to *wait* for it, so we just fork it off
var _ = TrySendRemainingAttachments(webhook, req.Name, req.AvatarUrl, attachmentChunks, req.ThreadId);
return webhookMessage;
// for some reason discord may(?) return a null guildid here???
return webhookMessage with { GuildId = webhookMessage.GuildId ?? req.GuildId };
}
private async Task TrySendRemainingAttachments(Webhook webhook, string name, string avatarUrl,