aljaz/chatgpt-telegram-bot
1
1
Fork 0
mirror of https://github.com/aljazceru/chatgpt-telegram-bot.git synced 2025-12-21 22:54:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/support-functions

Browse Source 
# Conflicts:
#	README.md
This commit is contained in:
ned
2023-08-04 18:07:17 +02:00
parent 3b735f3987 3d2231a320
commit e1f328bf6f
3 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bot/telegram_bot.py
View File

@@ -129,12 +129,13 @@ class ChatGPTTelegramBot:
f"{localized_text(budget_period, bot_language)}: "
f"${remaining_budget:.2f}.\n"
)
# No longer works as of July 21st 2023, as OpenAI has removed the billing API
# add OpenAI account information for admin request
if is_admin(self.config, user_id):
text_budget += (
f"{localized_text('stats_openai', bot_language)}"
f"{self.openai.get_billing_current_month():.2f}"
)
# if is_admin(self.config, user_id):
# text_budget += (
# f"{localized_text('stats_openai', bot_language)}"
# f"{self.openai.get_billing_current_month():.2f}"
# )
usage_text = text_current_conversation + text_today + text_month + text_budget
await update.message.reply_text(usage_text, parse_mode=constants.ParseMode.MARKDOWN)
@@ -371,8 +372,10 @@ class ChatGPTTelegramBot:
if is_group_chat(update):
trigger_keyword = self.config['group_trigger_keyword']
if prompt.lower().startswith(trigger_keyword.lower()):
prompt = prompt[len(trigger_keyword):].strip()
if prompt.lower().startswith(trigger_keyword.lower()) or update.message.text.lower().startswith('/chat'):
if prompt.lower().startswith(trigger_keyword.lower()):
prompt = prompt[len(trigger_keyword):].strip()
if update.message.reply_to_message and \
update.message.reply_to_message.text and \