Merge branch 'master' into asyncio
This commit is contained in:
@@ -16,13 +16,14 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
import logging
|
||||
import asyncio
|
||||
import platform
|
||||
|
||||
from telethon.tl.types import *
|
||||
from telethon.tl.types import User as TLUser
|
||||
|
||||
from .db import User as DBUser, Message as DBMessage
|
||||
from .tgclient import MautrixTelegramClient
|
||||
from . import portal as po, puppet as pu
|
||||
from . import portal as po, puppet as pu, __version__
|
||||
|
||||
config = None
|
||||
|
||||
@@ -84,10 +85,15 @@ class User:
|
||||
# region Telegram connection management
|
||||
|
||||
async def start(self):
|
||||
device = f"{platform.system()} {platform.release()}"
|
||||
sysversion = MautrixTelegramClient.__version__
|
||||
self.client = MautrixTelegramClient(self.mxid,
|
||||
config["telegram.api_id"],
|
||||
config["telegram.api_hash"],
|
||||
loop=self.loop)
|
||||
loop=self.loop,
|
||||
app_version=__version__,
|
||||
system_version=sysversion,
|
||||
device_model=device)
|
||||
self.client.add_update_handler(self.update_catch)
|
||||
self.connected = await self.client.connect()
|
||||
if self.logged_in:
|
||||
|
||||
Reference in New Issue
Block a user