Merge pull request #1046 from hamarb123/main

Add handling of threads to starboard

Author: patrickklaeren

src/Modix.Bot/Responders/StarboardReactionResponder.cs

@@ -1,6 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Discord;
+using Discord.WebSocket;
 using MediatR;
 using Modix.Bot.Notifications;
 using Modix.Bot.Responders.MessageQuotes;
@@ -20,6 +21,37 @@ public Task Handle(ReactionAddedNotificationV3 notification, CancellationToken c
         public Task Handle(ReactionRemovedNotificationV3 notification, CancellationToken cancellationToken)
             => HandleReactionAsync(notification.Message, notification.Reaction);
 
+        private async ValueTask<bool> IsChannelIgnoredFromStarboard(IGuildChannel channel)
+        {
+            if (channel.ChannelType is ChannelType.PrivateThread)
+            {
+                return true;
+            }
+
+            var hasDirectDesignation = await designatedChannelService
+                .ChannelHasDesignation(channel.Guild.Id, channel.Id, DesignatedChannelType.IgnoredFromStarboard, default);
+
+            if (hasDirectDesignation)
+            {
+                return true;
+            }
+
+            if (channel is SocketThreadChannel { ParentChannel: not null } threadChannel)
+            {
+                var parentChannelId = threadChannel.ParentChannel.Id;
+
+                var parentHasDesignation = await designatedChannelService
+                    .ChannelHasDesignation(channel.Guild.Id, parentChannelId, DesignatedChannelType.IgnoredFromStarboard, default);
+
+                if (parentHasDesignation)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         private async Task HandleReactionAsync(Cacheable<IUserMessage, ulong> cachedMessage, IReaction reaction)
         {
             var emote = reaction.Emote;
@@ -34,13 +66,15 @@ private async Task HandleReactionAsync(Cacheable<IUserMessage, ulong> cachedMess
                 return;
             }
 
-            var isIgnoredFromStarboard = await designatedChannelService
-                .ChannelHasDesignation(channel.Guild.Id, channel.Id, DesignatedChannelType.IgnoredFromStarboard, default);
+            if (await IsChannelIgnoredFromStarboard(channel))
+            {
+                return;
+            }
 
             var starboardExists = await designatedChannelService
                 .HasDesignatedChannelForType(channel.GuildId, DesignatedChannelType.Starboard);
 
-            if (isIgnoredFromStarboard || !starboardExists)
+            if (!starboardExists)
             {
                 return;
             }