Make cleanChannelName a NOOP for IRC (#4154)

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>

CHANGELOG.md

@@ -83,6 +83,7 @@
 - Minor: Add settings tooltips. (#3437)
 - Minor: Add setting to limit message input length. (#3418)
 - Minor: Improved look of tabs when using a layout other than top. (#3925, #4152)
+- Bugfix: Fixed channels with two leading `#`s not being usable on IRC (#4154)
 - Bugfix: Fixed `Add new account` dialog causing main chatterino window to be non movable. (#4121)
 - Bugfix: Connection to Twitch PubSub now recovers more reliably. (#3643, #3716)
 - Bugfix: Fixed `Smooth scrolling on new messages` setting sometimes hiding messages. (#4028)

src/providers/irc/AbstractIrcServer.cpp

@@ -373,10 +373,8 @@ std::shared_ptr<Channel> AbstractIrcServer::getCustomChannel(
 
 QString AbstractIrcServer::cleanChannelName(const QString &dirtyChannelName)
 {
-    if (dirtyChannelName.startsWith('#'))
+    // This function is a Noop only for IRC, for Twitch it removes a leading '#' and lowercases the name
-        return dirtyChannelName.mid(1);
+    return dirtyChannelName;
-    else
-        return dirtyChannelName;
 }
 
 void AbstractIrcServer::addFakeMessage(const QString &data)

src/providers/irc/IrcServer.cpp

@@ -219,8 +219,7 @@ void IrcServer::readConnectionMessageReceived(Communi::IrcMessage *message)
         case Communi::IrcMessage::Join: {
             auto x = static_cast<Communi::IrcJoinMessage *>(message);
 
-            if (auto it =
+            if (auto it = this->channels.find(x->channel());
-                    this->channels.find(this->cleanChannelName(x->channel()));
                 it != this->channels.end())
             {
                 if (auto shared = it->lock())
@@ -243,8 +242,7 @@ void IrcServer::readConnectionMessageReceived(Communi::IrcMessage *message)
         case Communi::IrcMessage::Part: {
             auto x = static_cast<Communi::IrcPartMessage *>(message);
 
-            if (auto it =
+            if (auto it = this->channels.find(x->channel());
-                    this->channels.find(this->cleanChannelName(x->channel()));
                 it != this->channels.end())
             {
                 if (auto shared = it->lock())

src/widgets/dialogs/SelectChannelDialog.cpp

@@ -207,7 +207,7 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
             outerBox->addRow("Server:", view);
         }
 
-        outerBox->addRow("Channel:", this->ui_.irc.channel = new QLineEdit);
+        outerBox->addRow("Channel: #", this->ui_.irc.channel = new QLineEdit);
 
         auto tab = notebook->addPage(obj.getElement());
         tab->setCustomTitle("Irc (Beta)");