chatterino2
Code Issues

Remove global third party emotes from TwitchChannel class (#3000)

Browse Source 
Those are still accessible under getApp()->twitch2 instance.
This commit is contained in:
Paweł
2021-07-13 13:23:50 +02:00
committed by GitHub
parent 8c113c2311
commit c8c28d7f55
6 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/TwitchChannel.hpp
+1 -6
View File
@@ -87,8 +87,6 @@ public:
SharedAccessGuard<const StreamStatus> accessStreamStatus() const;
// Emotes
const BttvEmotes &globalBttv() const;
const FfzEmotes &globalFfz() const;
boost::optional<EmotePtr> bttvEmote(const EmoteName &name) const;
boost::optional<EmotePtr> ffzEmote(const EmoteName &name) const;
std::shared_ptr<const EmoteMap> bttvEmotes() const;
@@ -127,8 +125,7 @@ private:
} nameOptions;
protected:
explicit TwitchChannel(const QString &channelName, BttvEmotes &globalBttv,
FfzEmotes &globalFfz);
explicit TwitchChannel(const QString &channelName);
private:
// Methods
@@ -162,8 +159,6 @@ private:
UniqueAccess<RoomModes> roomModes_;
protected:
BttvEmotes &globalBttv_;
FfzEmotes &globalFfz_;
Atomic<std::shared_ptr<const EmoteMap>> bttvEmotes_;
Atomic<std::shared_ptr<const EmoteMap>> ffzEmotes_;
Atomic<boost::optional<EmotePtr>> ffzCustomModBadge_;