This commit is based on the patch attached to Opie bug 1735:

http://opie-bugs.oszine.de/view.php?id=1735

It changes the opie-irc app to be able to support the additional user
characters that the unrealircd irc daemon provides.

Thanks goes to andrewy for reporting and providing a patch.

1 files changed, 26 insertions, 11 deletions

diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp
index 32e1011..c449a65 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -548,121 +548,136 @@ void IRCMessageParser::parseLiteralMode(IRCMessage *message) {
         }
     } else {
         emit outputReady(IRCOutput(OUTPUT_ERROR, tr("User modes not supported yet")));
     }
 }
 
 void IRCMessageParser::parseLiteralKick(IRCMessage *message) {
     IRCPerson mask(message->prefix());
     IRCChannel *channel = m_session->getChannel(message->param(0).lower());
     if (channel) {
         IRCChannelPerson *person = channel->getPerson(message->param(1));
         if (person) {
             if (person->nick() == m_session->m_server->nick()) {
                 m_session->removeChannel(channel);
                 IRCOutput output(OUTPUT_SELFKICK, tr("You were kicked from ") + channel->channelname() + tr(" by ") + mask.nick() + " (" + message->param(2) + ")");
                 output.addParam(channel);
                 emit outputReady(output);
             } else {
               /* someone else got kicked */
                 channel->removePerson(person);
                 IRCOutput output(OUTPUT_OTHERKICK, person->nick() + tr(" was kicked from ") + channel->channelname() + tr(" by ") + mask.nick()+ " (" + message->param(2) + ")");
                 output.addParam(channel);
                 output.addParam(person);
                 emit outputReady(output);
             }
         } else {
             emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person kick - desynchronized?")));
         }
     } else {
          emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown channel kick - desynchronized?")));
     }
 }
 
 void IRCMessageParser::parseNumericalNames(IRCMessage *message) {
     /* Name list sent when joining a channel */
     IRCChannel *channel = m_session->getChannel(message->param(2).lower());
     if (channel != 0) {
         QString people = message->param(3);
         QTextIStream stream(&people);
         QString temp;
 
         while (!stream.atEnd()) {
             stream >> temp;
 
             char flagch = temp.at(0).latin1();
             int flag = 0;
             QString nick;
             /* Parse person flags */
-            if (flagch == '@' || flagch == '+' || flagch=='%' || flagch == '*') {
+            if (flagch == '~' || flagch == '&' || flagch == '@' || flagch == '+' ||
+                flagch=='%' || flagch == '*') {
 
                 nick = temp.right(temp.length()-1);
                 switch (flagch) {
-                    case '@': flag = IRCChannelPerson::PERSON_FLAG_OP;     break;
-                    case '+': flag = IRCChannelPerson::PERSON_FLAG_VOICE;  break;
-                    case '%': flag = IRCChannelPerson::PERSON_FLAG_HALFOP; break;
-                    default : flag = 0; break;
-                }
-            } else {
+                    /**
+                     * @note '~' and `&' are extensions of the unrealircd irc
+                     * daemon. This app can't see users w/out checking for these
+                     * chars.
+                     */
+                    case '~':
+                    case '&':
+                    case '@':
+                        flag = IRCChannelPerson::PERSON_FLAG_OP;
+                        break;
+                    case '+':
+                        flag = IRCChannelPerson::PERSON_FLAG_VOICE;
+                        break;
+                    case '%':
+                        flag = IRCChannelPerson::PERSON_FLAG_HALFOP;
+                        break;
+                    default :
+                        flag = 0;
+                        break;
+                }
+            } else
                 nick = temp;
-            }
 
             IRCPerson *person = m_session->getPerson(nick);
             if (person == 0) {
                 person = new IRCPerson();
                 person->setNick(nick);
                 m_session->addPerson(person);
             }
             IRCChannelPerson *chan_person = new IRCChannelPerson(person);
             chan_person->setFlags(flag);
             channel->addPerson(chan_person);
         }
-    } else {
-        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Server message with unknown channel")));
-    }
+    } else
+        emit outputReady(IRCOutput(OUTPUT_ERROR,
+                                   tr("Server message with unknown channel")));
 }
 
 void IRCMessageParser::parseNumericalEndOfNames(IRCMessage *message) {
     /* Done syncing to channel */
     IRCChannel *channel = m_session->getChannel(message->param(1).lower());
     if (channel) {
         channel->setHasPeople(TRUE);
         /* Yes, we want the names before anything happens inside the GUI */
         IRCOutput output(OUTPUT_SELFJOIN, tr("You joined channel ") + channel->channelname());
         output.addParam(channel);
         emit outputReady(output);
     } else {
         emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Server message with unknown channel")));
     }
 }
 
 
 void IRCMessageParser::parseNumericalNicknameInUse(IRCMessage *) {
     /* If we are connnected this error is not critical */
     if(m_session->isLoggedIn())
         return;
     
     emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Nickname is in use, please reconnect with a different nickname")));
     m_session->endSession();
 }
 
 void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) {
     emit outputReady(IRCOutput(OUTPUT_ERROR, tr("No such nickname")));
 }
 
 void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
     IRCChannel *channel = m_session->getChannel(message->param(1).lower());
     if (channel) {
         IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\""));
         output.addParam(channel);
         emit outputReady(output);
     } else {
         IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\""));
         output.addParam(0);
         emit outputReady(output);
     }
 }
 
 void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) {
 }