diff --git a/README.md b/README.md index 1b778942..01ffea68 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ - Run `npm run start` to only run the frontend React UI - Run `npm run start-app` to run both backend and frontend at the same time +When contributing please ensure to log a pull request on the `unstable` branch ### Launching Jellystat using Docker diff --git a/backend/routes/api.js b/backend/routes/api.js index 7afa9f10..59d414c6 100644 --- a/backend/routes/api.js +++ b/backend/routes/api.js @@ -888,7 +888,7 @@ router.post("/getItemHistory", async (req, res) => { `select jf_playback_activity.* from jf_playback_activity jf_playback_activity where - ("EpisodeId"=$1 OR "SeasonId"=$1 OR "NowPlayingItemId"=$1);`, [idemid] + ("EpisodeId"=$1 OR "SeasonId"=$1 OR "NowPlayingItemId"=$1);`, [itemid] ); const groupedResults = rows.map((item) => ({ diff --git a/backend/routes/stats.js b/backend/routes/stats.js index 51fa31cf..5faf03df 100644 --- a/backend/routes/stats.js +++ b/backend/routes/stats.js @@ -149,7 +149,7 @@ router.post("/getUserLastPlayed", async (req, res) => { try { const { userid } = req.body; const { rows } = await db.query( - `select * from fs_last_user_activity($1) limit 15`, [userId] + `select * from fs_last_user_activity($1) limit 15`, [userid] ); res.send(rows); } catch (error) {