test autoban (mods not exempt)

app.py

@@ -35,6 +35,14 @@ logging.basicConfig(level=logging.DEBUG)
 #rate_limiter = RateLimiter(max_calls=10, period=60)  # needs testing
 message_cache = {}
 
+AUTO_BAN_ALERT_THRESHOLD = 5
+AUTO_BAN_EXEMPT_ROLE_IDS = {897381378172264449, 897376942817419265}
+# moderator = 1078351789843292311
+
+def is_exempt(member: discord.Member) -> bool:
+    return any(getattr(r, "id", None) in AUTO_BAN_EXEMPT_ROLE_IDS for r in getattr(member, "roles", []))
+
+
 # stats stuff ---------------------------------------------------------------------------------------------------------------------------------------------------------
 number_of_messages = 0
 user_cooldowns = {}
@@ -98,8 +106,8 @@ async def on_message(message):
             """
         
             # cooldown_duration = 3; false_positive_threshld = 3; -> 99% spam at spam_count of 10+ (could still be wrong, so we timeout)
-            cooldown_duration = 5  # messages per n seconds, was 1, now 3, could try 5
-            false_positive_threshold = 5 # big = alert less (catch less spam), small = alert more (catch more spam)
+            cooldown_duration = 7  # messages per n seconds, was 1, now 3, could try 5 (adjusted 5->7)
+            false_positive_threshold = 4 # big = alert less (catch less spam), small = alert more (catch more spam)
             timeout_threshold = 10  # number of messages before issuing a timeout (similar function to ban, easier to reverse)
             timeout_duration = 168  # timeout duration in hours (1 week)
             
@@ -119,7 +127,7 @@ async def on_message(message):
 
                     # tldr; if we post 2 messages with less than [cooldown_duration]seconds between them
                     if spam_count >= false_positive_threshold: # n in a row, helps avoid false positives for posting in threads
-                        # warning for 5+
+                        # warning for 4+
                         channel = message.channel
                         if spam_count == false_positive_threshold:
                             if channel.id != 996580741121065091: # admin channel excluded due to how automod messages are categorized by the discord bot
@@ -149,27 +157,85 @@ async def on_message(message):
                             f"Message content: {message.content}\n"
                             f"[Jump to message!](https://discord.com/channels/{message.guild.id}/{message.channel.id}/{message.id})\n"
                         )
-                    # auto-ban
-                    """
-                    if spam_count >= timeout_threshold:
-                        try:  
-                            member = message.author
-                            await member.send(
-                                "You have been auto-banned for spamming. \n If this was an error, message <@811235357663297546> ."
-                            )
-                            await member.ban()
-                        except Exception as e:
-                            print(f"Error: {e}")                     
+                        # AUTO BAN ======================================================================================================
+                        # Only in guild text contexts
+                        if not message.guild:
+                            # DMs or weird contexts — never autoban
+                            pass
+                        else:
+                            # Resolve a proper Member object
+                            member = message.author if isinstance(message.author, discord.Member) else message.guild.get_member(message.author.id)
+                        
+                            if member is None:
+                                print("Autoban: could not resolve Member, skipping.")
+                            else:
+                                # Prepare alert ping safely
+                                test_server = os.environ.get('TEST_SERVER')
+                                if test_server == 'True':
+                                    alert = "<@&1106995261487710411>"  # test alerts
+                                elif test_server == 'False':
+                                    alert = "<@&1108342563628404747>"  # prod alerts
+                                else:
+                                    alert = ""  # no ping fallback
+                        
+                                # Skip bots and exempt roles
+                                if member.bot or is_exempt(member):
+                                    pass
+                                elif spam_count >= AUTO_BAN_ALERT_THRESHOLD:
+                                    me: discord.Member = message.guild.me
+                                    can_ban = (
+                                        isinstance(me, discord.Member)
+                                        and me.guild_permissions.ban_members
+                                        and (member.top_role < me.top_role)  # role hierarchy check
+                                    )
                     
-                    """
-
-
+                                    if not can_ban:
+                                        try:
+                                            await bot.log_channel.send(
+                                                f"❌ Auto-ban skipped for {member.mention} — missing `Ban Members` or role hierarchy issue."
+                                            )
+                                        except Exception as e:
+                                            print(f"Autoban permission log error: {e}")
+                                    else:
+                                        try:
+                                            # Try to DM; ignore failures
+                                            try:
+                                                await member.send(
+                                                    f"You have been automatically banned from **{message.guild.name}** for repeated spam. "
+                                                    f"If this was an error, please contact @lunarflu."
+                                                )
+                                            except Exception as dm_err:
+                                                print(f"Could not DM user before ban: {dm_err}")
+                    
+                                            await member.ban(
+                                                reason=f"Auto-ban: reached {spam_count} spam alerts within ~{cooldown_duration}s inter-arrival window"
+                                            )
+                    
+                                            try:
+                                                await bot.log_channel.send(
+                                                    f"🚨 **AUTO-BANNED** {member.mention} ({member.id}) for repeated spam "
+                                                    f"({spam_count}/{AUTO_BAN_ALERT_THRESHOLD} within ~{cooldown_duration}s). {alert}"
+                                                )
+                                            except Exception as log_err:
+                                                print(f"Autoban log error: {log_err}")
+                    
+                                        except discord.Forbidden:
+                                            await bot.log_channel.send(
+                                                f"❌ Forbidden when auto-banning {member.mention} — check role order / perms."
+                                            )
+                                        except discord.HTTPException as e:
+                                            await bot.log_channel.send(f"❌ HTTPException during auto-ban for {member.mention}: `{e}`")
+                                        except Exception as e:
+                                            await bot.log_channel.send(f"❌ Unexpected error during auto-ban for {member.mention}: `{e}`")
+                    
+                                        # Reset their burst window so we don't double-trigger
+                                        user_cooldowns.pop(member.id, None)
+                        # ================= END AUTO BAN (hardened) =================
+     
             user_cooldowns[message.author.id]['timestamp'] = message.created_at  
 
         await bot.process_commands(message)
 
-    except Exception as e:
-        print(f"on_message Error: {e}")     
 
 # moderation stuff-----------------------------------------------------------------------------------------------------------------------------------------------------