From 03285df24f3e4eac5badc13fedc13603d912ecdc Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Thu, 20 May 2021 11:45:23 +0200 Subject: [PATCH] Join current channel if no name is given If user type `/join` on a channel without name it will take the name of the current channel --- src/client/clientuserinputhandler.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp index dc21d28a..65287377 100644 --- a/src/client/clientuserinputhandler.cpp +++ b/src/client/clientuserinputhandler.cpp @@ -91,13 +91,18 @@ void ClientUserInputHandler::handleExec(const BufferInfo& bufferInfo, const QStr void ClientUserInputHandler::handleJoin(const BufferInfo& bufferInfo, const QString& text) { - if (text.isEmpty()) { - Client::messageModel()->insertErrorMessage(bufferInfo, tr("/JOIN expects a channel")); - return; + auto channelName = text; + if (channelName.isEmpty()) { + if (bufferInfo.type() == BufferInfo::ChannelBuffer) { + channelName = bufferInfo.bufferName(); + } else { + Client::messageModel()->insertErrorMessage(bufferInfo, tr("/JOIN expects a channel")); + return; + } } - switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0)); + switchBuffer(bufferInfo.networkId(), channelName.section(' ', 0, 0)); // send to core - defaultHandler("JOIN", bufferInfo, text); + defaultHandler("JOIN", bufferInfo, channelName); } void ClientUserInputHandler::handleQuery(const BufferInfo& bufferInfo, const QString& text) -- 2.20.1