🔀 Merge branch 'dev' into improve-dns-hole-stats-layout

src/server/api/root.ts

@@ -4,7 +4,7 @@ import { appRouter } from './routers/app';
 import { calendarRouter } from './routers/calendar';
 import { configRouter } from './routers/config';
 import { dashDotRouter } from './routers/dash-dot';
-import { dnsHoleRouter } from './routers/dns-hole';
+import { dnsHoleRouter } from './routers/dns-hole/router';
 import { dockerRouter } from './routers/docker/router';
 import { downloadRouter } from './routers/download';
 import { iconRouter } from './routers/icon';

src/server/api/routers/dns-hole/router.ts

@@ -6,7 +6,7 @@ import { PiHoleClient } from '~/tools/server/sdk/pihole/piHole';
 import { ConfigAppType } from '~/types/app';
 import { AdStatistics } from '~/widgets/dnshole/type';
 
-import { createTRPCRouter, publicProcedure } from '../trpc';
+import { createTRPCRouter, publicProcedure } from '../../trpc';
 
 export const dnsHoleRouter = createTRPCRouter({
   control: publicProcedure
@@ -135,8 +135,14 @@ const collectAdGuardSummary = async (app: ConfigAppType) => {
   const status = await adGuard.getStatus();
   const countFilteredDomains = await adGuard.getCountFilteringDomains();
 
-  const blockedQueriesToday = stats.blocked_filtering.reduce((prev, sum) => prev + sum, 0);
-  const queriesToday = stats.dns_queries.reduce((prev, sum) => prev + sum, 0);
+  const blockedQueriesToday =
+    stats.time_units === 'days'
+      ? stats.blocked_filtering[stats.blocked_filtering.length - 1]
+      : stats.blocked_filtering.reduce((prev, sum) => prev + sum, 0);
+  const queriesToday =
+    stats.time_units === 'days'
+      ? stats.dns_queries[stats.dns_queries.length - 1]
+      : stats.dns_queries.reduce((prev, sum) => prev + sum, 0);
 
   return {
     domainsBeingBlocked: countFilteredDomains,

src/server/api/routers/media-request.ts

@@ -65,7 +65,7 @@ export const mediaRequestsRouter = createTRPCRouter({
                   status: item.status,
                   backdropPath: `https://image.tmdb.org/t/p/original/${genericItem.backdropPath}`,
                   posterPath: `https://image.tmdb.org/t/p/w600_and_h900_bestv2/${genericItem.posterPath}`,
-                  href: `${appUrl}/movie/${item.media.tmdbId}`,
+                  href: `${appUrl}/${item.type}/${item.media.tmdbId}`,
                 };
               })
             );