alexei.dolgolyov
3b76a09759
The "per-chat album scope" feature stored on CommandTrackerListener was
really per-bot: listener_id = bot.id, and every chat that bot served
shared the same scope. Commands like /albums, /random, /status,
/events leaked the full provider catalog into chats that were never
wired up to receive notifications from those trackers.
New model: the album scope for /commands in a given chat is derived
from the notification-routing graph. For a (provider, bot, chat_id)
triple we walk TargetReceiver (chat_id match, enabled) →
NotificationTarget (telegram or broadcast parent) →
NotificationTrackerTarget → NotificationTracker (provider match) and
union their collection_ids. That's the natural "what does this chat
get notifications about" set, and it becomes the command scope.
- New helper: command_utils.resolve_chat_album_scope(provider_id,
bot_id, chat_id) -> set[str]. Empty set is the default for chats
with no routing — commands return nothing rather than leaking the
provider's catalog.
- Dispatcher computes the scope per (tracker, bot, chat) and threads
it through handler.handle(..., allowed_album_ids=...). Explicit
CommandTrackerListener.allowed_album_ids override, when set, still
wins verbatim (kept as an escape hatch for users who want a divergent
scope for a whole bot).
- /status, /albums, /events, and all /_cmd_immich-routed commands
(/random, /search, /find, /latest, /memory, /summary, /favorites,
/place, /person) now intersect with the resolved scope.
- UI scope modal relabeled: it's an explicit *override for this bot*,
not a per-chat setting. Default is "derive from notification
routing", which matches what users already configured elsewhere.
Also:
- /search, /find, /person, /place — _enrich_assets return value was
discarded, dropping public_url enrichment. Assign the return value.
- search_smart / search_metadata — consolidated into _search_items
helper that logs non-200 responses and transport errors instead of
silently returning []. Makes "always no results" bugs actually
diagnosable. Also accepts the alternate {"assets": [...]} flat-list
shape from older Immich versions.
- Immich search error bodies go through _redact_body so credentials
echoed by authenticating proxies don't land in server logs.
89 lines
3.6 KiB
Python
89 lines
3.6 KiB
Python
"""Search-related Immich bot commands: search, find, person, place."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
|
|
from ..handler import _render_cmd_template
|
|
from .common import _format_assets
|
|
|
|
|
|
def _enrich_assets(assets: list[dict[str, Any]], asset_public_urls: dict[str, str]) -> list[dict[str, Any]]:
|
|
"""Add public_url to assets from the pre-built map. Returns new list without mutating inputs."""
|
|
if not asset_public_urls:
|
|
return assets
|
|
return [
|
|
{**asset, "public_url": asset_public_urls.get(asset.get("id", ""), "")}
|
|
if asset.get("id", "") in asset_public_urls and not asset.get("public_url")
|
|
else asset
|
|
for asset in assets
|
|
]
|
|
|
|
|
|
async def cmd_search(
|
|
client: Any, args: str, all_album_ids: list[str], count: int,
|
|
locale: str, response_mode: str,
|
|
cmd_templates: dict[str, dict[str, str]],
|
|
asset_public_urls: dict[str, str] | None = None,
|
|
page: int = 1,
|
|
) -> str | dict[str, Any]:
|
|
"""Handle /search command."""
|
|
if not args:
|
|
return _render_cmd_template(cmd_templates, "no_results", locale, {"command": "search", "query": ""})
|
|
assets = await client.search_smart(args, album_ids=all_album_ids, limit=count, page=page)
|
|
assets = _enrich_assets(assets, asset_public_urls or {})
|
|
return _format_assets(assets, "search", args, locale, response_mode, client, cmd_templates)
|
|
|
|
|
|
async def cmd_find(
|
|
client: Any, args: str, all_album_ids: list[str], count: int,
|
|
locale: str, response_mode: str,
|
|
cmd_templates: dict[str, dict[str, str]],
|
|
asset_public_urls: dict[str, str] | None = None,
|
|
page: int = 1,
|
|
) -> str | dict[str, Any]:
|
|
"""Handle /find command."""
|
|
if not args:
|
|
return _render_cmd_template(cmd_templates, "no_results", locale, {"command": "find", "query": ""})
|
|
assets = await client.search_metadata(args, album_ids=all_album_ids, limit=count, page=page)
|
|
assets = _enrich_assets(assets, asset_public_urls or {})
|
|
return _format_assets(assets, "find", args, locale, response_mode, client, cmd_templates)
|
|
|
|
|
|
async def cmd_person(
|
|
client: Any, args: str, count: int,
|
|
locale: str, response_mode: str,
|
|
cmd_templates: dict[str, dict[str, str]],
|
|
asset_public_urls: dict[str, str] | None = None,
|
|
) -> str | dict[str, Any]:
|
|
"""Handle /person command."""
|
|
if not args:
|
|
return _render_cmd_template(cmd_templates, "no_results", locale, {"command": "person", "query": ""})
|
|
people = await client.get_people()
|
|
person_id = None
|
|
for pid, pname in people.items():
|
|
if args.lower() in pname.lower():
|
|
person_id = pid
|
|
break
|
|
if not person_id:
|
|
return _render_cmd_template(cmd_templates, "no_results", locale, {"command": "person", "query": args})
|
|
assets = await client.search_by_person(person_id, limit=count)
|
|
assets = _enrich_assets(assets, asset_public_urls or {})
|
|
return _format_assets(assets, "person", args, locale, response_mode, client, cmd_templates)
|
|
|
|
|
|
async def cmd_place(
|
|
client: Any, args: str, all_album_ids: list[str], count: int,
|
|
locale: str, response_mode: str,
|
|
cmd_templates: dict[str, dict[str, str]],
|
|
asset_public_urls: dict[str, str] | None = None,
|
|
) -> str | dict[str, Any]:
|
|
"""Handle /place command."""
|
|
if not args:
|
|
return _render_cmd_template(cmd_templates, "no_results", locale, {"command": "place", "query": ""})
|
|
assets = await client.search_smart(
|
|
f"photos taken in {args}", album_ids=all_album_ids, limit=count
|
|
)
|
|
assets = _enrich_assets(assets, asset_public_urls or {})
|
|
return _format_assets(assets, "place", args, locale, response_mode, client, cmd_templates)
|