Nachrichten klappen jetzt einigermassen

This commit is contained in:
concierge committed 2026-10-25 09:59:37 +01:00
1 parent 518248ca00
commit ffdb399f9e
5 files changed
+551 -69

No files matched your search

+16
View File
@@ -4,12 +4,28 @@ API Endpunkte für Initialdaten
from flask import Blueprint, jsonify, g, request
from cmbnet.auth import login_required
from cmbnet.db import get_db
from cmbnet.models.accounts import AccountModel
from cmbnet.services.streets_service import StreetsService
from cmbnet.services.groups_service import GroupsService
api_init_bp = Blueprint('api_init', __name__)
@api_init_bp.route('/init/accounts')
@login_required
def init_accounts(**kwargs):
"""Liefert alle Accounts für den Tenant (für Senderdarstellung)"""
accounts = AccountModel.get_all_by_tenant(g.tenant_id)
result = []
for account in accounts:
result.append({
'id': account['id'],
'name': account['name'],
'role': account['role']
})
return jsonify(result)
@api_init_bp.route('/init/streets')
@login_required
def init_streets(**kwargs):
+81 -7
View File
@@ -557,30 +557,103 @@ class WebSocketBroker:
except Exception as exc:
print(f'Transaction log error: {exc}')
def _get_sender_info(self, tenant_id, sender):
"""Liefert Sender-Informationen inkl. Accountname und ggf. Gruppen-Alias."""
db = get_db()
info = {
'account_id': sender['id'] if sender else None,
'account_name': sender['name'] if sender else None,
'role': sender['role'] if sender else None,
'group_id': None,
'group_alias': None
}
if sender and sender['role'] == 'Gruppe':
group = db.execute(
'SELECT id, aliasname FROM groups WHERE account_id = ? AND tenant_id = ?',
(sender['id'], tenant_id)
).fetchone()
if group:
info['group_id'] = group['id']
info['group_alias'] = group['aliasname']
else:
# Auch für andere Rollen kann ein verknüpfter Gruppen-Account Kontext
# liefern; für Dispatcher reicht der Accountname.
pass
return info
def _normalize_chat_message(self, tenant_id, message, sender, payload):
"""Normalisiert Chat-Nachrichten (Code >= 1000) auf einheitliches JSON."""
sender_info = self._get_sender_info(tenant_id, sender)
text = ''
if isinstance(payload, dict):
if payload.get('text') is not None:
text = str(payload.get('text') or '')
elif payload.get('msg') is not None:
inner = payload.get('msg')
if isinstance(inner, dict) and inner.get('text') is not None:
text = str(inner.get('text') or '')
elif isinstance(inner, str):
text = inner
else:
text = str(inner or '')
else:
# Fallback: falls nur andere Felder, versuche text
text = str(payload.get('message') or '')
elif isinstance(message.msg, str):
text = message.msg
else:
text = str(message.msg or '')
text = str(text).strip()
normalized = {
'text': text,
'sender': {
'account_id': sender_info['account_id'],
'name': sender_info['account_name'],
'role': sender_info['role'],
'group_id': sender_info['group_id'],
'group_alias': sender_info['group_alias']
}
}
if message.code == 1100:
group_id = self._resolve_group_id(tenant_id, message, sender, payload)
if group_id is not None:
try:
message.receiver_id = int(group_id)
except (TypeError, ValueError):
message.receiver_id = group_id
normalized['group_id'] = message.receiver_id
elif message.code == 1000:
normalized['broadcast'] = True
else:
if message.receiver_id is not None:
normalized['receiver_id'] = message.receiver_id
message.msg = json.dumps(normalized, ensure_ascii=False)
return message
def _prepare_message(self, tenant_id, message, sender):
"""Ergänzt Nachrichten um serverseitig abgeleitete Informationen."""
db = get_db()
payload = self._payload(message)
code = message.code
if code >= 1000:
return self._normalize_chat_message(tenant_id, message, sender, payload)
if message.code == 1100:
# Empfänger ist eine spezielle Gruppe. Die Gruppen-ID wird aus dem
# Payload oder dem receiver_id-Feld gelesen.
group_id = self._resolve_group_id(tenant_id, message, sender, payload)
group = self._fetch_group(tenant_id, group_id)
message.receiver_id = group_id
# Spezifikation: Dem Freitext wird der Aliasname der Gruppe
# vorangestellt. Ein bereits vorhandenes Präfix wird nicht doppelt
# gesetzt.
if group:
alias = group['aliasname'] or str(group['id'])
prefix = f'{alias}: '
text = message.msg if isinstance(message.msg, str) else json.dumps(message.msg)
if not text.startswith(prefix):
message.msg = prefix + text
return self._normalize_chat_message(tenant_id, message, sender, payload)
elif message.code == 2000:
# Spezifikation: Inhalt ist JSON mit Gruppen-ID und Freitext.
group_id = self._resolve_group_id(tenant_id, message, sender, payload)
message.receiver_id = group_id
if isinstance(payload, dict):
@@ -592,6 +665,7 @@ class WebSocketBroker:
{'group_id': group_id, 'text': message.msg},
ensure_ascii=False
)
return self._normalize_chat_message(tenant_id, message, sender, payload)
return message