From 5743276ea92479848ee49f5d7696fa0bcf1293c5 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Sat, 10 Jun 2023 02:42:10 +0200
Subject: [PATCH] update nginx config reinstate temporary turk cooldown
 increase to 1.2

---
 deployment/nginx/conf.d/6denyws.conf  | 30 +++++++--------------------
 deployment/nginx/includes/canvas.conf |  1 -
 src/core/draw.js                      |  8 +++----
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/deployment/nginx/conf.d/6denyws.conf b/deployment/nginx/conf.d/6denyws.conf
index 821f1ca0..d4585c83 100644
--- a/deployment/nginx/conf.d/6denyws.conf
+++ b/deployment/nginx/conf.d/6denyws.conf
@@ -4,6 +4,11 @@ geo $allow_ws {
     91.200.160.0/22   1;
     92.118.132.0/24   1;
     195.189.44.0/22   1;
+    # Sevastopol
+    185.71.80.0/22    1;
+    195.209.151.0/24  1;
+    213.59.160.0/20   1;
+    62.76.12.0/24     1;
 }
 
 geo $deny_ws {
@@ -49,32 +54,22 @@ geo $deny_ws {
     2a0a:fa40::/29    1;
     # Some Brazil University
     200.235.0.0/17    1;
+    # Turk spamer
+    85.100.70.0/23    1;
+    85.99.178.0/23    1;
     # Hohols
     103.108.94.130 1;
     104.223.100.81 1;
     109.236.81.170 1;
     141.95.54.180 1;
     146.0.86.196 1;
-    146.70.52.116 1;
     169.150.196.109 1;
-    176.103.27.246 1;
-    176.105.204.93 1;
-    176.119.68.184 1;
-    176.38.17.17 1;
-    176.39.36.34 1;
-    176.53.147.75 1;
-    176.8.143.17 1;
     178.17.170.189 1;
     178.20.142.170 1;
     185.107.56.163 1;
     185.231.207.118 1;
     185.43.191.203 1;
     185.72.247.151 1;
-    188.163.121.219 1;
-    193.106.56.22 1;
-    193.109.145.47 1;
-    194.242.103.232 1;
-    195.46.35.206 1;
     199.244.49.79 1;
     2a01:36d:1400:28d2:bd93:65a6:5e31:e322 1;
     2a09:bac1:7540:48::84:6d 1;
@@ -82,20 +77,14 @@ geo $deny_ws {
     31.222.253.215 1;
     31.223.105.113 1;
     37.120.156.234 1;
-    37.57.120.109 1;
     37.63.9.104 1;
     37.78.224.175 1;
     45.132.194.16 1;
     46.166.182.34 1;
     46.166.182.57 1;
-    46.211.166.66 1;
-    46.219.225.169 1;
-    46.229.61.32 1;
     5.173.158.92 1;
     5.173.172.228 1;
     5.180.128.110 1;
-    62.244.51.28 1;
-    77.120.35.184 1;
     83.71.204.117 1;
     85.100.66.238 1;
     85.110.146.67 1;
@@ -104,11 +93,8 @@ geo $deny_ws {
     88.134.42.187 1;
     89.43.30.38 1;
     91.219.238.174 1;
-    91.228.236.175 1;
-    91.237.27.102 1;
     93.115.28.181 1;
     94.110.186.197 1;
-    95.69.133.104 1;
     99.224.5.31 1;
     141.94.31.178 1;
     146.70.52.247 1;
diff --git a/deployment/nginx/includes/canvas.conf b/deployment/nginx/includes/canvas.conf
index 7790163d..f46d45a6 100644
--- a/deployment/nginx/includes/canvas.conf
+++ b/deployment/nginx/includes/canvas.conf
@@ -12,7 +12,6 @@ include /etc/nginx/includes/certbotroot.conf;
 
 set $test 0;
 if ($cloudflare_ip != 1) {
-  # return 302 https://www.youtube.com/watch?v=YkZvwVf7F9k;
   return 404;
 }
 if ($http_cf_ipcountry = "UA") {
diff --git a/src/core/draw.js b/src/core/draw.js
index e2fa4ade..7e4eaac4 100644
--- a/src/core/draw.js
+++ b/src/core/draw.js
@@ -113,13 +113,13 @@ export default async function drawByOffsets(
     const isAdmin = (user.userlvl === 1);
     const req = (isAdmin) ? null : canvas.req;
     const clrIgnore = canvas.cli || 0;
-    const factor = (isAdmin || (user.userlvl > 0 && pixels[0][1] < clrIgnore))
+    let factor = (isAdmin || (user.userlvl > 0 && pixels[0][1] < clrIgnore))
       ? 0.0 : coolDownFactor;
-    /*
+
     if (user.country === 'tr') {
-      factor *= 1.5;
+      factor *= 1.2;
     }
-    */
+
     const bcd = canvas.bcd * factor;
     const pcd = (canvas.pcd) ? canvas.pcd * factor : bcd;
     const pxlOffsets = [];