From 5c156e92f12140ebbded7c19eff95dbc7b97ad99 Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Sat, 14 Jan 2023 21:17:31 +0400 Subject: [PATCH] Move Matrix loop --- mirrortea/__main__.py | 2 +- mirrortea/messengers/__init__.py | 1 + mirrortea/{ => messengers}/matrix.py | 11 +++++------ 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 mirrortea/messengers/__init__.py rename mirrortea/{ => messengers}/matrix.py (80%) diff --git a/mirrortea/__main__.py b/mirrortea/__main__.py index 2dc2aba..44bd80d 100644 --- a/mirrortea/__main__.py +++ b/mirrortea/__main__.py @@ -1,6 +1,6 @@ import asyncio -from matrix import MatrixLoop +from messengers import Matrix as MatrixLoop from abstract_source_platform.telegram import Telegram from config_dataclass import Config diff --git a/mirrortea/messengers/__init__.py b/mirrortea/messengers/__init__.py new file mode 100644 index 0000000..4200d22 --- /dev/null +++ b/mirrortea/messengers/__init__.py @@ -0,0 +1 @@ +from .matrix import Matrix diff --git a/mirrortea/matrix.py b/mirrortea/messengers/matrix.py similarity index 80% rename from mirrortea/matrix.py rename to mirrortea/messengers/matrix.py index 061b4a3..5c8555c 100644 --- a/mirrortea/matrix.py +++ b/mirrortea/messengers/matrix.py @@ -1,15 +1,14 @@ -import nio as matrix +import nio import sys - -class MatrixLoop: +class Matrix: def __init__(self, app): self.app = app - self.client = matrix.AsyncClient( + self.client = nio.AsyncClient( app.config.matrix_homeserver_url, app.config.matrix_full_bot_id, ) - self.client.add_event_callback(self.on_message, matrix.RoomMessage) + self.client.add_event_callback(self.on_message, nio.RoomMessage) async def prepare(self): await self.client.login(self.app.config.matrix_bot_password) @@ -24,7 +23,7 @@ class MatrixLoop: print(room, event, file=sys.stderr) def upgrade_room(self, room, telegram_nickname): - event_dict = matrix.event_builders.event_builder.EventBuilder( + event_dict = nio.event_builders.event_builder.EventBuilder( name=telegram_nickname ).as_dict() client.room_send(