Compare commits
No commits in common. "dfa4c10138c7475eef7f8dbae052ec33c5cf142d" and "3c40b08b02c5b63661263af8f39938b36413573e" have entirely different histories.
dfa4c10138
...
3c40b08b02
|
@ -5,43 +5,28 @@ import sys
|
||||||
import aiogram as telegram
|
import aiogram as telegram
|
||||||
import nio as matrix
|
import nio as matrix
|
||||||
|
|
||||||
def main():
|
MATRIX_HOMESERVER_URL = os.environ['MATRIX_HOMESERVER_URL']
|
||||||
config = Config(
|
MATRIX_FULL_USER_ID = os.environ['MATRIX_FULL_USER_ID']
|
||||||
matrix_homeserver_url=os.environ['MATRIX_HOMESERVER_URL'],
|
MATRIX_PASSWORD = os.environ['MATRIX_PASSWORD']
|
||||||
matrix_full_user_id=os.environ['MATRIX_FULL_USER_ID'],
|
TELEGRAM_BOT_TOKEN = os.environ['TELEGRAM_BOT_TOKEN']
|
||||||
matrix_password=os.environ['MATRIX_PASSWORD'],
|
|
||||||
telegram_bot_token=os.environ['TELEGRAM_BOT_TOKEN'],
|
|
||||||
)
|
|
||||||
|
|
||||||
asyncio.run(Application(config).run())
|
async def main():
|
||||||
|
try:
|
||||||
|
matrix_loop = None
|
||||||
|
|
||||||
class Config:
|
matrix_loop = MatrixLoop(MATRIX_HOMESERVER_URL, MATRIX_FULL_USER_ID,
|
||||||
def __init__(self, **kwargs):
|
MATRIX_PASSWORD)
|
||||||
self.matrix_homeserver_url = kwargs['matrix_homeserver_url']
|
await matrix_loop.prepare()
|
||||||
self.matrix_full_user_id = kwargs['matrix_full_user_id']
|
|
||||||
self.matrix_password = kwargs['matrix_password']
|
|
||||||
self.telegram_bot_token = kwargs['telegram_bot_token']
|
|
||||||
|
|
||||||
class Application:
|
telegram_loop = TelegramLoop(TELEGRAM_BOT_TOKEN)
|
||||||
def __init__(self, config):
|
|
||||||
self.config = config
|
await asyncio.gather(
|
||||||
self.matrix_loop = MatrixLoop(
|
matrix_loop.run(),
|
||||||
config.matrix_homeserver_url,
|
telegram_loop.run(),
|
||||||
config.matrix_full_user_id,
|
|
||||||
config.matrix_password,
|
|
||||||
)
|
)
|
||||||
self.telegram_loop = TelegramLoop(config.telegram_bot_token)
|
finally:
|
||||||
|
if matrix_loop:
|
||||||
async def run(self):
|
await matrix_loop.finish()
|
||||||
try:
|
|
||||||
await self.matrix_loop.prepare()
|
|
||||||
await asyncio.gather(
|
|
||||||
self.matrix_loop.run(),
|
|
||||||
self.telegram_loop.run(),
|
|
||||||
)
|
|
||||||
finally:
|
|
||||||
if self.matrix_loop:
|
|
||||||
await self.matrix_loop.finish()
|
|
||||||
|
|
||||||
class MatrixLoop:
|
class MatrixLoop:
|
||||||
def __init__(self, homeserver_url, full_user_id, password):
|
def __init__(self, homeserver_url, full_user_id, password):
|
||||||
|
@ -74,4 +59,4 @@ class TelegramLoop:
|
||||||
print(msg, file=sys.stderr)
|
print(msg, file=sys.stderr)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
asyncio.run(main())
|
||||||
|
|
Reference in a new issue