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

feat(bot): remove double push notifications

Browse source
This commit is contained in:
Petal Ladenson 2024-10-03 02:42:26 -06:00 • committed by GitHub
parent 93264cbf20
commit 9a6254c01f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Myriad/Types/Message.cs
View file

@ -15,6 +15,7 @@ public record Message
SourceMessageDeleted = 1 << 3, SourceMessageDeleted = 1 << 3,
Urgent = 1 << 4, Urgent = 1 << 4,
Ephemeral = 1 << 6, Ephemeral = 1 << 6,
SuppressNotifications = 1 << 12,
VoiceMessage = 1 << 13, VoiceMessage = 1 << 13,
} }

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

@ -237,6 +237,10 @@ public class ProxyService
var senderPermissions = PermissionExtensions.PermissionsFor(guild, messageChannel, trigger.Author.Id, guildMember); var senderPermissions = PermissionExtensions.PermissionsFor(guild, messageChannel, trigger.Author.Id, guildMember);
var tts = match.Member.Tts && senderPermissions.HasFlag(PermissionSet.SendTtsMessages); var tts = match.Member.Tts && senderPermissions.HasFlag(PermissionSet.SendTtsMessages);
//We suppress notifications so that people don't get double push notifications. Pings and unreads are not suppressed.
Message.MessageFlags flags = Message.MessageFlags.SuppressNotifications;
flags = trigger.Flags.HasFlag(Message.MessageFlags.VoiceMessage) ? flags | Message.MessageFlags.VoiceMessage : flags;
var proxyMessage = await _webhookExecutor.ExecuteWebhook(new ProxyRequest var proxyMessage = await _webhookExecutor.ExecuteWebhook(new ProxyRequest
{ {
GuildId = trigger.GuildId!.Value, GuildId = trigger.GuildId!.Value,
@ -251,7 +255,7 @@ public class ProxyService
Embeds = embeds.ToArray(), Embeds = embeds.ToArray(),
Stickers = trigger.StickerItems, Stickers = trigger.StickerItems,
AllowEveryone = allowEveryone, AllowEveryone = allowEveryone,
Flags = trigger.Flags.HasFlag(Message.MessageFlags.VoiceMessage) ? Message.MessageFlags.VoiceMessage : null, Flags = flags,
Tts = tts, Tts = tts,
Poll = trigger.Poll, Poll = trigger.Poll,
}); });