mikl/telegram-mcp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: restore parse_mode and safe-path handling

Browse source 
Address review feedback from @chigwell and @l1v0n1:

- Restore parse_mode=parse_mode in send_message and reply_to_message
- Restore _resolve_readable_file_path() in send_file, send_voice,
  send_sticker, and edit_chat_photo
- Use str(safe_path) instead of raw file_path in upload_file calls

The entity cache fix (resolve_entity/resolve_input_entity) is preserved
in all affected functions.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Nathan Schram 2026-03-18 14:36:27 +11:00
parent dad686a2d5
commit 2e87007da2
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
main.py
View file

@ -764,7 +764,7 @@ async def send_message(
""" """
try: try:
entity = await resolve_entity(chat_id) entity = await resolve_entity(chat_id)
await client.send_message(entity, message) await client.send_message(entity, message, parse_mode=parse_mode)
return "Message sent successfully." return "Message sent successfully."
except Exception as e: except Exception as e:
return log_and_format_error("send_message", e, chat_id=chat_id) return log_and_format_error("send_message", e, chat_id=chat_id)
@ -2071,13 +2071,16 @@ async def send_file(
caption: Optional caption for the file. caption: Optional caption for the file.
""" """
try: try:
if not os.path.isfile(file_path): safe_path, path_error = await _resolve_readable_file_path(
return f"File not found: {file_path}" raw_path=file_path,
if not os.access(file_path, os.R_OK): ctx=ctx,
return f"File is not readable: {file_path}" tool_name="send_file",
)
if path_error:
return path_error
entity = await resolve_entity(chat_id) entity = await resolve_entity(chat_id)
await client.send_file(entity, file_path, caption=caption) await client.send_file(entity, str(safe_path), caption=caption)
return f"File sent to chat {chat_id}." return f"File sent to chat {chat_id} from {safe_path}."
except Exception as e: except Exception as e:
return log_and_format_error( return log_and_format_error(
"send_file", e, chat_id=chat_id, file_path=file_path, caption=caption "send_file", e, chat_id=chat_id, file_path=file_path, caption=caption
@ -2457,7 +2460,7 @@ async def edit_chat_photo(
return path_error return path_error
entity = await resolve_entity(chat_id) entity = await resolve_entity(chat_id)
uploaded_file = await client.upload_file(file_path) uploaded_file = await client.upload_file(str(safe_path))
if isinstance(entity, Channel): if isinstance(entity, Channel):
# For channels/supergroups, use EditPhotoRequest with InputChatUploadedPhoto # For channels/supergroups, use EditPhotoRequest with InputChatUploadedPhoto
@ -3008,8 +3011,8 @@ async def send_voice(
return "Voice file must be .ogg or .opus format." return "Voice file must be .ogg or .opus format."
entity = await resolve_entity(chat_id) entity = await resolve_entity(chat_id)
await client.send_file(entity, file_path, voice_note=True) await client.send_file(entity, str(safe_path), voice_note=True)
return f"Voice message sent to chat {chat_id}." return f"Voice message sent to chat {chat_id} from {safe_path}."
except Exception as e: except Exception as e:
return log_and_format_error("send_voice", e, chat_id=chat_id, file_path=file_path) return log_and_format_error("send_voice", e, chat_id=chat_id, file_path=file_path)
@ -3181,7 +3184,7 @@ async def reply_to_message(
""" """
try: try:
entity = await resolve_entity(chat_id) entity = await resolve_entity(chat_id)
await client.send_message(entity, text, reply_to=message_id) await client.send_message(entity, text, reply_to=message_id, parse_mode=parse_mode)
return f"Replied to message {message_id} in chat {chat_id}." return f"Replied to message {message_id} in chat {chat_id}."
except Exception as e: except Exception as e:
return log_and_format_error( return log_and_format_error(
@ -3481,8 +3484,8 @@ async def send_sticker(
return path_error return path_error
entity = await resolve_entity(chat_id) entity = await resolve_entity(chat_id)
await client.send_file(entity, file_path, force_document=False) await client.send_file(entity, str(safe_path), force_document=False)
return f"Sticker sent to chat {chat_id}." return f"Sticker sent to chat {chat_id} from {safe_path}."
except Exception as e: except Exception as e:
return log_and_format_error("send_sticker", e, chat_id=chat_id, file_path=file_path) return log_and_format_error("send_sticker", e, chat_id=chat_id, file_path=file_path)