Files
meshcore-bot/modules/commands/roll_command.py
T
Stacy Olivas 242e0a5df1 fix: ruff/mypy compliance for issues introduced by PR #152
PR #152 introduced trailing whitespace in several command files, set
message.content_lower at runtime without declaring it on the MeshMessage
dataclass, and left unused/unsorted imports in test and service files.
All cause ruff/mypy CI failures on branches that rebase onto dev after
that merge.

Linting fixes (ruff --fix):
- modules/command_manager.py: restore PUBLIC_CHANNEL_KEY_HEX re-export
  with noqa guard (core.py imports it from here; auto-fix silently dropped it)
- modules/commands/multitest_command.py: strip W291/W293 trailing whitespace
- modules/commands/path_command.py: strip W293 trailing whitespace
- modules/commands/prefix_command.py: strip W291 trailing whitespace
- modules/commands/roll_command.py: strip W293 trailing whitespace
- modules/commands/sports_command.py: strip W293 trailing whitespace
- modules/core.py: strip W293 blank-line whitespace
- modules/service_plugins/packet_capture_service.py: sort imports (I001)
- modules/version_info.py: remove unused typing.Any import (F401)
- tests/integration/test_flood_scope_reply.py: remove unused call import
- tests/unit/test_log_data_scope_fields.py: remove unused asyncio import
- tests/unit/test_public_channel_guard.py: sort imports, remove unused
  patch and validate_config imports

Dataclass fix (mypy attr-defined):
- modules/models.py: declare content_lower field on MeshMessage so mypy
  resolves the attribute set by base_command.cleanup_message_for_matching

Must be merged before or alongside PRs #155–#158 to clear CI on those
branches.
2026-04-14 10:10:41 -07:00

177 lines
5.6 KiB
Python

#!/usr/bin/env python3
"""
Roll command for the MeshCore Bot
Handles random number generation between 1 and X (default 100)
"""
import random
from typing import Optional
from ..models import MeshMessage
from .base_command import BaseCommand
class RollCommand(BaseCommand):
"""Handles random number rolling commands.
This command generates a random number between 1 and a specified maximum (default 100).
It supports syntax like 'roll' or 'roll 50'.
"""
# Plugin metadata
name = "roll"
keywords = ['roll']
description = "Roll a random number between 1 and X (default 100). Use 'roll' for 1-100, 'roll 50' for 1-50, etc."
category = "games"
# Documentation
short_description = "Roll a random number between 1 and X"
usage = "roll [max]"
examples = ["roll", "roll 50"]
parameters = [
{"name": "max", "description": "Maximum value (default: 100, max: 10000)"}
]
def __init__(self, bot):
"""Initialize the roll command.
Args:
bot: The bot instance.
"""
super().__init__(bot)
self.roll_enabled = self.get_config_value('Roll_Command', 'enabled', fallback=True, value_type='bool')
def can_execute(self, message: MeshMessage, skip_channel_check: bool = False) -> bool:
"""Check if this command can be executed with the given message.
Args:
message: The message triggering the command.
Returns:
bool: True if command is enabled and checks pass, False otherwise.
"""
if not self.roll_enabled:
return False
return super().can_execute(message)
def get_help_text(self) -> str:
"""Get help text for the roll command.
Returns:
str: The help text for this command.
"""
return self.translate('commands.roll.help')
def matches_keyword(self, message: MeshMessage) -> bool:
"""Override to handle roll-specific matching.
Custom matching logic to support variable maximums (e.g., "roll 50").
Args:
message: The message to check for a match.
Returns:
bool: True if the message matches the roll command syntax, False otherwise.
"""
content_lower = self.cleanup_message_for_matching(message)
# Check for exact "roll" match
if content_lower == "roll":
return True
# Check for roll with parameters (roll 50, roll 1000, etc.)
# Ensure "roll" is the first word and followed by valid number
if content_lower.startswith("roll "):
words = content_lower.split()
if len(words) >= 2 and words[0] == "roll":
roll_part = content_lower[5:].strip() # Get everything after "roll "
# Check if the roll part is valid number notation (not just any word)
max_num = self.parse_roll_notation(roll_part)
return max_num is not None # Only match if it's valid number notation
return False
def parse_roll_notation(self, roll_input: str) -> Optional[int]:
"""Parse roll notation and return the maximum number.
Supports inputs like: 50, 100, 1000.
Args:
roll_input: The string part containing the number.
Returns:
Optional[int]: The maximum number if valid, None otherwise.
"""
roll_input = roll_input.strip()
# Handle direct number (e.g., "50", "100", "1000")
if roll_input.isdigit():
max_num = int(roll_input)
if 1 <= max_num <= 10000: # Reasonable limit
return max_num
else:
return None
return None
def roll_number(self, max_num: int) -> int:
"""Roll a random number between 1 and max_num (inclusive).
Args:
max_num: The maximum possible value.
Returns:
int: The generated random number.
"""
return random.randint(1, max_num)
def format_roll_result(self, max_num: int, result: int) -> str:
"""Format roll result into a readable string.
Args:
max_num: The maximum number for the roll.
result: The actual rolled number.
Returns:
str: The formatted result string.
"""
return self.translate('commands.roll.result', max=max_num, result=result)
async def execute(self, message: MeshMessage) -> bool:
"""Execute the roll command.
Parses the maximum number (if provided), generates a random number,
and sends the result to the user.
Args:
message: The message triggering the command.
Returns:
bool: True if executed successfully, False otherwise.
"""
content = message.content.strip()
# Handle command-style messages
if content.startswith('!'):
content = content[1:].strip()
# Default to 1-100 if no specification
if content.lower() == "roll":
max_num: Optional[int] = 100
else:
# Parse roll specification
roll_part = content[5:].strip() # Get everything after "roll "
max_num = self.parse_roll_notation(roll_part)
if max_num is None:
# Invalid roll specification
response = self.translate('commands.roll.invalid_number')
return await self.send_response(message, response)
# Roll the number
result = self.roll_number(max_num)
# Format and send response
response = self.format_roll_result(max_num, result)
return await self.send_response(message, response)