Diffstat (limited to 'noncore/net/opieirc/ircmessageparser.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -500,169 +500,184 @@ void IRCMessageParser::parseLiteralMode(IRCMessage *message) { | |||
500 | while (!stream.atEnd()) { | 500 | while (!stream.atEnd()) { |
501 | stream >> temp; | 501 | stream >> temp; |
502 | if (temp.startsWith("+")) { | 502 | if (temp.startsWith("+")) { |
503 | set = TRUE; | 503 | set = TRUE; |
504 | temp = temp.right(1); | 504 | temp = temp.right(1); |
505 | } | 505 | } |
506 | else | 506 | else |
507 | if (temp.startsWith("-")) { | 507 | if (temp.startsWith("-")) { |
508 | set = FALSE; | 508 | set = FALSE; |
509 | temp = temp.right(1); | 509 | temp = temp.right(1); |
510 | } | 510 | } |
511 | else { | 511 | else { |
512 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change has unknown type"))); | 512 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change has unknown type"))); |
513 | return; | 513 | return; |
514 | } | 514 | } |
515 | if (temp == "o") { | 515 | if (temp == "o") { |
516 | stream >> temp; | 516 | stream >> temp; |
517 | IRCChannelPerson *person = channel->getPerson(temp); | 517 | IRCChannelPerson *person = channel->getPerson(temp); |
518 | if (person) { | 518 | if (person) { |
519 | IRCOutput output(OUTPUT_CHANPERSONMODE, person->setOp(mask.nick(), set)); | 519 | IRCOutput output(OUTPUT_CHANPERSONMODE, person->setOp(mask.nick(), set)); |
520 | output.addParam(channel); | 520 | output.addParam(channel); |
521 | output.addParam(person); | 521 | output.addParam(person); |
522 | emit outputReady(output); | 522 | emit outputReady(output); |
523 | } | 523 | } |
524 | else { | 524 | else { |
525 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change with unknown person - Desynchronized?"))); | 525 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change with unknown person - Desynchronized?"))); |
526 | } | 526 | } |
527 | } | 527 | } |
528 | else | 528 | else |
529 | if (temp == "v") { | 529 | if (temp == "v") { |
530 | stream >> temp; | 530 | stream >> temp; |
531 | IRCChannelPerson *person = channel->getPerson(temp); | 531 | IRCChannelPerson *person = channel->getPerson(temp); |
532 | if (person) { | 532 | if (person) { |
533 | IRCOutput output(OUTPUT_CHANPERSONMODE, person->setVoice(mask.nick(), set)); | 533 | IRCOutput output(OUTPUT_CHANPERSONMODE, person->setVoice(mask.nick(), set)); |
534 | output.addParam(channel); | 534 | output.addParam(channel); |
535 | output.addParam(person); | 535 | output.addParam(person); |
536 | emit outputReady(output); | 536 | emit outputReady(output); |
537 | } | 537 | } |
538 | else { | 538 | else { |
539 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change with unknown person - Desynchronized?"))); | 539 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change with unknown person - Desynchronized?"))); |
540 | } | 540 | } |
541 | } | 541 | } |
542 | else { | 542 | else { |
543 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change with unknown flag"))); | 543 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change with unknown flag"))); |
544 | } | 544 | } |
545 | } | 545 | } |
546 | } else { | 546 | } else { |
547 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change with unknown kannel - Desynchronized?"))); | 547 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Mode change with unknown kannel - Desynchronized?"))); |
548 | } | 548 | } |
549 | } else { | 549 | } else { |
550 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("User modes not supported yet"))); | 550 | emit outputReady(IRCOutput(OUTPUT_ERROR, tr("User modes not supported yet"))); |
551 | } | 551 | } |
552 | } | 552 | } |
553 | 553 | ||
554 | void IRCMessageParser::parseLiteralKick(IRCMessage *message) { | 554 | void IRCMessageParser::parseLiteralKick(IRCMessage *message) { |
555 | IRCPerson mask(message->prefix()); | 555 | IRCPerson mask(message->prefix()); |
556 | IRCChannel *channel = m_session->getChannel(message->param(0).lower()); | 556 | IRCChannel *channel = m_session->getChannel(message->param(0).lower()); |
557 | if (channel) { | 557 | if (channel) { |
558 | IRCChannelPerson *person = channel->getPerson(message->param(1)); | 558 | IRCChannelPerson *person = channel->getPerson(message->param(1)); |
559 | if (person) { | 559 | if (person) { |
560 | if (person->nick() == m_session->m_server->nick()) { | 560 | if (person->nick() == m_session->m_server->nick()) { |
561 | m_session->removeChannel(channel); | 561 | m_session->removeChannel(channel); |
562 | IRCOutput output(OUTPUT_SELFKICK, tr("You were kicked from ") + channel->channelname() + tr(" by ") + mask.nick() + " (" + message->param(2) + ")"); | 562 | IRCOutput output(OUTPUT_SELFKICK, tr("You were kicked from ") + channel->channelname() + tr(" by ") + mask.nick() + " (" + message->param(2) + ")"); |
563 | output.addParam(channel); | 563 | output.addParam(channel); |
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 | ||
581 | void IRCMessageParser::parseNumericalNames(IRCMessage *message) { | 581 | void 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 | ||
624 | void IRCMessageParser::parseNumericalEndOfNames(IRCMessage *message) { | 639 | void 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 | ||
639 | void IRCMessageParser::parseNumericalNicknameInUse(IRCMessage *) { | 654 | void 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 | ||
648 | void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) { | 663 | void 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 | ||
652 | void IRCMessageParser::parseNumericalTopic(IRCMessage *message) { | 667 | void IRCMessageParser::parseNumericalTopic(IRCMessage *message) { |
653 | IRCChannel *channel = m_session->getChannel(message->param(1).lower()); | 668 | IRCChannel *channel = m_session->getChannel(message->param(1).lower()); |
654 | if (channel) { | 669 | if (channel) { |
655 | IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\"")); | 670 | IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\"")); |
656 | output.addParam(channel); | 671 | output.addParam(channel); |
657 | emit outputReady(output); | 672 | emit outputReady(output); |
658 | } else { | 673 | } else { |
659 | IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\"")); | 674 | IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\"")); |
660 | output.addParam(0); | 675 | output.addParam(0); |
661 | emit outputReady(output); | 676 | emit outputReady(output); |
662 | } | 677 | } |
663 | } | 678 | } |
664 | 679 | ||
665 | void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) { | 680 | void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) { |
666 | } | 681 | } |
667 | 682 | ||
668 | 683 | ||