summaryrefslogtreecommitdiff
authorerik <erik>2007-02-09 21:10:30 (UTC)
committer erik <erik>2007-02-09 21:10:30 (UTC)
commit9abe862308081155837512dd5e6c581752c9ddb2 (patch) (side-by-side diff)
tree0ba021365dab067f9783bdcf2fbc01d910c6802b
parentb3cde0d17f52f996c04a55de90583ca60a7e0210 (diff)
downloadopie-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.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opieirc/ircmessageparser.cpp37
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
@@ -594,16 +594,31 @@ void IRCMessageParser::parseNumericalNames(IRCMessage *message) {
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);
@@ -617,7 +632,7 @@ void IRCMessageParser::parseNumericalNames(IRCMessage *message) {
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")));
}