removed that pile of garbage IrcManager

This commit is contained in:
fourtf
2018-06-28 19:54:40 +02:00
parent 8ced5a1e25
commit 848bbc71aa
11 changed files with 15 additions and 183 deletions
+5 -6
View File
@@ -7,7 +7,6 @@
#include "providers/twitch/Pubsub.hpp"
#include "providers/twitch/TwitchMessageBuilder.hpp"
#include "singletons/Emotes.hpp"
#include "singletons/IrcManager.hpp"
#include "singletons/Settings.hpp"
#include "util/PostToThread.hpp"
@@ -145,7 +144,7 @@ void TwitchChannel::sendMessage(const QString &message)
// manager" dialog
this->addMessage(
Message::createSystemMessage("You need to log in to send messages. You can "
"link your Twitch account in the settings."));
"link your Twitch account in the settings."));
return;
}
@@ -233,8 +232,8 @@ void TwitchChannel::addJoinedUser(const QString &user)
QTimer::singleShot(500, &this->object, [this] {
std::lock_guard<std::mutex> guard(this->joinedUserMutex);
auto message = Message::createSystemMessage("Users joined: " +
this->joinedUsers.join(", "));
auto message =
Message::createSystemMessage("Users joined: " + this->joinedUsers.join(", "));
message->flags |= Message::Collapsed;
this->addMessage(message);
this->joinedUsers.clear();
@@ -262,8 +261,8 @@ void TwitchChannel::addPartedUser(const QString &user)
QTimer::singleShot(500, &this->object, [this] {
std::lock_guard<std::mutex> guard(this->partedUserMutex);
auto message = Message::createSystemMessage("Users parted: " +
this->partedUsers.join(", "));
auto message =
Message::createSystemMessage("Users parted: " + this->partedUsers.join(", "));
message->flags |= Message::Collapsed;
this->addMessage(message);
this->partedUsers.clear();
-1
View File
@@ -6,7 +6,6 @@
#include "common/Common.hpp"
#include "common/MutexValue.hpp"
#include "singletons/Emotes.hpp"
#include "singletons/IrcManager.hpp"
#include "util/ConcurrentMap.hpp"
#include <pajlada/signals/signalholder.hpp>
@@ -7,7 +7,6 @@
#include "debug/Log.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "singletons/Emotes.hpp"
#include "singletons/IrcManager.hpp"
#include "singletons/Resources.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Themes.hpp"
@@ -37,8 +36,8 @@ TwitchMessageBuilder::TwitchMessageBuilder(Channel *_channel,
TwitchMessageBuilder::TwitchMessageBuilder(Channel *_channel,
const Communi::IrcMessage *_ircMessage,
const MessageParseArgs &_args,
QString content, bool isAction)
const MessageParseArgs &_args, QString content,
bool isAction)
: channel(_channel)
, twitchChannel(dynamic_cast<TwitchChannel *>(_channel))
, ircMessage(_ircMessage)