Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion features/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,10 @@
EMOJI_STARPOWER_DEFAULT = "<:starpower_default:1454928324248993952>"
EMOJI_HYPERCHARGE_DEFAULT = "<:hypercharge_default:1455686652017115196>"

DAILY_MSG_EXCLUDED_CHANNEL_IDS = {ECONOMY_COMMANDS_CHANNEL_ID, BOT_COMMANDS_CHANNEL_ID}
PASSIVE_REWARD_EXCLUDED_CHANNEL_IDS = {
ECONOMY_COMMANDS_CHANNEL_ID,
BOT_COMMANDS_CHANNEL_ID,
}

ALLOWED_STAFF_ROLES = [
TOURNEY_ADMIN_ROLE_ID,
Expand Down
8 changes: 6 additions & 2 deletions features/economy.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
MODERATOR_ROLE_ID,
REDEMPTION_TICKET_CATEGORY_ID,
TRIAL_MODERATOR_ROLE_ID,
DAILY_MSG_EXCLUDED_CHANNEL_IDS,
PASSIVE_REWARD_EXCLUDED_CHANNEL_IDS,
)

shop_choices = [
Expand Down Expand Up @@ -645,13 +645,17 @@ async def on_message(self, message: discord.Message):
if message.channel.category and message.channel.category.id == BOTS_CATEGORY_ID:
return

# Skip token/XP rewards for bot command channels
if message.channel.id in PASSIVE_REWARD_EXCLUDED_CHANNEL_IDS:
return

user_id = str(message.author.id)
current_timestamp = time.time()
datetime.utcnow().strftime("%Y-%m-%d")

# --- TRACK DAILY MESSAGE COUNT (tied to /daily cooldown window) ---
# Format: "LAST_DAILY_TIMESTAMP:COUNT" — resets when user claims /daily
if message.channel.id not in DAILY_MSG_EXCLUDED_CHANNEL_IDS:
if message.channel.id not in PASSIVE_REWARD_EXCLUDED_CHANNEL_IDS:
last_daily_str = await get_setting(f"daily_{user_id}")
window_key = last_daily_str if last_daily_str else "0"

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "remaining7-discord-bot"
version = "1.9.1"
version = "1.9.2"

[tool.pytest.ini_options]
asyncio_mode = "auto"
Expand Down
Loading