Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

## [2.1.2] — 2026-05-07

### Removed

- Dead code: `_resolve_external_base_url` helper in `provider/__init__.py`
was defined but never called — the live code path uses
`resolve_base_url` from `_smarthome_auto_create.py`. Flagged by Copilot
review on upstream PR music-assistant/server#3834.

## [2.1.1] — 2026-05-07

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.1
2.1.2
22 changes: 0 additions & 22 deletions provider/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,28 +158,6 @@ def _resolve_direct_client_secret(
return str(values.get(CONF_DIRECT_CLIENT_SECRET) or "")


def _resolve_external_base_url(
mass: MusicAssistant,
values: dict[str, ConfigValueType] | None = None,
) -> str:
"""Return the public-facing Base URL to use for Yandex callbacks/webhooks.

Priority:
1. ``CONF_EXTERNAL_BASE_URL`` from values (user-set plugin override)
2. ``mass.webserver.base_url`` (MA's global setting)
Trailing slashes are stripped.
"""
override = ""
if values is not None:
override = str(values.get(CONF_EXTERNAL_BASE_URL) or "").strip()
if override:
return override.rstrip("/")
fallback = ""
with contextlib.suppress(Exception):
fallback = str(mass.webserver.base_url)
return fallback.strip().rstrip("/")


def _resolve_cached_x_token(
mass: MusicAssistant,
instance_id: str | None,
Expand Down
Loading