stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed communi backend without irc_network option

Browse source
This commit is contained in:
HanzZ 2012-09-22 08:18:38 +02:00
parent bf1cad516b
commit 74cd11e265
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backends/libcommuni/ircnetworkplugin.cpp
View file

@ -35,6 +35,8 @@ void IRCNetworkPlugin::handleLoginRequest(const std::string &user, const std::st
MyIrcSession *session = new MyIrcSession(user, this);
std::string h = user.substr(0, user.find("@"));
session->setNickName(FROM_UTF8(h.substr(0, h.find("%"))));
session->setUserName(FROM_UTF8(h.substr(0, h.find("%"))));
session->setRealName(FROM_UTF8(h.substr(0, h.find("%"))));
session->setHost(FROM_UTF8(h.substr(h.find("%") + 1)));
session->setPort(6667);
session->open();
@ -79,6 +81,10 @@ void IRCNetworkPlugin::handleMessageSendRequest(const std::string &user, const s
}
LOG4CXX_INFO(logger, user << ": Session name: " << u << ", message to " << r);
m_sessions[u]->sendCommand(IrcCommand::createMessage(FROM_UTF8(r), FROM_UTF8(message)));
if (r.find("#") == 0) {
handleMessage(user, legacyName, message, TO_UTF8(m_sessions[u]->nickName()));
}
}
void IRCNetworkPlugin::handleJoinRoomRequest(const std::string &user, const std::string &room, const std::string &nickname, const std::string &password) {
@ -96,6 +102,8 @@ void IRCNetworkPlugin::handleJoinRoomRequest(const std::string &user, const std:
// suffix is %irc.freenode.net to let MyIrcSession return #room%irc.freenode.net
MyIrcSession *session = new MyIrcSession(user, this, room.substr(room.find("@")));
session->setNickName(FROM_UTF8(nickname));
session->setUserName(FROM_UTF8(nickname));
session->setRealName(FROM_UTF8(nickname));
session->setHost(FROM_UTF8(room.substr(room.find("@") + 1)));
session->setPort(6667);
session->open();

3
backends/libcommuni/session.cpp
View file

@ -161,7 +161,8 @@ void MyIrcSession::on_messageReceived(IrcMessage *message) {
bool flags = 0;
std::string nickname = TO_UTF8(m->sender().name());
flags = correctNickname(nickname);
np->handleMessage(user, nickname, TO_UTF8(m->message()));
LOG4CXX_INFO(logger, nickname + suffix);
np->handleMessage(user, nickname + suffix, TO_UTF8(m->message()));
}
}