author | erik <erik> | 2007-02-09 21:10:30 (UTC) |
---|---|---|
committer | erik <erik> | 2007-02-09 21:10:30 (UTC) |
commit | 9abe862308081155837512dd5e6c581752c9ddb2 (patch) (side-by-side diff) | |
tree | 0ba021365dab067f9783bdcf2fbc01d910c6802b /noncore/net/opieirc | |
parent | b3cde0d17f52f996c04a55de90583ca60a7e0210 (diff) | |
download | opie-9abe862308081155837512dd5e6c581752c9ddb2.zip opie-9abe862308081155837512dd5e6c581752c9ddb2.tar.gz opie-9abe862308081155837512dd5e6c581752c9ddb2.tar.bz2 |
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.
-rw-r--r-- | noncore/net/opieirc/ircmessageparser.cpp | 35 |
1 files changed, 25 insertions, 10 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 @@ -584,50 +584,65 @@ void IRCMessageParser::parseNumericalNames(IRCMessage *message) { 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; + /** + * @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 { + } 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 { |