Compare commits
2 Commits
2602262059
...
886783eae4
| Author | SHA1 | Date | |
|---|---|---|---|
| 886783eae4 | |||
| d2ff2b3e41 |
@@ -1 +0,0 @@
|
|||||||
2602262059
|
|
||||||
53
Dockerfile
53
Dockerfile
@@ -1,53 +0,0 @@
|
|||||||
FROM node:20-slim AS frontend-builder
|
|
||||||
|
|
||||||
WORKDIR /frontend
|
|
||||||
|
|
||||||
ENV NODE_ENV=production \
|
|
||||||
BACKEND_INTERNAL_URL=http://127.0.0.1:8000 \
|
|
||||||
NEXT_PUBLIC_API_BASE=/api
|
|
||||||
|
|
||||||
COPY frontend/package.json ./
|
|
||||||
RUN npm install
|
|
||||||
|
|
||||||
COPY frontend/app ./app
|
|
||||||
COPY frontend/public ./public
|
|
||||||
COPY frontend/next-env.d.ts ./next-env.d.ts
|
|
||||||
COPY frontend/next.config.js ./next.config.js
|
|
||||||
COPY frontend/tsconfig.json ./tsconfig.json
|
|
||||||
|
|
||||||
RUN npm run build
|
|
||||||
|
|
||||||
FROM python:3.12-slim
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
ENV PYTHONDONTWRITEBYTECODE=1 \
|
|
||||||
PYTHONUNBUFFERED=1 \
|
|
||||||
NODE_ENV=production
|
|
||||||
|
|
||||||
RUN apt-get update \
|
|
||||||
&& apt-get install -y --no-install-recommends curl gnupg supervisor \
|
|
||||||
&& curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
|
||||||
&& apt-get install -y --no-install-recommends nodejs \
|
|
||||||
&& apt-get clean \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
COPY backend/requirements.txt .
|
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
|
||||||
|
|
||||||
COPY backend/app ./app
|
|
||||||
COPY data/branding /app/data/branding
|
|
||||||
|
|
||||||
COPY --from=frontend-builder /frontend/.next /app/frontend/.next
|
|
||||||
COPY --from=frontend-builder /frontend/public /app/frontend/public
|
|
||||||
COPY --from=frontend-builder /frontend/node_modules /app/frontend/node_modules
|
|
||||||
COPY --from=frontend-builder /frontend/package.json /app/frontend/package.json
|
|
||||||
COPY --from=frontend-builder /frontend/next.config.js /app/frontend/next.config.js
|
|
||||||
COPY --from=frontend-builder /frontend/next-env.d.ts /app/frontend/next-env.d.ts
|
|
||||||
COPY --from=frontend-builder /frontend/tsconfig.json /app/frontend/tsconfig.json
|
|
||||||
|
|
||||||
COPY docker/supervisord.conf /etc/supervisor/conf.d/magent.conf
|
|
||||||
|
|
||||||
EXPOSE 3000 8000
|
|
||||||
|
|
||||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/magent.conf"]
|
|
||||||
@@ -26,7 +26,7 @@ def triage_snapshot(snapshot: Snapshot) -> TriageResult:
|
|||||||
recommendations.append(
|
recommendations.append(
|
||||||
TriageRecommendation(
|
TriageRecommendation(
|
||||||
action_id="readd_to_arr",
|
action_id="readd_to_arr",
|
||||||
title="Push to Sonarr/Radarr",
|
title="Add it to the library queue",
|
||||||
reason="Sonarr/Radarr has not created the entry for this request.",
|
reason="Sonarr/Radarr has not created the entry for this request.",
|
||||||
risk="medium",
|
risk="medium",
|
||||||
)
|
)
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
@@ -1,28 +1,15 @@
|
|||||||
from typing import Dict, Any
|
from typing import Dict, Any
|
||||||
|
|
||||||
from fastapi import Depends, HTTPException, status, Request
|
from fastapi import Depends, HTTPException, status
|
||||||
from fastapi.security import OAuth2PasswordBearer
|
from fastapi.security import OAuth2PasswordBearer
|
||||||
|
|
||||||
from .db import get_user_by_username, upsert_user_activity
|
from .db import get_user_by_username
|
||||||
from .security import safe_decode_token, TokenError
|
from .security import safe_decode_token, TokenError
|
||||||
|
|
||||||
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
|
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
|
||||||
|
|
||||||
def _extract_client_ip(request: Request) -> str:
|
|
||||||
forwarded = request.headers.get("x-forwarded-for")
|
|
||||||
if forwarded:
|
|
||||||
parts = [part.strip() for part in forwarded.split(",") if part.strip()]
|
|
||||||
if parts:
|
|
||||||
return parts[0]
|
|
||||||
real_ip = request.headers.get("x-real-ip")
|
|
||||||
if real_ip:
|
|
||||||
return real_ip.strip()
|
|
||||||
if request.client and request.client.host:
|
|
||||||
return request.client.host
|
|
||||||
return "unknown"
|
|
||||||
|
|
||||||
|
def get_current_user(token: str = Depends(oauth2_scheme)) -> Dict[str, Any]:
|
||||||
def get_current_user(token: str = Depends(oauth2_scheme), request: Request = None) -> Dict[str, Any]:
|
|
||||||
try:
|
try:
|
||||||
payload = safe_decode_token(token)
|
payload = safe_decode_token(token)
|
||||||
except TokenError as exc:
|
except TokenError as exc:
|
||||||
@@ -38,17 +25,10 @@ def get_current_user(token: str = Depends(oauth2_scheme), request: Request = Non
|
|||||||
if user.get("is_blocked"):
|
if user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
|
|
||||||
if request is not None:
|
|
||||||
ip = _extract_client_ip(request)
|
|
||||||
user_agent = request.headers.get("user-agent", "unknown")
|
|
||||||
upsert_user_activity(user["username"], ip, user_agent)
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"username": user["username"],
|
"username": user["username"],
|
||||||
"role": user["role"],
|
"role": user["role"],
|
||||||
"auth_provider": user.get("auth_provider", "local"),
|
"auth_provider": user.get("auth_provider", "local"),
|
||||||
"jellyseerr_user_id": user.get("jellyseerr_user_id"),
|
|
||||||
"auto_search_enabled": bool(user.get("auto_search_enabled", True)),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
BUILD_NUMBER = "2602262059"
|
|
||||||
CHANGELOG = '2026-01-22\\n- Initial commit\\n- Ignore build artifacts\\n- Update README\\n- Update README with Docker-first guide\\n\\n2026-01-23\\n- Fix cache titles via Jellyseerr media lookup\\n- Split search actions and improve download options\\n- Fallback manual grab to qBittorrent\\n- Hide header actions when signed out\\n- Add feedback form and webhook\\n- Fix cache titles and move feedback link\\n- Show available status on landing when in Jellyfin\\n- Add default branding assets when missing\\n- Use bundled branding assets\\n- Remove password fields from users page\\n- Add Docker Hub compose override\\n- Fix backend Dockerfile paths for root context\\n- Copy public assets into frontend image\\n- Use backend branding assets for logo and favicon\\n\\n2026-01-24\\n- Route grabs through Sonarr/Radarr only\\n- Document fix buttons in how-it-works\\n- Clarify how-it-works steps and fixes\\n- Map Prowlarr releases to Arr indexers for manual grab\\n- Improve request handling and qBittorrent categories\\n\\n2026-01-25\\n- Add site banner, build number, and changelog\\n- Automate build number tagging and sync\\n- Improve mobile header layout\\n- Move account actions into avatar menu\\n- Add user stats and activity tracking\\n- Add Jellyfin login cache and admin-only stats\\n- Tidy request sync controls\\n- Seed branding logo from bundled assets\\n- Serve bundled branding assets by default\\n- Harden request cache titles and cache-only reads\\n- Build 2501262041\\n\\n2026-01-26\\n- Fix cache title hydration\\n- Fix sync progress bar animation\\n\\n2026-01-27\\n- Add cache control artwork stats\\n- Improve cache stats performance (build 271261145)\\n- Fix backend cache stats import (build 271261149)\\n- Clarify request sync settings (build 271261159)\\n- Bump build number to 271261202\\n- Fix request titles in snapshots (build 271261219)\\n- Fix snapshot title fallback (build 271261228)\\n- Add cache load spinner (build 271261238)\\n- Bump build number (process 2) 271261322\\n- Add service test buttons (build 271261335)\\n- Fallback to TMDB when artwork cache fails (build 271261524)\\n- Hydrate missing artwork from Jellyseerr (build 271261539)\\n\\n2026-01-29\\n- release: 2901262036\\n- release: 2901262044\\n- release: 2901262102\\n- Hardcode build number in backend\\n- Bake build number and changelog\\n- Update full changelog\\n- Tidy full changelog\\n- Build 2901262240: cache users\n\n2026-01-30\n- Merge backend and frontend into one container'
|
|
||||||
|
|
||||||
@@ -30,14 +30,3 @@ class ApiClient:
|
|||||||
response = await client.post(url, headers=self.headers(), json=payload)
|
response = await client.post(url, headers=self.headers(), json=payload)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
return response.json()
|
return response.json()
|
||||||
|
|
||||||
async def put(self, path: str, payload: Optional[Dict[str, Any]] = None) -> Optional[Any]:
|
|
||||||
if not self.base_url:
|
|
||||||
return None
|
|
||||||
url = f"{self.base_url}{path}"
|
|
||||||
async with httpx.AsyncClient(timeout=10.0) as client:
|
|
||||||
response = await client.put(url, headers=self.headers(), json=payload)
|
|
||||||
response.raise_for_status()
|
|
||||||
if not response.content:
|
|
||||||
return None
|
|
||||||
return response.json()
|
|
||||||
|
|||||||
@@ -58,13 +58,3 @@ class JellyfinClient(ApiClient):
|
|||||||
response = await client.get(url, headers=headers)
|
response = await client.get(url, headers=headers)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
return response.json()
|
return response.json()
|
||||||
|
|
||||||
async def refresh_library(self, recursive: bool = True) -> None:
|
|
||||||
if not self.base_url or not self.api_key:
|
|
||||||
return None
|
|
||||||
url = f"{self.base_url}/Library/Refresh"
|
|
||||||
headers = {"X-Emby-Token": self.api_key}
|
|
||||||
params = {"Recursive": "true" if recursive else "false"}
|
|
||||||
async with httpx.AsyncClient(timeout=10.0) as client:
|
|
||||||
response = await client.post(url, headers=headers, params=params)
|
|
||||||
response.raise_for_status()
|
|
||||||
|
|||||||
@@ -18,6 +18,16 @@ class JellyseerrClient(ApiClient):
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
async def get_users(self, take: int = 50, skip: int = 0) -> Optional[Dict[str, Any]]:
|
||||||
|
return await self.get(
|
||||||
|
"/api/v1/user",
|
||||||
|
params={
|
||||||
|
"take": take,
|
||||||
|
"skip": skip,
|
||||||
|
"sort": "createdAt",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
async def get_media(self, media_id: int) -> Optional[Dict[str, Any]]:
|
async def get_media(self, media_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get(f"/api/v1/media/{media_id}")
|
return await self.get(f"/api/v1/media/{media_id}")
|
||||||
|
|
||||||
@@ -35,12 +45,3 @@ class JellyseerrClient(ApiClient):
|
|||||||
"page": page,
|
"page": page,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
async def get_users(self, take: int = 50, skip: int = 0) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get(
|
|
||||||
"/api/v1/user",
|
|
||||||
params={
|
|
||||||
"take": take,
|
|
||||||
"skip": skip,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
from typing import Any, Dict, Optional
|
from typing import Any, Dict, Optional
|
||||||
import httpx
|
import httpx
|
||||||
import logging
|
|
||||||
from .base import ApiClient
|
from .base import ApiClient
|
||||||
|
|
||||||
|
|
||||||
@@ -9,7 +8,6 @@ class QBittorrentClient(ApiClient):
|
|||||||
super().__init__(base_url, None)
|
super().__init__(base_url, None)
|
||||||
self.username = username
|
self.username = username
|
||||||
self.password = password
|
self.password = password
|
||||||
self.logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
def configured(self) -> bool:
|
def configured(self) -> bool:
|
||||||
return bool(self.base_url and self.username and self.password)
|
return bool(self.base_url and self.username and self.password)
|
||||||
@@ -74,14 +72,6 @@ class QBittorrentClient(ApiClient):
|
|||||||
raise
|
raise
|
||||||
|
|
||||||
async def add_torrent_url(self, url: str, category: Optional[str] = None) -> None:
|
async def add_torrent_url(self, url: str, category: Optional[str] = None) -> None:
|
||||||
url_host = None
|
|
||||||
if isinstance(url, str) and "://" in url:
|
|
||||||
url_host = url.split("://", 1)[-1].split("/", 1)[0]
|
|
||||||
self.logger.warning(
|
|
||||||
"qBittorrent add_torrent_url invoked: category=%s host=%s",
|
|
||||||
category,
|
|
||||||
url_host or "unknown",
|
|
||||||
)
|
|
||||||
data: Dict[str, Any] = {"urls": url}
|
data: Dict[str, Any] = {"urls": url}
|
||||||
if category:
|
if category:
|
||||||
data["category"] = category
|
data["category"] = category
|
||||||
|
|||||||
@@ -9,9 +9,6 @@ class RadarrClient(ApiClient):
|
|||||||
async def get_movie_by_tmdb_id(self, tmdb_id: int) -> Optional[Dict[str, Any]]:
|
async def get_movie_by_tmdb_id(self, tmdb_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/movie", params={"tmdbId": tmdb_id})
|
return await self.get("/api/v3/movie", params={"tmdbId": tmdb_id})
|
||||||
|
|
||||||
async def get_movie(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get(f"/api/v3/movie/{movie_id}")
|
|
||||||
|
|
||||||
async def get_movies(self) -> Optional[Dict[str, Any]]:
|
async def get_movies(self) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/movie")
|
return await self.get("/api/v3/movie")
|
||||||
|
|
||||||
@@ -24,9 +21,6 @@ class RadarrClient(ApiClient):
|
|||||||
async def get_queue(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
async def get_queue(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/queue", params={"movieId": movie_id})
|
return await self.get("/api/v3/queue", params={"movieId": movie_id})
|
||||||
|
|
||||||
async def get_indexers(self) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get("/api/v3/indexer")
|
|
||||||
|
|
||||||
async def search(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
async def search(self, movie_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.post("/api/v3/command", payload={"name": "MoviesSearch", "movieIds": [movie_id]})
|
return await self.post("/api/v3/command", payload={"name": "MoviesSearch", "movieIds": [movie_id]})
|
||||||
|
|
||||||
@@ -47,17 +41,5 @@ class RadarrClient(ApiClient):
|
|||||||
}
|
}
|
||||||
return await self.post("/api/v3/movie", payload=payload)
|
return await self.post("/api/v3/movie", payload=payload)
|
||||||
|
|
||||||
async def update_movie(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.put("/api/v3/movie", payload=payload)
|
|
||||||
|
|
||||||
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
||||||
|
|
||||||
async def push_release(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.post("/api/v3/release/push", payload=payload)
|
|
||||||
|
|
||||||
async def download_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.post(
|
|
||||||
"/api/v3/command",
|
|
||||||
payload={"name": "DownloadRelease", "guid": guid, "indexerId": indexer_id},
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -9,9 +9,6 @@ class SonarrClient(ApiClient):
|
|||||||
async def get_series_by_tvdb_id(self, tvdb_id: int) -> Optional[Dict[str, Any]]:
|
async def get_series_by_tvdb_id(self, tvdb_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/series", params={"tvdbId": tvdb_id})
|
return await self.get("/api/v3/series", params={"tvdbId": tvdb_id})
|
||||||
|
|
||||||
async def get_series(self, series_id: int) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get(f"/api/v3/series/{series_id}")
|
|
||||||
|
|
||||||
async def get_root_folders(self) -> Optional[Dict[str, Any]]:
|
async def get_root_folders(self) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/rootfolder")
|
return await self.get("/api/v3/rootfolder")
|
||||||
|
|
||||||
@@ -21,9 +18,6 @@ class SonarrClient(ApiClient):
|
|||||||
async def get_queue(self, series_id: int) -> Optional[Dict[str, Any]]:
|
async def get_queue(self, series_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/queue", params={"seriesId": series_id})
|
return await self.get("/api/v3/queue", params={"seriesId": series_id})
|
||||||
|
|
||||||
async def get_indexers(self) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.get("/api/v3/indexer")
|
|
||||||
|
|
||||||
async def get_episodes(self, series_id: int) -> Optional[Dict[str, Any]]:
|
async def get_episodes(self, series_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.get("/api/v3/episode", params={"seriesId": series_id})
|
return await self.get("/api/v3/episode", params={"seriesId": series_id})
|
||||||
|
|
||||||
@@ -54,17 +48,5 @@ class SonarrClient(ApiClient):
|
|||||||
payload["title"] = title
|
payload["title"] = title
|
||||||
return await self.post("/api/v3/series", payload=payload)
|
return await self.post("/api/v3/series", payload=payload)
|
||||||
|
|
||||||
async def update_series(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.put("/api/v3/series", payload=payload)
|
|
||||||
|
|
||||||
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
async def grab_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
||||||
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
return await self.post("/api/v3/release", payload={"guid": guid, "indexerId": indexer_id})
|
||||||
|
|
||||||
async def push_release(self, payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.post("/api/v3/release/push", payload=payload)
|
|
||||||
|
|
||||||
async def download_release(self, guid: str, indexer_id: int) -> Optional[Dict[str, Any]]:
|
|
||||||
return await self.post(
|
|
||||||
"/api/v3/command",
|
|
||||||
payload={"name": "DownloadRelease", "guid": guid, "indexerId": indexer_id},
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ from typing import Optional
|
|||||||
from pydantic import AliasChoices, Field
|
from pydantic import AliasChoices, Field
|
||||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||||
|
|
||||||
from .build_info import BUILD_NUMBER, CHANGELOG
|
|
||||||
|
|
||||||
class Settings(BaseSettings):
|
class Settings(BaseSettings):
|
||||||
model_config = SettingsConfigDict(env_prefix="")
|
model_config = SettingsConfigDict(env_prefix="")
|
||||||
@@ -39,17 +38,6 @@ class Settings(BaseSettings):
|
|||||||
artwork_cache_mode: str = Field(
|
artwork_cache_mode: str = Field(
|
||||||
default="remote", validation_alias=AliasChoices("ARTWORK_CACHE_MODE")
|
default="remote", validation_alias=AliasChoices("ARTWORK_CACHE_MODE")
|
||||||
)
|
)
|
||||||
site_build_number: Optional[str] = Field(default=BUILD_NUMBER)
|
|
||||||
site_banner_enabled: bool = Field(
|
|
||||||
default=False, validation_alias=AliasChoices("SITE_BANNER_ENABLED")
|
|
||||||
)
|
|
||||||
site_banner_message: Optional[str] = Field(
|
|
||||||
default=None, validation_alias=AliasChoices("SITE_BANNER_MESSAGE")
|
|
||||||
)
|
|
||||||
site_banner_tone: str = Field(
|
|
||||||
default="info", validation_alias=AliasChoices("SITE_BANNER_TONE")
|
|
||||||
)
|
|
||||||
site_changelog: Optional[str] = Field(default=CHANGELOG)
|
|
||||||
|
|
||||||
jellyseerr_base_url: Optional[str] = Field(
|
jellyseerr_base_url: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("JELLYSEERR_URL", "JELLYSEERR_BASE_URL")
|
default=None, validation_alias=AliasChoices("JELLYSEERR_URL", "JELLYSEERR_BASE_URL")
|
||||||
@@ -82,10 +70,6 @@ class Settings(BaseSettings):
|
|||||||
sonarr_root_folder: Optional[str] = Field(
|
sonarr_root_folder: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("SONARR_ROOT_FOLDER")
|
default=None, validation_alias=AliasChoices("SONARR_ROOT_FOLDER")
|
||||||
)
|
)
|
||||||
sonarr_qbittorrent_category: Optional[str] = Field(
|
|
||||||
default="sonarr",
|
|
||||||
validation_alias=AliasChoices("SONARR_QBITTORRENT_CATEGORY"),
|
|
||||||
)
|
|
||||||
|
|
||||||
radarr_base_url: Optional[str] = Field(
|
radarr_base_url: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("RADARR_URL", "RADARR_BASE_URL")
|
default=None, validation_alias=AliasChoices("RADARR_URL", "RADARR_BASE_URL")
|
||||||
@@ -99,10 +83,6 @@ class Settings(BaseSettings):
|
|||||||
radarr_root_folder: Optional[str] = Field(
|
radarr_root_folder: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("RADARR_ROOT_FOLDER")
|
default=None, validation_alias=AliasChoices("RADARR_ROOT_FOLDER")
|
||||||
)
|
)
|
||||||
radarr_qbittorrent_category: Optional[str] = Field(
|
|
||||||
default="radarr",
|
|
||||||
validation_alias=AliasChoices("RADARR_QBITTORRENT_CATEGORY"),
|
|
||||||
)
|
|
||||||
|
|
||||||
prowlarr_base_url: Optional[str] = Field(
|
prowlarr_base_url: Optional[str] = Field(
|
||||||
default=None, validation_alias=AliasChoices("PROWLARR_URL", "PROWLARR_BASE_URL")
|
default=None, validation_alias=AliasChoices("PROWLARR_URL", "PROWLARR_BASE_URL")
|
||||||
@@ -125,6 +105,159 @@ class Settings(BaseSettings):
|
|||||||
default="https://discord.com/api/webhooks/1464141924775629033/O_rvCAmIKowR04tyAN54IuMPcQFEiT-ustU3udDaMTlF62PmoI6w4-52H3ZQcjgHQOgt",
|
default="https://discord.com/api/webhooks/1464141924775629033/O_rvCAmIKowR04tyAN54IuMPcQFEiT-ustU3udDaMTlF62PmoI6w4-52H3ZQcjgHQOgt",
|
||||||
validation_alias=AliasChoices("DISCORD_WEBHOOK_URL"),
|
validation_alias=AliasChoices("DISCORD_WEBHOOK_URL"),
|
||||||
)
|
)
|
||||||
|
invites_enabled: bool = Field(default=True, validation_alias=AliasChoices("INVITES_ENABLED"))
|
||||||
|
invites_require_captcha: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("INVITES_REQUIRE_CAPTCHA")
|
||||||
|
)
|
||||||
|
invite_default_profile_id: Optional[int] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("INVITE_DEFAULT_PROFILE_ID")
|
||||||
|
)
|
||||||
|
signup_allow_referrals: bool = Field(
|
||||||
|
default=True, validation_alias=AliasChoices("SIGNUP_ALLOW_REFERRALS")
|
||||||
|
)
|
||||||
|
referral_default_uses: int = Field(
|
||||||
|
default=1, validation_alias=AliasChoices("REFERRAL_DEFAULT_USES")
|
||||||
|
)
|
||||||
|
password_min_length: int = Field(
|
||||||
|
default=8, validation_alias=AliasChoices("PASSWORD_MIN_LENGTH")
|
||||||
|
)
|
||||||
|
password_require_upper: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("PASSWORD_REQUIRE_UPPER")
|
||||||
|
)
|
||||||
|
password_require_lower: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("PASSWORD_REQUIRE_LOWER")
|
||||||
|
)
|
||||||
|
password_require_number: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("PASSWORD_REQUIRE_NUMBER")
|
||||||
|
)
|
||||||
|
password_require_symbol: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("PASSWORD_REQUIRE_SYMBOL")
|
||||||
|
)
|
||||||
|
password_reset_enabled: bool = Field(
|
||||||
|
default=True, validation_alias=AliasChoices("PASSWORD_RESET_ENABLED")
|
||||||
|
)
|
||||||
|
captcha_provider: str = Field(
|
||||||
|
default="none", validation_alias=AliasChoices("CAPTCHA_PROVIDER")
|
||||||
|
)
|
||||||
|
hcaptcha_site_key: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("HCAPTCHA_SITE_KEY")
|
||||||
|
)
|
||||||
|
hcaptcha_secret_key: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("HCAPTCHA_SECRET_KEY")
|
||||||
|
)
|
||||||
|
recaptcha_site_key: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("RECAPTCHA_SITE_KEY")
|
||||||
|
)
|
||||||
|
recaptcha_secret_key: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("RECAPTCHA_SECRET_KEY")
|
||||||
|
)
|
||||||
|
turnstile_site_key: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("TURNSTILE_SITE_KEY")
|
||||||
|
)
|
||||||
|
turnstile_secret_key: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("TURNSTILE_SECRET_KEY")
|
||||||
|
)
|
||||||
|
smtp_host: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("SMTP_HOST")
|
||||||
|
)
|
||||||
|
smtp_port: Optional[int] = Field(
|
||||||
|
default=587, validation_alias=AliasChoices("SMTP_PORT")
|
||||||
|
)
|
||||||
|
smtp_user: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("SMTP_USER")
|
||||||
|
)
|
||||||
|
smtp_password: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("SMTP_PASSWORD")
|
||||||
|
)
|
||||||
|
smtp_from: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("SMTP_FROM")
|
||||||
|
)
|
||||||
|
smtp_tls: bool = Field(default=False, validation_alias=AliasChoices("SMTP_TLS"))
|
||||||
|
smtp_starttls: bool = Field(default=True, validation_alias=AliasChoices("SMTP_STARTTLS"))
|
||||||
|
notify_email_enabled: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("NOTIFY_EMAIL_ENABLED")
|
||||||
|
)
|
||||||
|
notify_discord_enabled: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("NOTIFY_DISCORD_ENABLED")
|
||||||
|
)
|
||||||
|
notify_telegram_enabled: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("NOTIFY_TELEGRAM_ENABLED")
|
||||||
|
)
|
||||||
|
notify_matrix_enabled: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("NOTIFY_MATRIX_ENABLED")
|
||||||
|
)
|
||||||
|
notify_pushover_enabled: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("NOTIFY_PUSHOVER_ENABLED")
|
||||||
|
)
|
||||||
|
notify_pushbullet_enabled: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("NOTIFY_PUSHBULLET_ENABLED")
|
||||||
|
)
|
||||||
|
notify_gotify_enabled: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("NOTIFY_GOTIFY_ENABLED")
|
||||||
|
)
|
||||||
|
notify_ntfy_enabled: bool = Field(
|
||||||
|
default=False, validation_alias=AliasChoices("NOTIFY_NTFY_ENABLED")
|
||||||
|
)
|
||||||
|
telegram_bot_token: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("TELEGRAM_BOT_TOKEN")
|
||||||
|
)
|
||||||
|
telegram_chat_id: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("TELEGRAM_CHAT_ID")
|
||||||
|
)
|
||||||
|
matrix_homeserver: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("MATRIX_HOMESERVER")
|
||||||
|
)
|
||||||
|
matrix_user: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("MATRIX_USER")
|
||||||
|
)
|
||||||
|
matrix_password: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("MATRIX_PASSWORD")
|
||||||
|
)
|
||||||
|
matrix_access_token: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("MATRIX_ACCESS_TOKEN")
|
||||||
|
)
|
||||||
|
matrix_room_id: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("MATRIX_ROOM_ID")
|
||||||
|
)
|
||||||
|
pushover_token: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("PUSHOVER_TOKEN")
|
||||||
|
)
|
||||||
|
pushover_user_key: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("PUSHOVER_USER_KEY")
|
||||||
|
)
|
||||||
|
pushbullet_token: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("PUSHBULLET_TOKEN")
|
||||||
|
)
|
||||||
|
gotify_url: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("GOTIFY_URL")
|
||||||
|
)
|
||||||
|
gotify_token: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("GOTIFY_TOKEN")
|
||||||
|
)
|
||||||
|
ntfy_url: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("NTFY_URL")
|
||||||
|
)
|
||||||
|
ntfy_topic: Optional[str] = Field(
|
||||||
|
default=None, validation_alias=AliasChoices("NTFY_TOPIC")
|
||||||
|
)
|
||||||
|
expiry_default_days: int = Field(
|
||||||
|
default=0, validation_alias=AliasChoices("EXPIRY_DEFAULT_DAYS")
|
||||||
|
)
|
||||||
|
expiry_default_action: str = Field(
|
||||||
|
default="disable", validation_alias=AliasChoices("EXPIRY_DEFAULT_ACTION")
|
||||||
|
)
|
||||||
|
expiry_warning_days: int = Field(
|
||||||
|
default=3, validation_alias=AliasChoices("EXPIRY_WARNING_DAYS")
|
||||||
|
)
|
||||||
|
expiry_check_interval_minutes: int = Field(
|
||||||
|
default=60, validation_alias=AliasChoices("EXPIRY_CHECK_INTERVAL_MINUTES")
|
||||||
|
)
|
||||||
|
jellyseerr_sync_users: bool = Field(
|
||||||
|
default=True, validation_alias=AliasChoices("JELLYSEERR_SYNC_USERS")
|
||||||
|
)
|
||||||
|
jellyseerr_sync_interval_minutes: int = Field(
|
||||||
|
default=1440, validation_alias=AliasChoices("JELLYSEERR_SYNC_INTERVAL_MINUTES")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
settings = Settings()
|
settings = Settings()
|
||||||
|
|||||||
1588
backend/app/db.py
1588
backend/app/db.py
File diff suppressed because it is too large
Load Diff
@@ -18,8 +18,9 @@ from .routers.images import router as images_router
|
|||||||
from .routers.branding import router as branding_router
|
from .routers.branding import router as branding_router
|
||||||
from .routers.status import router as status_router
|
from .routers.status import router as status_router
|
||||||
from .routers.feedback import router as feedback_router
|
from .routers.feedback import router as feedback_router
|
||||||
from .routers.site import router as site_router
|
|
||||||
from .services.jellyfin_sync import run_daily_jellyfin_sync
|
from .services.jellyfin_sync import run_daily_jellyfin_sync
|
||||||
|
from .services.jellyseerr_sync import run_jellyseerr_sync_loop
|
||||||
|
from .services.expiry import run_expiry_loop
|
||||||
from .logging_config import configure_logging
|
from .logging_config import configure_logging
|
||||||
from .runtime import get_runtime_settings
|
from .runtime import get_runtime_settings
|
||||||
|
|
||||||
@@ -44,10 +45,12 @@ async def startup() -> None:
|
|||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
configure_logging(runtime.log_level, runtime.log_file)
|
configure_logging(runtime.log_level, runtime.log_file)
|
||||||
asyncio.create_task(run_daily_jellyfin_sync())
|
asyncio.create_task(run_daily_jellyfin_sync())
|
||||||
|
asyncio.create_task(run_jellyseerr_sync_loop())
|
||||||
asyncio.create_task(startup_warmup_requests_cache())
|
asyncio.create_task(startup_warmup_requests_cache())
|
||||||
asyncio.create_task(run_requests_delta_loop())
|
asyncio.create_task(run_requests_delta_loop())
|
||||||
asyncio.create_task(run_daily_requests_full_sync())
|
asyncio.create_task(run_daily_requests_full_sync())
|
||||||
asyncio.create_task(run_daily_db_cleanup())
|
asyncio.create_task(run_daily_db_cleanup())
|
||||||
|
asyncio.create_task(run_expiry_loop())
|
||||||
|
|
||||||
|
|
||||||
app.include_router(requests_router)
|
app.include_router(requests_router)
|
||||||
@@ -57,4 +60,3 @@ app.include_router(images_router)
|
|||||||
app.include_router(branding_router)
|
app.include_router(branding_router)
|
||||||
app.include_router(status_router)
|
app.include_router(status_router)
|
||||||
app.include_router(feedback_router)
|
app.include_router(feedback_router)
|
||||||
app.include_router(site_router)
|
|
||||||
|
|||||||
@@ -1,31 +1,30 @@
|
|||||||
from typing import Any, Dict, List, Optional
|
from typing import Any, Dict, List
|
||||||
from datetime import datetime, timedelta, timezone
|
from datetime import datetime, timedelta, timezone
|
||||||
import ipaddress
|
import secrets
|
||||||
import os
|
import os
|
||||||
from urllib.parse import urlparse, urlunparse
|
|
||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File
|
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File
|
||||||
|
|
||||||
from ..auth import require_admin, get_current_user
|
from ..auth import require_admin
|
||||||
from ..config import settings as env_settings
|
from ..config import settings as env_settings
|
||||||
from ..db import (
|
from ..db import (
|
||||||
delete_setting,
|
delete_setting,
|
||||||
get_all_users,
|
get_all_users,
|
||||||
get_cached_requests,
|
get_invite_profile,
|
||||||
get_cached_requests_count,
|
list_invite_profiles,
|
||||||
|
create_invite_profile,
|
||||||
|
create_invite,
|
||||||
|
list_invites,
|
||||||
|
disable_invite,
|
||||||
|
delete_invite,
|
||||||
|
delete_user,
|
||||||
|
get_all_contacts,
|
||||||
get_request_cache_overview,
|
get_request_cache_overview,
|
||||||
get_request_cache_missing_titles,
|
save_announcement,
|
||||||
get_request_cache_stats,
|
|
||||||
get_settings_overrides,
|
get_settings_overrides,
|
||||||
get_user_by_id,
|
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
get_user_request_stats,
|
|
||||||
create_user_if_missing,
|
|
||||||
set_user_jellyseerr_id,
|
|
||||||
set_setting,
|
set_setting,
|
||||||
set_user_blocked,
|
set_user_blocked,
|
||||||
set_user_auto_search_enabled,
|
|
||||||
set_auto_search_enabled_for_non_admin_users,
|
|
||||||
set_user_password,
|
set_user_password,
|
||||||
set_user_role,
|
set_user_role,
|
||||||
run_integrity_check,
|
run_integrity_check,
|
||||||
@@ -33,9 +32,6 @@ from ..db import (
|
|||||||
clear_requests_cache,
|
clear_requests_cache,
|
||||||
clear_history,
|
clear_history,
|
||||||
cleanup_history,
|
cleanup_history,
|
||||||
update_request_cache_title,
|
|
||||||
repair_request_cache_titles,
|
|
||||||
delete_non_admin_users,
|
|
||||||
)
|
)
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from ..clients.sonarr import SonarrClient
|
from ..clients.sonarr import SonarrClient
|
||||||
@@ -43,18 +39,12 @@ from ..clients.radarr import RadarrClient
|
|||||||
from ..clients.jellyfin import JellyfinClient
|
from ..clients.jellyfin import JellyfinClient
|
||||||
from ..clients.jellyseerr import JellyseerrClient
|
from ..clients.jellyseerr import JellyseerrClient
|
||||||
from ..services.jellyfin_sync import sync_jellyfin_users
|
from ..services.jellyfin_sync import sync_jellyfin_users
|
||||||
from ..services.user_cache import (
|
from ..services.jellyseerr_sync import sync_jellyseerr_users
|
||||||
build_jellyseerr_candidate_map,
|
|
||||||
get_cached_jellyfin_users,
|
|
||||||
get_cached_jellyseerr_users,
|
|
||||||
match_jellyseerr_user_id,
|
|
||||||
save_jellyfin_users_cache,
|
|
||||||
save_jellyseerr_users_cache,
|
|
||||||
)
|
|
||||||
import logging
|
import logging
|
||||||
from ..logging_config import configure_logging
|
from ..logging_config import configure_logging
|
||||||
from ..routers import requests as requests_router
|
from ..routers import requests as requests_router
|
||||||
from ..routers.branding import save_branding_image
|
from ..routers.branding import save_branding_image
|
||||||
|
from ..services.notifications import send_notification
|
||||||
|
|
||||||
router = APIRouter(prefix="/admin", tags=["admin"], dependencies=[Depends(require_admin)])
|
router = APIRouter(prefix="/admin", tags=["admin"], dependencies=[Depends(require_admin)])
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -66,16 +56,17 @@ SENSITIVE_KEYS = {
|
|||||||
"radarr_api_key",
|
"radarr_api_key",
|
||||||
"prowlarr_api_key",
|
"prowlarr_api_key",
|
||||||
"qbittorrent_password",
|
"qbittorrent_password",
|
||||||
}
|
"smtp_password",
|
||||||
|
"hcaptcha_secret_key",
|
||||||
URL_SETTING_KEYS = {
|
"recaptcha_secret_key",
|
||||||
"jellyseerr_base_url",
|
"turnstile_secret_key",
|
||||||
"jellyfin_base_url",
|
"telegram_bot_token",
|
||||||
"jellyfin_public_url",
|
"matrix_password",
|
||||||
"sonarr_base_url",
|
"matrix_access_token",
|
||||||
"radarr_base_url",
|
"pushover_token",
|
||||||
"prowlarr_base_url",
|
"pushover_user_key",
|
||||||
"qbittorrent_base_url",
|
"pushbullet_token",
|
||||||
|
"gotify_token",
|
||||||
}
|
}
|
||||||
|
|
||||||
SETTING_KEYS: List[str] = [
|
SETTING_KEYS: List[str] = [
|
||||||
@@ -90,12 +81,10 @@ SETTING_KEYS: List[str] = [
|
|||||||
"sonarr_api_key",
|
"sonarr_api_key",
|
||||||
"sonarr_quality_profile_id",
|
"sonarr_quality_profile_id",
|
||||||
"sonarr_root_folder",
|
"sonarr_root_folder",
|
||||||
"sonarr_qbittorrent_category",
|
|
||||||
"radarr_base_url",
|
"radarr_base_url",
|
||||||
"radarr_api_key",
|
"radarr_api_key",
|
||||||
"radarr_quality_profile_id",
|
"radarr_quality_profile_id",
|
||||||
"radarr_root_folder",
|
"radarr_root_folder",
|
||||||
"radarr_qbittorrent_category",
|
|
||||||
"prowlarr_base_url",
|
"prowlarr_base_url",
|
||||||
"prowlarr_api_key",
|
"prowlarr_api_key",
|
||||||
"qbittorrent_base_url",
|
"qbittorrent_base_url",
|
||||||
@@ -110,60 +99,61 @@ SETTING_KEYS: List[str] = [
|
|||||||
"requests_cleanup_time",
|
"requests_cleanup_time",
|
||||||
"requests_cleanup_days",
|
"requests_cleanup_days",
|
||||||
"requests_data_source",
|
"requests_data_source",
|
||||||
"site_banner_enabled",
|
"invites_enabled",
|
||||||
"site_banner_message",
|
"invites_require_captcha",
|
||||||
"site_banner_tone",
|
"invite_default_profile_id",
|
||||||
|
"signup_allow_referrals",
|
||||||
|
"referral_default_uses",
|
||||||
|
"password_min_length",
|
||||||
|
"password_require_upper",
|
||||||
|
"password_require_lower",
|
||||||
|
"password_require_number",
|
||||||
|
"password_require_symbol",
|
||||||
|
"password_reset_enabled",
|
||||||
|
"captcha_provider",
|
||||||
|
"hcaptcha_site_key",
|
||||||
|
"hcaptcha_secret_key",
|
||||||
|
"recaptcha_site_key",
|
||||||
|
"recaptcha_secret_key",
|
||||||
|
"turnstile_site_key",
|
||||||
|
"turnstile_secret_key",
|
||||||
|
"smtp_host",
|
||||||
|
"smtp_port",
|
||||||
|
"smtp_user",
|
||||||
|
"smtp_password",
|
||||||
|
"smtp_from",
|
||||||
|
"smtp_tls",
|
||||||
|
"smtp_starttls",
|
||||||
|
"notify_email_enabled",
|
||||||
|
"notify_discord_enabled",
|
||||||
|
"notify_telegram_enabled",
|
||||||
|
"notify_matrix_enabled",
|
||||||
|
"notify_pushover_enabled",
|
||||||
|
"notify_pushbullet_enabled",
|
||||||
|
"notify_gotify_enabled",
|
||||||
|
"notify_ntfy_enabled",
|
||||||
|
"telegram_bot_token",
|
||||||
|
"telegram_chat_id",
|
||||||
|
"matrix_homeserver",
|
||||||
|
"matrix_user",
|
||||||
|
"matrix_password",
|
||||||
|
"matrix_access_token",
|
||||||
|
"matrix_room_id",
|
||||||
|
"pushover_token",
|
||||||
|
"pushover_user_key",
|
||||||
|
"pushbullet_token",
|
||||||
|
"gotify_url",
|
||||||
|
"gotify_token",
|
||||||
|
"ntfy_url",
|
||||||
|
"ntfy_topic",
|
||||||
|
"expiry_default_days",
|
||||||
|
"expiry_default_action",
|
||||||
|
"expiry_warning_days",
|
||||||
|
"expiry_check_interval_minutes",
|
||||||
|
"jellyseerr_sync_users",
|
||||||
|
"jellyseerr_sync_interval_minutes",
|
||||||
]
|
]
|
||||||
|
|
||||||
def _normalize_username(value: str) -> str:
|
|
||||||
normalized = value.strip().lower()
|
|
||||||
if "@" in normalized:
|
|
||||||
normalized = normalized.split("@", 1)[0]
|
|
||||||
return normalized
|
|
||||||
|
|
||||||
|
|
||||||
def _is_ip_host(host: str) -> bool:
|
|
||||||
try:
|
|
||||||
ipaddress.ip_address(host)
|
|
||||||
return True
|
|
||||||
except ValueError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _normalize_service_url(value: str) -> str:
|
|
||||||
raw = value.strip()
|
|
||||||
if not raw:
|
|
||||||
raise ValueError("URL cannot be empty.")
|
|
||||||
|
|
||||||
candidate = raw
|
|
||||||
if "://" not in candidate:
|
|
||||||
authority = candidate.split("/", 1)[0].strip()
|
|
||||||
if authority.startswith("["):
|
|
||||||
closing = authority.find("]")
|
|
||||||
host = authority[1:closing] if closing > 0 else authority.strip("[]")
|
|
||||||
else:
|
|
||||||
host = authority.split(":", 1)[0]
|
|
||||||
host = host.strip().lower()
|
|
||||||
default_scheme = "http" if host in {"localhost"} or _is_ip_host(host) or "." not in host else "https"
|
|
||||||
candidate = f"{default_scheme}://{candidate}"
|
|
||||||
|
|
||||||
parsed = urlparse(candidate)
|
|
||||||
if parsed.scheme not in {"http", "https"}:
|
|
||||||
raise ValueError("URL must use http:// or https://.")
|
|
||||||
if not parsed.netloc:
|
|
||||||
raise ValueError("URL must include a host.")
|
|
||||||
if parsed.query or parsed.fragment:
|
|
||||||
raise ValueError("URL must not include query params or fragments.")
|
|
||||||
if not parsed.hostname:
|
|
||||||
raise ValueError("URL must include a valid host.")
|
|
||||||
|
|
||||||
normalized_path = parsed.path.rstrip("/")
|
|
||||||
normalized = parsed._replace(path=normalized_path, params="", query="", fragment="")
|
|
||||||
result = urlunparse(normalized).rstrip("/")
|
|
||||||
if not result:
|
|
||||||
raise ValueError("URL is invalid.")
|
|
||||||
return result
|
|
||||||
|
|
||||||
def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
||||||
if not isinstance(folders, list):
|
if not isinstance(folders, list):
|
||||||
return []
|
return []
|
||||||
@@ -179,38 +169,6 @@ def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
|||||||
return results
|
return results
|
||||||
|
|
||||||
|
|
||||||
async def _hydrate_cache_titles_from_jellyseerr(limit: int) -> int:
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
|
||||||
if not client.configured():
|
|
||||||
return 0
|
|
||||||
missing = get_request_cache_missing_titles(limit)
|
|
||||||
if not missing:
|
|
||||||
return 0
|
|
||||||
hydrated = 0
|
|
||||||
for row in missing:
|
|
||||||
tmdb_id = row.get("tmdb_id")
|
|
||||||
media_type = row.get("media_type")
|
|
||||||
request_id = row.get("request_id")
|
|
||||||
if not tmdb_id or not media_type or not request_id:
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
title, year = await requests_router._hydrate_title_from_tmdb(
|
|
||||||
client, media_type, tmdb_id
|
|
||||||
)
|
|
||||||
except Exception:
|
|
||||||
logger.warning(
|
|
||||||
"Requests cache title hydrate failed: request_id=%s tmdb_id=%s",
|
|
||||||
request_id,
|
|
||||||
tmdb_id,
|
|
||||||
)
|
|
||||||
continue
|
|
||||||
if title:
|
|
||||||
update_request_cache_title(request_id, title, year)
|
|
||||||
hydrated += 1
|
|
||||||
return hydrated
|
|
||||||
|
|
||||||
|
|
||||||
def _normalize_quality_profiles(profiles: Any) -> List[Dict[str, Any]]:
|
def _normalize_quality_profiles(profiles: Any) -> List[Dict[str, Any]]:
|
||||||
if not isinstance(profiles, list):
|
if not isinstance(profiles, list):
|
||||||
return []
|
return []
|
||||||
@@ -260,14 +218,7 @@ async def update_settings(payload: Dict[str, Any]) -> Dict[str, Any]:
|
|||||||
delete_setting(key)
|
delete_setting(key)
|
||||||
updates += 1
|
updates += 1
|
||||||
continue
|
continue
|
||||||
value_to_store = str(value).strip() if isinstance(value, str) else str(value)
|
set_setting(key, str(value))
|
||||||
if key in URL_SETTING_KEYS and value_to_store:
|
|
||||||
try:
|
|
||||||
value_to_store = _normalize_service_url(value_to_store)
|
|
||||||
except ValueError as exc:
|
|
||||||
friendly_key = key.replace("_", " ")
|
|
||||||
raise HTTPException(status_code=400, detail=f"{friendly_key}: {exc}") from exc
|
|
||||||
set_setting(key, value_to_store)
|
|
||||||
updates += 1
|
updates += 1
|
||||||
if key in {"log_level", "log_file"}:
|
if key in {"log_level", "log_file"}:
|
||||||
touched_logging = True
|
touched_logging = True
|
||||||
@@ -307,9 +258,6 @@ async def radarr_options() -> Dict[str, Any]:
|
|||||||
|
|
||||||
@router.get("/jellyfin/users")
|
@router.get("/jellyfin/users")
|
||||||
async def jellyfin_users() -> Dict[str, Any]:
|
async def jellyfin_users() -> Dict[str, Any]:
|
||||||
cached = get_cached_jellyfin_users()
|
|
||||||
if cached is not None:
|
|
||||||
return {"users": cached}
|
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
@@ -317,7 +265,18 @@ async def jellyfin_users() -> Dict[str, Any]:
|
|||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if not isinstance(users, list):
|
if not isinstance(users, list):
|
||||||
return {"users": []}
|
return {"users": []}
|
||||||
results = save_jellyfin_users_cache(users)
|
results = []
|
||||||
|
for user in users:
|
||||||
|
if not isinstance(user, dict):
|
||||||
|
continue
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
"id": user.get("Id"),
|
||||||
|
"name": user.get("Name"),
|
||||||
|
"hasPassword": user.get("HasPassword"),
|
||||||
|
"lastLoginDate": user.get("LastLoginDate"),
|
||||||
|
}
|
||||||
|
)
|
||||||
return {"users": results}
|
return {"users": results}
|
||||||
|
|
||||||
|
|
||||||
@@ -326,106 +285,12 @@ async def jellyfin_users_sync() -> Dict[str, Any]:
|
|||||||
imported = await sync_jellyfin_users()
|
imported = await sync_jellyfin_users()
|
||||||
return {"status": "ok", "imported": imported}
|
return {"status": "ok", "imported": imported}
|
||||||
|
|
||||||
async def _fetch_all_jellyseerr_users(
|
|
||||||
client: JellyseerrClient, use_cache: bool = True
|
|
||||||
) -> List[Dict[str, Any]]:
|
|
||||||
if use_cache:
|
|
||||||
cached = get_cached_jellyseerr_users()
|
|
||||||
if cached is not None:
|
|
||||||
return cached
|
|
||||||
users: List[Dict[str, Any]] = []
|
|
||||||
take = 100
|
|
||||||
skip = 0
|
|
||||||
while True:
|
|
||||||
payload = await client.get_users(take=take, skip=skip)
|
|
||||||
if not payload:
|
|
||||||
break
|
|
||||||
if isinstance(payload, list):
|
|
||||||
batch = payload
|
|
||||||
elif isinstance(payload, dict):
|
|
||||||
batch = payload.get("results") or payload.get("users") or payload.get("data") or payload.get("items")
|
|
||||||
else:
|
|
||||||
batch = None
|
|
||||||
if not isinstance(batch, list) or not batch:
|
|
||||||
break
|
|
||||||
users.extend([user for user in batch if isinstance(user, dict)])
|
|
||||||
if len(batch) < take:
|
|
||||||
break
|
|
||||||
skip += take
|
|
||||||
if users:
|
|
||||||
return save_jellyseerr_users_cache(users)
|
|
||||||
return users
|
|
||||||
|
|
||||||
@router.post("/jellyseerr/users/sync")
|
@router.post("/jellyseerr/users/sync")
|
||||||
async def jellyseerr_users_sync() -> Dict[str, Any]:
|
async def jellyseerr_users_sync() -> Dict[str, Any]:
|
||||||
runtime = get_runtime_settings()
|
imported = await sync_jellyseerr_users()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
return {"status": "ok", "imported": imported}
|
||||||
if not client.configured():
|
|
||||||
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
|
||||||
jellyseerr_users = await _fetch_all_jellyseerr_users(client, use_cache=False)
|
|
||||||
if not jellyseerr_users:
|
|
||||||
return {"status": "ok", "matched": 0, "skipped": 0, "total": 0}
|
|
||||||
|
|
||||||
candidate_to_id = build_jellyseerr_candidate_map(jellyseerr_users)
|
|
||||||
|
|
||||||
updated = 0
|
|
||||||
skipped = 0
|
|
||||||
users = get_all_users()
|
|
||||||
for user in users:
|
|
||||||
if user.get("jellyseerr_user_id") is not None:
|
|
||||||
skipped += 1
|
|
||||||
continue
|
|
||||||
username = user.get("username") or ""
|
|
||||||
matched_id = match_jellyseerr_user_id(username, candidate_to_id)
|
|
||||||
if matched_id is not None:
|
|
||||||
set_user_jellyseerr_id(username, matched_id)
|
|
||||||
updated += 1
|
|
||||||
else:
|
|
||||||
skipped += 1
|
|
||||||
|
|
||||||
return {"status": "ok", "matched": updated, "skipped": skipped, "total": len(users)}
|
|
||||||
|
|
||||||
def _pick_jellyseerr_username(user: Dict[str, Any]) -> Optional[str]:
|
|
||||||
for key in ("email", "username", "displayName", "name"):
|
|
||||||
value = user.get(key)
|
|
||||||
if isinstance(value, str) and value.strip():
|
|
||||||
return value.strip()
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/jellyseerr/users/resync")
|
|
||||||
async def jellyseerr_users_resync() -> Dict[str, Any]:
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
|
||||||
if not client.configured():
|
|
||||||
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
|
||||||
jellyseerr_users = await _fetch_all_jellyseerr_users(client, use_cache=False)
|
|
||||||
if not jellyseerr_users:
|
|
||||||
return {"status": "ok", "imported": 0, "cleared": 0}
|
|
||||||
|
|
||||||
cleared = delete_non_admin_users()
|
|
||||||
imported = 0
|
|
||||||
for user in jellyseerr_users:
|
|
||||||
user_id = user.get("id") or user.get("userId") or user.get("Id")
|
|
||||||
try:
|
|
||||||
user_id = int(user_id)
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
continue
|
|
||||||
username = _pick_jellyseerr_username(user)
|
|
||||||
if not username:
|
|
||||||
continue
|
|
||||||
created = create_user_if_missing(
|
|
||||||
username,
|
|
||||||
"jellyseerr-user",
|
|
||||||
role="user",
|
|
||||||
auth_provider="jellyseerr",
|
|
||||||
jellyseerr_user_id=user_id,
|
|
||||||
)
|
|
||||||
if created:
|
|
||||||
imported += 1
|
|
||||||
else:
|
|
||||||
set_user_jellyseerr_id(username, user_id)
|
|
||||||
return {"status": "ok", "imported": imported, "cleared": cleared}
|
|
||||||
|
|
||||||
@router.post("/requests/sync")
|
@router.post("/requests/sync")
|
||||||
async def requests_sync() -> Dict[str, Any]:
|
async def requests_sync() -> Dict[str, Any]:
|
||||||
@@ -454,12 +319,10 @@ async def requests_sync_delta() -> Dict[str, Any]:
|
|||||||
|
|
||||||
|
|
||||||
@router.post("/requests/artwork/prefetch")
|
@router.post("/requests/artwork/prefetch")
|
||||||
async def requests_artwork_prefetch(only_missing: bool = False) -> Dict[str, Any]:
|
async def requests_artwork_prefetch() -> Dict[str, Any]:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
state = await requests_router.start_artwork_prefetch(
|
state = await requests_router.start_artwork_prefetch(
|
||||||
runtime.jellyseerr_base_url,
|
runtime.jellyseerr_base_url, runtime.jellyseerr_api_key
|
||||||
runtime.jellyseerr_api_key,
|
|
||||||
only_missing=only_missing,
|
|
||||||
)
|
)
|
||||||
logger.info("Admin triggered artwork prefetch: status=%s", state.get("status"))
|
logger.info("Admin triggered artwork prefetch: status=%s", state.get("status"))
|
||||||
return {"status": "ok", "prefetch": state}
|
return {"status": "ok", "prefetch": state}
|
||||||
@@ -469,25 +332,6 @@ async def requests_artwork_prefetch(only_missing: bool = False) -> Dict[str, Any
|
|||||||
async def requests_artwork_status() -> Dict[str, Any]:
|
async def requests_artwork_status() -> Dict[str, Any]:
|
||||||
return {"status": "ok", "prefetch": requests_router.get_artwork_prefetch_state()}
|
return {"status": "ok", "prefetch": requests_router.get_artwork_prefetch_state()}
|
||||||
|
|
||||||
@router.get("/requests/artwork/summary")
|
|
||||||
async def requests_artwork_summary() -> Dict[str, Any]:
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
|
||||||
stats = get_request_cache_stats()
|
|
||||||
if cache_mode != "cache":
|
|
||||||
stats["cache_bytes"] = 0
|
|
||||||
stats["cache_files"] = 0
|
|
||||||
stats["missing_artwork"] = 0
|
|
||||||
summary = {
|
|
||||||
"cache_mode": cache_mode,
|
|
||||||
"cache_bytes": stats.get("cache_bytes", 0),
|
|
||||||
"cache_files": stats.get("cache_files", 0),
|
|
||||||
"missing_artwork": stats.get("missing_artwork", 0),
|
|
||||||
"total_requests": stats.get("total_requests", 0),
|
|
||||||
"updated_at": stats.get("updated_at"),
|
|
||||||
}
|
|
||||||
return {"status": "ok", "summary": summary}
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/requests/sync/status")
|
@router.get("/requests/sync/status")
|
||||||
async def requests_sync_status() -> Dict[str, Any]:
|
async def requests_sync_status() -> Dict[str, Any]:
|
||||||
@@ -514,48 +358,7 @@ async def read_logs(lines: int = 200) -> Dict[str, Any]:
|
|||||||
|
|
||||||
@router.get("/requests/cache")
|
@router.get("/requests/cache")
|
||||||
async def requests_cache(limit: int = 50) -> Dict[str, Any]:
|
async def requests_cache(limit: int = 50) -> Dict[str, Any]:
|
||||||
repaired = repair_request_cache_titles()
|
return {"rows": get_request_cache_overview(limit)}
|
||||||
if repaired:
|
|
||||||
logger.info("Requests cache titles repaired via settings view: %s", repaired)
|
|
||||||
hydrated = await _hydrate_cache_titles_from_jellyseerr(limit)
|
|
||||||
if hydrated:
|
|
||||||
logger.info("Requests cache titles hydrated via Jellyseerr: %s", hydrated)
|
|
||||||
rows = get_request_cache_overview(limit)
|
|
||||||
return {"rows": rows}
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/requests/all")
|
|
||||||
async def requests_all(
|
|
||||||
take: int = 50,
|
|
||||||
skip: int = 0,
|
|
||||||
days: Optional[int] = None,
|
|
||||||
user: Dict[str, str] = Depends(get_current_user),
|
|
||||||
) -> Dict[str, Any]:
|
|
||||||
if user.get("role") != "admin":
|
|
||||||
raise HTTPException(status_code=403, detail="Forbidden")
|
|
||||||
take = max(1, min(int(take or 50), 200))
|
|
||||||
skip = max(0, int(skip or 0))
|
|
||||||
since_iso = None
|
|
||||||
if days is not None and int(days) > 0:
|
|
||||||
since_iso = (datetime.now(timezone.utc) - timedelta(days=int(days))).isoformat()
|
|
||||||
rows = get_cached_requests(limit=take, offset=skip, since_iso=since_iso)
|
|
||||||
total = get_cached_requests_count(since_iso=since_iso)
|
|
||||||
results = []
|
|
||||||
for row in rows:
|
|
||||||
status = row.get("status")
|
|
||||||
results.append(
|
|
||||||
{
|
|
||||||
"id": row.get("request_id"),
|
|
||||||
"title": row.get("title"),
|
|
||||||
"year": row.get("year"),
|
|
||||||
"type": row.get("media_type"),
|
|
||||||
"status": status,
|
|
||||||
"statusLabel": requests_router._status_label(status),
|
|
||||||
"requestedBy": row.get("requested_by"),
|
|
||||||
"createdAt": row.get("created_at"),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
return {"results": results, "total": total, "take": take, "skip": skip}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/branding/logo")
|
@router.post("/branding/logo")
|
||||||
@@ -607,39 +410,9 @@ async def clear_logs() -> Dict[str, Any]:
|
|||||||
|
|
||||||
@router.get("/users")
|
@router.get("/users")
|
||||||
async def list_users() -> Dict[str, Any]:
|
async def list_users() -> Dict[str, Any]:
|
||||||
users = [user for user in get_all_users() if user.get("role") == "admin" or user.get("auth_provider") == "jellyseerr"]
|
users = get_all_users()
|
||||||
return {"users": users}
|
return {"users": users}
|
||||||
|
|
||||||
@router.get("/users/summary")
|
|
||||||
async def list_users_summary() -> Dict[str, Any]:
|
|
||||||
users = [user for user in get_all_users() if user.get("role") == "admin" or user.get("auth_provider") == "jellyseerr"]
|
|
||||||
results: list[Dict[str, Any]] = []
|
|
||||||
for user in users:
|
|
||||||
username = user.get("username") or ""
|
|
||||||
username_norm = _normalize_username(username) if username else ""
|
|
||||||
stats = get_user_request_stats(username_norm, user.get("jellyseerr_user_id"))
|
|
||||||
results.append({**user, "stats": stats})
|
|
||||||
return {"users": results}
|
|
||||||
|
|
||||||
@router.get("/users/{username}")
|
|
||||||
async def get_user_summary(username: str) -> Dict[str, Any]:
|
|
||||||
user = get_user_by_username(username)
|
|
||||||
if not user:
|
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
|
||||||
username_norm = _normalize_username(user.get("username") or "")
|
|
||||||
stats = get_user_request_stats(username_norm, user.get("jellyseerr_user_id"))
|
|
||||||
return {"user": user, "stats": stats}
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/users/id/{user_id}")
|
|
||||||
async def get_user_summary_by_id(user_id: int) -> Dict[str, Any]:
|
|
||||||
user = get_user_by_id(user_id)
|
|
||||||
if not user:
|
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
|
||||||
username_norm = _normalize_username(user.get("username") or "")
|
|
||||||
stats = get_user_request_stats(username_norm, user.get("jellyseerr_user_id"))
|
|
||||||
return {"user": user, "stats": stats}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/{username}/block")
|
@router.post("/users/{username}/block")
|
||||||
async def block_user(username: str) -> Dict[str, Any]:
|
async def block_user(username: str) -> Dict[str, Any]:
|
||||||
@@ -662,32 +435,6 @@ async def update_user_role(username: str, payload: Dict[str, Any]) -> Dict[str,
|
|||||||
return {"status": "ok", "username": username, "role": role}
|
return {"status": "ok", "username": username, "role": role}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/{username}/auto-search")
|
|
||||||
async def update_user_auto_search(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
|
||||||
enabled = payload.get("enabled") if isinstance(payload, dict) else None
|
|
||||||
if not isinstance(enabled, bool):
|
|
||||||
raise HTTPException(status_code=400, detail="enabled must be true or false")
|
|
||||||
user = get_user_by_username(username)
|
|
||||||
if not user:
|
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
|
||||||
set_user_auto_search_enabled(username, enabled)
|
|
||||||
return {"status": "ok", "username": username, "auto_search_enabled": enabled}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/auto-search/bulk")
|
|
||||||
async def update_users_auto_search_bulk(payload: Dict[str, Any]) -> Dict[str, Any]:
|
|
||||||
enabled = payload.get("enabled") if isinstance(payload, dict) else None
|
|
||||||
if not isinstance(enabled, bool):
|
|
||||||
raise HTTPException(status_code=400, detail="enabled must be true or false")
|
|
||||||
updated = set_auto_search_enabled_for_non_admin_users(enabled)
|
|
||||||
return {
|
|
||||||
"status": "ok",
|
|
||||||
"enabled": enabled,
|
|
||||||
"updated": updated,
|
|
||||||
"scope": "non-admin-users",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/{username}/password")
|
@router.post("/users/{username}/password")
|
||||||
async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
new_password = payload.get("password") if isinstance(payload, dict) else None
|
new_password = payload.get("password") if isinstance(payload, dict) else None
|
||||||
@@ -702,3 +449,157 @@ async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[s
|
|||||||
)
|
)
|
||||||
set_user_password(username, new_password.strip())
|
set_user_password(username, new_password.strip())
|
||||||
return {"status": "ok", "username": username}
|
return {"status": "ok", "username": username}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/users/bulk")
|
||||||
|
async def bulk_user_action(payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
action = str(payload.get("action") or "").strip().lower()
|
||||||
|
usernames = payload.get("usernames")
|
||||||
|
if not isinstance(usernames, list) or not usernames:
|
||||||
|
raise HTTPException(status_code=400, detail="User list required")
|
||||||
|
if action not in {"block", "unblock", "delete", "role"}:
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid action")
|
||||||
|
updated = 0
|
||||||
|
for username in usernames:
|
||||||
|
if not isinstance(username, str) or not username.strip():
|
||||||
|
continue
|
||||||
|
name = username.strip()
|
||||||
|
if action == "block":
|
||||||
|
set_user_blocked(name, True)
|
||||||
|
elif action == "unblock":
|
||||||
|
set_user_blocked(name, False)
|
||||||
|
elif action == "delete":
|
||||||
|
delete_user(name)
|
||||||
|
elif action == "role":
|
||||||
|
role = str(payload.get("role") or "").strip().lower()
|
||||||
|
if role not in {"admin", "user"}:
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid role")
|
||||||
|
set_user_role(name, role)
|
||||||
|
updated += 1
|
||||||
|
return {"status": "ok", "updated": updated}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/invite-profiles")
|
||||||
|
async def invite_profiles() -> Dict[str, Any]:
|
||||||
|
return {"profiles": list_invite_profiles()}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/invite-profiles")
|
||||||
|
async def create_profile(
|
||||||
|
payload: Dict[str, Any], user: Dict[str, Any] = Depends(require_admin)
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
name = str(payload.get("name") or "").strip()
|
||||||
|
if not name:
|
||||||
|
raise HTTPException(status_code=400, detail="Profile name required")
|
||||||
|
profile_id = create_invite_profile(
|
||||||
|
name=name,
|
||||||
|
description=str(payload.get("description") or "").strip() or None,
|
||||||
|
max_uses=payload.get("max_uses"),
|
||||||
|
expires_in_days=payload.get("expires_in_days"),
|
||||||
|
require_captcha=bool(payload.get("require_captcha")),
|
||||||
|
password_rules=payload.get("password_rules") if isinstance(payload.get("password_rules"), dict) else None,
|
||||||
|
allow_referrals=bool(payload.get("allow_referrals")),
|
||||||
|
referral_uses=payload.get("referral_uses"),
|
||||||
|
user_expiry_days=payload.get("user_expiry_days"),
|
||||||
|
user_expiry_action=str(payload.get("user_expiry_action") or "").strip() or None,
|
||||||
|
)
|
||||||
|
return {"status": "ok", "id": profile_id}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/invites")
|
||||||
|
async def list_invites_endpoint(limit: int = 200) -> Dict[str, Any]:
|
||||||
|
return {"invites": list_invites(limit)}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/invites")
|
||||||
|
async def create_invite_endpoint(
|
||||||
|
payload: Dict[str, Any], user: Dict[str, Any] = Depends(require_admin)
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
profile_id = payload.get("profile_id")
|
||||||
|
profile = None
|
||||||
|
if profile_id is not None:
|
||||||
|
try:
|
||||||
|
profile = get_invite_profile(int(profile_id))
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
profile = None
|
||||||
|
expires_in_days = payload.get("expires_in_days") or (profile.get("expires_in_days") if profile else None)
|
||||||
|
expires_at = None
|
||||||
|
if expires_in_days:
|
||||||
|
try:
|
||||||
|
expires_at = (
|
||||||
|
datetime.now(timezone.utc) + timedelta(days=float(expires_in_days))
|
||||||
|
).isoformat()
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
expires_at = None
|
||||||
|
require_captcha = bool(payload.get("require_captcha"))
|
||||||
|
if not require_captcha and profile:
|
||||||
|
require_captcha = bool(profile.get("require_captcha"))
|
||||||
|
if not require_captcha:
|
||||||
|
require_captcha = runtime.invites_require_captcha
|
||||||
|
password_rules = payload.get("password_rules")
|
||||||
|
if not isinstance(password_rules, dict):
|
||||||
|
password_rules = profile.get("password_rules") if profile else None
|
||||||
|
allow_referrals = bool(payload.get("allow_referrals"))
|
||||||
|
if not allow_referrals and profile:
|
||||||
|
allow_referrals = bool(profile.get("allow_referrals"))
|
||||||
|
user_expiry_days = payload.get("user_expiry_days") or (profile.get("user_expiry_days") if profile else None)
|
||||||
|
user_expiry_action = payload.get("user_expiry_action") or (profile.get("user_expiry_action") if profile else None)
|
||||||
|
code = secrets.token_urlsafe(8)
|
||||||
|
create_invite(
|
||||||
|
code=code,
|
||||||
|
created_by=user.get("username"),
|
||||||
|
profile_id=int(profile_id) if profile_id is not None else None,
|
||||||
|
expires_at=expires_at,
|
||||||
|
max_uses=payload.get("max_uses") or (profile.get("max_uses") if profile else None),
|
||||||
|
require_captcha=require_captcha,
|
||||||
|
password_rules=password_rules if isinstance(password_rules, dict) else None,
|
||||||
|
allow_referrals=allow_referrals,
|
||||||
|
referral_uses=payload.get("referral_uses") or (profile.get("referral_uses") if profile else None),
|
||||||
|
user_expiry_days=user_expiry_days,
|
||||||
|
user_expiry_action=str(user_expiry_action) if user_expiry_action else None,
|
||||||
|
is_referral=bool(payload.get("is_referral")),
|
||||||
|
)
|
||||||
|
return {"status": "ok", "code": code}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/invites/{code}/disable")
|
||||||
|
async def disable_invite_endpoint(code: str) -> Dict[str, Any]:
|
||||||
|
disable_invite(code)
|
||||||
|
return {"status": "ok", "code": code, "disabled": True}
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/invites/{code}")
|
||||||
|
async def delete_invite_endpoint(code: str) -> Dict[str, Any]:
|
||||||
|
delete_invite(code)
|
||||||
|
return {"status": "ok", "code": code, "deleted": True}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/announcements")
|
||||||
|
async def send_announcement(
|
||||||
|
payload: Dict[str, Any], user: Dict[str, Any] = Depends(require_admin)
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
subject = str(payload.get("subject") or "").strip()
|
||||||
|
body = str(payload.get("body") or "").strip()
|
||||||
|
channels = payload.get("channels") if isinstance(payload.get("channels"), list) else []
|
||||||
|
if not subject or not body:
|
||||||
|
raise HTTPException(status_code=400, detail="Subject and message required")
|
||||||
|
results: Dict[str, Any] = {}
|
||||||
|
email_count = 0
|
||||||
|
email_failed = 0
|
||||||
|
if "email" in [str(c).lower() for c in channels]:
|
||||||
|
for contact in get_all_contacts():
|
||||||
|
email = contact.get("email")
|
||||||
|
if not email:
|
||||||
|
continue
|
||||||
|
outcome = await send_notification(subject, body, channels=["email"], email=email)
|
||||||
|
if outcome.get("email") == "sent":
|
||||||
|
email_count += 1
|
||||||
|
else:
|
||||||
|
email_failed += 1
|
||||||
|
results["email"] = {"sent": email_count, "failed": email_failed}
|
||||||
|
other_channels = [c for c in channels if str(c).lower() != "email"]
|
||||||
|
if other_channels:
|
||||||
|
results.update(await send_notification(subject, body, channels=other_channels))
|
||||||
|
save_announcement(user.get("username"), subject, body, ",".join(channels))
|
||||||
|
return {"status": "ok", "results": results}
|
||||||
|
|||||||
@@ -1,108 +1,66 @@
|
|||||||
from datetime import datetime, timedelta, timezone
|
from datetime import datetime, timedelta, timezone
|
||||||
|
from typing import Optional
|
||||||
from fastapi import APIRouter, HTTPException, status, Depends
|
from fastapi import APIRouter, HTTPException, status, Depends, Request
|
||||||
from fastapi.security import OAuth2PasswordRequestForm
|
from fastapi.security import OAuth2PasswordRequestForm
|
||||||
|
import secrets
|
||||||
|
|
||||||
from ..db import (
|
from ..db import (
|
||||||
verify_user_password,
|
verify_user_password,
|
||||||
create_user_if_missing,
|
create_user_if_missing,
|
||||||
|
create_user,
|
||||||
set_last_login,
|
set_last_login,
|
||||||
get_user_by_username,
|
get_user_by_username,
|
||||||
get_users_by_username_ci,
|
get_user_by_email,
|
||||||
set_user_password,
|
set_user_password,
|
||||||
set_jellyfin_auth_cache,
|
get_invite_by_code,
|
||||||
set_user_jellyseerr_id,
|
get_invite_profile,
|
||||||
get_user_activity,
|
increment_invite_use,
|
||||||
get_user_activity_summary,
|
list_invites_by_creator,
|
||||||
get_user_request_stats,
|
create_invite,
|
||||||
get_global_request_leader,
|
upsert_user_contact,
|
||||||
get_global_request_total,
|
get_user_contact,
|
||||||
|
set_user_expiry,
|
||||||
|
create_password_reset,
|
||||||
|
get_password_reset,
|
||||||
|
mark_password_reset_used,
|
||||||
)
|
)
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from ..clients.jellyfin import JellyfinClient
|
from ..clients.jellyfin import JellyfinClient
|
||||||
from ..clients.jellyseerr import JellyseerrClient
|
from ..clients.jellyseerr import JellyseerrClient
|
||||||
from ..security import create_access_token, verify_password
|
from ..security import create_access_token
|
||||||
from ..auth import get_current_user
|
from ..auth import get_current_user
|
||||||
from ..services.user_cache import (
|
from ..services.captcha import verify_captcha
|
||||||
build_jellyseerr_candidate_map,
|
from ..services.notifications import send_notification
|
||||||
get_cached_jellyseerr_users,
|
|
||||||
match_jellyseerr_user_id,
|
|
||||||
save_jellyfin_users_cache,
|
|
||||||
)
|
|
||||||
|
|
||||||
router = APIRouter(prefix="/auth", tags=["auth"])
|
router = APIRouter(prefix="/auth", tags=["auth"])
|
||||||
|
|
||||||
|
def _validate_password(password: str, rules: dict | None = None) -> Optional[str]:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
rules = rules or {}
|
||||||
|
min_length = int(rules.get("min_length") or runtime.password_min_length or 8)
|
||||||
|
require_upper = bool(rules.get("require_upper", runtime.password_require_upper))
|
||||||
|
require_lower = bool(rules.get("require_lower", runtime.password_require_lower))
|
||||||
|
require_number = bool(rules.get("require_number", runtime.password_require_number))
|
||||||
|
require_symbol = bool(rules.get("require_symbol", runtime.password_require_symbol))
|
||||||
|
|
||||||
def _normalize_username(value: str) -> str:
|
if len(password) < min_length:
|
||||||
normalized = value.strip().lower()
|
return f"Password must be at least {min_length} characters."
|
||||||
if "@" in normalized:
|
if require_upper and password.lower() == password:
|
||||||
normalized = normalized.split("@", 1)[0]
|
return "Password must include an uppercase letter."
|
||||||
return normalized
|
if require_lower and password.upper() == password:
|
||||||
|
return "Password must include a lowercase letter."
|
||||||
|
if require_number and not any(char.isdigit() for char in password):
|
||||||
def _is_recent_jellyfin_auth(last_auth_at: str) -> bool:
|
return "Password must include a number."
|
||||||
if not last_auth_at:
|
if require_symbol and password.isalnum():
|
||||||
return False
|
return "Password must include a symbol."
|
||||||
try:
|
|
||||||
parsed = datetime.fromisoformat(last_auth_at)
|
|
||||||
except ValueError:
|
|
||||||
return False
|
|
||||||
if parsed.tzinfo is None:
|
|
||||||
parsed = parsed.replace(tzinfo=timezone.utc)
|
|
||||||
age = datetime.now(timezone.utc) - parsed
|
|
||||||
return age <= timedelta(days=7)
|
|
||||||
|
|
||||||
|
|
||||||
def _has_valid_jellyfin_cache(user: dict, password: str) -> bool:
|
|
||||||
if not user or not password:
|
|
||||||
return False
|
|
||||||
cached_hash = user.get("jellyfin_password_hash")
|
|
||||||
last_auth_at = user.get("last_jellyfin_auth_at")
|
|
||||||
if not cached_hash or not last_auth_at:
|
|
||||||
return False
|
|
||||||
if not verify_password(password, cached_hash):
|
|
||||||
return False
|
|
||||||
return _is_recent_jellyfin_auth(last_auth_at)
|
|
||||||
|
|
||||||
def _extract_jellyseerr_user_id(response: dict) -> int | None:
|
|
||||||
if not isinstance(response, dict):
|
|
||||||
return None
|
|
||||||
candidate = response
|
|
||||||
if isinstance(response.get("user"), dict):
|
|
||||||
candidate = response.get("user")
|
|
||||||
for key in ("id", "userId", "Id"):
|
|
||||||
value = candidate.get(key) if isinstance(candidate, dict) else None
|
|
||||||
if value is None:
|
|
||||||
continue
|
|
||||||
try:
|
|
||||||
return int(value)
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
continue
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
@router.post("/login")
|
@router.post("/login")
|
||||||
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
||||||
# Provider placeholder passwords must never be accepted by the local-login endpoint.
|
|
||||||
if form_data.password in {"jellyfin-user", "jellyseerr-user"}:
|
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
|
||||||
matching_users = get_users_by_username_ci(form_data.username)
|
|
||||||
has_external_match = any(
|
|
||||||
str(user.get("auth_provider") or "local").lower() != "local" for user in matching_users
|
|
||||||
)
|
|
||||||
if has_external_match:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
|
||||||
detail="This account uses external sign-in. Use the external sign-in option.",
|
|
||||||
)
|
|
||||||
user = verify_user_password(form_data.username, form_data.password)
|
user = verify_user_password(form_data.username, form_data.password)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
||||||
if str(user.get("auth_provider") or "local").lower() != "local":
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=status.HTTP_400_BAD_REQUEST,
|
|
||||||
detail="This account uses external sign-in. Use the external sign-in option.",
|
|
||||||
)
|
|
||||||
if user.get("is_blocked"):
|
if user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
token = create_access_token(user["username"], user["role"])
|
token = create_access_token(user["username"], user["role"])
|
||||||
@@ -120,47 +78,30 @@ async def jellyfin_login(form_data: OAuth2PasswordRequestForm = Depends()) -> di
|
|||||||
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Jellyfin not configured")
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Jellyfin not configured")
|
||||||
jellyseerr_users = get_cached_jellyseerr_users()
|
|
||||||
candidate_map = build_jellyseerr_candidate_map(jellyseerr_users or [])
|
|
||||||
username = form_data.username
|
|
||||||
password = form_data.password
|
|
||||||
user = get_user_by_username(username)
|
|
||||||
if user and user.get("is_blocked"):
|
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
|
||||||
if user and _has_valid_jellyfin_cache(user, password):
|
|
||||||
token = create_access_token(username, "user")
|
|
||||||
set_last_login(username)
|
|
||||||
return {"access_token": token, "token_type": "bearer", "user": {"username": username, "role": "user"}}
|
|
||||||
try:
|
try:
|
||||||
response = await client.authenticate_by_name(username, password)
|
response = await client.authenticate_by_name(form_data.username, form_data.password)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
||||||
if not isinstance(response, dict) or not response.get("User"):
|
if not isinstance(response, dict) or not response.get("User"):
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
||||||
create_user_if_missing(username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(form_data.username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
||||||
user = get_user_by_username(username)
|
user = get_user_by_username(form_data.username)
|
||||||
if user and user.get("is_blocked"):
|
if user and user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
try:
|
try:
|
||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if isinstance(users, list):
|
if isinstance(users, list):
|
||||||
save_jellyfin_users_cache(users)
|
for user in users:
|
||||||
for jellyfin_user in users:
|
if not isinstance(user, dict):
|
||||||
if not isinstance(jellyfin_user, dict):
|
|
||||||
continue
|
continue
|
||||||
name = jellyfin_user.get("Name")
|
name = user.get("Name")
|
||||||
if isinstance(name, str) and name:
|
if isinstance(name, str) and name:
|
||||||
create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin")
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
set_jellyfin_auth_cache(username, password)
|
token = create_access_token(form_data.username, "user")
|
||||||
if user and user.get("jellyseerr_user_id") is None and candidate_map:
|
set_last_login(form_data.username)
|
||||||
matched_id = match_jellyseerr_user_id(username, candidate_map)
|
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
||||||
if matched_id is not None:
|
|
||||||
set_user_jellyseerr_id(username, matched_id)
|
|
||||||
token = create_access_token(username, "user")
|
|
||||||
set_last_login(username)
|
|
||||||
return {"access_token": token, "token_type": "bearer", "user": {"username": username, "role": "user"}}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/jellyseerr/login")
|
@router.post("/jellyseerr/login")
|
||||||
@@ -176,19 +117,10 @@ async def jellyseerr_login(form_data: OAuth2PasswordRequestForm = Depends()) ->
|
|||||||
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
||||||
if not isinstance(response, dict):
|
if not isinstance(response, dict):
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyseerr credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyseerr credentials")
|
||||||
jellyseerr_user_id = _extract_jellyseerr_user_id(response)
|
create_user_if_missing(form_data.username, "jellyseerr-user", role="user", auth_provider="jellyseerr")
|
||||||
create_user_if_missing(
|
|
||||||
form_data.username,
|
|
||||||
"jellyseerr-user",
|
|
||||||
role="user",
|
|
||||||
auth_provider="jellyseerr",
|
|
||||||
jellyseerr_user_id=jellyseerr_user_id,
|
|
||||||
)
|
|
||||||
user = get_user_by_username(form_data.username)
|
user = get_user_by_username(form_data.username)
|
||||||
if user and user.get("is_blocked"):
|
if user and user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
if jellyseerr_user_id is not None:
|
|
||||||
set_user_jellyseerr_id(form_data.username, jellyseerr_user_id)
|
|
||||||
token = create_access_token(form_data.username, "user")
|
token = create_access_token(form_data.username, "user")
|
||||||
set_last_login(form_data.username)
|
set_last_login(form_data.username)
|
||||||
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
||||||
@@ -199,32 +131,6 @@ async def me(current_user: dict = Depends(get_current_user)) -> dict:
|
|||||||
return current_user
|
return current_user
|
||||||
|
|
||||||
|
|
||||||
@router.get("/profile")
|
|
||||||
async def profile(current_user: dict = Depends(get_current_user)) -> dict:
|
|
||||||
username = current_user.get("username") or ""
|
|
||||||
username_norm = _normalize_username(username) if username else ""
|
|
||||||
stats = get_user_request_stats(username_norm, current_user.get("jellyseerr_user_id"))
|
|
||||||
global_total = get_global_request_total()
|
|
||||||
share = (stats.get("total", 0) / global_total) if global_total else 0
|
|
||||||
activity_summary = get_user_activity_summary(username) if username else {}
|
|
||||||
activity_recent = get_user_activity(username, limit=5) if username else []
|
|
||||||
stats_payload = {
|
|
||||||
**stats,
|
|
||||||
"share": share,
|
|
||||||
"global_total": global_total,
|
|
||||||
}
|
|
||||||
if current_user.get("role") == "admin":
|
|
||||||
stats_payload["most_active_user"] = get_global_request_leader()
|
|
||||||
return {
|
|
||||||
"user": current_user,
|
|
||||||
"stats": stats_payload,
|
|
||||||
"activity": {
|
|
||||||
**activity_summary,
|
|
||||||
"recent": activity_recent,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/password")
|
@router.post("/password")
|
||||||
async def change_password(payload: dict, current_user: dict = Depends(get_current_user)) -> dict:
|
async def change_password(payload: dict, current_user: dict = Depends(get_current_user)) -> dict:
|
||||||
if current_user.get("auth_provider") != "local":
|
if current_user.get("auth_provider") != "local":
|
||||||
@@ -236,12 +142,216 @@ async def change_password(payload: dict, current_user: dict = Depends(get_curren
|
|||||||
new_password = payload.get("new_password") if isinstance(payload, dict) else None
|
new_password = payload.get("new_password") if isinstance(payload, dict) else None
|
||||||
if not isinstance(current_password, str) or not isinstance(new_password, str):
|
if not isinstance(current_password, str) or not isinstance(new_password, str):
|
||||||
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid payload")
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid payload")
|
||||||
if len(new_password.strip()) < 8:
|
error = _validate_password(new_password.strip())
|
||||||
raise HTTPException(
|
if error:
|
||||||
status_code=status.HTTP_400_BAD_REQUEST, detail="Password must be at least 8 characters."
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=error)
|
||||||
)
|
|
||||||
user = verify_user_password(current_user["username"], current_password)
|
user = verify_user_password(current_user["username"], current_password)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Current password is incorrect")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Current password is incorrect")
|
||||||
set_user_password(current_user["username"], new_password.strip())
|
set_user_password(current_user["username"], new_password.strip())
|
||||||
return {"status": "ok"}
|
return {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/contact")
|
||||||
|
async def get_contact(current_user: dict = Depends(get_current_user)) -> dict:
|
||||||
|
contact = get_user_contact(current_user["username"])
|
||||||
|
return {"contact": contact or {}}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/contact")
|
||||||
|
async def update_contact(payload: dict, current_user: dict = Depends(get_current_user)) -> dict:
|
||||||
|
if not isinstance(payload, dict):
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid payload")
|
||||||
|
upsert_user_contact(
|
||||||
|
current_user["username"],
|
||||||
|
email=str(payload.get("email") or "").strip() or None,
|
||||||
|
discord=str(payload.get("discord") or "").strip() or None,
|
||||||
|
telegram=str(payload.get("telegram") or "").strip() or None,
|
||||||
|
matrix=str(payload.get("matrix") or "").strip() or None,
|
||||||
|
)
|
||||||
|
return {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/register")
|
||||||
|
async def register(payload: dict, request: Request) -> dict:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.invites_enabled:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invites are disabled")
|
||||||
|
invite_code = str(payload.get("invite_code") or "").strip()
|
||||||
|
username = str(payload.get("username") or "").strip()
|
||||||
|
password = str(payload.get("password") or "").strip()
|
||||||
|
contact = payload.get("contact") if isinstance(payload, dict) else None
|
||||||
|
captcha_token = str(payload.get("captcha_token") or "").strip()
|
||||||
|
if not invite_code or not username or not password:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invite, username, and password required")
|
||||||
|
if get_user_by_username(username):
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Username already exists")
|
||||||
|
invite = get_invite_by_code(invite_code)
|
||||||
|
if not invite or invite.get("disabled"):
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invite not found or disabled")
|
||||||
|
profile = None
|
||||||
|
if invite.get("profile_id"):
|
||||||
|
profile = get_invite_profile(int(invite["profile_id"]))
|
||||||
|
max_uses = invite.get("max_uses")
|
||||||
|
if max_uses is not None and invite.get("uses_count", 0) >= max_uses:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invite has been fully used")
|
||||||
|
expires_at = invite.get("expires_at")
|
||||||
|
if expires_at:
|
||||||
|
try:
|
||||||
|
if datetime.fromisoformat(expires_at) <= datetime.now(timezone.utc):
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invite has expired")
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
|
require_captcha = (
|
||||||
|
bool(invite.get("require_captcha"))
|
||||||
|
or (bool(profile.get("require_captcha")) if profile else False)
|
||||||
|
or runtime.invites_require_captcha
|
||||||
|
)
|
||||||
|
if require_captcha:
|
||||||
|
ok = await verify_captcha(captcha_token, request.client.host if request.client else None)
|
||||||
|
if not ok:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Captcha failed")
|
||||||
|
rules = invite.get("password_rules") or (profile.get("password_rules") if profile else None)
|
||||||
|
error = _validate_password(password, rules)
|
||||||
|
if error:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=error)
|
||||||
|
try:
|
||||||
|
create_user(username, password, role="user", auth_provider="local")
|
||||||
|
except Exception as exc:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
|
||||||
|
if isinstance(contact, dict):
|
||||||
|
upsert_user_contact(
|
||||||
|
username,
|
||||||
|
email=str(contact.get("email") or "").strip() or None,
|
||||||
|
discord=str(contact.get("discord") or "").strip() or None,
|
||||||
|
telegram=str(contact.get("telegram") or "").strip() or None,
|
||||||
|
matrix=str(contact.get("matrix") or "").strip() or None,
|
||||||
|
)
|
||||||
|
expiry_days = (
|
||||||
|
invite.get("user_expiry_days")
|
||||||
|
or (profile.get("user_expiry_days") if profile else None)
|
||||||
|
or runtime.expiry_default_days
|
||||||
|
)
|
||||||
|
expiry_action = (
|
||||||
|
invite.get("user_expiry_action")
|
||||||
|
or (profile.get("user_expiry_action") if profile else None)
|
||||||
|
or runtime.expiry_default_action
|
||||||
|
)
|
||||||
|
if expiry_days and expiry_action:
|
||||||
|
try:
|
||||||
|
expiry_days_float = float(expiry_days)
|
||||||
|
except (TypeError, ValueError):
|
||||||
|
expiry_days_float = 0
|
||||||
|
if expiry_days_float > 0:
|
||||||
|
expires_at = (
|
||||||
|
datetime.now(timezone.utc) + timedelta(days=expiry_days_float)
|
||||||
|
).isoformat()
|
||||||
|
set_user_expiry(username, expires_at, str(expiry_action))
|
||||||
|
increment_invite_use(invite_code)
|
||||||
|
token = create_access_token(username, "user")
|
||||||
|
return {"access_token": token, "token_type": "bearer", "user": {"username": username, "role": "user"}}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/password/reset")
|
||||||
|
async def request_password_reset(payload: dict) -> dict:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.password_reset_enabled:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Password reset disabled")
|
||||||
|
identifier = str(payload.get("identifier") or "").strip()
|
||||||
|
if not identifier:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Username or email required")
|
||||||
|
user = get_user_by_username(identifier)
|
||||||
|
if not user:
|
||||||
|
user = get_user_by_email(identifier)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
|
||||||
|
if user.get("auth_provider") != "local":
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Password reset for local users only")
|
||||||
|
token = secrets.token_urlsafe(32)
|
||||||
|
expires_at = (datetime.now(timezone.utc) + timedelta(hours=2)).isoformat()
|
||||||
|
create_password_reset(token, user["username"], expires_at)
|
||||||
|
contact = get_user_contact(user["username"])
|
||||||
|
email = contact.get("email") if isinstance(contact, dict) else None
|
||||||
|
if not runtime.notify_email_enabled or not email:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_400_BAD_REQUEST,
|
||||||
|
detail="Email notifications are not configured for password resets.",
|
||||||
|
)
|
||||||
|
await send_notification(
|
||||||
|
"Password reset request",
|
||||||
|
f"Your reset token is: {token}",
|
||||||
|
channels=["email"],
|
||||||
|
email=email,
|
||||||
|
)
|
||||||
|
return {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/password/reset/confirm")
|
||||||
|
async def confirm_password_reset(payload: dict) -> dict:
|
||||||
|
token = str(payload.get("token") or "").strip()
|
||||||
|
new_password = str(payload.get("new_password") or "").strip()
|
||||||
|
if not token or not new_password:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Token and new password required")
|
||||||
|
reset = get_password_reset(token)
|
||||||
|
if not reset:
|
||||||
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Reset token not found")
|
||||||
|
if reset.get("used_at"):
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Reset token already used")
|
||||||
|
try:
|
||||||
|
expires_at = datetime.fromisoformat(reset["expires_at"])
|
||||||
|
if expires_at <= datetime.now(timezone.utc):
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Reset token expired")
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
|
error = _validate_password(new_password)
|
||||||
|
if error:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=error)
|
||||||
|
set_user_password(reset["username"], new_password)
|
||||||
|
mark_password_reset_used(token)
|
||||||
|
return {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/signup/config")
|
||||||
|
async def signup_config() -> dict:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
return {
|
||||||
|
"invites_enabled": runtime.invites_enabled,
|
||||||
|
"captcha_provider": runtime.captcha_provider,
|
||||||
|
"hcaptcha_site_key": runtime.hcaptcha_site_key,
|
||||||
|
"recaptcha_site_key": runtime.recaptcha_site_key,
|
||||||
|
"turnstile_site_key": runtime.turnstile_site_key,
|
||||||
|
"password_min_length": runtime.password_min_length,
|
||||||
|
"password_require_upper": runtime.password_require_upper,
|
||||||
|
"password_require_lower": runtime.password_require_lower,
|
||||||
|
"password_require_number": runtime.password_require_number,
|
||||||
|
"password_require_symbol": runtime.password_require_symbol,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/referrals")
|
||||||
|
async def list_referrals(current_user: dict = Depends(get_current_user)) -> dict:
|
||||||
|
invites = list_invites_by_creator(current_user["username"], is_referral=True)
|
||||||
|
return {"invites": invites}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/referrals")
|
||||||
|
async def create_referral(current_user: dict = Depends(get_current_user)) -> dict:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.signup_allow_referrals:
|
||||||
|
raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Referrals are disabled")
|
||||||
|
code = secrets.token_urlsafe(8)
|
||||||
|
create_invite(
|
||||||
|
code=code,
|
||||||
|
created_by=current_user["username"],
|
||||||
|
profile_id=runtime.invite_default_profile_id,
|
||||||
|
expires_at=None,
|
||||||
|
max_uses=int(runtime.referral_default_uses or 1),
|
||||||
|
require_captcha=runtime.invites_require_captcha,
|
||||||
|
password_rules=None,
|
||||||
|
allow_referrals=False,
|
||||||
|
referral_uses=None,
|
||||||
|
user_expiry_days=None,
|
||||||
|
user_expiry_action=None,
|
||||||
|
is_referral=True,
|
||||||
|
)
|
||||||
|
return {"status": "ok", "code": code}
|
||||||
|
|||||||
@@ -11,10 +11,6 @@ router = APIRouter(prefix="/branding", tags=["branding"])
|
|||||||
_BRANDING_DIR = os.path.join(os.getcwd(), "data", "branding")
|
_BRANDING_DIR = os.path.join(os.getcwd(), "data", "branding")
|
||||||
_LOGO_PATH = os.path.join(_BRANDING_DIR, "logo.png")
|
_LOGO_PATH = os.path.join(_BRANDING_DIR, "logo.png")
|
||||||
_FAVICON_PATH = os.path.join(_BRANDING_DIR, "favicon.ico")
|
_FAVICON_PATH = os.path.join(_BRANDING_DIR, "favicon.ico")
|
||||||
_BUNDLED_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "assets", "branding"))
|
|
||||||
_BUNDLED_LOGO_PATH = os.path.join(_BUNDLED_DIR, "logo.png")
|
|
||||||
_BUNDLED_FAVICON_PATH = os.path.join(_BUNDLED_DIR, "favicon.ico")
|
|
||||||
_BRANDING_SOURCE = os.getenv("BRANDING_SOURCE", "bundled").lower()
|
|
||||||
|
|
||||||
|
|
||||||
def _ensure_branding_dir() -> None:
|
def _ensure_branding_dir() -> None:
|
||||||
@@ -45,18 +41,6 @@ def _ensure_default_branding() -> None:
|
|||||||
if os.path.exists(_LOGO_PATH) and os.path.exists(_FAVICON_PATH):
|
if os.path.exists(_LOGO_PATH) and os.path.exists(_FAVICON_PATH):
|
||||||
return
|
return
|
||||||
_ensure_branding_dir()
|
_ensure_branding_dir()
|
||||||
if not os.path.exists(_LOGO_PATH) and os.path.exists(_BUNDLED_LOGO_PATH):
|
|
||||||
try:
|
|
||||||
with open(_BUNDLED_LOGO_PATH, "rb") as source, open(_LOGO_PATH, "wb") as target:
|
|
||||||
target.write(source.read())
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
if not os.path.exists(_FAVICON_PATH) and os.path.exists(_BUNDLED_FAVICON_PATH):
|
|
||||||
try:
|
|
||||||
with open(_BUNDLED_FAVICON_PATH, "rb") as source, open(_FAVICON_PATH, "wb") as target:
|
|
||||||
target.write(source.read())
|
|
||||||
except OSError:
|
|
||||||
pass
|
|
||||||
if not os.path.exists(_LOGO_PATH):
|
if not os.path.exists(_LOGO_PATH):
|
||||||
image = Image.new("RGBA", (300, 300), (12, 18, 28, 255))
|
image = Image.new("RGBA", (300, 300), (12, 18, 28, 255))
|
||||||
draw = ImageDraw.Draw(image)
|
draw = ImageDraw.Draw(image)
|
||||||
@@ -81,32 +65,24 @@ def _ensure_default_branding() -> None:
|
|||||||
favicon.save(_FAVICON_PATH, format="ICO")
|
favicon.save(_FAVICON_PATH, format="ICO")
|
||||||
|
|
||||||
|
|
||||||
def _resolve_branding_paths() -> tuple[str, str]:
|
|
||||||
if _BRANDING_SOURCE == "data":
|
|
||||||
_ensure_default_branding()
|
|
||||||
return _LOGO_PATH, _FAVICON_PATH
|
|
||||||
if os.path.exists(_BUNDLED_LOGO_PATH) and os.path.exists(_BUNDLED_FAVICON_PATH):
|
|
||||||
return _BUNDLED_LOGO_PATH, _BUNDLED_FAVICON_PATH
|
|
||||||
_ensure_default_branding()
|
|
||||||
return _LOGO_PATH, _FAVICON_PATH
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/logo.png")
|
@router.get("/logo.png")
|
||||||
async def branding_logo() -> FileResponse:
|
async def branding_logo() -> FileResponse:
|
||||||
logo_path, _ = _resolve_branding_paths()
|
if not os.path.exists(_LOGO_PATH):
|
||||||
if not os.path.exists(logo_path):
|
_ensure_default_branding()
|
||||||
|
if not os.path.exists(_LOGO_PATH):
|
||||||
raise HTTPException(status_code=404, detail="Logo not found")
|
raise HTTPException(status_code=404, detail="Logo not found")
|
||||||
headers = {"Cache-Control": "no-store"}
|
headers = {"Cache-Control": "public, max-age=300"}
|
||||||
return FileResponse(logo_path, media_type="image/png", headers=headers)
|
return FileResponse(_LOGO_PATH, media_type="image/png", headers=headers)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/favicon.ico")
|
@router.get("/favicon.ico")
|
||||||
async def branding_favicon() -> FileResponse:
|
async def branding_favicon() -> FileResponse:
|
||||||
_, favicon_path = _resolve_branding_paths()
|
if not os.path.exists(_FAVICON_PATH):
|
||||||
if not os.path.exists(favicon_path):
|
_ensure_default_branding()
|
||||||
|
if not os.path.exists(_FAVICON_PATH):
|
||||||
raise HTTPException(status_code=404, detail="Favicon not found")
|
raise HTTPException(status_code=404, detail="Favicon not found")
|
||||||
headers = {"Cache-Control": "no-store"}
|
headers = {"Cache-Control": "public, max-age=300"}
|
||||||
return FileResponse(favicon_path, media_type="image/x-icon", headers=headers)
|
return FileResponse(_FAVICON_PATH, media_type="image/x-icon", headers=headers)
|
||||||
|
|
||||||
|
|
||||||
async def save_branding_image(file: UploadFile) -> Dict[str, Any]:
|
async def save_branding_image(file: UploadFile) -> Dict[str, Any]:
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import mimetypes
|
import mimetypes
|
||||||
import logging
|
|
||||||
from typing import Optional
|
|
||||||
from fastapi import APIRouter, HTTPException, Response
|
from fastapi import APIRouter, HTTPException, Response
|
||||||
from fastapi.responses import FileResponse, RedirectResponse
|
from fastapi.responses import FileResponse, RedirectResponse
|
||||||
import httpx
|
import httpx
|
||||||
@@ -13,7 +11,6 @@ router = APIRouter(prefix="/images", tags=["images"])
|
|||||||
|
|
||||||
_TMDB_BASE = "https://image.tmdb.org/t/p"
|
_TMDB_BASE = "https://image.tmdb.org/t/p"
|
||||||
_ALLOWED_SIZES = {"w92", "w154", "w185", "w342", "w500", "w780", "original"}
|
_ALLOWED_SIZES = {"w92", "w154", "w185", "w342", "w500", "w780", "original"}
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
def _safe_filename(path: str) -> str:
|
def _safe_filename(path: str) -> str:
|
||||||
@@ -22,35 +19,23 @@ def _safe_filename(path: str) -> str:
|
|||||||
safe = re.sub(r"[^A-Za-z0-9_.-]", "_", trimmed)
|
safe = re.sub(r"[^A-Za-z0-9_.-]", "_", trimmed)
|
||||||
return safe or "image"
|
return safe or "image"
|
||||||
|
|
||||||
def tmdb_cache_path(path: str, size: str) -> Optional[str]:
|
|
||||||
if not path or "://" in path or ".." in path:
|
|
||||||
return None
|
|
||||||
if not path.startswith("/"):
|
|
||||||
path = f"/{path}"
|
|
||||||
if size not in _ALLOWED_SIZES:
|
|
||||||
return None
|
|
||||||
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
|
||||||
return os.path.join(cache_dir, _safe_filename(path))
|
|
||||||
|
|
||||||
|
|
||||||
def is_tmdb_cached(path: str, size: str) -> bool:
|
|
||||||
file_path = tmdb_cache_path(path, size)
|
|
||||||
return bool(file_path and os.path.exists(file_path))
|
|
||||||
|
|
||||||
|
|
||||||
async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
async def cache_tmdb_image(path: str, size: str = "w342") -> bool:
|
||||||
if not path or "://" in path or ".." in path:
|
if not path or "://" in path or ".." in path:
|
||||||
return False
|
return False
|
||||||
|
if not path.startswith("/"):
|
||||||
|
path = f"/{path}"
|
||||||
|
if size not in _ALLOWED_SIZES:
|
||||||
|
return False
|
||||||
|
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
cache_mode = (runtime.artwork_cache_mode or "remote").lower()
|
||||||
if cache_mode != "cache":
|
if cache_mode != "cache":
|
||||||
return False
|
return False
|
||||||
|
|
||||||
file_path = tmdb_cache_path(path, size)
|
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
||||||
if not file_path:
|
os.makedirs(cache_dir, exist_ok=True)
|
||||||
return False
|
file_path = os.path.join(cache_dir, _safe_filename(path))
|
||||||
os.makedirs(os.path.dirname(file_path), exist_ok=True)
|
|
||||||
if os.path.exists(file_path):
|
if os.path.exists(file_path):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@@ -79,10 +64,9 @@ async def tmdb_image(path: str, size: str = "w342"):
|
|||||||
if cache_mode != "cache":
|
if cache_mode != "cache":
|
||||||
return RedirectResponse(url=url)
|
return RedirectResponse(url=url)
|
||||||
|
|
||||||
file_path = tmdb_cache_path(path, size)
|
cache_dir = os.path.join(os.getcwd(), "data", "artwork", "tmdb", size)
|
||||||
if not file_path:
|
os.makedirs(cache_dir, exist_ok=True)
|
||||||
raise HTTPException(status_code=400, detail="Invalid image path")
|
file_path = os.path.join(cache_dir, _safe_filename(path))
|
||||||
os.makedirs(os.path.dirname(file_path), exist_ok=True)
|
|
||||||
headers = {"Cache-Control": "public, max-age=86400"}
|
headers = {"Cache-Control": "public, max-age=86400"}
|
||||||
if os.path.exists(file_path):
|
if os.path.exists(file_path):
|
||||||
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
||||||
@@ -93,8 +77,6 @@ async def tmdb_image(path: str, size: str = "w342"):
|
|||||||
if os.path.exists(file_path):
|
if os.path.exists(file_path):
|
||||||
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
media_type = mimetypes.guess_type(file_path)[0] or "image/jpeg"
|
||||||
return FileResponse(file_path, media_type=media_type, headers=headers)
|
return FileResponse(file_path, media_type=media_type, headers=headers)
|
||||||
logger.warning("TMDB cache miss after fetch: path=%s size=%s", path, size)
|
raise HTTPException(status_code=502, detail="Image cache failed")
|
||||||
except (httpx.HTTPError, OSError) as exc:
|
except httpx.HTTPError as exc:
|
||||||
logger.warning("TMDB cache failed: path=%s size=%s error=%s", path, size, exc)
|
raise HTTPException(status_code=502, detail=f"Image fetch failed: {exc}") from exc
|
||||||
|
|
||||||
return RedirectResponse(url=url)
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,39 +0,0 @@
|
|||||||
from typing import Any, Dict
|
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends
|
|
||||||
|
|
||||||
from ..auth import get_current_user
|
|
||||||
from ..runtime import get_runtime_settings
|
|
||||||
|
|
||||||
router = APIRouter(prefix="/site", tags=["site"])
|
|
||||||
|
|
||||||
_BANNER_TONES = {"info", "warning", "error", "maintenance"}
|
|
||||||
|
|
||||||
|
|
||||||
def _build_site_info(include_changelog: bool) -> Dict[str, Any]:
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
banner_message = (runtime.site_banner_message or "").strip()
|
|
||||||
tone = (runtime.site_banner_tone or "info").strip().lower()
|
|
||||||
if tone not in _BANNER_TONES:
|
|
||||||
tone = "info"
|
|
||||||
info = {
|
|
||||||
"buildNumber": (runtime.site_build_number or "").strip(),
|
|
||||||
"banner": {
|
|
||||||
"enabled": bool(runtime.site_banner_enabled and banner_message),
|
|
||||||
"message": banner_message,
|
|
||||||
"tone": tone,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
if include_changelog:
|
|
||||||
info["changelog"] = (runtime.site_changelog or "").strip()
|
|
||||||
return info
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/public")
|
|
||||||
async def site_public() -> Dict[str, Any]:
|
|
||||||
return _build_site_info(False)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/info")
|
|
||||||
async def site_info(user: Dict[str, Any] = Depends(get_current_user)) -> Dict[str, Any]:
|
|
||||||
return _build_site_info(True)
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
from typing import Any, Dict
|
from typing import Any, Dict
|
||||||
import httpx
|
import httpx
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
from fastapi import APIRouter, Depends
|
||||||
|
|
||||||
from ..auth import get_current_user
|
from ..auth import get_current_user
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
@@ -93,42 +93,3 @@ async def services_status() -> Dict[str, Any]:
|
|||||||
overall = "degraded"
|
overall = "degraded"
|
||||||
|
|
||||||
return {"overall": overall, "services": services}
|
return {"overall": overall, "services": services}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/services/{service}/test")
|
|
||||||
async def test_service(service: str) -> Dict[str, Any]:
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
jellyseerr = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
|
||||||
sonarr = SonarrClient(runtime.sonarr_base_url, runtime.sonarr_api_key)
|
|
||||||
radarr = RadarrClient(runtime.radarr_base_url, runtime.radarr_api_key)
|
|
||||||
prowlarr = ProwlarrClient(runtime.prowlarr_base_url, runtime.prowlarr_api_key)
|
|
||||||
qbittorrent = QBittorrentClient(
|
|
||||||
runtime.qbittorrent_base_url, runtime.qbittorrent_username, runtime.qbittorrent_password
|
|
||||||
)
|
|
||||||
jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
|
||||||
|
|
||||||
service_key = service.strip().lower()
|
|
||||||
checks = {
|
|
||||||
"jellyseerr": (
|
|
||||||
"Jellyseerr",
|
|
||||||
jellyseerr.configured(),
|
|
||||||
lambda: jellyseerr.get_recent_requests(take=1, skip=0),
|
|
||||||
),
|
|
||||||
"sonarr": ("Sonarr", sonarr.configured(), sonarr.get_system_status),
|
|
||||||
"radarr": ("Radarr", radarr.configured(), radarr.get_system_status),
|
|
||||||
"prowlarr": ("Prowlarr", prowlarr.configured(), prowlarr.get_health),
|
|
||||||
"qbittorrent": ("qBittorrent", qbittorrent.configured(), qbittorrent.get_app_version),
|
|
||||||
"jellyfin": ("Jellyfin", jellyfin.configured(), jellyfin.get_system_info),
|
|
||||||
}
|
|
||||||
|
|
||||||
if service_key not in checks:
|
|
||||||
raise HTTPException(status_code=404, detail="Unknown service")
|
|
||||||
|
|
||||||
name, configured, func = checks[service_key]
|
|
||||||
result = await _check(name, configured, func)
|
|
||||||
if name == "Prowlarr" and result.get("status") == "up":
|
|
||||||
health = result.get("detail")
|
|
||||||
if isinstance(health, list) and health:
|
|
||||||
result["status"] = "degraded"
|
|
||||||
result["message"] = "Health warnings"
|
|
||||||
return result
|
|
||||||
|
|||||||
@@ -2,19 +2,44 @@ from .config import settings
|
|||||||
from .db import get_settings_overrides
|
from .db import get_settings_overrides
|
||||||
|
|
||||||
_INT_FIELDS = {
|
_INT_FIELDS = {
|
||||||
|
"expiry_check_interval_minutes",
|
||||||
|
"expiry_default_days",
|
||||||
|
"expiry_warning_days",
|
||||||
"sonarr_quality_profile_id",
|
"sonarr_quality_profile_id",
|
||||||
"radarr_quality_profile_id",
|
"radarr_quality_profile_id",
|
||||||
|
"invite_default_profile_id",
|
||||||
|
"referral_default_uses",
|
||||||
"jwt_exp_minutes",
|
"jwt_exp_minutes",
|
||||||
"requests_sync_ttl_minutes",
|
"requests_sync_ttl_minutes",
|
||||||
"requests_poll_interval_seconds",
|
"requests_poll_interval_seconds",
|
||||||
"requests_delta_sync_interval_minutes",
|
"requests_delta_sync_interval_minutes",
|
||||||
"requests_cleanup_days",
|
"requests_cleanup_days",
|
||||||
|
"smtp_port",
|
||||||
|
"jellyseerr_sync_interval_minutes",
|
||||||
|
"password_min_length",
|
||||||
}
|
}
|
||||||
_BOOL_FIELDS = {
|
_BOOL_FIELDS = {
|
||||||
|
"invites_enabled",
|
||||||
|
"invites_require_captcha",
|
||||||
|
"signup_allow_referrals",
|
||||||
|
"password_require_upper",
|
||||||
|
"password_require_lower",
|
||||||
|
"password_require_number",
|
||||||
|
"password_require_symbol",
|
||||||
|
"password_reset_enabled",
|
||||||
|
"smtp_tls",
|
||||||
|
"smtp_starttls",
|
||||||
|
"notify_email_enabled",
|
||||||
|
"notify_discord_enabled",
|
||||||
|
"notify_telegram_enabled",
|
||||||
|
"notify_matrix_enabled",
|
||||||
|
"notify_pushover_enabled",
|
||||||
|
"notify_pushbullet_enabled",
|
||||||
|
"notify_gotify_enabled",
|
||||||
|
"notify_ntfy_enabled",
|
||||||
"jellyfin_sync_to_arr",
|
"jellyfin_sync_to_arr",
|
||||||
"site_banner_enabled",
|
"jellyseerr_sync_users",
|
||||||
}
|
}
|
||||||
_SKIP_OVERRIDE_FIELDS = {"site_build_number", "site_changelog"}
|
|
||||||
|
|
||||||
|
|
||||||
def get_runtime_settings():
|
def get_runtime_settings():
|
||||||
@@ -23,8 +48,6 @@ def get_runtime_settings():
|
|||||||
for key, value in overrides.items():
|
for key, value in overrides.items():
|
||||||
if value is None:
|
if value is None:
|
||||||
continue
|
continue
|
||||||
if key in _SKIP_OVERRIDE_FIELDS:
|
|
||||||
continue
|
|
||||||
if key in _INT_FIELDS:
|
if key in _INT_FIELDS:
|
||||||
try:
|
try:
|
||||||
update[key] = int(value)
|
update[key] = int(value)
|
||||||
|
|||||||
43
backend/app/services/captcha.py
Normal file
43
backend/app/services/captcha.py
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
|
||||||
|
from ..runtime import get_runtime_settings
|
||||||
|
|
||||||
|
|
||||||
|
async def verify_captcha(token: Optional[str], remote_ip: Optional[str] = None) -> bool:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
provider = (runtime.captcha_provider or "none").strip().lower()
|
||||||
|
if provider in {"", "none", "off", "disabled"}:
|
||||||
|
return True
|
||||||
|
if not token:
|
||||||
|
return False
|
||||||
|
|
||||||
|
if provider == "hcaptcha":
|
||||||
|
secret = runtime.hcaptcha_secret_key
|
||||||
|
url = "https://hcaptcha.com/siteverify"
|
||||||
|
payload = {"secret": secret, "response": token}
|
||||||
|
elif provider == "recaptcha":
|
||||||
|
secret = runtime.recaptcha_secret_key
|
||||||
|
url = "https://www.google.com/recaptcha/api/siteverify"
|
||||||
|
payload = {"secret": secret, "response": token}
|
||||||
|
elif provider == "turnstile":
|
||||||
|
secret = runtime.turnstile_secret_key
|
||||||
|
url = "https://challenges.cloudflare.com/turnstile/v0/siteverify"
|
||||||
|
payload = {"secret": secret, "response": token}
|
||||||
|
else:
|
||||||
|
return False
|
||||||
|
|
||||||
|
if not secret:
|
||||||
|
return False
|
||||||
|
if remote_ip:
|
||||||
|
payload["remoteip"] = remote_ip
|
||||||
|
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post(url, data=payload)
|
||||||
|
response.raise_for_status()
|
||||||
|
data = response.json()
|
||||||
|
return bool(data.get("success"))
|
||||||
|
except httpx.HTTPError:
|
||||||
|
return False
|
||||||
47
backend/app/services/expiry.py
Normal file
47
backend/app/services/expiry.py
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
import asyncio
|
||||||
|
import logging
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
|
||||||
|
from ..db import (
|
||||||
|
get_users_expiring_by,
|
||||||
|
get_expired_users,
|
||||||
|
get_user_contact,
|
||||||
|
mark_expiry_warning_sent,
|
||||||
|
mark_expiry_disabled,
|
||||||
|
mark_expiry_deleted,
|
||||||
|
set_user_blocked,
|
||||||
|
delete_user,
|
||||||
|
)
|
||||||
|
from ..runtime import get_runtime_settings
|
||||||
|
from .notifications import send_notification
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
async def run_expiry_loop() -> None:
|
||||||
|
while True:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
|
warn_days = int(runtime.expiry_warning_days or 0)
|
||||||
|
if warn_days > 0:
|
||||||
|
cutoff = (now + timedelta(days=warn_days)).isoformat()
|
||||||
|
for user in get_users_expiring_by(cutoff):
|
||||||
|
contact = get_user_contact(user["username"]) or {}
|
||||||
|
email = contact.get("email")
|
||||||
|
await send_notification(
|
||||||
|
"Account expiring soon",
|
||||||
|
f"Your account expires on {user['expires_at']}.",
|
||||||
|
channels=["email"] if email else [],
|
||||||
|
email=email,
|
||||||
|
)
|
||||||
|
mark_expiry_warning_sent(user["username"])
|
||||||
|
for expired in get_expired_users(now.isoformat()):
|
||||||
|
action = (expired.get("action") or "disable").lower()
|
||||||
|
if action in {"disable", "disable_then_delete"}:
|
||||||
|
set_user_blocked(expired["username"], True)
|
||||||
|
mark_expiry_disabled(expired["username"])
|
||||||
|
if action in {"delete", "disable_then_delete"}:
|
||||||
|
delete_user(expired["username"])
|
||||||
|
mark_expiry_deleted(expired["username"])
|
||||||
|
delay = max(60, int(runtime.expiry_check_interval_minutes or 60) * 60)
|
||||||
|
await asyncio.sleep(delay)
|
||||||
@@ -3,14 +3,8 @@ import logging
|
|||||||
from fastapi import HTTPException
|
from fastapi import HTTPException
|
||||||
|
|
||||||
from ..clients.jellyfin import JellyfinClient
|
from ..clients.jellyfin import JellyfinClient
|
||||||
from ..db import create_user_if_missing, set_user_jellyseerr_id
|
from ..db import create_user_if_missing
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from .user_cache import (
|
|
||||||
build_jellyseerr_candidate_map,
|
|
||||||
get_cached_jellyseerr_users,
|
|
||||||
match_jellyseerr_user_id,
|
|
||||||
save_jellyfin_users_cache,
|
|
||||||
)
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -23,9 +17,6 @@ async def sync_jellyfin_users() -> int:
|
|||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if not isinstance(users, list):
|
if not isinstance(users, list):
|
||||||
return 0
|
return 0
|
||||||
save_jellyfin_users_cache(users)
|
|
||||||
jellyseerr_users = get_cached_jellyseerr_users()
|
|
||||||
candidate_map = build_jellyseerr_candidate_map(jellyseerr_users or [])
|
|
||||||
imported = 0
|
imported = 0
|
||||||
for user in users:
|
for user in users:
|
||||||
if not isinstance(user, dict):
|
if not isinstance(user, dict):
|
||||||
@@ -33,18 +24,8 @@ async def sync_jellyfin_users() -> int:
|
|||||||
name = user.get("Name")
|
name = user.get("Name")
|
||||||
if not name:
|
if not name:
|
||||||
continue
|
continue
|
||||||
matched_id = match_jellyseerr_user_id(name, candidate_map) if candidate_map else None
|
if create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin"):
|
||||||
created = create_user_if_missing(
|
|
||||||
name,
|
|
||||||
"jellyfin-user",
|
|
||||||
role="user",
|
|
||||||
auth_provider="jellyfin",
|
|
||||||
jellyseerr_user_id=matched_id,
|
|
||||||
)
|
|
||||||
if created:
|
|
||||||
imported += 1
|
imported += 1
|
||||||
elif matched_id is not None:
|
|
||||||
set_user_jellyseerr_id(name, matched_id)
|
|
||||||
return imported
|
return imported
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
56
backend/app/services/jellyseerr_sync.py
Normal file
56
backend/app/services/jellyseerr_sync.py
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import asyncio
|
||||||
|
import logging
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from fastapi import HTTPException
|
||||||
|
|
||||||
|
from ..clients.jellyseerr import JellyseerrClient
|
||||||
|
from ..db import create_user_if_missing, upsert_user_contact
|
||||||
|
from ..runtime import get_runtime_settings
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
async def sync_jellyseerr_users() -> int:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.jellyseerr_base_url or not runtime.jellyseerr_api_key:
|
||||||
|
raise HTTPException(status_code=400, detail="Jellyseerr not configured")
|
||||||
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
|
take = 50
|
||||||
|
skip = 0
|
||||||
|
imported = 0
|
||||||
|
while True:
|
||||||
|
data = await client.get_users(take=take, skip=skip)
|
||||||
|
if not isinstance(data, dict):
|
||||||
|
break
|
||||||
|
results = data.get("results")
|
||||||
|
if not isinstance(results, list) or not results:
|
||||||
|
break
|
||||||
|
for user in results:
|
||||||
|
if not isinstance(user, dict):
|
||||||
|
continue
|
||||||
|
username = user.get("username") or user.get("email") or user.get("displayName")
|
||||||
|
if not isinstance(username, str) or not username.strip():
|
||||||
|
continue
|
||||||
|
email = user.get("email") if isinstance(user.get("email"), str) else None
|
||||||
|
if create_user_if_missing(username.strip(), "jellyseerr-user", role="user", auth_provider="jellyseerr"):
|
||||||
|
imported += 1
|
||||||
|
if email:
|
||||||
|
upsert_user_contact(username.strip(), email=email.strip())
|
||||||
|
skip += take
|
||||||
|
return imported
|
||||||
|
|
||||||
|
|
||||||
|
async def run_jellyseerr_sync_loop() -> None:
|
||||||
|
while True:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if runtime.jellyseerr_sync_users:
|
||||||
|
try:
|
||||||
|
imported = await sync_jellyseerr_users()
|
||||||
|
logger.info("Jellyseerr sync complete: imported=%s", imported)
|
||||||
|
except HTTPException as exc:
|
||||||
|
logger.warning("Jellyseerr sync skipped: %s", exc.detail)
|
||||||
|
except Exception:
|
||||||
|
logger.exception("Jellyseerr sync failed")
|
||||||
|
delay = max(60, int(runtime.jellyseerr_sync_interval_minutes or 1440) * 60)
|
||||||
|
await asyncio.sleep(delay)
|
||||||
216
backend/app/services/notifications.py
Normal file
216
backend/app/services/notifications.py
Normal file
@@ -0,0 +1,216 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import Iterable, Optional
|
||||||
|
import asyncio
|
||||||
|
import logging
|
||||||
|
import smtplib
|
||||||
|
from email.message import EmailMessage
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
|
||||||
|
from ..db import log_notification
|
||||||
|
from ..runtime import get_runtime_settings
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def _normalize_channels(channels: Optional[Iterable[str]]) -> list[str]:
|
||||||
|
if not channels:
|
||||||
|
return []
|
||||||
|
return [str(channel).strip().lower() for channel in channels if str(channel).strip()]
|
||||||
|
|
||||||
|
|
||||||
|
def _send_email_sync(
|
||||||
|
smtp_host: str,
|
||||||
|
smtp_port: int,
|
||||||
|
smtp_user: Optional[str],
|
||||||
|
smtp_password: Optional[str],
|
||||||
|
smtp_from: str,
|
||||||
|
to_address: str,
|
||||||
|
subject: str,
|
||||||
|
body: str,
|
||||||
|
use_tls: bool,
|
||||||
|
use_starttls: bool,
|
||||||
|
) -> None:
|
||||||
|
message = EmailMessage()
|
||||||
|
message["From"] = smtp_from
|
||||||
|
message["To"] = to_address
|
||||||
|
message["Subject"] = subject
|
||||||
|
message.set_content(body)
|
||||||
|
|
||||||
|
if use_tls:
|
||||||
|
with smtplib.SMTP_SSL(smtp_host, smtp_port, timeout=10) as server:
|
||||||
|
if smtp_user and smtp_password:
|
||||||
|
server.login(smtp_user, smtp_password)
|
||||||
|
server.send_message(message)
|
||||||
|
else:
|
||||||
|
with smtplib.SMTP(smtp_host, smtp_port, timeout=10) as server:
|
||||||
|
if use_starttls:
|
||||||
|
server.starttls()
|
||||||
|
if smtp_user and smtp_password:
|
||||||
|
server.login(smtp_user, smtp_password)
|
||||||
|
server.send_message(message)
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_email(to_address: str, subject: str, body: str) -> None:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.notify_email_enabled:
|
||||||
|
raise RuntimeError("Email notifications disabled")
|
||||||
|
if not runtime.smtp_host or not runtime.smtp_from:
|
||||||
|
raise RuntimeError("SMTP not configured")
|
||||||
|
await asyncio.to_thread(
|
||||||
|
_send_email_sync,
|
||||||
|
runtime.smtp_host,
|
||||||
|
int(runtime.smtp_port or 587),
|
||||||
|
runtime.smtp_user,
|
||||||
|
runtime.smtp_password,
|
||||||
|
runtime.smtp_from,
|
||||||
|
to_address,
|
||||||
|
subject,
|
||||||
|
body,
|
||||||
|
bool(runtime.smtp_tls),
|
||||||
|
bool(runtime.smtp_starttls),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_discord(subject: str, body: str) -> None:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.notify_discord_enabled:
|
||||||
|
raise RuntimeError("Discord notifications disabled")
|
||||||
|
if not runtime.discord_webhook_url:
|
||||||
|
raise RuntimeError("Discord webhook not configured")
|
||||||
|
payload = {"content": f"**{subject}**\n{body}"}
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post(runtime.discord_webhook_url, json=payload)
|
||||||
|
response.raise_for_status()
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_telegram(subject: str, body: str, chat_id: Optional[str]) -> None:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.notify_telegram_enabled:
|
||||||
|
raise RuntimeError("Telegram notifications disabled")
|
||||||
|
if not runtime.telegram_bot_token:
|
||||||
|
raise RuntimeError("Telegram bot token not configured")
|
||||||
|
target_chat = chat_id or runtime.telegram_chat_id
|
||||||
|
if not target_chat:
|
||||||
|
raise RuntimeError("Telegram chat ID not configured")
|
||||||
|
url = f"https://api.telegram.org/bot{runtime.telegram_bot_token}/sendMessage"
|
||||||
|
payload = {"chat_id": target_chat, "text": f"{subject}\n{body}"}
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post(url, json=payload)
|
||||||
|
response.raise_for_status()
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_matrix(subject: str, body: str) -> None:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.notify_matrix_enabled:
|
||||||
|
raise RuntimeError("Matrix notifications disabled")
|
||||||
|
if not runtime.matrix_homeserver or not runtime.matrix_access_token or not runtime.matrix_room_id:
|
||||||
|
raise RuntimeError("Matrix not configured")
|
||||||
|
url = (
|
||||||
|
f"{runtime.matrix_homeserver}/_matrix/client/v3/rooms/"
|
||||||
|
f"{runtime.matrix_room_id}/send/m.room.message"
|
||||||
|
)
|
||||||
|
payload = {"msgtype": "m.text", "body": f"{subject}\n{body}"}
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post(url, json=payload, params={"access_token": runtime.matrix_access_token})
|
||||||
|
response.raise_for_status()
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_pushover(subject: str, body: str) -> None:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.notify_pushover_enabled:
|
||||||
|
raise RuntimeError("Pushover notifications disabled")
|
||||||
|
if not runtime.pushover_token or not runtime.pushover_user_key:
|
||||||
|
raise RuntimeError("Pushover not configured")
|
||||||
|
payload = {
|
||||||
|
"token": runtime.pushover_token,
|
||||||
|
"user": runtime.pushover_user_key,
|
||||||
|
"title": subject,
|
||||||
|
"message": body,
|
||||||
|
}
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post("https://api.pushover.net/1/messages.json", data=payload)
|
||||||
|
response.raise_for_status()
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_pushbullet(subject: str, body: str) -> None:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.notify_pushbullet_enabled:
|
||||||
|
raise RuntimeError("Pushbullet notifications disabled")
|
||||||
|
if not runtime.pushbullet_token:
|
||||||
|
raise RuntimeError("Pushbullet not configured")
|
||||||
|
payload = {"type": "note", "title": subject, "body": body}
|
||||||
|
headers = {"Access-Token": runtime.pushbullet_token}
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post("https://api.pushbullet.com/v2/pushes", json=payload, headers=headers)
|
||||||
|
response.raise_for_status()
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_gotify(subject: str, body: str) -> None:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.notify_gotify_enabled:
|
||||||
|
raise RuntimeError("Gotify notifications disabled")
|
||||||
|
if not runtime.gotify_url or not runtime.gotify_token:
|
||||||
|
raise RuntimeError("Gotify not configured")
|
||||||
|
payload = {"title": subject, "message": body, "priority": 5}
|
||||||
|
url = f"{runtime.gotify_url.rstrip('/')}/message"
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post(url, params={"token": runtime.gotify_token}, json=payload)
|
||||||
|
response.raise_for_status()
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_ntfy(subject: str, body: str) -> None:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
if not runtime.notify_ntfy_enabled:
|
||||||
|
raise RuntimeError("ntfy notifications disabled")
|
||||||
|
if not runtime.ntfy_url or not runtime.ntfy_topic:
|
||||||
|
raise RuntimeError("ntfy not configured")
|
||||||
|
url = f"{runtime.ntfy_url.rstrip('/')}/{runtime.ntfy_topic}"
|
||||||
|
headers = {"Title": subject}
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post(url, content=body.encode("utf-8"), headers=headers)
|
||||||
|
response.raise_for_status()
|
||||||
|
|
||||||
|
|
||||||
|
async def send_notification(
|
||||||
|
subject: str,
|
||||||
|
body: str,
|
||||||
|
channels: Optional[Iterable[str]] = None,
|
||||||
|
email: Optional[str] = None,
|
||||||
|
telegram_chat_id: Optional[str] = None,
|
||||||
|
) -> dict[str, str]:
|
||||||
|
requested = _normalize_channels(channels)
|
||||||
|
results: dict[str, str] = {}
|
||||||
|
if not requested:
|
||||||
|
return results
|
||||||
|
for channel in requested:
|
||||||
|
try:
|
||||||
|
if channel == "email":
|
||||||
|
if not email:
|
||||||
|
raise RuntimeError("Email address not provided")
|
||||||
|
await _send_email(email, subject, body)
|
||||||
|
elif channel == "discord":
|
||||||
|
await _send_discord(subject, body)
|
||||||
|
elif channel == "telegram":
|
||||||
|
await _send_telegram(subject, body, telegram_chat_id)
|
||||||
|
elif channel == "matrix":
|
||||||
|
await _send_matrix(subject, body)
|
||||||
|
elif channel == "pushover":
|
||||||
|
await _send_pushover(subject, body)
|
||||||
|
elif channel == "pushbullet":
|
||||||
|
await _send_pushbullet(subject, body)
|
||||||
|
elif channel == "gotify":
|
||||||
|
await _send_gotify(subject, body)
|
||||||
|
elif channel == "ntfy":
|
||||||
|
await _send_ntfy(subject, body)
|
||||||
|
else:
|
||||||
|
results[channel] = "unsupported"
|
||||||
|
continue
|
||||||
|
results[channel] = "sent"
|
||||||
|
log_notification(channel, email or telegram_chat_id, "sent", None)
|
||||||
|
except Exception as exc: # noqa: BLE001
|
||||||
|
logger.warning("Notification failed: channel=%s error=%s", channel, exc)
|
||||||
|
results[channel] = "failed"
|
||||||
|
log_notification(channel, email or telegram_chat_id, "failed", str(exc))
|
||||||
|
return results
|
||||||
@@ -11,21 +11,9 @@ from ..clients.radarr import RadarrClient
|
|||||||
from ..clients.prowlarr import ProwlarrClient
|
from ..clients.prowlarr import ProwlarrClient
|
||||||
from ..clients.qbittorrent import QBittorrentClient
|
from ..clients.qbittorrent import QBittorrentClient
|
||||||
from ..runtime import get_runtime_settings
|
from ..runtime import get_runtime_settings
|
||||||
from ..db import (
|
from ..db import save_snapshot, get_request_cache_payload
|
||||||
save_snapshot,
|
|
||||||
get_request_cache_payload,
|
|
||||||
get_request_cache_by_id,
|
|
||||||
get_recent_snapshots,
|
|
||||||
get_setting,
|
|
||||||
set_setting,
|
|
||||||
)
|
|
||||||
from ..models import ActionOption, NormalizedState, RequestType, Snapshot, TimelineHop
|
from ..models import ActionOption, NormalizedState, RequestType, Snapshot, TimelineHop
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
JELLYFIN_SCAN_COOLDOWN_SECONDS = 300
|
|
||||||
_jellyfin_scan_key = "jellyfin_scan_last_at"
|
|
||||||
|
|
||||||
|
|
||||||
STATUS_LABELS = {
|
STATUS_LABELS = {
|
||||||
1: "Waiting for approval",
|
1: "Waiting for approval",
|
||||||
@@ -53,35 +41,6 @@ def _pick_first(value: Any) -> Optional[Dict[str, Any]]:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
async def _maybe_refresh_jellyfin(snapshot: Snapshot) -> None:
|
|
||||||
if snapshot.state not in {NormalizedState.available, NormalizedState.completed}:
|
|
||||||
return
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
client = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
|
||||||
if not client.configured():
|
|
||||||
return
|
|
||||||
last_scan = get_setting(_jellyfin_scan_key)
|
|
||||||
if last_scan:
|
|
||||||
try:
|
|
||||||
parsed = datetime.fromisoformat(last_scan.replace("Z", "+00:00"))
|
|
||||||
if (datetime.now(timezone.utc) - parsed).total_seconds() < JELLYFIN_SCAN_COOLDOWN_SECONDS:
|
|
||||||
return
|
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
previous = await asyncio.to_thread(get_recent_snapshots, snapshot.request_id, 1)
|
|
||||||
if previous:
|
|
||||||
prev_state = previous[0].get("state")
|
|
||||||
if prev_state in {NormalizedState.available.value, NormalizedState.completed.value}:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
await client.refresh_library()
|
|
||||||
except Exception as exc:
|
|
||||||
logger.warning("Jellyfin library refresh failed: %s", exc)
|
|
||||||
return
|
|
||||||
set_setting(_jellyfin_scan_key, datetime.now(timezone.utc).isoformat())
|
|
||||||
logger.info("Jellyfin library refresh triggered: request_id=%s", snapshot.request_id)
|
|
||||||
|
|
||||||
|
|
||||||
def _queue_records(queue: Any) -> List[Dict[str, Any]]:
|
def _queue_records(queue: Any) -> List[Dict[str, Any]]:
|
||||||
if isinstance(queue, dict):
|
if isinstance(queue, dict):
|
||||||
records = queue.get("records")
|
records = queue.get("records")
|
||||||
@@ -226,21 +185,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
logging.getLogger(__name__).debug(
|
logging.getLogger(__name__).debug(
|
||||||
"snapshot cache miss: request_id=%s mode=%s", request_id, mode
|
"snapshot cache miss: request_id=%s mode=%s", request_id, mode
|
||||||
)
|
)
|
||||||
if cached_request is not None:
|
|
||||||
cache_meta = get_request_cache_by_id(int(request_id))
|
|
||||||
cached_title = cache_meta.get("title") if cache_meta else None
|
|
||||||
if cached_title and isinstance(cached_request, dict):
|
|
||||||
media = cached_request.get("media")
|
|
||||||
if not isinstance(media, dict):
|
|
||||||
media = {}
|
|
||||||
cached_request["media"] = media
|
|
||||||
if not media.get("title") and not media.get("name"):
|
|
||||||
media["title"] = cached_title
|
|
||||||
media["name"] = cached_title
|
|
||||||
if not cached_request.get("title") and not cached_request.get("name"):
|
|
||||||
cached_request["title"] = cached_title
|
|
||||||
|
|
||||||
allow_remote = mode == "always_js" and jellyseerr.configured()
|
|
||||||
if not jellyseerr.configured() and not cached_request:
|
if not jellyseerr.configured() and not cached_request:
|
||||||
timeline.append(TimelineHop(service="Jellyseerr", status="not_configured"))
|
timeline.append(TimelineHop(service="Jellyseerr", status="not_configured"))
|
||||||
timeline.append(TimelineHop(service="Sonarr/Radarr", status="not_configured"))
|
timeline.append(TimelineHop(service="Sonarr/Radarr", status="not_configured"))
|
||||||
@@ -248,15 +193,9 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
timeline.append(TimelineHop(service="qBittorrent", status="not_configured"))
|
timeline.append(TimelineHop(service="qBittorrent", status="not_configured"))
|
||||||
snapshot.timeline = timeline
|
snapshot.timeline = timeline
|
||||||
return snapshot
|
return snapshot
|
||||||
if cached_request is None and not allow_remote:
|
|
||||||
timeline.append(TimelineHop(service="Jellyseerr", status="cache_miss"))
|
|
||||||
snapshot.timeline = timeline
|
|
||||||
snapshot.state = NormalizedState.unknown
|
|
||||||
snapshot.state_reason = "Request not found in cache"
|
|
||||||
return snapshot
|
|
||||||
|
|
||||||
jelly_request = cached_request
|
jelly_request = cached_request
|
||||||
if allow_remote and (jelly_request is None or mode == "always_js"):
|
if (jelly_request is None or mode == "always_js") and jellyseerr.configured():
|
||||||
try:
|
try:
|
||||||
jelly_request = await jellyseerr.get_request(request_id)
|
jelly_request = await jellyseerr.get_request(request_id)
|
||||||
logging.getLogger(__name__).debug(
|
logging.getLogger(__name__).debug(
|
||||||
@@ -279,25 +218,17 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
jelly_status = jelly_request.get("status", "unknown")
|
jelly_status = jelly_request.get("status", "unknown")
|
||||||
jelly_status_label = _status_label(jelly_status)
|
jelly_status_label = _status_label(jelly_status)
|
||||||
jelly_type = jelly_request.get("type") or "unknown"
|
jelly_type = jelly_request.get("type") or "unknown"
|
||||||
media = jelly_request.get("media", {}) if isinstance(jelly_request, dict) else {}
|
snapshot.title = jelly_request.get("media", {}).get("title", "Unknown")
|
||||||
if not isinstance(media, dict):
|
snapshot.year = jelly_request.get("media", {}).get("year")
|
||||||
media = {}
|
|
||||||
snapshot.title = (
|
|
||||||
media.get("title")
|
|
||||||
or media.get("name")
|
|
||||||
or jelly_request.get("title")
|
|
||||||
or jelly_request.get("name")
|
|
||||||
or "Unknown"
|
|
||||||
)
|
|
||||||
snapshot.year = media.get("year") or jelly_request.get("year")
|
|
||||||
snapshot.request_type = RequestType(jelly_type) if jelly_type in {"movie", "tv"} else RequestType.unknown
|
snapshot.request_type = RequestType(jelly_type) if jelly_type in {"movie", "tv"} else RequestType.unknown
|
||||||
|
media = jelly_request.get("media", {}) if isinstance(jelly_request, dict) else {}
|
||||||
poster_path = None
|
poster_path = None
|
||||||
backdrop_path = None
|
backdrop_path = None
|
||||||
if isinstance(media, dict):
|
if isinstance(media, dict):
|
||||||
poster_path = media.get("posterPath") or media.get("poster_path")
|
poster_path = media.get("posterPath") or media.get("poster_path")
|
||||||
backdrop_path = media.get("backdropPath") or media.get("backdrop_path")
|
backdrop_path = media.get("backdropPath") or media.get("backdrop_path")
|
||||||
|
|
||||||
if snapshot.title in {None, "", "Unknown"} and allow_remote:
|
if snapshot.title in {None, "", "Unknown"} and jellyseerr.configured():
|
||||||
tmdb_id = jelly_request.get("media", {}).get("tmdbId")
|
tmdb_id = jelly_request.get("media", {}).get("tmdbId")
|
||||||
if tmdb_id:
|
if tmdb_id:
|
||||||
try:
|
try:
|
||||||
@@ -450,6 +381,10 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
|
|
||||||
if arr_state is None:
|
if arr_state is None:
|
||||||
arr_state = "unknown"
|
arr_state = "unknown"
|
||||||
|
if arr_state == "missing" and media_status_code in {4}:
|
||||||
|
arr_state = "available"
|
||||||
|
elif arr_state == "missing" and media_status_code in {6}:
|
||||||
|
arr_state = "added"
|
||||||
|
|
||||||
timeline.append(TimelineHop(service="Sonarr/Radarr", status=arr_state, details=arr_details))
|
timeline.append(TimelineHop(service="Sonarr/Radarr", status=arr_state, details=arr_details))
|
||||||
|
|
||||||
@@ -589,7 +524,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
snapshot.state_reason = "Waiting for download to start in qBittorrent."
|
snapshot.state_reason = "Waiting for download to start in qBittorrent."
|
||||||
elif arr_state == "missing" and derived_approved:
|
elif arr_state == "missing" and derived_approved:
|
||||||
snapshot.state = NormalizedState.needs_add
|
snapshot.state = NormalizedState.needs_add
|
||||||
snapshot.state_reason = "Approved, but not yet added to Sonarr/Radarr."
|
snapshot.state_reason = "Approved, but not added to the library yet."
|
||||||
elif arr_state == "searching":
|
elif arr_state == "searching":
|
||||||
snapshot.state = NormalizedState.searching
|
snapshot.state = NormalizedState.searching
|
||||||
snapshot.state_reason = "Searching for a matching release."
|
snapshot.state_reason = "Searching for a matching release."
|
||||||
@@ -613,7 +548,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
actions.append(
|
actions.append(
|
||||||
ActionOption(
|
ActionOption(
|
||||||
id="readd_to_arr",
|
id="readd_to_arr",
|
||||||
label="Push to Sonarr/Radarr",
|
label="Add to the library queue (Sonarr/Radarr)",
|
||||||
risk="medium",
|
risk="medium",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -669,6 +604,5 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
await _maybe_refresh_jellyfin(snapshot)
|
|
||||||
await asyncio.to_thread(save_snapshot, snapshot)
|
await asyncio.to_thread(save_snapshot, snapshot)
|
||||||
return snapshot
|
return snapshot
|
||||||
|
|||||||
@@ -1,144 +0,0 @@
|
|||||||
import json
|
|
||||||
import logging
|
|
||||||
from datetime import datetime, timezone, timedelta
|
|
||||||
from typing import Any, Dict, List, Optional
|
|
||||||
|
|
||||||
from ..db import get_setting, set_setting
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
JELLYSEERR_CACHE_KEY = "jellyseerr_users_cache"
|
|
||||||
JELLYSEERR_CACHE_AT_KEY = "jellyseerr_users_cached_at"
|
|
||||||
JELLYFIN_CACHE_KEY = "jellyfin_users_cache"
|
|
||||||
JELLYFIN_CACHE_AT_KEY = "jellyfin_users_cached_at"
|
|
||||||
|
|
||||||
|
|
||||||
def _now_iso() -> str:
|
|
||||||
return datetime.now(timezone.utc).isoformat()
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_iso(value: Optional[str]) -> Optional[datetime]:
|
|
||||||
if not value:
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
parsed = datetime.fromisoformat(value)
|
|
||||||
except ValueError:
|
|
||||||
return None
|
|
||||||
if parsed.tzinfo is None:
|
|
||||||
parsed = parsed.replace(tzinfo=timezone.utc)
|
|
||||||
return parsed
|
|
||||||
|
|
||||||
|
|
||||||
def _cache_is_fresh(cached_at: Optional[str], max_age_minutes: int) -> bool:
|
|
||||||
parsed = _parse_iso(cached_at)
|
|
||||||
if not parsed:
|
|
||||||
return False
|
|
||||||
age = datetime.now(timezone.utc) - parsed
|
|
||||||
return age <= timedelta(minutes=max_age_minutes)
|
|
||||||
|
|
||||||
|
|
||||||
def _load_cached_users(
|
|
||||||
cache_key: str, cache_at_key: str, max_age_minutes: int
|
|
||||||
) -> Optional[List[Dict[str, Any]]]:
|
|
||||||
cached_at = get_setting(cache_at_key)
|
|
||||||
if not _cache_is_fresh(cached_at, max_age_minutes):
|
|
||||||
return None
|
|
||||||
raw = get_setting(cache_key)
|
|
||||||
if not raw:
|
|
||||||
return None
|
|
||||||
try:
|
|
||||||
data = json.loads(raw)
|
|
||||||
except (TypeError, json.JSONDecodeError):
|
|
||||||
return None
|
|
||||||
if isinstance(data, list):
|
|
||||||
return [item for item in data if isinstance(item, dict)]
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _save_cached_users(cache_key: str, cache_at_key: str, users: List[Dict[str, Any]]) -> None:
|
|
||||||
payload = json.dumps(users, ensure_ascii=True)
|
|
||||||
set_setting(cache_key, payload)
|
|
||||||
set_setting(cache_at_key, _now_iso())
|
|
||||||
|
|
||||||
|
|
||||||
def _normalized_handles(value: Any) -> List[str]:
|
|
||||||
if not isinstance(value, str):
|
|
||||||
return []
|
|
||||||
normalized = value.strip().lower()
|
|
||||||
if not normalized:
|
|
||||||
return []
|
|
||||||
handles = [normalized]
|
|
||||||
if "@" in normalized:
|
|
||||||
handles.append(normalized.split("@", 1)[0])
|
|
||||||
return list(dict.fromkeys(handles))
|
|
||||||
|
|
||||||
|
|
||||||
def build_jellyseerr_candidate_map(users: List[Dict[str, Any]]) -> Dict[str, int]:
|
|
||||||
candidate_to_id: Dict[str, int] = {}
|
|
||||||
for user in users:
|
|
||||||
if not isinstance(user, dict):
|
|
||||||
continue
|
|
||||||
user_id = user.get("id") or user.get("userId") or user.get("Id")
|
|
||||||
try:
|
|
||||||
user_id = int(user_id)
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
continue
|
|
||||||
for key in ("username", "email", "displayName", "name"):
|
|
||||||
for handle in _normalized_handles(user.get(key)):
|
|
||||||
candidate_to_id.setdefault(handle, user_id)
|
|
||||||
return candidate_to_id
|
|
||||||
|
|
||||||
|
|
||||||
def match_jellyseerr_user_id(
|
|
||||||
username: str, candidate_map: Dict[str, int]
|
|
||||||
) -> Optional[int]:
|
|
||||||
for handle in _normalized_handles(username):
|
|
||||||
matched = candidate_map.get(handle)
|
|
||||||
if matched is not None:
|
|
||||||
return matched
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def save_jellyseerr_users_cache(users: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
|
||||||
normalized: List[Dict[str, Any]] = []
|
|
||||||
for user in users:
|
|
||||||
if not isinstance(user, dict):
|
|
||||||
continue
|
|
||||||
normalized.append(
|
|
||||||
{
|
|
||||||
"id": user.get("id") or user.get("userId") or user.get("Id"),
|
|
||||||
"email": user.get("email"),
|
|
||||||
"username": user.get("username"),
|
|
||||||
"displayName": user.get("displayName"),
|
|
||||||
"name": user.get("name"),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
_save_cached_users(JELLYSEERR_CACHE_KEY, JELLYSEERR_CACHE_AT_KEY, normalized)
|
|
||||||
logger.debug("Cached Jellyseerr users: %s", len(normalized))
|
|
||||||
return normalized
|
|
||||||
|
|
||||||
|
|
||||||
def get_cached_jellyseerr_users(max_age_minutes: int = 1440) -> Optional[List[Dict[str, Any]]]:
|
|
||||||
return _load_cached_users(JELLYSEERR_CACHE_KEY, JELLYSEERR_CACHE_AT_KEY, max_age_minutes)
|
|
||||||
|
|
||||||
|
|
||||||
def save_jellyfin_users_cache(users: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
|
||||||
normalized: List[Dict[str, Any]] = []
|
|
||||||
for user in users:
|
|
||||||
if not isinstance(user, dict):
|
|
||||||
continue
|
|
||||||
normalized.append(
|
|
||||||
{
|
|
||||||
"id": user.get("Id"),
|
|
||||||
"name": user.get("Name"),
|
|
||||||
"hasPassword": user.get("HasPassword"),
|
|
||||||
"lastLoginDate": user.get("LastLoginDate"),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
_save_cached_users(JELLYFIN_CACHE_KEY, JELLYFIN_CACHE_AT_KEY, normalized)
|
|
||||||
logger.debug("Cached Jellyfin users: %s", len(normalized))
|
|
||||||
return normalized
|
|
||||||
|
|
||||||
|
|
||||||
def get_cached_jellyfin_users(max_age_minutes: int = 1440) -> Optional[List[Dict[str, Any]]]:
|
|
||||||
return _load_cached_users(JELLYFIN_CACHE_KEY, JELLYFIN_CACHE_AT_KEY, max_age_minutes)
|
|
||||||
@@ -1,10 +1,19 @@
|
|||||||
services:
|
services:
|
||||||
magent:
|
backend:
|
||||||
image: rephl3xnz/magent:latest
|
image: rephl3xnz/magent-backend:latest
|
||||||
env_file:
|
env_file:
|
||||||
- ./.env
|
- ./.env
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
image: rephl3xnz/magent-frontend:latest
|
||||||
|
environment:
|
||||||
|
- NEXT_PUBLIC_API_BASE=/api
|
||||||
|
- BACKEND_INTERNAL_URL=http://backend:8000
|
||||||
|
ports:
|
||||||
|
- "3000:3000"
|
||||||
|
depends_on:
|
||||||
|
- backend
|
||||||
|
|||||||
@@ -1,12 +1,23 @@
|
|||||||
services:
|
services:
|
||||||
magent:
|
backend:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: backend/Dockerfile
|
||||||
env_file:
|
env_file:
|
||||||
- ./.env
|
- ./.env
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "8001:8000"
|
||||||
- "8000:8000"
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
build:
|
||||||
|
context: ./frontend
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
environment:
|
||||||
|
- NEXT_PUBLIC_API_BASE=/api
|
||||||
|
- BACKEND_INTERNAL_URL=http://backend:8000
|
||||||
|
ports:
|
||||||
|
- "3001:3000"
|
||||||
|
depends_on:
|
||||||
|
- backend
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
[supervisord]
|
|
||||||
nodaemon=true
|
|
||||||
logfile=/dev/null
|
|
||||||
logfile_maxbytes=0
|
|
||||||
pidfile=/tmp/supervisord.pid
|
|
||||||
|
|
||||||
[program:backend]
|
|
||||||
directory=/app
|
|
||||||
command=uvicorn app.main:app --host 0.0.0.0 --port 8000
|
|
||||||
autostart=true
|
|
||||||
autorestart=true
|
|
||||||
stdout_logfile=/dev/stdout
|
|
||||||
stdout_logfile_maxbytes=0
|
|
||||||
stderr_logfile=/dev/stderr
|
|
||||||
stderr_logfile_maxbytes=0
|
|
||||||
priority=10
|
|
||||||
|
|
||||||
[program:frontend]
|
|
||||||
directory=/app/frontend
|
|
||||||
command=/usr/bin/npm start -- --hostname 0.0.0.0 --port 3000
|
|
||||||
environment=NEXT_PUBLIC_API_BASE="/api",BACKEND_INTERNAL_URL="http://127.0.0.1:8000",NODE_ENV="production"
|
|
||||||
autostart=true
|
|
||||||
autorestart=true
|
|
||||||
stdout_logfile=/dev/stdout
|
|
||||||
stdout_logfile_maxbytes=0
|
|
||||||
stderr_logfile=/dev/stderr
|
|
||||||
stderr_logfile_maxbytes=0
|
|
||||||
priority=20
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useCallback, useEffect, useMemo, useState } from 'react'
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
||||||
import AdminShell from '../ui/AdminShell'
|
import AdminShell from '../ui/AdminShell'
|
||||||
@@ -21,48 +21,35 @@ type ServiceOptions = {
|
|||||||
const SECTION_LABELS: Record<string, string> = {
|
const SECTION_LABELS: Record<string, string> = {
|
||||||
jellyseerr: 'Jellyseerr',
|
jellyseerr: 'Jellyseerr',
|
||||||
jellyfin: 'Jellyfin',
|
jellyfin: 'Jellyfin',
|
||||||
artwork: 'Artwork cache',
|
artwork: 'Artwork',
|
||||||
cache: 'Cache Control',
|
cache: 'Cache',
|
||||||
sonarr: 'Sonarr',
|
sonarr: 'Sonarr',
|
||||||
radarr: 'Radarr',
|
radarr: 'Radarr',
|
||||||
prowlarr: 'Prowlarr',
|
prowlarr: 'Prowlarr',
|
||||||
qbittorrent: 'qBittorrent',
|
qbittorrent: 'qBittorrent',
|
||||||
log: 'Activity log',
|
log: 'Activity log',
|
||||||
requests: 'Request sync',
|
requests: 'Request syncing',
|
||||||
site: 'Site',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const BOOL_SETTINGS = new Set(['jellyfin_sync_to_arr', 'site_banner_enabled'])
|
const BOOL_SETTINGS = new Set(['jellyfin_sync_to_arr'])
|
||||||
const TEXTAREA_SETTINGS = new Set(['site_banner_message', 'site_changelog'])
|
|
||||||
const URL_SETTINGS = new Set([
|
|
||||||
'jellyseerr_base_url',
|
|
||||||
'jellyfin_base_url',
|
|
||||||
'jellyfin_public_url',
|
|
||||||
'sonarr_base_url',
|
|
||||||
'radarr_base_url',
|
|
||||||
'prowlarr_base_url',
|
|
||||||
'qbittorrent_base_url',
|
|
||||||
])
|
|
||||||
const BANNER_TONES = ['info', 'warning', 'error', 'maintenance']
|
|
||||||
|
|
||||||
const SECTION_DESCRIPTIONS: Record<string, string> = {
|
const SECTION_DESCRIPTIONS: Record<string, string> = {
|
||||||
jellyseerr: 'Connect the request system where users submit content.',
|
jellyseerr: 'Connect the request system where users submit content.',
|
||||||
jellyfin: 'Control Jellyfin login and availability checks.',
|
jellyfin: 'Control Jellyfin login and availability checks.',
|
||||||
artwork: 'Cache posters/backdrops and review artwork coverage.',
|
artwork: 'Configure how posters and artwork are loaded.',
|
||||||
cache: 'Manage saved requests cache and refresh behavior.',
|
cache: 'Manage saved request data and offline artwork.',
|
||||||
sonarr: 'TV automation settings.',
|
sonarr: 'TV automation settings.',
|
||||||
radarr: 'Movie automation settings.',
|
radarr: 'Movie automation settings.',
|
||||||
prowlarr: 'Indexer search settings.',
|
prowlarr: 'Indexer search settings.',
|
||||||
qbittorrent: 'Downloader connection settings.',
|
qbittorrent: 'Downloader connection settings.',
|
||||||
requests: 'Control how often requests are refreshed and cleaned up.',
|
requests: 'Sync and refresh cadence for requests.',
|
||||||
log: 'Activity log for troubleshooting.',
|
log: 'Activity log for troubleshooting.',
|
||||||
site: 'Sitewide banner, version, and changelog details.',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const SETTINGS_SECTION_MAP: Record<string, string | null> = {
|
const SETTINGS_SECTION_MAP: Record<string, string | null> = {
|
||||||
jellyseerr: 'jellyseerr',
|
jellyseerr: 'jellyseerr',
|
||||||
jellyfin: 'jellyfin',
|
jellyfin: 'jellyfin',
|
||||||
artwork: null,
|
artwork: 'artwork',
|
||||||
sonarr: 'sonarr',
|
sonarr: 'sonarr',
|
||||||
radarr: 'radarr',
|
radarr: 'radarr',
|
||||||
prowlarr: 'prowlarr',
|
prowlarr: 'prowlarr',
|
||||||
@@ -71,7 +58,6 @@ const SETTINGS_SECTION_MAP: Record<string, string | null> = {
|
|||||||
cache: null,
|
cache: null,
|
||||||
logs: 'log',
|
logs: 'log',
|
||||||
maintenance: null,
|
maintenance: null,
|
||||||
site: 'site',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const labelFromKey = (key: string) =>
|
const labelFromKey = (key: string) =>
|
||||||
@@ -82,34 +68,16 @@ const labelFromKey = (key: string) =>
|
|||||||
.replace('quality profile id', 'Quality profile ID')
|
.replace('quality profile id', 'Quality profile ID')
|
||||||
.replace('root folder', 'Root folder')
|
.replace('root folder', 'Root folder')
|
||||||
.replace('qbittorrent', 'qBittorrent')
|
.replace('qbittorrent', 'qBittorrent')
|
||||||
.replace('requests sync ttl minutes', 'Saved request refresh TTL (minutes)')
|
.replace('requests sync ttl minutes', 'Refresh saved requests if older than (minutes)')
|
||||||
.replace('requests poll interval seconds', 'Full refresh check interval (seconds)')
|
.replace('requests poll interval seconds', 'Background refresh check (seconds)')
|
||||||
.replace('requests delta sync interval minutes', 'Delta sync interval (minutes)')
|
.replace('requests delta sync interval minutes', 'Check for new or updated requests every (minutes)')
|
||||||
.replace('requests full sync time', 'Daily full refresh time (24h)')
|
.replace('requests full sync time', 'Full refresh time (24h)')
|
||||||
.replace('requests cleanup time', 'Daily history cleanup time (24h)')
|
.replace('requests cleanup time', 'Clean up old history time (24h)')
|
||||||
.replace('requests cleanup days', 'History retention window (days)')
|
.replace('requests cleanup days', 'Remove history older than (days)')
|
||||||
.replace('requests data source', 'Request source (cache vs Jellyseerr)')
|
.replace('requests data source', 'Where requests are loaded from')
|
||||||
.replace('jellyfin public url', 'Jellyfin public URL')
|
.replace('jellyfin public url', 'Jellyfin public URL')
|
||||||
.replace('jellyfin sync to arr', 'Sync Jellyfin to Sonarr/Radarr')
|
.replace('jellyfin sync to arr', 'Sync Jellyfin to Sonarr/Radarr')
|
||||||
.replace('artwork cache mode', 'Artwork cache mode')
|
.replace('artwork cache mode', 'Artwork cache mode')
|
||||||
.replace('site build number', 'Build number')
|
|
||||||
.replace('site banner enabled', 'Sitewide banner enabled')
|
|
||||||
.replace('site banner message', 'Sitewide banner message')
|
|
||||||
.replace('site banner tone', 'Sitewide banner tone')
|
|
||||||
.replace('site changelog', 'Changelog text')
|
|
||||||
|
|
||||||
const formatBytes = (value?: number | null) => {
|
|
||||||
if (!value || value <= 0) return '0 B'
|
|
||||||
const units = ['B', 'KB', 'MB', 'GB', 'TB']
|
|
||||||
let size = value
|
|
||||||
let unitIndex = 0
|
|
||||||
while (size >= 1024 && unitIndex < units.length - 1) {
|
|
||||||
size /= 1024
|
|
||||||
unitIndex += 1
|
|
||||||
}
|
|
||||||
const decimals = unitIndex === 0 || size >= 10 ? 0 : 1
|
|
||||||
return `${size.toFixed(decimals)} ${units[unitIndex]}`
|
|
||||||
}
|
|
||||||
|
|
||||||
type SettingsPageProps = {
|
type SettingsPageProps = {
|
||||||
section: string
|
section: string
|
||||||
@@ -134,15 +102,12 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const [cacheRows, setCacheRows] = useState<any[]>([])
|
const [cacheRows, setCacheRows] = useState<any[]>([])
|
||||||
const [cacheCount, setCacheCount] = useState(50)
|
const [cacheCount, setCacheCount] = useState(50)
|
||||||
const [cacheStatus, setCacheStatus] = useState<string | null>(null)
|
const [cacheStatus, setCacheStatus] = useState<string | null>(null)
|
||||||
const [cacheLoading, setCacheLoading] = useState(false)
|
|
||||||
const [requestsSync, setRequestsSync] = useState<any | null>(null)
|
const [requestsSync, setRequestsSync] = useState<any | null>(null)
|
||||||
const [artworkPrefetch, setArtworkPrefetch] = useState<any | null>(null)
|
const [artworkPrefetch, setArtworkPrefetch] = useState<any | null>(null)
|
||||||
const [artworkSummary, setArtworkSummary] = useState<any | null>(null)
|
|
||||||
const [artworkSummaryStatus, setArtworkSummaryStatus] = useState<string | null>(null)
|
|
||||||
const [maintenanceStatus, setMaintenanceStatus] = useState<string | null>(null)
|
const [maintenanceStatus, setMaintenanceStatus] = useState<string | null>(null)
|
||||||
const [maintenanceBusy, setMaintenanceBusy] = useState(false)
|
const [maintenanceBusy, setMaintenanceBusy] = useState(false)
|
||||||
|
|
||||||
const loadSettings = useCallback(async () => {
|
const loadSettings = async () => {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/settings`)
|
const response = await authFetch(`${baseUrl}/admin/settings`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -174,9 +139,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
setFormValues(initialValues)
|
setFormValues(initialValues)
|
||||||
setStatus(null)
|
setStatus(null)
|
||||||
}, [router])
|
}
|
||||||
|
|
||||||
const loadArtworkPrefetchStatus = useCallback(async () => {
|
const loadArtworkPrefetchStatus = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/requests/artwork/status`)
|
const response = await authFetch(`${baseUrl}/admin/requests/artwork/status`)
|
||||||
@@ -188,30 +153,10 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
}
|
}
|
||||||
}, [])
|
}
|
||||||
|
|
||||||
const loadArtworkSummary = useCallback(async () => {
|
|
||||||
setArtworkSummaryStatus(null)
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/admin/requests/artwork/summary`)
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || 'Artwork summary fetch failed')
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setArtworkSummary(data?.summary ?? null)
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
const message =
|
|
||||||
err instanceof Error && err.message
|
|
||||||
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
|
||||||
: 'Could not load artwork stats.'
|
|
||||||
setArtworkSummaryStatus(message)
|
|
||||||
}
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const loadOptions = useCallback(async (service: 'sonarr' | 'radarr') => {
|
const loadOptions = async (service: 'sonarr' | 'radarr') => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/${service}/options`)
|
const response = await authFetch(`${baseUrl}/admin/${service}/options`)
|
||||||
@@ -240,7 +185,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setRadarrError('Could not load Radarr options.')
|
setRadarrError('Could not load Radarr options.')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [])
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const load = async () => {
|
const load = async () => {
|
||||||
@@ -250,9 +195,8 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
await loadSettings()
|
await loadSettings()
|
||||||
if (section === 'cache' || section === 'artwork') {
|
if (section === 'artwork') {
|
||||||
await loadArtworkPrefetchStatus()
|
await loadArtworkPrefetchStatus()
|
||||||
await loadArtworkSummary()
|
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
@@ -269,7 +213,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
if (section === 'radarr') {
|
if (section === 'radarr') {
|
||||||
void loadOptions('radarr')
|
void loadOptions('radarr')
|
||||||
}
|
}
|
||||||
}, [loadArtworkPrefetchStatus, loadArtworkSummary, loadOptions, loadSettings, router, section])
|
}, [router, section])
|
||||||
|
|
||||||
const groupedSettings = useMemo(() => {
|
const groupedSettings = useMemo(() => {
|
||||||
const groups: Record<string, AdminSetting[]> = {}
|
const groups: Record<string, AdminSetting[]> = {}
|
||||||
@@ -284,51 +228,28 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const settingsSection = SETTINGS_SECTION_MAP[section] ?? null
|
const settingsSection = SETTINGS_SECTION_MAP[section] ?? null
|
||||||
const visibleSections = settingsSection ? [settingsSection] : []
|
const visibleSections = settingsSection ? [settingsSection] : []
|
||||||
const isCacheSection = section === 'cache'
|
const isCacheSection = section === 'cache'
|
||||||
const cacheSettingKeys = new Set(['requests_sync_ttl_minutes', 'requests_data_source'])
|
const cacheSettingKeys = new Set([
|
||||||
const artworkSettingKeys = new Set(['artwork_cache_mode'])
|
'requests_sync_ttl_minutes',
|
||||||
const hiddenSettingKeys = new Set([...cacheSettingKeys, ...artworkSettingKeys])
|
'requests_data_source',
|
||||||
const requestSettingOrder = [
|
'artwork_cache_mode',
|
||||||
'requests_poll_interval_seconds',
|
])
|
||||||
'requests_delta_sync_interval_minutes',
|
|
||||||
'requests_full_sync_time',
|
|
||||||
'requests_cleanup_time',
|
|
||||||
'requests_cleanup_days',
|
|
||||||
]
|
|
||||||
const sortByOrder = (items: AdminSetting[], order: string[]) => {
|
|
||||||
const position = new Map(order.map((key, index) => [key, index]))
|
|
||||||
return [...items].sort((a, b) => {
|
|
||||||
const aIndex = position.get(a.key) ?? Number.POSITIVE_INFINITY
|
|
||||||
const bIndex = position.get(b.key) ?? Number.POSITIVE_INFINITY
|
|
||||||
if (aIndex !== bIndex) return aIndex - bIndex
|
|
||||||
return a.key.localeCompare(b.key)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
const cacheSettings = settings.filter((setting) => cacheSettingKeys.has(setting.key))
|
const cacheSettings = settings.filter((setting) => cacheSettingKeys.has(setting.key))
|
||||||
const artworkSettings = settings.filter((setting) => artworkSettingKeys.has(setting.key))
|
|
||||||
const settingsSections = isCacheSection
|
const settingsSections = isCacheSection
|
||||||
? [
|
? [{ key: 'cache', title: 'Cache settings', items: cacheSettings }]
|
||||||
{ key: 'cache', title: 'Cache control', items: cacheSettings },
|
|
||||||
{ key: 'artwork', title: 'Artwork cache', items: artworkSettings },
|
|
||||||
]
|
|
||||||
: visibleSections.map((sectionKey) => ({
|
: visibleSections.map((sectionKey) => ({
|
||||||
key: sectionKey,
|
key: sectionKey,
|
||||||
title: SECTION_LABELS[sectionKey] ?? sectionKey,
|
title: SECTION_LABELS[sectionKey] ?? sectionKey,
|
||||||
items: (() => {
|
items:
|
||||||
const sectionItems = groupedSettings[sectionKey] ?? []
|
sectionKey === 'requests' || sectionKey === 'artwork'
|
||||||
const filtered =
|
? (groupedSettings[sectionKey] ?? []).filter(
|
||||||
sectionKey === 'requests' || sectionKey === 'artwork'
|
(setting) => !cacheSettingKeys.has(setting.key)
|
||||||
? sectionItems.filter((setting) => !hiddenSettingKeys.has(setting.key))
|
)
|
||||||
: sectionItems
|
: groupedSettings[sectionKey] ?? [],
|
||||||
if (sectionKey === 'requests') {
|
|
||||||
return sortByOrder(filtered, requestSettingOrder)
|
|
||||||
}
|
|
||||||
return filtered
|
|
||||||
})(),
|
|
||||||
}))
|
}))
|
||||||
const showLogs = section === 'logs'
|
const showLogs = section === 'logs'
|
||||||
const showMaintenance = section === 'maintenance'
|
const showMaintenance = section === 'maintenance'
|
||||||
const showRequestsExtras = section === 'requests'
|
const showRequestsExtras = section === 'requests'
|
||||||
const showArtworkExtras = section === 'cache'
|
const showArtworkExtras = section === 'artwork'
|
||||||
const showCacheExtras = section === 'cache'
|
const showCacheExtras = section === 'cache'
|
||||||
const shouldRenderSection = (sectionGroup: { key: string; items?: AdminSetting[] }) => {
|
const shouldRenderSection = (sectionGroup: { key: string; items?: AdminSetting[] }) => {
|
||||||
if (sectionGroup.items && sectionGroup.items.length > 0) return true
|
if (sectionGroup.items && sectionGroup.items.length > 0) return true
|
||||||
@@ -339,60 +260,35 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const settingDescriptions: Record<string, string> = {
|
const settingDescriptions: Record<string, string> = {
|
||||||
jellyseerr_base_url:
|
jellyseerr_base_url: 'Base URL for your Jellyseerr server.',
|
||||||
'Base URL for your Jellyseerr server (FQDN or IP). Scheme is optional.',
|
|
||||||
jellyseerr_api_key: 'API key used to read requests and status.',
|
jellyseerr_api_key: 'API key used to read requests and status.',
|
||||||
jellyfin_base_url:
|
jellyfin_base_url: 'Local Jellyfin server URL for logins and lookups.',
|
||||||
'Jellyfin server URL for logins and lookups (FQDN or IP). Scheme is optional.',
|
|
||||||
jellyfin_api_key: 'Admin API key for syncing users and availability.',
|
jellyfin_api_key: 'Admin API key for syncing users and availability.',
|
||||||
jellyfin_public_url:
|
jellyfin_public_url: 'Public Jellyfin URL used for the “Open in Jellyfin” button.',
|
||||||
'Public Jellyfin URL for the “Open in Jellyfin” button (FQDN or IP).',
|
|
||||||
jellyfin_sync_to_arr: 'Auto-add items to Sonarr/Radarr when they already exist in Jellyfin.',
|
jellyfin_sync_to_arr: 'Auto-add items to Sonarr/Radarr when they already exist in Jellyfin.',
|
||||||
artwork_cache_mode: 'Choose whether posters are cached locally or loaded from the web.',
|
artwork_cache_mode: 'Choose whether posters are cached locally or loaded from the web.',
|
||||||
sonarr_base_url: 'Sonarr server URL for TV tracking (FQDN or IP). Scheme is optional.',
|
sonarr_base_url: 'Sonarr server URL for TV tracking.',
|
||||||
sonarr_api_key: 'API key for Sonarr.',
|
sonarr_api_key: 'API key for Sonarr.',
|
||||||
sonarr_quality_profile_id: 'Quality profile used when adding TV shows.',
|
sonarr_quality_profile_id: 'Quality profile used when adding TV shows.',
|
||||||
sonarr_root_folder: 'Root folder where Sonarr stores TV shows.',
|
sonarr_root_folder: 'Root folder where Sonarr stores TV shows.',
|
||||||
sonarr_qbittorrent_category: 'qBittorrent category for manual Sonarr downloads.',
|
radarr_base_url: 'Radarr server URL for movies.',
|
||||||
radarr_base_url: 'Radarr server URL for movies (FQDN or IP). Scheme is optional.',
|
|
||||||
radarr_api_key: 'API key for Radarr.',
|
radarr_api_key: 'API key for Radarr.',
|
||||||
radarr_quality_profile_id: 'Quality profile used when adding movies.',
|
radarr_quality_profile_id: 'Quality profile used when adding movies.',
|
||||||
radarr_root_folder: 'Root folder where Radarr stores movies.',
|
radarr_root_folder: 'Root folder where Radarr stores movies.',
|
||||||
radarr_qbittorrent_category: 'qBittorrent category for manual Radarr downloads.',
|
prowlarr_base_url: 'Prowlarr server URL for indexer searches.',
|
||||||
prowlarr_base_url:
|
|
||||||
'Prowlarr server URL for indexer searches (FQDN or IP). Scheme is optional.',
|
|
||||||
prowlarr_api_key: 'API key for Prowlarr.',
|
prowlarr_api_key: 'API key for Prowlarr.',
|
||||||
qbittorrent_base_url:
|
qbittorrent_base_url: 'qBittorrent server URL for download status.',
|
||||||
'qBittorrent server URL for download status (FQDN or IP). Scheme is optional.',
|
|
||||||
qbittorrent_username: 'qBittorrent login username.',
|
qbittorrent_username: 'qBittorrent login username.',
|
||||||
qbittorrent_password: 'qBittorrent login password.',
|
qbittorrent_password: 'qBittorrent login password.',
|
||||||
requests_sync_ttl_minutes: 'How long saved requests stay fresh before a refresh is needed.',
|
requests_sync_ttl_minutes: 'How long saved requests stay fresh before a refresh is needed.',
|
||||||
requests_poll_interval_seconds:
|
requests_poll_interval_seconds: 'How often the background checker runs.',
|
||||||
'How often Magent checks if a full refresh should run.',
|
requests_delta_sync_interval_minutes: 'How often we check for new or updated requests.',
|
||||||
requests_delta_sync_interval_minutes:
|
requests_full_sync_time: 'Daily time to refresh the full request list.',
|
||||||
'How often we poll for new or updated requests.',
|
requests_cleanup_time: 'Daily time to trim old history.',
|
||||||
requests_full_sync_time: 'Daily time to rebuild the full request cache.',
|
|
||||||
requests_cleanup_time: 'Daily time to trim old request history.',
|
|
||||||
requests_cleanup_days: 'History older than this is removed during cleanup.',
|
requests_cleanup_days: 'History older than this is removed during cleanup.',
|
||||||
requests_data_source:
|
requests_data_source: 'Pick where Magent should read requests from.',
|
||||||
'Pick where Magent should read requests from. Cache-only avoids Jellyseerr lookups on reads.',
|
|
||||||
log_level: 'How much detail is written to the activity log.',
|
log_level: 'How much detail is written to the activity log.',
|
||||||
log_file: 'Where the activity log is stored.',
|
log_file: 'Where the activity log is stored.',
|
||||||
site_build_number: 'Build number shown in the account menu (auto-set from releases).',
|
|
||||||
site_banner_enabled: 'Enable a sitewide banner for announcements.',
|
|
||||||
site_banner_message: 'Short banner message for maintenance or updates.',
|
|
||||||
site_banner_tone: 'Visual tone for the banner.',
|
|
||||||
site_changelog: 'One update per line for the public changelog.',
|
|
||||||
}
|
|
||||||
|
|
||||||
const settingPlaceholders: Record<string, string> = {
|
|
||||||
jellyseerr_base_url: 'https://requests.example.com or 10.30.1.81:5055',
|
|
||||||
jellyfin_base_url: 'https://jelly.example.com or 10.40.0.80:8096',
|
|
||||||
jellyfin_public_url: 'https://jelly.example.com',
|
|
||||||
sonarr_base_url: 'https://sonarr.example.com or 10.30.1.81:8989',
|
|
||||||
radarr_base_url: 'https://radarr.example.com or 10.30.1.81:7878',
|
|
||||||
prowlarr_base_url: 'https://prowlarr.example.com or 10.30.1.81:9696',
|
|
||||||
qbittorrent_base_url: 'https://qb.example.com or 10.30.1.81:8080',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const buildSelectOptions = (
|
const buildSelectOptions = (
|
||||||
@@ -550,31 +446,6 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const prefetchArtworkMissing = async () => {
|
|
||||||
setArtworkPrefetchStatus(null)
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/requests/artwork/prefetch?only_missing=1`,
|
|
||||||
{ method: 'POST' }
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || 'Missing artwork prefetch failed')
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setArtworkPrefetch(data?.prefetch ?? null)
|
|
||||||
setArtworkPrefetchStatus('Missing artwork caching started.')
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
const message =
|
|
||||||
err instanceof Error && err.message
|
|
||||||
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
|
||||||
: 'Could not cache missing artwork.'
|
|
||||||
setArtworkPrefetchStatus(message)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!artworkPrefetch || artworkPrefetch.status !== 'running') {
|
if (!artworkPrefetch || artworkPrefetch.status !== 'running') {
|
||||||
return
|
return
|
||||||
@@ -592,7 +463,6 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setArtworkPrefetch(data?.prefetch ?? null)
|
setArtworkPrefetch(data?.prefetch ?? null)
|
||||||
if (data?.prefetch?.status && data.prefetch.status !== 'running') {
|
if (data?.prefetch?.status && data.prefetch.status !== 'running') {
|
||||||
setArtworkPrefetchStatus(data.prefetch.message || 'Artwork caching complete.')
|
setArtworkPrefetchStatus(data.prefetch.message || 'Artwork caching complete.')
|
||||||
void loadArtworkSummary()
|
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
@@ -602,7 +472,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
active = false
|
active = false
|
||||||
clearInterval(timer)
|
clearInterval(timer)
|
||||||
}
|
}
|
||||||
}, [artworkPrefetch, loadArtworkSummary])
|
}, [artworkPrefetch?.status])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!artworkPrefetch || artworkPrefetch.status === 'running') {
|
if (!artworkPrefetch || artworkPrefetch.status === 'running') {
|
||||||
@@ -612,7 +482,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setArtworkPrefetch(null)
|
setArtworkPrefetch(null)
|
||||||
}, 5000)
|
}, 5000)
|
||||||
return () => clearTimeout(timer)
|
return () => clearTimeout(timer)
|
||||||
}, [artworkPrefetch])
|
}, [artworkPrefetch?.status])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!requestsSync || requestsSync.status !== 'running') {
|
if (!requestsSync || requestsSync.status !== 'running') {
|
||||||
@@ -640,7 +510,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
active = false
|
active = false
|
||||||
clearInterval(timer)
|
clearInterval(timer)
|
||||||
}
|
}
|
||||||
}, [requestsSync])
|
}, [requestsSync?.status])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!requestsSync || requestsSync.status === 'running') {
|
if (!requestsSync || requestsSync.status === 'running') {
|
||||||
@@ -650,9 +520,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
setRequestsSync(null)
|
setRequestsSync(null)
|
||||||
}, 5000)
|
}, 5000)
|
||||||
return () => clearTimeout(timer)
|
return () => clearTimeout(timer)
|
||||||
}, [requestsSync])
|
}, [requestsSync?.status])
|
||||||
|
|
||||||
const loadLogs = useCallback(async () => {
|
const loadLogs = async () => {
|
||||||
setLogsStatus(null)
|
setLogsStatus(null)
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
@@ -677,7 +547,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
: 'Could not load logs.'
|
: 'Could not load logs.'
|
||||||
setLogsStatus(message)
|
setLogsStatus(message)
|
||||||
}
|
}
|
||||||
}, [logsCount])
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!showLogs) {
|
if (!showLogs) {
|
||||||
@@ -688,11 +558,10 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
void loadLogs()
|
void loadLogs()
|
||||||
}, 5000)
|
}, 5000)
|
||||||
return () => clearInterval(timer)
|
return () => clearInterval(timer)
|
||||||
}, [loadLogs, showLogs])
|
}, [logsCount, showLogs])
|
||||||
|
|
||||||
const loadCache = async () => {
|
const loadCache = async () => {
|
||||||
setCacheStatus(null)
|
setCacheStatus(null)
|
||||||
setCacheLoading(true)
|
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(
|
const response = await authFetch(
|
||||||
@@ -715,8 +584,6 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
||||||
: 'Could not load cache.'
|
: 'Could not load cache.'
|
||||||
setCacheStatus(message)
|
setCacheStatus(message)
|
||||||
} finally {
|
|
||||||
setCacheLoading(false)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -831,9 +698,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
.map((sectionGroup) => (
|
.map((sectionGroup) => (
|
||||||
<section key={sectionGroup.key} className="admin-section">
|
<section key={sectionGroup.key} className="admin-section">
|
||||||
<div className="section-header">
|
<div className="section-header">
|
||||||
<h2>
|
<h2>{sectionGroup.title}</h2>
|
||||||
{sectionGroup.key === 'requests' ? 'Request sync controls' : sectionGroup.title}
|
|
||||||
</h2>
|
|
||||||
{sectionGroup.key === 'sonarr' && (
|
{sectionGroup.key === 'sonarr' && (
|
||||||
<button type="button" onClick={() => loadOptions('sonarr')}>
|
<button type="button" onClick={() => loadOptions('sonarr')}>
|
||||||
Refresh Sonarr options
|
Refresh Sonarr options
|
||||||
@@ -849,38 +714,24 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
Import Jellyfin users
|
Import Jellyfin users
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
{showArtworkExtras && sectionGroup.key === 'artwork' ? (
|
{(showArtworkExtras && sectionGroup.key === 'artwork') ||
|
||||||
<div className="sync-actions">
|
(showCacheExtras && sectionGroup.key === 'cache') ? (
|
||||||
<button type="button" onClick={prefetchArtwork}>
|
<button type="button" onClick={prefetchArtwork}>
|
||||||
Cache all artwork now
|
Cache all artwork now
|
||||||
</button>
|
</button>
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="ghost-button"
|
|
||||||
onClick={prefetchArtworkMissing}
|
|
||||||
>
|
|
||||||
Sync only missing artwork
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
) : null}
|
) : null}
|
||||||
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
||||||
<div className="sync-actions-block">
|
<div className="sync-actions">
|
||||||
<div className="sync-actions">
|
<button type="button" onClick={syncRequests}>
|
||||||
<button type="button" onClick={syncRequests}>
|
Full refresh
|
||||||
Run full refresh (rebuild cache)
|
</button>
|
||||||
</button>
|
<button type="button" className="ghost-button" onClick={syncRequestsDelta}>
|
||||||
<button type="button" className="ghost-button" onClick={syncRequestsDelta}>
|
Quick refresh (new changes)
|
||||||
Run delta sync (recent changes)
|
</button>
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div className="meta sync-note">
|
|
||||||
Full refresh rebuilds the entire cache. Delta sync only checks new or updated
|
|
||||||
requests.
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{SECTION_DESCRIPTIONS[sectionGroup.key] && !settingsSection && (
|
{SECTION_DESCRIPTIONS[sectionGroup.key] && (
|
||||||
<p className="section-subtitle">{SECTION_DESCRIPTIONS[sectionGroup.key]}</p>
|
<p className="section-subtitle">{SECTION_DESCRIPTIONS[sectionGroup.key]}</p>
|
||||||
)}
|
)}
|
||||||
{sectionGroup.key === 'sonarr' && sonarrError && (
|
{sectionGroup.key === 'sonarr' && sonarrError && (
|
||||||
@@ -892,48 +743,17 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
{sectionGroup.key === 'jellyfin' && jellyfinSyncStatus && (
|
{sectionGroup.key === 'jellyfin' && jellyfinSyncStatus && (
|
||||||
<div className="status-banner">{jellyfinSyncStatus}</div>
|
<div className="status-banner">{jellyfinSyncStatus}</div>
|
||||||
)}
|
)}
|
||||||
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkPrefetchStatus && (
|
{((showArtworkExtras && sectionGroup.key === 'artwork') ||
|
||||||
|
(showCacheExtras && sectionGroup.key === 'cache')) &&
|
||||||
|
artworkPrefetchStatus && (
|
||||||
<div className="status-banner">{artworkPrefetchStatus}</div>
|
<div className="status-banner">{artworkPrefetchStatus}</div>
|
||||||
)}
|
)}
|
||||||
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkSummaryStatus && (
|
|
||||||
<div className="status-banner">{artworkSummaryStatus}</div>
|
|
||||||
)}
|
|
||||||
{showArtworkExtras && sectionGroup.key === 'artwork' && (
|
|
||||||
<div className="summary">
|
|
||||||
<div className="summary-card">
|
|
||||||
<strong>Missing artwork</strong>
|
|
||||||
<p>{artworkSummary?.missing_artwork ?? '--'}</p>
|
|
||||||
<div className="meta">Requests missing poster/backdrop or cache files.</div>
|
|
||||||
</div>
|
|
||||||
<div className="summary-card">
|
|
||||||
<strong>Artwork cache size</strong>
|
|
||||||
<p>{formatBytes(artworkSummary?.cache_bytes)}</p>
|
|
||||||
<div className="meta">
|
|
||||||
{artworkSummary?.cache_files ?? '--'} cached files
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="summary-card">
|
|
||||||
<strong>Total requests</strong>
|
|
||||||
<p>{artworkSummary?.total_requests ?? '--'}</p>
|
|
||||||
<div className="meta">Requests currently tracked in cache.</div>
|
|
||||||
</div>
|
|
||||||
<div className="summary-card">
|
|
||||||
<strong>Cache mode</strong>
|
|
||||||
<p>{artworkSummary?.cache_mode ?? '--'}</p>
|
|
||||||
<div className="meta">Artwork setting applied to posters/backdrops.</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{showRequestsExtras && sectionGroup.key === 'requests' && requestsSyncStatus && (
|
{showRequestsExtras && sectionGroup.key === 'requests' && requestsSyncStatus && (
|
||||||
<div className="status-banner">{requestsSyncStatus}</div>
|
<div className="status-banner">{requestsSyncStatus}</div>
|
||||||
)}
|
)}
|
||||||
{showRequestsExtras && sectionGroup.key === 'requests' && (
|
{((showArtworkExtras && sectionGroup.key === 'artwork') ||
|
||||||
<div className="status-banner">
|
(showCacheExtras && sectionGroup.key === 'cache')) &&
|
||||||
Full refresh checks only decide when to run a full refresh. The delta sync interval
|
artworkPrefetch && (
|
||||||
polls for new or updated requests.
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{showArtworkExtras && sectionGroup.key === 'artwork' && artworkPrefetch && (
|
|
||||||
<div className="sync-progress">
|
<div className="sync-progress">
|
||||||
<div className="sync-meta">
|
<div className="sync-meta">
|
||||||
<span>Status: {artworkPrefetch.status}</span>
|
<span>Status: {artworkPrefetch.status}</span>
|
||||||
@@ -1006,10 +826,6 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
const isRadarrProfile = setting.key === 'radarr_quality_profile_id'
|
const isRadarrProfile = setting.key === 'radarr_quality_profile_id'
|
||||||
const isRadarrRoot = setting.key === 'radarr_root_folder'
|
const isRadarrRoot = setting.key === 'radarr_root_folder'
|
||||||
const isBoolSetting = BOOL_SETTINGS.has(setting.key)
|
const isBoolSetting = BOOL_SETTINGS.has(setting.key)
|
||||||
const isUrlSetting = URL_SETTINGS.has(setting.key)
|
|
||||||
const inputPlaceholder = setting.sensitive && setting.isSet
|
|
||||||
? 'Configured (enter to replace)'
|
|
||||||
: settingPlaceholders[setting.key] ?? ''
|
|
||||||
if (isBoolSetting) {
|
if (isBoolSetting) {
|
||||||
return (
|
return (
|
||||||
<label key={setting.key} data-helper={helperText || undefined}>
|
<label key={setting.key} data-helper={helperText || undefined}>
|
||||||
@@ -1191,34 +1007,6 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
</label>
|
</label>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (setting.key === 'site_banner_tone') {
|
|
||||||
return (
|
|
||||||
<label key={setting.key} data-helper={helperText || undefined}>
|
|
||||||
<span className="label-row">
|
|
||||||
<span>{labelFromKey(setting.key)}</span>
|
|
||||||
<span className="meta">
|
|
||||||
{setting.isSet ? `Source: ${setting.source}` : 'Not set'}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
<select
|
|
||||||
name={setting.key}
|
|
||||||
value={value || 'info'}
|
|
||||||
onChange={(event) =>
|
|
||||||
setFormValues((current) => ({
|
|
||||||
...current,
|
|
||||||
[setting.key]: event.target.value,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
>
|
|
||||||
{BANNER_TONES.map((tone) => (
|
|
||||||
<option key={tone} value={tone}>
|
|
||||||
{tone.charAt(0).toUpperCase() + tone.slice(1)}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (
|
if (
|
||||||
setting.key === 'requests_full_sync_time' ||
|
setting.key === 'requests_full_sync_time' ||
|
||||||
setting.key === 'requests_cleanup_time'
|
setting.key === 'requests_cleanup_time'
|
||||||
@@ -1292,42 +1080,11 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<option value="always_js">Always use Jellyseerr (slower)</option>
|
<option value="always_js">Always use Jellyseerr (slower)</option>
|
||||||
<option value="prefer_cache">
|
<option value="prefer_cache">Use saved requests first (faster)</option>
|
||||||
Use saved requests only (fastest)
|
|
||||||
</option>
|
|
||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (TEXTAREA_SETTINGS.has(setting.key)) {
|
|
||||||
return (
|
|
||||||
<label key={setting.key} data-helper={helperText || undefined}>
|
|
||||||
<span className="label-row">
|
|
||||||
<span>{labelFromKey(setting.key)}</span>
|
|
||||||
<span className="meta">
|
|
||||||
{setting.isSet ? `Source: ${setting.source}` : 'Not set'}
|
|
||||||
{setting.sensitive && setting.isSet ? ' stored' : ''}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
<textarea
|
|
||||||
name={setting.key}
|
|
||||||
rows={setting.key === 'site_changelog' ? 6 : 3}
|
|
||||||
placeholder={
|
|
||||||
setting.key === 'site_changelog'
|
|
||||||
? 'One update per line.'
|
|
||||||
: ''
|
|
||||||
}
|
|
||||||
value={value}
|
|
||||||
onChange={(event) =>
|
|
||||||
setFormValues((current) => ({
|
|
||||||
...current,
|
|
||||||
[setting.key]: event.target.value,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
return (
|
return (
|
||||||
<label key={setting.key} data-helper={helperText || undefined}>
|
<label key={setting.key} data-helper={helperText || undefined}>
|
||||||
<span className="label-row">
|
<span className="label-row">
|
||||||
@@ -1340,8 +1097,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
<input
|
<input
|
||||||
name={setting.key}
|
name={setting.key}
|
||||||
type={setting.sensitive ? 'password' : 'text'}
|
type={setting.sensitive ? 'password' : 'text'}
|
||||||
placeholder={inputPlaceholder}
|
placeholder={
|
||||||
autoComplete={isUrlSetting ? 'url' : undefined}
|
setting.sensitive && setting.isSet ? 'Configured (enter to replace)' : ''
|
||||||
|
}
|
||||||
value={value}
|
value={value}
|
||||||
onChange={(event) =>
|
onChange={(event) =>
|
||||||
setFormValues((current) => ({
|
setFormValues((current) => ({
|
||||||
@@ -1363,7 +1121,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
</form>
|
</form>
|
||||||
) : (
|
) : (
|
||||||
<div className="status-banner">
|
<div className="status-banner">
|
||||||
No settings to show here yet. Try the Cache Control page for artwork and saved-request controls.
|
No settings to show here yet. Try the Cache page for artwork and saved-request controls.
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{showLogs && (
|
{showLogs && (
|
||||||
@@ -1409,15 +1167,8 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
<option value={200}>200</option>
|
<option value={200}>200</option>
|
||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
<button type="button" onClick={loadCache} disabled={cacheLoading}>
|
<button type="button" onClick={loadCache}>
|
||||||
{cacheLoading ? (
|
Load saved requests
|
||||||
<>
|
|
||||||
<span className="spinner button-spinner" aria-hidden="true" />
|
|
||||||
Loading saved requests
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
'Load saved requests'
|
|
||||||
)}
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,9 +11,14 @@ const ALLOWED_SECTIONS = new Set([
|
|||||||
'qbittorrent',
|
'qbittorrent',
|
||||||
'requests',
|
'requests',
|
||||||
'cache',
|
'cache',
|
||||||
|
'invites',
|
||||||
|
'password',
|
||||||
|
'captcha',
|
||||||
|
'smtp',
|
||||||
|
'notifications',
|
||||||
|
'expiry',
|
||||||
'logs',
|
'logs',
|
||||||
'maintenance',
|
'maintenance',
|
||||||
'site',
|
|
||||||
])
|
])
|
||||||
|
|
||||||
type PageProps = {
|
type PageProps = {
|
||||||
|
|||||||
@@ -1,172 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
|
||||||
import { useRouter } from 'next/navigation'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
|
||||||
import AdminShell from '../../ui/AdminShell'
|
|
||||||
|
|
||||||
type RequestRow = {
|
|
||||||
id: number
|
|
||||||
title?: string | null
|
|
||||||
year?: number | null
|
|
||||||
type?: string | null
|
|
||||||
statusLabel?: string | null
|
|
||||||
requestedBy?: string | null
|
|
||||||
createdAt?: string | null
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatDateTime = (value?: string | null) => {
|
|
||||||
if (!value) return 'Unknown'
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function AdminRequestsAllPage() {
|
|
||||||
const router = useRouter()
|
|
||||||
const [rows, setRows] = useState<RequestRow[]>([])
|
|
||||||
const [total, setTotal] = useState(0)
|
|
||||||
const [loading, setLoading] = useState(false)
|
|
||||||
const [error, setError] = useState<string | null>(null)
|
|
||||||
const [pageSize, setPageSize] = useState(50)
|
|
||||||
const [page, setPage] = useState(1)
|
|
||||||
|
|
||||||
const pageCount = useMemo(() => {
|
|
||||||
if (!total || pageSize <= 0) return 1
|
|
||||||
return Math.max(1, Math.ceil(total / pageSize))
|
|
||||||
}, [total, pageSize])
|
|
||||||
|
|
||||||
const load = async () => {
|
|
||||||
if (!getToken()) {
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
setLoading(true)
|
|
||||||
setError(null)
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const skip = (page - 1) * pageSize
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/requests/all?take=${pageSize}&skip=${skip}`
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (response.status === 403) {
|
|
||||||
router.push('/')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error(`Load failed: ${response.status}`)
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setRows(Array.isArray(data?.results) ? data.results : [])
|
|
||||||
setTotal(Number(data?.total ?? 0))
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Unable to load requests.')
|
|
||||||
} finally {
|
|
||||||
setLoading(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
void load()
|
|
||||||
}, [page, pageSize])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (page > pageCount) {
|
|
||||||
setPage(pageCount)
|
|
||||||
}
|
|
||||||
}, [pageCount, page])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<AdminShell
|
|
||||||
title="All requests"
|
|
||||||
subtitle="Paginated view of every cached request."
|
|
||||||
actions={
|
|
||||||
<button type="button" onClick={() => router.push('/admin')}>
|
|
||||||
Back to settings
|
|
||||||
</button>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<section className="admin-section">
|
|
||||||
<div className="admin-toolbar">
|
|
||||||
<div className="admin-toolbar-info">
|
|
||||||
<span>{total.toLocaleString()} total</span>
|
|
||||||
</div>
|
|
||||||
<div className="admin-toolbar-actions">
|
|
||||||
<label className="admin-select">
|
|
||||||
<span>Per page</span>
|
|
||||||
<select value={pageSize} onChange={(e) => setPageSize(Number(e.target.value))}>
|
|
||||||
<option value={25}>25</option>
|
|
||||||
<option value={50}>50</option>
|
|
||||||
<option value={100}>100</option>
|
|
||||||
<option value={200}>200</option>
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{loading ? (
|
|
||||||
<div className="status-banner">Loading requests…</div>
|
|
||||||
) : error ? (
|
|
||||||
<div className="error-banner">{error}</div>
|
|
||||||
) : rows.length === 0 ? (
|
|
||||||
<div className="status-banner">No requests found.</div>
|
|
||||||
) : (
|
|
||||||
<div className="admin-table">
|
|
||||||
<div className="admin-table-head">
|
|
||||||
<span>Request</span>
|
|
||||||
<span>Status</span>
|
|
||||||
<span>Requested by</span>
|
|
||||||
<span>Created</span>
|
|
||||||
</div>
|
|
||||||
{rows.map((row) => (
|
|
||||||
<button
|
|
||||||
key={row.id}
|
|
||||||
type="button"
|
|
||||||
className="admin-table-row"
|
|
||||||
onClick={() => router.push(`/requests/${row.id}`)}
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
{row.title || `Request #${row.id}`}
|
|
||||||
{row.year ? ` (${row.year})` : ''}
|
|
||||||
</span>
|
|
||||||
<span>{row.statusLabel || 'Unknown'}</span>
|
|
||||||
<span>{row.requestedBy || 'Unknown'}</span>
|
|
||||||
<span>{formatDateTime(row.createdAt)}</span>
|
|
||||||
</button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="admin-pagination">
|
|
||||||
<button type="button" onClick={() => setPage(1)} disabled={page <= 1}>
|
|
||||||
First
|
|
||||||
</button>
|
|
||||||
<button type="button" onClick={() => setPage(page - 1)} disabled={page <= 1}>
|
|
||||||
Previous
|
|
||||||
</button>
|
|
||||||
<span>
|
|
||||||
Page {page} of {pageCount}
|
|
||||||
</span>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => setPage(page + 1)}
|
|
||||||
disabled={page >= pageCount}
|
|
||||||
>
|
|
||||||
Next
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => setPage(pageCount)}
|
|
||||||
disabled={page >= pageCount}
|
|
||||||
>
|
|
||||||
Last
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</AdminShell>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
|
||||||
import { useRouter } from 'next/navigation'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
|
||||||
|
|
||||||
type SiteInfo = {
|
|
||||||
changelog?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
const parseChangelog = (raw: string) =>
|
|
||||||
raw
|
|
||||||
.split('\n')
|
|
||||||
.map((line) => line.trim())
|
|
||||||
.filter(Boolean)
|
|
||||||
|
|
||||||
export default function ChangelogPage() {
|
|
||||||
const router = useRouter()
|
|
||||||
const [entries, setEntries] = useState<string[]>([])
|
|
||||||
const [loading, setLoading] = useState(true)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const token = getToken()
|
|
||||||
if (!token) {
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
let active = true
|
|
||||||
const load = async () => {
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/site/info`)
|
|
||||||
if (!response.ok) {
|
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error('Failed to load changelog')
|
|
||||||
}
|
|
||||||
const data: SiteInfo = await response.json()
|
|
||||||
if (!active) return
|
|
||||||
setEntries(parseChangelog(data?.changelog ?? ''))
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
if (!active) return
|
|
||||||
setEntries([])
|
|
||||||
} finally {
|
|
||||||
if (active) setLoading(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
void load()
|
|
||||||
return () => {
|
|
||||||
active = false
|
|
||||||
}
|
|
||||||
}, [router])
|
|
||||||
|
|
||||||
const content = useMemo(() => {
|
|
||||||
if (loading) {
|
|
||||||
return <div className="loading-text">Loading changelog...</div>
|
|
||||||
}
|
|
||||||
if (entries.length === 0) {
|
|
||||||
return <div className="meta">No updates posted yet.</div>
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<ul className="changelog-list">
|
|
||||||
{entries.map((entry, index) => (
|
|
||||||
<li key={`${entry}-${index}`}>{entry}</li>
|
|
||||||
))}
|
|
||||||
</ul>
|
|
||||||
)
|
|
||||||
}, [entries, loading])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="page">
|
|
||||||
<section className="card changelog-card">
|
|
||||||
<div className="changelog-header">
|
|
||||||
<h1>Changelog</h1>
|
|
||||||
<p className="lede">Latest updates and release notes.</p>
|
|
||||||
</div>
|
|
||||||
{content}
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -75,64 +75,8 @@ export default function HowItWorksPage() {
|
|||||||
</ol>
|
</ol>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section className="how-flow">
|
|
||||||
<h2>Steps and fixes (simple and visual)</h2>
|
|
||||||
<div className="how-step-grid">
|
|
||||||
<article className="how-step-card step-jellyseerr">
|
|
||||||
<div className="step-badge">1</div>
|
|
||||||
<h3>Request sent</h3>
|
|
||||||
<p className="step-note">Jellyseerr holds your request and approval.</p>
|
|
||||||
<div className="step-fix-title">Fixes you can try</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Add to library queue (if it was approved but never added)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="how-step-card step-arr">
|
|
||||||
<div className="step-badge">2</div>
|
|
||||||
<h3>Added to the library list</h3>
|
|
||||||
<p className="step-note">Sonarr/Radarr decide what quality to get.</p>
|
|
||||||
<div className="step-fix-title">Fixes you can try</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Search for releases (see options)</li>
|
|
||||||
<li>Search and auto-download (let it pick for you)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="how-step-card step-prowlarr">
|
|
||||||
<div className="step-badge">3</div>
|
|
||||||
<h3>Searching for sources</h3>
|
|
||||||
<p className="step-note">Prowlarr checks your torrent providers.</p>
|
|
||||||
<div className="step-fix-title">Fixes you can try</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Search for releases (show a list to choose)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="how-step-card step-qbit">
|
|
||||||
<div className="step-badge">4</div>
|
|
||||||
<h3>Downloading the file</h3>
|
|
||||||
<p className="step-note">qBittorrent downloads the selected match.</p>
|
|
||||||
<div className="step-fix-title">Fixes you can try</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Resume download (only if it already exists there)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
|
|
||||||
<article className="how-step-card step-jellyfin">
|
|
||||||
<div className="step-badge">5</div>
|
|
||||||
<h3>Ready to watch</h3>
|
|
||||||
<p className="step-note">Jellyfin shows it in your library.</p>
|
|
||||||
<div className="step-fix-title">What to do next</div>
|
|
||||||
<ul className="step-fix-list">
|
|
||||||
<li>Open in Jellyfin (watch it)</li>
|
|
||||||
</ul>
|
|
||||||
</article>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section className="how-callout">
|
<section className="how-callout">
|
||||||
<h2>Why Magent sometimes says "waiting"</h2>
|
<h2>Why Magent sometimes says “waiting”</h2>
|
||||||
<p>
|
<p>
|
||||||
If the search helper cannot find a match yet, Magent will say there is nothing to grab.
|
If the search helper cannot find a match yet, Magent will say there is nothing to grab.
|
||||||
That does not mean it is broken. It usually means the release is not available yet.
|
That does not mean it is broken. It usually means the release is not available yet.
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import HeaderIdentity from './ui/HeaderIdentity'
|
|||||||
import ThemeToggle from './ui/ThemeToggle'
|
import ThemeToggle from './ui/ThemeToggle'
|
||||||
import BrandingFavicon from './ui/BrandingFavicon'
|
import BrandingFavicon from './ui/BrandingFavicon'
|
||||||
import BrandingLogo from './ui/BrandingLogo'
|
import BrandingLogo from './ui/BrandingLogo'
|
||||||
import SiteStatus from './ui/SiteStatus'
|
|
||||||
|
|
||||||
export const metadata = {
|
export const metadata = {
|
||||||
title: 'Magent',
|
title: 'Magent',
|
||||||
@@ -29,14 +28,13 @@ export default function RootLayout({ children }: { children: ReactNode }) {
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div className="header-right">
|
<div className="header-right">
|
||||||
<ThemeToggle />
|
|
||||||
<HeaderIdentity />
|
<HeaderIdentity />
|
||||||
|
<ThemeToggle />
|
||||||
</div>
|
</div>
|
||||||
<div className="header-nav">
|
<div className="header-nav">
|
||||||
<HeaderActions />
|
<HeaderActions />
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
<SiteStatus />
|
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -86,6 +86,9 @@ export default function LoginPage() {
|
|||||||
Sign in with Magent account
|
Sign in with Magent account
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
<div className="status-banner">
|
||||||
|
Have an invite? <a href="/register">Create an account</a>
|
||||||
|
</div>
|
||||||
</main>
|
</main>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ export default function HomePage() {
|
|||||||
year?: number
|
year?: number
|
||||||
statusLabel?: string
|
statusLabel?: string
|
||||||
artwork?: { poster_url?: string }
|
artwork?: { poster_url?: string }
|
||||||
createdAt?: string | null
|
|
||||||
}[]
|
}[]
|
||||||
>([])
|
>([])
|
||||||
const [recentError, setRecentError] = useState<string | null>(null)
|
const [recentError, setRecentError] = useState<string | null>(null)
|
||||||
@@ -31,8 +30,6 @@ export default function HomePage() {
|
|||||||
>(null)
|
>(null)
|
||||||
const [servicesLoading, setServicesLoading] = useState(false)
|
const [servicesLoading, setServicesLoading] = useState(false)
|
||||||
const [servicesError, setServicesError] = useState<string | null>(null)
|
const [servicesError, setServicesError] = useState<string | null>(null)
|
||||||
const [serviceTesting, setServiceTesting] = useState<Record<string, boolean>>({})
|
|
||||||
const [serviceTestResults, setServiceTestResults] = useState<Record<string, string | null>>({})
|
|
||||||
|
|
||||||
const submit = (event: React.FormEvent) => {
|
const submit = (event: React.FormEvent) => {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
@@ -45,61 +42,6 @@ export default function HomePage() {
|
|||||||
void runSearch(trimmed)
|
void runSearch(trimmed)
|
||||||
}
|
}
|
||||||
|
|
||||||
const toServiceSlug = (name: string) => name.toLowerCase().replace(/[^a-z0-9]/g, '')
|
|
||||||
|
|
||||||
const updateServiceStatus = (name: string, status: string, message?: string) => {
|
|
||||||
setServicesStatus((prev) => {
|
|
||||||
if (!prev) return prev
|
|
||||||
return {
|
|
||||||
...prev,
|
|
||||||
services: prev.services.map((service) =>
|
|
||||||
service.name === name ? { ...service, status, message } : service
|
|
||||||
),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const testService = async (name: string) => {
|
|
||||||
const slug = toServiceSlug(name)
|
|
||||||
setServiceTesting((prev) => ({ ...prev, [name]: true }))
|
|
||||||
setServiceTestResults((prev) => ({ ...prev, [name]: null }))
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/status/services/${slug}/test`, {
|
|
||||||
method: 'POST',
|
|
||||||
})
|
|
||||||
if (!response.ok) {
|
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || `Service test failed: ${response.status}`)
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
const status = data?.status ?? 'unknown'
|
|
||||||
const message =
|
|
||||||
data?.message ||
|
|
||||||
(status === 'up'
|
|
||||||
? 'API OK'
|
|
||||||
: status === 'down'
|
|
||||||
? 'API unreachable'
|
|
||||||
: status === 'degraded'
|
|
||||||
? 'Health warnings'
|
|
||||||
: status === 'not_configured'
|
|
||||||
? 'Not configured'
|
|
||||||
: 'Unknown')
|
|
||||||
setServiceTestResults((prev) => ({ ...prev, [name]: message }))
|
|
||||||
updateServiceStatus(name, status, data?.message)
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error)
|
|
||||||
setServiceTestResults((prev) => ({ ...prev, [name]: 'Test failed' }))
|
|
||||||
} finally {
|
|
||||||
setServiceTesting((prev) => ({ ...prev, [name]: false }))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!getToken()) {
|
if (!getToken()) {
|
||||||
router.push('/login')
|
router.push('/login')
|
||||||
@@ -152,7 +94,6 @@ export default function HomePage() {
|
|||||||
year: item.year,
|
year: item.year,
|
||||||
statusLabel: item.statusLabel,
|
statusLabel: item.statusLabel,
|
||||||
artwork: item.artwork,
|
artwork: item.artwork,
|
||||||
createdAt: item.createdAt ?? null,
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
@@ -238,13 +179,6 @@ export default function HomePage() {
|
|||||||
return url.startsWith('http') ? url : `${getApiBase()}${url}`
|
return url.startsWith('http') ? url : `${getApiBase()}${url}`
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatRequestTime = (value?: string | null) => {
|
|
||||||
if (!value) return null
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main className="card">
|
<main className="card">
|
||||||
<div className="layout-grid">
|
<div className="layout-grid">
|
||||||
@@ -280,37 +214,21 @@ export default function HomePage() {
|
|||||||
return order.map((name) => {
|
return order.map((name) => {
|
||||||
const item = items.find((entry) => entry.name === name)
|
const item = items.find((entry) => entry.name === name)
|
||||||
const status = item?.status ?? 'unknown'
|
const status = item?.status ?? 'unknown'
|
||||||
const testing = serviceTesting[name] ?? false
|
|
||||||
return (
|
return (
|
||||||
<div key={name} className={`system-item system-${status}`}>
|
<div key={name} className={`system-item system-${status}`}>
|
||||||
<span className="system-dot" />
|
<span className="system-dot" />
|
||||||
<div className="system-meta">
|
<span className="system-name">{name}</span>
|
||||||
<span className="system-name">{name}</span>
|
<span className="system-state">
|
||||||
{serviceTestResults[name] && (
|
{status === 'up'
|
||||||
<span className="system-test-message">{serviceTestResults[name]}</span>
|
? 'Up'
|
||||||
)}
|
: status === 'down'
|
||||||
</div>
|
? 'Down'
|
||||||
<div className="system-actions">
|
: status === 'degraded'
|
||||||
<span className="system-state">
|
? 'Needs attention'
|
||||||
{status === 'up'
|
: status === 'not_configured'
|
||||||
? 'Up'
|
? 'Not configured'
|
||||||
: status === 'down'
|
: 'Unknown'}
|
||||||
? 'Down'
|
</span>
|
||||||
: status === 'degraded'
|
|
||||||
? 'Needs attention'
|
|
||||||
: status === 'not_configured'
|
|
||||||
? 'Not configured'
|
|
||||||
: 'Unknown'}
|
|
||||||
</span>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="system-test"
|
|
||||||
onClick={() => void testService(name)}
|
|
||||||
disabled={testing}
|
|
||||||
>
|
|
||||||
{testing ? 'Testing...' : 'Test'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -321,12 +239,11 @@ export default function HomePage() {
|
|||||||
<h2>{role === 'admin' ? 'All requests' : 'My recent requests'}</h2>
|
<h2>{role === 'admin' ? 'All requests' : 'My recent requests'}</h2>
|
||||||
{authReady && (
|
{authReady && (
|
||||||
<label className="recent-filter">
|
<label className="recent-filter">
|
||||||
<span>Show</span>
|
<span>Show last</span>
|
||||||
<select
|
<select
|
||||||
value={recentDays}
|
value={recentDays}
|
||||||
onChange={(event) => setRecentDays(Number(event.target.value))}
|
onChange={(event) => setRecentDays(Number(event.target.value))}
|
||||||
>
|
>
|
||||||
<option value={0}>All</option>
|
|
||||||
<option value={30}>30 days</option>
|
<option value={30}>30 days</option>
|
||||||
<option value={60}>60 days</option>
|
<option value={60}>60 days</option>
|
||||||
<option value={90}>90 days</option>
|
<option value={90}>90 days</option>
|
||||||
@@ -373,7 +290,6 @@ export default function HomePage() {
|
|||||||
<span className="recent-meta">
|
<span className="recent-meta">
|
||||||
{item.statusLabel ? item.statusLabel : 'Status not available yet'} · Request{' '}
|
{item.statusLabel ? item.statusLabel : 'Status not available yet'} · Request{' '}
|
||||||
{item.id}
|
{item.id}
|
||||||
{item.createdAt ? ` · ${formatRequestTime(item.createdAt)}` : ''}
|
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -10,68 +10,25 @@ type ProfileInfo = {
|
|||||||
auth_provider: string
|
auth_provider: string
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProfileStats = {
|
type ContactInfo = {
|
||||||
total: number
|
email?: string | null
|
||||||
ready: number
|
discord?: string | null
|
||||||
pending: number
|
telegram?: string | null
|
||||||
in_progress: number
|
matrix?: string | null
|
||||||
declined: number
|
|
||||||
working: number
|
|
||||||
partial: number
|
|
||||||
approved: number
|
|
||||||
last_request_at?: string | null
|
|
||||||
share: number
|
|
||||||
global_total: number
|
|
||||||
most_active_user?: { username: string; total: number } | null
|
|
||||||
}
|
|
||||||
|
|
||||||
type ActivityEntry = {
|
|
||||||
ip: string
|
|
||||||
user_agent: string
|
|
||||||
first_seen_at: string
|
|
||||||
last_seen_at: string
|
|
||||||
hit_count: number
|
|
||||||
}
|
|
||||||
|
|
||||||
type ProfileActivity = {
|
|
||||||
last_ip?: string | null
|
|
||||||
last_user_agent?: string | null
|
|
||||||
last_seen_at?: string | null
|
|
||||||
device_count: number
|
|
||||||
recent: ActivityEntry[]
|
|
||||||
}
|
|
||||||
|
|
||||||
type ProfileResponse = {
|
|
||||||
user: ProfileInfo
|
|
||||||
stats: ProfileStats
|
|
||||||
activity: ProfileActivity
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatDate = (value?: string | null) => {
|
|
||||||
if (!value) return 'Never'
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
const parseBrowser = (agent?: string | null) => {
|
|
||||||
if (!agent) return 'Unknown'
|
|
||||||
const value = agent.toLowerCase()
|
|
||||||
if (value.includes('edg/')) return 'Edge'
|
|
||||||
if (value.includes('chrome/') && !value.includes('edg/')) return 'Chrome'
|
|
||||||
if (value.includes('firefox/')) return 'Firefox'
|
|
||||||
if (value.includes('safari/') && !value.includes('chrome/')) return 'Safari'
|
|
||||||
return 'Unknown'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function ProfilePage() {
|
export default function ProfilePage() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const [profile, setProfile] = useState<ProfileInfo | null>(null)
|
const [profile, setProfile] = useState<ProfileInfo | null>(null)
|
||||||
const [stats, setStats] = useState<ProfileStats | null>(null)
|
const [contact, setContact] = useState<ContactInfo>({})
|
||||||
const [activity, setActivity] = useState<ProfileActivity | null>(null)
|
|
||||||
const [currentPassword, setCurrentPassword] = useState('')
|
const [currentPassword, setCurrentPassword] = useState('')
|
||||||
const [newPassword, setNewPassword] = useState('')
|
const [newPassword, setNewPassword] = useState('')
|
||||||
const [status, setStatus] = useState<string | null>(null)
|
const [status, setStatus] = useState<string | null>(null)
|
||||||
|
const [contactStatus, setContactStatus] = useState<string | null>(null)
|
||||||
|
const [referrals, setReferrals] = useState<
|
||||||
|
{ code: string; uses_count?: number; max_uses?: number | null }[]
|
||||||
|
>([])
|
||||||
|
const [referralStatus, setReferralStatus] = useState<string | null>(null)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -82,21 +39,35 @@ export default function ProfilePage() {
|
|||||||
const load = async () => {
|
const load = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/auth/profile`)
|
const response = await authFetch(`${baseUrl}/auth/me`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
clearToken()
|
clearToken()
|
||||||
router.push('/login')
|
router.push('/login')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
const user = data?.user ?? {}
|
|
||||||
setProfile({
|
setProfile({
|
||||||
username: user?.username ?? 'Unknown',
|
username: data?.username ?? 'Unknown',
|
||||||
role: user?.role ?? 'user',
|
role: data?.role ?? 'user',
|
||||||
auth_provider: user?.auth_provider ?? 'local',
|
auth_provider: data?.auth_provider ?? 'local',
|
||||||
})
|
})
|
||||||
setStats(data?.stats ?? null)
|
const contactResponse = await authFetch(`${baseUrl}/auth/contact`)
|
||||||
setActivity(data?.activity ?? null)
|
if (contactResponse.ok) {
|
||||||
|
const contactData = await contactResponse.json()
|
||||||
|
setContact({
|
||||||
|
email: contactData?.contact?.email ?? '',
|
||||||
|
discord: contactData?.contact?.discord ?? '',
|
||||||
|
telegram: contactData?.contact?.telegram ?? '',
|
||||||
|
matrix: contactData?.contact?.matrix ?? '',
|
||||||
|
})
|
||||||
|
}
|
||||||
|
const referralResponse = await authFetch(`${baseUrl}/auth/referrals`)
|
||||||
|
if (referralResponse.ok) {
|
||||||
|
const referralData = await referralResponse.json()
|
||||||
|
if (Array.isArray(referralData?.invites)) {
|
||||||
|
setReferrals(referralData.invites)
|
||||||
|
}
|
||||||
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setStatus('Could not load your profile.')
|
setStatus('Could not load your profile.')
|
||||||
@@ -137,6 +108,55 @@ export default function ProfilePage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const submitContact = async (event: React.FormEvent) => {
|
||||||
|
event.preventDefault()
|
||||||
|
setContactStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/auth/contact`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
email: contact.email,
|
||||||
|
discord: contact.discord,
|
||||||
|
telegram: contact.telegram,
|
||||||
|
matrix: contact.matrix,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Update failed')
|
||||||
|
}
|
||||||
|
setContactStatus('Contact details saved.')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setContactStatus('Could not update contact details.')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const createReferral = async () => {
|
||||||
|
setReferralStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/auth/referrals`, { method: 'POST' })
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Could not create referral invite')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
if (data?.code) {
|
||||||
|
setReferrals((current) => [
|
||||||
|
{ code: data.code, uses_count: 0, max_uses: 1 },
|
||||||
|
...current,
|
||||||
|
])
|
||||||
|
}
|
||||||
|
setReferralStatus('Referral invite created.')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setReferralStatus('Could not create a referral invite.')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return <main className="card">Loading profile...</main>
|
return <main className="card">Loading profile...</main>
|
||||||
}
|
}
|
||||||
@@ -150,78 +170,6 @@ export default function ProfilePage() {
|
|||||||
{profile.auth_provider}.
|
{profile.auth_provider}.
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="profile-grid">
|
|
||||||
<section className="profile-section">
|
|
||||||
<h2>Account stats</h2>
|
|
||||||
<div className="stat-grid">
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Requests submitted</div>
|
|
||||||
<div className="stat-value">{stats?.total ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Ready to watch</div>
|
|
||||||
<div className="stat-value">{stats?.ready ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">In progress</div>
|
|
||||||
<div className="stat-value">{stats?.in_progress ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Pending approval</div>
|
|
||||||
<div className="stat-value">{stats?.pending ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Declined</div>
|
|
||||||
<div className="stat-value">{stats?.declined ?? 0}</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Last request</div>
|
|
||||||
<div className="stat-value stat-value--small">
|
|
||||||
{formatDate(stats?.last_request_at)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Share of all requests</div>
|
|
||||||
<div className="stat-value">
|
|
||||||
{stats?.global_total
|
|
||||||
? `${Math.round((stats.share || 0) * 1000) / 10}%`
|
|
||||||
: '0%'}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{profile?.role === 'admin' ? (
|
|
||||||
<div className="stat-card">
|
|
||||||
<div className="stat-label">Most active user</div>
|
|
||||||
<div className="stat-value stat-value--small">
|
|
||||||
{stats?.most_active_user
|
|
||||||
? `${stats.most_active_user.username} (${stats.most_active_user.total})`
|
|
||||||
: 'N/A'}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : null}
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
<section className="profile-section">
|
|
||||||
<h2>Connection history</h2>
|
|
||||||
<div className="status-banner">
|
|
||||||
Last seen {formatDate(activity?.last_seen_at)} from {activity?.last_ip ?? 'Unknown'}.
|
|
||||||
</div>
|
|
||||||
<div className="connection-list">
|
|
||||||
{(activity?.recent ?? []).map((entry, index) => (
|
|
||||||
<div key={`${entry.ip}-${entry.last_seen_at}-${index}`} className="connection-item">
|
|
||||||
<div>
|
|
||||||
<div className="connection-label">{parseBrowser(entry.user_agent)}</div>
|
|
||||||
<div className="meta">IP: {entry.ip}</div>
|
|
||||||
<div className="meta">Last seen: {formatDate(entry.last_seen_at)}</div>
|
|
||||||
</div>
|
|
||||||
<div className="connection-count">{entry.hit_count} visits</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
{activity && activity.recent.length === 0 ? (
|
|
||||||
<div className="status-banner">No connection history yet.</div>
|
|
||||||
) : null}
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
{profile?.auth_provider !== 'local' ? (
|
{profile?.auth_provider !== 'local' ? (
|
||||||
<div className="status-banner">
|
<div className="status-banner">
|
||||||
Password changes are only available for local Magent accounts.
|
Password changes are only available for local Magent accounts.
|
||||||
@@ -252,6 +200,82 @@ export default function ProfilePage() {
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
)}
|
)}
|
||||||
|
<form onSubmit={submitContact} className="auth-form">
|
||||||
|
<h2>Contact details</h2>
|
||||||
|
<label>
|
||||||
|
Email address
|
||||||
|
<input
|
||||||
|
type="email"
|
||||||
|
value={contact.email || ''}
|
||||||
|
onChange={(event) => setContact((current) => ({ ...current, email: event.target.value }))}
|
||||||
|
autoComplete="email"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Discord handle
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={contact.discord || ''}
|
||||||
|
onChange={(event) =>
|
||||||
|
setContact((current) => ({ ...current, discord: event.target.value }))
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Telegram ID
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={contact.telegram || ''}
|
||||||
|
onChange={(event) =>
|
||||||
|
setContact((current) => ({ ...current, telegram: event.target.value }))
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Matrix ID
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={contact.matrix || ''}
|
||||||
|
onChange={(event) =>
|
||||||
|
setContact((current) => ({ ...current, matrix: event.target.value }))
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
{contactStatus && <div className="status-banner">{contactStatus}</div>}
|
||||||
|
<div className="auth-actions">
|
||||||
|
<button type="submit">Save contact details</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<section className="summary-card">
|
||||||
|
<h2>Referral invites</h2>
|
||||||
|
<p className="meta">
|
||||||
|
Share a referral invite with friends or family. Each invite has limited uses.
|
||||||
|
</p>
|
||||||
|
{referralStatus && <div className="status-banner">{referralStatus}</div>}
|
||||||
|
<div className="auth-actions">
|
||||||
|
<button type="button" onClick={createReferral}>
|
||||||
|
Create referral invite
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{referrals.length === 0 ? (
|
||||||
|
<div className="meta">No referral invites yet.</div>
|
||||||
|
) : (
|
||||||
|
<div className="cache-table">
|
||||||
|
<div className="cache-row cache-head">
|
||||||
|
<span>Code</span>
|
||||||
|
<span>Uses</span>
|
||||||
|
</div>
|
||||||
|
{referrals.map((invite) => (
|
||||||
|
<div key={invite.code} className="cache-row">
|
||||||
|
<span>{invite.code}</span>
|
||||||
|
<span>
|
||||||
|
{invite.uses_count ?? 0}/{invite.max_uses ?? '∞'}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
</main>
|
</main>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
194
frontend/app/register/page.tsx
Normal file
194
frontend/app/register/page.tsx
Normal file
@@ -0,0 +1,194 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import { useEffect, useState } from 'react'
|
||||||
|
import { useRouter } from 'next/navigation'
|
||||||
|
import { authFetch, getApiBase, setToken } from '../lib/auth'
|
||||||
|
import BrandingLogo from '../ui/BrandingLogo'
|
||||||
|
|
||||||
|
type SignupConfig = {
|
||||||
|
invites_enabled: boolean
|
||||||
|
captcha_provider: string
|
||||||
|
hcaptcha_site_key?: string | null
|
||||||
|
recaptcha_site_key?: string | null
|
||||||
|
turnstile_site_key?: string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function RegisterPage() {
|
||||||
|
const router = useRouter()
|
||||||
|
const [config, setConfig] = useState<SignupConfig | null>(null)
|
||||||
|
const [inviteCode, setInviteCode] = useState('')
|
||||||
|
const [username, setUsername] = useState('')
|
||||||
|
const [password, setPassword] = useState('')
|
||||||
|
const [email, setEmail] = useState('')
|
||||||
|
const [discord, setDiscord] = useState('')
|
||||||
|
const [telegram, setTelegram] = useState('')
|
||||||
|
const [matrix, setMatrix] = useState('')
|
||||||
|
const [captchaToken, setCaptchaToken] = useState('')
|
||||||
|
const [status, setStatus] = useState<string | null>(null)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const load = async () => {
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/auth/signup/config`)
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Signup unavailable')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
setConfig(data)
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
setStatus('Sign-up is not available right now.')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void load()
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!config?.captcha_provider || config.captcha_provider === 'none') {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const provider = config.captcha_provider
|
||||||
|
const script = document.createElement('script')
|
||||||
|
if (provider === 'hcaptcha') {
|
||||||
|
script.src = 'https://js.hcaptcha.com/1/api.js'
|
||||||
|
} else if (provider === 'recaptcha') {
|
||||||
|
script.src = 'https://www.google.com/recaptcha/api.js'
|
||||||
|
} else if (provider === 'turnstile') {
|
||||||
|
script.src = 'https://challenges.cloudflare.com/turnstile/v0/api.js'
|
||||||
|
}
|
||||||
|
script.async = true
|
||||||
|
script.defer = true
|
||||||
|
document.body.appendChild(script)
|
||||||
|
;(window as any).magentCaptchaCallback = (token: string) => {
|
||||||
|
setCaptchaToken(token)
|
||||||
|
}
|
||||||
|
return () => {
|
||||||
|
document.body.removeChild(script)
|
||||||
|
}
|
||||||
|
}, [config?.captcha_provider])
|
||||||
|
|
||||||
|
const submit = async (event: React.FormEvent) => {
|
||||||
|
event.preventDefault()
|
||||||
|
setStatus(null)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetch(`${baseUrl}/auth/register`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
invite_code: inviteCode,
|
||||||
|
username,
|
||||||
|
password,
|
||||||
|
contact: { email, discord, telegram, matrix },
|
||||||
|
captcha_token: captchaToken,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || 'Registration failed')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
if (data?.access_token) {
|
||||||
|
setToken(data.access_token)
|
||||||
|
}
|
||||||
|
router.push('/')
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
const message =
|
||||||
|
err instanceof Error && err.message
|
||||||
|
? err.message.replace(/^\\{\"detail\":\"|\"\\}$/g, '')
|
||||||
|
: 'Could not complete sign-up.'
|
||||||
|
setStatus(message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const captchaProvider = config?.captcha_provider || 'none'
|
||||||
|
const captchaKey =
|
||||||
|
captchaProvider === 'hcaptcha'
|
||||||
|
? config?.hcaptcha_site_key
|
||||||
|
: captchaProvider === 'recaptcha'
|
||||||
|
? config?.recaptcha_site_key
|
||||||
|
: config?.turnstile_site_key
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main className="card auth-card">
|
||||||
|
<BrandingLogo className="brand-logo brand-logo--login" />
|
||||||
|
<h1>Create your account</h1>
|
||||||
|
{!config?.invites_enabled ? (
|
||||||
|
<div className="status-banner">Sign-ups are currently closed.</div>
|
||||||
|
) : (
|
||||||
|
<form onSubmit={submit} className="auth-form">
|
||||||
|
<label>
|
||||||
|
Invite code
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={inviteCode}
|
||||||
|
onChange={(event) => setInviteCode(event.target.value)}
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Username
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={username}
|
||||||
|
onChange={(event) => setUsername(event.target.value)}
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Password
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
value={password}
|
||||||
|
onChange={(event) => setPassword(event.target.value)}
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Email address (optional)
|
||||||
|
<input type="email" value={email} onChange={(event) => setEmail(event.target.value)} />
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Discord handle (optional)
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={discord}
|
||||||
|
onChange={(event) => setDiscord(event.target.value)}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Telegram ID (optional)
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={telegram}
|
||||||
|
onChange={(event) => setTelegram(event.target.value)}
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Matrix ID (optional)
|
||||||
|
<input type="text" value={matrix} onChange={(event) => setMatrix(event.target.value)} />
|
||||||
|
</label>
|
||||||
|
{captchaProvider !== 'none' && captchaKey ? (
|
||||||
|
<div className="captcha-wrap">
|
||||||
|
{captchaProvider === 'hcaptcha' && (
|
||||||
|
<div className="h-captcha" data-sitekey={captchaKey} data-callback="magentCaptchaCallback" />
|
||||||
|
)}
|
||||||
|
{captchaProvider === 'recaptcha' && (
|
||||||
|
<div className="g-recaptcha" data-sitekey={captchaKey} data-callback="magentCaptchaCallback" />
|
||||||
|
)}
|
||||||
|
{captchaProvider === 'turnstile' && (
|
||||||
|
<div className="cf-turnstile" data-sitekey={captchaKey} data-callback="magentCaptchaCallback" />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
{status && <div className="status-banner">{status}</div>}
|
||||||
|
<div className="auth-actions">
|
||||||
|
<button type="submit">Create account</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
)}
|
||||||
|
</main>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import Image from 'next/image'
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
||||||
@@ -34,7 +33,6 @@ type ReleaseOption = {
|
|||||||
seeders?: number
|
seeders?: number
|
||||||
leechers?: number
|
leechers?: number
|
||||||
protocol?: string
|
protocol?: string
|
||||||
publishDate?: string
|
|
||||||
infoUrl?: string
|
infoUrl?: string
|
||||||
downloadUrl?: string
|
downloadUrl?: string
|
||||||
}
|
}
|
||||||
@@ -125,7 +123,7 @@ const friendlyState = (value: string) => {
|
|||||||
const map: Record<string, string> = {
|
const map: Record<string, string> = {
|
||||||
REQUESTED: 'Waiting for approval',
|
REQUESTED: 'Waiting for approval',
|
||||||
APPROVED: 'Approved and queued',
|
APPROVED: 'Approved and queued',
|
||||||
NEEDS_ADD: 'Push to Sonarr/Radarr',
|
NEEDS_ADD: 'Needs adding to the library',
|
||||||
ADDED_TO_ARR: 'Added to the library queue',
|
ADDED_TO_ARR: 'Added to the library queue',
|
||||||
SEARCHING: 'Searching for releases',
|
SEARCHING: 'Searching for releases',
|
||||||
GRABBED: 'Download queued',
|
GRABBED: 'Download queued',
|
||||||
@@ -157,7 +155,7 @@ const friendlyTimelineStatus = (service: string, status: string) => {
|
|||||||
}
|
}
|
||||||
if (service === 'Sonarr/Radarr') {
|
if (service === 'Sonarr/Radarr') {
|
||||||
const map: Record<string, string> = {
|
const map: Record<string, string> = {
|
||||||
missing: 'Push to Sonarr/Radarr',
|
missing: 'Not added yet',
|
||||||
added: 'Added to the library queue',
|
added: 'Added to the library queue',
|
||||||
searching: 'Searching for releases',
|
searching: 'Searching for releases',
|
||||||
available: 'Ready to watch',
|
available: 'Ready to watch',
|
||||||
@@ -252,7 +250,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
}
|
}
|
||||||
|
|
||||||
load()
|
load()
|
||||||
}, [params.id, router])
|
}, [params.id])
|
||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return (
|
return (
|
||||||
@@ -276,11 +274,9 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
const downloadHop = snapshot.timeline.find((hop) => hop.service === 'qBittorrent')
|
const downloadHop = snapshot.timeline.find((hop) => hop.service === 'qBittorrent')
|
||||||
const downloadState = downloadHop?.details?.summary ?? downloadHop?.status ?? 'Unknown'
|
const downloadState = downloadHop?.details?.summary ?? downloadHop?.status ?? 'Unknown'
|
||||||
const jellyfinAvailable = Boolean(snapshot.raw?.jellyfin?.available)
|
const jellyfinAvailable = Boolean(snapshot.raw?.jellyfin?.available)
|
||||||
const arrStageLabel =
|
|
||||||
snapshot.state === 'NEEDS_ADD' ? 'Push to Sonarr/Radarr' : 'Library queue'
|
|
||||||
const pipelineSteps = [
|
const pipelineSteps = [
|
||||||
{ key: 'Jellyseerr', label: 'Jellyseerr' },
|
{ key: 'Jellyseerr', label: 'Jellyseerr' },
|
||||||
{ key: 'Sonarr/Radarr', label: arrStageLabel },
|
{ key: 'Sonarr/Radarr', label: 'Library queue' },
|
||||||
{ key: 'Prowlarr', label: 'Search' },
|
{ key: 'Prowlarr', label: 'Search' },
|
||||||
{ key: 'qBittorrent', label: 'Download' },
|
{ key: 'qBittorrent', label: 'Download' },
|
||||||
{ key: 'Jellyfin', label: 'Jellyfin' },
|
{ key: 'Jellyfin', label: 'Jellyfin' },
|
||||||
@@ -312,14 +308,11 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
<div className="request-header">
|
<div className="request-header">
|
||||||
<div className="request-header-main">
|
<div className="request-header-main">
|
||||||
{resolvedPoster && (
|
{resolvedPoster && (
|
||||||
<Image
|
<img
|
||||||
className="request-poster"
|
className="request-poster"
|
||||||
src={resolvedPoster}
|
src={resolvedPoster}
|
||||||
alt={`${snapshot.title} poster`}
|
alt={`${snapshot.title} poster`}
|
||||||
width={90}
|
loading="lazy"
|
||||||
height={135}
|
|
||||||
sizes="90px"
|
|
||||||
unoptimized
|
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<div>
|
<div>
|
||||||
@@ -597,14 +590,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
guid: release.guid,
|
guid: release.guid,
|
||||||
indexerId: release.indexerId,
|
indexerId: release.indexerId,
|
||||||
indexerName: release.indexer,
|
|
||||||
downloadUrl: release.downloadUrl,
|
downloadUrl: release.downloadUrl,
|
||||||
title: release.title,
|
|
||||||
size: release.size,
|
|
||||||
protocol: release.protocol,
|
|
||||||
publishDate: release.publishDate,
|
|
||||||
seeders: release.seeders,
|
|
||||||
leechers: release.leechers,
|
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -617,8 +603,8 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
const text = await response.text()
|
const text = await response.text()
|
||||||
throw new Error(text || `Request failed: ${response.status}`)
|
throw new Error(text || `Request failed: ${response.status}`)
|
||||||
}
|
}
|
||||||
setActionMessage('Download sent to qBittorrent.')
|
setActionMessage('Download sent to Sonarr/Radarr.')
|
||||||
setModalMessage('Download sent to qBittorrent.')
|
setModalMessage('Download sent to Sonarr/Radarr.')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error)
|
console.error(error)
|
||||||
const message = 'Download failed. Check the logs.'
|
const message = 'Download failed. Check the logs.'
|
||||||
|
|||||||
@@ -17,15 +17,25 @@ const NAV_GROUPS = [
|
|||||||
{
|
{
|
||||||
title: 'Requests',
|
title: 'Requests',
|
||||||
items: [
|
items: [
|
||||||
{ href: '/admin/requests', label: 'Request sync' },
|
{ href: '/admin/requests', label: 'Request syncing' },
|
||||||
{ href: '/admin/requests-all', label: 'All requests' },
|
{ href: '/admin/artwork', label: 'Artwork' },
|
||||||
{ href: '/admin/cache', label: 'Cache Control' },
|
{ href: '/admin/cache', label: 'Cache' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Accounts',
|
||||||
|
items: [
|
||||||
|
{ href: '/admin/invites', label: 'Invites' },
|
||||||
|
{ href: '/admin/password', label: 'Password rules' },
|
||||||
|
{ href: '/admin/captcha', label: 'Captcha' },
|
||||||
|
{ href: '/admin/smtp', label: 'Email (SMTP)' },
|
||||||
|
{ href: '/admin/notifications', label: 'Notifications' },
|
||||||
|
{ href: '/admin/expiry', label: 'Account expiry' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Admin',
|
title: 'Admin',
|
||||||
items: [
|
items: [
|
||||||
{ href: '/admin/site', label: 'Site' },
|
|
||||||
{ href: '/users', label: 'Users' },
|
{ href: '/users', label: 'Users' },
|
||||||
{ href: '/admin/logs', label: 'Activity log' },
|
{ href: '/admin/logs', label: 'Activity log' },
|
||||||
{ href: '/admin/maintenance', label: 'Maintenance' },
|
{ href: '/admin/maintenance', label: 'Maintenance' },
|
||||||
|
|||||||
@@ -32,6 +32,14 @@ export default function HeaderActions() {
|
|||||||
void load()
|
void load()
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
|
const signOut = () => {
|
||||||
|
clearToken()
|
||||||
|
setSignedIn(false)
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
window.location.href = '/login'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!signedIn) {
|
if (!signedIn) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -41,7 +49,11 @@ export default function HeaderActions() {
|
|||||||
<a className="header-cta header-cta--left" href="/feedback">Send feedback</a>
|
<a className="header-cta header-cta--left" href="/feedback">Send feedback</a>
|
||||||
<a href="/">Requests</a>
|
<a href="/">Requests</a>
|
||||||
<a href="/how-it-works">How it works</a>
|
<a href="/how-it-works">How it works</a>
|
||||||
|
<a href="/profile">My profile</a>
|
||||||
{role === 'admin' && <a href="/admin">Settings</a>}
|
{role === 'admin' && <a href="/admin">Settings</a>}
|
||||||
|
<button type="button" className="header-link" onClick={signOut}>
|
||||||
|
Sign out
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,15 +4,13 @@ import { useEffect, useState } from 'react'
|
|||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
||||||
|
|
||||||
export default function HeaderIdentity() {
|
export default function HeaderIdentity() {
|
||||||
const [identity, setIdentity] = useState<{ username: string; role?: string } | null>(null)
|
const [identity, setIdentity] = useState<string | null>(null)
|
||||||
const [buildNumber, setBuildNumber] = useState<string | null>(null)
|
|
||||||
const [open, setOpen] = useState(false)
|
const [open, setOpen] = useState(false)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const token = getToken()
|
const token = getToken()
|
||||||
if (!token) {
|
if (!token) {
|
||||||
setIdentity(null)
|
setIdentity(null)
|
||||||
setBuildNumber(null)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const load = async () => {
|
const load = async () => {
|
||||||
@@ -26,14 +24,7 @@ export default function HeaderIdentity() {
|
|||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
if (data?.username) {
|
if (data?.username) {
|
||||||
setIdentity({ username: data.username, role: data.role })
|
setIdentity(`${data.username}${data.role ? ` (${data.role})` : ''}`)
|
||||||
}
|
|
||||||
const siteResponse = await fetch(`${baseUrl}/site/public`)
|
|
||||||
if (siteResponse.ok) {
|
|
||||||
const siteInfo = await siteResponse.json()
|
|
||||||
if (siteInfo?.buildNumber) {
|
|
||||||
setBuildNumber(siteInfo.buildNumber)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
@@ -47,42 +38,14 @@ export default function HeaderIdentity() {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
const label = `${identity.username}${identity.role ? ` (${identity.role})` : ''}`
|
|
||||||
const initial = identity.username.slice(0, 1).toUpperCase()
|
|
||||||
const signOut = () => {
|
|
||||||
clearToken()
|
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
window.location.href = '/login'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="signed-in-menu">
|
<div className="signed-in-menu">
|
||||||
<button
|
<button type="button" className="signed-in" onClick={() => setOpen((prev) => !prev)}>
|
||||||
type="button"
|
Signed in as {identity}
|
||||||
className="avatar-button"
|
|
||||||
onClick={() => setOpen((prev) => !prev)}
|
|
||||||
aria-haspopup="true"
|
|
||||||
aria-expanded={open}
|
|
||||||
title={label}
|
|
||||||
>
|
|
||||||
{initial}
|
|
||||||
</button>
|
</button>
|
||||||
{open && (
|
{open && (
|
||||||
<div className="signed-in-dropdown">
|
<div className="signed-in-dropdown">
|
||||||
<div className="signed-in-header">Signed in as {label}</div>
|
<a href="/profile">My profile</a>
|
||||||
<div className="signed-in-actions">
|
|
||||||
<a href="/profile" onClick={() => setOpen(false)}>
|
|
||||||
My profile
|
|
||||||
</a>
|
|
||||||
<a href="/changelog" onClick={() => setOpen(false)}>
|
|
||||||
Changelog
|
|
||||||
</a>
|
|
||||||
<button type="button" className="signed-in-signout" onClick={signOut}>
|
|
||||||
Sign out
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{buildNumber ? <div className="signed-in-build">Build {buildNumber}</div> : null}
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
|
||||||
|
|
||||||
type BannerInfo = {
|
|
||||||
enabled: boolean
|
|
||||||
message: string
|
|
||||||
tone?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
type SiteInfo = {
|
|
||||||
buildNumber?: string
|
|
||||||
banner?: BannerInfo
|
|
||||||
}
|
|
||||||
|
|
||||||
const buildRequest = () => {
|
|
||||||
const token = getToken()
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const url = token ? `${baseUrl}/site/info` : `${baseUrl}/site/public`
|
|
||||||
const fetcher = token ? authFetch : fetch
|
|
||||||
return { token, url, fetcher }
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function SiteStatus() {
|
|
||||||
const [info, setInfo] = useState<SiteInfo | null>(null)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
let active = true
|
|
||||||
const load = async () => {
|
|
||||||
try {
|
|
||||||
const { token, url, fetcher } = buildRequest()
|
|
||||||
const response = await fetcher(url)
|
|
||||||
if (!response.ok) {
|
|
||||||
if (response.status === 401 && token) {
|
|
||||||
clearToken()
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
if (!active) return
|
|
||||||
setInfo(data)
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
void load()
|
|
||||||
return () => {
|
|
||||||
active = false
|
|
||||||
}
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const banner = info?.banner
|
|
||||||
const tone = banner?.tone || 'info'
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{banner?.enabled && banner.message ? (
|
|
||||||
<div className={`site-banner site-banner--${tone}`}>{banner.message}</div>
|
|
||||||
) : null}
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,281 +0,0 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
|
||||||
import { useParams, useRouter } from 'next/navigation'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
|
||||||
import AdminShell from '../../ui/AdminShell'
|
|
||||||
|
|
||||||
type UserStats = {
|
|
||||||
total: number
|
|
||||||
ready: number
|
|
||||||
pending: number
|
|
||||||
approved: number
|
|
||||||
working: number
|
|
||||||
partial: number
|
|
||||||
declined: number
|
|
||||||
in_progress: number
|
|
||||||
last_request_at?: string | null
|
|
||||||
}
|
|
||||||
|
|
||||||
type AdminUser = {
|
|
||||||
id?: number
|
|
||||||
username: string
|
|
||||||
role: string
|
|
||||||
auth_provider?: string | null
|
|
||||||
last_login_at?: string | null
|
|
||||||
is_blocked?: boolean
|
|
||||||
auto_search_enabled?: boolean
|
|
||||||
jellyseerr_user_id?: number | null
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatDateTime = (value?: string | null) => {
|
|
||||||
if (!value) return 'Never'
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
const normalizeStats = (stats: any): UserStats => ({
|
|
||||||
total: Number(stats?.total ?? 0),
|
|
||||||
ready: Number(stats?.ready ?? 0),
|
|
||||||
pending: Number(stats?.pending ?? 0),
|
|
||||||
approved: Number(stats?.approved ?? 0),
|
|
||||||
working: Number(stats?.working ?? 0),
|
|
||||||
partial: Number(stats?.partial ?? 0),
|
|
||||||
declined: Number(stats?.declined ?? 0),
|
|
||||||
in_progress: Number(stats?.in_progress ?? 0),
|
|
||||||
last_request_at: stats?.last_request_at ?? null,
|
|
||||||
})
|
|
||||||
|
|
||||||
export default function UserDetailPage() {
|
|
||||||
const params = useParams()
|
|
||||||
const router = useRouter()
|
|
||||||
const idParam = Array.isArray(params?.id) ? params.id[0] : params?.id
|
|
||||||
const [user, setUser] = useState<AdminUser | null>(null)
|
|
||||||
const [stats, setStats] = useState<UserStats | null>(null)
|
|
||||||
const [error, setError] = useState<string | null>(null)
|
|
||||||
const [loading, setLoading] = useState(true)
|
|
||||||
|
|
||||||
const loadUser = async () => {
|
|
||||||
if (!idParam) return
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/id/${encodeURIComponent(idParam)}`
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (response.status === 403) {
|
|
||||||
router.push('/')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (response.status === 404) {
|
|
||||||
setError('User not found.')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error('Could not load user.')
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setUser(data?.user ?? null)
|
|
||||||
setStats(normalizeStats(data?.stats))
|
|
||||||
setError(null)
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not load user.')
|
|
||||||
} finally {
|
|
||||||
setLoading(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const toggleUserBlock = async (blocked: boolean) => {
|
|
||||||
if (!user) return
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/${blocked ? 'block' : 'unblock'}`,
|
|
||||||
{ method: 'POST' }
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Update failed')
|
|
||||||
}
|
|
||||||
await loadUser()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not update user access.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateUserRole = async (role: string) => {
|
|
||||||
if (!user) return
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/role`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ role }),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Update failed')
|
|
||||||
}
|
|
||||||
await loadUser()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not update user role.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const updateAutoSearchEnabled = async (enabled: boolean) => {
|
|
||||||
if (!user) return
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(user.username)}/auto-search`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ enabled }),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Update failed')
|
|
||||||
}
|
|
||||||
await loadUser()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setError('Could not update auto search access.')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!getToken()) {
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
void loadUser()
|
|
||||||
}, [router, idParam])
|
|
||||||
|
|
||||||
if (loading) {
|
|
||||||
return <main className="card">Loading user...</main>
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<AdminShell
|
|
||||||
title={user?.username || 'User'}
|
|
||||||
subtitle="User overview and request stats."
|
|
||||||
actions={
|
|
||||||
<button type="button" onClick={() => router.push('/users')}>
|
|
||||||
Back to users
|
|
||||||
</button>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<section className="admin-section">
|
|
||||||
{error && <div className="error-banner">{error}</div>}
|
|
||||||
{!user ? (
|
|
||||||
<div className="status-banner">No user data found.</div>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
<div className="user-detail-card">
|
|
||||||
<div className="user-detail-layout">
|
|
||||||
<div className="user-detail-identity">
|
|
||||||
<div className="user-detail-title-row">
|
|
||||||
<strong className="user-detail-name">{user.username}</strong>
|
|
||||||
<span className={`user-grid-pill ${user.is_blocked ? 'is-blocked' : ''}`}>
|
|
||||||
{user.is_blocked ? 'Blocked' : 'Active'}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-meta-pills">
|
|
||||||
<span className="user-detail-chip">
|
|
||||||
Jellyseerr ID: {user.jellyseerr_user_id ?? user.id ?? 'Unknown'}
|
|
||||||
</span>
|
|
||||||
<span className="user-detail-chip">Role: {user.role}</span>
|
|
||||||
<span className="user-detail-chip">Login type: {user.auth_provider || 'local'}</span>
|
|
||||||
<span className="user-detail-chip">Last login: {formatDateTime(user.last_login_at)}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-controls">
|
|
||||||
<div className="user-detail-controls-title">User controls</div>
|
|
||||||
<div className="user-detail-actions">
|
|
||||||
<label className="toggle">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={user.role === 'admin'}
|
|
||||||
onChange={(event) => updateUserRole(event.target.checked ? 'admin' : 'user')}
|
|
||||||
/>
|
|
||||||
<span>Make admin</span>
|
|
||||||
</label>
|
|
||||||
<label className="toggle">
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={Boolean(user.auto_search_enabled ?? true)}
|
|
||||||
disabled={user.role === 'admin'}
|
|
||||||
onChange={(event) => updateAutoSearchEnabled(event.target.checked)}
|
|
||||||
/>
|
|
||||||
<span>Allow auto search/download</span>
|
|
||||||
</label>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="ghost-button"
|
|
||||||
onClick={() => toggleUserBlock(!user.is_blocked)}
|
|
||||||
>
|
|
||||||
{user.is_blocked ? 'Allow access' : 'Block access'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{user.role === 'admin' && (
|
|
||||||
<div className="user-detail-helper">
|
|
||||||
Admins always have auto search/download access.
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-grid">
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Total</span>
|
|
||||||
<span className="value">{stats?.total ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Ready</span>
|
|
||||||
<span className="value">{stats?.ready ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Pending</span>
|
|
||||||
<span className="value">{stats?.pending ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Approved</span>
|
|
||||||
<span className="value">{stats?.approved ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Working</span>
|
|
||||||
<span className="value">{stats?.working ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Partial</span>
|
|
||||||
<span className="value">{stats?.partial ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">Declined</span>
|
|
||||||
<span className="value">{stats?.declined ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat">
|
|
||||||
<span className="label">In progress</span>
|
|
||||||
<span className="value">{stats?.in_progress ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-detail-stat user-detail-stat--wide">
|
|
||||||
<span className="label">Last request</span>
|
|
||||||
<span className="value">{formatDateTime(stats?.last_request_at)}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</section>
|
|
||||||
</AdminShell>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -2,31 +2,15 @@
|
|||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import Link from 'next/link'
|
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
||||||
import AdminShell from '../ui/AdminShell'
|
import AdminShell from '../ui/AdminShell'
|
||||||
|
|
||||||
type AdminUser = {
|
type AdminUser = {
|
||||||
id: number
|
|
||||||
username: string
|
username: string
|
||||||
role: string
|
role: string
|
||||||
authProvider?: string | null
|
authProvider?: string | null
|
||||||
lastLoginAt?: string | null
|
lastLoginAt?: string | null
|
||||||
isBlocked?: boolean
|
isBlocked?: boolean
|
||||||
autoSearchEnabled?: boolean
|
|
||||||
stats?: UserStats
|
|
||||||
}
|
|
||||||
|
|
||||||
type UserStats = {
|
|
||||||
total: number
|
|
||||||
ready: number
|
|
||||||
pending: number
|
|
||||||
approved: number
|
|
||||||
working: number
|
|
||||||
partial: number
|
|
||||||
declined: number
|
|
||||||
in_progress: number
|
|
||||||
last_request_at?: string | null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatLastLogin = (value?: string | null) => {
|
const formatLastLogin = (value?: string | null) => {
|
||||||
@@ -36,51 +20,19 @@ const formatLastLogin = (value?: string | null) => {
|
|||||||
return date.toLocaleString()
|
return date.toLocaleString()
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatLastRequest = (value?: string | null) => {
|
|
||||||
if (!value) return '—'
|
|
||||||
const date = new Date(value)
|
|
||||||
if (Number.isNaN(date.valueOf())) return value
|
|
||||||
return date.toLocaleString()
|
|
||||||
}
|
|
||||||
|
|
||||||
const emptyStats: UserStats = {
|
|
||||||
total: 0,
|
|
||||||
ready: 0,
|
|
||||||
pending: 0,
|
|
||||||
approved: 0,
|
|
||||||
working: 0,
|
|
||||||
partial: 0,
|
|
||||||
declined: 0,
|
|
||||||
in_progress: 0,
|
|
||||||
last_request_at: null,
|
|
||||||
}
|
|
||||||
|
|
||||||
const normalizeStats = (stats: any): UserStats => ({
|
|
||||||
total: Number(stats?.total ?? 0),
|
|
||||||
ready: Number(stats?.ready ?? 0),
|
|
||||||
pending: Number(stats?.pending ?? 0),
|
|
||||||
approved: Number(stats?.approved ?? 0),
|
|
||||||
working: Number(stats?.working ?? 0),
|
|
||||||
partial: Number(stats?.partial ?? 0),
|
|
||||||
declined: Number(stats?.declined ?? 0),
|
|
||||||
in_progress: Number(stats?.in_progress ?? 0),
|
|
||||||
last_request_at: stats?.last_request_at ?? null,
|
|
||||||
})
|
|
||||||
|
|
||||||
export default function UsersPage() {
|
export default function UsersPage() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const [users, setUsers] = useState<AdminUser[]>([])
|
const [users, setUsers] = useState<AdminUser[]>([])
|
||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
const [jellyseerrSyncStatus, setJellyseerrSyncStatus] = useState<string | null>(null)
|
const [selected, setSelected] = useState<string[]>([])
|
||||||
const [jellyseerrSyncBusy, setJellyseerrSyncBusy] = useState(false)
|
const [bulkAction, setBulkAction] = useState('block')
|
||||||
const [jellyseerrResyncBusy, setJellyseerrResyncBusy] = useState(false)
|
const [bulkRole, setBulkRole] = useState('user')
|
||||||
const [bulkAutoSearchBusy, setBulkAutoSearchBusy] = useState(false)
|
|
||||||
|
|
||||||
const loadUsers = async () => {
|
const loadUsers = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/users/summary`)
|
const response = await authFetch(`${baseUrl}/admin/users`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
if (response.status === 401) {
|
||||||
clearToken()
|
clearToken()
|
||||||
@@ -102,9 +54,6 @@ export default function UsersPage() {
|
|||||||
authProvider: user.auth_provider ?? 'local',
|
authProvider: user.auth_provider ?? 'local',
|
||||||
lastLoginAt: user.last_login_at ?? null,
|
lastLoginAt: user.last_login_at ?? null,
|
||||||
isBlocked: Boolean(user.is_blocked),
|
isBlocked: Boolean(user.is_blocked),
|
||||||
autoSearchEnabled: Boolean(user.auto_search_enabled ?? true),
|
|
||||||
id: Number(user.id ?? 0),
|
|
||||||
stats: normalizeStats(user.stats ?? emptyStats),
|
|
||||||
}))
|
}))
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
@@ -157,87 +106,44 @@ export default function UsersPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const syncJellyseerrUsers = async () => {
|
const toggleSelect = (username: string, isChecked: boolean) => {
|
||||||
setJellyseerrSyncStatus(null)
|
setSelected((current) =>
|
||||||
setJellyseerrSyncBusy(true)
|
isChecked ? [...new Set([...current, username])] : current.filter((name) => name !== username)
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/admin/jellyseerr/users/sync`, {
|
|
||||||
method: 'POST',
|
|
||||||
})
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || 'Sync failed')
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setJellyseerrSyncStatus(
|
|
||||||
`Matched ${data?.matched ?? 0} users. Skipped ${data?.skipped ?? 0}.`
|
|
||||||
)
|
|
||||||
await loadUsers()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setJellyseerrSyncStatus('Could not sync Jellyseerr users.')
|
|
||||||
} finally {
|
|
||||||
setJellyseerrSyncBusy(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const resyncJellyseerrUsers = async () => {
|
|
||||||
const confirmed = window.confirm(
|
|
||||||
'This will remove all non-admin users and re-import from Jellyseerr. Continue?'
|
|
||||||
)
|
)
|
||||||
if (!confirmed) return
|
|
||||||
setJellyseerrSyncStatus(null)
|
|
||||||
setJellyseerrResyncBusy(true)
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(`${baseUrl}/admin/jellyseerr/users/resync`, {
|
|
||||||
method: 'POST',
|
|
||||||
})
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || 'Resync failed')
|
|
||||||
}
|
|
||||||
const data = await response.json()
|
|
||||||
setJellyseerrSyncStatus(
|
|
||||||
`Re-imported ${data?.imported ?? 0} users. Cleared ${data?.cleared ?? 0}.`
|
|
||||||
)
|
|
||||||
await loadUsers()
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setJellyseerrSyncStatus('Could not resync Jellyseerr users.')
|
|
||||||
} finally {
|
|
||||||
setJellyseerrResyncBusy(false)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const bulkUpdateAutoSearch = async (enabled: boolean) => {
|
const toggleSelectAll = (isChecked: boolean) => {
|
||||||
setBulkAutoSearchBusy(true)
|
setSelected(isChecked ? users.map((user) => user.username) : [])
|
||||||
setJellyseerrSyncStatus(null)
|
}
|
||||||
|
|
||||||
|
const runBulkAction = async () => {
|
||||||
|
if (selected.length === 0) {
|
||||||
|
setError('Select at least one user to run a bulk action.')
|
||||||
|
return
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/users/auto-search/bulk`, {
|
const response = await authFetch(`${baseUrl}/admin/users/bulk`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify({ enabled }),
|
body: JSON.stringify({
|
||||||
|
action: bulkAction,
|
||||||
|
role: bulkRole,
|
||||||
|
usernames: selected,
|
||||||
|
}),
|
||||||
})
|
})
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const text = await response.text()
|
throw new Error('Bulk update failed')
|
||||||
throw new Error(text || 'Bulk update failed')
|
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
setSelected([])
|
||||||
setJellyseerrSyncStatus(
|
|
||||||
`${enabled ? 'Enabled' : 'Disabled'} auto search/download for ${data?.updated ?? 0} non-admin users.`
|
|
||||||
)
|
|
||||||
await loadUsers()
|
await loadUsers()
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setError('Could not update auto search/download for all users.')
|
setError('Could not run the bulk action.')
|
||||||
} finally {
|
|
||||||
setBulkAutoSearchBusy(false)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!getToken()) {
|
if (!getToken()) {
|
||||||
router.push('/login')
|
router.push('/login')
|
||||||
@@ -250,105 +156,87 @@ export default function UsersPage() {
|
|||||||
return <main className="card">Loading users...</main>
|
return <main className="card">Loading users...</main>
|
||||||
}
|
}
|
||||||
|
|
||||||
const nonAdminUsers = users.filter((user) => user.role !== 'admin')
|
|
||||||
const autoSearchEnabledCount = nonAdminUsers.filter((user) => user.autoSearchEnabled !== false).length
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AdminShell
|
<AdminShell
|
||||||
title="Users"
|
title="Users"
|
||||||
subtitle="Manage who can use Magent."
|
subtitle="Manage who can use Magent."
|
||||||
actions={
|
actions={
|
||||||
<>
|
<button type="button" onClick={loadUsers}>
|
||||||
<button type="button" onClick={loadUsers}>
|
Reload list
|
||||||
Reload list
|
</button>
|
||||||
</button>
|
|
||||||
<button type="button" onClick={syncJellyseerrUsers} disabled={jellyseerrSyncBusy}>
|
|
||||||
{jellyseerrSyncBusy ? 'Syncing Jellyseerr users...' : 'Sync Jellyseerr users'}
|
|
||||||
</button>
|
|
||||||
<button type="button" onClick={resyncJellyseerrUsers} disabled={jellyseerrResyncBusy}>
|
|
||||||
{jellyseerrResyncBusy ? 'Resyncing Jellyseerr users...' : 'Resync Jellyseerr users'}
|
|
||||||
</button>
|
|
||||||
</>
|
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<section className="admin-section">
|
<section className="admin-section">
|
||||||
{error && <div className="error-banner">{error}</div>}
|
{error && <div className="error-banner">{error}</div>}
|
||||||
{jellyseerrSyncStatus && <div className="status-banner">{jellyseerrSyncStatus}</div>}
|
{users.length > 0 && (
|
||||||
<div className="user-bulk-toolbar">
|
<div className="summary-card user-bulk-bar">
|
||||||
<div className="user-bulk-summary">
|
<label className="toggle">
|
||||||
<strong>Auto search/download</strong>
|
<input
|
||||||
<span>
|
type="checkbox"
|
||||||
{autoSearchEnabledCount} of {nonAdminUsers.length} non-admin users enabled
|
checked={selected.length === users.length}
|
||||||
</span>
|
onChange={(event) => toggleSelectAll(event.target.checked)}
|
||||||
|
/>
|
||||||
|
<span>Select all</span>
|
||||||
|
</label>
|
||||||
|
<div className="user-bulk-actions">
|
||||||
|
<select value={bulkAction} onChange={(event) => setBulkAction(event.target.value)}>
|
||||||
|
<option value="block">Block access</option>
|
||||||
|
<option value="unblock">Allow access</option>
|
||||||
|
<option value="role">Set role</option>
|
||||||
|
<option value="delete">Delete users</option>
|
||||||
|
</select>
|
||||||
|
{bulkAction === 'role' && (
|
||||||
|
<select value={bulkRole} onChange={(event) => setBulkRole(event.target.value)}>
|
||||||
|
<option value="user">User</option>
|
||||||
|
<option value="admin">Admin</option>
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
<button type="button" onClick={runBulkAction}>
|
||||||
|
Apply to {selected.length} selected
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="user-bulk-actions">
|
)}
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => bulkUpdateAutoSearch(true)}
|
|
||||||
disabled={bulkAutoSearchBusy}
|
|
||||||
>
|
|
||||||
{bulkAutoSearchBusy ? 'Working...' : 'Enable for all users'}
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="ghost-button"
|
|
||||||
onClick={() => bulkUpdateAutoSearch(false)}
|
|
||||||
disabled={bulkAutoSearchBusy}
|
|
||||||
>
|
|
||||||
{bulkAutoSearchBusy ? 'Working...' : 'Disable for all users'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{users.length === 0 ? (
|
{users.length === 0 ? (
|
||||||
<div className="status-banner">No users found yet.</div>
|
<div className="status-banner">No users found yet.</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="user-grid">
|
<div className="admin-grid">
|
||||||
{users.map((user) => (
|
{users.map((user) => (
|
||||||
<Link
|
<div key={user.username} className="summary-card user-card">
|
||||||
key={user.username}
|
<div>
|
||||||
className="user-grid-card"
|
<label className="toggle">
|
||||||
href={`/users/${user.id}`}
|
<input
|
||||||
>
|
type="checkbox"
|
||||||
<div className="user-grid-header">
|
checked={selected.includes(user.username)}
|
||||||
<div>
|
onChange={(event) => toggleSelect(user.username, event.target.checked)}
|
||||||
<strong>{user.username}</strong>
|
/>
|
||||||
<span className="user-grid-meta">{user.role}</span>
|
<span>Select</span>
|
||||||
</div>
|
</label>
|
||||||
<span className={`user-grid-pill ${user.isBlocked ? 'is-blocked' : ''}`}>
|
<strong>{user.username}</strong>
|
||||||
{user.isBlocked ? 'Blocked' : 'Active'}
|
<span className="meta">Role: {user.role}</span>
|
||||||
</span>
|
<span className="meta">Login type: {user.authProvider || 'local'}</span>
|
||||||
</div>
|
|
||||||
<div className="user-grid-subpills">
|
|
||||||
<span className={`user-grid-pill ${user.autoSearchEnabled === false ? 'is-disabled' : ''}`}>
|
|
||||||
Auto search {user.autoSearchEnabled === false ? 'Off' : 'On'}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="user-grid-stats">
|
|
||||||
<div>
|
|
||||||
<span className="label">Total</span>
|
|
||||||
<span className="value">{user.stats?.total ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span className="label">Ready</span>
|
|
||||||
<span className="value">{user.stats?.ready ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span className="label">Pending</span>
|
|
||||||
<span className="value">{user.stats?.pending ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span className="label">In progress</span>
|
|
||||||
<span className="value">{user.stats?.in_progress ?? 0}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="user-grid-footer">
|
|
||||||
<span className="meta">Login: {user.authProvider || 'local'}</span>
|
|
||||||
<span className="meta">Last login: {formatLastLogin(user.lastLoginAt)}</span>
|
<span className="meta">Last login: {formatLastLogin(user.lastLoginAt)}</span>
|
||||||
<span className="meta">
|
|
||||||
Last request: {formatLastRequest(user.stats?.last_request_at)}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
</Link>
|
<div className="user-actions">
|
||||||
|
<label className="toggle">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={user.role === 'admin'}
|
||||||
|
onChange={(event) =>
|
||||||
|
updateUserRole(user.username, event.target.checked ? 'admin' : 'user')
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<span>Make admin</span>
|
||||||
|
</label>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="ghost-button"
|
||||||
|
onClick={() => toggleUserBlock(user.username, !user.isBlocked)}
|
||||||
|
>
|
||||||
|
{user.isBlocked ? 'Allow access' : 'Block access'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "magent-frontend",
|
"name": "magent-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0202261541",
|
"version": "0.1.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
$ErrorActionPreference = "Stop"
|
|
||||||
|
|
||||||
$repoRoot = Resolve-Path "$PSScriptRoot\\.."
|
|
||||||
Set-Location $repoRoot
|
|
||||||
|
|
||||||
$now = Get-Date
|
|
||||||
$buildNumber = "{0}{1}{2}{3}{4}" -f $now.ToString("dd"), $now.ToString("M"), $now.ToString("yy"), $now.ToString("HH"), $now.ToString("mm")
|
|
||||||
|
|
||||||
Write-Host "Build number: $buildNumber"
|
|
||||||
|
|
||||||
git tag $buildNumber
|
|
||||||
git push origin $buildNumber
|
|
||||||
|
|
||||||
$backendImage = "rephl3xnz/magent-backend:$buildNumber"
|
|
||||||
$frontendImage = "rephl3xnz/magent-frontend:$buildNumber"
|
|
||||||
|
|
||||||
docker build -f backend/Dockerfile -t $backendImage --build-arg BUILD_NUMBER=$buildNumber .
|
|
||||||
docker build -f frontend/Dockerfile -t $frontendImage frontend
|
|
||||||
|
|
||||||
docker tag $backendImage rephl3xnz/magent-backend:latest
|
|
||||||
docker tag $frontendImage rephl3xnz/magent-frontend:latest
|
|
||||||
|
|
||||||
docker push $backendImage
|
|
||||||
docker push $frontendImage
|
|
||||||
docker push rephl3xnz/magent-backend:latest
|
|
||||||
docker push rephl3xnz/magent-frontend:latest
|
|
||||||
Reference in New Issue
Block a user