diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..3b75d0fa --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,1732 @@ +# [Unreleased] + +These changes are awaiting release: + +## Data migrations + +This is the first time migrations are being taken place when updating Watcharr, please be mindful of that and **ensure you have your existing database backed up** incase of any errors. + +### Backfilling `plays` data from users Activity. + +This migration was added so that existing data could be used to fill out how many plays of your media you have. It can't be 100% accurate because it has to make some assumptions, but it can get close and saves you a lot of time. + +### Dropping `deleted_at` columns for `watched_seasons` and `watched_episodes` tables since we do not use them. + +I noticed that queries (eg for loading your main list) would take an extra ~100ms because we were adding a `deleted_at IS NULL` to them when getting watched seasons/episodes. We don't use the deleted_at column, so I have just removed it from the tables (and queries so we have the speed boost). + +### Moving to using WAL journal_mode for our sqlite database, which will grant us improvements in all areas. + +Most database operations will be much faster now and more concurrent use of the database is now possible. + +#### Important Note About Backups + +You will notice that the database now comprises of three files: `watcharr.db` (which has always been there) and `watcharr.db-wal`, `watcharr.db-shm` (which are new). + +If you backup your database by copying the .db file (while your server is stopped of course), you should also copy the `watcharr.db-wal` file since it can contain database content. You can ignore the `watcharr.db-shm` file if you want. + +## Added + +- DB: Add custom migrations support. +- Activity: New `CountAsPlay` property for tracking media total plays (this will speed up counting plays since we'll no longer rely on text searches in the db). + - Migration: Backfill media plays data from existing user activity, so no one has to start from `0` plays when they already have data we can use to get their total plays. +- Add link to names of top crew members. +- Return `Plays` in WatchedDto where used. +- Show `plays` count for media in `MyReview` component. +- Activity: Show icon for activity that counts as a play. + +## Changed + +- Moved db to WAL journal_mode. +- WatchedUpdateRequest: Manually validate instead of using complex struct tags. + - Now properly validating WatchedStatus. + +## Fixed + +- fix safari: Shrikhand font. +- Icon: Fix status icons not having width and height properties not set. +- Status: Fix button sizes now that icons have a width/height set. +- Nav: Fix logo link being clickable through whole left side of nav. +- import: myanimelist: Don't import start/finish dates when they are empty. +- Star and Play icons color. +- Activity: Fixed automation tooltip going out of bounds by moving it to top. + +## Removed + +- Drop `deleted_at` columns for watched episode/season tables. +- Removed `AddActivity` (POST /activity) endpoint (Thanks [@Dredsen] for pointing out the flaw). + +## Documentation + +- Backup: Also note that `watcharr.db-wal` should be backed up along with the .db file since v3. + +# [3.0.1] - 2026-03-09 + +Hi All, delivered straight to your inbox today; you have bug fixes, some even improving general quality of life!! + +**How a poster will now look after deleting it (until you refresh the view)** + +example of blurred poster + +## Fixed + +- Fix syncing/import, restoreWatched renamed and now works like it used to so we can return different exists errors by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/1029 +- Support importing games (from watcharr export, or txt list) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/1030 +- If person doesn't have birthday, don't attempt processing (fixing showing age as 2025 years) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/1031 +- Fix 'sparkes' (automated) icon on Activity and fix it not showing on mobile by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/1031 +- Add confirmation modal when deleting from your list to avoid accidental data loss by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/1032 +- Blur poster when deleting watched entry from list through it by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/1033 + +## Docs + +- Correct license reference on homepage by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/1031 + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/725348034?tag=v3.0.1 or on [docker hub](https://hub.docker.com/layers/sbondco/watcharr/v3.0.1/images/sha256-ccc87af68982c1bc66f848e2925c45c4f8f1f70f53412564bd80d6b8521a6789). + +# [3.0.0] - 2026-03-04 + +> [!NOTE] +> The next release is finally here! Don't worry about the major version bump though, there's nothing for you to do, other than update your server as usual. +> +> If you are using custom scripts, you may find that they need updating as a few endpoints have been removed and some now return a new data structure. +> +> As always, it is highly recommended that you perform a backup before updating (https://watcharr.app/docs/server_config/backup)! + +image + +## Deprecations + +If you have any questions about the deprecations, I'm reachable on Matrix (or you can open an issue/discussion; more info at the bottom of these release notes). + +- `Include Previously Watched` setting no longer works for your main list and is due to be removed. The 'Last Finished' sort now acts as if this setting is set to 'true' (previously it defaulted to 'false'). +- The `AddWatched` api is now also used for Games (The separate `AddPlayed` api was removed). +- The `AddWatched` api now accepts a `tmdbId` for movies/tv OR an `igdbId` for games. + - It still supports the old `contentId` field to ensure any custom scripts out there still work, but in one of the future releases, this will be removed. You will see a warning in your logs if you are still using this property. +- All search endpoints have been replaced with a new central search endpoint that encompasses all behavior from the last endpoints. + +## New + +- Redesigned the top half of content pages. +- Redesigned people pages. + - Added expandable biography (we are no longer limited to the first paragraph). + - Added `age`. +- Your watched list is now delivered with pagination and infinite loading. + - Gets you to your data quicker. + - Reduces bandwidth usage. + - Sorting and filtering is now done server-side (saving your device). +- Created a new centralized Search service. + - Search by (external) id now occurs on server. +- Search: Support searching your own watched list for results before needing to go out to external db. +- import: You can now provide your own api key when doing a Trakt import (incase our included api key ever stops working). +- Games: Added providers (currently just: `Steam`, `GOG` & `itch.io`) +- Discover: Overhauled the entire experience. + - Added games and people types. + - Added sorting options. + - Now with pagination so you can keep browsing past the top results for each media type and sort. +- Nav: The main search bar is now truly centered on the page and no longer jumps around when navigating through different pages. +- Added version log to server (with nice art if you are looking at cli output). + +## Changed + +- Games now use the normal `Poster` component (`GamePoster` has been deleted). +- Game results now loads max 40 records at once (previously was 10). +- Restyled the Error component that is shown when data fails to load for pages. + +## Fixed + +- Removed spammed duplicate styling being added to built styles (reducing wasted bandwidth on duplicate styling). +- Trakt importing. +- Replaced some `log.Fatal`s with real error responses. +- Improve twitch config by not writing empty time. + +## Documentation + +- Importing/Trakt: New section for optional api key field. +- Update screenshots to match new UI and add a person page screenshot. + +## Maintenence + +- Watcharr is now licensed under GPLv3! +- Server code has been completely redesigned/restructured. +- Created Makefiles for server/client. + - For usual dev commands. + - Added a nice `version` job for updating app version. +- Created a [FEATURES.md](/FEATURES.md). +- Upgrade to go 1.25. +- Dockerfile: Fix COPY requiring trailing slash on dest dir. +- Upgrade all doc site dependencies. + +## A Note + +I hope you all enjoy this release. Please feel free to provide any feedback and report any bugs you find! + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/716738135?tag=v3.0.0 or on [docker hub](https://hub.docker.com/layers/sbondco/watcharr/v3.0.0/images/sha256-1caeaec2dd8262864684e5b5156d230fc159102fccdcd150c46277b906a35f46). + +# [2.1.1] - 2025-07-15 + +## Fixed + +- import: Perfect matching now takes Year into account if provided by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/915 +- StarRating: Ignore star presses if scroll position changes from start to end of click (this should fix accidental rating changes when trying to scroll down the page on mobile) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/916 +- Fix Twitch init error logging bug by [@ParksideParade] in https://github.com/sbondCo/Watcharr/pull/921 +- fix bug on return from blurhash.Encode by [@ParksideParade] in https://github.com/sbondCo/Watcharr/pull/922 + +## Credits + +Many thanks to everyone who has worked on this release! + +- [@ParksideParade] made their first contribution in https://github.com/sbondCo/Watcharr/pull/921 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/462309867?tag=v2.1.1 or on [docker hub](https://hub.docker.com/layers/sbondco/watcharr/v2.1.1/images/sha256-8a94e8c5b718e61c073117b6eaef24095b326e94a9114bf56fe10ad0f0ae959e). + +# [2.1.0] - 2025-05-18 + +## New + +- About modal (accessible via face menu) by [@Clusters] in https://github.com/sbondCo/Watcharr/pull/811 +- System app theme (automatically swaps between light/dark themes depending on system config) by @antoniosarro in https://github.com/sbondCo/Watcharr/pull/822 +- Search shortcut (`Ctrl+S`) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/886 + +## Fixed + +- Improve imdb import accuracy by [@jigglycrumb] in https://github.com/sbondCo/Watcharr/pull/880 +- Support for importing ryot 8 files by [@IvanBeke] in https://github.com/sbondCo/Watcharr/pull/862 +- Search: add missing keys that search handler should ignore by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/886 + +## Maintenance + +- server: bump github.com/gin-contrib/cors from 1.7.3 to 1.7.5 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/864 +- server: bump golang.org/x/crypto from 0.32.0 to 0.37.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/863 +- server: bump github.com/golang-jwt/jwt/v5 from 5.2.1 to 5.2.2 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/846 +- server: bump github.com/go-co-op/gocron/v2 from 2.14.2 to 2.16.1 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/842 +- ui: bump @sveltejs/kit from 2.16.0 to 2.20.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/875 +- ui: bump vite from 6.0.7 to 6.2.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/873 +- ui: bump axios from 1.7.9 to 1.8.4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/855 +- ui: bump prettier-plugin-svelte from 3.3.2 to 3.3.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/773 +- ui: bump @typescript-eslint/eslint-plugin from 8.19.0 to 8.30.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/874 +- ui: bump sass from 1.83.0 to 1.86.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/867 +- ui: bump eslint-config-prettier from 9.1.0 to 10.1.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/872 +- ui: bump typescript from 5.7.2 to 5.8.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/865 + +## Documentation + +- doc: Add text-file, trakt, watcharr pages for importing. by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/883 + +## Credits + +Many thanks to everyone who has worked on this release! + +- [@Clusters] made their first contribution in https://github.com/sbondCo/Watcharr/pull/811 +- [@jigglycrumb] made their first contribution in https://github.com/sbondCo/Watcharr/pull/880 +- [@IvanBeke] made their first contribution in https://github.com/sbondCo/Watcharr/pull/862 + +## The Future + +v3.0 has been in-progress for a while now. A rework of how list data is handled is coming soon. Nothing but better performance should be noticed by you (as usual, there will be zero breaking changes so don't worry about migrations). When v3.0 is released, we will get back to more regular feature releases. + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/418145464?tag=v2.1.0 or on [docker hub](https://hub.docker.com/layers/sbondco/watcharr/v2.1.0/images/sha256-09f4dbc21aa67b689516357fb51718470dc2c0985bcc272c34d5cd94c5ef9cc7). + +# [2.0.2] - 2025-02-16 + +## Fixed + +- DetailedMenu: Fix state not properly being saved (and as a result, wlDetailView not being updated in localStorage, causing the setting to reset after a page refresh) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/814 + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/356688609?tag=v2.0.2 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v2.0.2/images/sha256-1e82b2c173ff035e6f333485a5526a3670c5dfd27b9e163ffac12893d7f4469a) + +# [2.0.1] - 2025-02-14 + +## New + +- Search by IGDB ID & TMDB ID support by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/807 +- SeasonsList: Added season status and episode count to entries by [@antoniosarro] in https://github.com/sbondCo/Watcharr/pull/784 + ![image](./changelog/2.0.1/0.png) +- SeasonsList: Horizontal scroller for mobile view by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/808 + ![image](./changelog/2.0.1/1.png) + +## Fixed + +- Game: Fix search when query contains special character (space, etc) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/806 + +## New Contributors + +- [@antoniosarro] made their first contribution in https://github.com/sbondCo/Watcharr/pull/784 + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/355568229?tag=v2.0.1 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v2.0.1/images/sha256-6faa2ffe0d1a96921d7c6f17ada5bd005cf83ea5776bf23c39b82c434a3a20fd) + +# [2.0.0] - 2025-01-23 + +> [!NOTE] +> The next release is finally here! Don't worry about the major version bump though, there's nothing for you to do, other than update your server as usual ([more details here](https://github.com/sbondCo/Watcharr/discussions/768)). +> +> It is still recommended that you perform a backup before updating! + +## New + +- Trusted header authentication by [@lufixSch] & [@IRHM] in https://github.com/sbondCo/Watcharr/pull/736 +- Person: Ability to sort items in people view by [@AlexPerathoner] in https://github.com/sbondCo/Watcharr/pull/670 +- Person: 'On my list' filter support by [@AlexPerathoner] & [@IRHM] in https://github.com/sbondCo/Watcharr/pull/704 +- Person: show message when no credits to show by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/705 +- Search by external id (with this format: `provider:id`, example: `imdb:tt15435876`) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/709 + - imdb (aliases: `i`, `imd`) + - tvdb (aliases: `thetvdb`) + - youtube (aliases: `yt`) + - wikidata (aliases: `wd`, `wdt`) + - facebook + - instagram + - twitter + - tiktok +- Search: Support special characters (technically breaking, but only for frontend url, not api) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/713 +- Imdb import (for movies & tv) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/726 +- Imdb episodes import support (only if show is imported too from list) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/728 +- Create a default error page by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/738 +- manage_users: Support swapping users between Watcharr/Proxy user types (which enabled a migration path for existing users over to becoming a trusted header user) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/747 + +## Changed + +- Migration to Svelte 5, new code format rules for frontend, some general overdue refactoring by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/762 + - Full migration to Svelte 5 (instead of slowly migrating, everything has been moved over to use Svelte 5 features now) + - The store is now an object using the $state rune, instead of using a svelte store. All uses have been updated, looks a lot cleaner now! + - Edited prettierrc: Use default `printWidth` of 80, Always leave trailing `,`, use tabs. + - All code reformatted to use Tabs instead of Spaces (have been meaning to fix this for a while, all the code being changed in this pr was a good excuse to get it done). + - Code makeover: A lot of stuff has been refactored to be (more) pleasing to the eyes. + +## Fixed + +- import: Disable 'change statuses' button while importing by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/727 +- Fix search debounce and styling by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/770 +- Fix importing state error by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/781 + +## Documentation + +- New screenshots for readme/doc site by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/771 + +## Maintenance + +- ui: bump @sveltejs/kit from 2.5.27 to 2.15.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/737 +- ui: bump @typescript-eslint/eslint-plugin from 7.14.1 to 8.18.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/733 +- ui: bump typescript from 5.5.4 to 5.7.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/703 +- ui: bump @vite-pwa/sveltekit from 0.5.0 to 0.6.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/669 +- ui: bump prettier from 3.3.2 to 3.4.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/714 +- server: bump github.com/go-co-op/gocron/v2 from 2.11.0 to 2.14.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/731 +- server: bump gorm.io/driver/sqlite from 1.5.6 to 1.5.7 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/723 +- server: bump golang.org/x/crypto from 0.27.0 to 0.31.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/717 +- ui: bump @types/papaparse from 5.3.14 to 5.3.15 by @dependabot in https://github.com/sbondCo/Watcharr/pull/742 +- server: bump github.com/gin-contrib/cors from 1.7.2 to 1.7.3 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/745 +- server: bump golang.org/x/crypto from 0.31.0 to 0.32.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/748 +- server: bump github.com/gin-contrib/cache from 1.3.0 to 1.3.1 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/746 +- server: bump github.com/go-co-op/gocron/v2 from 2.14.0 to 2.14.2 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/761 +- ui: bump @sveltejs/adapter-node from 5.2.11 to 5.2.12 by @dependabot in https://github.com/sbondCo/Watcharr/pull/763 +- ui: bump @sveltejs/kit from 2.15.1 to 2.16.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/764 + +## Thanks + +- [@lufixSch] For getting the base work done for the trusted header authentication support. +- [@christaikobo] For providing valuable feedback on trusted header authentication implementation. +- [@AlexPerathoner] For continued work on improving quality of life for the frontend. + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/342565711?tag=v2.0.0 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v2.0.0/images/sha256-efaf2f5aed5e6e0ef86f0e981f5c76949147d19fb2f4c28467eb55bf6df4e079) + +# [1.44.2] - 2024-10-15 + +## Fixed + +- GamePoster: Fix focus lost issue on rating/status via quick btns by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/659 +- Import: Ryot: Fix dates not importing for watched episodes by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/664 + +## Thanks + +- [@SirMartin] for reporting the Ryot import issue in #663 + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/289810676?tag=v1.44.2 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.44.2/images/sha256-85df9a7f4e7cb73d89edf546c9458a096d40d2641c22e36d6ad41aa15da47625?context=explore) +**Full Changelog**: https://github.com/sbondCo/Watcharr/compare/ + +# [1.44.1] - 2024-10-13 + +## Fixed + +- Fix PosterRating `minimal` option (previously stopped the popup from showing when used in the Seasons List and its Episode Items) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/655 +- Poster: Fix focus lost after giving status/rating via quick btns by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/657 +- Improve download file func - don't make empty files, add extra logging by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/658 + +## Maintenance + +- Created a [security policy](https://github.com/sbondCo/Watcharr/blob/dev/SECURITY.md) for the repository. + +## Thanks + +- [@senz] for reporting the PosterRating issue in #654 + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/288447184?tag=v1.44.1 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.44.1/images/sha256-90c2c58cd0d2d74ada7eaaf0350fb7c928b0d89f0031dc1c93a0bae653fcbe8c?context=explore) + +# [1.44.0] - 2024-10-06 + +**IMPORTANT: This release contains security fixes, please make sure you upgrade!** Thanks to [@yamerooo123] for reporting the issues to me. + +## New + +- New rating systems (with better keyboard accessibility) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/627 + ![Current UI for the related settings](./changelog/1.44.0/0.png) + ![image](./changelog/1.44.0/1.png) +- Import: add todomovies by [@AlexPerathoner] in https://github.com/sbondCo/Watcharr/pull/618 +- test-pr.yml: Add format_check_go job by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/634 + +## Fixed + +- Fix no filtering tag page and other stuffs i found by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/633 +- Fix tagmenu going out of bounds by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/636 +- Fix poster focus/accessibility issues and middle clicking by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/647 +- Fix poster summary overflowing by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/648 + +## Maintenance + +- ui: bump svelte from 4.2.17 to 4.2.19 by @dependabot in https://github.com/sbondCo/Watcharr/pull/611 +- ui: bump vite from 5.2.11 to 5.4.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/631 +- ui: bump @sveltejs/kit from 2.5.24 to 2.5.27 by @dependabot in https://github.com/sbondCo/Watcharr/pull/629 +- server: bump gorm.io/gorm from 1.25.11 to 1.25.12 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/623 +- ui: bump @sveltejs/adapter-node from 5.0.1 to 5.2.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/635 +- server: bump golang.org/x/crypto from 0.26.0 to 0.27.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/624 +- ui: bump svelte-check from 3.8.6 to 4.0.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/628 +- ui: bump prettier-plugin-svelte from 3.2.3 to 3.2.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/616 + +## New Contributors + +- [@AlexPerathoner] made their first contribution in https://github.com/sbondCo/Watcharr/pull/618 + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/284866355?tag=v1.44.0 or on [docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.44.0/images/sha256-0ef8377d2bb68fe6f793ab9c994cc097b20582f646d29311db98aae2ab11a63d?context=explore). + +# [1.43.0] - 2024-08-30 + +## New + +- Page titles for browser tabs (profile, content, person) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/607 +- Preload last season viewed by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/609 + +## Fixed + +- person: Fix credits not changing if nav between two people by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/608 + +## πŸ”¨ Maintenance + +- ui: bump svelte-eslint-parser from 0.39.2 to 0.41.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/606 +- ui: bump eslint-plugin-svelte from 2.41.0 to 2.43.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/603 +- ui: bump tslib from 2.6.2 to 2.7.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/605 +- ui: bump svelte-check from 3.8.5 to 3.8.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/604 + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/265758944?tag=v1.43.0 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.43.0/images/sha256-fe0735de2ce51920560e559145945a214b000c91687682aa95c6b73b2dcb4a3b?context=explore) + +# [1.42.0] - 2024-08-25 + +## New + +- Trakt import support by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/582 +- Tags (you can now attach custom made tags to content in your main list) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/597 +- job: support adding unique jobs (by name) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/583 + +## Changed + +- Close all sub menus on nav bar after a navigation by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/598 +- api: Use `location` to create `baseURL` var in dev mode by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/599 + +## Fixed + +- Fixed unit oversight ('m' -> 'min' for episodes) by @oPisiti in https://github.com/sbondCo/Watcharr/pull/578 + +## πŸ“– [Documentation](https://watcharr.app/) + +- doc: Create backup guide by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/573 + +## πŸ”¨ Maintenance + +- ui: bump @sveltejs/kit from 2.5.10 to 2.5.24 by @dependabot in https://github.com/sbondCo/Watcharr/pull/596 +- server: bump golang.org/x/crypto from 0.24.0 to 0.26.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/593 +- ui: bump axios from 1.7.2 to 1.7.4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/600 +- ui: bump svelte-check from 3.7.1 to 3.8.5 by @dependabot in https://github.com/sbondCo/Watcharr/pull/590 +- ui: bump typescript from 5.4.5 to 5.5.4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/588 +- ui: bump svelte-preprocess from 5.1.4 to 6.0.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/586 +- server: bump gorm.io/gorm from 1.25.10 to 1.25.11 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/584 +- server: bump github.com/go-co-op/gocron/v2 from 2.7.0 to 2.11.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/587 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/263151699?tag=v1.42.0 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.42.0/images/sha256-cfb51f589e568e889e97d4ba99754e27f5dd701afc8dc7f2ac59d1c351e8fdcb?context=explore) + +# [1.41.0] - 2024-06-28 + +I spent a lot of time trying to make sure no bugs were introduced with the new search features, please don't hesitate to reach out if you think someone is not working as intended! + +## 🧠 New + +- Search: Infinite scrolling and serverside content type filters by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/562 + - Search now supports scrolling through multiple pages of results, making it possible to find content that may have been hidden in the past. + - The search filters (Movies, TV Shows, Games, People) have been reworked to filter through the server, this leads to better results and more of them. + - Running search requests will now be cancelled if you navigate away from the page or if you change your search query (helps a lot on slower connections). +- Ryot import implementation by [@oPisiti] in https://github.com/sbondCo/Watcharr/pull/563 + +## πŸ’― Changed + +- Time unit changes by [@oPisiti] in https://github.com/sbondCo/Watcharr/pull/563 + - Movie/show runtimes are now printed as `24 min` instead of `24m` + - Time spent watching stats can now show `months, weeks, days, hours & minutes`, instead of just the previous `hours and minutes`. + +## πŸ—οΈ Fixed + +- Fix server side rating validation for imports, watched episodes and watched seasons in https://github.com/sbondCo/Watcharr/commit/7888e0490f20dfd31cffa17d92e0d90506ca6882 + +## πŸ”¨ Maintenance + +- server: bump golang.org/x/crypto from 0.23.0 to 0.24.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/539 +- ui: bump prettier from 3.2.5 to 3.3.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/549 +- server: bump gorm.io/driver/sqlite from 1.5.5 to 1.5.6 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/546 +- workflow: bump docker/build-push-action from 5 to 6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/545 +- ui: bump @typescript-eslint/eslint-plugin from 7.12.0 to 7.14.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/560 +- ui: bump svelte-eslint-parser from 0.36.0 to 0.39.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/559 +- ui: bump eslint-plugin-svelte from 2.39.0 to 2.41.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/558 +- server: bump github.com/go-co-op/gocron/v2 from 2.5.0 to 2.7.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/557 + +## πŸ₯‡ Credit + +- Thanks to [@oPisiti] for making their first (and second) contribution in https://github.com/sbondCo/Watcharr/pull/563 +- Thanks to [@simonbcn] for reporting an issue that led to the search improvements being made in https://github.com/sbondCo/Watcharr/issues/531 + +Package: https://github.com/orgs/sbondCo/packages/container/watcharr/236341139?tag=v1.41.0 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.41.0/images/sha256-2229366989b906418c17df5a54c0c6d378f6044f45c591bba81a6cdd25e30a96?context=explore) + +# [1.40.0] - 2024-06-09 + +## 🧠 New + +- Better tasks (tasks rewritten and now reschedulable) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/526 + ![example](https://github.com/sbondCo/Watcharr/assets/37304121/d2f2193f-728f-496b-9896-19e4f1b12a99) +- Episode automations by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/536 + ![example](https://github.com/sbondCo/Watcharr/assets/37304121/7497e29c-39bf-4c54-bbef-81aa8ed34ea2) +- `AutomateShowStatuses` setting by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/537 + +## πŸ—οΈ Fixed + +- plex: Comment out ViewMode property from structs by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/538 +- Activity: Fix header font-family https://github.com/sbondCo/Watcharr/commit/22bdadc0db47181bb1ddb361a8a4bedb77b43543 +- watched: WatchedStatus: Fix HOLD value https://github.com/sbondCo/Watcharr/commit/1a3c9e08805485e73775bb4049464675ab2d64fa + +## πŸ”¨ Maintenance + +- server: bump golang.org/x/crypto from 0.22.0 to 0.23.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/514 +- server: bump github.com/gin-contrib/cors from 1.7.1 to 1.7.2 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/513 +- server: bump gorm.io/gorm from 1.25.9 to 1.25.10 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/505 +- ui: bump svelte from 4.2.12 to 4.2.15 by @dependabot in https://github.com/sbondCo/Watcharr/pull/501 +- ui: bump @typescript-eslint/eslint-plugin from 7.4.0 to 7.8.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/507 +- ui: bump prettier-plugin-svelte from 3.2.2 to 3.2.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/483 +- ui: bump @typescript-eslint/parser from 7.6.0 to 7.8.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/506 +- ui: bump vite from 5.2.8 to 5.2.11 by @dependabot in https://github.com/sbondCo/Watcharr/pull/518 +- ui: bump svelte-check from 3.6.9 to 3.7.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/525 +- ui: bump svelte-preprocess from 5.1.3 to 5.1.4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/519 +- ui: bump @vite-pwa/sveltekit from 0.3.0 to 0.5.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/512 +- ui: bump svelte-eslint-parser from 0.33.1 to 0.36.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/520 +- server: bump github.com/gin-contrib/cache from 1.2.0 to 1.3.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/522 +- server: bump github.com/gin-gonic/gin from 1.9.1 to 1.10.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/521 +- ui: bump svelte from 4.2.15 to 4.2.17 by @dependabot in https://github.com/sbondCo/Watcharr/pull/527 +- ui: bump axios from 1.6.8 to 1.7.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/533 +- ui: bump @typescript-eslint/eslint-plugin from 7.8.0 to 7.12.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/534 +- ui: bump @sveltejs/kit from 2.5.3 to 2.5.10 by @dependabot in https://github.com/sbondCo/Watcharr/pull/530 +- ui: bump eslint-plugin-svelte from 2.35.1 to 2.39.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/529 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/227554693?tag=v1.40.0 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.40.0/images/sha256-de6b16f6cf7a5aa5a0e953c4fc1cc506e5b2a74a5c51292edf4c067b690152d1?context=explore) + +# [1.39.0] - 2024-04-23 + +## 🧠 New + +- Support pinning watched list items to the top of your list (pinned items are highlighted with a gold outline) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/498 + ![image](./changelog/1.39.0/0.png) +- Support emby branding (new `USE_EMBY` setting that will swap out Jellyfin branding for Embys branding, no auth logic has been changed) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/504 + +## πŸ’― Changed + +- Better thoughts (now a modal is opened so you can add your thoughts more easily) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/495 +- Improve search (add content type filters and remove dumb sort) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/496 + ![image](https://github.com/sbondCo/Watcharr/assets/37304121/6c6a846d-da1e-4061-a2b0-e7839fd87176) +- Support detailed view for posters on search page by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/497 + +## πŸ—οΈ Fixed + +- LastFinished Sort: Prefer custom dates that are set on `FINISHED` activities by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/494 +- Content Pages: Make btns container wrap elements when overflowing by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/499 + +## πŸ₯‡ Credit + +A big thanks to [@n00b12345], [@simonbcn], [@mommyune], [@gardebreak] and [@rguinn829] for suggesting the improvements/fixes made in this release! + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/207084376?tag=v1.39.0 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.39.0/images/sha256-9c5d999d92d3475b6a91317727d1620f14b5d85309a3878604f38c60eee22526?context=explore) + +# [1.38.2] - 2024-04-18 + +## 🐞 Fixed + +- container-release: Fix ghcr `latest` tag by [@IRHM] in b8003691651ac095e111d85266362f46a1a6036e + +## πŸ“– [Documentation](https://watcharr.app/) + +- docs: Remove `version` property in docker compose examples by [@IRHM] in b749bffa1585c2d2d3453e35c58d431ae2d9c118 + +## Credit + +- Thanks to [@simonbcn] for reporting the issues fixed in this release! + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/205468961?tag=v1.38.2 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.38.2/images/sha256-a30d605acd154d5e346e5ae768cda5df1bbe6f21fac12f90765f3d1c67c57f6e?context=explore) + +# [1.38.1] - 2024-04-18 + +## 🐞 Fixed + +- Sorting by 'Last Watched' on public lists (by fetching Activity on public watched lists). +- Catch errors when filtering/sorting a list. Display a pretty error on screen when one occurs. + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/205195625?tag=v1.38.1 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.38.1/images/sha256-00a359e97aea939ace762030a0cbf40d796bb3db662ed822cddcf622b0f71391?context=explore) + +# [1.38.0] - 2024-04-18 + +## 🧠 New + +- Sonarr/Radarr request management, progress reporting and new auto approve permission by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/474 + ![image](./changelog/1.38.0/0.png) +- Ability to set a country for correct streaming providers (doesn't affect language) by [@stignarnia] in https://github.com/sbondCo/Watcharr/pull/463 +- Sort by last finished/played by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/479 +- Add delete button to content pages by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/486 + +## πŸ’― Changed + +- ProvidersList: Also display free providers by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/478 + +## 🧼 Fixed + +- import: Fix customDates all coming back the same in all activity when importing a watcharr export by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/485 +- Games: Fix not being able to add games previously removed from list by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/487 + +## πŸ“– [Documentation](https://watcharr.app/) + +- docs: Environment Variables by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/445 + +## πŸ”¨ Maintenance + +- server: bump gorm.io/gorm from 1.25.7 to 1.25.9 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/449 +- server: bump github.com/gin-contrib/cors from 1.7.0 to 1.7.1 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/435 +- ui: bump svelte from 4.2.10 to 4.2.12 by @dependabot in https://github.com/sbondCo/Watcharr/pull/421 +- ui: bump axios from 1.6.7 to 1.6.8 by @dependabot in https://github.com/sbondCo/Watcharr/pull/418 +- ui: bump prettier-plugin-svelte from 3.2.1 to 3.2.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/417 +- ui: bump @sveltejs/adapter-node from 4.0.1 to 5.0.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/419 +- ui: bump @typescript-eslint/eslint-plugin from 7.2.0 to 7.4.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/434 +- ui: bump vite from 5.1.6 to 5.2.8 by @dependabot in https://github.com/sbondCo/Watcharr/pull/469 +- ui: bump typescript from 5.3.3 to 5.4.5 by @dependabot in https://github.com/sbondCo/Watcharr/pull/475 +- ui: bump svelte-check from 3.6.4 to 3.6.9 by @dependabot in https://github.com/sbondCo/Watcharr/pull/467 +- ui: bump @typescript-eslint/parser from 7.2.0 to 7.6.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/466 +- workflow: bump peaceiris/actions-gh-pages from 3 to 4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/465 +- server: bump golang.org/x/crypto from 0.21.0 to 0.22.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/470 + +## New Contributors + +- [@stignarnia] made their first contribution (thank you very much!) in https://github.com/sbondCo/Watcharr/pull/463 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/205183324?tag=v1.38.0 or [on docker hub](https://hub.docker.com/layers/sbondco/watcharr/v1.38.0/images/sha256-736623c87bdf8b12660fc9e42c1cbf8d4bd5f85d15c9b087d5c443e412ec5665?context=explore) + +# [1.37.0] - 2024-03-27 + +Some changes regarding responsiveness on mobile have been made (dynamic poster sizes at certain device sizes). I did my best to ensure nothing broke, but if you spot anything, please let us know! + +## πŸŒ” New + +- Configurable data location via environment variable `WATCHARR_DATA` by @mordquist in https://github.com/sbondCo/Watcharr/pull/423 +- User management by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/437 + ![image](./changelog/1.37.0/0.png) +- Importing Watcharr Exports by @stephaje in https://github.com/sbondCo/Watcharr/pull/389 +- Importing from MyAnimeList by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/439 + +## ☎️ Changed + +- Poster and search bar mobile responsiveness improvements by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/428 + +## πŸ“– [Documentation](https://watcharr.app/) + +- docs: installation for development by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/432 +- docs: restoring admin guide by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/438 +- docs: Importing from MyAnimeList by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/439 +- [ImgBot] Optimize images by @imgbot in https://github.com/sbondCo/Watcharr/pull/440 + +## ⛏️ New Contributors + +- @mordquist made their first contribution (thank you very much for the great work!) in https://github.com/sbondCo/Watcharr/pull/423 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/196745444?tag=v1.37.0 + +# [1.36.0] - 2024-03-18 + +## 🌚 New + +- Plex authentication by [@stephaje] in https://github.com/sbondCo/Watcharr/pull/387 and [@IRHM] in https://github.com/sbondCo/Watcharr/pull/402 +- Plex sync by [@IRHM] and [@stephaje] in https://github.com/sbondCo/Watcharr/pull/413 + +## πŸ”§ Fixed + +- Jobs: Fix getting job when id includes a slash (/) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/415 + +## ⛰️ Maintenance + +- ui: bump vite from 5.1.3 to 5.1.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/408 +- ui: bump @sveltejs/kit from 2.5.0 to 2.5.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/405 +- ui: bump @typescript-eslint/parser from 7.0.2 to 7.2.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/406 +- server: bump github.com/golang-jwt/jwt/v5 from 5.2.0 to 5.2.1 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/404 +- server: bump golang.org/x/crypto from 0.19.0 to 0.21.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/393 +- ui: bump eslint from 8.56.0 to 8.57.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/378 +- server: bump github.com/gin-contrib/cors from 1.5.0 to 1.7.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/403 +- ui: bump @typescript-eslint/eslint-plugin from 7.0.2 to 7.2.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/407 +- ui: bump follow-redirects from 1.15.4 to 1.15.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/412 +- Bump follow-redirects from 1.15.5 to 1.15.6 in /doc by @dependabot in https://github.com/sbondCo/Watcharr/pull/414 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/192128255?tag=v1.36.0 + +# [1.35.2] - 2024-03-07 + +## Fixed + +- `Registering Disabled` bug when setting up first user #400 + If you were affected by this bug, please remove your `watcharr.json` config file, update to this version and try again (alternatively, you could update your `watcharr.json` config and set `SIGNUP_ENABLED` to `true` then restart). Sorry for any inconvenience. + +## πŸ₯‡ Credit + +- Thanks to [@priyajit4u] for reporting the issue fixed in this release. + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/188028779?tag=v1.35.2 + +# [1.35.1] - 2024-03-06 + +## Fixed + +- Don't omit `SIGNUP_ENABLED` from config when false (fixing it being re-enabled after a restart) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/399 + +## Documentation + +- Add `restart` property to docker-compose example by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/398 + +## πŸ₯‡ Credit + +- Thanks to [@n00b12345] for suggesting/reporting the two changes made in this patch release. + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/187807718?tag=v1.35.1 + +# [1.35.0] - 2024-03-05 + +## New + +- Editing activity time and (soft) deleting activity by [@stephaje] in https://github.com/sbondCo/Watcharr/pull/366 + ![image](./changelog/1.35.0/0.png) +- Jellyfin (Manual) Sync (for jellyfin profile, triggered by button in profile page) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/394 & https://github.com/sbondCo/Watcharr/pull/395 + +## Maintenance + +- ui: bump vite from 5.0.12 to 5.1.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/369 +- ui: bump @typescript-eslint/eslint-plugin from 6.21.0 to 7.0.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/367 +- ui: bump prettier-plugin-svelte from 3.1.2 to 3.2.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/368 +- ui: bump svelte-check from 3.6.3 to 3.6.4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/370 + +## New Contributors + +- [@stephaje] made their first contribution (thanks a lot!) in https://github.com/sbondCo/Watcharr/pull/366 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/187219192?tag=v1.35.0 + +# [1.34.0] - 2024-02-18 + +## New + +- Ratings and Statuses for episodes by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/363 + +## Fixed + +- Fix discovery (trending) requests by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/365 + +## Maintenance + +- [ImgBot] Optimize images by @imgbot in https://github.com/sbondCo/Watcharr/pull/357 +- ui: bump axios from 1.6.5 to 1.6.7 by @dependabot in https://github.com/sbondCo/Watcharr/pull/339 +- ui: bump svelte from 4.2.8 to 4.2.10 by @dependabot in https://github.com/sbondCo/Watcharr/pull/337 +- ui: bump @typescript-eslint/eslint-plugin from 6.20.0 to 6.21.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/338 +- ui: bump prettier from 3.2.4 to 3.2.5 by @dependabot in https://github.com/sbondCo/Watcharr/pull/341 +- server: bump gorm.io/gorm from 1.25.6 to 1.25.7 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/355 +- server: bump golang.org/x/crypto from 0.18.0 to 0.19.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/354 +- server: bump gorm.io/driver/sqlite from 1.5.4 to 1.5.5 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/353 + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/180398221?tag=v1.34.0 + +# [1.33.0] - 2024-02-12 + +# πŸ”« The Games Update + +The changelog may be small, but we've all learned not to judge a book by it's cover, right? + +## New + +- Games Support in https://github.com/sbondCo/Watcharr/pull/342 +- [Game docs](https://watcharr.app/docs/server_config/game-support-igdb) in https://github.com/sbondCo/Watcharr/pull/343 + +## Fixed + +- Poster images flashing white, then staying white after hover in https://github.com/sbondCo/Watcharr/pull/342 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/177545525?tag=v1.33.0 + +# [1.32.1] - 2024-02-03 + +## πŸ”§ Fixed + +- Save watchedAt date and keep watched movies that are also on watchlist when importing from Movary in https://github.com/sbondCo/Watcharr/pull/335 +- Create 'Include Previously Watched' setting for showing previously watched content in 'Finished' filter in https://github.com/sbondCo/Watcharr/pull/335 + ![image](./changelog/1.32.1/0.png) +- Fix all 'dates watched' activity having same date after import in https://github.com/sbondCo/Watcharr/pull/336 +- Include previously watched in profile stats in https://github.com/sbondCo/Watcharr/pull/336 +- Fix finished filter not working with type filter in https://github.com/sbondCo/Watcharr/pull/336 + +## πŸ₯‡ Credit + +- A big thanks to [@sahinakkaya] for helping test and finding the issues fixed in this release (and suggesting the features). + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/174461124?tag=v1.32.1 + +# [1.32.0] - 2024-02-02 + +## New + +- Movary Importing by [@IRHM] (thanks to [@sahinakkaya]) in https://github.com/sbondCo/Watcharr/pull/334 + +## Changed + +- Update content table on request by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/314 + +## Maintenance + +- ui: bump vite from 5.0.11 to 5.0.12 by @dependabot in https://github.com/sbondCo/Watcharr/pull/320 +- ui: bump prettier from 3.1.1 to 3.2.4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/322 +- ui: bump @sveltejs/adapter-node from 2.0.2 to 4.0.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/331 +- ui: bump @typescript-eslint/eslint-plugin from 6.18.0 to 6.20.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/330 +- server: bump gorm.io/gorm from 1.25.5 to 1.25.6 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/327 +- ui: bump @typescript-eslint/parser from 6.18.0 to 6.20.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/328 +- ui: bump svelte-check from 3.6.2 to 3.6.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/317 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/173982496?tag=v1.32.0 + +# [1.31.1] - 2024-01-09 + +## New + +- Watchtime Profile Stat by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/302 + ![image](./changelog/1.31.1/0.png) +- Support ARM64 Arch by [@IRHM] (thanks to [@schmurian]) in https://github.com/sbondCo/Watcharr/pull/310 + +## Maintenance + +- ui: bump vite from 5.0.10 to 5.0.11 by @dependabot in https://github.com/sbondCo/Watcharr/pull/307 +- server: bump golang.org/x/crypto from 0.17.0 to 0.18.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/303 +- ui: bump @typescript-eslint/eslint-plugin from 6.17.0 to 6.18.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/306 +- ui: bump @sveltejs/kit from 2.0.6 to 2.0.7 by @dependabot in https://github.com/sbondCo/Watcharr/pull/305 +- ui: bump axios from 1.6.3 to 1.6.5 by @dependabot in https://github.com/sbondCo/Watcharr/pull/304 +- ui: bump @sveltejs/kit from 2.0.7 to 2.0.8 by @dependabot in https://github.com/sbondCo/Watcharr/pull/308 +- Bump follow-redirects from 1.15.3 to 1.15.4 in /doc by @dependabot in https://github.com/sbondCo/Watcharr/pull/311 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/165278865?tag=v1.31.1 + +# [1.31.0] - 2024-01-07 + +## New + +- Poster detailed view by [@IRHM] (thanks to [@Contrillion-2]) in https://github.com/sbondCo/Watcharr/pull/297 + ![image](./changelog/1.31.0/0.png) ![image](./changelog/1.31.0/1.png) + +## Fixed + +- Input changed validation by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/299 + +## Maintenance + +- ui: bump axios from 1.6.2 to 1.6.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/293 +- ui: bump @typescript-eslint/eslint-plugin from 6.16.0 to 6.17.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/294 +- ui: bump @typescript-eslint/parser from 6.16.0 to 6.18.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/298 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/164427545?tag=v1.31.0 + +# [1.30.0] - 2024-01-01 + +## New + +- Change Password by [@iamericfletcher] in https://github.com/sbondCo/Watcharr/pull/290 +- Export Watched List by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/291 + +## Changed + +- Content rating text follow hovered star by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/292 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/162656150?tag=v1.30.0 + +# [1.29.0] - 2023-12-26 + +## New + +- Enhancement: Allow filtering and sorting other watched lists #276 by [@iamericfletcher] in https://github.com/sbondCo/Watcharr/pull/281 +- Public thoughts (view your followed users' reviews/thoughts on movie/tv pages and new setting to keep your thoughts private) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/288 + ![image](./changelog/1.29.0/0.png) + +## Fixed + +- Fix tooltips on scroll and from causing overflow on window resize by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/277 +- Fix content with same tmdb ids by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/280 + +## Maintenance + +- [ImgBot] Optimize images by @imgbot in https://github.com/sbondCo/Watcharr/pull/268 +- server: bump golang.org/x/crypto from 0.16.0 to 0.17.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/275 +- ui: bump @typescript-eslint/parser from 6.13.1 to 6.15.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/274 +- workflow: bump actions/checkout from 3 to 4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/272 +- ui: bump typescript from 5.3.2 to 5.3.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/264 +- workflow: bump actions/setup-node from 3 to 4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/271 +- ui: bump prettier-plugin-svelte from 3.0.3 to 3.1.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/262 +- ui: bump eslint-plugin-svelte from 2.35.0 to 2.35.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/263 +- ui: bump @sveltejs/kit from 1.27.6 to 2.0.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/278 +- ui: bump prettier from 3.1.0 to 3.1.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/287 +- ui: bump eslint from 8.55.0 to 8.56.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/286 +- ui: bump svelte-preprocess from 5.1.1 to 5.1.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/283 +- ui: bump @typescript-eslint/parser from 6.15.0 to 6.16.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/284 +- ui: bump @typescript-eslint/eslint-plugin from 6.13.0 to 6.16.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/285 + +## New Contributors + +- [@iamericfletcher] made their first contribution (thank you very much!) in https://github.com/sbondCo/Watcharr/pull/281 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/161474333?tag=v1.29.0 + +# [1.28.0] - 2023-12-10 + +## New + +- PWA Support by [@ishaanparlikar] in https://github.com/sbondCo/Watcharr/pull/259 +- Basic sort and filter indicators by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/253 +- Episode overview and runtime by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/257 + +## Changed + +- Hiding rating when hide spoiler is checked in profile by [@ishaanparlikar] in https://github.com/sbondCo/Watcharr/pull/255 + +## Fixed + +- Fix tooltip and nav overflow by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/254 +- Fix dockerfile server build by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/260 + +## Maintenance + +- ui: bump @types/papaparse from 5.3.11 to 5.3.14 by @dependabot in https://github.com/sbondCo/Watcharr/pull/249 +- ui: bump vite from 4.5.0 to 4.5.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/251 +- ui: bump eslint from 8.54.0 to 8.55.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/250 +- ui: bump svelte from 4.2.7 to 4.2.8 by @dependabot in https://github.com/sbondCo/Watcharr/pull/246 +- server: bump github.com/golang-jwt/jwt/v5 from 5.1.0 to 5.2.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/245 +- ui: bump eslint-config-prettier from 9.0.0 to 9.1.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/248 +- ui: bump svelte-preprocess from 5.1.0 to 5.1.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/247 +- PR Template and test workflow by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/266 + +## New Contributors + +- [@ishaanparlikar] made their first contribution (thank you for taking the time!) in https://github.com/sbondCo/Watcharr/pull/255 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/156358524?tag=v1.28.0 + +# [1.27.0] - 2023-12-03 + +## New + +- User configure (avatars and bios) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/242 + ![image](./changelog/1.27.0/0.png) + +## Changed + +- Nav: Hide buttons when searchbar is focused by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/241 + +## Fixed + +- Posters - Use cached images on watched list by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/243 + +## Maintenance + +- ui: bump @typescript-eslint/eslint-plugin from 6.11.0 to 6.13.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/227 +- ui: bump @typescript-eslint/parser from 6.11.0 to 6.13.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/240 +- server: bump golang.org/x/crypto from 0.15.0 to 0.16.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/233 +- ui: bump svelte-check from 3.6.0 to 3.6.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/229 +- ui: bump axios from 1.6.1 to 1.6.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/230 +- ui: bump prettier from 3.0.3 to 3.1.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/231 +- server: bump github.com/gin-contrib/cors from 1.4.0 to 1.5.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/232 + +## Etc + +**Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/154020222?tag=v1.27.0 + +# [1.26.0] - 2023-11-28 + +## New + +- Following Users by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/234 (thanks @DNYLA) + ![image](./changelog/1.26.0/0.png) + Also: Users and content results separated and user list restyled: + ![image](./changelog/1.26.0/1.png) + +## Changed + +- Movie default status to FINISHED by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/239 (thanks @MathieuMoalic) + +## Fixed + +- User list posters (unrated text and buttons showing) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/234 + +## Etc + +**Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/151995542?tag=v1.26.0 + +# [1.25.0] - 2023-11-20 + +## New + +- :star2: Import rating and rating date from TMDb, give activity customDate column by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/223 (thanks [@MathieuMoalic]) + +## Maintenance + +- ui: bump @sveltejs/kit from 1.27.5 to 1.27.6 by @dependabot in https://github.com/sbondCo/Watcharr/pull/222 +- ui: bump eslint from 8.53.0 to 8.54.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/221 +- ui: bump typescript from 5.2.2 to 5.3.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/220 +- ui: bump svelte-check from 3.5.2 to 3.6.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/218 +- ui: bump svelte from 4.2.3 to 4.2.7 by @dependabot in https://github.com/sbondCo/Watcharr/pull/219 + +## Etc + +- **Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/149697959?tag=v1.25.0 + +# [1.24.0] - 2023-11-19 + +## New + +- TMDb Importing by [@MathieuMoalic] in https://github.com/sbondCo/Watcharr/pull/216 + +## Etc + +- **Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/149272531?tag=v1.24.0 + +# [1.23.0] - 2023-11-19 + +## New + +- Admin stats by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/213 + ![image](./changelog/1.23.0/0.png) + +## Etc + +- **Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/149193730?tag=v1.23.0 + +# [1.22.0] - 2023-11-17 + +## New + +- πŸ“Ί Sonarr Requesting (preview - enable in server settings) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/195 +- πŸŽ₯ Radarr requesting (preview - enable in server settings) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/198 + +## Fixed + +- πŸ“¦ Fix poster button colors in dark theme by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/196 +- πŸ”§ Fix left positioned tooltips and add tooltips to nav icons by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/208 +- 🧾 Hide request button when sonarr/radarr disabled by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/210 + +## Changed + +- πŸ“– readme: update and add new screenshots by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/191 + +## Maintenance + +- ui: bump eslint from 8.52.0 to 8.53.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/186 +- ui: bump @typescript-eslint/parser from 6.9.1 to 6.10.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/187 +- ui: bump @typescript-eslint/eslint-plugin from 6.9.1 to 6.10.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/189 +- ui: bump eslint-plugin-svelte from 2.34.0 to 2.35.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/190 +- ui: bump @sveltejs/kit from 1.27.2 to 1.27.5 by @dependabot in https://github.com/sbondCo/Watcharr/pull/197 +- ui: bump svelte-preprocess from 5.0.4 to 5.1.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/201 +- ui: bump axios from 1.6.0 to 1.6.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/202 +- ui: bump @typescript-eslint/parser from 6.10.0 to 6.11.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/203 +- ui: bump svelte from 4.2.2 to 4.2.3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/204 +- ui: bump @typescript-eslint/eslint-plugin from 6.10.0 to 6.11.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/205 +- server: bump golang.org/x/crypto from 0.14.0 to 0.15.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/206 +- server: bump github.com/golang-jwt/jwt/v5 from 5.0.0 to 5.1.0 in /server by @dependabot in https://github.com/sbondCo/Watcharr/pull/207 + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/148973625?tag=v1.22.0 + +# [1.21.1] - 2023-11-02 + +## Fixed + +- :camera_flash: Support changing user to run docker container with & move to alpine based images by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/185 + - Setting a user to run the container as now works (reported by [@simonbcn], thanks!). + - Moved to alpine based images (+ remove ui devDependencies), image size cut in half (509MB -> 214MB). + +## Etc + +- **Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/143463678?tag=v1.21.1 + +# [1.21.0] - 2023-11-01 + +## New + +- ⭐ Giving show seasons a status and rating by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/179 + +## Fixed + +- πŸ‘» Add shadow to `Click To Reveal` spoiler text so it is always visible by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/180 +- πŸš” Fix SeasonList being hidden below nav by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/182 +- πŸ”§ SeasonsList: Make season buttons wrap by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/183 + +## Maintenance + +- ui: bump @typescript-eslint/parser from 6.9.0 to 6.9.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/178 +- ui: bump axios from 1.5.1 to 1.6.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/177 +- workflow: bump actions/setup-node from 3 to 4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/161 +- ui: bump @typescript-eslint/eslint-plugin from 6.9.0 to 6.9.1 by @dependabot in https://github.com/sbondCo/Watcharr/pull/175 +- ui: bump @sveltejs/kit from 1.25.2 to 1.27.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/176 + +## Etc + +- **Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/143125551?tag=v1.21.0 + +# [1.20.1] - 2023-10-28 + +## Fixed + +- Nav: Fix search input not re-focusing after search loads on chromium by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/171 (thanks to [@simonbcn] for reporting) +- Poster: Fix big scrollbars making icons small in sub menus on chromium by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/172 + +## Maintenance + +- ui: bump @typescript-eslint/eslint-plugin from 6.7.5 to 6.8.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/159 +- ui: bump @typescript-eslint/parser from 6.7.5 to 6.8.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/160 +- ui: bump @typescript-eslint/eslint-plugin from 6.8.0 to 6.9.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/166 +- ui: bump eslint from 8.51.0 to 8.52.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/165 +- ui: bump svelte from 4.2.1 to 4.2.2 by @dependabot in https://github.com/sbondCo/Watcharr/pull/164 +- ui: bump vite from 4.4.11 to 4.5.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/163 +- ui: bump @typescript-eslint/parser from 6.8.0 to 6.9.0 by @dependabot in https://github.com/sbondCo/Watcharr/pull/162 + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/141988629?tag=v1.20.1 + +# [1.20.0] - 2023-10-15 + +## New + +- New `Hide Spoilers` Setting by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/156 + + ![](./changelog/1.20.0/0.png) + +- Similar Content Section by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/158 + + ![](./changelog/1.20.0/1.png) + +## Fixed + +- Content: Fix `cast` header text scrolling out of view by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/157 + +## Maintenance + +- workflow: bump actions/checkout from 3 to 4 by @dependabot in https://github.com/sbondCo/Watcharr/pull/154 +- workflow: bump docker/metadata-action from 4 to 5 by @dependabot in https://github.com/sbondCo/Watcharr/pull/152 +- workflow: bump docker/login-action from 2 to 3 by @dependabot in https://github.com/sbondCo/Watcharr/pull/153 +- workflow: bump docker/build-push-action from 4 to 5 by @dependabot in https://github.com/sbondCo/Watcharr/pull/155 + +## Etc + +- **Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/137585177?tag=v1.20.0 + +# [1.19.1] - 2023-10-14 + +## Maintenance + +- **Update deps** by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/151 + +## Docs + +We have (sorta wip) documentation now at [watcharr.app](https://watcharr.app). + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/137438778?tag=v1.19.1 + +# [1.19.0] - 2023-10-09 + +**NOTE**: Breaking changes related to server configuration. Please read below for migrating from v1.18.0 and older (tldr: moved to json configuration instead of .env file, accounts can now have admin) + +## Migration + +When you first run v1.19.0, a `watcharr.json` file will be created in the data directory. A new JWT_SECRET will be automatically generated. If you want to avoid logging users out, you can copy over the secret from your .env file. + +You will also have to migrate any other configuration, but this can be done via the new web ui. + +If you are using docker, you can remove the `.env` file volume and delete the file. + +**NOTE**: If you want to use a jellyfin account as the admin, but jellyfin login has now been disabled (because your server url is not in the new config), you have two options at the moment: + +1. Manually edit the `watcharr.json` config file and add your jellyfin host (add JELLYFIN_HOST): + ``` + { + "JWT_SECRET": "my_secret...", + "JELLYFIN_HOST": "https://jellyfin.example.com" + } + ``` +2. Create a new normal watcharr account, give it admin (using the `request_admin` page, see below..), set the Jellyfin Host setting in the web ui. Then logout and you will be able to login with your jellyfin account. Repeat the process to give admin to this account too. + +## Server Settings Web UI + +Admins can now manage the server settings through the new web ui. Changes are reflected immediately and are saved to the `watcharr.json` file. + +If your account has admin, simply navigate to the face menu then click the settings option. + +![image](./changelog/1.19.0/0.png) + +Here you can easily configure your server. + +![image](./changelog/1.19.0/1.png) + +## Getting admin on an existing account + +If you have an existing account you would like to give admin to, you can go to `127.0.0.1:3080/request_admin`. Click the `request` button and retrieve the token from your server log (in the data folder: `data/watcharr.log`. or with `docker compose logs`). + +1. Click request button + ![image](./changelog/1.19.0/2.png) +2. Retrieve token from `watcharr.log` server log file: + ![image](./changelog/1.19.0/3.png) +3. Type code in and get admin: + ![image](./changelog/1.19.0/4.png) + +## What's Changed + +Changelog simplified since all PRs relate to giving admin users the ability to modify server settings through web ui. + +- Admin users and json config by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/141 +- Admin tokens by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/142 +- Web UI Server Settings by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/144 +- config: Fix panic if `v` unset in `updateConfig` by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/145 +- Update userinfo after get admin by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/146 +- v1.19.0 - Updated readme steps & initial config setup fix by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/147 + +# [1.18.0] - 2023-09-24 + +## New + +- Watched List Filtering by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/133 + ![image](./changelog/1.18.0/0.png) + +## Fixed + +- Fix import page loading without auth by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/134 +- Content: Fix 'play on jellyfin' btn by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/135 +- Nav menu dark theme fixes by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/139 + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/130985205?tag=v1.18.0 + +# [1.17.0] - 2023-09-19 + +## New + +- Importing text watch list by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/132 + + ![image](./changelog/1.17.0/0.png) + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/129485637?tag=v1.17.0 + +# [1.16.1] - 2023-09-15 + +πŸ“£ An inconvenient computer failure left me without anything to work on, going to be working on getting more regular updates out from now on. + +## Changed + +- πŸ“– README: Update demo badge url by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/128 +- 🧭 Make Nav Sticky by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/126 + +## Fixed + +- πŸ₯‡ Do not fail on `.env` file missing thanks to [@stavros-k] in https://github.com/sbondCo/Watcharr/pull/131 + +## New Contributors + +- [@stavros-k] made their first contribution in https://github.com/sbondCo/Watcharr/pull/131 + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/128451187?tag=v1.16.1 + +# [1.16.0] - 2023-08-27 + +## New in [#125](https://github.com/sbondCo/Watcharr/pull/125) Socializing + +- πŸ”Ž When searching, if a user is found with a username LIKE the search query, they are displayed at the top of the results. +- 🎞️ Clicking a user result will allow you to look at their watched list. +- πŸ•΅οΈβ€β™‚οΈ Added a new setting, `private`, which when toggled, will remove your profile from displaying in search results. +- πŸ”˜ Added `Share List` button to nav face menu (copies link of your public watched list to clipboard). + +## Fixed in [#125](https://github.com/sbondCo/Watcharr/pull/125) + +- Long names overflowing in `Profile` page. + +## Etc + +- **Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/122354946?tag=v1.16.0 + +# [1.15.0] - 2023-08-26 + +## Changed + +- Add year to Poster by [@kurtmgray] in https://github.com/sbondCo/Watcharr/pull/111 +- Optimize images by @imgbot in https://github.com/sbondCo/Watcharr/pull/118 +- TMDB Request Caching by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/119 +- Loading Notifications (better feedback on slower networks) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/122 + +## Fixed + +- PersonPoster: Fix white flash on hover by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/120 (**Thanks @DNYLA for reporting**) +- Content: Omit ReleaseDate if not set by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/123 + +## New Contributors + +- [@kurtmgray] made their first contribution in https://github.com/sbondCo/Watcharr/pull/111 (**Thanks!**) +- @imgbot made their first contribution in https://github.com/sbondCo/Watcharr/pull/118 + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/122231066?tag=v1.15.0 + +# [1.14.0] - 2023-08-21 + +## New + +- Support disabling signup in https://github.com/sbondCo/Watcharr/pull/104 +- Support using a custom TMDB_KEY in https://github.com/sbondCo/Watcharr/pull/116 +- πŸ”Ž Discover Page in https://github.com/sbondCo/Watcharr/pull/109 +- New sorting options: Rating, Last Changed in https://github.com/sbondCo/Watcharr/pull/110 + +## Changed + +- πŸŽ₯ Show a better empty watched list message in https://github.com/sbondCo/Watcharr/pull/105 +- πŸ–ΌοΈ Fade out content backdrop in https://github.com/sbondCo/Watcharr/pull/106 + +## Fixed + +- SeasonsList: Stop requesting season 1 twice in https://github.com/sbondCo/Watcharr/pull/115 + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/120648411?tag=v1.14.0 + +# [1.13.0] - 2023-08-18 + +**Note:** Auth related improvements require a re-login from the user. You should notice you are automatically logged out after updating to this version. + +## New + +- Streaming Providers shown for content by @DNYLA in https://github.com/sbondCo/Watcharr/pull/97 +- Play In Jellyfin Button / Providers by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/101 +- Server Logging To File by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/95 + +## Changed + +- Show `TBD` if seasons not aired and add no episodes message by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/90 +- Hide tv runtimes if not provided in episode_run_time array by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/92 + +## Maintenance + +- Update Client And Server Dependencies by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/88 + +## New Contributors + +- @DNYLA made their first contribution in https://github.com/sbondCo/Watcharr/pull/97 + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/120038591?tag=v1.13.0 + +# [1.12.0] - 2023-08-14 + +## New + +- Show public ratings for movies and tv (from TheMovieDB) in https://github.com/sbondCo/Watcharr/pull/73 +- Episode ratings (from TheMovieDB) in https://github.com/sbondCo/Watcharr/pull/74 and https://github.com/sbondCo/Watcharr/pull/77 +- Trailers for movies and shows (YouTube Embed) by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/76 + +## Etc + +- **Package**: https://github.com/orgs/sbondCo/packages/container/watcharr/118290077?tag=v1.12.0 + +# [1.11.0] - 2023-08-09 + +## New + +- Dark theme (changeable in profile page) in https://github.com/sbondCo/Watcharr/pull/63 +- Give and save your thoughts on a movie/series in https://github.com/sbondCo/Watcharr/pull/69 + +## Changed + +- Show success notifications after adding/updating watched items in https://github.com/sbondCo/Watcharr/pull/69 + +## Fixed + +- Make profile page responsive in https://github.com/sbondCo/Watcharr/pull/64 + +# [1.10.0] - 2023-07-22 + +## New + +#### Watched Page Filters in https://github.com/sbondCo/Watcharr/pull/51 + +![image](./changelog/1.10.0/0.png) + +#### TV Seasons/Episodes in https://github.com/sbondCo/Watcharr/pull/52 + + + +#### Content Activity in https://github.com/sbondCo/Watcharr/pull/53 + + + +#### Profile (bare bones at the moment) in https://github.com/sbondCo/Watcharr/pull/55 + +![image](./changelog/1.10.0/3.png) + +## Fixed + +- Nav DropDowns: Close other menu on open in https://github.com/sbondCo/Watcharr/pull/57 + +## Etc + +- **Package**: https://github.com/sbondCo/Watcharr/pkgs/container/watcharr/111775794?tag=v1.10.0 + +# [1.9.2] - 2023-06-01 + +## Fixed + +- Routing in production app in https://github.com/sbondCo/Watcharr/commit/80b808c39e842ab2bbd1da4f607f7b34f4d14fb0 + +# [1.9.1] - 2023-05-31 + +## Changed + +- Simplified Setup (only one docker image and removed the need for a reverse proxy) in https://github.com/sbondCo/Watcharr/pull/50 + +# [1.9.0] - 2023-05-30 + +## πŸŽ₯ The Cast Update + +## New + +- Display Cast in content pages in https://github.com/sbondCo/Watcharr/pull/43 +- Create notification popups in https://github.com/sbondCo/Watcharr/pull/36 +- Show username at top of face menu in https://github.com/sbondCo/Watcharr/pull/38 + +## Changed + +- Move api.ts and helpers.ts to util folder in https://github.com/sbondCo/Watcharr/pull/39 +- Move calculateTransformOrigin to helpers and use it in person poster too in https://github.com/sbondCo/Watcharr/pull/48 + +## Fixed + +- Posters out of view on hover in https://github.com/sbondCo/Watcharr/pull/47 +- Increase search debounce time on mobile in https://github.com/sbondCo/Watcharr/pull/34 +- Posters Doubly Scaling in https://github.com/sbondCo/Watcharr/pull/49 + +# [1.8.0] - 2023-05-17 + +## 🀺 The People Update + +## New + +- Support Showing People In Search and person page with their content in https://github.com/sbondCo/Watcharr/pull/28, #33 +- Display version in face menu and in console in https://github.com/sbondCo/Watcharr/pull/31 + +## Changed + +- Only show available auth providers on login page in https://github.com/sbondCo/Watcharr/pull/29 + +## Fixed + +- Remove x padding on movies in person page in https://github.com/sbondCo/Watcharr/pull/32 + +# [1.7.0] - 2023-05-09 + +🦸 Watcharr is coming together! + +## New + +- Tooltips (for watched statuses only at the moment, since they can be confusing) in https://github.com/sbondCo/Watcharr/pull/13 +- Loading icons and better Errors in https://github.com/sbondCo/Watcharr/pull/14 +- Support removing watched list items in https://github.com/sbondCo/Watcharr/pull/24 + +## Changed + +- New font for logo, nav and headers `Shrikhand` +- Fonts now loaded from locally served files + +## Fixed + +- Chrome issues with navbar and posters in https://github.com/sbondCo/Watcharr/pull/15 +- Fix tooltips position whilst page is scrolled in https://github.com/sbondCo/Watcharr/pull/16 +- Fix poster tooltips not hiding after touch stops, bottom of page on mobile tv/movie pages being wrong bg color & nav logo width increasing on hover in https://github.com/sbondCo/Watcharr/pull/17 +- Fix adding watched list item when content exists in https://github.com/sbondCo/Watcharr/pull/24 +- Fix small nav logo width in https://github.com/sbondCo/Watcharr/pull/25 + +# [1.6.0] - 2023-04-25 + +⚠️ Breaking - Content table now stores tmdb ids in its own column (`tmdb_id` instead of `id`). + +## Changed + +- Show smaller nav on mobile, instead of nothing, so we can still navigate to home page +- Reduce margin on x axis, so we can show 2 columns of posters on mobile + +## Fixed + +- Not handling possible duplicate tmdb ids (a show and movie can have same id on tmdb) +- Posters on mobile + +# [1.5.0] - 2023-04-21 + +:tada: Watcharr should hopefully be a lot more stable as of this release, it has been tested to the best of my ability. There are some more issues, that will be fixed shortly, but for the most part it works. + +## New + +- Movie and TV details pages (currently with full overview, runtime, etc.. more details coming soon) + +## Changed + +- No hover needed on poster if img not set by [@IRHM] in https://github.com/sbondCo/Watcharr/pull/3 +- Posters have been redesigned +- Posters are more keyboard friendly +- More content statuses ("PLANNED" | "WATCHING" | "FINISHED" | "HOLD" | "DROPPED") +- Ratings changed from 5 stars to 10 stars +- Nav effects on hover +- More responsive design (hiding elements on nav, shortening margins, etc) + +## Fixed + +- Server dockerfile not having ca-certificates package - causing https requests to fail +- Watched posters using localhost in production +- Dont handleSearch if key pressed is not a letter (Tab, caps, meta, etc), so we don't search when we don't need to. Also fixes tabbing through UI, which could cause a search. + +# [1.4.0] - 2023-04-14 + +## New + +- Jellyfin login support (JELLYFIN_HOST environment variable needs to be set) + +## Changed + +- Panic if database auto migration fails +- UI: Remove local token on 401, then redirect to login + +## Fixed + +- UI: Normal auth login interceptors +- UI: Clear `watchedList` store on logout, to avoid seeing another users list on login with a different account + +# [1.3.0] - 2023-04-12 + +## Fixes + +- UI: Auth interceptor. + +## New + +- UI: Nav submenu for logging out. + +# [1.2.0] - 2023-04-11 + +## Fixes + +- Server: Ensure data dir exists on startup +- UI: Rating change not working on content search page +- Repo: Fixed example Caddyfile showing reverse proxy setup + +## Changed + +- Server: Default watched status is now `Watching` (used to be `Finished`) +- UI: Login/Register page now has it's own layout +- UI: Replaced custom `req` method with request interceptors - redirect to login should work better when auth fails or token not found + +# [1.1.0] - 2023-04-11 + +## Welcome :tada: + +Welcome to Watcharr :popcorn:, hope it is enjoyed and improves anyone's experience and upgrades their .txt file! + +## Fixes :lab_coat: + +- Server: Fix User model +- UI: Add password type to pass input on login/register +- UI: Use `req` method for login/registering - so correct api url is used + + + +[Unreleased]: https://github.com/sbondCo/Watcharr/compare/v3.0.1...HEAD +[3.0.1]: https://github.com/sbondCo/Watcharr/compare/v3.0.0...v3.0.1 +[3.0.0]: https://github.com/sbondCo/Watcharr/compare/v2.1.1...v3.0.0 +[2.1.1]: https://github.com/sbondCo/Watcharr/compare/v2.1.0...v2.1.1 +[2.1.0]: https://github.com/sbondCo/Watcharr/compare/v2.0.2...v2.1.0 +[2.0.2]: https://github.com/sbondCo/Watcharr/compare/v2.0.1...v2.0.2 +[2.0.1]: https://github.com/sbondCo/Watcharr/compare/v2.0.0...v2.0.1 +[2.0.0]: https://github.com/sbondCo/Watcharr/compare/v1.44.2...v2.0.0 +[1.44.2]: https://github.com/sbondCo/Watcharr/compare/v1.44.1...v1.44.2 +[1.44.1]: https://github.com/sbondCo/Watcharr/compare/v1.44.0...v1.44.1 +[1.44.0]: https://github.com/sbondCo/Watcharr/compare/v1.43.0...v1.44.0 +[1.43.0]: https://github.com/sbondCo/Watcharr/compare/v1.42.0...v1.43.0 +[1.42.0]: https://github.com/sbondCo/Watcharr/compare/v1.41.0...v1.42.0 +[1.41.0]: https://github.com/sbondCo/Watcharr/compare/v1.40.0...v1.41.0 +[1.40.0]: https://github.com/sbondCo/Watcharr/compare/v1.39.0...v1.40.0 +[1.39.0]: https://github.com/sbondCo/Watcharr/compare/v1.38.2...v1.39.0 +[1.38.2]: https://github.com/sbondCo/Watcharr/compare/v1.38.1...v1.38.2 +[1.38.1]: https://github.com/sbondCo/Watcharr/compare/v1.38.0...v1.38.1 +[1.38.0]: https://github.com/sbondCo/Watcharr/compare/v1.37.0...v1.38.0 +[1.37.0]: https://github.com/sbondCo/Watcharr/compare/v1.36.0...v1.37.0 +[1.36.0]: https://github.com/sbondCo/Watcharr/compare/v1.35.2...v1.36.0 +[1.35.2]: https://github.com/sbondCo/Watcharr/compare/v1.35.1...v1.35.2 +[1.35.1]: https://github.com/sbondCo/Watcharr/compare/v1.35.0...v1.35.1 +[1.35.0]: https://github.com/sbondCo/Watcharr/compare/v1.34.0...v1.35.0 +[1.34.0]: https://github.com/sbondCo/Watcharr/compare/v1.33.0...v1.34.0 +[1.33.0]: https://github.com/sbondCo/Watcharr/compare/v1.32.1...v1.33.0 +[1.32.1]: https://github.com/sbondCo/Watcharr/compare/v1.32.0...v1.32.1 +[1.32.0]: https://github.com/sbondCo/Watcharr/compare/v1.31.1...v1.32.0 +[1.31.1]: https://github.com/sbondCo/Watcharr/compare/v1.31.0...v1.31.1 +[1.31.0]: https://github.com/sbondCo/Watcharr/compare/v1.30.0...v1.31.0 +[1.30.0]: https://github.com/sbondCo/Watcharr/compare/v1.29.0...v1.30.0 +[1.29.0]: https://github.com/sbondCo/Watcharr/compare/v1.28.0...v1.29.0 +[1.28.0]: https://github.com/sbondCo/Watcharr/compare/v1.27.0...v1.28.0 +[1.27.0]: https://github.com/sbondCo/Watcharr/compare/v1.26.0...v1.27.0 +[1.26.0]: https://github.com/sbondCo/Watcharr/compare/v1.25.0...v1.26.0 +[1.25.0]: https://github.com/sbondCo/Watcharr/compare/v1.24.0...v1.25.0 +[1.24.0]: https://github.com/sbondCo/Watcharr/compare/v1.23.0...v1.24.0 +[1.23.0]: https://github.com/sbondCo/Watcharr/compare/v1.22.0...v1.23.0 +[1.22.0]: https://github.com/sbondCo/Watcharr/compare/v1.21.1...v1.22.0 +[1.21.1]: https://github.com/sbondCo/Watcharr/compare/v1.21.0...v1.21.1 +[1.21.0]: https://github.com/sbondCo/Watcharr/compare/v1.20.1...v1.21.0 +[1.20.1]: https://github.com/sbondCo/Watcharr/compare/v1.20.0...v1.20.1 +[1.20.0]: https://github.com/sbondCo/Watcharr/compare/v1.19.1...v1.20.0 +[1.19.1]: https://github.com/sbondCo/Watcharr/compare/v1.19.0...v1.19.1 +[1.19.0]: https://github.com/sbondCo/Watcharr/compare/v1.18.0...v1.19.0 +[1.18.0]: https://github.com/sbondCo/Watcharr/compare/v1.17.0...v1.18.0 +[1.17.0]: https://github.com/sbondCo/Watcharr/compare/v1.16.1...v1.17.0 +[1.16.1]: https://github.com/sbondCo/Watcharr/compare/v1.16.0...v1.16.1 +[1.16.0]: https://github.com/sbondCo/Watcharr/compare/v1.15.0...v1.16.0 +[1.15.0]: https://github.com/sbondCo/Watcharr/compare/v1.14.0...v1.15.0 +[1.14.0]: https://github.com/sbondCo/Watcharr/compare/v1.13.0...v1.14.0 +[1.13.0]: https://github.com/sbondCo/Watcharr/compare/v1.12.0...v1.13.0 +[1.12.0]: https://github.com/sbondCo/Watcharr/compare/v1.11.0...v1.12.0 +[1.11.0]: https://github.com/sbondCo/Watcharr/compare/v1.10.0...v1.11.0 +[1.10.0]: https://github.com/sbondCo/Watcharr/compare/v1.9.2...v1.10.0 +[1.9.2]: https://github.com/sbondCo/Watcharr/compare/v1.9.1...v1.9.2 +[1.9.1]: https://github.com/sbondCo/Watcharr/compare/v1.9.0...v1.9.1 +[1.9.0]: https://github.com/sbondCo/Watcharr/compare/v1.8.0...v1.9.0 +[1.8.0]: https://github.com/sbondCo/Watcharr/compare/v1.7.0...v1.8.0 +[1.7.0]: https://github.com/sbondCo/Watcharr/compare/v1.6.0...v1.7.0 +[1.6.0]: https://github.com/sbondCo/Watcharr/compare/v1.5.0...v1.6.0 +[1.5.0]: https://github.com/sbondCo/Watcharr/compare/v1.4.0...v1.5.0 +[1.4.0]: https://github.com/sbondCo/Watcharr/compare/v1.3.0...v1.4.0 +[1.3.0]: https://github.com/sbondCo/Watcharr/compare/v1.2.0...v1.3.0 +[1.2.0]: https://github.com/sbondCo/Watcharr/compare/v1.1.0...v1.2.0 +[1.1.0]: https://github.com/sbondCo/Watcharr/compare/v1.0.0...v1.1.0 + + + +[@IRHM]: https://github.com/IRHM +[@kurtmgray]: https://github.com/kurtmgray +[@stavros-k]: https://github.com/stavros-k +[@simonbcn]: https://github.com/simonbcn +[@MathieuMoalic]: https://github.com/MathieuMoalic +[@ishaanparlikar]: https://github.com/ishaanparlikar +[@iamericfletcher]: https://github.com/iamericfletcher +[@Contrillion-2]: https://github.com/Contrillion-2 +[@schmurian]: https://github.com/schmurian +[@sahinakkaya]: https://github.com/sahinakkaya +[@stephaje]: https://github.com/stephaje +[@n00b12345]: https://github.com/n00b12345 +[@priyajit4u]: https://github.com/priyajit4u +[@stignarnia]: https://github.com/stignarnia +[@mommyune]: https://github.com/cerxil +[@gardebreak]: https://github.com/gardebreak +[@rguinn829]: https://github.com/rguinn829 +[@oPisiti]: https://github.com/oPisiti +[@yamerooo123]: https://github.com/yamerooo123 +[@AlexPerathoner]: https://github.com/AlexPerathoner +[@senz]: https://github.com/senz +[@SirMartin]: https://github.com/SirMartin +[@lufixSch]: https://github.com/lufixSch +[@christaikobo]: https://github.com/christaikobo +[@antoniosarro]: https://github.com/antoniosarro +[@Clusters]: https://github.com/Clusters +[@jigglycrumb]: https://github.com/jigglycrumb +[@IvanBeke]: https://github.com/IvanBeke +[@ParksideParade]: https://github.com/ParksideParade +[Dredsen]: https://github.com/Dredsen diff --git a/changelog/1.10.0/0.png b/changelog/1.10.0/0.png new file mode 100644 index 00000000..38b14690 Binary files /dev/null and b/changelog/1.10.0/0.png differ diff --git a/changelog/1.10.0/1.png b/changelog/1.10.0/1.png new file mode 100644 index 00000000..965db457 Binary files /dev/null and b/changelog/1.10.0/1.png differ diff --git a/changelog/1.10.0/2.png b/changelog/1.10.0/2.png new file mode 100644 index 00000000..231dbb99 Binary files /dev/null and b/changelog/1.10.0/2.png differ diff --git a/changelog/1.10.0/3.png b/changelog/1.10.0/3.png new file mode 100644 index 00000000..4532a4a4 Binary files /dev/null and b/changelog/1.10.0/3.png differ diff --git a/changelog/1.17.0/0.png b/changelog/1.17.0/0.png new file mode 100644 index 00000000..3a2857bb Binary files /dev/null and b/changelog/1.17.0/0.png differ diff --git a/changelog/1.18.0/0.png b/changelog/1.18.0/0.png new file mode 100644 index 00000000..bcee9cf2 Binary files /dev/null and b/changelog/1.18.0/0.png differ diff --git a/changelog/1.19.0/0.png b/changelog/1.19.0/0.png new file mode 100644 index 00000000..f879b9a4 Binary files /dev/null and b/changelog/1.19.0/0.png differ diff --git a/changelog/1.19.0/1.png b/changelog/1.19.0/1.png new file mode 100644 index 00000000..813a3dbb Binary files /dev/null and b/changelog/1.19.0/1.png differ diff --git a/changelog/1.19.0/2.png b/changelog/1.19.0/2.png new file mode 100644 index 00000000..6cff3c3f Binary files /dev/null and b/changelog/1.19.0/2.png differ diff --git a/changelog/1.19.0/3.png b/changelog/1.19.0/3.png new file mode 100644 index 00000000..d4b2538a Binary files /dev/null and b/changelog/1.19.0/3.png differ diff --git a/changelog/1.19.0/4.png b/changelog/1.19.0/4.png new file mode 100644 index 00000000..bc1ada11 Binary files /dev/null and b/changelog/1.19.0/4.png differ diff --git a/changelog/1.20.0/0.png b/changelog/1.20.0/0.png new file mode 100644 index 00000000..1f7e54f3 Binary files /dev/null and b/changelog/1.20.0/0.png differ diff --git a/changelog/1.20.0/1.png b/changelog/1.20.0/1.png new file mode 100644 index 00000000..00440162 Binary files /dev/null and b/changelog/1.20.0/1.png differ diff --git a/changelog/1.23.0/0.png b/changelog/1.23.0/0.png new file mode 100644 index 00000000..26fb5115 Binary files /dev/null and b/changelog/1.23.0/0.png differ diff --git a/changelog/1.26.0/0.png b/changelog/1.26.0/0.png new file mode 100644 index 00000000..05c730e3 Binary files /dev/null and b/changelog/1.26.0/0.png differ diff --git a/changelog/1.26.0/1.png b/changelog/1.26.0/1.png new file mode 100644 index 00000000..5b76fa2d Binary files /dev/null and b/changelog/1.26.0/1.png differ diff --git a/changelog/1.27.0/0.png b/changelog/1.27.0/0.png new file mode 100644 index 00000000..3ad79015 Binary files /dev/null and b/changelog/1.27.0/0.png differ diff --git a/changelog/1.29.0/0.png b/changelog/1.29.0/0.png new file mode 100644 index 00000000..93e25847 Binary files /dev/null and b/changelog/1.29.0/0.png differ diff --git a/changelog/1.31.0/0.png b/changelog/1.31.0/0.png new file mode 100644 index 00000000..7456afeb Binary files /dev/null and b/changelog/1.31.0/0.png differ diff --git a/changelog/1.31.0/1.png b/changelog/1.31.0/1.png new file mode 100644 index 00000000..fd29a18a Binary files /dev/null and b/changelog/1.31.0/1.png differ diff --git a/changelog/1.31.1/0.png b/changelog/1.31.1/0.png new file mode 100644 index 00000000..9c6b9ab7 Binary files /dev/null and b/changelog/1.31.1/0.png differ diff --git a/changelog/1.32.1/0.png b/changelog/1.32.1/0.png new file mode 100644 index 00000000..4f6cfbd9 Binary files /dev/null and b/changelog/1.32.1/0.png differ diff --git a/changelog/1.35.0/0.png b/changelog/1.35.0/0.png new file mode 100644 index 00000000..f0c66506 Binary files /dev/null and b/changelog/1.35.0/0.png differ diff --git a/changelog/1.37.0/0.png b/changelog/1.37.0/0.png new file mode 100644 index 00000000..bab3302b Binary files /dev/null and b/changelog/1.37.0/0.png differ diff --git a/changelog/1.38.0/0.png b/changelog/1.38.0/0.png new file mode 100644 index 00000000..8c79d2d0 Binary files /dev/null and b/changelog/1.38.0/0.png differ diff --git a/changelog/1.39.0/0.png b/changelog/1.39.0/0.png new file mode 100644 index 00000000..dfc3f076 Binary files /dev/null and b/changelog/1.39.0/0.png differ diff --git a/changelog/1.40.0/0.png b/changelog/1.40.0/0.png new file mode 100644 index 00000000..45f84b23 Binary files /dev/null and b/changelog/1.40.0/0.png differ diff --git a/changelog/1.40.0/1.png b/changelog/1.40.0/1.png new file mode 100644 index 00000000..36bd3502 Binary files /dev/null and b/changelog/1.40.0/1.png differ diff --git a/changelog/1.44.0/0.png b/changelog/1.44.0/0.png new file mode 100644 index 00000000..6d1108af Binary files /dev/null and b/changelog/1.44.0/0.png differ diff --git a/changelog/1.44.0/1.png b/changelog/1.44.0/1.png new file mode 100644 index 00000000..6eba65c0 Binary files /dev/null and b/changelog/1.44.0/1.png differ diff --git a/changelog/2.0.1/0.png b/changelog/2.0.1/0.png new file mode 100644 index 00000000..8f6470a3 Binary files /dev/null and b/changelog/2.0.1/0.png differ diff --git a/changelog/2.0.1/1.png b/changelog/2.0.1/1.png new file mode 100644 index 00000000..aa2f00ea Binary files /dev/null and b/changelog/2.0.1/1.png differ diff --git a/changelog/3.0.0/0.png b/changelog/3.0.0/0.png new file mode 100644 index 00000000..04c5febd Binary files /dev/null and b/changelog/3.0.0/0.png differ diff --git a/changelog/3.0.1/0.png b/changelog/3.0.1/0.png new file mode 100644 index 00000000..56e8d6b0 Binary files /dev/null and b/changelog/3.0.1/0.png differ diff --git a/changelog/README.md b/changelog/README.md new file mode 100644 index 00000000..51ffedd1 --- /dev/null +++ b/changelog/README.md @@ -0,0 +1,5 @@ +## Changelog Data + +Changelog images, etc go in this folder. + +[View the real changelog for Watcharr.](../CHANGELOG.md) diff --git a/doc/docs/server_config/backup.md b/doc/docs/server_config/backup.md index 9d88c48d..643d2e42 100644 --- a/doc/docs/server_config/backup.md +++ b/doc/docs/server_config/backup.md @@ -35,7 +35,7 @@ Backing up this way is discouraged because new important files could be added la If you don't care about the warning not to backup this way, here are the "important" files that you can single out for backup: -- `watcharr.db` Your database, holds all users, their watchlists, etc. +- `watcharr.db` & `watcharr.db-wal` Your database, holds all users, their watchlists, etc. - `watcharr.json` Server config. - `img/up` Profile picture uploads. - `img/games` Game posters (not exactly important, but scenarios in which this folder is not backed up have not been tested, only relevant for servers with game support enabled). diff --git a/server/database/db.go b/server/database/db.go index 36f400e8..de83e5a1 100644 --- a/server/database/db.go +++ b/server/database/db.go @@ -1,26 +1,40 @@ package database import ( + "log/slog" "path" + "time" "github.com/sbondCo/Watcharr/config" "github.com/sbondCo/Watcharr/database/entity" + "github.com/sbondCo/Watcharr/database/migrate" "gorm.io/driver/sqlite" "gorm.io/gorm" ) // Create a new database connection. +// Also runs migrations, etc, before returning connection. +// Any error returned from this func should always make our app Exit (caller +// handled). func New() (*gorm.DB, error) { + slog.Info("New: Opening new database connection") // Open the database. db, err := gorm.Open( sqlite.Open(path.Join(config.DataPath, "watcharr.db")), &gorm.Config{TranslateError: true}, ) if err != nil { + slog.Error("New: Opening database failed.") + return nil, err + } + if err := configure(db); err != nil { + slog.Error("New: Configuring connection failed!", "error", err) return nil, err } // Perform auto migration. + slog.Info("New: AutoMigrating") err = db.AutoMigrate( + &migrate.MigrationRecord{}, &entity.User{}, &entity.UserServices{}, &entity.Content{}, @@ -36,7 +50,123 @@ func New() (*gorm.DB, error) { &entity.Tag{}, ) if err != nil { + slog.Error("New: Auto migration failed.") + return nil, err + } + slog.Info("New: AutoMigrated") + // Perform our manual migrations. + if err := migrate.Now(db); err != nil { + slog.Error("New: Manual migrations failed.", "error", err) + return nil, err + } + // Optimize database. + if err := optimize(db); err != nil { + slog.Error("New: Optimizing database failed.", "error", err) return nil, err } return db, nil } + +// Configure our SQLite database connection. +// Some PRAGMAs need to be defined per-connection, so we do that here. +func configure(db *gorm.DB) error { + slog.Info("configure: Configuring connection.") + + // Synchronous: https://sqlite.org/pragma.html#pragma_synchronous + // Configured to `FULL` because I'm slightly confused. + // `NORMAL` is recommended for most apps with WAL, but you + // lose "durability", which doesn't sound like a good thing to me... + // personally I'm okay with less performance for the best durability. + if res := db.Exec("PRAGMA synchronous=2"); res.Error != nil { + slog.Error("configure: Configuring synchronous failed!") + return res.Error + } + slog.Info("configure: Configured synchronous.") + + return nil +} + +// Optimize the database. +func optimize(db *gorm.DB) error { + slog.Info("optimize: Running optimizations.") + + // WAL Checkpoint (aka commit anything in the WAL to the main db). + // Seems best to do this to make sure it has happened, especially since + // we are running vacuum next. + // https://sqlite.org/pragma.html#pragma_wal_checkpoint + timeBeforeQuery := time.Now() + if res := db.Exec("PRAGMA wal_checkpoint(TRUNCATE)"); res.Error != nil { + slog.Error("optimize: Checkpoint failed!") + return res.Error + } + slog.Info("optimize: Checkpointed.", "took", time.Since(timeBeforeQuery)) + + // Optimize pragma. + // Running with recommended argument for our new long-living connection. + // https://sqlite.org/pragma.html#pragma_optimize + timeBeforeQuery = time.Now() + if res := db.Exec("PRAGMA optimize=0x10002"); res.Error != nil { + slog.Error("optimize: Optimize pragma failed!") + return res.Error + } + slog.Info("optimize: Optimize pragma succeeded.", + "took", time.Since(timeBeforeQuery)) + + // Vacuum. + // > VACUUM rebuilds the database file, repacking it into a minimal amount + // > of disk space. + // https://sqlite.org/lang_vacuum.html + timeBeforeQuery = time.Now() + if res := db.Exec("VACUUM"); res.Error != nil { + slog.Error("optimize: Vacuum failed!") + return res.Error + } + slog.Info("optimize: Vacuumed successfully.", + "took", time.Since(timeBeforeQuery)) + + // WAL Checkpoint (aka commit anything in the WAL to the main db). + // Do this after vacuum too to ensure we have a clean slate for this + // startup. + // https://sqlite.org/pragma.html#pragma_wal_checkpoint + timeBeforeQuery = time.Now() + if res := db.Exec("PRAGMA wal_checkpoint(TRUNCATE)"); res.Error != nil { + slog.Error("optimize: Checkpoint failed!") + return res.Error + } + slog.Info("optimize: Checkpointed.", "took", time.Since(timeBeforeQuery)) + + slog.Info("optimize: Done.") + return nil +} + +// Optimize task that is scheduled and ran every whenever. +// So this func is for optimzations that we want to re-run every time the +// task is scheduled for. +func TaskOptimize(db *gorm.DB) error { + slog.Info("TaskOptimize: Running optimizations.") + + // WAL Checkpoint (aka commit anything in the WAL to the main db). + // To avoid our WAL file becoming huge, we checkpoint regularly. + // https://sqlite.org/pragma.html#pragma_wal_checkpoint + timeBeforeQuery := time.Now() + if res := db.Exec("PRAGMA wal_checkpoint(TRUNCATE)"); res.Error != nil { + slog.Error("TaskOptimize: Checkpoint failed!") + return res.Error + } + slog.Info("TaskOptimize: Checkpointed.", + "took", time.Since(timeBeforeQuery)) + + // Optimize pragma. + // No args for our task as recommended. + // https://sqlite.org/pragma.html#pragma_optimize + timeBeforeQuery = time.Now() + if res := db.Exec("PRAGMA optimize"); res.Error != nil { + slog.Error("TaskOptimize: Optimize pragma failed!") + return res.Error + } + slog.Info("TaskOptimize: Optimize pragma succeeded.", + "took", time.Since(timeBeforeQuery)) + + slog.Info("TaskOptimize: Done.") + return nil +} diff --git a/server/database/dbmodel/gorm_model.go b/server/database/dbmodel/gorm_model.go index 707d3b66..664ad6ec 100644 --- a/server/database/dbmodel/gorm_model.go +++ b/server/database/dbmodel/gorm_model.go @@ -12,3 +12,11 @@ type GormModel struct { UpdatedAt time.Time `json:"updatedAt"` DeletedAt gorm.DeletedAt `gorm:"index" json:"deletedAt"` } + +// Same as GormModel, but without the DeletedAt field, +// so use this for tables where we don't need soft deletion. +type GormModelNoDel struct { + ID uint `gorm:"primarykey" json:"id"` + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` +} diff --git a/server/database/entity/activity.go b/server/database/entity/activity.go index bba337d2..33f76c64 100644 --- a/server/database/entity/activity.go +++ b/server/database/entity/activity.go @@ -54,4 +54,18 @@ type Activity struct { Data string `json:"data" gorm:"not null"` // Custom date for the activity, that the user can define. CustomDate *time.Time `json:"customDate,omitempty"` + // Count this Activity as a Play? + // Currently this was the best way I could see forward for implementing + // counting plays of media that doesn't involve inefficient querying of + // the actitivties table (or a whole new table, which would create extra + // complexities itself, ie, plays/activity showing different records). + // We write to this field when creating the activity to count is as a play + // or not (ie when we create STATUS CHANGE activities with status of + // FINISHED, imports, etc). + // We won't support the user (or the system) modifying this value after + // creation; if the user wants to delete a 'Play', they should delete the + // activity. + // Indexed (check migrations) to make search faster, since we frequently + // do it over the whole table for watched sorting at the moment. + CountAsPlay bool `json:"countAsPlay"` } diff --git a/server/database/entity/watched.go b/server/database/entity/watched.go index 9b51457d..f79e6553 100644 --- a/server/database/entity/watched.go +++ b/server/database/entity/watched.go @@ -12,6 +12,18 @@ const ( DROPPED WatchedStatus = "DROPPED" ) +func (r WatchedStatus) IsValid() bool { + switch r { + case FINISHED, + WATCHING, + PLANNED, + HOLD, + DROPPED: + return true + } + return false +} + type Watched struct { dbmodel.GormModel Status WatchedStatus `json:"status"` diff --git a/server/database/entity/watched_episode.go b/server/database/entity/watched_episode.go index 314c6f96..247daf67 100644 --- a/server/database/entity/watched_episode.go +++ b/server/database/entity/watched_episode.go @@ -8,7 +8,7 @@ import "github.com/sbondCo/Watcharr/database/dbmodel" // since episodes can be removed and re-added. For this reason we store season and episodes nums instead // of just the episode id. type WatchedEpisode struct { - dbmodel.GormModel + dbmodel.GormModelNoDel UserID uint `json:"-" gorm:"not null"` User User `json:"-"` WatchedID uint `json:"-" gorm:"uniqueIndex:we_watched_to_ens;not null"` diff --git a/server/database/entity/watched_season.go b/server/database/entity/watched_season.go index 75661f12..62e0a026 100644 --- a/server/database/entity/watched_season.go +++ b/server/database/entity/watched_season.go @@ -4,7 +4,7 @@ import "github.com/sbondCo/Watcharr/database/dbmodel" // UniqueIndex applied between WatchedID and SeasonNumber to avoid duplicates incase logic fails. type WatchedSeason struct { - dbmodel.GormModel + dbmodel.GormModelNoDel UserID uint `json:"-" gorm:"not null"` User User `json:"-"` WatchedID uint `json:"-" gorm:"uniqueIndex:ws_watched_to_season_num;not null"` diff --git a/server/database/migrate/entity.go b/server/database/migrate/entity.go new file mode 100644 index 00000000..35c767e0 --- /dev/null +++ b/server/database/migrate/entity.go @@ -0,0 +1,11 @@ +package migrate + +import "time" + +// Record of all our applied migrations. +type MigrationRecord struct { + // Migration ID + ID string `gorm:"primarykey"` + // When migration was applied on this db. + CreatedAt time.Time +} diff --git a/server/database/migrate/migrate.go b/server/database/migrate/migrate.go new file mode 100644 index 00000000..b866665b --- /dev/null +++ b/server/database/migrate/migrate.go @@ -0,0 +1,100 @@ +package migrate + +import ( + "log/slog" + "time" + + "gorm.io/gorm" +) + +type Migration struct { + // ID of migration, stick to YYYYMMDDHHMM. + ID string + // Apply migration func. + Up func(tx *gorm.DB) error + // When `true`, the migration is not run inside of a transaction. + // You should only use this when is required by sqlite that the command + // we need to run for eg cannot be ran from within a transaction! + // YOU SHOULD ENSURE YOU ONLY RUN ONE COMMAND PER MIGRATION WHEN USING + // THIS WITH `TRUE` TO AVOID BEING LEFT IN A BAD OR INCOMPLETE STATE!!! + // + // ALSO: All statements used with this should take into account that since, + // it isn't inside of a transaction, it's possible the migration succeeds, + // but creating the record of it doesn't. If a user starts the server again + // after we error in this case, the migration will run again, so it must + // not break data integrity or make any assumptions of it being the first + // time running! + UNSAFE bool +} + +// Start our migrations. +// NOTE: This is only to be ran after GORM's AutoMigrate. +func Now(db *gorm.DB) error { + slog.Info("Starting migrations.") + + for _, mig := range migrations { + slog.Debug("Processing migration.", "id", mig.ID) + + migRecord := MigrationRecord{ID: mig.ID} + + // First ensure that the migration hasn't already been applied. + var alreadyApplied int64 + res := db. + Model(&MigrationRecord{}). + Where(&migRecord). + Count(&alreadyApplied) + if res.Error != nil { + slog.Error("already applied check failed!") + return res.Error + } + if alreadyApplied > 0 { + // If record exists in our table, then migration was applied + // already, so skip processing it. + slog.Debug("Migration already applied.", "id", mig.ID) + continue + } + + // Timing the migration. + timeBeforeMig := time.Now() + + // Apply the migration. + if mig.UNSAFE { + // Unsafe migrations are not ran inside of a transaction + // and are only used when required by sqlite engine. + if err := mig.Up(db); err != nil { + slog.Error("Migration failed!", "id", mig.ID, "error", err) + return err + } + // Record the migration record. + if res := db.Create(&migRecord); res.Error != nil { + slog.Error("Unsafe migration succeeded, but we failed to create the record of it!", + "id", mig.ID, "error", res.Error) + return res.Error + } + } else { + // Migrations go through a transaction wrapper. + err := db.Transaction(func(tx *gorm.DB) error { + if err := mig.Up(tx); err != nil { + // Errored.. rollback any changes made. + return err + } + // Migration succeeded.. record it. + // If the Create succeeds, all will be committed. + return tx.Create(&migRecord).Error + }) + if err != nil { + // If any migration fails, we return here. + slog.Error("Migration failed!", "id", mig.ID, "error", err) + return err + } + } + + slog.Debug("Migration applied successfully.", + "id", mig.ID, + "duration", time.Since(timeBeforeMig)) + } + + slog.Info("Done processing all migrations.") + + return nil +} diff --git a/server/database/migrate/migrations.go b/server/database/migrate/migrations.go new file mode 100644 index 00000000..67f411b2 --- /dev/null +++ b/server/database/migrate/migrations.go @@ -0,0 +1,138 @@ +package migrate + +import ( + "errors" + "log/slog" + "strings" + + "github.com/sbondCo/Watcharr/database/entity" + "gorm.io/gorm" +) + +// NOTE: For obvious reasons, once a migration is created and in production, +// it is set in stone, so there should be almost no reason to change an existing +// migration, create a new one instead! +// If it's not obvious, changing an existing migration won't apply for people +// who already have applied it and only apply for people who haven't yet, +// so we are risking splitting the consistency of everyones databases as a +// whole. I can't forsee any circumstance that would require doing so.. + +var migrations = []Migration{ + { + // Backfilling `plays` data from users Activity. + // (we have just created the 'count_as_play' column, instead of starting + // existing data from 0 plays, we can check what existing activities + // should count, and count them). + ID: "202603201715_0001", + Up: func(tx *gorm.DB) error { + migID := "202603201715_0001" + slog.Info("Migration is starting.", "mig", migID) + // For ADDED_WATCHED and STATUS_CHANGED activities where the data + // holds something saying FINISHED somewhere, count as a play. + res := tx. + Model(&entity.Activity{}). + Where( + `type IN ? AND data LIKE "%FINISHED%"`, + []entity.ActivityType{ + entity.ADDED_WATCHED, + entity.STATUS_CHANGED, + }, + ). + Update("count_as_play", 1) + if res.Error != nil { + slog.Error("First step failed!", "mig", migID, + "error", res.Error) + return res.Error + } + slog.Info("First step succeeded, continuing.", "mig", migID) + // For IMPORTED_ADDED_WATCHED* activities, we don't need to check + // data (since there isn't any). We know these should always count + // as a play, so count them. + res = tx. + Model(&entity.Activity{}). + Where("type IN ?", []entity.ActivityType{ + entity.IMPORTED_ADDED_WATCHED, + // TODO: Should these be here?: + entity.IMPORTED_ADDED_WATCHED_JF, + entity.IMPORTED_ADDED_WATCHED_PLEX, + }). + Update("count_as_play", 1) + if res.Error != nil { + slog.Error("Second step failed!", "mig", migID, + "error", res.Error) + return res.Error + } + slog.Info("Second step succeeded, continuing.", "mig", migID) + return nil + }, + }, + { + // Dropping `deleted_at` columns for `watched_seasons` and + // `watched_episodes` tables since we do not use them. + ID: "202604142234_0002", + Up: func(tx *gorm.DB) error { + migID := "202604142234_0002" + slog.Info("Migration is starting.", "mig", migID) + + // Drop deleted_at for watched_seasons + err := tx.Migrator().DropColumn(&entity.WatchedSeason{}, "deleted_at") + if err != nil { + slog.Error("watched_seasons migration failed!", "mig", migID) + return err + } + slog.Info("watched_seasons migration succeeded.", "mig", migID) + + // Drop deleted_at for watched_episodes + err = tx.Migrator().DropColumn(&entity.WatchedEpisode{}, "deleted_at") + if err != nil { + slog.Error("watched_episodes migration failed!", "mig", migID) + return err + } + slog.Info("watched_episodes migration succeeded.", "mig", migID) + + slog.Info("Migration complete.", "mig", migID) + return nil + }, + }, + { + // Moving to using WAL journal_mode for our sqlite database, which + // should grant us improvements in all areas. + // https://sqlite.org/pragma.html#pragma_journal_mode + ID: "202604162229_0003", + // NOTE: We are using `unsafe` so that this migration isn't ran inside + // of a transaction (can't change into WAL from within one), so we + // MUST ENSURE we are only doing one thing! + UNSAFE: true, + Up: func(db *gorm.DB) error { + migID := "202604162229_0003" + slog.Info("Migration is starting.", "mig", migID) + + var mode string + res := db.Raw("PRAGMA journal_mode=WAL").Scan(&mode) + if res.Error != nil { + slog.Error("Setting journal_mode=WAL failed!", "mig", migID) + return res.Error + } + // Setting journal_mode might not return an error if it fails, + // it always returns the current journal_mode of the db, which + // will be WAL if it succeeds OR the "old" journal_mode if it + // wasn't changed. + // If the mode returned isn't WAL, then something has failed, so + // we'll error to stop here and prevent the migration record from + // being created, allowing the user to try again. + // Note: I was able to test this code by opening the db like this + // `sqlite.Open("file:data/watcharr.db?immutable=true")` and + // commenting out other code so we get right to this migration + // without failing at AutoMigration, etc. + slog.Info("journal_mode response.", "mode", mode) + if strings.ToLower(mode) != "wal" { + slog.Error("Setting journal_mode=WAL failed silently!") + return errors.New("Database is not in WAL mode after setting journal_mode=WAL") + } + slog.Info("WAL journal_mode migration succeeded.", "mig", migID) + + slog.Info("Migration complete.", "mig", migID) + return nil + }, + }, +} diff --git a/server/domain/activity.go b/server/domain/activity.go index b7892b66..a30cf3f1 100644 --- a/server/domain/activity.go +++ b/server/domain/activity.go @@ -7,7 +7,8 @@ import ( ) type ( - ActivityAddRequest struct { + // Internal struct accepted by AddActivity function. + ActivityAddProps struct { WatchedID uint `json:"watchedId" binding:"required"` Type entity.ActivityType `json:"type" binding:"required"` Data string `json:"data" binding:"required"` @@ -19,6 +20,22 @@ type ( } ActivityAddProvider interface { - AddActivity(userId uint, ar ActivityAddRequest) (entity.Activity, error) + AddActivity( + userId uint, + ar ActivityAddProps, + countAsPlay bool, + ) (entity.Activity, error) } ) + +// Looks through Activity for Watched entry and calculates the amount +// that count as plays. +func getPlaysFromActivity(a []entity.Activity) int { + plays := 0 + for i := range a { + if a[i].CountAsPlay { + plays++ + } + } + return plays +} diff --git a/server/domain/watched.go b/server/domain/watched.go index a5329a98..c674a5e0 100644 --- a/server/domain/watched.go +++ b/server/domain/watched.go @@ -89,6 +89,8 @@ type WatchedDto struct { WatchedEpisodes []entity.WatchedEpisode `json:"watchedEpisodes,omitempty"` Tags []entity.Tag `json:"tags,omitempty"` LastViewedSeason *int `json:"lastViewedSeason,omitempty"` + // Amount of plays this media has, calculated from activity. + Plays int `json:"plays,omitempty"` } // New dto with base properties that we have for all WatchedDtos. @@ -137,6 +139,7 @@ func NewWatchedDtoForContentPage(w *entity.Watched) WatchedDto { dto.WatchedEpisodes = w.WatchedEpisodes dto.Tags = w.Tags dto.LastViewedSeason = w.LastViewedSeason + dto.Plays = getPlaysFromActivity(w.Activity) return dto } @@ -192,11 +195,35 @@ type WatchedAddRequest struct { // Update watched entry request type WatchedUpdateRequest struct { - Status entity.WatchedStatus `json:"status" binding:"required_without_all=Rating Thoughts RemoveThoughts Pinned"` - Rating float64 `json:"rating" binding:"max=10,required_without_all=Status Thoughts RemoveThoughts Pinned"` - Thoughts string `json:"thoughts" binding:"required_without_all=Status Rating RemoveThoughts Pinned"` + Status entity.WatchedStatus `json:"status"` + Rating float64 `json:"rating"` + Thoughts string `json:"thoughts" ` RemoveThoughts bool `json:"removeThoughts"` - Pinned *bool `json:"pinned" binding:"required_without_all=Status Rating Thoughts RemoveThoughts"` + Pinned *bool `json:"pinned" ` + // Allow the added activity count as play? + // If the activity was going to count, this can stop it. + LetCountAsPlay *bool `json:"letCountAsPlay"` +} + +// If the struct is valid for the Update Request. +// - has atleast one property set. +// - If rating is set, can't be out of bounds. +func (w WatchedUpdateRequest) Valid() error { + if w.Status == "" && + w.Rating == 0 && + (w.Thoughts == "" && !w.RemoveThoughts) && + w.Pinned == nil && + w.LetCountAsPlay == nil { + // No properties are set, so this struct is not valid. + return errors.New("no properties provided") + } + if w.Status != "" && !w.Status.IsValid() { + return errors.New("status is not set to a supported status") + } + if w.Rating < 0 || w.Rating > 10 { + return errors.New("rating can only be a value from 0-10") + } + return nil } // Update response. diff --git a/server/feature/activity/activity.go b/server/feature/activity/activity.go index 3758ec5c..777fb4ab 100644 --- a/server/feature/activity/activity.go +++ b/server/feature/activity/activity.go @@ -19,31 +19,61 @@ func NewService(db *gorm.DB) *Service { } } -func (s *Service) GetActivity(userId uint, watchedId uint) ([]entity.Activity, error) { +func (s *Service) GetActivity( + userId uint, + watchedId uint, +) ([]entity.Activity, error) { activity := new([]entity.Activity) - res := s.db.Model(&entity.Activity{}).Where("user_id = ? AND watched_id = ?", userId, watchedId).Find(&activity) + res := s.db.Model(&entity.Activity{}). + Where("user_id = ? AND watched_id = ?", userId, watchedId). + Find(&activity) if res.Error != nil { - slog.Error("Failed getting activity from database", "error", res.Error.Error()) + slog.Error("Failed getting activity from database", + "error", res.Error.Error()) return []entity.Activity{}, errors.New("failed getting activity") } return *activity, nil } -func (s *Service) AddActivity(userId uint, ar domain.ActivityAddRequest) (entity.Activity, error) { +// NOTE: Currently this function doesn't verify if `userId` owns the referenced +// watched item at `ar.WatchedID`. If we ever need this function to work from an +// "AddActivity" endpoint on the API, we should create another func that has +// that validation, since this func is only for internal operations! +// AddActivity: Only for internal use. +func (s *Service) AddActivity( + userId uint, + ar domain.ActivityAddProps, + // If this activity counts as a play. + countAsPlay bool, +) (entity.Activity, error) { if ar.WatchedID == 0 { - return entity.Activity{}, errors.New("watchedId must be set to add an activity") + return entity.Activity{}, + errors.New("watchedId must be set to add an activity") + } + activity := entity.Activity{ + UserID: userId, + WatchedID: ar.WatchedID, + Type: ar.Type, + Data: ar.Data, + CustomDate: ar.CustomDate, + CountAsPlay: countAsPlay, } - activity := entity.Activity{UserID: userId, WatchedID: ar.WatchedID, Type: ar.Type, Data: ar.Data, CustomDate: ar.CustomDate} res := s.db.Create(&activity) if res.Error != nil { - slog.Error("Error adding activity to database", "error", res.Error.Error()) - return entity.Activity{}, errors.New("failed adding new activity to database") + slog.Error("Error adding activity to database", + "error", res.Error.Error()) + return entity.Activity{}, + errors.New("failed adding new activity to database") } slog.Debug("Adding activity", "added_activity", activity) return activity, nil } -func (s *Service) UpdateActivity(userId uint, id uint, activityUpdateRequest domain.ActivityUpdateRequest) error { +func (s *Service) UpdateActivity( + userId uint, + id uint, + activityUpdateRequest domain.ActivityUpdateRequest, +) error { if id == 0 { return errors.New("id must be set to update an activity") } @@ -55,11 +85,12 @@ func (s *Service) UpdateActivity(userId uint, id uint, activityUpdateRequest dom Where("user_id = ? AND id = ?", userId, id). Update("custom_date", activityUpdateRequest.CustomDate) if res.Error != nil { - slog.Error("Error updating activity in database", "error", res.Error.Error()) + slog.Error("Error updating activity in database", + "error", res.Error.Error()) return errors.New("failed updating activity in database") } if res.RowsAffected < 1 { - slog.Error("No activities were updated. This may be because the activity doesn't exist or is not owned by the calling user.") + slog.Error("No activities were updated.") return errors.New("failed updating activity in database") } slog.Debug("Updating activity", "updated_activity", id) @@ -72,11 +103,12 @@ func (s *Service) DeleteActivity(userId uint, id uint) error { } res := s.db.Where("user_id = ?", userId).Delete(&entity.Activity{}, id) if res.Error != nil { - slog.Error("Error deleting activity in database", "error", res.Error.Error()) + slog.Error("Error deleting activity in database", + "error", res.Error.Error()) return errors.New("failed deleting activity in database") } if res.RowsAffected < 1 { - slog.Error("No activities were deleted. This may be because the activity doesn't exist or is not owned by the calling user.") + slog.Error("No activities were deleted.") return errors.New("failed deleting activity from database") } return nil diff --git a/server/feature/activity/router.go b/server/feature/activity/router.go index 94d5575f..f4517be3 100644 --- a/server/feature/activity/router.go +++ b/server/feature/activity/router.go @@ -27,7 +27,6 @@ func (r *Router) AddRoutes() { activity := r.br.Router.Group("/activity").Use(authmiddleware.AuthRequired(nil, r.br.Cfg)) activity.GET(":watchedId", r.GetActivity) - activity.POST("", r.AddActivity) activity.PUT(":id", r.UpdateActivity) activity.DELETE(":id", r.DeleteActivity) } @@ -47,22 +46,6 @@ func (r *Router) GetActivity(c *gin.Context) { c.JSON(http.StatusOK, activity) } -func (r *Router) AddActivity(c *gin.Context) { - userId := c.MustGet("userId").(uint) - var ar domain.ActivityAddRequest - err := c.ShouldBindJSON(&ar) - if err == nil { - response, err := r.service.AddActivity(userId, ar) - if err != nil { - c.JSON(http.StatusForbidden, router.ErrorResponse{Error: err.Error()}) - return - } - c.JSON(http.StatusOK, response) - return - } - c.AbortWithStatusJSON(http.StatusBadRequest, router.ErrorResponse{Error: err.Error()}) -} - func (r *Router) UpdateActivity(c *gin.Context) { userId := c.MustGet("userId").(uint) id, err := strconv.ParseUint(c.Param("id"), 10, 32) diff --git a/server/feature/imprt/import.go b/server/feature/imprt/import.go index ecb8d863..0fb5a1f7 100644 --- a/server/feature/imprt/import.go +++ b/server/feature/imprt/import.go @@ -170,10 +170,12 @@ func (s *Service) SuccessfulImport( }) if err != nil { if errors.Is(err, domain.ErrWatchedExists) { - slog.Error("successfulImport: Must already be on watch list", "error", err) + slog.Error("successfulImport: Must already be on watch list", + "error", err) return domain.ImportResponse{Type: domain.IMPORT_EXISTS} } - slog.Error("successfulImport: Failed to add content as watched", "error", err) + slog.Error("successfulImport: Failed to add content as watched", + "error", err) return domain.ImportResponse{Type: domain.IMPORT_FAILED} } // Add activity of the original time the show was added to the users @@ -185,21 +187,58 @@ func (s *Service) SuccessfulImport( "rating": ar.Rating, "linkedActivity": w.Activity[0].ID, }) - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.IMPORTED_RATING, Data: string(activityJson), CustomDate: ar.RatingCustomDate}) + addedActivity, _ = s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.IMPORTED_RATING, + Data: string(activityJson), + CustomDate: ar.RatingCustomDate, + }, + false, + ) } else { - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.IMPORTED_RATING, Data: strconv.Itoa(int(ar.Rating)), CustomDate: ar.RatingCustomDate}) + addedActivity, _ = s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.IMPORTED_RATING, + Data: strconv.Itoa(int(ar.Rating)), + CustomDate: ar.RatingCustomDate, + }, + false, + ) } w.Activity = append(w.Activity, addedActivity) } // Add all dates watched as activity, if any if len(ar.DatesWatched) > 0 { - for _, v := range ar.DatesWatched { + for i, v := range ar.DatesWatched { + countAsPlay := true + if i == 0 && ar.Status == entity.FINISHED { + // If the watched status we are importing is of FINISHED + // then the first DatesWatched must not count as a play, + // since the import activity (set in AddWatched) will already. + // Any subsequent DatesWatched should count as a play though. + countAsPlay = false + slog.Info("successfulImport: Set countAsPlay=false for first" + + "DatesWatched to avoid duplicate play count with AddWatched activity.") + } customDate := v - addedActivity, err := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.IMPORTED_ADDED_WATCHED, CustomDate: &customDate}) + addedActivity, err := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.IMPORTED_ADDED_WATCHED, + CustomDate: &customDate, + }, + countAsPlay, + ) if err == nil { w.Activity = append(w.Activity, addedActivity) } else { - slog.Error("successfulImport: Failed to add dateswatched activity.", "date", v, "error", err) + slog.Error("successfulImport: Failed to add dateswatched activity.", + "date", v, "error", err) } } } @@ -212,11 +251,21 @@ func (s *Service) SuccessfulImport( if activityDate == nil || activityDate.IsZero() { activityDate = &ar.Activity[i].CreatedAt } - addedActivity, err := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: v.Type, Data: v.Data, CustomDate: activityDate}) + addedActivity, err := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: v.Type, + Data: v.Data, + CustomDate: activityDate, + }, + v.CountAsPlay, + ) if err == nil { w.Activity = append(w.Activity, addedActivity) } else { - slog.Error("successfulImport: Failed to add imported activity.", "full_object", v, "error", err) + slog.Error("successfulImport: Failed to add imported activity.", + "full_object", v, "error", err) } } } @@ -232,7 +281,8 @@ func (s *Service) SuccessfulImport( AddActivityDate: v.CreatedAt, }) if err != nil { - slog.Error("successfulImport: Failed to add watched season.", "error", err) + slog.Error("successfulImport: Failed to add watched season.", + "error", err) continue } w.WatchedSeasons = ws.WatchedSeasons @@ -251,7 +301,8 @@ func (s *Service) SuccessfulImport( AddActivityDate: v.CreatedAt, }) if err != nil { - slog.Error("successfulImport: Failed to add watched episodes.", "error", err) + slog.Error("successfulImport: Failed to add watched episodes.", + "error", err) continue } w.WatchedEpisodes = ws.WatchedEpisodes @@ -266,7 +317,8 @@ func (s *Service) SuccessfulImport( var t entity.Tag t, err := s.tagProvider.GetTagByNameAndColor(userId, v.Name, v.Color, v.BgColor) if err != nil && err.Error() != "tag does not exist" { - slog.Error("successfulImport: Failed to check for an existing tag", "name", v.Name, "error", err) + slog.Error("successfulImport: Failed to check for an existing tag", + "name", v.Name, "error", err) continue } if t.ID == 0 { @@ -276,7 +328,8 @@ func (s *Service) SuccessfulImport( BgColor: v.BgColor, }) if err != nil { - slog.Error("successfulImport: Failed to add a tag.", "name", v.Name, "error", err) + slog.Error("successfulImport: Failed to add a tag.", + "name", v.Name, "error", err) continue } t = tag @@ -285,7 +338,8 @@ func (s *Service) SuccessfulImport( // Associate the watched entry with the tag err = watched.AddWatchedToTag(s.db, userId, t.ID, w.ID) if err != nil { - slog.Error("successfulImport: Failed to associate watched entry with tag.", "error", err) + slog.Error("successfulImport: Failed to associate watched entry with tag.", + "error", err) continue } w.Tags = append(w.Tags, t) diff --git a/server/feature/imprt/import_trakt.go b/server/feature/imprt/import_trakt.go index 200574b3..df6545ef 100644 --- a/server/feature/imprt/import_trakt.go +++ b/server/feature/imprt/import_trakt.go @@ -257,7 +257,7 @@ func (t *TraktService) startTraktImport(jobId string, userId uint, req TraktImpo SeasonNumber: v.Episode.Season, EpisodeNumber: v.Episode.Number, Status: entity.PLANNED, - GormModel: dbmodel.GormModel{ + GormModelNoDel: dbmodel.GormModelNoDel{ CreatedAt: v.ListedAt, }, }) @@ -283,7 +283,7 @@ func (t *TraktService) startTraktImport(jobId string, userId uint, req TraktImpo SeasonNumber: v.Episode.Season, EpisodeNumber: v.Episode.Number, Status: entity.PLANNED, - GormModel: dbmodel.GormModel{ + GormModelNoDel: dbmodel.GormModelNoDel{ CreatedAt: v.ListedAt, }, }} @@ -393,7 +393,7 @@ func (t *TraktService) processTraktHistoryItem(v TraktHistory, toImport map[stri EpisodeNumber: v.Episode.Number, Status: entity.FINISHED, // Rating: , - GormModel: dbmodel.GormModel{ + GormModelNoDel: dbmodel.GormModelNoDel{ CreatedAt: v.WatchedAt, }, } diff --git a/server/feature/jellyfin/jellyfin_sync.go b/server/feature/jellyfin/jellyfin_sync.go index e64fb2d0..cf6860af 100644 --- a/server/feature/jellyfin/jellyfin_sync.go +++ b/server/feature/jellyfin/jellyfin_sync.go @@ -175,7 +175,15 @@ func (s *SyncService) startJellyfinSync( } else { // 3. Add IMPORTED_ADDED_WATCHED_JF activity if !v.UserData.LastPlayedDate.IsZero() { - _, err := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.IMPORTED_ADDED_WATCHED_JF, CustomDate: &v.UserData.LastPlayedDate}) + _, err := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.IMPORTED_ADDED_WATCHED_JF, + CustomDate: &v.UserData.LastPlayedDate, + }, + false, + ) if err != nil { slog.Error("jellyfinSyncWatched: Failed to add dateswatched activity.", "movie_name", v.Name, "movie_ids", v.ProviderIds, "user_id", userId, "date", v.UserData.LastPlayedDate, "error", err) @@ -280,10 +288,22 @@ func (s *SyncService) startJellyfinSync( } else { // 3. Add IMPORTED_ADDED_WATCHED activity (only if no err above, show also must not have already been on our list) if !v.UserData.LastPlayedDate.IsZero() { - _, err := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.IMPORTED_ADDED_WATCHED_JF, CustomDate: &v.UserData.LastPlayedDate}) + _, err := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.IMPORTED_ADDED_WATCHED_JF, + CustomDate: &v.UserData.LastPlayedDate, + }, + false, + ) if err != nil { - slog.Error("jellyfinSyncWatched: Failed to add dateswatched activity.", "series_name", v.Name, - "series_ids", v.ProviderIds, "user_id", userId, "date", v.UserData.LastPlayedDate, "error", err) + slog.Error("jellyfinSyncWatched: Failed to add dateswatched activity.", + "series_name", v.Name, + "series_ids", v.ProviderIds, + "user_id", userId, + "date", v.UserData.LastPlayedDate, + "error", err) } } } diff --git a/server/feature/plex/plex_sync.go b/server/feature/plex/plex_sync.go index 593941b4..10a9b4a8 100644 --- a/server/feature/plex/plex_sync.go +++ b/server/feature/plex/plex_sync.go @@ -150,11 +150,15 @@ func (s *SyncService) startPlexSync( } else { // 3. Add IMPORTED_ADDED_WATCHED_PLEX activity if !lastViewedAt.IsZero() { - _, err := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{ - WatchedID: w.ID, - Type: entity.IMPORTED_ADDED_WATCHED_PLEX, - CustomDate: &lastViewedAt, - }) + _, err := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.IMPORTED_ADDED_WATCHED_PLEX, + CustomDate: &lastViewedAt, + }, + false, + ) if err != nil { slog.Error("plexSyncWatched: Failed to add dateswatched activity.", "movie_name", movie.Title, "movie_id", movie.GUID, "user_id", userId, "date", lastViewedAt, "unparsed_date", movie.LastViewedAt, "error", err) @@ -236,11 +240,15 @@ func (s *SyncService) startPlexSync( } else { // 3. Add IMPORTED_ADDED_WATCHED_PLEX activity if !lastViewedAt.IsZero() { - _, err := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{ - WatchedID: w.ID, - Type: entity.IMPORTED_ADDED_WATCHED_PLEX, - CustomDate: &lastViewedAt, - }) + _, err := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.IMPORTED_ADDED_WATCHED_PLEX, + CustomDate: &lastViewedAt, + }, + false, + ) if err != nil { slog.Error("plexSyncWatched: Failed to add dateswatched activity.", "movie_name", show.Title, "movie_id", show.GUID, "user_id", userId, "date", lastViewedAt, "unparsed_date", show.LastViewedAt, "error", err) diff --git a/server/feature/watched/episode/episode.go b/server/feature/watched/episode/episode.go index babc36f8..d0f3ada6 100644 --- a/server/feature/watched/episode/episode.go +++ b/server/feature/watched/episode/episode.go @@ -143,24 +143,54 @@ func (s *Service) AddWatchedEpisodes(userId uint, ar WatchedEpisodeAddRequest) ( // (changing value to same value doesn't count). if updated { if ar.Status != "" { - json, _ := json.Marshal(map[string]interface{}{"season": ar.SeasonNumber, "episode": ar.EpisodeNumber, "status": ar.Status}) - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.EPISODE_STATUS_CHANGED, Data: string(json)}) + json, _ := json.Marshal(map[string]any{ + "season": ar.SeasonNumber, + "episode": ar.EpisodeNumber, + "status": ar.Status}) + addedActivity, _ = s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.EPISODE_STATUS_CHANGED, + Data: string(json), + }, + false, + ) } if ar.Rating != 0 { - json, _ := json.Marshal(map[string]interface{}{"season": ar.SeasonNumber, "episode": ar.EpisodeNumber, "rating": ar.Rating}) - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.EPISODE_RATING_CHANGED, Data: string(json)}) + json, _ := json.Marshal(map[string]any{ + "season": ar.SeasonNumber, + "episode": ar.EpisodeNumber, + "rating": ar.Rating}) + addedActivity, _ = s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.EPISODE_RATING_CHANGED, + Data: string(json), + }, + false, + ) } } } else { - json, _ := json.Marshal(map[string]interface{}{"season": ar.SeasonNumber, "episode": ar.EpisodeNumber, "status": ar.Status, "rating": ar.Rating}) - act := domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.EPISODE_ADDED, Data: string(json)} + json, _ := json.Marshal(map[string]any{ + "season": ar.SeasonNumber, + "episode": ar.EpisodeNumber, + "status": ar.Status, + "rating": ar.Rating}) + act := domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.EPISODE_ADDED, + Data: string(json), + } if ar.AddActivity != "" { act.Type = ar.AddActivity } if !ar.AddActivityDate.IsZero() { act.CustomDate = &ar.AddActivityDate } - addedActivity, _ = s.activityProvider.AddActivity(userId, act) + addedActivity, _ = s.activityProvider.AddActivity(userId, act, false) } episodeAddResp := WatchedEpisodeAddResponse{ WatchedEpisodes: w.WatchedEpisodes, @@ -168,7 +198,13 @@ func (s *Service) AddWatchedEpisodes(userId uint, ar WatchedEpisodeAddRequest) ( } if ar.Status != "" { slog.Debug("addWatchedEpisodes: Episode status was changed, calling hook.") - episodeAddResp.EpisodeStatusChangedHookResponse = s.hookEpisodeStatusChanged(userId, ar.WatchedID, ar.SeasonNumber, ar.EpisodeNumber, ar.Status) + episodeAddResp.EpisodeStatusChangedHookResponse = + s.hookEpisodeStatusChanged( + userId, + ar.WatchedID, + ar.SeasonNumber, + ar.EpisodeNumber, + ar.Status) } return episodeAddResp, nil } @@ -177,7 +213,12 @@ func (s *Service) AddWatchedEpisodes(userId uint, ar WatchedEpisodeAddRequest) ( func (s *Service) rmWatchedEpisode(userId uint, id uint) (entity.Activity, error) { slog.Debug("rmWatchedSeason called", "user_id", userId, "id", id) var watchedEpisode entity.WatchedEpisode - resp := s.db.Clauses(clause.Returning{}).Model(&entity.WatchedEpisode{}).Unscoped().Where("id = ? AND user_id = ?", id, userId).Delete(&watchedEpisode) + resp := s.db. + Clauses(clause.Returning{}). + Model(&entity.WatchedEpisode{}). + Unscoped(). + Where("id = ? AND user_id = ?", id, userId). + Delete(&watchedEpisode) if resp.Error != nil { slog.Error("Failed when removing a watched episode", "error", resp.Error) return entity.Activity{}, errors.New("failed when removing watched episode") @@ -194,7 +235,15 @@ func (s *Service) rmWatchedEpisode(userId uint, id uint) (entity.Activity, error "status": watchedEpisode.Status, "rating": watchedEpisode.Rating, }) - addedActivity, _ := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: watchedEpisode.WatchedID, Type: entity.EPISODE_REMOVED, Data: string(json)}) + addedActivity, _ := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: watchedEpisode.WatchedID, + Type: entity.EPISODE_REMOVED, + Data: string(json), + }, + false, + ) return addedActivity, nil } return entity.Activity{}, errors.New("removed, but failed to add activity entry") @@ -223,7 +272,15 @@ func (s *Service) hookEpisodeStatusChanged(userId uint, watchedId uint, seasonNu hookResponse := EpisodeStatusChangedHookResponse{} addHookActivity := func(aType entity.ActivityType, data string) { - addedActivity, _ := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: watchedId, Type: aType, Data: (data)}) + addedActivity, _ := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: watchedId, + Type: aType, + Data: (data), + }, + false, + ) hookResponse.AddedActivities = append(hookResponse.AddedActivities, addedActivity) } diff --git a/server/feature/watched/router.go b/server/feature/watched/router.go index 9d9454d3..65e2ff52 100644 --- a/server/feature/watched/router.go +++ b/server/feature/watched/router.go @@ -120,14 +120,19 @@ func (r *Router) AddWatched(c *gin.Context) { var ar domain.WatchedAddRequest err := c.ShouldBindJSON(&ar) if err == nil { - response, err := r.s.AddWatched(userId, ar, domain.WatchedAddExtraProps{ - ActivityType: entity.ADDED_WATCHED, - }) + newWatched, err := r.s.AddWatched( + userId, + ar, + domain.WatchedAddExtraProps{ + ActivityType: entity.ADDED_WATCHED, + }, + ) if err != nil { c.JSON(http.StatusForbidden, router.ErrorResponse{Error: err.Error()}) return } - c.JSON(http.StatusOK, response) + dto := domain.NewWatchedDtoForContentPage(&newWatched) + c.JSON(http.StatusOK, dto) return } c.AbortWithStatusJSON(http.StatusBadRequest, router.ErrorResponse{Error: err.Error()}) diff --git a/server/feature/watched/season/season.go b/server/feature/watched/season/season.go index 2981a9ea..5c22ef5b 100644 --- a/server/feature/watched/season/season.go +++ b/server/feature/watched/season/season.go @@ -46,7 +46,11 @@ func (s *Service) AddWatchedSeason(userId uint, ar WatchedSeasonAddRequest) (Wat slog.Debug("Adding watched season item", "userId", userId, "watchedID", ar.WatchedID, "season", ar.SeasonNumber) // 1. Make sure watched item exists and it is the correct type (TV) var w entity.Watched - if resp := s.db.Where("id = ? AND user_id = ?", ar.WatchedID, userId).Preload("Content").Preload("WatchedSeasons").Find(&w); resp.Error != nil { + if resp := s.db. + Where("id = ? AND user_id = ?", ar.WatchedID, userId). + Preload("Content"). + Preload("WatchedSeasons"). + Find(&w); resp.Error != nil { slog.Error("Failed when adding a watched season", "error", "failed to get watched item from db") return WatchedSeasonAddResponse{}, errors.New("failed when retrieving watched item") } @@ -96,11 +100,27 @@ func (s *Service) AddWatchedSeason(userId uint, ar WatchedSeasonAddRequest) (Wat if updated { if ar.Status != "" { json, _ := json.Marshal(map[string]interface{}{"season": ar.SeasonNumber, "status": ar.Status}) - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.SEASON_STATUS_CHANGED, Data: string(json)}) + addedActivity, _ = s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.SEASON_STATUS_CHANGED, + Data: string(json), + }, + false, + ) } if ar.Rating != 0 { json, _ := json.Marshal(map[string]interface{}{"season": ar.SeasonNumber, "rating": ar.Rating}) - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.SEASON_RATING_CHANGED, Data: string(json)}) + addedActivity, _ = s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: w.ID, + Type: entity.SEASON_RATING_CHANGED, + Data: string(json), + }, + false, + ) } } } else { @@ -113,14 +133,14 @@ func (s *Service) AddWatchedSeason(userId uint, ar WatchedSeasonAddRequest) (Wat } } json, _ := json.Marshal(actData) - act := domain.ActivityAddRequest{WatchedID: w.ID, Type: entity.SEASON_ADDED, Data: string(json)} + act := domain.ActivityAddProps{WatchedID: w.ID, Type: entity.SEASON_ADDED, Data: string(json)} if ar.AddActivity != "" { act.Type = ar.AddActivity } if !ar.AddActivityDate.IsZero() { act.CustomDate = &ar.AddActivityDate } - addedActivity, _ = s.activityProvider.AddActivity(userId, act) + addedActivity, _ = s.activityProvider.AddActivity(userId, act, false) } return WatchedSeasonAddResponse{ WatchedSeasons: w.WatchedSeasons, @@ -132,7 +152,12 @@ func (s *Service) AddWatchedSeason(userId uint, ar WatchedSeasonAddRequest) (Wat func (s *Service) RmWatchedSeason(userId uint, seasonId uint) (entity.Activity, error) { slog.Debug("rmWatchedSeason called", "user_id", userId, "season_id", seasonId) var watchedSeason entity.WatchedSeason - resp := s.db.Clauses(clause.Returning{}).Model(&entity.WatchedSeason{}).Unscoped().Where("id = ? AND user_id = ?", seasonId, userId).Delete(&watchedSeason) + resp := s.db. + Clauses(clause.Returning{}). + Model(&entity.WatchedSeason{}). + Unscoped(). + Where("id = ? AND user_id = ?", seasonId, userId). + Delete(&watchedSeason) if resp.Error != nil { slog.Error("Failed when removing a watched season", "error", resp.Error) return entity.Activity{}, errors.New("failed when removing watched season") @@ -148,7 +173,15 @@ func (s *Service) RmWatchedSeason(userId uint, seasonId uint) (entity.Activity, "status": watchedSeason.Status, "rating": watchedSeason.Rating, }) - addedActivity, _ := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: watchedSeason.WatchedID, Type: entity.SEASON_REMOVED, Data: string(json)}) + addedActivity, _ := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: watchedSeason.WatchedID, + Type: entity.SEASON_REMOVED, + Data: string(json), + }, + false, + ) return addedActivity, nil } return entity.Activity{}, errors.New("removed, but failed to add activity entry") diff --git a/server/feature/watched/watched.go b/server/feature/watched/watched.go index 72d0a7e1..d23ec0b9 100644 --- a/server/feature/watched/watched.go +++ b/server/feature/watched/watched.go @@ -100,17 +100,18 @@ func (s *Service) GetWatchedPage( Preload("Tags"). Preload("WatchedSeasons"). Preload("WatchedEpisodes"). - // Refine our results first (filters, sort); - Scopes( - watchedRefine(wr), - ). + // Apply filters first. + Scopes(watchedRefineFilter(wr)). // Then count results (after filter); Count(&pRes.TotalResults). // Now calculate pagination properties with a TotalResults // that takes filtered out items into account. - Scopes( - util.Paginate(pp, pRes), - ). + Scopes(util.Paginate(pp, pRes)). + // Last we can apply our sorting. + // Note: We must sort *after* we count, because currently + // our 'Last Finished' sort, causes the COUNT query to also + // be given extra JOINS that we don't want (because it slows it down). + Scopes(watchedRefineSort(wr, userId)). Find(&watched) if res.Error != nil { slog.Error("GetWatchedPage: Failed!", "error", res.Error) @@ -162,17 +163,16 @@ func (s *Service) getPublicWatched( Preload("Tags"). Preload("WatchedSeasons"). Preload("WatchedEpisodes"). - // Refine our results first (filters, sort); - Scopes( - watchedRefine(wr), - ). + // Apply filters first. + Scopes(watchedRefineFilter(wr)). // Then count results (after filter); Count(&pRes.TotalResults). // Now calculate pagination properties with a TotalResults // that takes filtered out items into account. - Scopes( - util.Paginate(pp, pRes), - ). + Scopes(util.Paginate(pp, pRes)). + // Sort options. + // Note: See note above in GetWatchedPage. + Scopes(watchedRefineSort(wr, userId)). Find(&watched) if res.Error != nil { slog.Error("getPublicWatched: Failed!", "error", res.Error) @@ -186,7 +186,10 @@ func (s *Service) getPublicWatched( // Get a watched list item by id (must be for `userId`). func (s *Service) GetWatchedItemById(userId uint, id uint) (entity.Watched, error) { watched := new(entity.Watched) - res := s.db.Model(&entity.Watched{}).Preload("Content").Where("user_id = ? AND id = ?", userId, id).Find(&watched) + res := s.db.Model(&entity.Watched{}). + Preload("Content"). + Where("user_id = ? AND id = ?", userId, id). + Find(&watched) if res.Error != nil { slog.Error("GetWatchedItemById: Failed!", "error", res.Error) return entity.Watched{}, res.Error @@ -453,7 +456,7 @@ func (s *Service) AddWatched( slog.Debug("AddWatched: Added watched list item", "item", watched) // Finally add activity - activityAddReq := domain.ActivityAddRequest{ + activityAddReq := domain.ActivityAddProps{ WatchedID: watched.ID, Type: extraProps.ActivityType, } @@ -466,9 +469,14 @@ func (s *Service) AddWatched( } else { activityAddReq.Data = string(activityJson) } + countAsPlay := false + if ar.Status == entity.FINISHED { + countAsPlay = true + } act, _ := s.activityProvider.AddActivity( userId, activityAddReq, + countAsPlay, ) watched.Activity = append(watched.Activity, act) @@ -575,6 +583,11 @@ func (s *Service) updateWatched( ar domain.WatchedUpdateRequest, ) (domain.WatchedUpdateResponse, error) { slog.Debug("UpdateWatched", "request_data", ar) + if err := ar.Valid(); err != nil { + slog.Error("UpdateWatched: UpdateRequest struct is invalid.", + "id", id, "error", err) + return domain.WatchedUpdateResponse{}, err + } upwat := entity.Watched{} res := s.db.Model(&entity.Watched{}).Where("id = ? AND user_id = ?", id, userId).Take(&upwat) if res.Error != nil { @@ -603,16 +616,49 @@ func (s *Service) updateWatched( } addedActivity := entity.Activity{} if ar.Rating != 0 { - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: id, Type: entity.RATING_CHANGED, Data: strconv.Itoa(int(ar.Rating))}) + addedActivity, _ = s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: id, + Type: entity.RATING_CHANGED, + Data: strconv.Itoa(int(ar.Rating)), + }, + false, + ) } if ar.Status != "" { - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: id, Type: entity.STATUS_CHANGED, Data: string(ar.Status)}) + countAsPlay := false + if ar.Status == entity.FINISHED && + util.Deref(ar.LetCountAsPlay, true) != false { + countAsPlay = true + } + addedActivity, _ = s.activityProvider.AddActivity(userId, + domain.ActivityAddProps{ + WatchedID: id, + Type: entity.STATUS_CHANGED, + Data: string(ar.Status), + }, + countAsPlay, + ) } if ar.Thoughts != "" { - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: id, Type: entity.THOUGHTS_CHANGED}) + addedActivity, _ = s.activityProvider.AddActivity(userId, + domain.ActivityAddProps{ + WatchedID: id, + Type: entity.THOUGHTS_CHANGED, + }, + false, + ) } if ar.RemoveThoughts { - addedActivity, _ = s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: id, Type: entity.THOUGHTS_REMOVED, Data: originalThoughts}) + addedActivity, _ = s.activityProvider.AddActivity(userId, + domain.ActivityAddProps{ + WatchedID: id, + Type: entity.THOUGHTS_REMOVED, + Data: originalThoughts, + }, + false, + ) } return domain.WatchedUpdateResponse{NewActivity: addedActivity}, nil } @@ -665,6 +711,13 @@ func (s *Service) removeWatched( if res.RowsAffected <= 0 { return domain.WatchedRemoveResponse{}, errors.New("no watched entry found") } - addedActivity, _ := s.activityProvider.AddActivity(userId, domain.ActivityAddRequest{WatchedID: id, Type: entity.REMOVED_WATCHED}) + addedActivity, _ := s.activityProvider.AddActivity( + userId, + domain.ActivityAddProps{ + WatchedID: id, + Type: entity.REMOVED_WATCHED, + }, + false, + ) return domain.WatchedRemoveResponse{NewActivity: addedActivity}, nil } diff --git a/server/feature/watched/watched_refine.go b/server/feature/watched/watched_refine.go index 74272e66..20d16904 100644 --- a/server/feature/watched/watched_refine.go +++ b/server/feature/watched/watched_refine.go @@ -50,7 +50,14 @@ func refineFilterStatus(db *gorm.DB, f []entity.WatchedStatus) { } // Applies sorts to list. -func refineSort(db *gorm.DB, sort domain.WatchedSort, dir domain.SortDirection) { +// Takes in userId of user who owns the list we are sorting, since some sorts +// may require it for subqueries (eg LastFinished). +func refineSort( + db *gorm.DB, + userId uint, + sort domain.WatchedSort, + dir domain.SortDirection, +) { if sort == "" { return } @@ -71,19 +78,27 @@ func refineSort(db *gorm.DB, sort domain.WatchedSort, dir domain.SortDirection) db.Order(obc(clause.Column{Name: "watcheds.updated_at"})) case domain.WatchedSortLastFinished: db. - // This join looks for the latest activity for each watched entry - // that indiciates a 'FINISHED' status. The date of these is used - // in the sort below. - // This seems the best way to support this sort with how our current - // activity data is structured. + // This join looks for the latest activity that counts as a play + // for each watched entry. The date of these is used in the sort + // below. + // Note: Technically the join subquery will process ALL activities + // that the user has by their user_id, BUT this is okay since we + // use this sorting over the users entire watched list, so we want + // to process every activity to join to main list for the sort + // anyways. I'm making this note because previously I had left out + // the user_id WHERE, which results in all activities in the table + // being processed, which is obviously NOT wanted (cuz its slower). Joins(`LEFT JOIN ( SELECT watched_id AS a_watched_id, MAX(COALESCE(custom_date, created_at)) AS a_sort_by_date FROM activities - WHERE data LIKE "%FINISHED%" AND deleted_at IS NULL + WHERE + count_as_play = 1 + AND deleted_at IS NULL + AND user_id = ? GROUP BY watched_id - ) q ON q.a_watched_id = watcheds.id`). + ) q ON q.a_watched_id = watcheds.id`, userId). Order(obc(clause.Column{Name: "q.a_sort_by_date"})) case domain.WatchedSortRating: db.Order(obc(clause.Column{Name: "watcheds.rating"})) @@ -109,15 +124,23 @@ func refineSortPinned(db *gorm.DB) { } // list data. -// gorm scope for applying sort and filters to watched -func watchedRefine(wr domain.WatchedGetPageRequest) func(db *gorm.DB) *gorm.DB { +// gorm scope for applying filters to watched +func watchedRefineFilter(wr domain.WatchedGetPageRequest) func(db *gorm.DB) *gorm.DB { return func(db *gorm.DB) *gorm.DB { // Apply filters refineFilterType(db, wr.FilterType) refineFilterStatus(db, wr.FilterStatus) + return db + } +} + +// list data. +// gorm scope for applying sort to watched +func watchedRefineSort(wr domain.WatchedGetPageRequest, userId uint) func(db *gorm.DB) *gorm.DB { + return func(db *gorm.DB) *gorm.DB { // Apply sort refineSortPinned(db) - refineSort(db, wr.Sort, wr.SortDir) + refineSort(db, userId, wr.Sort, wr.SortDir) return db } } diff --git a/server/feature/watched/watchedutil/watched_util_test.go b/server/feature/watched/watchedutil/watched_util_test.go index 34564d82..aa1def1d 100644 --- a/server/feature/watched/watchedutil/watched_util_test.go +++ b/server/feature/watched/watchedutil/watched_util_test.go @@ -25,28 +25,28 @@ func TestGetLatestWatchedInTv(t *testing.T) { } watchedEps := []entity.WatchedEpisode{ { - GormModel: dbmodel.GormModel{ID: 60}, - EpisodeNumber: 1, - SeasonNumber: 1, - Status: entity.FINISHED, + GormModelNoDel: dbmodel.GormModelNoDel{ID: 60}, + EpisodeNumber: 1, + SeasonNumber: 1, + Status: entity.FINISHED, }, { - GormModel: dbmodel.GormModel{ID: 70}, - EpisodeNumber: 5, - SeasonNumber: 2, - Status: entity.FINISHED, + GormModelNoDel: dbmodel.GormModelNoDel{ID: 70}, + EpisodeNumber: 5, + SeasonNumber: 2, + Status: entity.FINISHED, }, { - GormModel: dbmodel.GormModel{ID: 72}, - EpisodeNumber: 6, - SeasonNumber: 3, - Status: entity.DROPPED, + GormModelNoDel: dbmodel.GormModelNoDel{ID: 72}, + EpisodeNumber: 6, + SeasonNumber: 3, + Status: entity.DROPPED, }, { - GormModel: dbmodel.GormModel{ID: 90}, - EpisodeNumber: 2, - SeasonNumber: 3, - Status: entity.FINISHED, + GormModelNoDel: dbmodel.GormModelNoDel{ID: 90}, + EpisodeNumber: 2, + SeasonNumber: 3, + Status: entity.FINISHED, }, } resp := watchedutil.GetLatestWatchedInTv(watchedSeasons, watchedEps) diff --git a/server/task/task.go b/server/task/task.go index 85584610..08342166 100644 --- a/server/task/task.go +++ b/server/task/task.go @@ -7,6 +7,7 @@ import ( "github.com/go-co-op/gocron/v2" "github.com/sbondCo/Watcharr/config" + "github.com/sbondCo/Watcharr/database" "github.com/sbondCo/Watcharr/feature/arr" "github.com/sbondCo/Watcharr/image" "github.com/sbondCo/Watcharr/token" @@ -74,6 +75,12 @@ func SetupTasks(cfg *config.ServerConfig, db *gorm.DB) { }, dd: 24 * time.Hour, }, + "Optimize Database": { + f: func() { + database.TaskOptimize(db) + }, + dd: 24 * time.Hour, + }, } // Add all jobs to scheduler. diff --git a/server/util/ptr.go b/server/util/ptr.go new file mode 100644 index 00000000..687fee6f --- /dev/null +++ b/server/util/ptr.go @@ -0,0 +1,11 @@ +package util + +// Safe dereferencing of pointers to make +// our core logic more readable. +// If the ptr is nil, def (a default value) is returned. +func Deref[T any](ptr *T, def T) T { + if ptr == nil { + return def + } + return *ptr +} diff --git a/server/watcharr.go b/server/watcharr.go index aec731d4..3713842c 100644 --- a/server/watcharr.go +++ b/server/watcharr.go @@ -66,7 +66,13 @@ func main() { } multiw := logging.Setup(path.Join(config.DataPath, "watcharr.log")) - slog.Info("Watcharr Starting", "version", version) + // Just a nice separator so when inspecting the log file I know when + // logs are for a new instance. + fmt.Fprintf(multiw, ` + Stand back. Watcharr is starting. + +`) + slog.Info("Watcharr starting", "version", version) fmt.Printf(` β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β’€β£€β£€β£€β£€β£€β£€β£€β£€β‘€β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β €β € ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣠⣴⣢⣿⠿⠛⠛⠛⠻⠿⣿⣿⣿⣿⣿⣢⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ @@ -110,7 +116,7 @@ func main() { β•šβ•β•β•β•šβ•β•β• β•šβ•β• β•šβ•β• β•šβ•β• β•šβ•β•β•β•β•β•β•šβ•β• β•šβ•β•β•šβ•β• β•šβ•β•β•šβ•β• β•šβ•β•β•šβ•β• β•šβ•β• Layer:%s Starting now. Get ready! - + Thank you for running my (spaghetti) code on your system.`+"\n\n", version) // Ensure data dir exists @@ -133,9 +139,12 @@ func main() { isProd = false } + // Create our database connection. + // Migrations are ran before our connection is returned for use. db, err := database.New() if err != nil { - log.Fatal("Failed to connect to database:", err) + slog.Error("Database initialization failed!", "error", err) + os.Exit(1) } if isProd { diff --git a/src/lib/Activity.svelte b/src/lib/Activity.svelte index 090dc305..98457ace 100644 --- a/src/lib/Activity.svelte +++ b/src/lib/Activity.svelte @@ -11,13 +11,10 @@ interface Props { activity: Activity[] | undefined; + onRemoved: (activity: Activity) => void; } - let { - // Bindable so we can update/delete activity and reflect - // the change upstream. - activity = $bindable(undefined), - }: Props = $props(); + let { activity = undefined, onRemoved }: Props = $props(); let clickedActivity: Activity | undefined = $state(); let groupedActivities: { [index: string]: any } = $derived( @@ -218,14 +215,14 @@ const ai = activity.findIndex((a) => a.id === activityId); activity[ai] = updatedActivity; }} - onRemoved={(activityId) => { + onRemoved={(a) => { if (!activity) { console.error( "ActivityEditor->onRemoved: 'activity' doesn't exist somehow..", ); return; } - activity = activity.filter((a) => a.id !== activityId); + onRemoved(a); }} /> {/if} @@ -252,13 +249,24 @@ data && data.reason ? `Automated because ${data.reason}` : "Completed by an automation.", - pos: "bot", + pos: "top", }} style="width: 20px; height: 20px;" > {/if} + {#if a.countAsPlay} + + + + {/if} {/each} {/each} diff --git a/src/lib/ActivityEditor.svelte b/src/lib/ActivityEditor.svelte index 34841f81..698d1b0f 100644 --- a/src/lib/ActivityEditor.svelte +++ b/src/lib/ActivityEditor.svelte @@ -8,7 +8,7 @@ activity: Activity; activityMessage: string; onClose: () => void; - onRemoved: (activityId: number) => void; + onRemoved: (activity: Activity) => void; onUpdated: (activityId: number, updatedActivity: Activity) => void; } @@ -85,7 +85,7 @@ if (!success) { return; } - onRemoved(activity.id); + onRemoved(activity); onClose(); } diff --git a/src/lib/Icon.svelte b/src/lib/Icon.svelte index 57c26fd2..d7803fa6 100644 --- a/src/lib/Icon.svelte +++ b/src/lib/Icon.svelte @@ -43,6 +43,7 @@ viewBox="0 0 512 512" width={wh} height={wh} + fill="currentColor" > ac.id !== a.id); +} + +/** + * Update local watched state with new `plays` when removing activity. + */ +function activityRemovedUpdateWatchedPlays( + w: Watched, + removedCountedAsPlay: boolean, +) { + // Only if the removed actitivty counted as a play + // will we update the state. + if (!removedCountedAsPlay) { + return; + } + if (w.plays && w.plays > 0) { + w.plays--; + } +} diff --git a/src/lib/content/MyReview.svelte b/src/lib/content/MyReview.svelte index 74a4efbd..c3d690d3 100644 --- a/src/lib/content/MyReview.svelte +++ b/src/lib/content/MyReview.svelte @@ -30,6 +30,12 @@ thoughts={watched?.thoughts} onChange={onThoughtsChanged} /> + {#if typeof watched.plays == "number" && watched.plays > 0} +
+ {watched.plays} + {watched.plays > 1 ? "Plays" : "Play"} +
+ {/if} {/if} diff --git a/src/lib/content/TopCrewList.svelte b/src/lib/content/TopCrewList.svelte new file mode 100644 index 00000000..d943412f --- /dev/null +++ b/src/lib/content/TopCrewList.svelte @@ -0,0 +1,38 @@ + + +
+ {#each topCrew as crew} +
+ {crew.name} + {crew.job} +
+ {/each} +
+ + diff --git a/src/lib/util/api.ts b/src/lib/util/api.ts index 47632757..6f607d08 100644 --- a/src/lib/util/api.ts +++ b/src/lib/util/api.ts @@ -27,14 +27,11 @@ export const baseURL = : "/api"; console.log("api: baseURL constructed:", baseURL); -interface UpdateWatchedSharedOptions { - status?: WatchedStatus; - rating?: number; - thoughts?: string; - pinned?: boolean; -} - -interface UpdateWatchedOptions extends UpdateWatchedSharedOptions { +/** + * Options for our internal updateWatched func. + */ +export interface UpdateWatchedOptions + extends Omit { /** * TMDB ID. */ @@ -52,6 +49,7 @@ async function _updateWatched( rating?: number, thoughts?: string, pinned?: boolean, + letCountAsPlay?: boolean, ) { if ( !status && @@ -70,6 +68,9 @@ async function _updateWatched( if (typeof thoughts !== "undefined") obj.thoughts = thoughts; if (thoughts === "") obj.removeThoughts = true; if (typeof pinned !== "undefined") obj.pinned = pinned; + if (typeof letCountAsPlay !== "undefined") { + obj.letCountAsPlay = letCountAsPlay; + } const resp = await axios.put( `/watched/${wEntry.id}`, obj, @@ -79,21 +80,25 @@ async function _updateWatched( if (typeof thoughts !== "undefined") wEntry.thoughts = thoughts; if (typeof pinned !== "undefined") wEntry.pinned = pinned; if (resp?.data?.newActivity && resp?.data?.newActivity?.id) { - if (wEntry.activity?.length > 0) { + if (wEntry.activity && wEntry.activity.length > 0) { wEntry.activity.push(resp.data.newActivity); } else { wEntry.activity = [resp.data.newActivity]; } - // We want to update the updatedAt field too (so - // change is reflected when filtering modified at) - // We can piggy back from this data for now. - wEntry.updatedAt = resp.data.newActivity.createdAt; + // If new activity counts as play, increment plays for local state. + if (resp.data.newActivity.countAsPlay) { + if (wEntry.plays) { + wEntry.plays++; + } else { + wEntry.plays = 1; + } + } } } /** - * Add or update watched show/movie. - * @param wEntry The watched entry (movie or tv only) we are updating. + * Add or update watched media. + * @param wEntry The watched entry we are updating. * @param opts Update options. * @returns Updated watched entry if request succeeded, otherwise will * throw error after displaying updating the notification to "failed". @@ -114,6 +119,7 @@ export async function updateWatched( opts.rating, opts.thoughts, opts.pinned, + opts.letCountAsPlay, ); notify({ id: nid, text: `Saved!`, type: "success" }); } catch (err) { diff --git a/src/lib/util/signal.ts b/src/lib/util/signal.ts new file mode 100644 index 00000000..29f06ee5 --- /dev/null +++ b/src/lib/util/signal.ts @@ -0,0 +1,24 @@ +// A simple signal implementation. +// For example, we can use a Signal to allow waiting for a decision +// from the user in a Modal and then continue logic depending on the response. + +export type SignalFireFunc = (value: T) => void; + +export interface Signal { + promise: Promise; + fire: SignalFireFunc; +} + +/** + * Create a new signal. + * Returns a new promise that we can await. + * The `fire` function resolves the promise. + */ +export function createSignal(): Signal { + let resolve: SignalFireFunc; + const promise = new Promise((r) => (resolve = r)); + return { + promise, + fire: (data: T) => resolve(data), + }; +} diff --git a/src/lib/watched/CountAsPlayModal.svelte b/src/lib/watched/CountAsPlayModal.svelte new file mode 100644 index 00000000..62cd3a44 --- /dev/null +++ b/src/lib/watched/CountAsPlayModal.svelte @@ -0,0 +1,37 @@ + + + +
+ + +
+ + + diff --git a/src/routes/(app)/game/[id]/+page.svelte b/src/routes/(app)/game/[id]/+page.svelte index 93ec6004..651c73f4 100644 --- a/src/routes/(app)/game/[id]/+page.svelte +++ b/src/routes/(app)/game/[id]/+page.svelte @@ -19,6 +19,7 @@ import Poster from "@/lib/poster/Poster.svelte"; import ExpandableText from "@/lib/content/ExpandableText.svelte"; import WatchedDeleteBtn from "@/lib/content/WatchedDeleteBtn.svelte"; + import { activityRemovedHook } from "@/lib/activity.js"; let { data } = $props(); @@ -213,7 +214,10 @@ {/if} {#if game.watched} - + activityRemovedHook(game?.watched, a)} + /> {/if} diff --git a/src/routes/(app)/import/process/+page.svelte b/src/routes/(app)/import/process/+page.svelte index a1eaa91e..26f32c3e 100644 --- a/src/routes/(app)/import/process/+page.svelte +++ b/src/routes/(app)/import/process/+page.svelte @@ -337,7 +337,10 @@ try { const startDateNode = animeNode.querySelector("my_start_date"); const finishDateNode = animeNode.querySelector("my_finish_date"); - if (startDateNode?.textContent) { + if ( + startDateNode?.textContent && + startDateNode?.textContent != "0000-00-00" + ) { // For start date, we can simply add the activity manually. l.activity = [ // We don't need all the data when importing activity. @@ -349,7 +352,10 @@ }, ] as any[]; } - if (finishDateNode?.textContent) { + if ( + finishDateNode?.textContent && + finishDateNode?.textContent != "0000-00-00" + ) { l.datesWatched = [new Date(finishDateNode.textContent)]; } } catch (err) { diff --git a/src/routes/(app)/movie/[id]/+page.svelte b/src/routes/(app)/movie/[id]/+page.svelte index 115fefbc..cdbc001a 100644 --- a/src/routes/(app)/movie/[id]/+page.svelte +++ b/src/routes/(app)/movie/[id]/+page.svelte @@ -33,6 +33,8 @@ import PosterImage from "@/lib/content/PosterImage.svelte"; import ExpandableText from "@/lib/content/ExpandableText.svelte"; import WatchedDeleteBtn from "@/lib/content/WatchedDeleteBtn.svelte"; + import TopCrewList from "@/lib/content/TopCrewList.svelte"; + import { activityRemovedHook } from "@/lib/activity.js"; let { data } = $props(); @@ -262,14 +264,7 @@ {:then credits} {#if credits.topCrew?.length > 0} -
- {#each credits.topCrew as crew} -
- {crew.name} - {crew.job} -
- {/each} -
+ {/if} {#if credits.cast?.length > 0} @@ -294,7 +289,10 @@ {/if} {#if movie.watched} - + activityRemovedHook(movie?.watched, a)} + /> {/if} @@ -370,22 +368,4 @@ padding: 20px; } } - - .creators { - display: flex; - flex-wrap: wrap; - justify-content: center; - gap: 35px; - margin: 10px 60px; - - div { - display: flex; - flex-flow: column; - min-width: 150px; - - span:first-child { - font-weight: bold; - } - } - } diff --git a/src/routes/(app)/profile/modals/ExportListModal.svelte b/src/routes/(app)/profile/modals/ExportListModal.svelte index aa124ce9..ca339782 100644 --- a/src/routes/(app)/profile/modals/ExportListModal.svelte +++ b/src/routes/(app)/profile/modals/ExportListModal.svelte @@ -47,8 +47,8 @@ instance.

- If you are migrating to another server you own, it's best to migrate take - your existing database with you. + If you are migrating to another server that you own, it's best to take your + existing database with you.

Warning: This is not a backup feature. Backups should be done on the diff --git a/src/routes/(app)/tv/[id]/+page.svelte b/src/routes/(app)/tv/[id]/+page.svelte index 159f27a7..a5b34b84 100644 --- a/src/routes/(app)/tv/[id]/+page.svelte +++ b/src/routes/(app)/tv/[id]/+page.svelte @@ -13,6 +13,7 @@ contentExistsOnJellyfin, removeWatched, updateWatched, + type UpdateWatchedOptions, } from "@/lib/util/api"; import { getTopCrew } from "@/lib/util/helpers.js"; import { store } from "@/store.svelte.js"; @@ -34,6 +35,10 @@ import PosterImage from "@/lib/content/PosterImage.svelte"; import ExpandableText from "@/lib/content/ExpandableText.svelte"; import WatchedDeleteBtn from "@/lib/content/WatchedDeleteBtn.svelte"; + import TopCrewList from "@/lib/content/TopCrewList.svelte"; + import { activityRemovedHook } from "@/lib/activity.js"; + import CountAsPlayModal from "@/lib/watched/CountAsPlayModal.svelte"; + import { createSignal, type Signal } from "@/lib/util/signal.js"; let { data } = $props(); @@ -42,6 +47,7 @@ let arrRequestButtonComp: ArrRequestButton | undefined = $state(); let show: Media | undefined = $state(); let pageError: Error | undefined = $state(); + let countAsPlayModalSignal: Signal | undefined = $state(); $effect(() => { (async () => { @@ -101,14 +107,29 @@ console.error("contentChanged: no show"); return false; } - show.watched = await updateWatched(show.watched, { + const reqOpts: UpdateWatchedOptions = { contentId: data.tvId, contentType: "tv", status: newStatus, rating: newRating, thoughts: newThoughts, pinned: pinned, - }); + }; + // Series differ from other media in that people are likely to go + // back out of the 'FINISHED' state when a new season releases + // while they watch it, then go back to 'FINISHED' after only + // watching the new season. Because of that use case, for series, + // we will ask the user if any 'FINISHED' statuses set when plays>1 + // should count as a play.. + if (show.watched?.plays && newStatus == "FINISHED") { + countAsPlayModalSignal = createSignal(); + const allow = await countAsPlayModalSignal.promise; + countAsPlayModalSignal = undefined; + if (!allow) { + reqOpts.letCountAsPlay = false; + } + } + show.watched = await updateWatched(show.watched, reqOpts); return true; } catch { return false; @@ -239,6 +260,10 @@ /> + {#if countAsPlayModalSignal} + + {/if} + {#if requestModalShown} {:then credits} {#if credits.topCrew?.length > 0} -

- {#each credits.topCrew as crew} -
- {crew.name} - {crew.job} -
- {/each} -
+ {/if} {#if credits.cast?.length > 0} @@ -292,7 +310,10 @@ {/if} {#if show.watched} - + activityRemovedHook(show?.watched, a)} + /> {/if} {#if data?.tvId && show.seasons} @@ -382,22 +403,4 @@ padding: 20px; } } - - .creators { - display: flex; - flex-wrap: wrap; - justify-content: center; - gap: 35px; - margin: 10px 60px; - - div { - display: flex; - flex-flow: column; - min-width: 150px; - - span:first-child { - font-weight: bold; - } - } - } diff --git a/src/types.ts b/src/types.ts index 178895f9..0bc0e654 100644 --- a/src/types.ts +++ b/src/types.ts @@ -114,6 +114,7 @@ export interface Activity extends dbModel { type: string; data: string; customDate: string; + countAsPlay: boolean; } export interface WatchedSeason { @@ -151,6 +152,7 @@ export interface Watched { watchedEpisodes?: WatchedEpisode[]; tags?: Tag[]; lastViewedSeason?: number; + plays?: number; // 'Watching Season/Ep' Extra detail. watchingSeason?: string; @@ -172,6 +174,7 @@ export interface WatchedUpdateRequest { thoughts?: string; removeThoughts?: boolean; pinned?: boolean; + letCountAsPlay?: boolean; } export interface WatchedUpdateResponse {