From cde0d44b04472c1c6e895b4dcece40df2a72cd7a Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 30 Jun 2023 03:20:40 +0200 Subject: [PATCH] Readd check after changing the underlying list --- .../discordplugin/mcchat/ChannelconCommand.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scala/buttondevteam/discordplugin/mcchat/ChannelconCommand.scala b/src/main/scala/buttondevteam/discordplugin/mcchat/ChannelconCommand.scala index 78020a9..aab0764 100644 --- a/src/main/scala/buttondevteam/discordplugin/mcchat/ChannelconCommand.scala +++ b/src/main/scala/buttondevteam/discordplugin/mcchat/ChannelconCommand.scala @@ -20,6 +20,7 @@ import java.util.function.Supplier import java.util.{Objects, Optional} import javax.annotation.Nullable import scala.jdk.Accumulator +import scala.jdk.CollectionConverters.ListHasAsScala import scala.jdk.OptionConverters.RichOptional import scala.jdk.StreamConverters.StreamHasToScala @@ -107,7 +108,8 @@ class ChannelconCommand(private val module: MinecraftChatModule) extends IComman if (MCChatCustom.hasCustomChat(message.getChannelId)) { return respond(sender, "this channel is already connected to a Minecraft channel. Use `@ChromaBot channelcon remove` to remove it.") } - val chan: Optional[Channel] = Channel.getChannels.filter(ch => ch.getIdentifier.equalsIgnoreCase(channelID)).findAny // TODO: Removed erroring shit + val chan: Optional[Channel] = Channel.getChannels.filter(ch => ch.getIdentifier.equalsIgnoreCase(channelID) + || ch.extraIdentifiers.get().asScala.exists(id => id.equalsIgnoreCase(channelID))).findAny if (!chan.isPresent) { //TODO: Red embed that disappears over time (kinda like the highlight messages in OW) DPUtils.reply(message, channel, "MC channel with ID '" + channelID + "' not found! The ID is the command for it without the /.").subscribe() return true