chatterino2
Code Issues

Merge branch 'master' into apa-notification-on-live

Browse Source
This commit is contained in:
pajlada
2018-09-16 17:43:53 +02:00
committed by GitHub
parent e89caa9e78 23cf815219
commit e2a7765964
53 changed files with 628 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Application.cpp
+2
View File
@@ -10,6 +10,7 @@
#include "debug/Log.hpp"
#include "messages/MessageBuilder.hpp"
#include "providers/bttv/BttvEmotes.hpp"
#include "providers/chatterino/ChatterinoBadges.hpp"
#include "providers/ffz/FfzEmotes.hpp"
#include "providers/twitch/PubsubClient.hpp"
#include "providers/twitch/TwitchServer.hpp"
@@ -56,6 +57,7 @@ Application::Application(Settings &_settings, Paths &_paths)
, taggedUsers(&this->emplace<TaggedUsersController>())
, moderationActions(&this->emplace<ModerationActions>())
, twitch2(&this->emplace<TwitchServer>())
, chatterinoBadges(&this->emplace<ChatterinoBadges>())
, logging(&this->emplace<Logging>())
{