diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bf463a95..b0fefbc01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -114,7 +114,7 @@ - Dev: Refactored the Image Uploader feature. (#4971) - Dev: Refactored the SplitOverlay code. (#5082) - Dev: Refactored the TwitchBadges structure, making it less of a singleton. (#5096, #5144) -- Dev: Refactored emotes out of TwitchIrcServer. (#5120) +- Dev: Refactored emotes out of TwitchIrcServer. (#5120, #5146) - Dev: Refactored the ChatterinoBadges structure, making it less of a singleton. (#5103) - Dev: Refactored the ColorProvider class a bit. (#5112) - Dev: Moved the Network files to their own folder. (#5089) diff --git a/benchmarks/src/RecentMessages.cpp b/benchmarks/src/RecentMessages.cpp index 9bfc82cfd..77efd6dc1 100644 --- a/benchmarks/src/RecentMessages.cpp +++ b/benchmarks/src/RecentMessages.cpp @@ -12,6 +12,7 @@ #include "providers/recentmessages/Impl.hpp" #include "providers/seventv/SeventvBadges.hpp" #include "providers/seventv/SeventvEmotes.hpp" +#include "providers/twitch/TwitchBadges.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "singletons/Emotes.hpp" #include "singletons/Resources.hpp" @@ -72,6 +73,26 @@ public: return &this->highlights; } + TwitchBadges *getTwitchBadges() override + { + return &this->twitchBadges; + } + + BttvEmotes *getBttvEmotes() override + { + return &this->bttvEmotes; + } + + FfzEmotes *getFfzEmotes() override + { + return &this->ffzEmotes; + } + + SeventvEmotes *getSeventvEmotes() override + { + return &this->seventvEmotes; + } + AccountController accounts; Emotes emotes; mock::UserDataController userData; @@ -80,6 +101,10 @@ public: FfzBadges ffzBadges; SeventvBadges seventvBadges; HighlightController highlights; + TwitchBadges twitchBadges; + BttvEmotes bttvEmotes; + FfzEmotes ffzEmotes; + SeventvEmotes seventvEmotes; }; std::optional tryReadJsonFile(const QString &path)