Merge pull request #954 from ModOrganizer2/Develop

Stage for release 2.2.2

1 files changed, 34 insertions, 1 deletions

diff --git a/src/apiuseraccount.cpp b/src/apiuseraccount.cpp
index b901e41a..976dd488 100644
--- a/src/apiuseraccount.cpp
+++ b/src/apiuseraccount.cpp
@@ -1,10 +1,37 @@
 #include "apiuseraccount.h"
 
+QString localizedUserAccountType(APIUserAccountTypes t)
+{
+  switch (t)
+  {
+    case APIUserAccountTypes::Regular:
+      return QObject::tr("Regular");
+
+    case APIUserAccountTypes::Premium:
+      return QObject::tr("Premium");
+
+    case APIUserAccountTypes::None:  // fall-through
+    default:
+      return QObject::tr("None");
+  }
+}
+
+
 APIUserAccount::APIUserAccount()
   : m_type(APIUserAccountTypes::None)
 {
 }
 
+bool APIUserAccount::isValid() const
+{
+  return !m_key.isEmpty();
+}
+
+const QString& APIUserAccount::apiKey() const
+{
+  return m_key;
+}
+
 const QString& APIUserAccount::id() const
 {
   return m_id;
@@ -25,6 +52,12 @@ const APILimits& APIUserAccount::limits() const
   return m_limits;
 }
 
+APIUserAccount& APIUserAccount::apiKey(const QString& key)
+{
+  m_key = key;
+  return *this;
+}
+
 APIUserAccount& APIUserAccount::id(const QString& id)
 {
   m_id = id;
@@ -63,5 +96,5 @@ bool APIUserAccount::shouldThrottle() const
 
 bool APIUserAccount::exhausted() const
 {
-  return (remainingRequests() <= 0);
+  return isValid() && (remainingRequests() <= 0);
 }