[Bugfix] Mark ForumChannel as a TopicChannelMixin (#2317)

discord-jda · Oct 30, 2022 · 9b154d1 · 9b154d1
1 parent 32483a1
commit 9b154d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/ChannelField.java b/src/main/java/net/dv8tion/jda/api/entities/channel/ChannelField.java
@@ -100,13 +100,13 @@ public enum ChannelField
     DEFAULT_REACTION_EMOJI("default_reaction_emoji", AuditLogKey.CHANNEL_DEFAULT_REACTION_EMOJI),
 
     //Text Specific
-
     /**
      * The topic of the channel.
      *
-     * <p>Limited to {@link NewsChannel NewsChannels} and {@link TextChannel TextChannels}.
+     * <p>Limited to {@link NewsChannel NewsChannels}, {@link TextChannel TextChannels}, and {@link ForumChannel ForumChannels}.
      *
      * @see StandardGuildMessageChannel#getTopic()
+     * @see ForumChannel#getTopic()
      */
     TOPIC("topic", AuditLogKey.CHANNEL_TOPIC),
 
@@ -202,7 +202,7 @@ public enum ChannelField
     /**
      * The time this channel's archival information was last updated.
      *
-     * <p>This timestamp will be updated when any of the following happen:
+     * <p>This timestamp will be updated when any of the following happens:
      * <ul>
      *     <li>The channel is archived</li>
      *     <li>The channel is unarchived</li>

diff --git a/src/main/java/net/dv8tion/jda/internal/entities/ForumChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/ForumChannelImpl.java
@@ -40,8 +40,9 @@
 import net.dv8tion.jda.internal.entities.channel.middleman.AbstractGuildChannelImpl;
 import net.dv8tion.jda.internal.entities.channel.mixin.attribute.IAgeRestrictedChannelMixin;
 import net.dv8tion.jda.internal.entities.channel.mixin.attribute.ISlowmodeChannelMixin;
-import net.dv8tion.jda.internal.entities.channel.mixin.attribute.IThreadContainerMixin;
 import net.dv8tion.jda.internal.entities.channel.mixin.attribute.IWebhookContainerMixin;
+import net.dv8tion.jda.internal.entities.channel.mixin.attribute.IThreadContainerMixin;
+import net.dv8tion.jda.internal.entities.channel.mixin.attribute.ITopicChannelMixin;
 import net.dv8tion.jda.internal.entities.channel.mixin.middleman.StandardGuildChannelMixin;
 import net.dv8tion.jda.internal.entities.emoji.CustomEmojiImpl;
 import net.dv8tion.jda.internal.managers.channel.concrete.ForumChannelManagerImpl;
@@ -60,10 +61,11 @@ public class ForumChannelImpl extends AbstractGuildChannelImpl<ForumChannelImpl>
         implements ForumChannel,
                    GuildChannelUnion,
                    StandardGuildChannelMixin<ForumChannelImpl>,
+                   IAgeRestrictedChannelMixin<ForumChannelImpl>,
+                   ISlowmodeChannelMixin<ForumChannelImpl>,
                    IWebhookContainerMixin<ForumChannelImpl>,
                    IThreadContainerMixin<ForumChannelImpl>,
-                   IAgeRestrictedChannelMixin<ForumChannelImpl>,
-                   ISlowmodeChannelMixin<ForumChannelImpl>
+                   ITopicChannelMixin<ForumChannelImpl>
 {
     private final TLongObjectMap<PermissionOverride> overrides = MiscUtil.newLongMap();
     private final SortedSnowflakeCacheViewImpl<ForumTag> tagCache = new SortedSnowflakeCacheViewImpl<>(ForumTag.class, ForumTag::getName, Comparator.naturalOrder());