.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -24,13 +24,13 @@ body:
       render: shell
   - type: input
     attributes:
-      label: Which Umami version are you using?
+      label: Which Umami version are you using? (if relevant)
       description: 'For example: 2.18.0, 2.15.1, 1.39.0, etc'
   - type: input
     attributes:
-      label: How are you deploying your application?
-      description: 'For example: Vercel, Railway, Docker, etc'
+      label: Which browser are you using? (if relevant)
+      description: 'For example: Chrome, Edge, Firefox, etc'
   - type: input
     attributes:
-      label: Which browser are you using?
-      description: 'For example: Chrome, Edge, Firefox, etc'
+      label: How are you deploying your application? (if relevant)
+      description: 'For example: Vercel, Railway, Docker, etc'

src/app/api/reports/attribution/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getAttribution(websiteId, parameters as AttributionParameters, filters);
 

src/app/api/reports/breakdown/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getBreakdown(websiteId, parameters as BreakdownParameters, filters);
 

src/app/api/reports/funnel/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getFunnel(websiteId, parameters as FunnelParameters, filters);
 

src/app/api/reports/goal/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getGoal(websiteId, parameters as GoalParameters, filters);
 

src/app/api/reports/retention/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+  const filters = await getQueryFilters(body.filters, websiteId);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
 
   const data = await getRetention(websiteId, parameters as RetentionParameters, filters);
 

src/app/api/reports/revenue/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
+  const filters = await getQueryFilters(body.filters, websiteId);
 
   const data = await getRevenue(websiteId, parameters as RevenuParameters, filters);
 

src/app/api/reports/utm/route.ts

@@ -18,8 +18,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(body.filters, websiteId, auth.user?.id);
-  const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
+  const filters = await getQueryFilters(body.filters, websiteId);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
 
   const data = {
     utm_source: [],

src/app/api/websites/[websiteId]/event-data/events/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataEvents(websiteId, {
     ...filters,

src/app/api/websites/[websiteId]/event-data/fields/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataFields(websiteId, filters);
 

src/app/api/websites/[websiteId]/event-data/properties/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataProperties(websiteId, filters);
 

src/app/api/websites/[websiteId]/event-data/stats/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataStats(websiteId, filters);
 

src/app/api/websites/[websiteId]/event-data/values/route.ts

@@ -30,7 +30,7 @@ export async function GET(
   }
 
   const { propertyName } = query;
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventDataValues(websiteId, {
     ...filters,

src/app/api/websites/[websiteId]/events/route.ts

@@ -29,7 +29,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getWebsiteEvents(websiteId, filters);
 

src/app/api/websites/[websiteId]/events/series/route.ts

@@ -29,7 +29,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getEventStats(websiteId, filters);
 

src/app/api/websites/[websiteId]/export/route.ts

@@ -28,7 +28,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const [events, pages, referrers, browsers, os, devices, countries] = await Promise.all([
     getEventMetrics(websiteId, { type: 'event' }, filters),

src/app/api/websites/[websiteId]/metrics/expanded/route.ts

@@ -37,7 +37,7 @@ export async function GET(
   }
 
   const { type, limit, offset, search } = query;
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   if (search) {
     filters[type] = `c.${search}`;

src/app/api/websites/[websiteId]/metrics/route.ts

@@ -37,7 +37,7 @@ export async function GET(
   }
 
   const { type, limit, offset, search } = query;
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   if (search) {
     filters[type] = `c.${search}`;

src/app/api/websites/[websiteId]/pageviews/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const [pageviews, sessions] = await Promise.all([
     getPageviewStats(websiteId, filters),

src/app/api/websites/[websiteId]/session-data/properties/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getSessionDataProperties(websiteId, filters);
 

src/app/api/websites/[websiteId]/session-data/values/route.ts

@@ -29,7 +29,7 @@ export async function GET(
   }
 
   const { propertyName } = query;
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getSessionDataValues(websiteId, {
     ...filters,

src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts

@@ -25,7 +25,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getSessionActivity(websiteId, sessionId, filters);
 

src/app/api/websites/[websiteId]/sessions/route.ts

@@ -28,7 +28,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getWebsiteSessions(websiteId, filters);
 

src/app/api/websites/[websiteId]/sessions/stats/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const metrics = await getWebsiteSessionStats(websiteId, filters);
 

src/app/api/websites/[websiteId]/sessions/weekly/route.ts

@@ -28,7 +28,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getWeeklyTraffic(websiteId, filters);
 

src/app/api/websites/[websiteId]/stats/route.ts

@@ -27,7 +27,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+  const filters = await getQueryFilters(query, websiteId);
 
   const data = await getWebsiteStats(websiteId, filters);
 

src/app/api/websites/[websiteId]/values/route.ts

@@ -42,7 +42,7 @@ export async function GET(
       value: segment.name,
     }));
   } else {
-    const filters = await getQueryFilters(query, websiteId, auth.user?.id);
+    const filters = await getQueryFilters(query, websiteId);
     values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
   }
 

src/app/api/websites/route.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { uuid } from '@/lib/crypto';
-import { fetchAccount } from '@/lib/load';
+import redis from '@/lib/redis';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
 import { pagingParams, searchParams } from '@/lib/schema';
@@ -52,7 +52,7 @@ export async function POST(request: Request) {
   const { id, name, domain, shareId, teamId } = body;
 
   if (process.env.CLOUD_MODE && !teamId) {
-    const account = await fetchAccount(auth.user.id);
+    const account = await redis.client.get(`account:${auth.user.id}`);
 
     if (!account?.hasSubscription) {
       const count = await getWebsiteCount(auth.user.id);

src/lib/load.ts

@@ -38,9 +38,3 @@ export async function fetchSession(websiteId: string, sessionId: string): Promis
 
   return session;
 }
-
-export async function fetchAccount(userId: string) {
-  const account = await redis.client.get(`account:${userId}`);
-
-  return account;
-}

src/lib/request.ts

@@ -1,9 +1,8 @@
-import { startOfMonth, subMonths } from 'date-fns';
 import { z } from 'zod';
 import { checkAuth } from '@/lib/auth';
 import { DEFAULT_PAGE_SIZE, FILTER_COLUMNS } from '@/lib/constants';
 import { getAllowedUnits, getMinimumUnit, maxDate, parseDateRange } from '@/lib/date';
-import { fetchAccount, fetchWebsite } from '@/lib/load';
+import { fetchWebsite } from '@/lib/load';
 import { filtersArrayToObject } from '@/lib/params';
 import { badRequest, unauthorized } from '@/lib/response';
 import type { QueryFilters } from '@/lib/types';
@@ -17,7 +16,7 @@ export async function parseRequest(
   const url = new URL(request.url);
   let query = Object.fromEntries(url.searchParams);
   let body = await getJsonBody(request);
-  let error: () => undefined | undefined | Response;
+  let error: () => undefined | undefined;
   let auth = null;
 
   if (schema) {
@@ -81,17 +80,8 @@ export function getRequestFilters(query: Record<string, any>) {
   return result;
 }
 
-export async function setWebsiteDate(websiteId: string, userId: string, data: Record<string, any>) {
+export async function setWebsiteDate(websiteId: string, data: Record<string, any>) {
   const website = await fetchWebsite(websiteId);
-  const cloudMode = !!process.env.CLOUD_MODE;
-
-  if (cloudMode && !website.teamId) {
-    const account = await fetchAccount(userId);
-
-    if (!account?.hasSubscription) {
-      data.startDate = maxDate(data.startDate, startOfMonth(subMonths(new Date(), 6)));
-    }
-  }
 
   if (website?.resetAt) {
     data.startDate = maxDate(data.startDate, new Date(website?.resetAt));
@@ -103,13 +93,12 @@ export async function setWebsiteDate(websiteId: string, userId: string, data: Re
 export async function getQueryFilters(
   params: Record<string, any>,
   websiteId?: string,
-  userId?: string,
 ): Promise<QueryFilters> {
   const dateRange = getRequestDateRange(params);
   const filters = getRequestFilters(params);
 
   if (websiteId) {
-    await setWebsiteDate(websiteId, userId, dateRange);
+    await setWebsiteDate(websiteId, dateRange);
 
     if (params.segment) {
       const segmentParams = (await getWebsiteSegment(websiteId, params.segment))