summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircmessageparser.cpp35
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
@@ -564,90 +564,105 @@ void IRCMessageParser::parseLiteralKick(IRCMessage *message) {
564 emit outputReady(output); 564 emit outputReady(output);
565 } else { 565 } else {
566 /* someone else got kicked */ 566 /* someone else got kicked */
567 channel->removePerson(person); 567 channel->removePerson(person);
568 IRCOutput output(OUTPUT_OTHERKICK, person->nick() + tr(" was kicked from ") + channel->channelname() + tr(" by ") + mask.nick()+ " (" + message->param(2) + ")"); 568 IRCOutput output(OUTPUT_OTHERKICK, person->nick() + tr(" was kicked from ") + channel->channelname() + tr(" by ") + mask.nick()+ " (" + message->param(2) + ")");
569 output.addParam(channel); 569 output.addParam(channel);
570 output.addParam(person); 570 output.addParam(person);
571 emit outputReady(output); 571 emit outputReady(output);
572 } 572 }
573 } else { 573 } else {
574 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person kick - desynchronized?"))); 574 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person kick - desynchronized?")));
575 } 575 }
576 } else { 576 } else {
577 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown channel kick - desynchronized?"))); 577 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown channel kick - desynchronized?")));
578 } 578 }
579} 579}
580 580
581void IRCMessageParser::parseNumericalNames(IRCMessage *message) { 581void IRCMessageParser::parseNumericalNames(IRCMessage *message) {
582 /* Name list sent when joining a channel */ 582 /* Name list sent when joining a channel */
583 IRCChannel *channel = m_session->getChannel(message->param(2).lower()); 583 IRCChannel *channel = m_session->getChannel(message->param(2).lower());
584 if (channel != 0) { 584 if (channel != 0) {
585 QString people = message->param(3); 585 QString people = message->param(3);
586 QTextIStream stream(&people); 586 QTextIStream stream(&people);
587 QString temp; 587 QString temp;
588 588
589 while (!stream.atEnd()) { 589 while (!stream.atEnd()) {
590 stream >> temp; 590 stream >> temp;
591 591
592 char flagch = temp.at(0).latin1(); 592 char flagch = temp.at(0).latin1();
593 int flag = 0; 593 int flag = 0;
594 QString nick; 594 QString nick;
595 /* Parse person flags */ 595 /* Parse person flags */
596 if (flagch == '@' || flagch == '+' || flagch=='%' || flagch == '*') { 596 if (flagch == '~' || flagch == '&' || flagch == '@' || flagch == '+' ||
597 flagch=='%' || flagch == '*') {
597 598
598 nick = temp.right(temp.length()-1); 599 nick = temp.right(temp.length()-1);
599 switch (flagch) { 600 switch (flagch) {
600 case '@': flag = IRCChannelPerson::PERSON_FLAG_OP; break; 601 /**
601 case '+': flag = IRCChannelPerson::PERSON_FLAG_VOICE; break; 602 * @note '~' and `&' are extensions of the unrealircd irc
602 case '%': flag = IRCChannelPerson::PERSON_FLAG_HALFOP; break; 603 * daemon. This app can't see users w/out checking for these
603 default : flag = 0; break; 604 * chars.
605 */
606 case '~':
607 case '&':
608 case '@':
609 flag = IRCChannelPerson::PERSON_FLAG_OP;
610 break;
611 case '+':
612 flag = IRCChannelPerson::PERSON_FLAG_VOICE;
613 break;
614 case '%':
615 flag = IRCChannelPerson::PERSON_FLAG_HALFOP;
616 break;
617 default :
618 flag = 0;
619 break;
604 } 620 }
605 } else { 621 } else
606 nick = temp; 622 nick = temp;
607 }
608 623
609 IRCPerson *person = m_session->getPerson(nick); 624 IRCPerson *person = m_session->getPerson(nick);
610 if (person == 0) { 625 if (person == 0) {
611 person = new IRCPerson(); 626 person = new IRCPerson();
612 person->setNick(nick); 627 person->setNick(nick);
613 m_session->addPerson(person); 628 m_session->addPerson(person);
614 } 629 }
615 IRCChannelPerson *chan_person = new IRCChannelPerson(person); 630 IRCChannelPerson *chan_person = new IRCChannelPerson(person);
616 chan_person->setFlags(flag); 631 chan_person->setFlags(flag);
617 channel->addPerson(chan_person); 632 channel->addPerson(chan_person);
618 } 633 }
619 } else { 634 } else
620 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Server message with unknown channel"))); 635 emit outputReady(IRCOutput(OUTPUT_ERROR,
621 } 636 tr("Server message with unknown channel")));
622} 637}
623 638
624void IRCMessageParser::parseNumericalEndOfNames(IRCMessage *message) { 639void IRCMessageParser::parseNumericalEndOfNames(IRCMessage *message) {
625 /* Done syncing to channel */ 640 /* Done syncing to channel */
626 IRCChannel *channel = m_session->getChannel(message->param(1).lower()); 641 IRCChannel *channel = m_session->getChannel(message->param(1).lower());
627 if (channel) { 642 if (channel) {
628 channel->setHasPeople(TRUE); 643 channel->setHasPeople(TRUE);
629 /* Yes, we want the names before anything happens inside the GUI */ 644 /* Yes, we want the names before anything happens inside the GUI */
630 IRCOutput output(OUTPUT_SELFJOIN, tr("You joined channel ") + channel->channelname()); 645 IRCOutput output(OUTPUT_SELFJOIN, tr("You joined channel ") + channel->channelname());
631 output.addParam(channel); 646 output.addParam(channel);
632 emit outputReady(output); 647 emit outputReady(output);
633 } else { 648 } else {
634 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Server message with unknown channel"))); 649 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Server message with unknown channel")));
635 } 650 }
636} 651}
637 652
638 653
639void IRCMessageParser::parseNumericalNicknameInUse(IRCMessage *) { 654void IRCMessageParser::parseNumericalNicknameInUse(IRCMessage *) {
640 /* If we are connnected this error is not critical */ 655 /* If we are connnected this error is not critical */
641 if(m_session->isLoggedIn()) 656 if(m_session->isLoggedIn())
642 return; 657 return;
643 658
644 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Nickname is in use, please reconnect with a different nickname"))); 659 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Nickname is in use, please reconnect with a different nickname")));
645 m_session->endSession(); 660 m_session->endSession();
646} 661}
647 662
648void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) { 663void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) {
649 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("No such nickname"))); 664 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("No such nickname")));
650} 665}
651 666
652void IRCMessageParser::parseNumericalTopic(IRCMessage *message) { 667void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
653 IRCChannel *channel = m_session->getChannel(message->param(1).lower()); 668 IRCChannel *channel = m_session->getChannel(message->param(1).lower());