watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 14:17:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "refactor 6 month retention. use auth instead of cache:website". Fix share page retention bug.

Browse source 
This reverts commit 741c6039e6.
This commit is contained in:
Francis Cao 2026-01-14 10:28:48 -08:00
parent 6d480d9c36
commit b6013c3ee8
27 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/request.ts
View file

@ -81,12 +81,12 @@ 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 && !website.teamId) {
const account = await fetchAccount(userId);
const account = await fetchAccount(website.userId);
if (!account?.hasSubscription) {
data.startDate = maxDate(data.startDate, startOfMonth(subMonths(new Date(), 6)));
@ -103,13 +103,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))