saces/pygomx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

smal: e2eesetup cleanup

Browse source
This commit is contained in:
saces 2026-04-29 09:44:09 +02:00
parent ce6ed0977e
commit c772abf8b3
2 changed files with 5 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mxsmal/src/mxsmal/smalsetup/e2eebot.py
View file

@ -4,14 +4,7 @@ import logging
from mxsmal.bot import SMALBot from mxsmal.bot import SMALBot
from pygomx.apiv0 import ApiV0Api from pygomx.apiv0 import ApiV0Api
# setup logging, we want timestamps
logging.basicConfig(
level=logging.INFO,
format="%(asctime)s.%(msecs)03d %(levelname)s %(name)s - %(funcName)s: %(message)s",
datefmt="%Y-%m-%d %H:%M:%S",
)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.setLevel(level=logging.INFO)
# TODO this should be an App, not a Bot # TODO this should be an App, not a Bot
@ -21,10 +14,7 @@ class E2eeBot(SMALBot):
super().__init__("¿") super().__init__("¿")
async def on_startup(self): async def on_startup(self):
print("e2eeBot started.") ApiV0Api.self_sign(self.client_id)
res = ApiV0Api.self_sign(self.client_id)
print(res)
print("e2eeBot done?.")
async def on_sys(self, ntf): async def on_sys(self, ntf):
print("Got a system notification: ", ntf) print("Got a system notification: ", ntf)

13
mxsmal/src/mxsmal/smalsetup/e2eesetup.py
View file

@ -1,16 +1,12 @@
# Copyright (C) 2026 saces@c-base.org # Copyright (C) 2026 saces@c-base.org
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
from datetime import datetime
import getpass import getpass
import os from datetime import datetime
import json
from functools import partial, wraps from functools import partial, wraps
import click import click
from pygomx.errors import PygomxAPIError
from pygomx.apiv0 import ApiV0
from pygomx.cliv0 import CliV0 from pygomx.cliv0 import CliV0
from pygomx.errors import PygomxAPIError
from .e2eebot import E2eeBot from .e2eebot import E2eeBot
@ -55,11 +51,10 @@ def e2eesetup(mxpassfile):
click.echo("Other devices:") click.echo("Other devices:")
other_devices_list = [] other_devices_list = []
for device in devices["devices"]: for device in devices["devices"]:
# print(device)
if device["device_id"] != whoami["device_id"]: if device["device_id"] != whoami["device_id"]:
other_devices_list.append(device["device_id"]) other_devices_list.append(device["device_id"])
# devices never logged in don't have a 'last_seen_ts' # devices never logged in don't have a 'last_seen_ts'
last_seen = "" last_seen = "never"
if device["last_seen_ts"]: if device["last_seen_ts"]:
last_seen = datetime.fromtimestamp(device["last_seen_ts"] / 1000) last_seen = datetime.fromtimestamp(device["last_seen_ts"] / 1000)
click.echo( click.echo(
@ -95,4 +90,4 @@ def e2eesetup(mxpassfile):
e2eeBot.run(sync=False) e2eeBot.run(sync=False)
print("Huhu Bämm!") click.echo("e2ee setup done. you may start your bot now.")