From d3c6bc1619c39b1e6225d405efaad5df99a27406 Mon Sep 17 00:00:00 2001 From: Jono Cairns Date: Sat, 10 Apr 2021 13:10:43 +1200 Subject: [PATCH] fix(quotas): Time value of a quota was being ignored --- .gitattributes | 1 + server/entity/User.ts | 11 +++-------- 2 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..fcadb2cf --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text eol=lf diff --git a/server/entity/User.ts b/server/entity/User.ts index db5fa950..5c392706 100644 --- a/server/entity/User.ts +++ b/server/entity/User.ts @@ -236,11 +236,9 @@ export class User { const movieDate = new Date(); if (movieQuotaDays) { movieDate.setDate(movieDate.getDate() - movieQuotaDays); - } else { - movieDate.setDate(0); } - // YYYY-MM-DD format - const movieQuotaStartDate = movieDate.toJSON().split('T')[0]; + const movieQuotaStartDate = movieDate.toJSON(); + const movieQuotaUsed = movieQuotaLimit ? await requestRepository.count({ where: { @@ -261,11 +259,8 @@ export class User { const tvDate = new Date(); if (tvQuotaDays) { tvDate.setDate(tvDate.getDate() - tvQuotaDays); - } else { - tvDate.setDate(0); } - // YYYY-MM-DD format - const tvQuotaStartDate = tvDate.toJSON().split('T')[0]; + const tvQuotaStartDate = tvDate.toJSON(); const tvQuotaUsed = tvQuotaLimit ? ( await requestRepository