CEF/3M
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small alert fix

Browse source
This commit is contained in:
CEF Server 2025-03-02 23:57:28 +00:00
parent 01dafa0d88
commit 861c672910
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cef_3M/util.py
View file

@ -12,10 +12,12 @@ from minio import Minio
from redis.asyncio import Redis
from pywebpush import WebPusher
from .sql import SessionMaker, AlertEndpoints, ergoQueryFetchOne
from .sql import SessionMaker, AlertEndpoints
from fastapi import UploadFile
from .sql_generated import History
safeName = re.compile(r"[^\w\d\.-]")
@ -53,11 +55,12 @@ class ErgoClient:
"p256dh": target.p256dh
}
})
messageQuery = ergoQueryFetchOne("SELECT `data` FROM `history` WHERE `msgid` = :id", id=int(msgid)).data
message = json.loads(messageQuery.decode("utf8"))
messageQuery: History = session.query(History).filter(History.msgid == int(msgid)).first()
message = json.loads(messageQuery.data.decode("utf8"))
encoded = json.dumps({
"channel": channel,
"from": message["AccountName"],
"from": message["Account"],
"content": message["Message"]["Message"]
}).encode("utf8")
@ -79,8 +82,9 @@ class ErgoClient:
message = await pubsub.get_message(ignore_subscribe_messages=True, timeout=None)
try:
await self.handleUserMessage(message)
except Exception as e:
print("Error in handling user message", e)
except:
print("Error in handling user message")
traceback.print_exc()