fixed and optimized the autocompletion

src/providers/twitch/TwitchChannel.hpp

@@ -1,13 +1,17 @@
 #pragma once
 
-#include <IrcConnection>
-
 #include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
 #include "common/Channel.hpp"
 #include "common/Outcome.hpp"
 #include "common/UniqueAccess.hpp"
+#include "common/UsernameSet.hpp"
+#include "providers/twitch/TwitchEmotes.hpp"
 
+#include <rapidjson/document.h>
+#include <IrcConnection>
+#include <QColor>
+#include <QRegularExpression>
 #include <boost/optional.hpp>
 #include <mutex>
 #include <pajlada/signals/signalholder.hpp>
@@ -37,11 +41,6 @@ public:
         QString streamType;
     };
 
-    struct UserState {
-        bool mod;
-        bool broadcaster;
-    };
-
     struct RoomModes {
         bool submode = false;
         bool r9k = false;
@@ -51,32 +50,24 @@ public:
         QString broadcasterLang;
     };
 
-    void refreshChannelEmotes();
+    void initialize();
 
     // Channel methods
     virtual bool isEmpty() const override;
     virtual bool canSendMessage() const override;
     virtual void sendMessage(const QString &message) override;
-
-    // Auto completion
-    void addRecentChatter(const MessagePtr &message) final;
-    void addJoinedUser(const QString &user);
-    void addPartedUser(const QString &user);
-
-    bool isLive() const;
     virtual bool isMod() const override;
-    void setMod(bool value);
     virtual bool isBroadcaster() const override;
 
     // Data
     const QString &subscriptionUrl();
     const QString &channelUrl();
     const QString &popoutPlayerUrl();
+    bool isLive() const;
     QString roomId() const;
-    void setRoomId(const QString &id);
     AccessGuard<const RoomModes> accessRoomModes() const;
-    void setRoomModes(const RoomModes &roomModes_);
     AccessGuard<const StreamStatus> accessStreamStatus() const;
+    AccessGuard<const UsernameSet> accessChatters() const;
 
     // Emotes
     const BttvEmotes &globalBttv() const;
@@ -86,58 +77,53 @@ public:
     std::shared_ptr<const EmoteMap> bttvEmotes() const;
     std::shared_ptr<const EmoteMap> ffzEmotes() const;
 
-    boost::optional<EmotePtr> getTwitchBadge(const QString &set,
-                                             const QString &version) const;
+    void refreshChannelEmotes();
+
+    // Badges
+    boost::optional<EmotePtr> twitchBadge(const QString &set,
+                                          const QString &version) const;
 
     // Signals
     pajlada::Signals::NoArgSignal roomIdChanged;
-    pajlada::Signals::NoArgSignal liveStatusChanged;
     pajlada::Signals::NoArgSignal userStateChanged;
+    pajlada::Signals::NoArgSignal liveStatusChanged;
     pajlada::Signals::NoArgSignal roomModesChanged;
 
+protected:
+    void addRecentChatter(const MessagePtr &message) override;
+
 private:
     struct NameOptions {
         QString displayName;
         QString localizedName;
     };
 
-    struct CheerEmote {
-        // a Cheermote indicates one tier
-        QColor color;
-        int minBits;
-
-        EmotePtr animatedEmote;
-        EmotePtr staticEmote;
-    };
-
-    struct CheerEmoteSet {
-        QRegularExpression regex;
-        std::vector<CheerEmote> cheerEmotes;
-    };
-
-    explicit TwitchChannel(const QString &channelName, BttvEmotes &bttv,
-                           FfzEmotes &ffz);
+    explicit TwitchChannel(const QString &channelName, BttvEmotes &globalBttv,
+                           FfzEmotes &globalFfz);
 
     // Methods
     void refreshLiveStatus();
     Outcome parseLiveStatus(const rapidjson::Document &document);
     void refreshPubsub();
-    void refreshViewerList();
-    Outcome parseViewerList(const QJsonObject &jsonRoot);
+    void refreshChatters();
+    void refreshBadges();
+    void refreshCheerEmotes();
     void loadRecentMessages();
 
+    void addJoinedUser(const QString &user);
+    void addPartedUser(const QString &user);
     void setLive(bool newLiveStatus);
-
-    void loadBadges();
-    void loadCheerEmotes();
+    void setMod(bool value);
+    void setRoomId(const QString &id);
+    void setRoomModes(const RoomModes &roomModes_);
 
     // Data
     const QString subscriptionUrl_;
     const QString channelUrl_;
     const QString popoutPlayerUrl_;
     UniqueAccess<StreamStatus> streamStatus_;
-    UniqueAccess<UserState> userState_;
     UniqueAccess<RoomModes> roomModes_;
+    UniqueAccess<UsernameSet> chatters_;  // maps 2 char prefix to set of names
 
     // Emotes
     BttvEmotes &globalBttv_;
@@ -145,6 +131,11 @@ private:
     Atomic<std::shared_ptr<const EmoteMap>> bttvEmotes_;
     Atomic<std::shared_ptr<const EmoteMap>> ffzEmotes_;
 
+    // Badges
+    UniqueAccess<std::map<QString, std::map<QString, EmotePtr>>>
+        badgeSets_;  // "subscribers": { "0": ... "3": ... "6": ...
+    UniqueAccess<std::vector<CheerEmoteSet>> cheerEmoteSets_;
+
     bool mod_ = false;
     UniqueAccess<QString> roomID_;
 
@@ -153,10 +144,6 @@ private:
     UniqueAccess<QStringList> partedUsers_;
     bool partedUsersMergeQueued_ = false;
 
-    // "subscribers": { "0": ... "3": ... "6": ...
-    UniqueAccess<std::map<QString, std::map<QString, EmotePtr>>> badgeSets_;
-    UniqueAccess<std::vector<CheerEmoteSet>> cheerEmoteSets_;
-
     // --
     QByteArray messageSuffix_;
     QString lastSentMessage_;
@@ -165,6 +152,8 @@ private:
     QTimer chattersListTimer_;
 
     friend class TwitchServer;
+    friend class TwitchMessageBuilder;
+    friend class IrcMessageHandler;
 };
 
 }  // namespace chatterino