projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix core crash
[quassel.git]
/
src
/
core
/
ctcpparser.cpp
diff --git
a/src/core/ctcpparser.cpp
b/src/core/ctcpparser.cpp
index
fc71057
..
b9dc240
100644
(file)
--- a/
src/core/ctcpparser.cpp
+++ b/
src/core/ctcpparser.cpp
@@
-39,6
+39,8
@@
CtcpParser::CtcpParser(CoreSession *coreSession, QObject *parent)
QByteArray XQUOTE = QByteArray("\134");
_ctcpXDelimDequoteHash[XQUOTE + XQUOTE] = XQUOTE;
_ctcpXDelimDequoteHash[XQUOTE + QByteArray("a")] = XDELIM;
QByteArray XQUOTE = QByteArray("\134");
_ctcpXDelimDequoteHash[XQUOTE + XQUOTE] = XQUOTE;
_ctcpXDelimDequoteHash[XQUOTE + QByteArray("a")] = XDELIM;
+
+ connect(this, SIGNAL(newEvent(Event *)), _coreSession->eventManager(), SLOT(postEvent(Event *)));
}
void CtcpParser::displayMsg(NetworkEvent *event, Message::Type msgType, const QString &msg, const QString &sender,
}
void CtcpParser::displayMsg(NetworkEvent *event, Message::Type msgType, const QString &msg, const QString &sender,
@@
-49,7
+51,7
@@
void CtcpParser::displayMsg(NetworkEvent *event, Message::Type msgType, const QS
MessageEvent *msgEvent = new MessageEvent(msgType, event->network(), msg, sender, target, msgFlags);
msgEvent->setTimestamp(event->timestamp());
MessageEvent *msgEvent = new MessageEvent(msgType, event->network(), msg, sender, target, msgFlags);
msgEvent->setTimestamp(event->timestamp());
-
coreSession()->eventManager()->send
Event(msgEvent);
+
emit new
Event(msgEvent);
}
QByteArray CtcpParser::lowLevelQuote(const QByteArray &message) {
}
QByteArray CtcpParser::lowLevelQuote(const QByteArray &message) {
@@
-177,7
+179,8
@@
void CtcpParser::parse(IrcEventRawMessage *e, Message::Type messagetype) {
ctcpcmd = ctcpcmd.toUpper();
ctcpcmd = ctcpcmd.toUpper();
- if(!coreSession()->ignoreListManager()->ctcpMatch(e->prefix(), e->network()->networkName(), ctcpcmd)) {
+ // we don't want to block /me messages by the CTCP ignore list
+ if(ctcpcmd == QLatin1String("ACTION") || !coreSession()->ignoreListManager()->ctcpMatch(e->prefix(), e->network()->networkName(), ctcpcmd)) {
if(uuid.isNull())
uuid = QUuid::createUuid();
if(uuid.isNull())
uuid = QUuid::createUuid();
@@
-188,10
+191,11
@@
void CtcpParser::parse(IrcEventRawMessage *e, Message::Type messagetype) {
}
if(!ctcpEvents.isEmpty()) {
_replies.insert(uuid, CtcpReply(coreNetwork(e), nickFromMask(e->prefix())));
}
if(!ctcpEvents.isEmpty()) {
_replies.insert(uuid, CtcpReply(coreNetwork(e), nickFromMask(e->prefix())));
- CtcpEvent *flushEvent = new CtcpEvent(uuid);
+ CtcpEvent *flushEvent = new CtcpEvent(EventManager::CtcpEventFlush, e->network(), e->prefix(), e->target(),
+ ctcptype, "INVALID", QString(), e->timestamp(), uuid);
ctcpEvents << flushEvent;
foreach(CtcpEvent *event, ctcpEvents) {
ctcpEvents << flushEvent;
foreach(CtcpEvent *event, ctcpEvents) {
-
coreSession()->eventManager()->send
Event(event);
+
emit new
Event(event);
}
}
}
}
@@
-214,7
+218,8
@@
void CtcpParser::sendCtcpEvent(CtcpEvent *e) {
}
} else if(e->type() == EventManager::CtcpEventFlush && _replies.contains(e->uuid())) {
CtcpReply reply = _replies.take(e->uuid());
}
} else if(e->type() == EventManager::CtcpEventFlush && _replies.contains(e->uuid())) {
CtcpReply reply = _replies.take(e->uuid());
- packedReply(net, reply.bufferName, reply.replies);
+ if(reply.replies.count())
+ packedReply(net, reply.bufferName, reply.replies);
}
}
}
}
@@
-245,13
+250,10
@@
void CtcpParser::packedReply(CoreNetwork *net, const QString &bufname, const QLi
answerSize += replies.at(i).size();
}
answerSize += replies.at(i).size();
}
- QByteArray quotedReply(answerSize, 0);
- int nextPos = 0;
- QByteArray &reply = quotedReply;
+ QByteArray quotedReply;
+ quotedReply.reserve(answerSize);
for(int i = 0; i < replies.count(); i++) {
for(int i = 0; i < replies.count(); i++) {
- reply = replies.at(i);
- quotedReply.replace(nextPos, reply.size(), reply);
- nextPos += reply.size();
+ quotedReply.append(replies.at(i));
}
params << net->serverEncode(bufname) << quotedReply;
}
params << net->serverEncode(bufname) << quotedReply;