Compare commits
10 commits
Author | SHA1 | Date | |
---|---|---|---|
localhost_frssoft | 9750ab5454 | ||
localhost_frssoft | 1196424bbd | ||
localhost_frssoft | 4fde0e8efd | ||
def | 94cf102c0b | ||
def | 575917fb5b | ||
def | 82907916b7 | ||
def | 67856a849d | ||
def | 6ae22a36ef | ||
def | 9d7df8202b | ||
def | 063e25e578 |
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -3,3 +3,4 @@ __pycache__/
|
||||||
/.env
|
/.env
|
||||||
/data/
|
/data/
|
||||||
!/data/.keep
|
!/data/.keep
|
||||||
|
test_database.db
|
7
.vscode/settings.json
vendored
Normal file
7
.vscode/settings.json
vendored
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"python.testing.pytestArgs": [
|
||||||
|
"tests"
|
||||||
|
],
|
||||||
|
"python.testing.unittestEnabled": false,
|
||||||
|
"python.testing.pytestEnabled": true
|
||||||
|
}
|
0
mirrortea/__init__.py
Normal file
0
mirrortea/__init__.py
Normal file
|
@ -1,4 +1,4 @@
|
||||||
import asyncio
|
import sys
|
||||||
|
|
||||||
from messengers import Matrix as MatrixLoop, Telegram as TelegramLoop
|
from messengers import Matrix as MatrixLoop, Telegram as TelegramLoop
|
||||||
|
|
||||||
|
@ -10,7 +10,54 @@ CONFIG_FILE_NAME = "config.yaml"
|
||||||
def main():
|
def main():
|
||||||
config = Config.from_yaml_config(CONFIG_FILE_NAME)
|
config = Config.from_yaml_config(CONFIG_FILE_NAME)
|
||||||
|
|
||||||
asyncio.run(Application(config).run())
|
telegram.run(Application(config).run())
|
||||||
|
|
||||||
|
|
||||||
|
class TelegramLopp:
|
||||||
|
def __init__(self, app):
|
||||||
|
self.app = app
|
||||||
|
self.bot = telegram.Bot(token=app.config.telegram_bot_token)
|
||||||
|
self.dispatcher = telegram.Dispatcher(bot=self.bot)
|
||||||
|
self.dispatcher.register_message_handler(self.on_message)
|
||||||
|
|
||||||
|
async def run(self) -> None:
|
||||||
|
await self.dispatcher.start_polling()
|
||||||
|
|
||||||
|
async def on_message(self, msg):
|
||||||
|
print(msg, file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
|
class MatrixLoop:
|
||||||
|
def __init__(self, app):
|
||||||
|
self.app = app
|
||||||
|
self.client = matrix.AsyncClient(
|
||||||
|
app.config.matrix_homeserver_url,
|
||||||
|
app.config.matrix_full_bot_id,
|
||||||
|
)
|
||||||
|
self.client.add_event_callback(self.on_message, matrix.RoomMessage)
|
||||||
|
|
||||||
|
async def prepare(self):
|
||||||
|
await self.client.login(self.app.config.matrix_bot_password)
|
||||||
|
|
||||||
|
async def finish(self):
|
||||||
|
await self.client.close()
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
await self.client.sync_forever(timeout=30000)
|
||||||
|
|
||||||
|
async def on_message(self, room, event):
|
||||||
|
print(room, event, file=sys.stderr)
|
||||||
|
|
||||||
|
def upgrade_room(self, room, telegram_nickname):
|
||||||
|
event_dict = matrix.event_builders.event_builder.EventBuilder(
|
||||||
|
name=telegram_nickname
|
||||||
|
).as_dict()
|
||||||
|
client.room_send(
|
||||||
|
room_id=room,
|
||||||
|
message_type=event_dict["type"],
|
||||||
|
content=event_dict["content"],
|
||||||
|
) # предположу что оно так работает
|
||||||
|
# https://matrix-nio.readthedocs.io/en/latest/nio.html#module-nio.event_builders.state_events
|
||||||
|
|
||||||
|
|
||||||
class Application:
|
class Application:
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
from abc import ABC, abstractmethod
|
||||||
|
|
||||||
|
from models.user import User
|
||||||
|
|
||||||
|
|
||||||
|
class AbstractSourcePlatform(ABC):
|
||||||
|
@abstractmethod
|
||||||
|
def get_user_information(self) -> User:
|
||||||
|
"""Init tables in database"""
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def run(self) -> None:
|
||||||
|
"""Platform launch"""
|
11
mirrortea/models/matrix_room.py
Normal file
11
mirrortea/models/matrix_room.py
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
from typing import Optional
|
||||||
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
from mirrortea.models.user import User
|
||||||
|
|
||||||
|
|
||||||
|
class MatrixRoom(BaseModel):
|
||||||
|
""""""
|
||||||
|
|
||||||
|
matrix_room_id: str
|
||||||
|
connect_to_user: User
|
|
@ -8,8 +8,8 @@ class User(BaseModel):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
first_name: str
|
first_name: str
|
||||||
last_named: Optional[str]
|
last_name: Optional[str]
|
||||||
|
|
||||||
id: str
|
user_id: str
|
||||||
username: Optional[str]
|
username: Optional[str]
|
||||||
avatar_hash: Optional[str]
|
avatar_hash: Optional[str]
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from repository.sqlite_repository import (
|
from .sqlite_repository import (
|
||||||
SQLiteDatabaseRepository,
|
SQLiteDatabaseRepository,
|
||||||
)
|
)
|
||||||
|
|
||||||
repository = SQLiteDatabaseRepository()
|
repository = SQLiteDatabaseRepository
|
||||||
|
|
|
@ -1,7 +1,42 @@
|
||||||
from abc import ABC, abstractmethod
|
from abc import ABC, abstractmethod
|
||||||
|
|
||||||
|
from ..models.matrix_room import MatrixRoom
|
||||||
|
from ..models.user import User
|
||||||
|
|
||||||
|
|
||||||
class AbstractDatabaseRepository(ABC):
|
class AbstractDatabaseRepository(ABC):
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def create_tables(self) -> None:
|
def create_tables(self) -> None:
|
||||||
"""Init tables in database"""
|
"""Init tables in database"""
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def create_user(self, user: User) -> User:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def get_user_by_id(self, user_id: str) -> User:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def update_user(self, user: User) -> User:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def delete_user(self, user_id: str) -> None:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def create_matrix_room(self) -> MatrixRoom:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def get_matrix_room(self) -> MatrixRoom:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def update_matrix_room(self) -> MatrixRoom:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def delete_matrix_room(self) -> None:
|
||||||
|
""""""
|
||||||
|
|
14
mirrortea/repository/exceptions.py
Normal file
14
mirrortea/repository/exceptions.py
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
class UserNotFoundError(Exception):
|
||||||
|
"""User not found!"""
|
||||||
|
|
||||||
|
|
||||||
|
class UserAlreadyExistError(Exception):
|
||||||
|
"""Token already exits!"""
|
||||||
|
|
||||||
|
|
||||||
|
class MatrixRoomNotFoundError(Exception):
|
||||||
|
"""Matrix room not found!"""
|
||||||
|
|
||||||
|
|
||||||
|
class MatrixRoomAlreadyExistError(Exception):
|
||||||
|
"""matrix room already exits!"""
|
|
@ -1,27 +1,27 @@
|
||||||
TELEGRAM_USER_MATRIX_CHATS_SQL = """
|
# PLATFORM_USER_MATRIX_CHATS_SQL = """
|
||||||
CREATE TABLE IF NOT EXISTS telegram_user_matrix_chats (
|
# CREATE TABLE IF NOT EXISTS platforms_user_matrix_chats (
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
# id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
telegram_user_id INTEGER NOT NULL,
|
# plstform_user_id INTEGER NOT NULL,
|
||||||
matrix_chat_id INTEGER NOT NULL,
|
# matrix_chat_id INTEGER NOT NULL,
|
||||||
FOREIGN KEY(telegram_user_id) REFERENCES telegram_users(id),
|
# FOREIGN KEY(platform_user_id) REFERENCES platforms_users(id),
|
||||||
FOREIGN KEY(matrix_chat_id) REFERENCES matrix_chats(id)
|
# FOREIGN KEY(matrix_chat_id) REFERENCES matrix_chats(id)
|
||||||
);
|
# );
|
||||||
"""
|
# """
|
||||||
|
|
||||||
TELEGRAM_USERS_SQL = """
|
PLATFORMS_USERS_SQL = """
|
||||||
CREATE TABLE IF NOT EXISTS telegram_users
|
CREATE TABLE IF NOT EXISTS platforms_users
|
||||||
(
|
(
|
||||||
id INTEGER PRIMARY KEY NOT NULL (15),
|
user_id INTEGER(100) PRIMARY KEY NOT NULL,
|
||||||
first_name TEXT NOT NULL (50),
|
first_name TEXT(100) NOT NULL,
|
||||||
last_name TEXT (50),
|
last_name TEXT(100),
|
||||||
username TEXT (50),
|
username TEXT(100),
|
||||||
avatar_hash BLOB,
|
avatar_hash BLOB
|
||||||
);
|
);
|
||||||
"""
|
"""
|
||||||
|
|
||||||
MATRIX_ROOMS_SQL = """
|
MATRIX_ROOMS_SQL = """
|
||||||
CREATE TABLE IF NOT EXISTS telegram_users
|
CREATE TABLE IF NOT EXISTS matrix_rooms
|
||||||
(
|
(
|
||||||
id TEXT PRIMARY KEY NOT NULL
|
matrix_room_id TEXT(100) PRIMARY KEY NOT NULL
|
||||||
);
|
);
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -1,31 +1,109 @@
|
||||||
import sqlite3
|
import sqlite3
|
||||||
from pathlib import Path
|
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
from collections import namedtuple
|
||||||
|
|
||||||
from repository.abstract_db_repository import AbstractDatabaseRepository
|
from mirrortea.repository.abstract_db_repository import AbstractDatabaseRepository
|
||||||
|
|
||||||
from repository.sqlite_init_tables import (
|
from mirrortea.models.matrix_room import MatrixRoom
|
||||||
TELEGRAM_USER_MATRIX_CHATS_SQL,
|
from mirrortea.models.user import User
|
||||||
TELEGRAM_USERS_SQL,
|
|
||||||
|
from mirrortea.repository.exceptions import (
|
||||||
|
UserNotFoundError,
|
||||||
|
MatrixRoomAlreadyExistError,
|
||||||
|
MatrixRoomNotFoundError,
|
||||||
|
UserAlreadyExistError,
|
||||||
|
)
|
||||||
|
|
||||||
|
from mirrortea.repository.sqlite_init_tables import (
|
||||||
|
# PLATFORM_USER_MATRIX_CHATS_SQL,
|
||||||
|
PLATFORMS_USERS_SQL,
|
||||||
MATRIX_ROOMS_SQL,
|
MATRIX_ROOMS_SQL,
|
||||||
)
|
)
|
||||||
|
|
||||||
TABLES_LIST = [
|
TABLES_LIST = [
|
||||||
TELEGRAM_USER_MATRIX_CHATS_SQL,
|
# PLATFORM_USER_MATRIX_CHATS_SQL,
|
||||||
TELEGRAM_USERS_SQL,
|
PLATFORMS_USERS_SQL,
|
||||||
MATRIX_ROOMS_SQL,
|
MATRIX_ROOMS_SQL,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
PATH_TO_DB = "database.db"
|
||||||
|
|
||||||
|
|
||||||
class SQLiteDatabaseRepository(AbstractDatabaseRepository):
|
class SQLiteDatabaseRepository(AbstractDatabaseRepository):
|
||||||
def __init__(self, app, path: Path):
|
def __init__(self, path=PATH_TO_DB):
|
||||||
self.path = path
|
self.path = path
|
||||||
self.conn = sqlite3.connect(path)
|
self.conn = sqlite3.connect(self.path)
|
||||||
|
self.cursor = self.conn.cursor()
|
||||||
|
|
||||||
|
def _namedtuple_factory(row, cursor, raw_tuples):
|
||||||
|
fields = [column[0] for column in cursor.description]
|
||||||
|
cls = namedtuple("Row", fields)
|
||||||
|
return cls._make(raw_tuples)
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def create_tables(self) -> None:
|
def create_tables(self) -> None:
|
||||||
"""Init tables in database"""
|
"""Init tables in database"""
|
||||||
|
|
||||||
for table in TABLES_LIST:
|
for table in TABLES_LIST:
|
||||||
self.conn.execute(table)
|
self.conn.execute(table)
|
||||||
self.conn.commit()
|
self.conn.commit()
|
||||||
|
|
||||||
|
def get_user_by_id(self, user_id: str) -> User:
|
||||||
|
"""Get user by user id"""
|
||||||
|
|
||||||
|
self.conn.row_factory = self._namedtuple_factory
|
||||||
|
|
||||||
|
self.cur_userdata = self.conn.execute(
|
||||||
|
"SELECT user_id AS user_id, first_name AS first_name, last_name AS last_name, username AS username, avatar_hash AS avatar_hash FROM platforms_users WHERE user_id = (?)",
|
||||||
|
(user_id,)
|
||||||
|
)
|
||||||
|
|
||||||
|
self.userdata = self.cur_userdata.fetchone()
|
||||||
|
|
||||||
|
if self.userdata == ():
|
||||||
|
return UserNotFoundError("User not found!")
|
||||||
|
|
||||||
|
return User(
|
||||||
|
user_id=self.userdata.user_id,
|
||||||
|
first_name=self.userdata.first_name,
|
||||||
|
last_name=self.userdata.last_name,
|
||||||
|
username=self.userdata.username,
|
||||||
|
avatar_hash=self.userdata.avatar_hash,
|
||||||
|
)
|
||||||
|
|
||||||
|
def create_user(self, user: User) -> User:
|
||||||
|
"""Create user"""
|
||||||
|
try:
|
||||||
|
self.cursor.execute(
|
||||||
|
"INSERT INTO platforms_users VALUES (?, ?, ?, ?, ?)",
|
||||||
|
(
|
||||||
|
user.user_id,
|
||||||
|
user.first_name,
|
||||||
|
user.last_name,
|
||||||
|
user.username,
|
||||||
|
user.avatar_hash,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
except sqlite3.IntegrityError:
|
||||||
|
return UserAlreadyExistError("User already exist!")
|
||||||
|
|
||||||
|
self.conn.commit()
|
||||||
|
return self.get_user_by_id(user_id=user.user_id)
|
||||||
|
|
||||||
|
def update_user(self) -> None:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
def delete_user(self) -> None:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
def create_matrix_room(self) -> MatrixRoom:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
def get_matrix_room(self) -> MatrixRoom:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
def update_matrix_room(self) -> MatrixRoom:
|
||||||
|
""""""
|
||||||
|
|
||||||
|
def delete_matrix_room(self) -> None:
|
||||||
|
""""""
|
||||||
|
|
0
tests/__init__.py
Normal file
0
tests/__init__.py
Normal file
39
tests/test_repository.py
Normal file
39
tests/test_repository.py
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
import pytest
|
||||||
|
import os
|
||||||
|
|
||||||
|
from mirrortea.models.user import User
|
||||||
|
from mirrortea.repository import repository
|
||||||
|
|
||||||
|
|
||||||
|
PATH = "tests/test_database.db"
|
||||||
|
|
||||||
|
|
||||||
|
def create_repository_object():
|
||||||
|
return repository(PATH)
|
||||||
|
|
||||||
|
|
||||||
|
def test_create_tables():
|
||||||
|
os.system("rm -f " + PATH)
|
||||||
|
repo = create_repository_object()
|
||||||
|
assert repo.create_tables() is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_create_user():
|
||||||
|
repo = create_repository_object()
|
||||||
|
assert (
|
||||||
|
repo.create_user(
|
||||||
|
User(
|
||||||
|
user_id="123",
|
||||||
|
first_name="dettlaff",
|
||||||
|
# last_name=None,
|
||||||
|
# username=None,
|
||||||
|
# avatar_hash=None,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
is None
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_get_user_by_id():
|
||||||
|
repo = create_repository_object()
|
||||||
|
assert repo.get_user_by_id(user_id="123") is None
|
Reference in a new issue