chore: bump version to 1.7.22 and update CHANGELOG, tests and docs
Docs Check / Markdown lint (push) Successful in 1m14s
Build and Push Docker Image / build (push) Successful in 1m52s
Licence Check / Licence compatibility and copyright header verification (push) Successful in 1m55s
CI / Security audit (push) Successful in 2m25s
Docs Check / Mermaid diagram parse check (push) Successful in 3m6s
CI / Swagger Validation & Coverage (push) Successful in 3m22s
CI / Tests & coverage (push) Successful in 3m45s
Docs Check / Markdown lint (push) Successful in 1m14s
Build and Push Docker Image / build (push) Successful in 1m52s
Licence Check / Licence compatibility and copyright header verification (push) Successful in 1m55s
CI / Security audit (push) Successful in 2m25s
Docs Check / Mermaid diagram parse check (push) Successful in 3m6s
CI / Swagger Validation & Coverage (push) Successful in 3m22s
CI / Tests & coverage (push) Successful in 3m45s
This commit is contained in:
+91
-13
@@ -17,17 +17,52 @@ import { applyRequestFilters, getRequestStatus } from '../utils/ombiFilters.js';
|
||||
function extractRequestedUser(request) {
|
||||
if (!request) return '';
|
||||
|
||||
// Handle object format: OmbiStore.Entities.OmbiUser
|
||||
if (request.requestedUser && typeof request.requestedUser === 'object') {
|
||||
// Priority: alias > userAlias > userName > normalizedUserName > requestedByAlias
|
||||
return request.requestedUser.alias ||
|
||||
request.requestedUser.userAlias ||
|
||||
request.requestedUser.userName ||
|
||||
request.requestedUser.normalizedUserName ||
|
||||
request.requestedByAlias || '';
|
||||
// Try to locate a user object or string from various fields common to Ombi Movies and TV shows
|
||||
const userSource = request.requestedUser || request.RequestedUser ||
|
||||
request.user || request.User ||
|
||||
request.requestedBy || request.RequestedBy ||
|
||||
request.ombiUser || request.OmbiUser ||
|
||||
request.requestedByUser || request.RequestedByUser;
|
||||
|
||||
// If userSource is an object, extract key fields
|
||||
if (userSource && typeof userSource === 'object') {
|
||||
const username = userSource.alias || userSource.Alias ||
|
||||
userSource.userAlias || userSource.UserAlias ||
|
||||
userSource.userName || userSource.UserName ||
|
||||
userSource.normalizedUserName || userSource.NormalizedUserName ||
|
||||
userSource.displayName || userSource.DisplayName ||
|
||||
userSource.email || userSource.Email;
|
||||
if (username) return username;
|
||||
}
|
||||
// Handle string format (fallback for compatibility)
|
||||
return request.requestedUser || request.requestedByAlias || '';
|
||||
|
||||
// If userSource is a string
|
||||
if (userSource && typeof userSource === 'string') {
|
||||
return userSource;
|
||||
}
|
||||
|
||||
// Fallbacks on the request root level
|
||||
const rootFallback = request.requestedByAlias || request.RequestedByAlias ||
|
||||
request.requestedByUsername || request.RequestedByUsername ||
|
||||
request.requester || request.Requester ||
|
||||
request.requestedByEmail || request.RequestedByEmail;
|
||||
if (rootFallback) return rootFallback;
|
||||
|
||||
// Check seasons / childRequests nested arrays (common for Ombi TV show requests)
|
||||
if (Array.isArray(request.seasons)) {
|
||||
for (const season of request.seasons) {
|
||||
const seasonUser = extractRequestedUser(season);
|
||||
if (seasonUser) return seasonUser;
|
||||
}
|
||||
}
|
||||
|
||||
if (Array.isArray(request.childRequests)) {
|
||||
for (const child of request.childRequests) {
|
||||
const childUser = extractRequestedUser(child);
|
||||
if (childUser) return childUser;
|
||||
}
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
export function renderRequests() {
|
||||
@@ -111,11 +146,38 @@ function createRequestCard(request) {
|
||||
}
|
||||
|
||||
const username = extractRequestedUser(request);
|
||||
const user = document.createElement('span');
|
||||
user.className = 'request-user';
|
||||
if (username) {
|
||||
const user = document.createElement('span');
|
||||
user.className = 'request-user';
|
||||
user.textContent = `Requested by: ${username}`;
|
||||
meta.appendChild(user);
|
||||
} else {
|
||||
user.textContent = 'Requested by: Unknown (Ombi)';
|
||||
user.title = 'No user information received from Ombi';
|
||||
user.style.cursor = 'help';
|
||||
user.style.textDecoration = 'underline dotted';
|
||||
}
|
||||
meta.appendChild(user);
|
||||
|
||||
const dateStr = request.requestedDate || request.RequestedDate || request.date || request.Date;
|
||||
if (dateStr) {
|
||||
const requestDate = document.createElement('span');
|
||||
requestDate.className = 'request-date';
|
||||
try {
|
||||
const dateObj = new Date(dateStr);
|
||||
if (!isNaN(dateObj.getTime())) {
|
||||
const year = dateObj.getFullYear();
|
||||
const month = String(dateObj.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(dateObj.getDate()).padStart(2, '0');
|
||||
const hours = String(dateObj.getHours()).padStart(2, '0');
|
||||
const minutes = String(dateObj.getMinutes()).padStart(2, '0');
|
||||
requestDate.textContent = `Date: ${year}-${month}-${day} ${hours}:${minutes}`;
|
||||
} else {
|
||||
requestDate.textContent = `Date: ${dateStr}`;
|
||||
}
|
||||
} catch (e) {
|
||||
requestDate.textContent = `Date: ${dateStr}`;
|
||||
}
|
||||
meta.appendChild(requestDate);
|
||||
}
|
||||
|
||||
if (request.quality) {
|
||||
@@ -147,6 +209,22 @@ function createRequestCard(request) {
|
||||
actions.appendChild(ombiLink);
|
||||
}
|
||||
|
||||
if (state.isAdmin && request.arrLink) {
|
||||
const arrLink = document.createElement('a');
|
||||
arrLink.className = `request-link ${request.arrType}-link`;
|
||||
arrLink.href = request.arrLink;
|
||||
arrLink.target = '_blank';
|
||||
arrLink.title = `View in ${request.arrType === 'sonarr' ? 'Sonarr' : 'Radarr'}`;
|
||||
|
||||
const arrIcon = document.createElement('img');
|
||||
arrIcon.src = request.arrType === 'sonarr' ? '/images/sonarr.svg' : '/images/radarr.svg';
|
||||
arrIcon.alt = request.arrType === 'sonarr' ? 'Sonarr' : 'Radarr';
|
||||
arrIcon.className = 'request-icon';
|
||||
|
||||
arrLink.appendChild(arrIcon);
|
||||
actions.appendChild(arrLink);
|
||||
}
|
||||
|
||||
card.appendChild(typeIcon);
|
||||
card.appendChild(content);
|
||||
card.appendChild(actions);
|
||||
|
||||
+29
-10
@@ -4,24 +4,43 @@ import { getTheme, saveTheme } from '../utils/storage.js';
|
||||
|
||||
// Apply saved theme immediately on load
|
||||
(function applyTheme() {
|
||||
const theme = getTheme();
|
||||
if (theme) {
|
||||
document.documentElement.setAttribute('data-theme', theme);
|
||||
}
|
||||
const theme = getTheme() || 'light';
|
||||
document.documentElement.setAttribute('data-theme', theme);
|
||||
})();
|
||||
|
||||
export function initThemeSwitcher() {
|
||||
const themeToggle = document.getElementById('theme-toggle');
|
||||
if (!themeToggle) return;
|
||||
const themeButtons = document.querySelectorAll('.theme-btn');
|
||||
const currentTheme = getTheme() || 'light';
|
||||
|
||||
themeToggle.addEventListener('click', () => {
|
||||
const currentTheme = getTheme();
|
||||
const newTheme = currentTheme === 'dark' ? 'light' : 'dark';
|
||||
setTheme(newTheme);
|
||||
// Set initial active state on buttons
|
||||
themeButtons.forEach(btn => {
|
||||
if (btn.getAttribute('data-theme') === currentTheme) {
|
||||
btn.classList.add('active');
|
||||
} else {
|
||||
btn.classList.remove('active');
|
||||
}
|
||||
|
||||
btn.addEventListener('click', () => {
|
||||
const theme = btn.getAttribute('data-theme');
|
||||
if (theme) {
|
||||
setTheme(theme);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
export function setTheme(theme) {
|
||||
document.documentElement.setAttribute('data-theme', theme);
|
||||
saveTheme(theme);
|
||||
|
||||
// Sync button active classes if elements are present on the page
|
||||
const themeButtons = document.querySelectorAll('.theme-btn');
|
||||
themeButtons.forEach(btn => {
|
||||
if (btn.getAttribute('data-theme') === theme) {
|
||||
btn.classList.add('active');
|
||||
} else {
|
||||
btn.classList.remove('active');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user