Skip to content

Bump version to 1.1.10 in package.json and update SQL queries for par… #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CyferShepard merged 1 commit into from
Apr 18, 2026
+24 −21
Merged

Bump version to 1.1.10 in package.json and update SQL queries for par… #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions backend/routes/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ router.get("/getRecentlyAdded", async (req, res) => {
and i."ParentId"=$1
order by "DateCreated" desc
limit $2`,
[libraryid, limit]
[libraryid, limit],
);

const { rows: episodes } = await db.query(
Expand All @@ -240,7 +240,7 @@ router.get("/getRecentlyAdded", async (req, res) => {
and i."ParentId"=$1
order by e."DateCreated" desc
limit $2`,
[libraryid, limit]
[libraryid, limit],
);

let lastSynctedItemDate;
Expand All @@ -258,7 +258,7 @@ router.get("/getRecentlyAdded", async (req, res) => {

if (lastSynctedItemDate !== undefined) {
recentlyAddedFromJellystatMapped = recentlyAddedFromJellystatMapped.filter((item) =>
dayjs(item.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ").isAfter(lastSynctedItemDate)
dayjs(item.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ").isAfter(lastSynctedItemDate),
);
}

Expand All @@ -270,7 +270,7 @@ router.get("/getRecentlyAdded", async (req, res) => {
const recentlyAdded = [...recentlyAddedFromJellystatMapped, ...filteredDbRows];
// Sort recentlyAdded by DateCreated in descending order
recentlyAdded.sort(
(a, b) => dayjs(b.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ") - dayjs(a.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ")
(a, b) => dayjs(b.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ") - dayjs(a.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ"),
);

res.send(recentlyAdded);
Expand All @@ -282,7 +282,7 @@ router.get("/getRecentlyAdded", async (req, res) => {
where i.archived=false
order by "DateCreated" desc
limit $1`,
[limit]
[limit],
);

const { rows: episodes } = await db.query(
Expand All @@ -295,7 +295,7 @@ router.get("/getRecentlyAdded", async (req, res) => {
and e.archived=false
order by e."DateCreated" desc
limit $1`,
[limit]
[limit],
);
let lastSynctedItemDate;
if (items.length > 0 && items[0].DateCreated !== undefined && items[0].DateCreated !== null) {
Expand All @@ -312,7 +312,7 @@ router.get("/getRecentlyAdded", async (req, res) => {

if (lastSynctedItemDate !== undefined) {
recentlyAddedFromJellystatMapped = recentlyAddedFromJellystatMapped.filter((item) =>
dayjs(item.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ").isAfter(lastSynctedItemDate)
dayjs(item.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ").isAfter(lastSynctedItemDate),
);
}

Expand All @@ -330,7 +330,7 @@ router.get("/getRecentlyAdded", async (req, res) => {

// Sort recentlyAdded by DateCreated in descending order
recentlyAdded.sort(
(a, b) => dayjs(b.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ") - dayjs(a.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ")
(a, b) => dayjs(b.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ") - dayjs(a.DateCreated, "YYYY-MM-DD HH:mm:ss.SSSZ"),
);

res.send(recentlyAdded);
Expand Down Expand Up @@ -527,7 +527,7 @@ router.post("/updateCredentials", async (req, res) => {

try {
if (username !== undefined && config.APP_USER !== username) {
await db.query(`UPDATE app_config SET "APP_USER"='${username}' where "ID"=1`);
await db.query(`UPDATE app_config SET "APP_USER"=$1 where "ID"=1`, [username]);
}

if (current_password === undefined && new_password === undefined) {
Expand All @@ -541,9 +541,10 @@ router.post("/updateCredentials", async (req, res) => {
result.isValid = false;
result.errorMessage = "New Password cannot be the same as Old Password";
} else {
await db.query(
`UPDATE app_config SET "APP_PASSWORD"='${new_password}' where "ID"=1 AND "APP_PASSWORD"='${current_password}' `
);
await db.query(`UPDATE app_config SET "APP_PASSWORD"=$1 where "ID"=1 AND "APP_PASSWORD"=$2`, [
new_password,
current_password,
]);
}
} else {
result.isValid = false;
Expand All @@ -566,17 +567,19 @@ router.post("/updatePassword", async (req, res) => {

try {
const { rows } = await db.query(
`SELECT "JF_HOST","JF_API_KEY","APP_USER" FROM app_config where "ID"=1 AND "APP_PASSWORD"='${current_password}' `
`SELECT "JF_HOST","JF_API_KEY","APP_USER" FROM app_config where "ID"=1 AND "APP_PASSWORD"=$1 `,
[current_password],
);

if (rows && rows.length > 0) {
if (current_password === new_password) {
result.isValid = false;
result.errorMessage = "New Password cannot be the same as Old Password";
} else {
await db.query(
`UPDATE app_config SET "APP_PASSWORD"='${new_password}' where "ID"=1 AND "APP_PASSWORD"='${current_password}' `
);
await db.query(`UPDATE app_config SET "APP_PASSWORD"=$1 where "ID"=1 AND "APP_PASSWORD"=$2`, [
new_password,
current_password,
]);
}
} else {
result.isValid = false;
Expand Down Expand Up @@ -923,7 +926,7 @@ router.post("/getUserDetails", async (req, res) => {
return;
}

const { rows } = await db.query(`select * from jf_users where "Id"='${userid}'`);
const { rows } = await db.query(`select * from jf_users where "Id"=$1`, [userid]);
res.send(rows[0]);
} catch (error) {
console.log(error);
Expand Down Expand Up @@ -951,7 +954,7 @@ router.post("/getLibrary", async (req, res) => {
return;
}

const { rows } = await db.query(`select * from jf_libraries where "Id"='${libraryid}'`);
const { rows } = await db.query(`select * from jf_libraries where "Id"=$1`, [libraryid]);
res.send(rows[0]);
} catch (error) {
console.log(error);
Expand Down Expand Up @@ -989,7 +992,7 @@ router.post("/getSeasons", async (req, res) => {

const { rows } = await db.query(
`SELECT s.*, i."PrimaryImageHash", (select count(e.*) "Episodes" from jf_library_episodes e where e."SeasonId"=s."Id") ,(select sum(ii."Size") "Size" from jf_library_episodes e join jf_item_info ii on ii."Id"=e."EpisodeId" where e."SeasonId"=s."Id") FROM jf_library_seasons s left join jf_library_items i on i."Id"=s."SeriesId" where "SeriesId"=$1`,
[Id]
[Id],
);
res.send(rows);
} catch (error) {
Expand All @@ -1009,7 +1012,7 @@ router.post("/getEpisodes", async (req, res) => {

const { rows } = await db.query(
`SELECT e.*, i."PrimaryImageHash", ii."Size" FROM jf_library_episodes e left join jf_library_items i on i."Id"=e."SeriesId" join jf_item_info ii on ii."Id"=e."EpisodeId" where "SeasonId"=$1`,
[Id]
[Id],
);
res.send(rows);
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jfstat",
"version": "1.1.9",
"version": "1.1.10",
"private": true,
"main": "src/index.jsx",
"scripts": {
Expand Down
Loading