Skip to content

The agent that grows with you

fix(gateway): no leading newline when an attachment-only message is noted

unsupportedpastelsb9d0cb18b2db
diff --git a/gateway/session_envelope.py b/gateway/session_envelope.py
index d0d25cf4782..c6694504dd0 100644
--- a/gateway/session_envelope.py
+++ b/gateway/session_envelope.py
@@ -77,13 +77,13 @@ def _drop_remote_media(event):
if not isinstance(event.text, str) or _media_clause(event) is not None or all(map(os.path.isabs, urls)):
return event
kept = [index for index, url in enumerate(urls) if os.path.isabs(url)]
- notes = ''.join(f"\n[The user sent an attachment ({types[index] if types else 'file'}) that could not be retrieved.]"
- for index in range(len(urls)) if index not in kept)
+ notes = [f"[The user sent an attachment ({types[index] if types else 'file'}) that could not be retrieved.]"
+ for index in range(len(urls)) if index not in kept]
def keep(values):
return [values[index] for index in kept] if values else values
- return replace(event, text=event.text + notes, media_urls=keep(urls), media_types=keep(types),
- media_text_inlined=keep(event.media_text_inlined))
+ return replace(event, text='\n'.join(filter(None, [event.text, *notes])), media_urls=keep(urls),
+ media_types=keep(types), media_text_inlined=keep(event.media_text_inlined))
def _refuse(event, reason, clause):
diff --git a/tests/gateway/test_native_admission_remote_media.py b/tests/gateway/test_native_admission_remote_media.py
index c0c33eab9ca..f09d5845cd5 100644
--- a/tests/gateway/test_native_admission_remote_media.py
+++ b/tests/gateway/test_native_admission_remote_media.py
@@ -33,3 +33,21 @@ async def test_remote_media_url_is_dropped_with_a_note_instead_of_refusing_the_m
assert envelope['event']['media_types'] == ['video/mp4']
finally:
authority.db.close()
+
+
+async def test_an_attachment_only_message_stores_just_the_note(tmp_path, monkeypatch):
+ from plugins.platforms.whatsapp.adapter import WhatsAppAdapter
+ monkeypatch.setenv('WHATSAPP_ALLOWED_USERS', '15551234567')
+ runner = GatewayRunner(GatewayConfig(sessions_dir=tmp_path / 'sessions'))
+ adapter = WhatsAppAdapter(PlatformConfig(enabled=True, extra={'session_path': str(tmp_path / 'wa')}))
+ runner.adapters = {Platform.WHATSAPP: adapter}
+ authority = await initialize_session_authority(runner, profile_id='default', instance_id='remote-media-only')
+ event = MessageEvent(text='', message_type=MessageType.PHOTO, message_id='m2',
+ source=adapter.build_source(chat_id=CHAT, user_id=CHAT, chat_type='dm'),
+ media_urls=['https://static.dingtalk.com/media/abc.png'], media_types=['image/png'])
+ try:
+ payload = await prepare_native(runner, event)
+ assert payload['text'] == '[The user sent an attachment (image/png) that could not be retrieved.]'
+ finally:
+ authority.db.close()