Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #642

Merged
merged 2 commits into from
Oct 26, 2024
Merged
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
37 changes: 35 additions & 2 deletions telegram/bot.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,51 @@
from authentication.models import UserProfile
from django.conf import settings
from django.utils import timezone
from abc import ABC, abstractmethod
from telebot import types
from telebot import types, ExceptionHandler

import telebot
import time
import logging
import traceback

from telegram.models import TelegramConnection


logger = logging.getLogger(__name__)

telebot_instance = telebot.TeleBot(settings.TELEGRAM_BOT_API_KEY)

class ExceptionHandler(ExceptionHandler):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): The ExceptionHandler class name shadows the imported ExceptionHandler from telebot

Consider renaming this class to something more specific like TelegramExceptionHandler to avoid naming conflicts and potential confusion

def handle(self, exception: Exception):
# Timestamp for when the exception occurred
timestamp = timezone.now().strftime("%d/%m/%Y, %H:%M:%S")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (bug_risk): Timestamp string format loses timezone information

Consider including timezone information in the timestamp string format to aid in debugging across different timezones

Suggested change
timestamp = timezone.now().strftime("%d/%m/%Y, %H:%M:%S")
timestamp = timezone.now().strftime("%d/%m/%Y, %H:%M:%S %Z")


logger.error(f"Custom exception handler triggered for {exception}: {timestamp}")
traceback.print_exception(type(exception), exception, exception.__traceback__)

# Detailed message with improved readability
exception_message = (
f"**Exception Details**\n\n"
f"**Exception Type:** `{exception.__class__.__name__}`\n"
f"**Occurred At:** `{timestamp}`\n"
f"\n**Traceback:**\n"
f"```\n{''.join(traceback.format_exception(type(exception), exception, exception.__traceback__))}\n```"
)

sticker_emoji = "🪲🪲" # Customize as needed for better visibility
TelegramMessenger.get_instance().send_message(
chat_id=settings.TELEGRAM_BUG_REPORTER_CHANNEL_ID,
text=(
f"{sticker_emoji} **An error has occurred!** {sticker_emoji}\n\n"
f"{exception_message}"
),
)


telebot_instance = telebot.TeleBot(
settings.TELEGRAM_BOT_API_KEY, exception_handler=ExceptionHandler()
)


MAX_REQUESTS_PER_SECOND = 30

Expand Down
Loading