added categories to the accountspage

src/providers/twitch/twitchaccount.cpp

@@ -12,7 +12,7 @@ namespace twitch {
 
 TwitchAccount::TwitchAccount(const QString &_username, const QString &_oauthToken,
                              const QString &_oauthClient, const QString &_userID)
-    : controllers::accounts::Account("Twitch")
+    : controllers::accounts::Account(ProviderId::Twitch)
     , oauthClient(_oauthClient)
     , oauthToken(_oauthToken)
     , userName(_username)

src/providers/twitch/twitchaccountmanager.cpp

@@ -32,7 +32,7 @@ std::vector<QString> TwitchAccountManager::getUsernames() const
 
     std::lock_guard<std::mutex> lock(this->mutex);
 
-    for (const auto &user : this->users) {
+    for (const auto &user : this->accounts.getVector()) {
         userNames.push_back(user->getUserName());
     }
 
@@ -44,7 +44,7 @@ std::shared_ptr<TwitchAccount> TwitchAccountManager::findUserByUsername(
 {
     std::lock_guard<std::mutex> lock(this->mutex);
 
-    for (const auto &user : this->users) {
+    for (const auto &user : this->accounts.getVector()) {
         if (username.compare(user->getUserName(), Qt::CaseInsensitive) == 0) {
             return user;
         }
@@ -140,17 +140,27 @@ bool TwitchAccountManager::removeUser(const QString &username)
         return false;
     }
 
-    this->mutex.lock();
-    this->users.erase(std::remove_if(this->users.begin(), this->users.end(), [username](auto user) {
-        if (user->getUserName() == username) {
-            std::string userID(user->getUserId().toStdString());
-            assert(!userID.empty());
-            pajlada::Settings::SettingManager::removeSetting("/accounts/uid" + userID);
-            return true;
+    {
+        std::lock_guard<std::mutex> guard(this->mutex);
+
+        const auto &accs = this->accounts.getVector();
+
+        while (true) {
+            auto it = std::find_if(accs.begin(), accs.end(),
+                                   [&](const auto &acc) { return acc->getUserName() == username; });
+
+            if (it == accs.end()) {
+                break;
+            }
+
+            std::string userID(it->get()->getUserId().toStdString());
+            if (!userID.empty()) {
+                pajlada::Settings::SettingManager::removeSetting("/accounts/uid" + userID);
+            }
+
+            this->accounts.removeItem(int(it - accs.begin()));
         }
-        return false;
-    }));
-    this->mutex.unlock();
+    }
 
     if (username == qS(this->currentUsername.getValue())) {
         // The user that was removed is the current user, log into the anonymous user
@@ -189,7 +199,7 @@ TwitchAccountManager::AddUserResponse TwitchAccountManager::addUser(
 
     std::lock_guard<std::mutex> lock(this->mutex);
 
-    this->users.push_back(newUser);
+    this->accounts.insertItem(newUser);
 
     return AddUserResponse::UserAdded;
 }

src/providers/twitch/twitchaccountmanager.hpp

@@ -68,7 +68,7 @@ private:
     std::shared_ptr<TwitchAccount> currentUser;
 
     std::shared_ptr<TwitchAccount> anonymousUser;
-    std::vector<std::shared_ptr<TwitchAccount>> users;
+    //    std::vector<std::shared_ptr<TwitchAccount>> users;
     mutable std::mutex mutex;
 
     friend class chatterino::controllers::accounts::AccountController;

src/providers/twitch/twitchchannel.hpp

@@ -7,7 +7,7 @@
 #include "singletons/emotemanager.hpp"
 #include "singletons/ircmanager.hpp"
 #include "util/concurrentmap.hpp"
-#include "util/mutexvalue.h"
+#include "util/mutexvalue.hpp"
 
 #include <pajlada/signals/signalholder.hpp>
 

src/providers/twitch/twitchserver.hpp

@@ -3,7 +3,7 @@
 #include "providers/irc/abstractircserver.hpp"
 #include "providers/twitch/twitchaccount.hpp"
 #include "providers/twitch/twitchchannel.hpp"
-#include "util/mutexvalue.h"
+#include "util/mutexvalue.hpp"
 
 #include <memory>