mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge 408a52961a into 7d84185d0e

Browse source
This commit is contained in:
Josh Stock 2025-03-30 11:01:13 -04:00 • committed by GitHub
commit 19a1107104
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/components/activitylog.js
View file

@ -61,20 +61,13 @@ function renderList(elem, apiClient, result) {
} }
function reloadData(instance, elem, apiClient, startIndex, limit) { function reloadData(instance, elem, apiClient, startIndex, limit) {
if (startIndex == null) { startIndex ||= parseInt(elem.getAttribute('data-activitystartindex') || '0', 10);
startIndex = parseInt(elem.getAttribute('data-activitystartindex') || '0', 10); limit ||= parseInt(elem.getAttribute('data-activitylimit') || '7', 10);
}
limit = limit || parseInt(elem.getAttribute('data-activitylimit') || '7', 10);
const minDate = new Date(); const minDate = new Date();
const hasUserId = toBoolean(elem.getAttribute('data-useractivity'), true); const hasUserId = toBoolean(elem.getAttribute('data-useractivity'), true);
const daysOffset = hasUserId ? 1 : 7; // one day back if user id, otherwise one week
// TODO: Use date-fns // TODO: Use date-fns
if (hasUserId) { minDate.setTime(minDate.getTime() - daysOffset * 24 * 60 * 60 * 1000);
minDate.setTime(minDate.getTime() - 24 * 60 * 60 * 1000); // one day back
} else {
minDate.setTime(minDate.getTime() - 7 * 24 * 60 * 60 * 1000); // one week back
}
ApiClient.getJSON(ApiClient.getUrl('System/ActivityLog/Entries', { ApiClient.getJSON(ApiClient.getUrl('System/ActivityLog/Entries', {
startIndex: startIndex, startIndex: startIndex,
@ -84,17 +77,8 @@ function reloadData(instance, elem, apiClient, startIndex, limit) {
})).then(function (result) { })).then(function (result) {
elem.setAttribute('data-activitystartindex', startIndex); elem.setAttribute('data-activitystartindex', startIndex);
elem.setAttribute('data-activitylimit', limit); elem.setAttribute('data-activitylimit', limit);
if (!startIndex) {
const activityContainer = dom.parentWithClass(elem, 'activityContainer'); const activityContainer = dom.parentWithClass(elem, 'activityContainer');
activityContainer?.classList.toggle('hide', result.Items.length === 0 && startIndex === 0);
if (activityContainer) {
if (result.Items.length) {
activityContainer.classList.remove('hide');
} else {
activityContainer.classList.add('hide');
}
}
}
instance.items = result.Items; instance.items = result.Items;
renderList(elem, apiClient, result); renderList(elem, apiClient, result);