fix: use past 365 days instead of astronomical year (#55)

re #55
RaunoT · Jan 8, 2024 · 4d5017f · 4d5017f
1 parent 5a1233e
commit 4d5017f
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 28 deletions.
diff --git a/src/app/dashboard/_components/PeriodSelect.tsx b/src/app/dashboard/_components/PeriodSelect.tsx
@@ -31,11 +31,11 @@ export default function PeriodSelect() {
       </li>
       <li>
         <Link
-          href={`${pathname}?period=thisYear`}
+          href={`${pathname}?period=pastYear`}
           className='nav-link'
-          aria-selected={period === 'thisYear'}
+          aria-selected={period === 'pastYear'}
         >
-          This year
+          Past year
         </Link>
       </li>
       <li>

diff --git a/src/app/rewind/_components/Stories/Audio.tsx b/src/app/rewind/_components/Stories/Audio.tsx
@@ -16,7 +16,7 @@ export default function StoryAudio({
         <>
           <RewindStat isPaused={isPaused} scaleDelay={3}>
             <p>
-              To top it all off, you listened to&nbsp;
+              To top it all off, you&apos;ve listened to&nbsp;
               <span className='rewind-stat'>
                 {userRewind.audio.duration}
               </span>{' '}
@@ -31,7 +31,7 @@ export default function StoryAudio({
 
           <RewindStat isPaused={isPaused} renderDelay={3} scaleDelay={3}>
             <p>
-              You listened to{' '}
+              You&apos;ve listened to{' '}
               <span className='rewind-stat'>{userRewind.audio.count}</span>{' '}
               <span className='rewind-cat'>tracks</span> in total!
             </p>
@@ -44,7 +44,7 @@ export default function StoryAudio({
             noScale
           >
             <p className='mb-2'>
-              Your favorite was{' '}
+              Your favorite has been{' '}
               <span className='rewind-cat'>
                 {userRewind.audio.top[0].title}
               </span>
@@ -69,7 +69,7 @@ export default function StoryAudio({
               Audio
               <MusicalNoteIcon />
             </span>{' '}
-            on <span className='text-yellow-500'>Plex</span> this year{' '}
+            on <span className='text-yellow-500'>Plex</span> in the past year{' '}
             <span className='not-italic'>🥴</span>
           </p>
         </RewindStat>

diff --git a/src/app/rewind/_components/Stories/Movies.tsx b/src/app/rewind/_components/Stories/Movies.tsx
@@ -17,7 +17,7 @@ export default function StoryMovies({
           <RewindStat isPaused={isPaused} scaleDelay={3}>
             <p>
               <span className='rewind-stat'>{userRewind.movies.duration}</span>{' '}
-              of your time was spent watching{' '}
+              of your time has been spent watching{' '}
               <span className='rewind-cat'>
                 Movies
                 <FilmIcon />
@@ -28,7 +28,7 @@ export default function StoryMovies({
 
           <RewindStat isPaused={isPaused} renderDelay={3} scaleDelay={3}>
             <p>
-              You watched{' '}
+              You&apos;ve watched{' '}
               <span className='rewind-stat'>{userRewind.movies.count}</span>{' '}
               <span className='rewind-cat'>movies</span> in total!
             </p>
@@ -41,7 +41,7 @@ export default function StoryMovies({
             noScale
           >
             <p className='mb-2'>
-              Your favorite was{' '}
+              Your favorite has been{' '}
               <span className='rewind-cat'>
                 {userRewind.movies.top[0].title}
               </span>
@@ -66,7 +66,7 @@ export default function StoryMovies({
               Movies
               <FilmIcon />
             </span>{' '}
-            on <span className='text-yellow-500'>Plex</span> this year{' '}
+            on <span className='text-yellow-500'>Plex</span> in the past year{' '}
             <span className='not-italic'>😵‍💫</span>
           </p>
         </RewindStat>

diff --git a/src/app/rewind/_components/Stories/Requests.tsx b/src/app/rewind/_components/Stories/Requests.tsx
@@ -25,7 +25,7 @@ export default function StoryRequests({
                 Requests
                 <QuestionMarkCircleIcon />
               </span>{' '}
-              this year <span className='not-italic'>😲</span>
+              in the past year <span className='not-italic'>😲</span>
             </p>
           </RewindStat>
         ) : (
@@ -38,7 +38,7 @@ export default function StoryRequests({
                     Requests
                     <QuestionMarkCircleIcon />
                   </span>{' '}
-                  this year! You can make them via{' '}
+                  in the past year! You can make them via{' '}
                   <a
                     className='link link--dark relative z-10'
                     href={process.env.NEXT_PUBLIC_OVERSEERR_URL}
@@ -61,7 +61,7 @@ export default function StoryRequests({
                     Requests
                     <QuestionMarkCircleIcon />
                   </span>{' '}
-                  this year.
+                  in the past year.
                 </p>
               </RewindStat>
             )}
@@ -74,7 +74,7 @@ export default function StoryRequests({
                   Requests
                   <QuestionMarkCircleIcon />
                 </span>{' '}
-                this year.
+                during the same period.
               </p>
             </RewindStat>
 

diff --git a/src/app/rewind/_components/Stories/Shows.tsx b/src/app/rewind/_components/Stories/Shows.tsx
@@ -20,17 +20,17 @@ export default function StoryShows({
                 TV Shows
                 <PlayCircleIcon />
               </span>{' '}
-              took up{' '}
+              have taken up{' '}
               <span className='rewind-stat'>
                 {userRewind.shows.duration}
               </span>{' '}
-              of your year on <span className='text-yellow-500'>Plex</span>.
+              of your time on <span className='text-yellow-500'>Plex</span>.
             </p>
           </RewindStat>
 
           <RewindStat isPaused={isPaused} renderDelay={3} scaleDelay={3}>
             <p>
-              You watched{' '}
+              You&apos;ve watched{' '}
               <span className='rewind-stat'>{userRewind.shows.count}</span>{' '}
               <span className='rewind-cat'>episodes</span> in total!
             </p>
@@ -43,7 +43,7 @@ export default function StoryShows({
             noScale
           >
             <p className='mb-2'>
-              Your favorite was{' '}
+              Your favorite has been{' '}
               <span className='rewind-cat'>
                 {userRewind.shows.top[0].title}
               </span>
@@ -68,7 +68,7 @@ export default function StoryShows({
               TV Shows
               <PlayCircleIcon />
             </span>{' '}
-            on <span className='text-yellow-500'>Plex</span> this year{' '}
+            on <span className='text-yellow-500'>Plex</span> in the past year{' '}
             <span className='not-italic'>😥</span>
           </p>
         </RewindStat>

diff --git a/src/app/rewind/_components/Stories/Total.tsx b/src/app/rewind/_components/Stories/Total.tsx
@@ -23,7 +23,7 @@ export default function StoryTotal({
               of <span className='rewind-stat'>
                 {userRewind.duration.user}
               </span>{' '}
-              on <span className='text-yellow-500'>Plex</span> this year!
+              on <span className='text-yellow-500'>Plex</span> in the past year!
             </p>
           </RewindStat>
 
@@ -34,7 +34,7 @@ export default function StoryTotal({
                 {userRewind.duration.user_percentage}
                 <ChartPieIcon />
               </span>{' '}
-              of all plays, which totalled{' '}
+              of all plays, which total{' '}
               <span className='rewind-stat'>{userRewind.duration.total}</span>{' '}
               over all users.
             </p>
@@ -44,7 +44,7 @@ export default function StoryTotal({
         <RewindStat noScale>
           <p>
             You haven&apos;t played anything on{' '}
-            <span className='text-yellow-500'>Plex</span> this year{' '}
+            <span className='text-yellow-500'>Plex</span> in the past year{' '}
             <span className='not-italic'>😫</span>
           </p>
         </RewindStat>

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -5,6 +5,9 @@ const DAYS_AGO_30: Date = new Date(
   new Date().setDate(new Date().getDate() - 30),
 )
 const CURRENT_YEAR: Date = new Date(new Date().getFullYear(), 0, 1)
+const PAST_YEAR: Date = new Date(
+  new Date().setFullYear(new Date().getFullYear() - 1),
+)
 const ALL_TIME: Date = new Date(statisticsStartDate)
 
 type Period = {
@@ -31,6 +34,13 @@ export const PERIODS: { [key: string]: Period } = {
       (new Date().getTime() - CURRENT_YEAR.getTime()) / (1000 * 3600 * 24),
     ),
   },
+  pastYear: {
+    date: PAST_YEAR.toISOString(),
+    string: PAST_YEAR.toISOString().split('T')[0],
+    daysAgo: Math.ceil(
+      (new Date().getTime() - PAST_YEAR.getTime()) / (1000 * 3600 * 24),
+    ),
+  },
   allTime: {
     date: ALL_TIME.toISOString(),
     string: ALL_TIME.toISOString().split('T')[0],

diff --git a/src/utils/getRewind.ts b/src/utils/getRewind.ts
@@ -29,7 +29,7 @@ export async function getTopMediaStats(userId: string, libraries: Library[]) {
       total_duration: string
     }>('get_history', {
       user_id: userId,
-      after: PERIODS.thisYear.string,
+      after: PERIODS.pastYear.string,
       length: 0,
       media_type: mediaTypeMap[library.section_type],
       section_id: library.section_id,
@@ -97,7 +97,7 @@ export async function getLibrariesTotalDuration(libraries: Library[]) {
     libraries.map((library) => {
       return fetchTautulli<{ total_duration: string }>('get_history', {
         section_id: library.section_id,
-        after: PERIODS.thisYear.string,
+        after: PERIODS.pastYear.string,
         length: 0,
       })
     }),
@@ -120,7 +120,7 @@ export async function getUserTotalDuration(
       return fetchTautulli<{ total_duration: string }>('get_history', {
         user_id: userId,
         section_id: library.section_id,
-        after: PERIODS.thisYear.string,
+        after: PERIODS.pastYear.string,
         length: 0,
       })
     }),
@@ -139,7 +139,7 @@ export async function getTopMediaItems(userId: string, libraries: Library[]) {
       return fetchTautulli<TautulliItem[]>('get_home_stats', {
         user_id: userId,
         section_id: library.section_id,
-        time_range: PERIODS.thisYear.daysAgo,
+        time_range: PERIODS.pastYear.daysAgo,
         stats_count: 5,
         stats_type: 'duration',
       })
@@ -181,7 +181,7 @@ export async function getTopMediaItems(userId: string, libraries: Library[]) {
 export async function getRequestsTotals(userId: string) {
   const requests = await fetchPaginatedOverseerrStats(
     'request',
-    PERIODS.thisYear.date,
+    PERIODS.pastYear.date,
   )
 
   return {