chatterino2
Code Issues

Merge branch 'master' of https://github.com/fourtf/chatterino2

Browse Source
This commit is contained in:
fourtf
2018-01-28 03:39:47 +01:00
parent 591ab4d8da e518cff06e
commit 431b9a8c1f
76 changed files with 1645 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/singletons/ircmanager.cpp
+13 -6
View File
@@ -246,16 +246,23 @@ void IrcManager::privateMessageReceived(Communi::IrcPrivateMessage *message)
return;
}
auto xd = message->content();
auto xd2 = message->toData();
// auto xd = message->content();
// auto xd2 = message->toData();
debug::Log("HEHE: {}", xd2.toStdString());
// debug::Log("HEHE: {}", xd2.toStdString());
messages::MessageParseArgs args;
twitch::TwitchMessageBuilder builder(c.get(), message, args);
c->addMessage(builder.parse());
if (!builder.isIgnored()) {
messages::MessagePtr _message = builder.build();
if (_message->flags & messages::Message::Highlighted) {
singletons::ChannelManager::getInstance().mentionsChannel->addMessage(_message);
}
c->addMessage(_message);
}
}
void IrcManager::messageReceived(Communi::IrcMessage *message)
@@ -384,7 +391,7 @@ void IrcManager::onConnected()
MessagePtr connMsg = Message::createSystemMessage("connected to chat");
MessagePtr reconnMsg = Message::createSystemMessage("reconnected to chat");
this->channelManager.doOnAll([connMsg, reconnMsg](SharedChannel channel) {
this->channelManager.doOnAll([connMsg, reconnMsg](ChannelPtr channel) {
assert(channel);
LimitedQueueSnapshot<MessagePtr> snapshot = channel->getMessageSnapshot();
@@ -407,7 +414,7 @@ void IrcManager::onDisconnected()
MessagePtr msg = Message::createSystemMessage("disconnected from chat");
msg->flags &= Message::DisconnectedMessage;
this->channelManager.doOnAll([msg](SharedChannel channel) {
this->channelManager.doOnAll([msg](ChannelPtr channel) {
assert(channel);
channel->addMessage(msg);
});