Revert "Clean up some DB Calls, other tweaks (#172)" (#173)

This reverts commit e9f190f.

Author: TobiTenno

CONTRIBUTING.md

@@ -21,7 +21,7 @@ Use the provided `.eslintrc.json` to lint your files, include any ignores in you
 
 ### Running
 
-1. Get a bot token from the [discord application dashboard here](https://discordapp.com/developers/applications/me) and use it in a copy of `pm2.json`, we ignore `genesis.json` by default in our `.gitignore`.
+1. Get a bot token from the [discord application dashboard here](https://discordapp.com/developers/applications/me) and use it in a copy of `pm2.json`, we ignore `genesis.json` by default in our `.gitignore`. 
 
 2. Install [pm2](http://pm2.keymetrics.io/docs/usage/quick-start/).
 
@@ -33,7 +33,7 @@ Use the provided `.eslintrc.json` to lint your files, include any ignores in you
 
 6. Invite the bot to your server using the format:
 
-`https://discordapp.com/oauth2/authorize?scope=bot&client_id=<bot_client_id>&permissions=<permissions###>`.
+`https://discordapp.com/oauth2/authorize?scope=bot&client_id=<bot_client_id>&permissions=<permissions###>`. 
 
 ### Resources
 
@@ -43,12 +43,14 @@ Use the provided `.eslintrc.json` to lint your files, include any ignores in you
 
 * warframe-nexus-query [Docs](https://warframe-community-developers.github.io/warframe-nexus-query)
 
+* warframe-location-query [Docs](https://warframe-community-developers.github.io/warframe-location-query)
+
 * Contact Tobiah on Discord [Cephalon Genesis guild](https://discord.gg/0onjYYKuUBHiR3LK)
 
 ## Contributors
 
 Nspace
  * Awesome dude who's working on porting and updating the accumulated tech debt caused by hubot
-
+ 
 Tobiah
  * Other dude who's helping, writing features, debugging, and sometimes sleeping

main.js

@@ -1,7 +1,9 @@
 'use strict';
 
 const cluster = require('cluster');
+const Nexus = require('warframe-nexus-query');
 const Cache = require('json-fetch-cache');
+const NexusFetcher = require('nexus-stats-api');
 const Raven = require('raven');
 
 const DataCache = require('./src/resources/DropCache.js');
@@ -35,6 +37,18 @@ process.on('unhandledRejection', (err) => {
   logger.error(err);
 });
 
+const nexusOptions = {
+  user_key: process.env.NEXUSSTATS_USER_KEY || undefined,
+  user_secret: process.env.NEXUSSTATS_USER_SECRET || undefined,
+  api_url: process.env.NEXUS_API_OVERRIDE || undefined,
+  auth_url: process.env.NEXUS_AUTH_OVERRIDE || undefined,
+  ignore_limiter: true,
+};
+
+const nexusFetcher = new NexusFetcher(nexusOptions.nexusKey
+    && nexusOptions.nexusSecret ? nexusOptions : {});
+
+const nexusQuerier = new Nexus(nexusFetcher);
 
 const caches = {
   pc: new Cache('https://api.warframestat.us/pc', 600000),
@@ -57,7 +71,9 @@ if (cluster.isMaster) {
     prefix: process.env.PREFIX,
     logger,
     owner: process.env.OWNER,
+    nexusQuerier,
     caches,
+    nexusFetcher,
   });
   shard.start();
 }