Update alchemysession to fix get_entity

This commit is contained in:
Tulir Asokan
2018-03-30 12:50:48 +03:00
parent c24cd8fbb1
commit a1297e90ce
3 changed files with 6 additions and 5 deletions
+2 -2
View File
@@ -28,7 +28,7 @@ from telethon.tl.types import (MessageEntityMention, MessageEntityMentionName,
MessageEntityEmail, MessageEntityUrl, MessageEntityTextUrl,
MessageEntityBold, MessageEntityItalic, MessageEntityCode,
MessageEntityPre, MessageEntityBotCommand, Message, PeerChannel,
MessageEntityHashtag, TypeMessageEntity, MessageFwdHeader)
MessageEntityHashtag, TypeMessageEntity, MessageFwdHeader, PeerUser)
from mautrix_appservice import MatrixRequestError
from mautrix_appservice.intent_api import IntentAPI
@@ -77,7 +77,7 @@ async def _add_forward_header(source, text: str, html: Optional[str],
fwd_from_html = f"<a href='https://matrix.to/#/{puppet.mxid}'>{fwd_from_text}</a>"
if not fwd_from_text:
user = await source.client.get_entity(fwd_from.from_id)
user = await source.client.get_entity(PeerUser(fwd_from.from_id))
if user:
fwd_from_text = pu.Puppet.get_displayname(user, format=False)
fwd_from_html = f"<b>{fwd_from_text}</b>"
+3 -2
View File
@@ -332,7 +332,7 @@ class Portal:
async def add_telegram_user(self, user_id, source=None):
puppet = p.Puppet.get(user_id)
if source:
entity = await source.client.get_entity(user_id)
entity = await source.client.get_entity(PeerUser(user_id))
await puppet.update_info(source, entity)
await puppet.intent.join_room(self.mxid)
@@ -611,7 +611,8 @@ class Portal:
# TODO remove this crap
for entity in entities:
if isinstance(entity, InputMessageEntityMentionName):
entity.user_id = await client.get_input_entity(entity.user_id.user_id)
entity.user_id = await client.get_input_entity(
PeerUser(entity.user_id.user_id))
else:
message, entities = formatter.matrix_text_to_telegram(event["body"])
except KeyError:
+1 -1
View File
@@ -34,7 +34,7 @@ setuptools.setup(
"future-fstrings>=0.4.2",
"python-magic>=0.4.15,<0.5",
"telethon-aio==0.18.1" if sys.version_info >= (3, 6) else "telethon-aio-git",
"telethon-session-sqlalchemy>=0.1,<0.2",
"telethon-session-sqlalchemy>=0.1.2,<0.2",
],
dependency_links=[
"https://github.com/tulir/telethon-asyncio/tarball/b7cd8f38fb640f21d2affc4f96b41e46524c9a51#egg=telethon-aio-git-0.18.1+2"