From 91d39b44a2e6bf7930e0b60db96812533a2b7a27 Mon Sep 17 00:00:00 2001 From: Emmy D'Anello Date: Mon, 20 Feb 2023 22:25:13 +0100 Subject: [PATCH] Add possibility to load Matrix credentials from env configuration --- tfjm/matrix.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tfjm/matrix.py b/tfjm/matrix.py index 48f4d0c..2023d81 100644 --- a/tfjm/matrix.py +++ b/tfjm/matrix.py @@ -23,14 +23,18 @@ class Matrix: Retrieve the bot account. If not logged, log in and store access token. """ - if not os.getenv("SYNAPSE_PASSWORD"): + if not os.getenv("SYNAPSE_PASSWORD") and not os.getenv("SYNAPSE_TOKEN"): return FakeMatrixClient() from nio import AsyncClient client = AsyncClient("https://tfjm.org", "@tfjmbot:tfjm.org") client.user_id = "@tfjmbot:tfjm.org" - if os.path.isfile(".matrix_token"): + if os.getenv("SYNAPSE_TOKEN"): + client.access_token = os.getenv("SYNAPSE_TOKEN") + client.device_id = os.getenv("SYNAPSE_DEVICE") + return client + elif os.path.isfile(".matrix_token"): with open(".matrix_device", "r") as f: cls._device_id = f.read().rstrip(" \t\r\n") client.device_id = cls._device_id