From a5d25a82177bfe93dcf692e64a5394fea60968e8 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Fri, 5 Aug 2022 23:38:49 +0200
Subject: [PATCH] more fixes

---
 src/components/ModIIDtools.jsx       |  2 +-
 src/components/UI.jsx                | 12 ++------
 src/components/contextmenus/index.js |  7 +++++
 src/core/isAllowed.js                | 46 +++++++++++++++++-----------
 src/core/parsePixelLog.js            |  6 ++--
 src/data/sql/IPInfo.js               |  1 +
 6 files changed, 42 insertions(+), 32 deletions(-)
 create mode 100644 src/components/contextmenus/index.js

diff --git a/src/components/ModIIDtools.jsx b/src/components/ModIIDtools.jsx
index 88baa65..79444b6 100644
--- a/src/components/ModIIDtools.jsx
+++ b/src/components/ModIIDtools.jsx
@@ -50,7 +50,7 @@ function ModIIDtools() {
           selectIIDAction(sel.options[sel.selectedIndex].value);
         }}
       >
-        {['givecaptcha', 'ban', 'unban', 'whitelist', 'unwhitelist']
+        {['status', 'givecaptcha', 'ban', 'unban', 'whitelist', 'unwhitelist']
           .map((opt) => (
             <option
               key={opt}
diff --git a/src/components/UI.jsx b/src/components/UI.jsx
index 1f42afb..b8aaf63 100644
--- a/src/components/UI.jsx
+++ b/src/components/UI.jsx
@@ -13,15 +13,7 @@ import Palette from './Palette';
 import Alert from './Alert';
 import HistorySelect from './HistorySelect';
 import Mobile3DControls from './Mobile3DControls';
-import UserContextMenu from './contextmenus/UserContextMenu';
-import ChannelContextMenu from './contextmenus/ChannelContextMenu';
-
-
-const CONTEXT_MENUS = {
-  USER: UserContextMenu,
-  CHANNEL: ChannelContextMenu,
-  /* other context menus */
-};
+import ContextMenues from './contextmenus';
 
 const UI = () => {
   const [
@@ -38,7 +30,7 @@ const UI = () => {
     state.contextMenu.menuType,
   ], shallowEqual);
 
-  const ContextMenu = menuOpen && menuType && CONTEXT_MENUS[menuType];
+  const ContextMenu = menuOpen && menuType && ContextMenues[menuType];
 
   return (
     <>
diff --git a/src/components/contextmenus/index.js b/src/components/contextmenus/index.js
new file mode 100644
index 0000000..3b06c4e
--- /dev/null
+++ b/src/components/contextmenus/index.js
@@ -0,0 +1,7 @@
+import UserContextMenu from './UserContextMenu';
+import ChannelContextMenu from './ChannelContextMenu';
+
+export default {
+  USER: UserContextMenu,
+  CHANNEL: ChannelContextMenu,
+};
diff --git a/src/core/isAllowed.js b/src/core/isAllowed.js
index 96212c8..4b57b83 100644
--- a/src/core/isAllowed.js
+++ b/src/core/isAllowed.js
@@ -94,10 +94,12 @@ async function dummy() {
   return [false, 'dummy'];
 }
 
-async function saveIPInfo(ip, isProxy, info) {
+async function saveIPInfo(ip, whoisRet, isProxy, info) {
+  const whoisData = whoisRet || {};
+
   try {
-    const whoisData = await whois(ip);
     IPInfo.upsert({
+      ip,
       ...whoisData,
       isProxy,
       pcheck: info,
@@ -113,24 +115,32 @@ async function saveIPInfo(ip, isProxy, info) {
  * @param ip IP to check
  * @return true if proxy or blacklisted, false if not or whitelisted
  */
-async function withoutCache(f, ip) {
+export async function withoutCache(f, ip) {
   const ipKey = getIPv6Subnet(ip);
-  let allowed;
-  let status;
-  let pcInfo;
-  if (await isWhitelisted(ipKey)) {
-    allowed = false;
-    pcInfo = 'wl';
-    status = -1;
-  } else if (await isIPBanned(ipKey)) {
-    allowed = true;
-    pcInfo = 'bl';
-    status = 2;
-  } else {
-    [allowed, pcInfo] = await f(ip);
-    status = (allowed) ? 1 : 0;
+  let allowed = true;
+  let status = -2;
+  let pcInfo = null;
+  let whoisRet = null;
+
+  try {
+    if (await isWhitelisted(ipKey)) {
+      allowed = true;
+      pcInfo = 'wl';
+      status = -1;
+    } else if (await isIPBanned(ipKey)) {
+      allowed = false;
+      pcInfo = 'bl';
+      status = 2;
+    } else {
+      [allowed, pcInfo] = await f(ip);
+      allowed = !allowed;
+      status = (allowed) ? 0 : 1;
+    }
+    whoisRet = await whois(ip);
+  } finally {
+    await saveIPInfo(ipKey, whoisRet, allowed, pcInfo);
   }
-  saveIPInfo(ipKey, allowed, pcInfo);
+
   return {
     allowed,
     status,
diff --git a/src/core/parsePixelLog.js b/src/core/parsePixelLog.js
index 260277b..2dc749c 100644
--- a/src/core/parsePixelLog.js
+++ b/src/core/parsePixelLog.js
@@ -272,9 +272,9 @@ export async function getSummaryFromArea(
           }
         }
         row.push(
-          ipInfo.uuid || 'N/A',
-          ipInfo.country || 'xx',
-          ipInfo.cidr || 'N/A',
+          ipInfo.uuid,
+          ipInfo.country,
+          ipInfo.cidr,
           ipInfo.org || 'N/A',
           pcheck || 'N/A',
         );
diff --git a/src/data/sql/IPInfo.js b/src/data/sql/IPInfo.js
index ab7ae89..174979c 100644
--- a/src/data/sql/IPInfo.js
+++ b/src/data/sql/IPInfo.js
@@ -23,6 +23,7 @@ const IPInfo = sequelize.define('IPInfo', {
 
   cidr: {
     type: DataTypes.CHAR(43),
+    defaultValue: 'N/A',
     allowNull: false,
   },