1
0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00

Update types.py

-- Fix encoding bug (emoji shifted offset)
This commit is contained in:
sviat9440 2018-04-15 19:19:29 +03:00
parent f5f48db6ba
commit ffe3a0c3d7

View File

@ -468,8 +468,10 @@ class Message(JsonDeserializable):
if hasattr(self, "custom_subs"): if hasattr(self, "custom_subs"):
for type in self.custom_subs: for type in self.custom_subs:
_subs[type] = self.custom_subs[type] _subs[type] = self.custom_subs[type]
utf16_text = self.text.encode("utf-16-le")
html_text = "" html_text = ""
def func(text, type=None, url=None, user=None): def func(text, type=None, url=None, user=None):
text = text.decode("utf-16-le")
if type == "text_mention": if type == "text_mention":
type = "url" type = "url"
url = "tg://user?id={0}".format(user.id) url = "tg://user?id={0}".format(user.id)
@ -483,16 +485,13 @@ class Message(JsonDeserializable):
offset = 0 offset = 0
for entity in self.entities: for entity in self.entities:
if entity.type == "bot_command":
entity.offset -= 1
entity.length += 1
if entity.offset > offset: if entity.offset > offset:
html_text += func(self.text[offset:entity.offset]) html_text += func(utf16_text[offset * 2 : entity.offset * 2])
offset = entity.offset offset = entity.offset
html_text += func(self.text[offset:offset + entity.length], entity.type, entity.url, entity.user) html_text += func(utf16_text[offset * 2 : (offset + entity.length) * 2], entity.type, entity.url, entity.user)
offset += entity.length offset += entity.length
if offset < len(self.text): if offset * 2 < len(utf16_text):
html_text += func(self.text[offset:]) html_text += func(utf16_text[offset * 2:])
return html_text return html_text