diff --git a/.env.example b/.env.example index c3a41f8..c0d4cae 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -MATRIX_HOMESERVER_URL=https://matrix.org -MATRIX_FULL_BOT_ID=@fckidiots:matrix.org MATRIX_BOT_PASSWORD=... +MATRIX_FULL_BOT_ID=@fckidiots:matrix.org +MATRIX_HOMESERVER_URL=https://matrix.org TELEGRAM_BOT_TOKEN=5890667880:... diff --git a/config.example.yml b/config.example.yml index 6206344..c5b6f33 100644 --- a/config.example.yml +++ b/config.example.yml @@ -1,7 +1,8 @@ -matrix_owner_id: "@dettlaff:inex.rocks" db_path: "data/database.sqlite3" -matrix_homeserver_url: "{{ MATRIX_HOMESERVER_URL }}" -matrix_full_bot_id: "{{ MATRIX_FULL_BOT_ID }}" matrix_bot_password: "{{ MATRIX_BOT_PASSWORD }}" +matrix_full_bot_id: "{{ MATRIX_FULL_BOT_ID }}" +matrix_homeserver_url: "{{ MATRIX_HOMESERVER_URL }}" +matrix_owner_id: "@dettlaff:inex.rocks" + telegram_bot_token: "{{ TELEGRAM_BOT_TOKEN }}" diff --git a/mirrortea/config.py b/mirrortea/config.py index a636c4e..855d0af 100644 --- a/mirrortea/config.py +++ b/mirrortea/config.py @@ -16,14 +16,13 @@ def render_env_template(raw_config: str) -> dict: class Config: db_path: Path - matrix_homeserver_url: str - matrix_full_bot_id: str matrix_bot_password: str + matrix_full_bot_id: str + matrix_homeserver_url: str + matrix_owner_id: str telegram_bot_token: str - matrix_owner_id: str - @classmethod def from_dict(config_class, dict): return config_class(**dict)