From 7391df8e840bd4e6959be11c89523c51c028d272 Mon Sep 17 00:00:00 2001
From: Niko Storni <niko@lbry.io>
Date: Sat, 10 Nov 2018 19:11:12 -0500
Subject: [PATCH] run eslint pre-hook

---
 server/middleware/autoblockPublishMiddleware.js |  4 ++++
 server/middleware/logMetricsMiddleware.js       |  4 ++++
 server/render/src/handleShowRender.jsx          | 11 +++++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/server/middleware/autoblockPublishMiddleware.js b/server/middleware/autoblockPublishMiddleware.js
index 4c4456fb..08cc6e3f 100644
--- a/server/middleware/autoblockPublishMiddleware.js
+++ b/server/middleware/autoblockPublishMiddleware.js
@@ -58,7 +58,11 @@ const autoblockPublishBodyMiddleware = (req, res, next) => {
     let ip = (req.headers['x-forwarded-for'] || req.connection.remoteAddress).split(/,\s?/)[0];
     const { channelName } = req.body;
 
+<<<<<<< HEAD
     if (channelName && publishingChannelWhitelist.indexOf(channelName.toLowerCase()) !== -1) {
+=======
+    if (channelName && publishingChannelWhitelist.indexOf(channelName) !== -1) {
+>>>>>>> run eslint pre-hook
       delete ipCounts[ip];
     }
   }
diff --git a/server/middleware/logMetricsMiddleware.js b/server/middleware/logMetricsMiddleware.js
index e4ddaceb..05c8ceb0 100644
--- a/server/middleware/logMetricsMiddleware.js
+++ b/server/middleware/logMetricsMiddleware.js
@@ -27,7 +27,11 @@ function logMetricsMiddleware (req, res, next) {
 
     db.Metrics.create({
       time      : Date.now(),
+<<<<<<< HEAD
       isInternal: /node-fetch/.test(userAgent),
+=======
+      isInternal: /node\-fetch/.test(userAgent),
+>>>>>>> run eslint pre-hook
       isChannel : res.isChannel,
       claimId   : res.claimId,
       routePath : httpContext.get('routePath'),
diff --git a/server/render/src/handleShowRender.jsx b/server/render/src/handleShowRender.jsx
index 6e527b0c..ca7d28b8 100644
--- a/server/render/src/handleShowRender.jsx
+++ b/server/render/src/handleShowRender.jsx
@@ -53,20 +53,23 @@ module.exports = (req, res) => {
   const runSaga = (action !== false && saga !== false);
 
   const renderPage = (store) => {
-
     // Workaround, remove when a solution for async httpContext exists
     const showState = store.getState().show;
     const assetKeys = Object.keys(showState.assetList);
+<<<<<<< HEAD
     
     if(assetKeys.length !== 0) {
+=======
+    if (assetKeys.length !== 0) {
+>>>>>>> run eslint pre-hook
       res.claimId = showState.assetList[assetKeys[0]].claimId;
     } else {
       const channelKeys = Object.keys(showState.channelList);
 
-      if(channelKeys.length !== 0) {
+      if (channelKeys.length !== 0) {
         res.claimId = showState.channelList[channelKeys[0]].longId;
         res.isChannel = true;
-        }
+      }
     }
 
     // render component to a string
@@ -119,7 +122,7 @@ module.exports = (req, res) => {
           console.log(`redirecting ${req.originalUrl} to ${canonicalUrl}`);
           res.redirect(canonicalUrl);
         }
-        return renderPage(store)
+        return renderPage(store);
       });
   } else {
     const store = createStore(Reducers);