chatterino2
Code Issues

credentials are now loaded when needed

Browse Source
This commit is contained in:
fourtf
2019-09-14 20:45:01 +02:00
parent d33a8b1b3a
commit 13d1fab303
15 changed files with 100 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/irc/AbstractIrcServer.cpp
+24 -12
View File
@@ -78,19 +78,26 @@ void AbstractIrcServer::connect()
if (this->hasSeparateWriteConnection())
{
this->initializeConnection(this->writeConnection_.get(), false, true);
this->initializeConnection(this->readConnection_.get(), true, false);
this->initializeConnection(this->writeConnection_.get(), Write);
this->initializeConnection(this->readConnection_.get(), Read);
}
else
{
this->initializeConnection(this->readConnection_.get(), true, true);
this->initializeConnection(this->readConnection_.get(), Both);
}
}
// fourtf: this should be asynchronous
void AbstractIrcServer::open(ConnectionType type)
{
std::lock_guard<std::mutex> lock1(this->connectionMutex_);
std::lock_guard<std::mutex> lock2(this->channelMutex);
if (type == Write)
{
this->writeConnection_->open();
}
if (type & Read)
{
std::lock_guard<std::mutex> lock1(this->connectionMutex_);
std::lock_guard<std::mutex> lock2(this->channelMutex);
for (std::weak_ptr<Channel> &weak : this->channels.values())
{
if (auto channel = weak.lock())
@@ -98,11 +105,6 @@ void AbstractIrcServer::connect()
this->readConnection_->sendRaw("JOIN #" + channel->getName());
}
}
if (this->hasSeparateWriteConnection())
{
this->writeConnection_->open();
}
this->readConnection_->open();
}
}
@@ -254,6 +256,16 @@ void AbstractIrcServer::onReadConnected(IrcConnection *connection)
std::lock_guard lock(this->channelMutex);
// join channels
for (auto &&weak : this->channels)
{
if (auto channel = weak.lock())
{
connection->sendRaw("JOIN #" + channel->getName());
}
}
// connected/disconnected message
auto connectedMsg = makeSystemMessage("connected");
connectedMsg->flags.set(MessageFlag::ConnectedMessage);
auto reconnected = makeSystemMessage("reconnected");