server/auth/authentication.js

@@ -1,4 +1,4 @@
-const { db } = require('mysqlConfig');
+const db = require('models');
 const logger = require('winston');
 
 module.exports = {

server/controllers/publishController.js

@@ -1,8 +1,8 @@
 const logger = require('winston');
-const { db } = require('mysqlConfig');
-const lbryApi = require('../helpers/lbryApi.js');
-const publishHelpers = require('../helpers/publishHelpers.js');
-const { publishing: { primaryClaimAddress, additionalClaimAddresses } } = require('../../config/siteConfig.js');
+const db = require('models');
+const lbryApi = require('helpers/lbryApi.js');
+const publishHelpers = require('helpers/publishHelpers.js');
+const { publishing: { primaryClaimAddress, additionalClaimAddresses } } = require('siteConfig.js');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
 
@@ -18,7 +18,11 @@ module.exports = {
           // get the channel information
           if (publishParams.channel_name) {
             logger.debug(`this claim was published in channel: ${publishParams.channel_name}`);
-            return db.Channel.findOne({where: {channelName: publishParams.channel_name}});
+            return db.Channel.findOne({
+              where: {
+                channelName: publishParams.channel_name,
+              },
+            });
           } else {
             logger.debug('this claim was not published in a channel');
             return null;

server/controllers/serveController.js

@@ -1,6 +1,6 @@
-const { db } = require('mysqlConfig');
+const db = require('models');
 const logger = require('winston');
-const { returnPaginatedChannelClaims } = require('../helpers/channelPagination.js');
+const { returnPaginatedChannelClaims } = require('helpers/channelPagination.js');
 
 const NO_CHANNEL = 'NO_CHANNEL';
 const NO_CLAIM = 'NO_CLAIM';

server/controllers/statsController.js

@@ -1,5 +1,5 @@
 const logger = require('winston');
-const { db } = require('mysqlConfig');
+const db = require('models');
 
 module.exports = {
   getRecentClaims () {

server/helpers/statsHelpers.js

@@ -1,5 +1,6 @@
 const logger = require('winston');
-const { db } = require('mysqlConfig');
+const db = require('models');
+
 module.exports = {
   postToStats (action, url, ipAddress, name, claimId, result) {
     logger.debug('action:', action);

server/index.js

@@ -87,7 +87,7 @@ function Server () {
     this.server = http.Server(this.app);
   };
   this.start = () => {
-    const db = require('./models/');
+    const db = require('models');
     const PORT = siteConfig.details.port;
     // sync sequelize
     db.sequelize.sync()

server/speechPassport/local-login.js

@@ -1,6 +1,6 @@
 const PassportLocalStrategy = require('passport-local').Strategy;
 const logger = require('winston');
-const { db } = require('mysqlConfig');
+const db = require('models');
 
 const returnUserAndChannelInfo = (userInstance) => {
   return new Promise((resolve, reject) => {

server/speechPassport/local-signup.js

@@ -1,7 +1,7 @@
 const PassportLocalStrategy = require('passport-local').Strategy;
 const lbryApi = require('../helpers/lbryApi.js');
 const logger = require('winston');
-const { db } = require('mysqlConfig');
+const db = require('models');
 
 module.exports = new PassportLocalStrategy(
   {

server/task-scripts/update-channel-names.js

@@ -1,8 +1,8 @@
 // load dependencies
 const logger = require('winston');
-const { db } = require('mysqlConfig');
+const db = require('models');
 // configure logging
-require('../helpers/configureLogger.js')(logger);
+require('helpers/configureLogger.js')(logger);
 
 let totalClaims = 0;
 let totalClaimsNoCertificate = 0;

server/task-scripts/update-password.js

@@ -1,8 +1,8 @@
 // load dependencies
 const logger = require('winston');
-const { db } = require('mysqlConfig');
+const db = require('models');
 // configure logging
-require('../helpers/configureLogger.js')(logger);
+require('helpers/configureLogger.js')(logger);
 
 const userName = process.argv[2];
 logger.debug('user name:', userName);