From 77375eca64463b67e86d129f7336a99ebf0f6abb Mon Sep 17 00:00:00 2001
From: HF <pixelplanetdev@gmail.com>
Date: Thu, 30 Apr 2020 00:27:58 +0200
Subject: [PATCH] have to check on config for proxycheck

---
 src/core/ChatProvider.js |  5 ++++-
 src/routes/api/me.js     | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/core/ChatProvider.js b/src/core/ChatProvider.js
index 8f757d7..7de6847 100644
--- a/src/core/ChatProvider.js
+++ b/src/core/ChatProvider.js
@@ -8,6 +8,9 @@ import webSockets from '../socket/websockets';
 
 import { CHAT_CHANNELS } from './constants';
 import { cheapDetector } from './isProxy';
+import {
+  USE_PROXYCHECK,
+} from './config';
 
 
 class ChatProvider {
@@ -106,7 +109,7 @@ class ChatProvider {
       }
     }
 
-    if (user.ip && await cheapDetector(user.ip)) {
+    if (USE_PROXYCHECK && user.ip && await cheapDetector(user.ip)) {
       logger.info(
         `${name} / ${user.ip} tried to send chat message with proxy`,
       );
diff --git a/src/routes/api/me.js b/src/routes/api/me.js
index 164318c..4c1f941 100644
--- a/src/routes/api/me.js
+++ b/src/routes/api/me.js
@@ -7,6 +7,10 @@
 import type { Request, Response } from 'express';
 
 import getMe from '../../core/me';
+import {
+  USE_PROXYCHECK,
+} from '../../core/config';
+import { cheapDetector } from '../../core/isProxy';
 
 
 export default async (req: Request, res: Response) => {
@@ -14,6 +18,13 @@ export default async (req: Request, res: Response) => {
   const userdata = await getMe(user);
   user.updateLogInTimestamp();
 
+  const { trueIp: ip } = req;
+  if (USE_PROXYCHECK && ip !== '0.0.0.1') {
+    // pre-fire cheap Detector to give it time to get a real result
+    // once api_pixel needs it
+    cheapDetector(ip);
+  }
+
   // https://stackoverflow.com/questions/49547/how-to-control-web-page-caching-across-all-browsers
   res.set({
     'Cache-Control': 'no-cache, no-store, must-revalidate',