From fc29f47d628b04e6af325b4d02aec00524528603 Mon Sep 17 00:00:00 2001 From: Danny van Heumen Date: Fri, 25 Jul 2014 21:15:34 +0200 Subject: [PATCH] Added support for joining with a channel key. --- .../impl/protocol/irc/IrcStack.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java index 49d828c0b..ddb3d3018 100644 --- a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java +++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java @@ -896,12 +896,23 @@ else if (msg.startsWith("/me ")) } else if (msg.startsWith("/join ")) { - final String channel = message.substring(6); - // TODO Add \0 to regex check for correct channel naming. - // TODO Add support for providing password for channel. + final String part = message.substring(6); + final String channel; + final String password; + int indexOfSep = part.indexOf(' '); + if (indexOfSep == -1) + { + channel = part; + password = ""; + } + else + { + channel = part.substring(0, indexOfSep); + password = part.substring(indexOfSep + 1); + } if (channel.matches("[^,\\n\\r\\s\\a]+")) { - irc.joinChannel(channel); + irc.joinChannel(channel, password); } } else