feat(trackers): user filters for Gitea, webhook polling cleanup, dashboard navigability
- Gitea: NotificationTracker now exposes sender allowlist / blocklist filters via MultiEntitySelect, populated from Gitea /users/search merged with past EventLog senders so the picker is useful before the first webhook arrives. - Webhook providers (gitea, planka, webhook): stop scheduling interval polling jobs on tracker create/update/startup; hide the "every Xs" indicator in the tracker list since there is no polling. - Dashboard: stat cards are now <a> links that route to providers, trackers, targets, command-trackers, or scroll to the events panel. Provider deck rows highlight the target provider on click. - Command trackers / command configs: auto-reselect the right config when the provider type changes (matches notification-tracker behavior). - Migration: drop legacy batch_duration column from notification_tracker — the field is gone from the model but its NOT NULL constraint blocked inserts on older DBs. - Docs: refresh entity-relationships.md with current NotificationTracker fields (filters, adaptive_max_skip, default_*_config_id).
This commit is contained in:
@@ -12,7 +12,7 @@ import aiohttp
|
||||
|
||||
from ..auth.dependencies import get_current_user
|
||||
from ..database.engine import get_session
|
||||
from ..database.models import ServiceProvider, User
|
||||
from ..database.models import EventLog, ServiceProvider, User
|
||||
from ..services import (
|
||||
make_immich_provider, make_gitea_provider, make_planka_provider,
|
||||
make_nut_provider, make_google_photos_provider, list_provider_collections,
|
||||
@@ -398,6 +398,62 @@ async def list_collections(
|
||||
return await list_provider_collections(provider)
|
||||
|
||||
|
||||
@router.get("/{provider_id}/users")
|
||||
async def list_provider_users(
|
||||
provider_id: int,
|
||||
user: User = Depends(get_current_user),
|
||||
session: AsyncSession = Depends(get_session),
|
||||
) -> list[dict[str, str]]:
|
||||
"""Return user identities for sender allowlist/blocklist pickers.
|
||||
|
||||
Two sources are merged so the picker is useful both before and after the
|
||||
first webhook arrives:
|
||||
|
||||
- **Provider API** (primary): Gitea's ``/users/search`` returns instance
|
||||
users the api_token can see. Skipped when no api_token is set.
|
||||
- **Past senders** (fallback): distinct ``sender`` values from
|
||||
``EventLog.details`` for this provider, so pre-existing trackers stay
|
||||
filterable even if the API call fails or is unconfigured.
|
||||
"""
|
||||
provider = await _get_user_provider(session, provider_id, user.id)
|
||||
|
||||
users_by_id: dict[str, str] = {}
|
||||
|
||||
# 1. Try the provider API.
|
||||
if provider.type == "gitea" and (provider.config or {}).get("api_token"):
|
||||
from notify_bridge_core.providers.gitea.client import GiteaClient
|
||||
http_session = await get_http_session()
|
||||
client = GiteaClient(
|
||||
http_session,
|
||||
provider.config.get("url", ""),
|
||||
provider.config.get("api_token", ""),
|
||||
)
|
||||
try:
|
||||
for u in await client.get_users():
|
||||
login = u.get("login", "")
|
||||
if isinstance(login, str) and login:
|
||||
users_by_id[login] = u.get("full_name") or login
|
||||
except Exception:
|
||||
_LOGGER.warning("Failed to fetch Gitea users via API", exc_info=True)
|
||||
|
||||
# 2. Merge in past senders (covers users not visible to the API token, or
|
||||
# cases where the API call fails).
|
||||
result = await session.exec(
|
||||
select(EventLog.details).where(EventLog.provider_id == provider.id)
|
||||
)
|
||||
for details in result.all():
|
||||
if not isinstance(details, dict):
|
||||
continue
|
||||
sender = details.get("sender", "")
|
||||
if isinstance(sender, str) and sender and sender not in users_by_id:
|
||||
users_by_id[sender] = sender
|
||||
|
||||
return [
|
||||
{"id": login, "name": name}
|
||||
for login, name in sorted(users_by_id.items(), key=lambda kv: kv[0].lower())
|
||||
]
|
||||
|
||||
|
||||
@router.get("/{provider_id}/albums/{album_id}/shared-links")
|
||||
async def get_album_shared_links(
|
||||
provider_id: int,
|
||||
|
||||
Reference in New Issue
Block a user