This removes getNexusPage from GameInfo and is currently in the game plugin.

I'm looking to move it to the nexus interface though as it doesn't really relate to the game plugin.

I've also removed the MananagementURL as
- you can log into nexus without needing to specify the game
- See above - it doesn't belong with the game plugin

This gets rid of all dependencies bar game saving and logging in

1 files changed, 12 insertions, 23 deletions

diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index 08572d50..c37131eb 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -26,7 +26,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "selfupdater.h"

 #include "persistentcookiejar.h"

 #include "settings.h"

-#include <gameinfo.h>

 #include <json.h>

 

 #include <QMessageBox>

@@ -42,10 +41,11 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QJsonDocument>

 #include <QJsonArray>

 

-

 using namespace MOBase;

-using namespace MOShared;

 

+namespace {

+  QString const Nexus_Management_URL("http://nmm.nexusmods.com");

+}

 

 // unfortunately Nexus doesn't seem to document these states, all I know is all these listed

 // are considered premium (27 should be lifetime premium)

@@ -99,8 +99,7 @@ QNetworkReply *NXMAccessManager::createRequest(
 

 void NXMAccessManager::showCookies() const

 {

-  QUrl url(ToQString(GameInfo::instance().getNexusPage()) + "/");

-

+  QUrl url(Nexus_Management_URL + "/");

   for (const QNetworkCookie &cookie : cookieJar()->cookiesForUrl(url)) {

     qDebug("%s - %s (expires: %s)",

            cookie.name().constData(), cookie.value().constData(),

@@ -113,7 +112,7 @@ void NXMAccessManager::startLoginCheck()
 {

   if (hasLoginCookies()) {

     qDebug("validating login cookies");

-    QNetworkRequest request(ToQString(GameInfo::instance().getNexusPage()) + "/Sessions/?Validate");

+    QNetworkRequest request(Nexus_Management_URL + "/Sessions/?Validate");

     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");

     request.setRawHeader("User-Agent", userAgent().toUtf8());

 

@@ -131,12 +130,7 @@ void NXMAccessManager::retrieveCredentials()
 {

   qDebug("retrieving credentials");

 

-  //This may be overkill as

-  //www.nexusmods.com/Core/Libs/Flamework/Entities/User?GetCredentials

-  //seems to work fine.

-  QNetworkRequest request(m_Game->getNexusManagementURL()

-                          + QString("/Core/Libs/Flamework/Entities/User?GetCredentials&game_id=%1"

-                                    ).arg(m_Game->getNexusGameID()));

+  QNetworkRequest request(Nexus_Management_URL + "/Core/Libs/Flamework/Entities/User?GetCredentials");

   request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");

   request.setRawHeader("User-Agent", userAgent().toUtf8());

 

@@ -231,8 +225,9 @@ QString NXMAccessManager::userAgent(const QString &subModule) const
 void NXMAccessManager::pageLogin()

 {

   qDebug("logging %s in on Nexus", qPrintable(m_Username));

-  QString requestString = (ToQString(GameInfo::instance().getNexusPage()) + "/Sessions/?Login&uri=%1")

-                             .arg(QString(QUrl::toPercentEncoding(ToQString(GameInfo::instance().getNexusPage()))));

+

+  QString requestString = (Nexus_Management_URL + "/Sessions/?Login&uri=%1")

+                            .arg(QString(QUrl::toPercentEncoding(Nexus_Management_URL)));

 

   QNetworkRequest request(requestString);

   request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");

@@ -296,15 +291,14 @@ void NXMAccessManager::loginError(QNetworkReply::NetworkError)
 

 bool NXMAccessManager::hasLoginCookies() const

 {

-  bool sidCookie = false;

-  QUrl url(ToQString(GameInfo::instance().getNexusPage()) + "/");

+  QUrl url(Nexus_Management_URL + "/");

   QList<QNetworkCookie> cookies = cookieJar()->cookiesForUrl(url);

   for (const QNetworkCookie &cookie : cookies) {

     if (cookie.name() == "sid") {

-      sidCookie = true;

+      return true;

     }

   }

-  return sidCookie;

+  return false;

 }

 

 

@@ -345,8 +339,3 @@ void NXMAccessManager::loginChecked()
   m_LoginReply->deleteLater();

   m_LoginReply = nullptr;

 }

-

-void NXMAccessManager::managedGameChanged(MOBase::IPluginGame const *game)

-{

-  m_Game = game;

-}