Skip to content

Commit 98eee0e

Browse files
committed
💻 Code: Upgrade md2tgmd version to 0.1.7
🐛 Bug: Add markdown rendering error handling
1 parent c0edc52 commit 98eee0e

File tree

3 files changed

+29
-5
lines changed

3 files changed

+29
-5
lines changed

bot.py

+13-4
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,14 @@ async def getChatGPT(update, context, title, robot, message, chatid, messageid):
186186
if "🌐" not in data:
187187
result = result + data
188188
tmpresult = result
189-
if re.sub(r"```", '', result).count("`") % 2 != 0:
189+
if re.sub(r"```", '', result.split("\n")[-1]).count("`") % 2 != 0:
190190
tmpresult = result + "`"
191-
if result.count("```") % 2 != 0:
191+
# if re.sub(r"```", '', result).count("`") % 2 != 0:
192+
# tmpresult = result + "`"
193+
if sum([line.strip().startswith("```") for line in result.split('\n')]) % 2 != 0:
192194
tmpresult = tmpresult + "\n```"
195+
# if result.count("```") % 2 != 0:
196+
# tmpresult = tmpresult + "\n```"
193197
tmpresult = title + tmpresult
194198
if "claude" in title:
195199
tmpresult = claude_replace(tmpresult)
@@ -219,10 +223,15 @@ async def getChatGPT(update, context, title, robot, message, chatid, messageid):
219223
await context.bot.delete_message(chat_id=chatid, message_id=messageid)
220224
messageid = ''
221225
config.API = ''
222-
tmpresult = f"`{e}`"
226+
tmpresult = f"{tmpresult}\n\n`{e}`"
223227
print(tmpresult)
224228
if lastresult != tmpresult and messageid:
225-
await context.bot.edit_message_text(chat_id=chatid, message_id=messageid, text=escape(tmpresult), parse_mode='MarkdownV2', disable_web_page_preview=True, read_timeout=time_out, write_timeout=time_out, pool_timeout=time_out, connect_timeout=time_out)
229+
if "Can't parse entities: can't find end of code entity at byte offset" in tmpresult:
230+
# await context.bot.edit_message_text(chat_id=chatid, message_id=messageid, text=tmpresult, disable_web_page_preview=True, read_timeout=time_out, write_timeout=time_out, pool_timeout=time_out, connect_timeout=time_out)
231+
await update.message.reply_text(tmpresult)
232+
print(escape(tmpresult))
233+
else:
234+
await context.bot.edit_message_text(chat_id=chatid, message_id=messageid, text=escape(tmpresult), parse_mode='MarkdownV2', disable_web_page_preview=True, read_timeout=time_out, write_timeout=time_out, pool_timeout=time_out, connect_timeout=time_out)
226235

227236
@decorators.GroupAuthorization
228237
@decorators.Authorization

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--index-url https://pypi.python.org/simple/
22
requests
33
tiktoken==0.6.0
4-
md2tgmd==0.1.2
4+
md2tgmd==0.1.7
55
# jieba
66
python-dotenv
77
beautifulsoup4

vercel.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"version": 2,
3+
"builds": [
4+
{
5+
"src": "bot.py",
6+
"use": "@vercel/python"
7+
}
8+
],
9+
"routes": [
10+
{
11+
"src": "/(.*)",
12+
"dest": "bot.py"
13+
}
14+
]
15+
}

0 commit comments

Comments
 (0)