projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow the creation of win32 debug builds.
[quassel.git]
/
src
/
core
/
coreuserinputhandler.cpp
diff --git
a/src/core/coreuserinputhandler.cpp
b/src/core/coreuserinputhandler.cpp
index
a2feda9
..
ecff7ef
100644
(file)
--- a/
src/core/coreuserinputhandler.cpp
+++ b/
src/core/coreuserinputhandler.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-
09
by the Quassel Project *
+ * Copyright (C) 2005-
10
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-29,7
+29,7
@@
#include <QRegExp>
CoreUserInputHandler::CoreUserInputHandler(CoreNetwork *parent)
#include <QRegExp>
CoreUserInputHandler::CoreUserInputHandler(CoreNetwork *parent)
- : BasicHandler(parent)
+ :
Core
BasicHandler(parent)
{
}
{
}
@@
-128,8
+128,8
@@
void CoreUserInputHandler::handleCtcp(const BufferInfo &bufferInfo, const QStrin
if(ctcpTag.isEmpty())
return;
if(ctcpTag.isEmpty())
return;
- QString message =
""
;
- QString verboseMessage = tr("sending CTCP-%1 request
").arg(ctcpTag
);
+ QString message =
msg.section(' ', 2)
;
+ QString verboseMessage = tr("sending CTCP-%1 request
to %2").arg(ctcpTag).arg(nick
);
if(ctcpTag == "PING") {
uint now = QDateTime::currentDateTime().toTime_t();
if(ctcpTag == "PING") {
uint now = QDateTime::currentDateTime().toTime_t();
@@
-169,16
+169,23
@@
void CoreUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QStrin
QString sane_msg = msg;
sane_msg.replace(QRegExp(", +"), ",");
QStringList params = sane_msg.trimmed().split(" ");
QString sane_msg = msg;
sane_msg.replace(QRegExp(", +"), ",");
QStringList params = sane_msg.trimmed().split(" ");
+
QStringList chans = params[0].split(",", QString::SkipEmptyParts);
QStringList keys;
QStringList chans = params[0].split(",", QString::SkipEmptyParts);
QStringList keys;
+ if(params.count() > 1)
+ keys = params[1].split(",");
+
int i;
for(i = 0; i < chans.count(); i++) {
if(!network()->isChannelName(chans[i]))
chans[i].prepend('#');
int i;
for(i = 0; i < chans.count(); i++) {
if(!network()->isChannelName(chans[i]))
chans[i].prepend('#');
- }
- if(params.count() > 1)
- keys = params[1].split(",");
+ if(i < keys.count()) {
+ network()->addChannelKey(chans[i], keys[i]);
+ } else {
+ network()->removeChannelKey(chans[i]);
+ }
+ }
static const char *cmd = "JOIN";
i = 0;
static const char *cmd = "JOIN";
i = 0;
@@
-186,18
+193,24
@@
void CoreUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QStrin
int slicesize = chans.count();
QList<QByteArray> encodedParams;
int slicesize = chans.count();
QList<QByteArray> encodedParams;
+ // go through all to-be-joined channels and (re)build the join list
while(i < chans.count()) {
joinChans.append(chans.at(i));
if(i < keys.count())
joinKeys.append(keys.at(i));
while(i < chans.count()) {
joinChans.append(chans.at(i));
if(i < keys.count())
joinKeys.append(keys.at(i));
+ // if the channel list we built so far either contains all requested channels or exceeds
+ // the desired amount of channels in this slice, try to send what we have so far
if(++i == chans.count() || joinChans.count() >= slicesize) {
if(++i == chans.count() || joinChans.count() >= slicesize) {
- params[0] = joinChans.join(",");
- params[1] = joinKeys.join(",");
+ params.clear();
+ params.append(joinChans.join(","));
+ params.append(joinKeys.join(","));
encodedParams = serverEncode(params);
encodedParams = serverEncode(params);
+ // check if it fits in one command
if(lastParamOverrun(cmd, encodedParams) == 0) {
emit putCmd(cmd, encodedParams);
} else if(slicesize > 1) {
if(lastParamOverrun(cmd, encodedParams) == 0) {
emit putCmd(cmd, encodedParams);
} else if(slicesize > 1) {
+ // back to start of slice, try again with half the amount of channels
i -= slicesize;
slicesize /= 2;
}
i -= slicesize;
slicesize /= 2;
}
@@
-205,16
+218,6
@@
void CoreUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QStrin
joinKeys.clear();
}
}
joinKeys.clear();
}
}
-
- i = 0;
- for(; i < keys.count(); i++) {
- if(i >= chans.count())
- break;
- network()->addChannelKey(chans[i], keys[i]);
- }
- for(; i < chans.count(); i++) {
- network()->removeChannelKey(chans[i]);
- }
}
void CoreUserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) {
}
void CoreUserInputHandler::handleKick(const BufferInfo &bufferInfo, const QString &msg) {
@@
-415,7
+418,7
@@
void CoreUserInputHandler::handleWhowas(const BufferInfo &bufferInfo, const QStr
void CoreUserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &msg) {
Q_UNUSED(bufferInfo);
void CoreUserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &msg) {
Q_UNUSED(bufferInfo);
- emit putCmd(serverEncode(cmd.toUpper()), serverEncode(msg));
+ emit putCmd(serverEncode(cmd.toUpper()), serverEncode(msg
.split(" ")
));
}
void CoreUserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message) {
}
void CoreUserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message) {