From da6a8cbbbf52700932add79b52611a5eb9eb8644 Mon Sep 17 00:00:00 2001 From: Johnscaban <65033937+Johnscaban@users.noreply.github.com> Date: Wed, 1 May 2024 19:22:36 +0000 Subject: [PATCH 1/4] add option to enable rewatching in next up section --- components/home/LoadItemsTask.bs | 2 +- locale/en_US/translations.ts | 10 ++++++++++ settings/settings.json | 7 +++++++ source/utils/quickplay.bs | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/components/home/LoadItemsTask.bs b/components/home/LoadItemsTask.bs index 369ce7b43..1c3049e9e 100644 --- a/components/home/LoadItemsTask.bs +++ b/components/home/LoadItemsTask.bs @@ -68,7 +68,7 @@ sub loadItems() params["SortOrder"] = "Descending" params["ImageTypeLimit"] = 1 params["UserId"] = m.global.session.user.id - params["EnableRewatching"] = false + params["EnableRewatching"] = m.global.session.user.settings["ui.details.enablerewatchingnextup"] params["DisableFirstEpisode"] = false params["limit"] = 24 params["EnableTotalRecordCount"] = false diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts index 8ae2cb15a..26849358e 100644 --- a/locale/en_US/translations.ts +++ b/locale/en_US/translations.ts @@ -1266,5 +1266,15 @@ Ratings for how good a movie is User Setting - Setting description + + Enable Rewatching Next Up + Enable Rewatching Next Up + User Setting - Setting title + + + Enable showing already watched episodes in 'Next Up' sections. + Enable showing already watched episodes in 'Next Up' sections. + User Setting - Setting description + \ No newline at end of file diff --git a/settings/settings.json b/settings/settings.json index d5b67399d..9493a6bfb 100644 --- a/settings/settings.json +++ b/settings/settings.json @@ -234,6 +234,13 @@ "type": "integer", "default": "365" }, + { + "title": "Enable Rewatching Next Up", + "description": "Enable showing already watched episodes in 'Next Up' sections.", + "settingName": "ui.details.enablerewatchingnextup", + "type": "bool", + "default": "false" + }, { "title": "Show What's New Popup", "description": "Show What's New popup when Jellyfin is updated to a new version.", diff --git a/source/utils/quickplay.bs b/source/utils/quickplay.bs index cca3dfa96..3dcb149f1 100644 --- a/source/utils/quickplay.bs +++ b/source/utils/quickplay.bs @@ -166,7 +166,7 @@ namespace quickplay "SortOrder": "Descending", "ImageTypeLimit": 1, "UserId": m.global.session.user.id, - "EnableRewatching": false, + "EnableRewatching": m.global.session.user.settings["ui.details.enablerewatchingnextup"], "DisableFirstEpisode": false, "EnableTotalRecordCount": false }) From c01cb15fdef6b19253f1f7c26c35713572ca0cbc Mon Sep 17 00:00:00 2001 From: Johnscaban <65033937+Johnscaban@users.noreply.github.com> Date: Sat, 20 Jul 2024 18:23:37 -0400 Subject: [PATCH 2/4] change wording of rewatching option for consistency Co-authored-by: Charles Ewert --- settings/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/settings.json b/settings/settings.json index 9493a6bfb..6f5e15c00 100644 --- a/settings/settings.json +++ b/settings/settings.json @@ -235,8 +235,8 @@ "default": "365" }, { - "title": "Enable Rewatching Next Up", - "description": "Enable showing already watched episodes in 'Next Up' sections.", + "title": "Rewatching Next Up", + "description": "Show already watched episodes in 'Next Up' sections.", "settingName": "ui.details.enablerewatchingnextup", "type": "bool", "default": "false" From c86dd4c4aa5eab9ff2765d796d3ef71dda2c77ab Mon Sep 17 00:00:00 2001 From: Johnscaban <65033937+Johnscaban@users.noreply.github.com> Date: Sun, 21 Jul 2024 09:41:55 -0400 Subject: [PATCH 3/4] update translations for rewatching option --- locale/en_US/translations.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts index eaac8ba3a..81c122358 100644 --- a/locale/en_US/translations.ts +++ b/locale/en_US/translations.ts @@ -1272,14 +1272,14 @@ User Setting - Setting description - Enable Rewatching Next Up - Enable Rewatching Next Up + Rewatching Next Up + Rewatching Next Up User Setting - Setting title - Enable showing already watched episodes in 'Next Up' sections. - Enable showing already watched episodes in 'Next Up' sections. + Show already watched episodes in 'Next Up' sections. + Show already watched episodes in 'Next Up' sections. User Setting - Setting description - \ No newline at end of file + From d34f1c304f70c756d3919d18736e62fd2dcf3513 Mon Sep 17 00:00:00 2001 From: jellyfin-bot Date: Sun, 21 Jul 2024 14:36:41 +0000 Subject: [PATCH 4/4] Update API docs --- docs/api/components_home_LoadItemsTask.bs.html | 2 +- docs/api/source_utils_quickplay.bs.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/components_home_LoadItemsTask.bs.html b/docs/api/components_home_LoadItemsTask.bs.html index a9d364eee..c58f7275e 100644 --- a/docs/api/components_home_LoadItemsTask.bs.html +++ b/docs/api/components_home_LoadItemsTask.bs.html @@ -70,7 +70,7 @@ params["SortOrder"] = "Descending" params["ImageTypeLimit"] = 1 params["UserId"] = m.global.session.user.id - params["EnableRewatching"] = false + params["EnableRewatching"] = m.global.session.user.settings["ui.details.enablerewatchingnextup"] params["DisableFirstEpisode"] = false params["limit"] = 24 params["EnableTotalRecordCount"] = false diff --git a/docs/api/source_utils_quickplay.bs.html b/docs/api/source_utils_quickplay.bs.html index 4d4a432cb..3052f6c8a 100644 --- a/docs/api/source_utils_quickplay.bs.html +++ b/docs/api/source_utils_quickplay.bs.html @@ -168,7 +168,7 @@ "SortOrder": "Descending", "ImageTypeLimit": 1, "UserId": m.global.session.user.id, - "EnableRewatching": false, + "EnableRewatching": m.global.session.user.settings["ui.details.enablerewatchingnextup"], "DisableFirstEpisode": false, "EnableTotalRecordCount": false })