fix

bots.txt

@@ -1,7 +1,6 @@
 97.145.164.161
 2605:6400:10:1fe::666
 2001:470:79c9:100:5054:ff:fe66:12ba
-97.145.164.161
 167.172.244.121
 185.224.128.59
 66.249.66.9
@@ -2351,3 +2350,34 @@
 2001:41d0:d:36d3::1
 4.227.115.6
 2a01:4f9:c010:241b::1
+95.108.213.114
+159.203.73.253
+167.172.244.121
+185.191.171.15
+85.208.96.193
+85.208.96.194
+2a03:90c0:114::2fb
+2a03:90c0:114::2fb
+198.235.24.255
+2a03:90c0:114::2fb
+2a03:90c0:114::2fb
+20.55.214.161
+2a03:90c0:114::2fb
+2a03:90c0:114::2fb
+2a03:90c0:114::2fb
+2a03:90c0:114::2fb
+20.49.15.208
+2a03:90c0:114::2fb
+2a01:4f9:c010:241b::1
+2600:3c06::f03c:94ff:fe41:45f8
+2a01:4f9:4a:3793:0:10:0:e16a
+2a01:4f9:4a:3793:0:10:0:e16a
+2a01:4f9:4a:3793:0:10:0:e16a
+2a01:4f9:4a:3793:0:10:0:e16a
+2a01:4f9:4a:3793:0:10:0:e16a
+66.249.66.20
+20.55.126.64
+20.161.78.6
+54.36.148.192
+2a01:4f9:c010:241b::1
+66.249.66.13

firewall2.sh

@@ -439,10 +439,10 @@ module-akkoma() {
 			if [ "$CHECK" = "" ]; then
 				ipBlockParser "$1"
 				echo $1 >>$TMP_BLOCK
-				message "module-accounts: Spam Attack! $i"
-				echo "module-accounts: Spam $1"
+				message "module-akkoma: Spam Attack! $i"
+				echo "module-akkoma: Spam $1"
 			else 
-				echo "module-accounts: Ignoring Duplicate IP: $i"	
+				echo "module-akkoma: Ignoring Duplicate IP: $i"	
 			fi
 	fi
 }
@@ -482,7 +482,7 @@ message() {
 watch() {
 	echo "Scanning $DATE"
 	echo
-	IP=($(grep $DATE $NGINX_ACCESS | grep -Evi -f $SAFE_TRAFFIC | grep -Evi -f $CRAWLER_DB | grep -vi $MY_IP | grep -vi '127.0.0.1' | cut -d ' ' -f1 | sort -u))
+	IP=($(grep $DATE $NGINX_ACCESS | grep -Evi -f $SAFE_TRAFFIC | grep -Evi -f $CRAWLER_DB | grep -Evi -f $SAVED_BOTS |grep -vi $MY_IP | grep -vi '127.0.0.1' | cut -d ' ' -f1 | sort -u))
 
 	for i in "${IP[@]}"; do
 		module-akkoma "$i" "$DATE"
@@ -491,7 +491,7 @@ watch() {
 		module-go "$i" "$DATE"
 		module-get-spam "$i" "$DATE"
 
-		COUNT=$(grep $DATE $NGINX_ACCESS | grep $i | grep -Evi -f $SAFE_TRAFFIC | wc -l)
+		COUNT=$(grep $DATE $NGINX_ACCESS | grep $i | grep -Evi -f $SAFE_TRAFFIC | grep -Evi -f $SAVED_BOTS | wc -l)
 
 		CHECK=$(cat $NFT_CACHE | sort -u | grep $i)
 		if [[ "$COUNT" -gt $ATTACK_THRESHOLD ]]; then