0001-j-and-join-only-prepend-when-channel-names-start.patch
| src/core/corealiasmanager.cpp | ||
|---|---|---|
| 54 | 54 | |
| 55 | 55 |
void CoreAliasManager::loadDefaults() {
|
| 56 | 56 |
// Default Aliases: |
| 57 |
addAlias("j", "/join #$1");
|
|
| 57 |
addAlias("j", "/join $1");
|
|
| 58 | 58 |
} |
| src/core/userinputhandler.cpp | ||
|---|---|---|
| 156 | 156 |
QStringList params = msg.trimmed().split(" ");
|
| 157 | 157 |
QStringList chans = params[0].split(",");
|
| 158 | 158 |
QStringList keys; |
| 159 |
int i; |
|
| 160 |
for(i = 0; i < chans.count(); i++) {
|
|
| 161 |
if (chans.at(i)[0].isLetterOrNumber()) |
|
| 162 |
chans[i].prepend(QChar('#'));
|
|
| 163 |
} |
|
| 164 |
params[0] = chans.join(",");
|
|
| 159 | 165 |
if(params.count() > 1) keys = params[1].split(",");
|
| 160 | 166 |
emit putCmd("JOIN", serverEncode(params)); // FIXME handle messages longer than 512 bytes!
|
| 161 |
int i = 0;
|
|
| 167 |
i = 0; |
|
| 162 | 168 |
for(; i < keys.count(); i++) {
|
| 163 | 169 |
if(i >= chans.count()) break; |
| 164 | 170 |
networkConnection()->addChannelKey(chans[i], keys[i]); |
| 165 |
- |
|