From b898b01680f8171329a5534e59afe19ced9e3f75 Mon Sep 17 00:00:00 2001 From: alyssa Date: Sat, 5 Oct 2024 23:07:17 +0900 Subject: [PATCH] Revert "feat(bot): remove double push notifications" This reverts commit 9a6254c01fcd7a3c7f0c1dd4bb359465bb7e9426. --- Myriad/Types/Message.cs | 1 - PluralKit.Bot/Proxy/ProxyService.cs | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Myriad/Types/Message.cs b/Myriad/Types/Message.cs index 1b8f723e..70013ecc 100644 --- a/Myriad/Types/Message.cs +++ b/Myriad/Types/Message.cs @@ -15,7 +15,6 @@ public record Message SourceMessageDeleted = 1 << 3, Urgent = 1 << 4, Ephemeral = 1 << 6, - SuppressNotifications = 1 << 12, VoiceMessage = 1 << 13, } diff --git a/PluralKit.Bot/Proxy/ProxyService.cs b/PluralKit.Bot/Proxy/ProxyService.cs index acccda39..4c9b701a 100644 --- a/PluralKit.Bot/Proxy/ProxyService.cs +++ b/PluralKit.Bot/Proxy/ProxyService.cs @@ -217,10 +217,6 @@ public class ProxyService var senderPermissions = PermissionExtensions.PermissionsFor(guild, messageChannel, trigger.Author.Id, guildMember); 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 { GuildId = trigger.GuildId!.Value, @@ -235,7 +231,7 @@ public class ProxyService Embeds = embeds.ToArray(), Stickers = trigger.StickerItems, AllowEveryone = allowEveryone, - Flags = flags, + Flags = trigger.Flags.HasFlag(Message.MessageFlags.VoiceMessage) ? Message.MessageFlags.VoiceMessage : null, Tts = tts, Poll = trigger.Poll, });