adam/meshcore-hub
1
0
Fork 0
mirror of https://github.com/ipnet-mesh/meshcore-hub.git synced 2026-08-05 00:12:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename receiver_public_key to received_by

Browse Source 
Shorter, cleaner field name for the receiving interface node's
public key in API responses.
This commit is contained in:
Claude
2025-12-05 16:57:24 +00:00
parent 796e303665
commit 84e83a3384
7 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/meshcore_hub/api/routes/advertisements.py
+6 -6
View File
@@ -20,7 +20,7 @@ async def list_advertisements(
_: RequireRead,
session: DbSession,
public_key: Optional[str] = Query(None, description="Filter by public key"),
receiver_public_key: Optional[str] = Query(
received_by: Optional[str] = Query(
None, description="Filter by receiver node public key"
),
since: Optional[datetime] = Query(None, description="Start timestamp"),
@@ -40,8 +40,8 @@ async def list_advertisements(
if public_key:
query = query.where(Advertisement.public_key == public_key)
if receiver_public_key:
query = query.where(ReceiverNode.public_key == receiver_public_key)
if received_by:
query = query.where(ReceiverNode.public_key == received_by)
if since:
query = query.where(Advertisement.received_at >= since)
@@ -59,13 +59,13 @@ async def list_advertisements(
# Execute
results = session.execute(query).all()
# Build response with receiver_public_key
# Build response with received_by
items = []
for adv, receiver_pk in results:
data = {
"id": adv.id,
"receiver_node_id": adv.receiver_node_id,
"receiver_public_key": receiver_pk,
"received_by": receiver_pk,
"node_id": adv.node_id,
"public_key": adv.public_key,
"name": adv.name,
@@ -106,7 +106,7 @@ async def get_advertisement(
data = {
"id": adv.id,
"receiver_node_id": adv.receiver_node_id,
"receiver_public_key": receiver_pk,
"received_by": receiver_pk,
"node_id": adv.node_id,
"public_key": adv.public_key,
"name": adv.name,
src/meshcore_hub/api/routes/messages.py
+6 -6
View File
@@ -22,7 +22,7 @@ async def list_messages(
message_type: Optional[str] = Query(None, description="Filter by message type"),
pubkey_prefix: Optional[str] = Query(None, description="Filter by sender prefix"),
channel_idx: Optional[int] = Query(None, description="Filter by channel"),
receiver_public_key: Optional[str] = Query(
received_by: Optional[str] = Query(
None, description="Filter by receiver node public key"
),
since: Optional[datetime] = Query(None, description="Start timestamp"),
@@ -49,8 +49,8 @@ async def list_messages(
if channel_idx is not None:
query = query.where(Message.channel_idx == channel_idx)
if receiver_public_key:
query = query.where(ReceiverNode.public_key == receiver_public_key)
if received_by:
query = query.where(ReceiverNode.public_key == received_by)
if since:
query = query.where(Message.received_at >= since)
@@ -96,13 +96,13 @@ async def list_messages(
for public_key, value in session.execute(friendly_name_query).all():
friendly_names[public_key[:12]] = value
# Build response with sender info and receiver_public_key
# Build response with sender info and received_by
items = []
for m, receiver_pk in results:
msg_dict = {
"id": m.id,
"receiver_node_id": m.receiver_node_id,
"receiver_public_key": receiver_pk,
"received_by": receiver_pk,
"message_type": m.message_type,
"pubkey_prefix": m.pubkey_prefix,
"sender_name": (
@@ -153,7 +153,7 @@ async def get_message(
data = {
"id": message.id,
"receiver_node_id": message.receiver_node_id,
"receiver_public_key": receiver_pk,
"received_by": receiver_pk,
"message_type": message.message_type,
"pubkey_prefix": message.pubkey_prefix,
"channel_idx": message.channel_idx,
src/meshcore_hub/api/routes/telemetry.py
+6 -6
View File
@@ -20,7 +20,7 @@ async def list_telemetry(
_: RequireRead,
session: DbSession,
node_public_key: Optional[str] = Query(None, description="Filter by node"),
receiver_public_key: Optional[str] = Query(
received_by: Optional[str] = Query(
None, description="Filter by receiver node public key"
),
since: Optional[datetime] = Query(None, description="Start timestamp"),
@@ -40,8 +40,8 @@ async def list_telemetry(
if node_public_key:
query = query.where(Telemetry.node_public_key == node_public_key)
if receiver_public_key:
query = query.where(ReceiverNode.public_key == receiver_public_key)
if received_by:
query = query.where(ReceiverNode.public_key == received_by)
if since:
query = query.where(Telemetry.received_at >= since)
@@ -59,13 +59,13 @@ async def list_telemetry(
# Execute
results = session.execute(query).all()
# Build response with receiver_public_key
# Build response with received_by
items = []
for tel, receiver_pk in results:
data = {
"id": tel.id,
"receiver_node_id": tel.receiver_node_id,
"receiver_public_key": receiver_pk,
"received_by": receiver_pk,
"node_id": tel.node_id,
"node_public_key": tel.node_public_key,
"parsed_data": tel.parsed_data,
@@ -104,7 +104,7 @@ async def get_telemetry(
data = {
"id": tel.id,
"receiver_node_id": tel.receiver_node_id,
"receiver_public_key": receiver_pk,
"received_by": receiver_pk,
"node_id": tel.node_id,
"node_public_key": tel.node_public_key,
"parsed_data": tel.parsed_data,
src/meshcore_hub/api/routes/trace_paths.py
+6 -6
View File
@@ -19,7 +19,7 @@ router = APIRouter()
async def list_trace_paths(
_: RequireRead,
session: DbSession,
receiver_public_key: Optional[str] = Query(
received_by: Optional[str] = Query(
None, description="Filter by receiver node public key"
),
since: Optional[datetime] = Query(None, description="Start timestamp"),
@@ -36,8 +36,8 @@ async def list_trace_paths(
ReceiverNode, TracePath.receiver_node_id == ReceiverNode.id
)
if receiver_public_key:
query = query.where(ReceiverNode.public_key == receiver_public_key)
if received_by:
query = query.where(ReceiverNode.public_key == received_by)
if since:
query = query.where(TracePath.received_at >= since)
@@ -55,13 +55,13 @@ async def list_trace_paths(
# Execute
results = session.execute(query).all()
# Build response with receiver_public_key
# Build response with received_by
items = []
for tp, receiver_pk in results:
data = {
"id": tp.id,
"receiver_node_id": tp.receiver_node_id,
"receiver_public_key": receiver_pk,
"received_by": receiver_pk,
"initiator_tag": tp.initiator_tag,
"path_len": tp.path_len,
"flags": tp.flags,
@@ -104,7 +104,7 @@ async def get_trace_path(
data = {
"id": tp.id,
"receiver_node_id": tp.receiver_node_id,
"receiver_public_key": receiver_pk,
"received_by": receiver_pk,
"initiator_tag": tp.initiator_tag,
"path_len": tp.path_len,
"flags": tp.flags,
src/meshcore_hub/common/schemas/messages.py
+4 -4
View File
@@ -9,7 +9,7 @@ from pydantic import BaseModel, Field
class MessageRead(BaseModel):
"""Schema for reading a message."""
receiver_public_key: Optional[str] = Field(
received_by: Optional[str] = Field(
default=None, description="Receiving interface node public key"
)
message_type: str = Field(..., description="Message type (contact, channel)")
@@ -81,7 +81,7 @@ class MessageFilters(BaseModel):
class AdvertisementRead(BaseModel):
"""Schema for reading an advertisement."""
receiver_public_key: Optional[str] = Field(
received_by: Optional[str] = Field(
default=None, description="Receiving interface node public key"
)
public_key: str = Field(..., description="Advertised public key")
@@ -107,7 +107,7 @@ class AdvertisementList(BaseModel):
class TracePathRead(BaseModel):
"""Schema for reading a trace path."""
receiver_public_key: Optional[str] = Field(
received_by: Optional[str] = Field(
default=None, description="Receiving interface node public key"
)
initiator_tag: int = Field(..., description="Trace identifier")
@@ -140,7 +140,7 @@ class TracePathList(BaseModel):
class TelemetryRead(BaseModel):
"""Schema for reading a telemetry record."""
receiver_public_key: Optional[str] = Field(
received_by: Optional[str] = Field(
default=None, description="Receiving interface node public key"
)
node_public_key: str = Field(..., description="Reporting node public key")
src/meshcore_hub/web/templates/messages.html
+2 -2
View File
@@ -90,8 +90,8 @@
{{ msg.text or '-' }}
</td>
<td class="text-xs">
{% if msg.receiver_public_key %}
<span class="font-mono" title="{{ msg.receiver_public_key }}">{{ msg.receiver_public_key[:8] }}...</span>
{% if msg.received_by %}
<span class="font-mono" title="{{ msg.received_by }}">{{ msg.received_by[:8] }}...</span>
{% else %}
<span class="opacity-50">-</span>
{% endif %}
src/meshcore_hub/web/templates/node_detail.html
+4 -4
View File
@@ -113,8 +113,8 @@
<td>{{ adv.adv_type or '-' }}</td>
<td>{{ adv.name or '-' }}</td>
<td class="text-xs">
{% if adv.receiver_public_key %}
<span class="font-mono" title="{{ adv.receiver_public_key }}">{{ adv.receiver_public_key[:8] }}...</span>
{% if adv.received_by %}
<span class="font-mono" title="{{ adv.received_by }}">{{ adv.received_by[:8] }}...</span>
{% else %}
<span class="opacity-50">-</span>
{% endif %}
@@ -156,8 +156,8 @@
{% endif %}
</td>
<td class="text-xs">
{% if tel.receiver_public_key %}
<span class="font-mono" title="{{ tel.receiver_public_key }}">{{ tel.receiver_public_key[:8] }}...</span>
{% if tel.received_by %}
<span class="font-mono" title="{{ tel.received_by }}">{{ tel.received_by[:8] }}...</span>
{% else %}
<span class="opacity-50">-</span>
{% endif %}