ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds ability to specify server with /join

Browse Source 
Fixes bug #232
This commit is contained in:
Arnav Rawat
2021-01-29 17:58:57 -06:00
committed by Carl Schwan
parent 5c8b9c0803
commit b4e996aecd
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/actionshandler.cpp
View File

@@ -137,6 +137,7 @@ void ActionsHandler::joinRoom(const QString &alias)
const auto knownServer = alias.mid(alias.indexOf(":") + 1); const auto knownServer = alias.mid(alias.indexOf(":") + 1);
auto joinRoomJob = m_connection->joinRoom(alias, QStringList{knownServer}); auto joinRoomJob = m_connection->joinRoom(alias, QStringList{knownServer});
qDebug() << alias;
Quotient::JoinRoomJob::connect(joinRoomJob, &JoinRoomJob::failure, [=] { Quotient::JoinRoomJob::connect(joinRoomJob, &JoinRoomJob::failure, [=] {
Q_EMIT showMessage(MessageType::Error, i18n("Server error when joining the room \"%1\": %2", Q_EMIT showMessage(MessageType::Error, i18n("Server error when joining the room \"%1\": %2",
joinRoomJob->errorString())); joinRoomJob->errorString()));
@@ -253,7 +254,13 @@ void ActionsHandler::postMessage(const QString &text,
Q_EMIT showMessage(MessageType::Error, i18n("Invalid command")); Q_EMIT showMessage(MessageType::Error, i18n("Invalid command"));
return; return;
} }
joinRoom(splittedText[0]); if (splittedText.count() > 1) {
joinRoom(splittedText[0] + ":" + splittedText[1]);
return;
}
else {
joinRoom(splittedText[0] + ":matrix.org");
}
return; return;
} }