From bb11bf899e7c32c5c1dc07e1e1e2c2bb1255a7f9 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Sat, 8 Apr 2023 23:34:16 +0200
Subject: [PATCH] better DDOS mitigation

---
 files/helpers/config/modaction_types.py | 13 +----------
 files/helpers/settings.py               |  3 +--
 files/routes/jinja2.py                  | 29 ++++++++++++-------------
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/files/helpers/config/modaction_types.py b/files/helpers/config/modaction_types.py
index 2ecac9a66..11bdc947c 100644
--- a/files/helpers/config/modaction_types.py
+++ b/files/helpers/config/modaction_types.py
@@ -101,11 +101,6 @@ MODACTION_TYPES = {
 		"icon": 'fa-images',
 		"color": 'bg-muted'
 	},
-	'disable_automatic_DDOS_mitigation': {
-		"str": 'disabled automatic DDOS mitigation',
-		"icon": 'fa-shield-virus',
-		"color": 'bg-danger'
-	},
 	'distinguish_comment': {
 		"str": 'distinguished {self.target_link}',
 		"icon": 'fa-crown',
@@ -176,11 +171,6 @@ MODACTION_TYPES = {
 		"icon": 'fa-images',
 		"color": 'bg-success',
 	},
-	'enable_automatic_DDOS_mitigation': {
-		"str": 'enabled automatic DDOS mitigation',
-		"icon": 'fa-shield-virus',
-		"color": 'bg-success',
-	},
 	'flair_post': {
 		"str": 'set a flair on {self.target_link}',
 		"icon": 'fa-tag',
@@ -429,5 +419,4 @@ MODACTION_TYPES__FILTERED = deepcopy({t:v for t,v in MODACTION_TYPES.items()
                                      if not t in MODACTION_PRIVILEGED__TYPES})
 AEVANN_MODACTION_TYPES = {'ban_user','unban_user',
 						'shadowban','unshadowban',
-						'delete_media',
-						'enable_automatic_DDOS_mitigation', 'disable_automatic_DDOS_mitigation'}
+						'delete_media'}
diff --git a/files/helpers/settings.py b/files/helpers/settings.py
index 2419f2f22..a34de577f 100644
--- a/files/helpers/settings.py
+++ b/files/helpers/settings.py
@@ -15,8 +15,7 @@ _SETTINGS = {
 	"login_required": False,
 	"under_siege": False,
 	"dm_images": True,
-	"under_attack": False,
-	"automatic_DDOS_mitigation": True,
+	"under_attack": False
 }
 
 def get_setting(setting:str):
diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py
index 242e6ec28..c4e6aa33b 100644
--- a/files/routes/jinja2.py
+++ b/files/routes/jinja2.py
@@ -77,22 +77,21 @@ def calc_users():
 		loggedin_counter = len(loggedin)
 		loggedout_counter = len(loggedout)
 
-		if get_setting('automatic_DDOS_mitigation'):
-			if SITE == 'watchpeopledie.tv': mul = 5
-			else: mul = 1
+		if SITE == 'watchpeopledie.tv': mul = 3
+		else: mul = 1
 
-			if loggedout_counter > (loggedin_counter * mul):
-				if not get_setting('login_required'):
-					toggle_setting('login_required')
-				if not get_setting('under_attack'):
-					toggle_setting('under_attack')
-					set_security_level('under_attack')
-			else:
-				if get_setting('login_required'):
-					toggle_setting('login_required')
-				if get_setting('under_attack'):
-					toggle_setting('under_attack')
-					set_security_level('high')
+		if loggedout_counter > (loggedin_counter * mul):
+			if not get_setting('login_required'):
+				toggle_setting('login_required')
+			if not get_setting('under_attack'):
+				toggle_setting('under_attack')
+				set_security_level('under_attack')
+		else:
+			if get_setting('login_required'):
+				toggle_setting('login_required')
+			if get_setting('under_attack'):
+				toggle_setting('under_attack')
+				set_security_level('high')
 
 
 	return {'loggedin_counter':loggedin_counter,