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 07959763ea into 4a947c01fc

Browse source
This commit is contained in:
Lena Tauchner 2026-01-20 23:26:30 +00:00 • committed by GitHub
commit 6a3de3f80c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
PluralKit.Bot/Proxy/ProxyService.cs
View file

@ -213,11 +213,21 @@ public class ProxyService
{ {
// Create reply embed // Create reply embed
var embeds = new List<Embed>(); var embeds = new List<Embed>();
var content = "";
if (trigger.Type == Message.MessageType.Reply && trigger.MessageReference?.ChannelId == trigger.ChannelId) if (trigger.Type == Message.MessageType.Reply && trigger.MessageReference?.ChannelId == trigger.ChannelId)
{ {
var repliedTo = trigger.ReferencedMessage.Value; var repliedTo = trigger.ReferencedMessage.Value;
if (repliedTo != null) if (repliedTo != null)
{ {
if (trigger.Mentions.Length > 0
&& repliedTo.Author.Id == trigger.Mentions[0].Id
&& !(trigger.Content.Contains($"<@{repliedTo.Author.Id}>")
|| trigger.Content.Contains($"<@!{repliedTo.Author.Id}>")))
{
content = $"*<@{repliedTo.Author.Id}>*\n";
}
var (nickname, avatar) = await FetchReferencedMessageAuthorInfo(trigger, repliedTo); var (nickname, avatar) = await FetchReferencedMessageAuthorInfo(trigger, repliedTo);
var embed = CreateReplyEmbed(match, trigger, repliedTo, nickname, avatar); var embed = CreateReplyEmbed(match, trigger, repliedTo, nickname, avatar);
if (embed != null) if (embed != null)
@ -228,7 +238,7 @@ public class ProxyService
} }
// Send the webhook // Send the webhook
var content = match.ProxyContent; content += match.ProxyContent;
if (!allowEmbeds) content = content.BreakLinkEmbeds(); if (!allowEmbeds) content = content.BreakLinkEmbeds();
var messageChannel = await _cache.GetChannel(trigger.GuildId!.Value, trigger.ChannelId); var messageChannel = await _cache.GetChannel(trigger.GuildId!.Value, trigger.ChannelId);